mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

emu64 work and misc improvements

Browse Source
This commit is contained in:
Cuyler36
2023-08-28 21:01:23 -04:00
parent 1d9045ad10
commit 595e2a92df
35 changed files with 2746 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libforest/emu64/emu64.hpp
+465
View File
@@ -0,0 +1,465 @@
#ifndef EMU64_H
#define EMU64_H
#include "types.h"
#include "va_args.h"
#include "MSL_C/printf.h"
#include "libforest/gbi_extensions.h"
#include "libforest/emu64/texture_cache.h"
#include "dolphin/os/__ppc_eabi_init.h"
#include "dolphin/gx.h"
#include "dolphin/mtx.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef EMU64_DEBUG
#define AFLAGS_MAX 100
#else
#define AFLAGS_MAX 0
#endif
#define EMU64_TEX_BLOCK_SIZE_X 4
#define EMU64_TEX_BLOCK_SIZE_Y 4
#define NUM_COMMANDS 64
#define NUM_SEGMENTS 16
#define DL_MAX_STACK_LEVEL 18
#define DL_HISTORY_COUNT 16
#define NUM_TILES 8
#define NUM_TLUTS 16
#define MTX_STACK_SIZE 10
#define VTX_COUNT 128
#define NUM_LIGHTS 8
#define EMU64_WARNING_COUNT 10
#define EMU64_WARN_IDX_DL 4
#define EMU64_WARN_TIME 600
#define NUM_DIRTY_FLAGS 32
/* TODO: figure out where this actually belongs */
namespace std {
typedef struct __va_list_struct __tag_va_List;
}
typedef union {
GXColor color;
struct {
u8 r;
u8 g;
u8 b;
u8 a;
};
u32 raw;
} EmuColor;
typedef struct {
Vec position;
union {
struct {
u16 _pad0:2;
u16 cull_z_greater:1;
u16 cull_z_lesser:1;
u16 cull_y_greater:1;
u16 cull_y_lesser:1;
u16 cull_x_greater:1;
u16 cull_x_lesser:1;
u16 _pad1:7;
u16 nonshared:1;
};
u16 flag;
};
struct {
s16 s, t;
} tex_coords;
short pad;
Vec normal;
EmuColor color;
} Vertex;
typedef struct {
EmuColor color;
Vec position;
u8 unk[12];
struct {
f32 kc, k1, kq; /*kc = k0, kq = k2 */
} attenuation;
} EmuLight;
typedef struct {
void* img_addr; /* Texture RAM address */
u16 width; /* Texture width */
u16 height; /* Texture height */
u8 format; /* Texture format */
u8 size; /* Size in bpp */
u8 tlut_name; /* Palette/TLUT idx */
u8 pad;
} emu64_texture_info;
class aflags_c {
public:
#ifndef EMU64_DEBUG
int getMaxArray() { return AFLAGS_MAX; }
void set(u32 idx, u8 val) { this->flags[idx] = val; } /* @fabricated */
int operator[](u32 idx) { return this->flags[idx]; } /* @fabricated */
#else
int getMaxArray() { return AFLAGS_MAX; }
void set(u32 idx, u8 val) { }
int operator[](u32 idx) { return 0; }
#endif
private:
int flags[AFLAGS_MAX];
};
class Texture {
public:
/* @weak */
Texture(void* img_p, u16 w, u16 h, u8 fmt, u8 bpp) {
this->img_p = img_p;
this->width = w;
this->height = h;
this->n64_bpp = bpp;
this->n64_fmt = fmt;
this->blockX_size = EMU64_TEX_BLOCK_SIZE_X;
this->blockY_size = EMU64_TEX_BLOCK_SIZE_Y;
}
/* @??? (maybe not weak?) */
~Texture() { };
/* @weak */
u32 getOffset(int x, int y) {
const int size_x = sizeof(u16) * EMU64_TEX_BLOCK_SIZE_X;
const int size_y = sizeof(u16) * EMU64_TEX_BLOCK_SIZE_Y;
return ((((u32)x / 8) + ((u32)(((u32)y / 8) * this->width) / 8)) * (size_x * size_y)) +
((u32)y & 7) * size_x +
((u32)x & 7);
}
/* @weak */
u32 getTexel(int block_x, int block_y) {
int x = (1 << this->blockX_size) - 1;
int y = (1 << this->blockY_size) - 1;
block_x &= x;
block_y &= y;
u32 ofs = this->getOffset(block_x, block_y);
switch (this->n64_bpp) {
case G_IM_SIZ_4b:
{
u8* img_p = ((u8*)this->img_p) + ofs / 2;
if ((block_x & 1) == 0) {
return *img_p >> 4;
}
else {
return *img_p & 0xF;
}
}
case G_IM_SIZ_8b:
{
return ((u8*)this->img_p)[ofs];
}
case G_IM_SIZ_16b:
{
return ((u16*)this->img_p)[ofs];
}
default:
{
return ((u32*)this->img_p)[ofs];
}
}
}
/* @weak */
void putTexel(int block_x, int block_y, u32 texel) {
int x = (1 << this->blockX_size) - 1;
int y = (1 << this->blockY_size) - 1;
block_x &= x;
block_y &= y;
u32 ofs = this->getOffset(block_x, block_y);
switch (this->n64_bpp) {
case G_IM_SIZ_4b:
{
u8* img_p = ((u8*)this->img_p) + ofs / 2;
if ((block_x & 1) == 0) {
*img_p = (*img_p & 0x0F) | (texel << 4);
}
else {
*img_p = (*img_p & 0xF0) | (texel & 0xF);
}
}
case G_IM_SIZ_8b:
{
((u8*)this->img_p)[ofs] = texel;
}
case G_IM_SIZ_16b:
{
((u16*)this->img_p)[ofs] = texel;
}
case G_IM_SIZ_32b:
{
((u32*)this->img_p)[ofs] = texel;
}
}
}
/* Member variables */
void* img_p;
u16 width;
u16 height;
u8 blockX_size;
u8 blockY_size;
u8 n64_fmt;
u8 n64_bpp;
};
#define EMU64_PRINTF_FLAG (1 << 1)
#define EMU64_PRINTF1_FLAG (1 << 2)
#define EMU64_PRINTF2_FLAG (1 << 3)
#define EMU64_PRINTF3_FLAG (1 << 4)
class emu64_print {
public:
void Printf(const char* fmt, ...) {
va_list list;
if ((this->print_flags & EMU64_PRINTF_FLAG)) {
va_start(list, fmt);
this->Vprintf(fmt, list);
va_end(list);
}
}
void Printf0(const char* fmt, ...) {
va_list list;
va_start(list, fmt);
this->Vprintf(fmt, list);
va_end(list);
}
void Printf1(const char* fmt, ...) {
va_list list;
if ((this->print_flags & EMU64_PRINTF1_FLAG)) {
va_start(list, fmt);
this->Vprintf(fmt, list);
va_end(list);
}
}
void Printf2(const char* fmt, ...) {
va_list list;
if ((this->print_flags & EMU64_PRINTF2_FLAG)) {
va_start(list, fmt);
this->Vprintf(fmt, list);
va_end(list);
}
}
void Printf3(const char* fmt, ...) {
va_list list;
if ((this->print_flags & EMU64_PRINTF3_FLAG)) {
va_start(list, fmt);
this->Vprintf(fmt, list);
va_end(list);
}
}
protected:
u8 print_flags;
private:
void Vprintf(const char* fmt, std::__tag_va_List* va_list) { vprintf(fmt, va_list); }
};
class emu64 : public emu64_print {
public:
/* N64 texture format[N64 bit size] -> dol texture format */
static u16 fmtxtbl[8][4];
static char* warningString[EMU64_WARNING_COUNT];
static int warningTime[EMU64_WARNING_COUNT];
static bool displayWarning;
private:
/* 0x0000 */ // u8 emu64_print::print_flags;
/* 0x0001 */ u8 print_commands;
/* 0x0002 */ bool disable_polygons;
/* 0x0004 */ u32 err_count;
/* 0x0008 */ u32 cmds_processed; /* ??? */
/* 0x000C */ u32 total_vertices;
/* 0x0010 */ u32 vtx_load_calls;
/* 0x0014 */ u32 triangles;
/* 0x0018 */ u32 double_triangles;
/* 0x001C */ u32 quads;
/* 0x0020 */ u32 lines;
/* 0x0024 */ u32 load_ucode_calls;
/* 0x0028 */ u32 num_unknown_cmds;
/* 0x002C */ u32 num_unknown_ucodes;
/* 0x0030 */ int polygons;
/* 0x0034 */ u32 cullDL_calls;
/* 0x0038 */ u32 cullDL_outside_obj_count;
/* 0x003C */ u32 cullDL_visible_obj_count;
/* 0x0040 */ Gfx* gfx_p;
/* 0x0048 */ Gfx gfx;
/* 0x0050 */ u8 gfx_cmd;
/* 0x0054 */ void* work_ptr;
/* 0x0058 */ int end_dl;
/* 0x005C */ s8 ucode_len;
/* 0x0060 */ void* ucode_info;
/* 0x0064 */ void* ucode_p;
/* 0x0068 */ int _0068; /* ??? */
/* 0x006C */ void* segments[NUM_SEGMENTS];
/* 0x00AC */ Gfx* DL_stack[DL_MAX_STACK_LEVEL];
/* 0x00F4 */ s8 DL_stack_level;
/* 0x00F8 */ u32 othermode_high;
/* 0x00FC */ u32 othermode_low;
/* 0x0100 */ u32 geometry_mode;
/* 0x0104 */ u32 _0104;
/* 0x0108 */ u32 combiner_high;
/* 0x010C */ u32 combiner_low;
/* 0x0110 */ emu64_texture_info texture_info[NUM_TILES];
/* 0x0170 */ Gsetimg2 setimg2_cmds[NUM_TILES];
/* 0x01B0 */ void* tlut_addresses[NUM_TLUTS];
/* 0x01F0 */ GXTexObj tex_objs[NUM_TILES];
/* 0x02F0 */ GXTlutObj tlut_objs[NUM_TLUTS];
/* 0x03B0 */ bool use_dolphin_settile[NUM_TILES];
/* 0x03B8 */ Gsettile settile_cmds[NUM_TILES];
/* 0x03F8 */ Gsettile_dolphin settile_dolphin_cmds[NUM_TILES];
/* 0x0438 */ Gsettilesize_dolphin settilesize_dolphin_cmds[NUM_TILES];
/* 0x0478 */ Gsetimg_new now_setimg;
/* 0x0480 */ u8 tex_edge_alpha;
/* 0x0484 */ union {
u32 primdepth;
struct {
u16 primdepth_z; /* Z value */
u16 primdepth_dz; /* Delta Z */
};
};
/* 0x0488 */ EmuColor primitive_color; /* GX_TEVREG1 */
/* 0x048C */ EmuColor environment_color; /* GX_TEVREG2 */
/* 0x0490 */ EmuColor blend_color;
/* 0x0494 */ EmuColor fog_color;
/* 0x0498 */ s16 fog_zmult;
/* 0x049A */ s16 fog_zoffset;
/* 0x049C */ EmuColor fill_color;
/* 0x04A0 */ EmuColor fill_tev_color; /* GX_TEVREG0 */
/* 0x04A4 */ bool dirty_flags[NUM_DIRTY_FLAGS];
/* 0x04C4 */ Mtx original_projection_mtx;
/* 0x04F4 */ Mtx position_mtx;
/* 0x0524 */ Mtx model_view_mtx_stack[MTX_STACK_SIZE];
/* 0x0704 */ Mtx position_mtx_stack[MTX_STACK_SIZE];
/* 0x08E4 */ Mtx44 projection_mtx;
/* 0x0924 */ struct {
struct {
s8 x, y, z;
} x;
struct {
s8 x, y, z;
} y;
} lookAt;
/* 0x092C */ f32 near; /* Near clipping plane */
/* 0x0930 */ f32 far; /* Far clipping plane */
/* 0x0934 */ Mtx model_view_mtx;
/* 0x0964 */ Mtx _0964; /* UNCONFIRMED TYPE */
/* 0x0994 */ int mtx_stack_size;
/* 0x0998 */ Gtexture_internal texture_gfx;
/* 0x09A0 */ f32 texture_scale_s; /* x-scale */
/* 0x09A4 */ f32 texture_scale_t; /* y-scale */
/* 0x09A8 */ Mtx44 ortho_mtx;
/* 0x09E8 */ GXProjectionType projection_type;
/* 0x09EC */ Mtx perspective_mtx;
/* 0x0A1C */ u32 _0A1C;
/* 0x0A20 */ u32 rdpHalf_1;
/* 0x0A24 */ EmuLight lights[NUM_LIGHTS];
/* 0x0B64 */ u8 num_lights;
/* 0x0B68 */ u32 lookatx_cnt;
/* 0x0B6C */ u32 lookaty_cnt;
/* 0x0B70 */ u32 _0B70;
/* 0x0B74 */ u32 texconv_cnt;
/* 0x0B78 */ u32 vertex_cnt;
/* 0x0B7C */ u32 texconv_time;
/* 0x0B80 */ u32 rsprdp_time;
/* 0x0B84 */ u32 combine_time;
/* 0x0B88 */ u32 spvertex_time;
/* 0x0B8C */ u32 setup_time;
/* 0x0B90 */ u32 loadblock_time;
/* 0x0B94 */ u32 loadtlut_time;
/* 0x0B98 */ u32 matrix_time;
/* 0x0B9C */ u32 polygons_time;
/* 0x0BA0 */ u32 dirty_check_time;
/* 0x0BA4 */ u32 dirty_lightX_time;
/* 0x0BA8 */ u32 dirty_lightX_cnt
/* 0x0BAC */ u32 dirty_light_time;
/* 0x0BB0 */ u32 dirty_light_cnt;
/* 0x0BB4 */ u32 dirty_tex_time;
/* 0x0BB8 */ u32 dirty_tex_cnt;
/* 0x0BBC */ u32 dirty_tex1_time;
/* 0x0BC0 */ u32 dirty_tex1_cnt;
/* 0x0BC4 */ u32 dirty_tex2_time;
/* 0x0BC8 */ u32 dirty_tex2_cnt;
/* 0x0BCC */ u32 dirty_texmtx_time;
/* 0x0BD0 */ u32 dirty_texmtx_cnt;
/* 0x0BD4 */ u32 dirty_proj_time;
/* 0x0BD8 */ u32 dirty_primcolor_time;
/* 0x0BDC */ u32 dirty_envcolor_time;
/* 0x0BE0 */ u32 dirty_fillcolor_time;
/* 0x0BE4 */ u32 dirty_combine_mode_time;
/* 0x0BE8 */ u32 dirty_othermodeh_time;
/* 0x0BEC */ u32 dirty_othermodel_time;
/* 0x0BF0 */ u32 dirty_geometory_time; /* Yes, the devs misspelt this */
/* 0x0BF4 */ u32 setuptex_time;
/* 0x0BF8 */ struct {
u32 time;
u32 calls;
} command_info[NUM_COMMANDS];
/* 0x0DF8 */ u32 texture_cache_select_time;
/* 0x0DFC */ u32 guMtxL2F_time;
/* 0x0E00 */ u32 guMtxL2F_cnt;
/* 0x0E04 */ u32 combine_auto_cnt[5];
/* 0x0E18 */ bool using_nonshared_mtx;
/* 0x0E1C */ Vertex vertices[VTX_COUNT];
/* 0x201C */ u8 texture_adjust_mode;
/* 0x2020 */ u32 resolved_addresses;
/* 0x2024 */ u32 _2024;
/* 0x2028 */ u32 _2028;
/* 0x202C */ u32 _202C;
/* 0x2030 */ u32 abnormal_addresses;
/* 0x2034 */ bool rdp_pipe_sync_needed;
/* 0x2035 */ bool segment_set;
/* 0x2038 */ Gfx* dl_history[DL_HISTORY_COUNT];
/* 0x2078 */ u8 dl_history_start;
};
#ifdef __cplusplus
}
#endif
#endif
include/libforest/emu64/texture_cache.h
+84
View File
@@ -0,0 +1,84 @@
#ifndef TEXTURE_CACHE_H
#define TEXTURE_CACHE_H
#include "types.h"
#include "libforest/gbi_extensions.h"
#ifdef __cplusplus
extern "C" {
#endif
#define TEX_CACHE_ALIGNMENT (32-1) /* 32 byte alignment */
#define NUM_TEXTURE_CACHE_DATA 10
#define TEXTURE_CACHE_LIST_SIZE 256
#define TMEM_ENTRIES 128
#define TEX_CACHE_ALIGN(n)((n + TEX_CACHE_ALIGNMENT) & ~TEX_CACHE_ALIGNMENT)
/* These would be initialized by the linker. TODO: Is there a better way to do this? */
extern void* _data_segment_start;
extern void* _sdata2_segment_end;
typedef struct {
void* addr;
Gloadblock loadblock;
Gloadtile loadtile;
Gsetimg_new setimg;
} tmem_t;
typedef struct {
void* start; /* Start RAM address of cache */
void* end; /* End RAM address of cache */
} texture_cache_data_entry_t;
typedef struct {
void* original; /* Original RAM address */
void* converted; /* Converted RAM address */
} texture_cache_entry_t;
typedef struct texture_cache_s texture_cache_t;
typedef void* (*texture_cache_search_func)(void* addr);
typedef int (*texture_cache_entry_func)(void* original, void* converted);
typedef void* (*texture_cache_alloc_func)(texture_cache_t* cache, u32 size);
typedef struct {
texture_cache_search_func search;
texture_cache_entry_func entry;
texture_cache_alloc_func alloc;
} texture_cache_funcs;
typedef struct texture_cache_s {
texture_cache_funcs* funcs; /* Pointer to texture cache funcs */
u8* buffer_start; /* Start address of cache buffer */
u8* buffer_end; /* End address of cache buffer */
u8* buffer_current; /* Current write position of the cache buffer */
u8* last_alloc_end; /* Points to end address from last cache alloc */
u8* last_alloc_start; /* Points to the start address from last cache alloc */
bool is_overflow; /* Set to true when the cache is full */
u32 buffer_pos; /* Write index into cache buffer */
} texture_cache_t;
/* TMEM map */
//static tmem_t tmem_map[TMEM_ENTRIES];
/* Shared alloc function */
void* texture_cache_alloc(texture_cache_t* cache, u32 size);
/* .data cache functions */
void* texture_cache_data_search(void* addr);
int texture_cache_data_entry(void* original, void* converted);
#define TEX_BUFFER_DATA_SIZE 0xC000
#define TEX_BUFFER_BSS_SIZE 0x1000
extern "C" void emu64_texture_cache_data_entry_set(void* begin, void* end);
extern texture_cache_t* texture_cache_select(void* address);
#ifdef __cplusplus
}
#endif
#endif