diff --git a/config/RZDE01_00/splits.txt b/config/RZDE01_00/splits.txt index 860b39f5f2e..ab505d33f2e 100644 --- a/config/RZDE01_00/splits.txt +++ b/config/RZDE01_00/splits.txt @@ -2695,7 +2695,7 @@ JSystem/JKernel/JKRDecomp.cpp: .text start:0x802EF438 end:0x802EFB1C .data start:0x8042C2D8 end:0x8042C2E8 .bss start:0x804C2EB0 end:0x804C2EF0 - .sbss start:0x8053B278 end:0x8053B284 + .sbss start:0x8053B278 end:0x8053B280 JSystem/JSupport/JSUList.cpp: .text start:0x802EFB1C end:0x802EFF5C @@ -2723,7 +2723,7 @@ JSystem/JGadget/std-vector.cpp: JSystem/JUtility/JUTCacheFont.cpp: .text start:0x802F0DF4 end:0x802F1CB4 - .data start:0x8042C350 end:0x8042C440 + .data start:0x8042C350 end:0x8042C410 .sdata2 start:0x8053FEB0 end:0x8053FEB8 JSystem/JUtility/JUTResource.cpp: @@ -2735,6 +2735,7 @@ JSystem/JUtility/JUTTexture.cpp: JSystem/JUtility/JUTPalette.cpp: .text start:0x802F2448 end:0x802F2534 + .data start:0x8042C410 end:0x8042C440 JSystem/JUtility/JUTNameTab.cpp: .text start:0x802F2534 end:0x802F2724 @@ -2743,16 +2744,16 @@ JSystem/JUtility/JUTNameTab.cpp: JSystem/JUtility/JUTGraphFifo.cpp: .text start:0x802F2724 end:0x802F28B4 .data start:0x8042C450 end:0x8042C460 - .sbss start:0x8053B284 end:0x8053B290 + .sbss start:0x8053B280 end:0x8053B290 JSystem/JUtility/JUTFont.cpp: .text start:0x802F28B4 end:0x802F2B2C - .data start:0x8042C460 end:0x8042C4DC + .data start:0x8042C460 end:0x8042C4A8 JSystem/JUtility/JUTResFont.cpp: .text start:0x802F2B2C end:0x802F3C3C .rodata start:0x803EF730 end:0x803EF800 - .data start:0x8042C4DC end:0x8042C528 + .data start:0x8042C4A8 end:0x8042C528 .sdata2 start:0x8053FED0 end:0x8053FEE8 JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: @@ -2760,7 +2761,7 @@ JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: JSystem/JUtility/JUTDbPrint.cpp: .text start:0x802F3C3C end:0x802F4198 - .sbss start:0x8053B290 end:0x8053B2A0 + .sbss start:0x8053B290 end:0x8053B298 .sdata2 start:0x8053FEE8 end:0x8053FEF8 JSystem/JUtility/JUTGamePad.cpp: @@ -2768,8 +2769,8 @@ JSystem/JUtility/JUTGamePad.cpp: .ctors start:0x803CE3BC end:0x803CE3C0 .data start:0x8042C528 end:0x8042C558 .bss start:0x804C2EF0 end:0x804C3090 - .sdata start:0x8053A1C0 end:0x8053A218 - .sbss start:0x8053B2A0 end:0x8053B2D0 + .sdata start:0x8053A1C0 end:0x8053A1D8 + .sbss start:0x8053B298 end:0x8053B2D0 .sdata2 start:0x8053FEF8 end:0x8053FF18 JSystem/JUtility/JUTException.cpp: @@ -2777,17 +2778,20 @@ JSystem/JUtility/JUTException.cpp: .ctors start:0x803CE3C0 end:0x803CE3C4 .data start:0x8042C558 end:0x8042CA90 .bss start:0x804C3090 end:0x804C3508 + .sdata start:0x8053A1D8 end:0x8053A208 .sbss start:0x8053B2D0 end:0x8053B2F8 .sdata2 start:0x8053FF18 end:0x8053FF28 JSystem/JUtility/JUTDirectPrint.cpp: .text start:0x802F7810 end:0x802F7EF0 .data start:0x8042CA90 end:0x8042CD58 + .sdata start:0x8053A208 end:0x8053A210 .sbss start:0x8053B2F8 end:0x8053B300 .sdata2 start:0x8053FF28 end:0x8053FF80 JSystem/JUtility/JUTAssert.cpp: .text start:0x802F7EF0 end:0x802F81CC + .sdata start:0x8053A210 end:0x8053A218 .sbss start:0x8053B300 end:0x8053B308 .sdata2 start:0x8053FF80 end:0x8053FF98 @@ -2802,18 +2806,19 @@ JSystem/JUtility/JUTXfb.cpp: JSystem/JUtility/JUTFader.cpp: .text start:0x802F89DC end:0x802F8CF0 - .data start:0x8042CD68 end:0x8042CD8C + .data start:0x8042CD68 end:0x8042CD80 .sdata2 start:0x8053FF98 end:0x8053FFA0 JSystem/JUtility/JUTProcBar.cpp: .text start:0x802F8CF0 end:0x802FA4A0 - .sdata start:0x8053A218 end:0x8053A288 + .sdata start:0x8053A218 end:0x8053A220 .sbss start:0x8053B328 end:0x8053B338 .sdata2 start:0x8053FFA0 end:0x8053FFE0 JSystem/JUtility/JUTConsole.cpp: .text start:0x802FA4A0 end:0x802FB7BC - .data start:0x8042CD8C end:0x8042CD98 + .data start:0x8042CD80 end:0x8042CD98 + .sdata start:0x8053A220 end:0x8053A228 .sbss start:0x8053B338 end:0x8053B348 .sdata2 start:0x8053FFE0 end:0x80540010 @@ -2880,6 +2885,7 @@ JSystem/J2DGraph/J2DPicture.cpp: JSystem/J2DGraph/J2DTextBox.cpp: .text start:0x80311CF4 end:0x803131E4 .data start:0x8042D610 end:0x8042D6D0 + .sdata start:0x8053A228 end:0x8053A230 .sdata2 start:0x80540148 end:0x80540168 JSystem/J2DGraph/J2DWindowEx.cpp: @@ -2898,6 +2904,7 @@ JSystem/J2DGraph/J2DTextBoxEx.cpp: .text start:0x80319144 end:0x8031A988 .rodata start:0x803F3AA8 end:0x803F3AE0 .data start:0x8042D8F0 end:0x8042D9B0 + .sdata start:0x8053A230 end:0x8053A238 .sdata2 start:0x805401A0 end:0x805401C0 JSystem/J2DGraph/J2DAnmLoader.cpp: @@ -2916,6 +2923,7 @@ JSystem/J2DGraph/J2DManage.cpp: JSystem/J3DGraphBase/J3DGD.cpp: .text start:0x8031EBB0 end:0x80320478 .data start:0x8042DAE0 end:0x8042DB88 + .sdata start:0x8053A238 end:0x8053A288 .sdata2 start:0x805401F8 end:0x80540238 JSystem/J3DGraphBase/J3DSys.cpp: diff --git a/config/RZDE01_00/symbols.txt b/config/RZDE01_00/symbols.txt index 1a74c5830f4..8ef25f657aa 100644 --- a/config/RZDE01_00/symbols.txt +++ b/config/RZDE01_00/symbols.txt @@ -25825,8 +25825,8 @@ exCallbackObject = .bss:0x804C30B0; // type:object size:0x14 scope:global align: sMapFileList__12JUTException = .bss:0x804C30D0; // type:object size:0xC scope:global align:4 data:4byte c3bcnt = .bss:0x804C30E0; // type:object size:0x20 scope:global align:4 data:4byte context$45953 = .bss:0x804C3100; // type:object size:0x2C8 scope:local align:4 -lbl_804C33C8 = .bss:0x804C33C8; // type:object size:0x40 -lbl_804C3408 = .bss:0x804C3408; // type:object size:0x100 +sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804C33C8; // type:object size:0x40 +sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804C3408; // type:object size:0x100 static_mBounds__7J2DPane = .bss:0x804C3508; // type:object size:0x10 scope:global align:4 lbl_804C3518 = .bss:0x804C3518; // type:object size:0x108 data:byte j3dSys = .bss:0x804C3620; // type:object size:0x11C scope:global align:4 @@ -27815,7 +27815,7 @@ lbl_8053A1F9 = .sdata:0x8053A1F9; // type:object size:0x8 data:string lbl_8053A201 = .sdata:0x8053A201; // type:object size:0x1 lbl_8053A202 = .sdata:0x8053A202; // type:object size:0x5 data:string lbl_8053A208 = .sdata:0x8053A208; // type:object size:0x3 data:string -lbl_8053A210 = .sdata:0x8053A210; // type:object size:0x1 data:byte +mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8053A210; // type:object size:0x1 data:byte oneFrameRate = .sdata:0x8053A218; // type:object size:0x4 scope:global align:4 data:float oneFrameRateUser = .sdata:0x8053A21C; // type:object size:0x4 scope:global align:4 data:float lbl_8053A220 = .sdata:0x8053A220; // type:object size:0x4 data:string @@ -28706,18 +28706,18 @@ lbl_8053B280 = .sbss:0x8053B280; // type:object size:0x1 data:byte sCurrentFifo__12JUTGraphFifo = .sbss:0x8053B284; // type:object size:0x4 scope:global align:4 data:4byte lbl_8053B288 = .sbss:0x8053B288; // type:object size:0x8 sDebugPrint__10JUTDbPrint = .sbss:0x8053B290; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8053B298 = .sbss:0x8053B298; // type:object size:0x1 data:byte -lbl_8053B299 = .sbss:0x8053B299; // type:object size:0x1 data:byte +mListInitialized__10JUTGamePad = .sbss:0x8053B298; // type:object size:0x1 data:byte +mPadAssign__10JUTGamePad = .sbss:0x8053B299; // type:object size:0x4 data:byte sSuppressPadReset__10JUTGamePad = .sbss:0x8053B2A0; // type:object size:0x4 scope:global align:4 data:4byte sAnalogMode__10JUTGamePad = .sbss:0x8053B2A4; // type:object size:0x4 scope:global align:4 data:4byte sRumbleSupported__10JUTGamePad = .sbss:0x8053B2A8; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8053B2AC = .sbss:0x8053B2AC; // type:object size:0x1 data:byte +mStatus__Q210JUTGamePad7CRumble = .sbss:0x8053B2AC; // type:object size:0x4 data:byte mEnabled__Q210JUTGamePad7CRumble = .sbss:0x8053B2B0; // type:object size:0x4 scope:global align:4 data:4byte sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2B4; // type:object size:0x4 scope:global align:4 data:4byte sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2B8; // type:object size:0x4 scope:global align:4 data:4byte sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2C0; // type:object size:0x8 scope:global align:4 data:4byte -lbl_8053B2C8 = .sbss:0x8053B2C8; // type:object size:0x1 data:byte -lbl_8053B2C9 = .sbss:0x8053B2C9; // type:object size:0x1 data:byte +sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2C8; // type:object size:0x1 data:byte +sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2C9; // type:object size:0x1 data:byte sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2CC; // type:object size:0x4 scope:global align:4 data:4byte sErrorManager__12JUTException = .sbss:0x8053B2D0; // type:object size:0x4 scope:global align:4 data:4byte sPreUserCallback__12JUTException = .sbss:0x8053B2D4; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/RZDE01_02/splits.txt b/config/RZDE01_02/splits.txt index 330c3a00063..540f739d7c0 100644 --- a/config/RZDE01_02/splits.txt +++ b/config/RZDE01_02/splits.txt @@ -2657,7 +2657,7 @@ JSystem/JKernel/JKRDecomp.cpp: .text start:0x802D9E08 end:0x802DA4EC .data start:0x804137A0 end:0x804137B0 .bss start:0x804A8F18 end:0x804A8F58 - .sbss start:0x80521270 end:0x8052127C + .sbss start:0x80521270 end:0x80521278 JSystem/JSupport/JSUList.cpp: .text start:0x802DA4EC end:0x802DA92C @@ -2685,7 +2685,7 @@ JSystem/JGadget/std-vector.cpp: JSystem/JUtility/JUTCacheFont.cpp: .text start:0x802DB7C4 end:0x802DC684 - .data start:0x80413818 end:0x80413908 + .data start:0x80413818 end:0x804138D8 .sdata2 start:0x80525F30 end:0x80525F38 JSystem/JUtility/JUTResource.cpp: @@ -2697,6 +2697,7 @@ JSystem/JUtility/JUTTexture.cpp: JSystem/JUtility/JUTPalette.cpp: .text start:0x802DCE18 end:0x802DCF04 + .data start:0x804138D8 end:0x80413908 JSystem/JUtility/JUTNameTab.cpp: .text start:0x802DCF04 end:0x802DD0F4 @@ -2705,16 +2706,16 @@ JSystem/JUtility/JUTNameTab.cpp: JSystem/JUtility/JUTGraphFifo.cpp: .text start:0x802DD0F4 end:0x802DD284 .data start:0x80413918 end:0x80413928 - .sbss start:0x8052127C end:0x80521288 + .sbss start:0x80521278 end:0x80521288 JSystem/JUtility/JUTFont.cpp: .text start:0x802DD284 end:0x802DD4FC - .data start:0x80413928 end:0x804139A4 + .data start:0x80413928 end:0x80413970 JSystem/JUtility/JUTResFont.cpp: .text start:0x802DD4FC end:0x802DE60C .rodata start:0x803DAA78 end:0x803DAB60 - .data start:0x804139A4 end:0x804139F0 + .data start:0x80413970 end:0x804139F0 .sdata2 start:0x80525F50 end:0x80525F68 JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: @@ -2722,7 +2723,7 @@ JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: JSystem/JUtility/JUTDbPrint.cpp: .text start:0x802DE60C end:0x802DEB68 - .sbss start:0x80521288 end:0x80521298 + .sbss start:0x80521288 end:0x80521290 .sdata2 start:0x80525F68 end:0x80525F78 JSystem/JUtility/JUTGamePad.cpp: @@ -2730,8 +2731,8 @@ JSystem/JUtility/JUTGamePad.cpp: .ctors start:0x803B8E00 end:0x803B8E04 .data start:0x804139F0 end:0x80413A20 .bss start:0x804A8F58 end:0x804A90F8 - .sdata start:0x805201D0 end:0x80520228 - .sbss start:0x80521298 end:0x805212C8 + .sdata start:0x805201D0 end:0x805201E8 + .sbss start:0x80521290 end:0x805212C8 .sdata2 start:0x80525F78 end:0x80525F98 JSystem/JUtility/JUTException.cpp: @@ -2739,17 +2740,20 @@ JSystem/JUtility/JUTException.cpp: .ctors start:0x803B8E04 end:0x803B8E08 .data start:0x80413A20 end:0x80413F58 .bss start:0x804A90F8 end:0x804A9570 + .sdata start:0x805201E8 end:0x80520218 .sbss start:0x805212C8 end:0x805212F0 .sdata2 start:0x80525F98 end:0x80525FA8 JSystem/JUtility/JUTDirectPrint.cpp: .text start:0x802E21E0 end:0x802E28C0 .data start:0x80413F58 end:0x80414220 + .sdata start:0x80520218 end:0x80520220 .sbss start:0x805212F0 end:0x805212F8 .sdata2 start:0x80525FA8 end:0x80526000 JSystem/JUtility/JUTAssert.cpp: .text start:0x802E28C0 end:0x802E2B9C + .sdata start:0x80520220 end:0x80520228 .sbss start:0x805212F8 end:0x80521300 .sdata2 start:0x80526000 end:0x80526018 @@ -2764,18 +2768,19 @@ JSystem/JUtility/JUTXfb.cpp: JSystem/JUtility/JUTFader.cpp: .text start:0x802E33AC end:0x802E36C0 - .data start:0x80414230 end:0x80414254 + .data start:0x80414230 end:0x80414248 .sdata2 start:0x80526018 end:0x80526020 JSystem/JUtility/JUTProcBar.cpp: .text start:0x802E36C0 end:0x802E4E70 - .sdata start:0x80520228 end:0x80520298 + .sdata start:0x80520228 end:0x80520230 .sbss start:0x80521320 end:0x80521330 .sdata2 start:0x80526020 end:0x80526060 JSystem/JUtility/JUTConsole.cpp: .text start:0x802E4E70 end:0x802E618C - .data start:0x80414254 end:0x80414260 + .data start:0x80414248 end:0x80414260 + .sdata start:0x80520230 end:0x80520238 .sbss start:0x80521330 end:0x80521340 .sdata2 start:0x80526060 end:0x80526090 @@ -2842,6 +2847,7 @@ JSystem/J2DGraph/J2DPicture.cpp: JSystem/J2DGraph/J2DTextBox.cpp: .text start:0x802FC6C4 end:0x802FDBB4 .data start:0x80414AD8 end:0x80414B98 + .sdata start:0x80520238 end:0x80520240 .sdata2 start:0x805261C8 end:0x805261E8 JSystem/J2DGraph/J2DWindowEx.cpp: @@ -2860,6 +2866,7 @@ JSystem/J2DGraph/J2DTextBoxEx.cpp: .text start:0x80303B14 end:0x80305358 .rodata start:0x803DEE08 end:0x803DEE40 .data start:0x80414DB8 end:0x80414E78 + .sdata start:0x80520240 end:0x80520248 .sdata2 start:0x80526220 end:0x80526240 JSystem/J2DGraph/J2DAnmLoader.cpp: @@ -2878,6 +2885,7 @@ JSystem/J2DGraph/J2DManage.cpp: JSystem/J3DGraphBase/J3DGD.cpp: .text start:0x80309580 end:0x8030AE48 .data start:0x80414FA8 end:0x80415050 + .sdata start:0x80520248 end:0x80520298 .sdata2 start:0x80526278 end:0x805262B8 JSystem/J3DGraphBase/J3DSys.cpp: diff --git a/config/RZDE01_02/symbols.txt b/config/RZDE01_02/symbols.txt index 38a3292d1ca..b321ecb8b53 100644 --- a/config/RZDE01_02/symbols.txt +++ b/config/RZDE01_02/symbols.txt @@ -25371,8 +25371,8 @@ exCallbackObject = .bss:0x804A9118; // type:object size:0x14 scope:global align: sMapFileList__12JUTException = .bss:0x804A9138; // type:object size:0xC scope:global align:4 data:4byte c3bcnt = .bss:0x804A9148; // type:object size:0x20 scope:global align:4 data:4byte context$45953 = .bss:0x804A9168; // type:object size:0x2C8 scope:global align:4 -lbl_804A9430 = .bss:0x804A9430; // type:object size:0x40 -lbl_804A9470 = .bss:0x804A9470; // type:object size:0x100 +sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A9430; // type:object size:0x40 +sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A9470; // type:object size:0x100 static_mBounds__7J2DPane = .bss:0x804A9570; // type:object size:0x10 scope:global align:4 lbl_804A9580 = .bss:0x804A9580; // type:object size:0x120 data:byte j3dSys = .bss:0x804A96A0; // type:object size:0x11C scope:global align:4 @@ -27339,7 +27339,7 @@ lbl_80520209 = .sdata:0x80520209; // type:object size:0x8 data:string lbl_80520211 = .sdata:0x80520211; // type:object size:0x1 lbl_80520212 = .sdata:0x80520212; // type:object size:0x5 data:string lbl_80520218 = .sdata:0x80520218; // type:object size:0x3 data:string -lbl_80520220 = .sdata:0x80520220; // type:object size:0x1 data:byte +mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x80520220; // type:object size:0x1 data:byte oneFrameRate = .sdata:0x80520228; // type:object size:0x4 scope:global align:4 data:float oneFrameRateUser = .sdata:0x8052022C; // type:object size:0x4 scope:global align:4 data:float lbl_80520230 = .sdata:0x80520230; // type:object size:0x4 data:string @@ -28226,18 +28226,18 @@ lbl_80521278 = .sbss:0x80521278; // type:object size:0x1 data:byte sCurrentFifo__12JUTGraphFifo = .sbss:0x8052127C; // type:object size:0x4 scope:global align:4 data:4byte lbl_80521280 = .sbss:0x80521280; // type:object size:0x8 sDebugPrint__10JUTDbPrint = .sbss:0x80521288; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80521290 = .sbss:0x80521290; // type:object size:0x1 data:byte -lbl_80521291 = .sbss:0x80521291; // type:object size:0x1 data:byte +mListInitialized__10JUTGamePad = .sbss:0x80521290; // type:object size:0x1 data:byte +mPadAssign__10JUTGamePad = .sbss:0x80521291; // type:object size:0x4 data:byte sSuppressPadReset__10JUTGamePad = .sbss:0x80521298; // type:object size:0x4 scope:global align:4 data:4byte sAnalogMode__10JUTGamePad = .sbss:0x8052129C; // type:object size:0x4 scope:global align:4 data:4byte sRumbleSupported__10JUTGamePad = .sbss:0x805212A0; // type:object size:0x4 scope:global align:4 data:4byte -lbl_805212A4 = .sbss:0x805212A4; // type:object size:0x1 data:byte +mStatus__Q210JUTGamePad7CRumble = .sbss:0x805212A4; // type:object size:0x4 data:byte mEnabled__Q210JUTGamePad7CRumble = .sbss:0x805212A8; // type:object size:0x4 scope:global align:4 data:4byte sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212AC; // type:object size:0x4 scope:global align:4 data:4byte sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212B0; // type:object size:0x4 scope:global align:4 data:4byte sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212B8; // type:object size:0x8 scope:global align:4 data:4byte -lbl_805212C0 = .sbss:0x805212C0; // type:object size:0x1 data:byte -lbl_805212C1 = .sbss:0x805212C1; // type:object size:0x1 data:byte +sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212C0; // type:object size:0x1 data:byte +sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212C1; // type:object size:0x1 data:byte sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212C4; // type:object size:0x4 scope:global align:4 data:4byte sErrorManager__12JUTException = .sbss:0x805212C8; // type:object size:0x4 scope:global align:4 data:4byte sPreUserCallback__12JUTException = .sbss:0x805212CC; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/RZDJ01/splits.txt b/config/RZDJ01/splits.txt index 904279e8df3..a68d330186c 100644 --- a/config/RZDJ01/splits.txt +++ b/config/RZDJ01/splits.txt @@ -2657,7 +2657,7 @@ JSystem/JKernel/JKRDecomp.cpp: .text start:0x802DB928 end:0x802DC00C .data start:0x80411620 end:0x80411630 .bss start:0x804A6D98 end:0x804A6DD8 - .sbss start:0x8051F0E0 end:0x8051F0EC + .sbss start:0x8051F0E0 end:0x8051F0E8 JSystem/JSupport/JSUList.cpp: .text start:0x802DC00C end:0x802DC44C @@ -2685,7 +2685,7 @@ JSystem/JGadget/std-vector.cpp: JSystem/JUtility/JUTCacheFont.cpp: .text start:0x802DD2E4 end:0x802DE1A4 - .data start:0x80411698 end:0x80411788 + .data start:0x80411698 end:0x80411758 .sdata2 start:0x80523D88 end:0x80523D90 JSystem/JUtility/JUTResource.cpp: @@ -2697,6 +2697,7 @@ JSystem/JUtility/JUTTexture.cpp: JSystem/JUtility/JUTPalette.cpp: .text start:0x802DE938 end:0x802DEA24 + .data start:0x80411758 end:0x80411788 JSystem/JUtility/JUTNameTab.cpp: .text start:0x802DEA24 end:0x802DEC14 @@ -2705,21 +2706,21 @@ JSystem/JUtility/JUTNameTab.cpp: JSystem/JUtility/JUTGraphFifo.cpp: .text start:0x802DEC14 end:0x802DEDA4 .data start:0x80411798 end:0x804117A8 - .sbss start:0x8051F0EC end:0x8051F0F8 + .sbss start:0x8051F0E8 end:0x8051F0F8 JSystem/JUtility/JUTFont.cpp: .text start:0x802DEDA4 end:0x802DF01C - .data start:0x804117A8 end:0x80411824 + .data start:0x804117A8 end:0x804117F0 JSystem/JUtility/JUTResFont.cpp: .text start:0x802DF01C end:0x802E012C .rodata start:0x803D8A38 end:0x803D8B20 - .data start:0x80411824 end:0x80411870 + .data start:0x804117F0 end:0x80411870 .sdata2 start:0x80523DA8 end:0x80523DC0 JSystem/JUtility/JUTDbPrint.cpp: .text start:0x802E012C end:0x802E0688 - .sbss start:0x8051F0F8 end:0x8051F108 + .sbss start:0x8051F0F8 end:0x8051F100 .sdata2 start:0x80523DC0 end:0x80523DD0 JSystem/JUtility/JUTGamePad.cpp: @@ -2727,8 +2728,8 @@ JSystem/JUtility/JUTGamePad.cpp: .ctors start:0x803BA8C0 end:0x803BA8C4 .data start:0x80411870 end:0x804118A0 .bss start:0x804A6DD8 end:0x804A6F78 - .sdata start:0x8051E040 end:0x8051E098 - .sbss start:0x8051F108 end:0x8051F138 + .sdata start:0x8051E040 end:0x8051E058 + .sbss start:0x8051F100 end:0x8051F138 .sdata2 start:0x80523DD0 end:0x80523DF0 JSystem/JUtility/JUTException.cpp: @@ -2736,17 +2737,20 @@ JSystem/JUtility/JUTException.cpp: .ctors start:0x803BA8C4 end:0x803BA8C8 .data start:0x804118A0 end:0x80411DD8 .bss start:0x804A6F78 end:0x804A73F0 + .sdata start:0x8051E058 end:0x8051E088 .sbss start:0x8051F138 end:0x8051F160 .sdata2 start:0x80523DF0 end:0x80523E00 JSystem/JUtility/JUTDirectPrint.cpp: .text start:0x802E3D00 end:0x802E43E0 .data start:0x80411DD8 end:0x804120A0 + .sdata start:0x8051E088 end:0x8051E090 .sbss start:0x8051F160 end:0x8051F168 .sdata2 start:0x80523E00 end:0x80523E58 JSystem/JUtility/JUTAssert.cpp: .text start:0x802E43E0 end:0x802E46BC + .sdata start:0x8051E090 end:0x8051E098 .sbss start:0x8051F168 end:0x8051F170 .sdata2 start:0x80523E58 end:0x80523E70 @@ -2761,18 +2765,19 @@ JSystem/JUtility/JUTXfb.cpp: JSystem/JUtility/JUTFader.cpp: .text start:0x802E4ECC end:0x802E51E0 - .data start:0x804120B0 end:0x804120D4 + .data start:0x804120B0 end:0x804120C8 .sdata2 start:0x80523E70 end:0x80523E78 JSystem/JUtility/JUTProcBar.cpp: .text start:0x802E51E0 end:0x802E6990 - .sdata start:0x8051E098 end:0x8051E108 + .sdata start:0x8051E098 end:0x8051E0A0 .sbss start:0x8051F190 end:0x8051F1A0 .sdata2 start:0x80523E78 end:0x80523EB8 JSystem/JUtility/JUTConsole.cpp: .text start:0x802E6990 end:0x802E7CAC - .data start:0x804120D4 end:0x804120E0 + .data start:0x804120C8 end:0x804120E0 + .sdata start:0x8051E0A0 end:0x8051E0A8 .sbss start:0x8051F1A0 end:0x8051F1B0 .sdata2 start:0x80523EB8 end:0x80523EE8 @@ -2839,6 +2844,7 @@ JSystem/J2DGraph/J2DPicture.cpp: JSystem/J2DGraph/J2DTextBox.cpp: .text start:0x802FE1E4 end:0x802FF6D4 .data start:0x80412958 end:0x80412A18 + .sdata start:0x8051E0A8 end:0x8051E0B0 .sdata2 start:0x80524020 end:0x80524040 JSystem/J2DGraph/J2DWindowEx.cpp: @@ -2856,6 +2862,7 @@ JSystem/J2DGraph/J2DTextBoxEx.cpp: .text start:0x80305634 end:0x80306E78 .rodata start:0x803DCDC8 end:0x803DCE00 .data start:0x80412C38 end:0x80412CF8 + .sdata start:0x8051E0B0 end:0x8051E0B8 .sdata2 start:0x80524078 end:0x80524098 JSystem/J2DGraph/J2DAnmLoader.cpp: @@ -2874,6 +2881,7 @@ JSystem/J2DGraph/J2DManage.cpp: JSystem/J3DGraphBase/J3DGD.cpp: .text start:0x8030B0A0 end:0x8030C968 .data start:0x80412E28 end:0x80412ED0 + .sdata start:0x8051E0B8 end:0x8051E108 .sdata2 start:0x805240D0 end:0x80524110 JSystem/J3DGraphBase/J3DSys.cpp: diff --git a/config/RZDJ01/symbols.txt b/config/RZDJ01/symbols.txt index f20807e0ab4..2fcb92996fa 100644 --- a/config/RZDJ01/symbols.txt +++ b/config/RZDJ01/symbols.txt @@ -25373,8 +25373,8 @@ exCallbackObject = .bss:0x804A6F98; // type:object size:0x14 scope:global align: sMapFileList__12JUTException = .bss:0x804A6FB8; // type:object size:0xC scope:global align:4 data:4byte c3bcnt = .bss:0x804A6FC8; // type:object size:0x20 scope:global align:4 data:4byte context$45953 = .bss:0x804A6FE8; // type:object size:0x2C8 scope:local align:4 -lbl_804A72B0 = .bss:0x804A72B0; // type:object size:0x40 -lbl_804A72F0 = .bss:0x804A72F0; // type:object size:0x100 +sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A72B0; // type:object size:0x40 +sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A72F0; // type:object size:0x100 static_mBounds__7J2DPane = .bss:0x804A73F0; // type:object size:0x10 scope:global align:4 lbl_804A7400 = .bss:0x804A7400; // type:object size:0x120 data:byte j3dSys = .bss:0x804A7520; // type:object size:0x11C scope:global align:4 @@ -27345,7 +27345,7 @@ lbl_8051E079 = .sdata:0x8051E079; // type:object size:0x8 data:string lbl_8051E081 = .sdata:0x8051E081; // type:object size:0x1 lbl_8051E082 = .sdata:0x8051E082; // type:object size:0x5 data:string lbl_8051E088 = .sdata:0x8051E088; // type:object size:0x3 data:string -lbl_8051E090 = .sdata:0x8051E090; // type:object size:0x1 data:byte +mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8051E090; // type:object size:0x1 data:byte oneFrameRate = .sdata:0x8051E098; // type:object size:0x4 scope:global align:4 data:float oneFrameRateUser = .sdata:0x8051E09C; // type:object size:0x4 scope:global align:4 data:float lbl_8051E0A0 = .sdata:0x8051E0A0; // type:object size:0x4 data:string @@ -28230,18 +28230,18 @@ lbl_8051F0E8 = .sbss:0x8051F0E8; // type:object size:0x1 data:byte sCurrentFifo__12JUTGraphFifo = .sbss:0x8051F0EC; // type:object size:0x4 scope:global align:4 data:4byte lbl_8051F0F0 = .sbss:0x8051F0F0; // type:object size:0x8 sDebugPrint__10JUTDbPrint = .sbss:0x8051F0F8; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8051F100 = .sbss:0x8051F100; // type:object size:0x1 data:byte -lbl_8051F101 = .sbss:0x8051F101; // type:object size:0x1 data:byte +mListInitialized__10JUTGamePad = .sbss:0x8051F100; // type:object size:0x1 data:byte +mPadAssign__10JUTGamePad = .sbss:0x8051F101; // type:object size:0x4 data:byte sSuppressPadReset__10JUTGamePad = .sbss:0x8051F108; // type:object size:0x4 scope:global align:4 data:4byte sAnalogMode__10JUTGamePad = .sbss:0x8051F10C; // type:object size:0x4 scope:global align:4 data:4byte sRumbleSupported__10JUTGamePad = .sbss:0x8051F110; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8051F114 = .sbss:0x8051F114; // type:object size:0x1 data:byte +mStatus__Q210JUTGamePad7CRumble = .sbss:0x8051F114; // type:object size:0x4 data:byte mEnabled__Q210JUTGamePad7CRumble = .sbss:0x8051F118; // type:object size:0x4 scope:global align:4 data:4byte sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F11C; // type:object size:0x4 scope:global align:4 data:4byte sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F120; // type:object size:0x4 scope:global align:4 data:4byte sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F128; // type:object size:0x8 scope:global align:4 data:4byte -lbl_8051F130 = .sbss:0x8051F130; // type:object size:0x1 data:byte -lbl_8051F131 = .sbss:0x8051F131; // type:object size:0x1 data:byte +sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F130; // type:object size:0x1 data:byte +sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F131; // type:object size:0x1 data:byte sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F134; // type:object size:0x4 scope:global align:4 data:4byte sErrorManager__12JUTException = .sbss:0x8051F138; // type:object size:0x4 scope:global align:4 data:4byte sPreUserCallback__12JUTException = .sbss:0x8051F13C; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/RZDP01/splits.txt b/config/RZDP01/splits.txt index 98b883e9d09..708ed06b9e5 100644 --- a/config/RZDP01/splits.txt +++ b/config/RZDP01/splits.txt @@ -2654,7 +2654,7 @@ JSystem/JKernel/JKRDecomp.cpp: .text start:0x802DA238 end:0x802DA91C .data start:0x804140B0 end:0x804140C0 .bss start:0x804A9838 end:0x804A9878 - .sbss start:0x80521A30 end:0x80521A3C + .sbss start:0x80521A30 end:0x80521A38 JSystem/JSupport/JSUList.cpp: .text start:0x802DA91C end:0x802DAD5C @@ -2682,7 +2682,7 @@ JSystem/JGadget/std-vector.cpp: JSystem/JUtility/JUTCacheFont.cpp: .text start:0x802DBBF4 end:0x802DCAB4 - .data start:0x80414128 end:0x80414218 + .data start:0x80414128 end:0x804141E8 .sdata2 start:0x80526700 end:0x80526708 JSystem/JUtility/JUTResource.cpp: @@ -2694,6 +2694,7 @@ JSystem/JUtility/JUTTexture.cpp: JSystem/JUtility/JUTPalette.cpp: .text start:0x802DD248 end:0x802DD334 + .data start:0x804141E8 end:0x80414218 JSystem/JUtility/JUTNameTab.cpp: .text start:0x802DD334 end:0x802DD524 @@ -2702,16 +2703,16 @@ JSystem/JUtility/JUTNameTab.cpp: JSystem/JUtility/JUTGraphFifo.cpp: .text start:0x802DD524 end:0x802DD6B4 .data start:0x80414228 end:0x80414238 - .sbss start:0x80521A3C end:0x80521A48 + .sbss start:0x80521A38 end:0x80521A48 JSystem/JUtility/JUTFont.cpp: .text start:0x802DD6B4 end:0x802DD92C - .data start:0x80414238 end:0x804142B4 + .data start:0x80414238 end:0x80414280 JSystem/JUtility/JUTResFont.cpp: .text start:0x802DD92C end:0x802DEA3C .rodata start:0x803DB798 end:0x803DB880 - .data start:0x804142B4 end:0x80414300 + .data start:0x80414280 end:0x80414300 .sdata2 start:0x80526720 end:0x80526738 JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: @@ -2719,7 +2720,7 @@ JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: JSystem/JUtility/JUTDbPrint.cpp: .text start:0x802DEA3C end:0x802DEF98 - .sbss start:0x80521A48 end:0x80521A58 + .sbss start:0x80521A48 end:0x80521A50 .sdata2 start:0x80526738 end:0x80526748 JSystem/JUtility/JUTGamePad.cpp: @@ -2727,8 +2728,8 @@ JSystem/JUtility/JUTGamePad.cpp: .ctors start:0x803B9280 end:0x803B9284 .data start:0x80414300 end:0x80414330 .bss start:0x804A9878 end:0x804A9A18 - .sdata start:0x80520978 end:0x805209D0 - .sbss start:0x80521A58 end:0x80521A88 + .sdata start:0x80520978 end:0x80520990 + .sbss start:0x80521A50 end:0x80521A88 .sdata2 start:0x80526748 end:0x80526768 JSystem/JUtility/JUTException.cpp: @@ -2736,17 +2737,20 @@ JSystem/JUtility/JUTException.cpp: .ctors start:0x803B9284 end:0x803B9288 .data start:0x80414330 end:0x80414868 .bss start:0x804A9A18 end:0x804A9E90 + .sdata start:0x80520990 end:0x805209C0 .sbss start:0x80521A88 end:0x80521AB0 .sdata2 start:0x80526768 end:0x80526778 JSystem/JUtility/JUTDirectPrint.cpp: .text start:0x802E2610 end:0x802E2CF0 .data start:0x80414868 end:0x80414B30 + .sdata start:0x805209C0 end:0x805209C8 .sbss start:0x80521AB0 end:0x80521AB8 .sdata2 start:0x80526778 end:0x805267D0 JSystem/JUtility/JUTAssert.cpp: .text start:0x802E2CF0 end:0x802E2FCC + .sdata start:0x805209C8 end:0x805209D0 .sbss start:0x80521AB8 end:0x80521AC0 .sdata2 start:0x805267D0 end:0x805267E8 @@ -2761,18 +2765,19 @@ JSystem/JUtility/JUTXfb.cpp: JSystem/JUtility/JUTFader.cpp: .text start:0x802E37DC end:0x802E3AF0 - .data start:0x80414B40 end:0x80414B64 + .data start:0x80414B40 end:0x80414B58 .sdata2 start:0x805267E8 end:0x805267F0 JSystem/JUtility/JUTProcBar.cpp: .text start:0x802E3AF0 end:0x802E52A0 - .sdata start:0x805209D0 end:0x80520A40 + .sdata start:0x805209D0 end:0x805209D8 .sbss start:0x80521AE0 end:0x80521AF0 .sdata2 start:0x805267F0 end:0x80526830 JSystem/JUtility/JUTConsole.cpp: .text start:0x802E52A0 end:0x802E65BC - .data start:0x80414B64 end:0x80414B70 + .data start:0x80414B58 end:0x80414B70 + .sdata start:0x805209D8 end:0x805209E0 .sbss start:0x80521AF0 end:0x80521B00 .sdata2 start:0x80526830 end:0x80526860 @@ -2839,6 +2844,7 @@ JSystem/J2DGraph/J2DPicture.cpp: JSystem/J2DGraph/J2DTextBox.cpp: .text start:0x802FCAF4 end:0x802FDFE4 .data start:0x804153E8 end:0x804154A8 + .sdata start:0x805209E0 end:0x805209E8 .sdata2 start:0x80526998 end:0x805269B8 JSystem/J2DGraph/J2DWindowEx.cpp: @@ -2856,6 +2862,7 @@ JSystem/J2DGraph/J2DTextBoxEx.cpp: .text start:0x80303F44 end:0x80305788 .rodata start:0x803DFB28 end:0x803DFB60 .data start:0x804156C8 end:0x80415788 + .sdata start:0x805209E8 end:0x805209F0 .sdata2 start:0x805269F0 end:0x80526A10 JSystem/J2DGraph/J2DAnmLoader.cpp: @@ -2874,6 +2881,7 @@ JSystem/J2DGraph/J2DManage.cpp: JSystem/J3DGraphBase/J3DGD.cpp: .text start:0x803099B0 end:0x8030B278 .data start:0x804158B8 end:0x80415960 + .sdata start:0x805209F0 end:0x80520A40 .sdata2 start:0x80526A48 end:0x80526A88 JSystem/J3DGraphBase/J3DSys.cpp: diff --git a/config/RZDP01/symbols.txt b/config/RZDP01/symbols.txt index 6d7c6341e7b..979c07a9457 100644 --- a/config/RZDP01/symbols.txt +++ b/config/RZDP01/symbols.txt @@ -25367,8 +25367,8 @@ exCallbackObject = .bss:0x804A9A38; // type:object size:0x14 scope:global align: sMapFileList__12JUTException = .bss:0x804A9A58; // type:object size:0xC scope:global align:4 data:4byte c3bcnt = .bss:0x804A9A68; // type:object size:0x20 scope:global align:4 data:4byte context$45953 = .bss:0x804A9A88; // type:object size:0x2C8 scope:local align:4 -lbl_804A9D50 = .bss:0x804A9D50; // type:object size:0x40 -lbl_804A9D90 = .bss:0x804A9D90; // type:object size:0x100 +sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A9D50; // type:object size:0x40 +sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A9D90; // type:object size:0x100 static_mBounds__7J2DPane = .bss:0x804A9E90; // type:object size:0x10 scope:global align:4 lbl_804A9EA0 = .bss:0x804A9EA0; // type:object size:0x120 data:byte j3dSys = .bss:0x804A9FC0; // type:object size:0x11C scope:global align:4 @@ -27230,7 +27230,7 @@ lbl_805209B1 = .sdata:0x805209B1; // type:object size:0x8 data:string lbl_805209B9 = .sdata:0x805209B9; // type:object size:0x1 lbl_805209BA = .sdata:0x805209BA; // type:object size:0x5 data:string lbl_805209C0 = .sdata:0x805209C0; // type:object size:0x3 data:string -lbl_805209C8 = .sdata:0x805209C8; // type:object size:0x1 data:byte +mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x805209C8; // type:object size:0x1 data:byte oneFrameRate = .sdata:0x805209D0; // type:object size:0x4 scope:global align:4 data:float oneFrameRateUser = .sdata:0x805209D4; // type:object size:0x4 scope:global align:4 data:float lbl_805209D8 = .sdata:0x805209D8; // type:object size:0x4 data:string @@ -28117,18 +28117,18 @@ lbl_80521A38 = .sbss:0x80521A38; // type:object size:0x1 data:byte sCurrentFifo__12JUTGraphFifo = .sbss:0x80521A3C; // type:object size:0x4 scope:global align:4 data:4byte lbl_80521A40 = .sbss:0x80521A40; // type:object size:0x8 sDebugPrint__10JUTDbPrint = .sbss:0x80521A48; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80521A50 = .sbss:0x80521A50; // type:object size:0x1 data:byte -lbl_80521A51 = .sbss:0x80521A51; // type:object size:0x1 data:byte +mListInitialized__10JUTGamePad = .sbss:0x80521A50; // type:object size:0x1 data:byte +mPadAssign__10JUTGamePad = .sbss:0x80521A51; // type:object size:0x4 data:byte sSuppressPadReset__10JUTGamePad = .sbss:0x80521A58; // type:object size:0x4 scope:global align:4 data:4byte sAnalogMode__10JUTGamePad = .sbss:0x80521A5C; // type:object size:0x4 scope:global align:4 data:4byte sRumbleSupported__10JUTGamePad = .sbss:0x80521A60; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80521A64 = .sbss:0x80521A64; // type:object size:0x1 data:byte +mStatus__Q210JUTGamePad7CRumble = .sbss:0x80521A64; // type:object size:0x4 data:byte mEnabled__Q210JUTGamePad7CRumble = .sbss:0x80521A68; // type:object size:0x4 scope:global align:4 data:4byte sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A6C; // type:object size:0x4 scope:global align:4 data:4byte sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A70; // type:object size:0x4 scope:global align:4 data:4byte sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A78; // type:object size:0x8 scope:global align:4 data:4byte -lbl_80521A80 = .sbss:0x80521A80; // type:object size:0x1 data:byte -lbl_80521A81 = .sbss:0x80521A81; // type:object size:0x1 data:byte +sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A80; // type:object size:0x1 data:byte +sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A81; // type:object size:0x1 data:byte sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A84; // type:object size:0x4 scope:global align:4 data:4byte sErrorManager__12JUTException = .sbss:0x80521A88; // type:object size:0x4 scope:global align:4 data:4byte sPreUserCallback__12JUTException = .sbss:0x80521A8C; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 82a639da922..fc2f52bd7dd 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -3451,7 +3451,7 @@ JSystem/JUtility/JUTResFont.cpp: JSystem/JUtility/JUTDbPrint.cpp: .text start:0x8051C3E0 end:0x8051CB70 - .sbss start:0x8074CF90 end:0x8074CF9C + .sbss start:0x8074CF90 end:0x8074CF98 .sdata2 start:0x80752718 end:0x80752728 JSystem/JUtility/JUTGamePad.cpp: @@ -3459,7 +3459,7 @@ JSystem/JUtility/JUTGamePad.cpp: .ctors start:0x8062F9C8 end:0x8062F9CC .data start:0x8070FC90 end:0x8070FD50 .sdata start:0x8074ADA8 end:0x8074ADD8 - .sbss start:0x8074CF9C end:0x8074CFD0 + .sbss start:0x8074CF98 end:0x8074CFD0 .sdata2 start:0x80752728 end:0x80752748 .bss start:0x807E20B8 end:0x807E2258 diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index 9adab8141bb..dadcd798a42 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -6,6 +6,15 @@ #include "JSystem/JUtility/JUTVideo.h" #include +inline void enter_(int param_0, int param_1, int param_2, const char* fmt, va_list args) { + char buf[0x100]; + int ret = vsnprintf(buf, 0x100, fmt, args); + if (ret < 0) { + return; + } + JUTDbPrint::getManager()->enter(param_0, param_1, param_2, buf, ret < 0x100 ? ret : 0xFF); +} + JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; mFirst = NULL; @@ -50,6 +59,11 @@ void JUTDbPrint::enter(int param_0, int param_1, int param_2, const char* param_ } } +static void dummy() { + va_list args; + enter_(0, 0, 0, 0, args); +} + void JUTDbPrint::flush() { this->flush(0, 0, JUTVideo::getManager()->getFbWidth(), JUTVideo::getManager()->getEfbHeight()); } @@ -89,27 +103,13 @@ void JUTDbPrint::drawString(int posX, int posY, int len, const u8* str) { void JUTReport(int param_0, int param_1, char const* fmt, ...) { va_list args; va_start(args, fmt); - - char buf[0x100]; - int ret = vsnprintf(buf, 0x100, fmt, args); + enter_(param_0, param_1, 1, fmt, args); va_end(args); - - if (ret < 0) { - return; - } - JUTDbPrint::sDebugPrint->enter(param_0, param_1, 1, buf, ret < 0x100 ? ret : 0xFF); } void JUTReport(int param_0, int param_1, int param_2, char const* fmt, ...) { va_list args; va_start(args, fmt); - - char buf[0x100]; - int ret = vsnprintf(buf, 0x100, fmt, args); + enter_(param_0, param_1, param_2, fmt, args); va_end(args); - - if (ret < 0) { - return; - } - JUTDbPrint::sDebugPrint->enter(param_0, param_1, param_2, buf, ret < 0x100 ? ret : 0xFF); } diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 19c3fafe0e7..efd51579100 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -10,8 +10,21 @@ #include #include +struct CallbackObject { + /* 0x00 */ JUTExceptionUserCallback callback; + /* 0x04 */ u16 error; + /* 0x08 */ OSContext* context; + /* 0x0C */ int param_3; + /* 0x10 */ int param_4; +}; + OSMessageQueue JUTException::sMessageQueue = {0}; +STATIC_ASSERT(sizeof(CallbackObject) == 0x14); +static CallbackObject exCallbackObject; + +JSUList JUTException::sMapFileList(false); + static OSTime c3bcnt[4] = {0, 0, 0, 0}; const char* JUTException::sCpuExpName[17] = { @@ -38,10 +51,16 @@ JUTException* JUTException::sErrorManager; JUTExceptionUserCallback JUTException::sPreUserCallback; - JUTExceptionUserCallback JUTException::sPostUserCallback; +JUTExceptionUserCallback JUTException::sPostUserCallback; + +#if PLATFORM_GCN +const int stack_size = 0x1C00; +#else +const int stack_size = 0x4000; +#endif JUTException::JUTException(JUTDirectPrint* directPrint) - : JKRThread(0x1C00, 0x10, 0), mDirectPrint(directPrint) { + : JKRThread(stack_size, 0x10, 0), mDirectPrint(directPrint) { OSSetErrorHandler(__OS_EXCEPTION_DSI, (OSErrorHandler)errorHandler); OSSetErrorHandler(__OS_EXCEPTION_ISI, (OSErrorHandler)errorHandler); OSSetErrorHandler(__OS_EXCEPTION_PROGRAM, (OSErrorHandler)errorHandler); @@ -74,16 +93,6 @@ JUTException* JUTException::create(JUTDirectPrint* directPrint) { OSMessage JUTException::sMessageBuffer[1] = {0}; -struct CallbackObject { - /* 0x00 */ JUTExceptionUserCallback callback; - /* 0x04 */ u16 error; - /* 0x06 */ u16 pad_0x06; - /* 0x08 */ OSContext* context; - /* 0x0C */ int param_3; - /* 0x10 */ int param_4; - /* 0x14 */ -}; - void* JUTException::run() { u32 msr = PPCMfmsr(); msr &= ~0x0900; @@ -118,9 +127,6 @@ void* JUTException::run() { } } -STATIC_ASSERT(sizeof(CallbackObject) == 0x14); -static CallbackObject exCallbackObject; - void* JUTException::sConsoleBuffer; u32 JUTException::sConsoleBufferSize; @@ -154,8 +160,6 @@ void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, OSYieldThread(); } -JSUList JUTException::sMapFileList(false); - void JUTException::panic_f_va(char const* file, int line, char const* format, va_list args) { char buffer[256]; vsnprintf(buffer, sizeof(buffer) - 1, format, args); @@ -525,12 +529,8 @@ bool JUTException::isEnablePad() const { bool JUTException::readPad(u32* out_trigger, u32* out_button) { bool result = false; OSTime start_time = OSGetTime(); - OSTime ms; do { - OSTime end_time = OSGetTime(); - OSTime ticks = end_time - start_time; - ms = ticks / (OS_TIMER_CLOCK / 1000); - } while (ms < 0x32); + } while (OSTicksToMilliseconds(OSGetTime() - start_time) < 0x32); if (mGamePad == (JUTGamePad*)0xffffffff) { JUTGamePad gamePad0(JUTGamePad::EPort1); @@ -750,24 +750,19 @@ void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u3 } void JUTException::waitTime(s32 timeout_ms) { - if (timeout_ms) { - OSTime start_time = OSGetTime(); - OSTime ms; - do { - OSTime end_time = OSGetTime(); - OSTime ticks = end_time - start_time; - ms = ticks / (OS_TIMER_CLOCK / 1000); - } while (ms < timeout_ms); + if (!timeout_ms) { + return; } + + OSTime start_time = OSGetTime(); + do { + } while (OSTicksToMilliseconds(OSGetTime() - start_time) < timeout_ms); } void JUTException::createFB() { _GXRenderModeObj* renderMode = &GXNtsc480Int; void* end = (void*)OSGetArenaHi(); - u16 width = ALIGN_NEXT(renderMode->fbWidth, 16); - u16 height = renderMode->xfbHeight; - u32 pixel_count = width * height; - u32 size = pixel_count * 2; + u32 size = (u16(ALIGN_NEXT(u16(renderMode->fbWidth), 16)) * renderMode->xfbHeight) * 2; void* begin = (void*)ALIGN_PREV((uintptr_t)end - size, 32); void* object = (void*)ALIGN_PREV((s32)begin - sizeof(JUTExternalFB), 32); @@ -807,7 +802,7 @@ void JUTException::appendMapFile(char const* path) { } for (JSUListIterator iterator = sMapFileList.getFirst(); iterator != sMapFileList.getEnd(); iterator++) { - if (strcmp(path, iterator->mPath) == 0) { + if (strcmp(path, iterator.getObject()->mPath) == 0) { return; } } diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index 1918268afc2..e633ebb0cf1 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -50,6 +50,8 @@ void JUTGamePad::initList() { u32 JUTGamePad::sSuppressPadReset; +u8 data_8074CFA4_debug; + s32 JUTGamePad::sAnalogMode; BOOL JUTGamePad::init() { @@ -80,7 +82,7 @@ u32 JUTGamePad::sRumbleSupported; u32 JUTGamePad::read() { sRumbleSupported = PADRead(mPadStatus); - switch (getClampMode()) { + switch (sClampMode) { case EClampStick: PADClamp(mPadStatus); break; @@ -89,17 +91,18 @@ u32 JUTGamePad::read() { break; } - u32 reset_mask = 0; u32 bittest; + u32 reset_mask = 0; for (int i = 0; i < 4; i++) { bittest = PAD_CHAN0_BIT >> i; if (mPadStatus[i].err == 0) { + PADStatus* pad_status = &mPadStatus[i]; u32 stick_status; - stick_status = mPadMStick[i].update(mPadStatus[i].stickX, mPadStatus[i].stickY, sStickMode, EMainStick, mPadButton[i].mButton) << 0x18; - stick_status |= (mPadSStick[i].update(mPadStatus[i].substickX, mPadStatus[i].substickY, sStickMode, ESubStick, mPadButton[i].mButton) << 0x10); + stick_status = mPadMStick[i].update(pad_status->stickX, pad_status->stickY, sStickMode, EMainStick, mPadButton[i].mButton) << 0x18; + stick_status |= (mPadSStick[i].update(pad_status->substickX, pad_status->substickY, sStickMode, ESubStick, mPadButton[i].mButton) << 0x10); - mPadButton[i].update(&mPadStatus[i], stick_status); + mPadButton[i].update(pad_status, stick_status); } else if (mPadStatus[i].err == -1) { mPadMStick[i].update(0, 0, sStickMode, EMainStick, 0); mPadSStick[i].update(0, 0, sStickMode, ESubStick, 0); @@ -109,6 +112,9 @@ u32 JUTGamePad::read() { reset_mask |= bittest; } } else { + if (data_8074CFA4_debug) { + OS_REPORT("game pad read error (%d)\n", mPadStatus[i].err); + } mPadButton[i].mTrigger = 0; mPadButton[i].mRelease = 0; mPadButton[i].mRepeat = 0; @@ -135,9 +141,11 @@ u32 JUTGamePad::read() { } if (pad->getPadRecord() != NULL && pad->getPadRecord()->isActive()) { - int port = pad->mPortNum; - if (port >= 0 && mPadStatus[port].err == 0) { - pad->getPadRecord()->write(&mPadStatus[port]); + if (pad->mPortNum >= 0) { + int port = pad->mPortNum; + if (mPadStatus[port].err == 0) { + pad->getPadRecord()->write(&mPadStatus[port]); + } } } } @@ -388,17 +396,21 @@ u32 JUTGamePad::CStick::getButton(u32 buttons) { if (-sReleasePoint < mPosX && mPosX < sReleasePoint) { button = button & ~0x3; } else if (mPosX <= -sPressPoint) { - button = (button & ~0x2) | 1; + button = (button & ~0x2); + button |= 1; } else if (mPosX >= sPressPoint) { - button = (button & ~0x1) | 2; + button = (button & ~0x1); + button |= 2; } if (-sReleasePoint < mPosY && mPosY < sReleasePoint) { button = button & ~0xC; } else if (mPosY <= -sPressPoint) { - button = (button & ~0x8) | 4; + button = (button & ~0x8); + button |= 4; } else if (mPosY >= sPressPoint) { - button = (button & ~0x4) | 8; + button = (button & ~0x4); + button |= 8; } return button; @@ -463,7 +475,7 @@ void JUTGamePad::CRumble::update(s16 port) { stopMotorHard(port); mLength = 0; } else if (mFrameCount == 0) { - if (mStatus[port] == 0) { + if (mStatus[port] == false) { startMotor(port); } return; diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/src/JSystem/JUtility/JUTVideo.cpp index b40b841c9a8..60f0ea680b6 100644 --- a/src/JSystem/JUtility/JUTVideo.cpp +++ b/src/JSystem/JUtility/JUTVideo.cpp @@ -56,9 +56,11 @@ JUTVideo::~JUTVideo() { } void JUTVideo::preRetraceProc(u32 retrace_count) { +#if PLATFORM_GCN if (!sManager) { return; } +#endif if (sManager->mPreCallback) { (*sManager->mPreCallback)(retrace_count); @@ -166,9 +168,11 @@ void JUTVideo::drawDoneCallback() { } void JUTVideo::postRetraceProc(u32 retrace_count) { +#if PLATFORM_GCN if (!sManager) { return; } +#endif if (sManager->mPostCallback != NULL) { sManager->mPostCallback(retrace_count);