diff --git a/config/ce-j/symbols.txt b/config/ce-j/symbols.txt index 4fcb496..bcecdde 100644 --- a/config/ce-j/symbols.txt +++ b/config/ce-j/symbols.txt @@ -187,15 +187,15 @@ mcardWriteAnywherePartial = .text:0x8001AB1C; // type:function size:0x1AC scope: mcardWriteAnywhere = .text:0x8001ACC8; // type:function size:0x19C scope:global mcardReadAnywhere = .text:0x8001AE64; // type:function size:0x170 scope:global mcardReadyCard = .text:0x8001AFD4; // type:function size:0x194 scope:global -mcardPoll = .text:0x8001B168; // type:function size:0xEC scope:global -mcardVerifyChecksumFileHeader = .text:0x8001B254; // type:function size:0x22C scope:global -mcardCheckChecksumFileHeader = .text:0x8001B480; // type:function size:0x314 scope:global -mcardReplaceFileBlock = .text:0x8001B794; // type:function size:0x480 scope:global -mcardSaveChecksumFileHeader = .text:0x8001BC14; // type:function size:0x35C scope:global -mcardCalculateChecksumFileBlock2 = .text:0x8001BF70; // type:function size:0x168 scope:global -mcardCalculateChecksumFileBlock1 = .text:0x8001C0D8; // type:function size:0x168 scope:global -mcardCalculateChecksum = .text:0x8001C240; // type:function size:0x60 scope:global -mcardGCErrorHandler = .text:0x8001C2A0; // type:function size:0x1A4 scope:global +mcardPoll = .text:0x8001B168; // type:function size:0xEC scope:local +mcardVerifyChecksumFileHeader = .text:0x8001B254; // type:function size:0x22C scope:local +mcardCheckChecksumFileHeader = .text:0x8001B480; // type:function size:0x314 scope:local +mcardReplaceFileBlock = .text:0x8001B794; // type:function size:0x480 scope:local +mcardSaveChecksumFileHeader = .text:0x8001BC14; // type:function size:0x35C scope:local +mcardCalculateChecksumFileBlock2 = .text:0x8001BF70; // type:function size:0x168 scope:local +mcardCalculateChecksumFileBlock1 = .text:0x8001C0D8; // type:function size:0x168 scope:local +mcardCalculateChecksum = .text:0x8001C240; // type:function size:0x60 scope:local +mcardGCErrorHandler = .text:0x8001C2A0; // type:function size:0x1A4 scope:local codeEvent = .text:0x8001C444; // type:function size:0x54 scope:global soundEvent = .text:0x8001C498; // type:function size:0x1F8 scope:global soundPlayBeep = .text:0x8001C690; // type:function size:0x7C scope:global @@ -566,15 +566,15 @@ rspObjLoadTxtr = .text:0x800797D0; // type:function size:0x44C scope:global rspFillObjTxtr = .text:0x80079C1C; // type:function size:0x160 scope:global guS2DEmuBgRect1Cyc = .text:0x80079D7C; // type:function size:0x73C scope:global tmemLoad = .text:0x8007A4B8; // type:function size:0x270 scope:global -tmemLoad_A = .text:0x8007A728; // type:function size:0xAC scope:global -tmemLoad_B = .text:0x8007A7D4; // type:function size:0x114 scope:global +tmemLoad_A = .text:0x8007A728; // type:function size:0xAC scope:local +tmemLoad_B = .text:0x8007A7D4; // type:function size:0x114 scope:local rspSetImage = .text:0x8007A8E8; // type:function size:0x94 scope:global rspFillObjBg = .text:0x8007A97C; // type:function size:0xF8 scope:global rspFillObjBgScale = .text:0x8007AA74; // type:function size:0xE0 scope:global -rspFillObjSprite = .text:0x8007AB54; // type:function size:0xC8 scope:global +rspFillObjSprite = .text:0x8007AB54; // type:function size:0xC8 scope:local Matrix4by4Identity = .text:0x8007AC1C; // type:function size:0x50 scope:global -rspParseJPEG_DecodeZ = .text:0x8007AC6C; // type:function size:0xFC scope:global -rspParseJPEG_EncodeZ = .text:0x8007AD68; // type:function size:0xFC scope:global +rspParseJPEG_DecodeZ = .text:0x8007AC6C; // type:function size:0xFC scope:local +rspParseJPEG_EncodeZ = .text:0x8007AD68; // type:function size:0xFC scope:local rspRecon420Z = .text:0x8007AE64; // type:function size:0x3E0 scope:global rspUndoRecon420Z = .text:0x8007B244; // type:function size:0x408 scope:global rspUndoLoadColorBufferZ = .text:0x8007B64C; // type:function size:0x94 scope:global @@ -1689,24 +1689,24 @@ __close_console = .text:0x800D0E88; // type:function size:0x8 scope:global __write_console = .text:0x800D0E90; // type:function size:0x98 scope:global __read_console = .text:0x800D0F28; // type:function size:0xE0 scope:global fwide = .text:0x800D1008; // type:function size:0x80 scope:global -fabs__Fd = .text:0x800D1088; // type:function size:0x8 scope:weak +fabs__Fd = .text:0x800D1088; // type:function size:0x8 scope:global __ieee754_pow = .text:0x800D1090; // type:function size:0x818 scope:global -scalbn = .text:0x800D18A8; // type:function size:0x20 scope:weak -__fpclassifyd__Fd = .text:0x800D18C8; // type:function size:0x80 scope:weak +scalbn = .text:0x800D18A8; // type:function size:0x20 scope:global +__fpclassifyd__Fd = .text:0x800D18C8; // type:function size:0x80 scope:global ceil = .text:0x800D1948; // type:function size:0x168 scope:global copysign = .text:0x800D1AB0; // type:function size:0x2C scope:global floor = .text:0x800D1ADC; // type:function size:0x16C scope:global frexp = .text:0x800D1C48; // type:function size:0x9C scope:global ldexp = .text:0x800D1CE4; // type:function size:0x178 scope:global pow = .text:0x800D1E5C; // type:function size:0x20 scope:global -fabsf__Ff = .text:0x800D1E7C; // type:function size:0x8 scope:weak +fabsf__Ff = .text:0x800D1E7C; // type:function size:0x8 scope:global log10f = .text:0x800D1E84; // type:function size:0x1D4 scope:global tanf = .text:0x800D2058; // type:function size:0x44 scope:global -cos__Ff = .text:0x800D209C; // type:function size:0x20 scope:weak -sin__Ff = .text:0x800D20BC; // type:function size:0x20 scope:weak +cos__Ff = .text:0x800D209C; // type:function size:0x20 scope:global +sin__Ff = .text:0x800D20BC; // type:function size:0x20 scope:global cosf = .text:0x800D20DC; // type:function size:0x194 scope:global sinf = .text:0x800D2270; // type:function size:0x1A4 scope:global -__sinit_trigf_c = .text:0x800D2414; // type:function size:0x30 scope:local +__sinit_trigf_c = .text:0x800D2414; // type:function size:0x30 scope:global sqrt = .text:0x800D2444; // type:function size:0x90 scope:global EXI2_Init = .text:0x800D24D4; // type:function size:0x4 scope:global EXI2_EnableInterrupts = .text:0x800D24D8; // type:function size:0x4 scope:global @@ -1732,6 +1732,7 @@ DBGReadMailbox = .text:0x800D2C40; // type:function size:0xAC scope:local DBGEXIImm = .text:0x800D2CEC; // type:function size:0x298 scope:local Hu_IsStub = .text:0x800D2F84; // type:function size:0x8 scope:global _ctors = .ctors:0x800D2FA0; // type:label scope:global data:4byte +__sinit_trigf_c_reference = .ctors:0x800D2FA0; // type:object size:0x4 scope:global __destroy_global_chain_reference = .dtors:0x800D2FC0; // type:object size:0x4 scope:global _dtors = .dtors:0x800D2FC0; // type:label scope:global data:4byte @36 = .rodata:0x800D2FE0; // type:object size:0x30 scope:local data:4byte @@ -1767,9 +1768,9 @@ bp = .rodata:0x800D36C0; // type:object size:0x10 scope:local data:double dp_h = .rodata:0x800D36D0; // type:object size:0x10 scope:local dp_l = .rodata:0x800D36E0; // type:object size:0x10 scope:local ...rodata.0 = .rodata:0x800D36F0; // type:label scope:local -_log10_poly = .rodata:0x800D36F0; // type:object size:0x10 scope:local data:float +_log10_poly = .rodata:0x800D36F0; // type:object size:0x10 scope:global data:float ...rodata.0 = .rodata:0x800D3700; // type:label scope:local -tmp_float = .rodata:0x800D3700; // type:object size:0x10 scope:local data:float +tmp_float = .rodata:0x800D3700; // type:object size:0x10 scope:global data:float ...data.0 = .data:0x800D3720; // type:label scope:local gTgPcTPL = .data:0x800D3720; // type:object size:0x8081 scope:global @136 = .data:0x800DB7A4; // type:object size:0xC scope:local data:string @@ -2420,11 +2421,11 @@ GXDefaultVATList = .data:0x800F1B40; // type:object size:0xD0 scope:local GXDefaultProjData = .data:0x800F1C10; // type:object size:0x1C scope:local GXTexRegionAddrTable = .data:0x800F1C2C; // type:object size:0xC0 scope:local data:4byte GXResetFuncInfo = .data:0x800F1CEC; // type:object size:0x10 scope:local -@65 = .data:0x800F1D00; // type:object size:0x68 scope:local -@125 = .data:0x800F1D68; // type:object size:0x44 scope:local -@153 = .data:0x800F1DAC; // type:object size:0x44 scope:local -@235 = .data:0x800F1DF0; // type:object size:0x1C scope:local -@234 = .data:0x800F1E0C; // type:object size:0x54 scope:local +@73 = .data:0x800F1D00; // type:object size:0x68 scope:local +@133 = .data:0x800F1D68; // type:object size:0x44 scope:local +@161 = .data:0x800F1DAC; // type:object size:0x44 scope:local +@307 = .data:0x800F1DF0; // type:object size:0x1C scope:local +@306 = .data:0x800F1E0C; // type:object size:0x54 scope:local GXNtsc480IntDf = .data:0x800F1E60; // type:object size:0x3C scope:global GXNtsc480Prog = .data:0x800F1E9C; // type:object size:0x3C scope:global GXMpal480IntDf = .data:0x800F1ED8; // type:object size:0x3C scope:global @@ -2533,7 +2534,7 @@ __files = .data:0x800F3B38; // type:object size:0xD8 scope:global __float_nan = .data:0x800F3E78; // type:object size:0x4 scope:global data:float __float_huge = .data:0x800F3E7C; // type:object size:0x4 scope:global data:float ...data.0 = .data:0x800F3E80; // type:label scope:local -__four_over_pi_m1 = .data:0x800F3E80; // type:object size:0x10 scope:local data:float +__four_over_pi_m1 = .data:0x800F3E80; // type:object size:0x10 scope:global data:float __sincos_on_quadrant = .data:0x800F3E90; // type:object size:0x20 scope:global __sincos_poly = .data:0x800F3EB0; // type:object size:0x28 scope:global data:float rmodeobj = .bss:0x800F3EE0; // type:object size:0x3C scope:local @@ -3007,9 +3008,9 @@ __VIVersion = .sdata:0x80135458; // type:object size:0x4 scope:global data:4byte @465 = .sdata:0x8013545C; // type:object size:0x5 scope:local data:string Unit01 = .sdata:0x80135468; // type:object size:0x8 scope:local __GXVersion = .sdata:0x80135470; // type:object size:0x4 scope:global data:4byte -tbl1$78 = .sdata:0x80135478; // type:object size:0x4 scope:local -tbl2$79 = .sdata:0x8013547C; // type:object size:0x4 scope:local -tbl3$80 = .sdata:0x80135480; // type:object size:0x4 scope:local +tbl1$86 = .sdata:0x80135478; // type:object size:0x4 scope:local +tbl2$87 = .sdata:0x8013547C; // type:object size:0x4 scope:local +tbl3$88 = .sdata:0x80135480; // type:object size:0x4 scope:local GXTexMode0Ids = .sdata:0x80135488; // type:object size:0x8 scope:local GXTexMode1Ids = .sdata:0x80135490; // type:object size:0x8 scope:local GXTexImage0Ids = .sdata:0x80135498; // type:object size:0x8 scope:local @@ -3409,7 +3410,7 @@ __atexit_curr_func = .sbss:0x80135CC8; // type:object size:0x4 scope:local data: __stdio_exit = .sbss:0x80135CCC; // type:object size:0x4 scope:local data:4byte __console_exit = .sbss:0x80135CD0; // type:object size:0x4 scope:local data:4byte errno = .sbss:0x80135CD8; // type:object size:0x4 scope:global data:4byte -initialized$16 = .sbss:0x80135CE0; // type:object size:0x4 scope:local data:4byte +initialized$30 = .sbss:0x80135CE0; // type:object size:0x4 scope:local data:4byte MTRCallback = .sbss:0x80135CE8; // type:object size:0x4 scope:local data:4byte DBGCallback = .sbss:0x80135CEC; // type:object size:0x4 scope:local data:4byte SendMailData = .sbss:0x80135CF0; // type:object size:0x4 scope:local data:4byte @@ -3624,14 +3625,14 @@ D_801360D8 = .sdata2:0x801360D8; // type:object size:0x8 scope:local data:4byte @25 = .sdata2:0x801360F8; // type:object size:0x4 scope:local data:float @26 = .sdata2:0x801360FC; // type:object size:0x4 scope:local data:float __GXData = .sdata2:0x80136100; // type:object size:0x4 scope:global data:4byte -@149 = .sdata2:0x80136104; // type:object size:0x4 scope:local data:float -@150 = .sdata2:0x80136108; // type:object size:0x4 scope:local data:float -@151 = .sdata2:0x8013610C; // type:object size:0x4 scope:local data:4byte -@152 = .sdata2:0x80136110; // type:object size:0x4 scope:local data:4byte -@153 = .sdata2:0x80136114; // type:object size:0x4 scope:local data:4byte -@205 = .sdata2:0x80136118; // type:object size:0x4 scope:local data:float -@206 = .sdata2:0x8013611C; // type:object size:0x4 scope:local data:float -@208 = .sdata2:0x80136120; // type:object size:0x8 scope:local data:double +@293 = .sdata2:0x80136104; // type:object size:0x4 scope:local data:float +@294 = .sdata2:0x80136108; // type:object size:0x4 scope:local data:float +@295 = .sdata2:0x8013610C; // type:object size:0x4 scope:local data:4byte +@296 = .sdata2:0x80136110; // type:object size:0x4 scope:local data:4byte +@297 = .sdata2:0x80136114; // type:object size:0x4 scope:local data:4byte +@349 = .sdata2:0x80136118; // type:object size:0x4 scope:local data:float +@350 = .sdata2:0x8013611C; // type:object size:0x4 scope:local data:float +@352 = .sdata2:0x80136120; // type:object size:0x8 scope:local data:double @124 = .sdata2:0x80136128; // type:object size:0x4 scope:local data:float @126 = .sdata2:0x80136130; // type:object size:0x8 scope:local data:double @130 = .sdata2:0x80136138; // type:object size:0x4 scope:local data:float @@ -3682,61 +3683,61 @@ __GXData = .sdata2:0x80136100; // type:object size:0x4 scope:global data:4byte @362 = .sdata2:0x80136258; // type:object size:0x8 scope:local data:double @363 = .sdata2:0x80136260; // type:object size:0x8 scope:local data:double @919 = .sdata2:0x80136268; // type:object size:0x8 scope:local data:double -@375 = .sdata2:0x80136270; // type:object size:0x8 scope:local data:double -@376 = .sdata2:0x80136278; // type:object size:0x8 scope:local data:double -@377 = .sdata2:0x80136280; // type:object size:0x8 scope:local data:double -@378 = .sdata2:0x80136288; // type:object size:0x8 scope:local data:double -@379 = .sdata2:0x80136290; // type:object size:0x8 scope:local data:double -@380 = .sdata2:0x80136298; // type:object size:0x8 scope:local data:double -@381 = .sdata2:0x801362A0; // type:object size:0x8 scope:local data:double -@382 = .sdata2:0x801362A8; // type:object size:0x8 scope:local data:double -@383 = .sdata2:0x801362B0; // type:object size:0x8 scope:local data:double -@384 = .sdata2:0x801362B8; // type:object size:0x8 scope:local data:double -@385 = .sdata2:0x801362C0; // type:object size:0x8 scope:local data:double -@386 = .sdata2:0x801362C8; // type:object size:0x8 scope:local data:double -@387 = .sdata2:0x801362D0; // type:object size:0x8 scope:local data:double -@388 = .sdata2:0x801362D8; // type:object size:0x8 scope:local data:double -@389 = .sdata2:0x801362E0; // type:object size:0x8 scope:local data:double -@390 = .sdata2:0x801362E8; // type:object size:0x8 scope:local data:double -@391 = .sdata2:0x801362F0; // type:object size:0x8 scope:local data:double -@392 = .sdata2:0x801362F8; // type:object size:0x8 scope:local data:double -@393 = .sdata2:0x80136300; // type:object size:0x8 scope:local data:double -@394 = .sdata2:0x80136308; // type:object size:0x8 scope:local data:double -@395 = .sdata2:0x80136310; // type:object size:0x8 scope:local data:double -@396 = .sdata2:0x80136318; // type:object size:0x8 scope:local data:double -@397 = .sdata2:0x80136320; // type:object size:0x8 scope:local data:double -@398 = .sdata2:0x80136328; // type:object size:0x8 scope:local data:double -@399 = .sdata2:0x80136330; // type:object size:0x8 scope:local data:double -@400 = .sdata2:0x80136338; // type:object size:0x8 scope:local data:double -@401 = .sdata2:0x80136340; // type:object size:0x8 scope:local data:double -@402 = .sdata2:0x80136348; // type:object size:0x8 scope:local data:double -@403 = .sdata2:0x80136350; // type:object size:0x8 scope:local data:double -@404 = .sdata2:0x80136358; // type:object size:0x8 scope:local data:double -@405 = .sdata2:0x80136360; // type:object size:0x8 scope:local data:double -@406 = .sdata2:0x80136368; // type:object size:0x8 scope:local data:double -@407 = .sdata2:0x80136370; // type:object size:0x8 scope:local data:double -@409 = .sdata2:0x80136378; // type:object size:0x8 scope:local data:double -@166 = .sdata2:0x80136380; // type:object size:0x8 scope:local data:double -@167 = .sdata2:0x80136388; // type:object size:0x8 scope:local data:double -@166 = .sdata2:0x80136390; // type:object size:0x8 scope:local data:double -@167 = .sdata2:0x80136398; // type:object size:0x8 scope:local data:double -@100 = .sdata2:0x801363A0; // type:object size:0x8 scope:local data:double -@131 = .sdata2:0x801363A8; // type:object size:0x8 scope:local data:double -@132 = .sdata2:0x801363B0; // type:object size:0x8 scope:local data:double -@133 = .sdata2:0x801363B8; // type:object size:0x8 scope:local data:double -@134 = .sdata2:0x801363C0; // type:object size:0x8 scope:local data:double -@135 = .sdata2:0x801363C8; // type:object size:0x8 scope:local data:double -@128 = .sdata2:0x801363D0; // type:object size:0x4 scope:local data:float -@129 = .sdata2:0x801363D4; // type:object size:0x4 scope:local data:float -@130 = .sdata2:0x801363D8; // type:object size:0x4 scope:local data:float -@131 = .sdata2:0x801363DC; // type:object size:0x4 scope:local data:float -@132 = .sdata2:0x801363E0; // type:object size:0x4 scope:local data:float -@133 = .sdata2:0x801363E4; // type:object size:0x4 scope:local data:float -@135 = .sdata2:0x801363E8; // type:object size:0x8 scope:local data:double -@106 = .sdata2:0x801363F0; // type:object size:0x4 scope:local data:float -@107 = .sdata2:0x801363F4; // type:object size:0x4 scope:local data:float -@108 = .sdata2:0x801363F8; // type:object size:0x4 scope:local data:float -@110 = .sdata2:0x80136400; // type:object size:0x8 scope:local data:double -@106 = .sdata2:0x80136408; // type:object size:0x8 scope:local data:double -@107 = .sdata2:0x80136410; // type:object size:0x8 scope:local data:double -@108 = .sdata2:0x80136418; // type:object size:0x8 scope:local data:double +@302 = .sdata2:0x80136270; // type:object size:0x8 scope:local data:double +@303 = .sdata2:0x80136278; // type:object size:0x8 scope:local data:double +@304 = .sdata2:0x80136280; // type:object size:0x8 scope:local data:double +@305 = .sdata2:0x80136288; // type:object size:0x8 scope:local data:double +@306 = .sdata2:0x80136290; // type:object size:0x8 scope:local data:double +@307 = .sdata2:0x80136298; // type:object size:0x8 scope:local data:double +@308 = .sdata2:0x801362A0; // type:object size:0x8 scope:local data:double +@309 = .sdata2:0x801362A8; // type:object size:0x8 scope:local data:double +@310 = .sdata2:0x801362B0; // type:object size:0x8 scope:local data:double +@311 = .sdata2:0x801362B8; // type:object size:0x8 scope:local data:double +@312 = .sdata2:0x801362C0; // type:object size:0x8 scope:local data:double +@313 = .sdata2:0x801362C8; // type:object size:0x8 scope:local data:double +@314 = .sdata2:0x801362D0; // type:object size:0x8 scope:local data:double +@315 = .sdata2:0x801362D8; // type:object size:0x8 scope:local data:double +@316 = .sdata2:0x801362E0; // type:object size:0x8 scope:local data:double +@317 = .sdata2:0x801362E8; // type:object size:0x8 scope:local data:double +@318 = .sdata2:0x801362F0; // type:object size:0x8 scope:local data:double +@319 = .sdata2:0x801362F8; // type:object size:0x8 scope:local data:double +@320 = .sdata2:0x80136300; // type:object size:0x8 scope:local data:double +@321 = .sdata2:0x80136308; // type:object size:0x8 scope:local data:double +@322 = .sdata2:0x80136310; // type:object size:0x8 scope:local data:double +@323 = .sdata2:0x80136318; // type:object size:0x8 scope:local data:double +@324 = .sdata2:0x80136320; // type:object size:0x8 scope:local data:double +@325 = .sdata2:0x80136328; // type:object size:0x8 scope:local data:double +@326 = .sdata2:0x80136330; // type:object size:0x8 scope:local data:double +@327 = .sdata2:0x80136338; // type:object size:0x8 scope:local data:double +@328 = .sdata2:0x80136340; // type:object size:0x8 scope:local data:double +@329 = .sdata2:0x80136348; // type:object size:0x8 scope:local data:double +@330 = .sdata2:0x80136350; // type:object size:0x8 scope:local data:double +@331 = .sdata2:0x80136358; // type:object size:0x8 scope:local data:double +@332 = .sdata2:0x80136360; // type:object size:0x8 scope:local data:double +@333 = .sdata2:0x80136368; // type:object size:0x8 scope:local data:double +@334 = .sdata2:0x80136370; // type:object size:0x8 scope:local data:double +@336 = .sdata2:0x80136378; // type:object size:0x8 scope:local data:double +@101 = .sdata2:0x80136380; // type:object size:0x8 scope:local data:double +@102 = .sdata2:0x80136388; // type:object size:0x8 scope:local data:double +@101 = .sdata2:0x80136390; // type:object size:0x8 scope:local data:double +@102 = .sdata2:0x80136398; // type:object size:0x8 scope:local data:double +@35 = .sdata2:0x801363A0; // type:object size:0x8 scope:local data:double +@66 = .sdata2:0x801363A8; // type:object size:0x8 scope:local data:double +@67 = .sdata2:0x801363B0; // type:object size:0x8 scope:local data:double +@68 = .sdata2:0x801363B8; // type:object size:0x8 scope:local data:double +@69 = .sdata2:0x801363C0; // type:object size:0x8 scope:local data:double +@70 = .sdata2:0x801363C8; // type:object size:0x8 scope:local data:double +@59 = .sdata2:0x801363D0; // type:object size:0x4 scope:local data:float +@60 = .sdata2:0x801363D4; // type:object size:0x4 scope:local data:float +@61 = .sdata2:0x801363D8; // type:object size:0x4 scope:local data:float +@62 = .sdata2:0x801363DC; // type:object size:0x4 scope:local data:float +@63 = .sdata2:0x801363E0; // type:object size:0x4 scope:local data:float +@64 = .sdata2:0x801363E4; // type:object size:0x4 scope:local data:float +@66 = .sdata2:0x801363E8; // type:object size:0x8 scope:local data:double +@44 = .sdata2:0x801363F0; // type:object size:0x4 scope:local data:float +@45 = .sdata2:0x801363F4; // type:object size:0x4 scope:local data:float +@46 = .sdata2:0x801363F8; // type:object size:0x4 scope:local data:float +@48 = .sdata2:0x80136400; // type:object size:0x8 scope:local data:double +@28 = .sdata2:0x80136408; // type:object size:0x8 scope:local data:double +@29 = .sdata2:0x80136410; // type:object size:0x8 scope:local data:double +@30 = .sdata2:0x80136418; // type:object size:0x8 scope:local data:double diff --git a/config/ce-u/symbols.txt b/config/ce-u/symbols.txt index 3439fa9..e5dc363 100644 --- a/config/ce-u/symbols.txt +++ b/config/ce-u/symbols.txt @@ -1688,24 +1688,24 @@ __close_console = .text:0x800D0F04; // type:function size:0x8 scope:global __write_console = .text:0x800D0F0C; // type:function size:0x98 scope:global __read_console = .text:0x800D0FA4; // type:function size:0xE0 scope:global fwide = .text:0x800D1084; // type:function size:0x80 scope:global -fabs__Fd = .text:0x800D1104; // type:function size:0x8 scope:weak +fabs__Fd = .text:0x800D1104; // type:function size:0x8 scope:global __ieee754_pow = .text:0x800D110C; // type:function size:0x818 scope:global -scalbn = .text:0x800D1924; // type:function size:0x20 scope:weak -__fpclassifyd__Fd = .text:0x800D1944; // type:function size:0x80 scope:weak +scalbn = .text:0x800D1924; // type:function size:0x20 scope:global +__fpclassifyd__Fd = .text:0x800D1944; // type:function size:0x80 scope:global ceil = .text:0x800D19C4; // type:function size:0x168 scope:global copysign = .text:0x800D1B2C; // type:function size:0x2C scope:global floor = .text:0x800D1B58; // type:function size:0x16C scope:global frexp = .text:0x800D1CC4; // type:function size:0x9C scope:global ldexp = .text:0x800D1D60; // type:function size:0x178 scope:global pow = .text:0x800D1ED8; // type:function size:0x20 scope:global -fabsf__Ff = .text:0x800D1EF8; // type:function size:0x8 scope:weak +fabsf__Ff = .text:0x800D1EF8; // type:function size:0x8 scope:global log10f = .text:0x800D1F00; // type:function size:0x1D4 scope:global tanf = .text:0x800D20D4; // type:function size:0x44 scope:global -cos__Ff = .text:0x800D2118; // type:function size:0x20 scope:weak -sin__Ff = .text:0x800D2138; // type:function size:0x20 scope:weak +cos__Ff = .text:0x800D2118; // type:function size:0x20 scope:global +sin__Ff = .text:0x800D2138; // type:function size:0x20 scope:global cosf = .text:0x800D2158; // type:function size:0x194 scope:global sinf = .text:0x800D22EC; // type:function size:0x1A4 scope:global -__sinit_trigf_c = .text:0x800D2490; // type:function size:0x30 scope:local +__sinit_trigf_c = .text:0x800D2490; // type:function size:0x30 scope:global sqrt = .text:0x800D24C0; // type:function size:0x90 scope:global EXI2_Init = .text:0x800D2550; // type:function size:0x4 scope:global EXI2_EnableInterrupts = .text:0x800D2554; // type:function size:0x4 scope:global @@ -1731,6 +1731,7 @@ DBGReadMailbox = .text:0x800D2CBC; // type:function size:0xAC scope:local DBGEXIImm = .text:0x800D2D68; // type:function size:0x298 scope:local Hu_IsStub = .text:0x800D3000; // type:function size:0x8 scope:global _ctors = .ctors:0x800D3020; // type:label scope:global data:4byte +__sinit_trigf_c_reference = .ctors:0x800D3020; // type:object size:0x4 scope:global __destroy_global_chain_reference = .dtors:0x800D3040; // type:object size:0x4 scope:global _dtors = .dtors:0x800D3040; // type:label scope:global data:4byte @36 = .rodata:0x800D3060; // type:object size:0x30 scope:local data:4byte @@ -1766,9 +1767,9 @@ bp = .rodata:0x800D3740; // type:object size:0x10 scope:local data:double dp_h = .rodata:0x800D3750; // type:object size:0x10 scope:local dp_l = .rodata:0x800D3760; // type:object size:0x10 scope:local ...rodata.0 = .rodata:0x800D3770; // type:label scope:local -_log10_poly = .rodata:0x800D3770; // type:object size:0x10 scope:local data:float +_log10_poly = .rodata:0x800D3770; // type:object size:0x10 scope:global data:float ...rodata.0 = .rodata:0x800D3780; // type:label scope:local -tmp_float = .rodata:0x800D3780; // type:object size:0x10 scope:local data:float +tmp_float = .rodata:0x800D3780; // type:object size:0x10 scope:global data:float ...data.0 = .data:0x800D37A0; // type:label scope:local gTgPcTPL = .data:0x800D37A0; // type:object size:0x8081 scope:global align:32 @136 = .data:0x800DB824; // type:object size:0xC scope:local data:string @@ -2419,11 +2420,11 @@ GXDefaultVATList = .data:0x800F4040; // type:object size:0xD0 scope:local GXDefaultProjData = .data:0x800F4110; // type:object size:0x1C scope:local GXTexRegionAddrTable = .data:0x800F412C; // type:object size:0xC0 scope:local data:4byte GXResetFuncInfo = .data:0x800F41EC; // type:object size:0x10 scope:local -@65 = .data:0x800F4200; // type:object size:0x68 scope:local -@125 = .data:0x800F4268; // type:object size:0x44 scope:local -@153 = .data:0x800F42AC; // type:object size:0x44 scope:local -@235 = .data:0x800F42F0; // type:object size:0x1C scope:local -@234 = .data:0x800F430C; // type:object size:0x54 scope:local +@73 = .data:0x800F4200; // type:object size:0x68 scope:local +@133 = .data:0x800F4268; // type:object size:0x44 scope:local +@161 = .data:0x800F42AC; // type:object size:0x44 scope:local +@307 = .data:0x800F42F0; // type:object size:0x1C scope:local +@306 = .data:0x800F430C; // type:object size:0x54 scope:local GXNtsc480IntDf = .data:0x800F4360; // type:object size:0x3C scope:global GXNtsc480Prog = .data:0x800F439C; // type:object size:0x3C scope:global GXMpal480IntDf = .data:0x800F43D8; // type:object size:0x3C scope:global @@ -2532,7 +2533,7 @@ __files = .data:0x800F6038; // type:object size:0xD8 scope:global __float_nan = .data:0x800F6378; // type:object size:0x4 scope:global data:float __float_huge = .data:0x800F637C; // type:object size:0x4 scope:global data:float ...data.0 = .data:0x800F6380; // type:label scope:local -__four_over_pi_m1 = .data:0x800F6380; // type:object size:0x10 scope:local data:float +__four_over_pi_m1 = .data:0x800F6380; // type:object size:0x10 scope:global data:float __sincos_on_quadrant = .data:0x800F6390; // type:object size:0x20 scope:global __sincos_poly = .data:0x800F63B0; // type:object size:0x28 scope:global data:float rmodeobj = .bss:0x800F63E0; // type:object size:0x3C scope:local @@ -3006,9 +3007,9 @@ __VIVersion = .sdata:0x80137958; // type:object size:0x4 scope:global data:4byte @465 = .sdata:0x8013795C; // type:object size:0x5 scope:local data:string Unit01 = .sdata:0x80137968; // type:object size:0x8 scope:local __GXVersion = .sdata:0x80137970; // type:object size:0x4 scope:global data:4byte -tbl1$78 = .sdata:0x80137978; // type:object size:0x4 scope:local -tbl2$79 = .sdata:0x8013797C; // type:object size:0x4 scope:local -tbl3$80 = .sdata:0x80137980; // type:object size:0x4 scope:local +tbl1$86 = .sdata:0x80137978; // type:object size:0x4 scope:local +tbl2$87 = .sdata:0x8013797C; // type:object size:0x4 scope:local +tbl3$88 = .sdata:0x80137980; // type:object size:0x4 scope:local GXTexMode0Ids = .sdata:0x80137988; // type:object size:0x8 scope:local GXTexMode1Ids = .sdata:0x80137990; // type:object size:0x8 scope:local GXTexImage0Ids = .sdata:0x80137998; // type:object size:0x8 scope:local @@ -3408,7 +3409,7 @@ __atexit_curr_func = .sbss:0x801381C8; // type:object size:0x4 scope:local data: __stdio_exit = .sbss:0x801381CC; // type:object size:0x4 scope:local data:4byte __console_exit = .sbss:0x801381D0; // type:object size:0x4 scope:local data:4byte errno = .sbss:0x801381D8; // type:object size:0x4 scope:global data:4byte -initialized$16 = .sbss:0x801381E0; // type:object size:0x4 scope:local data:4byte +initialized$30 = .sbss:0x801381E0; // type:object size:0x4 scope:local data:4byte MTRCallback = .sbss:0x801381E8; // type:object size:0x4 scope:local data:4byte DBGCallback = .sbss:0x801381EC; // type:object size:0x4 scope:local data:4byte SendMailData = .sbss:0x801381F0; // type:object size:0x4 scope:local data:4byte @@ -3623,14 +3624,14 @@ D_80135D00 = .sdata2:0x80138200; // type:object size:0x4 scope:global data:4byte @25 = .sdata2:0x801385F8; // type:object size:0x4 scope:local data:float @26 = .sdata2:0x801385FC; // type:object size:0x4 scope:local data:float __GXData = .sdata2:0x80138600; // type:object size:0x4 scope:global data:4byte -@149 = .sdata2:0x80138604; // type:object size:0x4 scope:local data:float -@150 = .sdata2:0x80138608; // type:object size:0x4 scope:local data:float -@151 = .sdata2:0x8013860C; // type:object size:0x4 scope:local data:4byte -@152 = .sdata2:0x80138610; // type:object size:0x4 scope:local data:4byte -@153 = .sdata2:0x80138614; // type:object size:0x4 scope:local data:4byte -@205 = .sdata2:0x80138618; // type:object size:0x4 scope:local data:float -@206 = .sdata2:0x8013861C; // type:object size:0x4 scope:local data:float -@208 = .sdata2:0x80138620; // type:object size:0x8 scope:local data:double +@293 = .sdata2:0x80138604; // type:object size:0x4 scope:local data:float +@294 = .sdata2:0x80138608; // type:object size:0x4 scope:local data:float +@295 = .sdata2:0x8013860C; // type:object size:0x4 scope:local data:4byte +@296 = .sdata2:0x80138610; // type:object size:0x4 scope:local data:4byte +@297 = .sdata2:0x80138614; // type:object size:0x4 scope:local data:4byte +@349 = .sdata2:0x80138618; // type:object size:0x4 scope:local data:float +@350 = .sdata2:0x8013861C; // type:object size:0x4 scope:local data:float +@352 = .sdata2:0x80138620; // type:object size:0x8 scope:local data:double @124 = .sdata2:0x80138628; // type:object size:0x4 scope:local data:float @126 = .sdata2:0x80138630; // type:object size:0x8 scope:local data:double @130 = .sdata2:0x80138638; // type:object size:0x4 scope:local data:float @@ -3681,61 +3682,61 @@ __GXData = .sdata2:0x80138600; // type:object size:0x4 scope:global data:4byte @362 = .sdata2:0x80138758; // type:object size:0x8 scope:local data:double @363 = .sdata2:0x80138760; // type:object size:0x8 scope:local data:double @919 = .sdata2:0x80138768; // type:object size:0x8 scope:local data:double -@375 = .sdata2:0x80138770; // type:object size:0x8 scope:local data:double -@376 = .sdata2:0x80138778; // type:object size:0x8 scope:local data:double -@377 = .sdata2:0x80138780; // type:object size:0x8 scope:local data:double -@378 = .sdata2:0x80138788; // type:object size:0x8 scope:local data:double -@379 = .sdata2:0x80138790; // type:object size:0x8 scope:local data:double -@380 = .sdata2:0x80138798; // type:object size:0x8 scope:local data:double -@381 = .sdata2:0x801387A0; // type:object size:0x8 scope:local data:double -@382 = .sdata2:0x801387A8; // type:object size:0x8 scope:local data:double -@383 = .sdata2:0x801387B0; // type:object size:0x8 scope:local data:double -@384 = .sdata2:0x801387B8; // type:object size:0x8 scope:local data:double -@385 = .sdata2:0x801387C0; // type:object size:0x8 scope:local data:double -@386 = .sdata2:0x801387C8; // type:object size:0x8 scope:local data:double -@387 = .sdata2:0x801387D0; // type:object size:0x8 scope:local data:double -@388 = .sdata2:0x801387D8; // type:object size:0x8 scope:local data:double -@389 = .sdata2:0x801387E0; // type:object size:0x8 scope:local data:double -@390 = .sdata2:0x801387E8; // type:object size:0x8 scope:local data:double -@391 = .sdata2:0x801387F0; // type:object size:0x8 scope:local data:double -@392 = .sdata2:0x801387F8; // type:object size:0x8 scope:local data:double -@393 = .sdata2:0x80138800; // type:object size:0x8 scope:local data:double -@394 = .sdata2:0x80138808; // type:object size:0x8 scope:local data:double -@395 = .sdata2:0x80138810; // type:object size:0x8 scope:local data:double -@396 = .sdata2:0x80138818; // type:object size:0x8 scope:local data:double -@397 = .sdata2:0x80138820; // type:object size:0x8 scope:local data:double -@398 = .sdata2:0x80138828; // type:object size:0x8 scope:local data:double -@399 = .sdata2:0x80138830; // type:object size:0x8 scope:local data:double -@400 = .sdata2:0x80138838; // type:object size:0x8 scope:local data:double -@401 = .sdata2:0x80138840; // type:object size:0x8 scope:local data:double -@402 = .sdata2:0x80138848; // type:object size:0x8 scope:local data:double -@403 = .sdata2:0x80138850; // type:object size:0x8 scope:local data:double -@404 = .sdata2:0x80138858; // type:object size:0x8 scope:local data:double -@405 = .sdata2:0x80138860; // type:object size:0x8 scope:local data:double -@406 = .sdata2:0x80138868; // type:object size:0x8 scope:local data:double -@407 = .sdata2:0x80138870; // type:object size:0x8 scope:local data:double -@409 = .sdata2:0x80138878; // type:object size:0x8 scope:local data:double -@166 = .sdata2:0x80138880; // type:object size:0x8 scope:local data:double -@167 = .sdata2:0x80138888; // type:object size:0x8 scope:local data:double -@166 = .sdata2:0x80138890; // type:object size:0x8 scope:local data:double -@167 = .sdata2:0x80138898; // type:object size:0x8 scope:local data:double -@100 = .sdata2:0x801388A0; // type:object size:0x8 scope:local data:double -@131 = .sdata2:0x801388A8; // type:object size:0x8 scope:local data:double -@132 = .sdata2:0x801388B0; // type:object size:0x8 scope:local data:double -@133 = .sdata2:0x801388B8; // type:object size:0x8 scope:local data:double -@134 = .sdata2:0x801388C0; // type:object size:0x8 scope:local data:double -@135 = .sdata2:0x801388C8; // type:object size:0x8 scope:local data:double -@128 = .sdata2:0x801388D0; // type:object size:0x4 scope:local data:float -@129 = .sdata2:0x801388D4; // type:object size:0x4 scope:local data:float -@130 = .sdata2:0x801388D8; // type:object size:0x4 scope:local data:float -@131 = .sdata2:0x801388DC; // type:object size:0x4 scope:local data:float -@132 = .sdata2:0x801388E0; // type:object size:0x4 scope:local data:float -@133 = .sdata2:0x801388E4; // type:object size:0x4 scope:local data:float -@135 = .sdata2:0x801388E8; // type:object size:0x8 scope:local data:double -@106 = .sdata2:0x801388F0; // type:object size:0x4 scope:local data:float -@107 = .sdata2:0x801388F4; // type:object size:0x4 scope:local data:float -@108 = .sdata2:0x801388F8; // type:object size:0x4 scope:local data:float -@110 = .sdata2:0x80138900; // type:object size:0x8 scope:local data:double -@106 = .sdata2:0x80138908; // type:object size:0x8 scope:local data:double -@107 = .sdata2:0x80138910; // type:object size:0x8 scope:local data:double -@108 = .sdata2:0x80138918; // type:object size:0x8 scope:local data:double +@302 = .sdata2:0x80138770; // type:object size:0x8 scope:local data:double +@303 = .sdata2:0x80138778; // type:object size:0x8 scope:local data:double +@304 = .sdata2:0x80138780; // type:object size:0x8 scope:local data:double +@305 = .sdata2:0x80138788; // type:object size:0x8 scope:local data:double +@306 = .sdata2:0x80138790; // type:object size:0x8 scope:local data:double +@307 = .sdata2:0x80138798; // type:object size:0x8 scope:local data:double +@308 = .sdata2:0x801387A0; // type:object size:0x8 scope:local data:double +@309 = .sdata2:0x801387A8; // type:object size:0x8 scope:local data:double +@310 = .sdata2:0x801387B0; // type:object size:0x8 scope:local data:double +@311 = .sdata2:0x801387B8; // type:object size:0x8 scope:local data:double +@312 = .sdata2:0x801387C0; // type:object size:0x8 scope:local data:double +@313 = .sdata2:0x801387C8; // type:object size:0x8 scope:local data:double +@314 = .sdata2:0x801387D0; // type:object size:0x8 scope:local data:double +@315 = .sdata2:0x801387D8; // type:object size:0x8 scope:local data:double +@316 = .sdata2:0x801387E0; // type:object size:0x8 scope:local data:double +@317 = .sdata2:0x801387E8; // type:object size:0x8 scope:local data:double +@318 = .sdata2:0x801387F0; // type:object size:0x8 scope:local data:double +@319 = .sdata2:0x801387F8; // type:object size:0x8 scope:local data:double +@320 = .sdata2:0x80138800; // type:object size:0x8 scope:local data:double +@321 = .sdata2:0x80138808; // type:object size:0x8 scope:local data:double +@322 = .sdata2:0x80138810; // type:object size:0x8 scope:local data:double +@323 = .sdata2:0x80138818; // type:object size:0x8 scope:local data:double +@324 = .sdata2:0x80138820; // type:object size:0x8 scope:local data:double +@325 = .sdata2:0x80138828; // type:object size:0x8 scope:local data:double +@326 = .sdata2:0x80138830; // type:object size:0x8 scope:local data:double +@327 = .sdata2:0x80138838; // type:object size:0x8 scope:local data:double +@328 = .sdata2:0x80138840; // type:object size:0x8 scope:local data:double +@329 = .sdata2:0x80138848; // type:object size:0x8 scope:local data:double +@330 = .sdata2:0x80138850; // type:object size:0x8 scope:local data:double +@331 = .sdata2:0x80138858; // type:object size:0x8 scope:local data:double +@332 = .sdata2:0x80138860; // type:object size:0x8 scope:local data:double +@333 = .sdata2:0x80138868; // type:object size:0x8 scope:local data:double +@334 = .sdata2:0x80138870; // type:object size:0x8 scope:local data:double +@336 = .sdata2:0x80138878; // type:object size:0x8 scope:local data:double +@101 = .sdata2:0x80138880; // type:object size:0x8 scope:local data:double +@102 = .sdata2:0x80138888; // type:object size:0x8 scope:local data:double +@101 = .sdata2:0x80138890; // type:object size:0x8 scope:local data:double +@102 = .sdata2:0x80138898; // type:object size:0x8 scope:local data:double +@35 = .sdata2:0x801388A0; // type:object size:0x8 scope:local data:double +@66 = .sdata2:0x801388A8; // type:object size:0x8 scope:local data:double +@67 = .sdata2:0x801388B0; // type:object size:0x8 scope:local data:double +@68 = .sdata2:0x801388B8; // type:object size:0x8 scope:local data:double +@69 = .sdata2:0x801388C0; // type:object size:0x8 scope:local data:double +@70 = .sdata2:0x801388C8; // type:object size:0x8 scope:local data:double +@59 = .sdata2:0x801388D0; // type:object size:0x4 scope:local data:float +@60 = .sdata2:0x801388D4; // type:object size:0x4 scope:local data:float +@61 = .sdata2:0x801388D8; // type:object size:0x4 scope:local data:float +@62 = .sdata2:0x801388DC; // type:object size:0x4 scope:local data:float +@63 = .sdata2:0x801388E0; // type:object size:0x4 scope:local data:float +@64 = .sdata2:0x801388E4; // type:object size:0x4 scope:local data:float +@66 = .sdata2:0x801388E8; // type:object size:0x8 scope:local data:double +@44 = .sdata2:0x801388F0; // type:object size:0x4 scope:local data:float +@45 = .sdata2:0x801388F4; // type:object size:0x4 scope:local data:float +@46 = .sdata2:0x801388F8; // type:object size:0x4 scope:local data:float +@48 = .sdata2:0x80138900; // type:object size:0x8 scope:local data:double +@28 = .sdata2:0x80138908; // type:object size:0x8 scope:local data:double +@29 = .sdata2:0x80138910; // type:object size:0x8 scope:local data:double +@30 = .sdata2:0x80138918; // type:object size:0x8 scope:local data:double diff --git a/include/macros.h b/include/macros.h index 36facaa..67365e6 100644 --- a/include/macros.h +++ b/include/macros.h @@ -47,39 +47,19 @@ inline void padStack(void) { int pad = 0; } #define PAD_STACK() padStack() #ifdef __MWERKS__ +#define AT_ADDRESS(xyz) : (xyz) +#define DECL_SECTION(x) __declspec(section x) +#define WEAK __declspec(weak) #define ASM asm #else +#define AT_ADDRESS(xyz) +#define DECL_SECTION(x) +#define WEAK #define ASM #endif -#ifdef __MWERKS__ -#define WEAK __declspec(weak) -#else -#define WEAK -#endif - -#ifdef __MWERKS__ -#define INIT __declspec(section ".init") -#else -#define INIT -#endif - -#ifdef __MWERKS__ -#define CTORS __declspec(section ".ctors") -#else -#define CTORS -#endif - -#ifdef __MWERKS__ -#define DTORS __declspec(section ".dtors") -#else -#define DTORS -#endif - -#ifdef __MWERKS__ -#define AT_ADDRESS(xyz) : (xyz) -#else -#define AT_ADDRESS(xyz) -#endif +#define INIT DECL_SECTION(".init") +#define CTORS DECL_SECTION(".ctors") +#define DTORS DECL_SECTION(".dtors") #endif diff --git a/src/emulator/frame.c b/src/emulator/frame.c index 3b4a482..d3a6dce 100644 --- a/src/emulator/frame.c +++ b/src/emulator/frame.c @@ -2060,6 +2060,7 @@ static bool frameDrawRectFill(Frame* pFrame, Rectangle* pRectangle) { f32 rX1; f32 rY1; + //! @bug `pRectangle->nY1` is using the N64 width instead of the height if ((pFrame->aMode[FMT_OTHER1] & 0x300000) == 0x300000 && pRectangle->nX0 <= 16 && pRectangle->nY0 <= 32 && pRectangle->nX1 >= N64_FRAME_WIDTH - 16 && pRectangle->nY1 >= N64_FRAME_WIDTH - 32) { bFlag = false; @@ -4728,10 +4729,12 @@ bool frameResetUCode(Frame* pFrame, FrameResetType eType) { } bool frameSetBuffer(Frame* pFrame, FrameBufferType eType) { - if (((u32)(eType - 2) > 1) && (eType == FBT_DEPTH)) { - pFrame->nOffsetDepth0 = pFrame->aBuffer[FBT_DEPTH].nAddress & 0x03FFFFFF; - pFrame->nOffsetDepth1 = pFrame->nOffsetDepth0 + 0x257FC; + if (eType == FBT_COLOR_SHOW || eType == FBT_COLOR_DRAW) { + } else if (eType == FBT_DEPTH) { + pFrame->nOffsetDepth0 = pFrame->aBuffer[FBT_DEPTH].nAddress & 0x03FFFFFF; + pFrame->nOffsetDepth1 = pFrame->nOffsetDepth0 + 0x257FC; } + return true; }