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: fix most data sections, sdata2 still has issues

Browse Source
This commit is contained in:
Cuyler36
2025-06-17 13:44:44 -04:00
parent 6b0308f46f
commit 8c1f8b4b45
3 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libforest/emu64/emu64.hpp
+2 -1
View File
@@ -251,7 +251,7 @@ typedef union GXTexFmts {
} GXTexFmts;
inline void get_blk_wd_ht(unsigned int siz, unsigned int* blk_wd, unsigned int* blk_ht) {
static u8 blk_tbl[4][2] = {
static const u8 blk_tbl[4][2] = {
{ 8, 8 }, // G_IM_SIZ_4b
{ 8, 4 }, // G_IM_SIZ_8b
{ 4, 4 }, // G_IM_SIZ_16b
@@ -679,6 +679,7 @@ class emu64 : public emu64_print {
void dl_G_GEOMETRYMODE();
void dl_G_MOVEWORD();
void dl_G_MOVEMEM();
void dl_G_S2DEX();
void dl_G_SPECIAL_1();
u32 emu64_taskstart_r(Gfx* dl_p);
src/static/libforest/emu64/emu64.c
+37 -33
View File
@@ -243,6 +243,9 @@ MATCH_FORCESTRIP static void* TextureLinearConvert(void* img_p, unsigned int wid
#include "../src/static/libforest/emu64/emu64_utility.c"
static GXColor black_color = { 0, 0, 0, 0 };
static GXColor white_color = { 255, 255, 255, 255 };
static char* doltexwrapmode[] = { "CLAMP", "REPEAT", "MIRROR", "?" };
static char* dolfmttbl2[4][5] = {
@@ -492,9 +495,6 @@ static const u8 tblc[32][4] = {
{ GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO }, { GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO },
};
static GXColor black_color = { 0, 0, 0, 0 };
static GXColor white_color = { 255, 255, 255, 255 };
static void emu64_init2(GXRenderModeObj* render_mode) {
GC_Mtx m;
int i;
@@ -660,7 +660,7 @@ void emu64::emu64_init() {
GXSetLineWidth(line_width - 1, tex_offsets);
static u8 black_texture[] = { 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
static u8 black_texture[] ATTRIBUTE_ALIGN(32) = { 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88 };
@@ -1408,8 +1408,6 @@ int emu64::combine_tev() {
}
#define NUM_COMBINER_HIGHLOW_ERRS 10
static u32 last_highlow;
static u64 highlow_errs[NUM_COMBINER_HIGHLOW_ERRS];
/* Combine Manual Macros */
@@ -1423,6 +1421,8 @@ static u64 highlow_errs[NUM_COMBINER_HIGHLOW_ERRS];
#define COMBINE_CONSTEXPR(mode0, mode1) (gsDPSetCombineLERPInline(mode0, mode1))
void emu64::combine_manual() {
static u64 highlow_errs[NUM_COMBINER_HIGHLOW_ERRS];
static u32 last_highlow;
u64 combine_mode = *(u64*)&this->combine_gfx;
switch (combine_mode) {
@@ -1860,10 +1860,10 @@ void emu64::combine_manual() {
highlow_errs[i] = combine_mode;
this->err_count++;
/* ### Unsupported combine mode ###\ncase 0x%16llx:// */
this->Printf0(VT_COL(YELLOW, BLACK) "### 未対応のコンバインモードです ###\ncase 0x%16llx:// ",
this->Printf0(VT_COL(YELLOW, BLACK) "### 未対応のコンバインモードです ###\ncase 0x%16llx: // ",
combine_mode);
this->print_combine(combine_mode);
this->Printf0("\n" VT_RST);
this->Printf0(VT_RST "\n");
}
}
@@ -2465,8 +2465,8 @@ void emu64::texture_matrix() {
u16 ult0;
f32 bilerp_adjust; /* bilerp center adjust */
float muls;
float mult;
float uls;
float ult;
float lrs;
float lrt;
@@ -2507,22 +2507,22 @@ void emu64::texture_matrix() {
uls0 = this->settilesize_dolphin_cmds[0].sl;
ult0 = this->settilesize_dolphin_cmds[0].tl;
muls = uls * ((fastcast_float(&uls0) - bilerp_adjust) * (1.0f / 16.0f)); /* 0.0625f */
mult = ult * ((fastcast_float(&ult0) - bilerp_adjust) * (1.0f / 16.0f)); /* 0.0625f */
lrs = muls + (uls * fastcast_float(&this->texture_info[0].width));
lrt = mult + (ult * fastcast_float(&this->texture_info[0].height));
uls = uls * ((fastcast_float(&uls0) - bilerp_adjust) * (1.0f / 16.0f)); /* 0.0625f */
ult = ult * ((fastcast_float(&ult0) - bilerp_adjust) * (1.0f / 16.0f)); /* 0.0625f */
lrs = uls + (uls * fastcast_float(&this->texture_info[0].width));
lrt = ult + (ult * fastcast_float(&this->texture_info[0].height));
if (mult == lrt) {
OSReport(VT_COL(RED, WHITE) "mult = %8.3f lrt = %8.3f ult0 = %d y32 = %8.3f texobj[0].ht = %d\n" VT_RST,
mult, lrt, ult0, y32, this->texture_info[0].height);
if (ult == lrt) {
OSReport(VT_COL(RED, WHITE) "ult = %8.3f lrt = %8.3f ult0 = %d y32 = %8.3f texobj[0].ht = %d\n" VT_RST,
ult, lrt, ult0, y32, this->texture_info[0].height);
}
if (muls == lrs) {
OSReport(VT_COL(RED, WHITE) "muls = %8.3f lrs = %8.3f uls0 = %d x32 = %8.3f texobj[0].wd = %d\n" VT_RST,
muls, lrs, uls0, x32, this->texture_info[0].width);
if (uls == lrs) {
OSReport(VT_COL(RED, WHITE) "uls = %8.3f lrs = %8.3f uls0 = %d x32 = %8.3f texobj[0].wd = %d\n" VT_RST,
uls, lrs, uls0, x32, this->texture_info[0].width);
}
C_MTXLightOrtho(m, mult, lrt, muls, lrs, scaleS, scaleT, transS, transT);
C_MTXLightOrtho(m, ult, lrt, uls, lrs, scaleS, scaleT, transS, transT);
GXLoadTexMtxImm(m, GX_TEXMTX0, GX_MTX2x4);
GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX0);
@@ -2539,22 +2539,22 @@ void emu64::texture_matrix() {
uls0 = this->settilesize_dolphin_cmds[1].sl;
ult0 = this->settilesize_dolphin_cmds[1].tl;
muls = uls * ((fastcast_float(&uls0) - bilerp_adjust) * (1.0f / 16.0f)); /* 0.0625f */
mult = ult * ((fastcast_float(&ult0) - bilerp_adjust) * (1.0f / 16.0f)); /* 0.0625f */
lrs = muls + (uls * fastcast_float(&this->texture_info[1].width));
lrt = mult + (ult * fastcast_float(&this->texture_info[1].height));
uls = uls * ((fastcast_float(&uls0) - bilerp_adjust) * (1.0f / 16.0f)); /* 0.0625f */
ult = ult * ((fastcast_float(&ult0) - bilerp_adjust) * (1.0f / 16.0f)); /* 0.0625f */
lrs = uls + (uls * fastcast_float(&this->texture_info[1].width));
lrt = ult + (ult * fastcast_float(&this->texture_info[1].height));
if (mult == lrt) {
OSReport(VT_COL(RED, WHITE) "mult = %8.3f lrt = %8.3f ult0 = %d y32 = %8.3f texobj[1].ht = %d\n" VT_RST,
mult, lrt, ult0, y32, this->texture_info[1].height);
if (ult == lrt) {
OSReport(VT_COL(RED, WHITE) "ult = %8.3f lrt = %8.3f ult0 = %d y32 = %8.3f texobj[1].ht = %d\n" VT_RST,
ult, lrt, ult0, y32, this->texture_info[1].height);
}
if (muls == lrs) {
OSReport(VT_COL(RED, WHITE) "muls = %8.3f lrs = %8.3f uls0 = %d x32 = %8.3f texobj[1].wd = %d\n" VT_RST,
muls, lrs, uls0, x32, this->texture_info[1].width);
if (uls == lrs) {
OSReport(VT_COL(RED, WHITE) "uls = %8.3f lrs = %8.3f uls0 = %d x32 = %8.3f texobj[1].wd = %d\n" VT_RST,
uls, lrs, uls0, x32, this->texture_info[1].width);
}
C_MTXLightOrtho(m, mult, lrt, muls, lrs, scaleS, scaleT, transS, transT);
C_MTXLightOrtho(m, ult, lrt, uls, lrs, scaleS, scaleT, transS, transT);
GXLoadTexMtxImm(m, GX_TEXMTX1, GX_MTX2x4);
GXSetTexCoordGen(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX1);
@@ -5065,7 +5065,7 @@ void emu64::dl_G_MOVEWORD() {
emu64::warningTime[3] = EMU64_WARN_TIME;
this->segment_set = true;
OSReport(VT_COL(RED, WHTIE) "%s\n%s\n%s\n" VT_RST, s1, s2, s3);
OSReport(VT_COL(RED, WHITE) "%s\n%s\n%s\n" VT_RST, s1, s2, s3);
}
} break;
@@ -5261,6 +5261,10 @@ void emu64::dl_G_MOVEMEM() {
}
}
void emu64::dl_G_S2DEX() {
this->Printf0("未知のディスプレイリストがありました\n");
}
void emu64::dl_G_SPECIAL_1() {
Gspecial1* special = (Gspecial1*)&this->gfx;
src/static/libforest/emu64/emu64_print.cpp
+6 -2
View File
@@ -2,6 +2,10 @@
#include "boot.h"
static const char* __unused__reorder_char0A(void) {
return "\n";
}
void emu64::disp_matrix(GC_Mtx mtx) {
static const u8 kakko[] = {'/', '\\', '/', '\\', '|', '|', '|', '|', '|', '|', '|', '|', '\\', '/', '\\', '/'};
@@ -353,9 +357,9 @@ void emu64::show_render(u32 data) {
static const char* const m[4][4] = {
{ "G_BL_CLR_IN", "G_BL_CLR_MEM", "G_BL_CLR_BL", "G_BL_CLR_FOG" },
{ "G_BL_A_SHADE", "G_BL_0", "G_BL_A_IN", "G_BL_A_FOG" },
{ "G_BL_A_IN", "G_BL_A_FOG", "G_BL_A_SHADE", "G_BL_0" },
{ "G_BL_CLR_IN", "G_BL_CLR_MEM", "G_BL_CLR_BL", "G_BL_CLR_FOG" },
{ "G_BL_A_MEM", "G_BL_0", "G_BL_1MA", "G_BL_1" },
{ "G_BL_1MA", "G_BL_A_MEM", "G_BL_0", "G_BL_1" },
};
EMU64_LOG("\ngsDPSetRenderBlender(\n");