diff --git a/asm/os/OS_8001a2c0.s b/asm/os/OS.s similarity index 92% rename from asm/os/OS_8001a2c0.s rename to asm/os/OS.s index 7604dda1..91fe5220 100644 --- a/asm/os/OS_8001a2c0.s +++ b/asm/os/OS.s @@ -1629,3 +1629,391 @@ lbl_8001B794: /* 8001B794 000175D4 3C 60 80 00 */ lis r3, 0x80003184@ha /* 8001B798 000175D8 88 63 31 84 */ lbz r3, 0x80003184@l(r3) /* 8001B79C 000175DC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@1_80421DD8" +"@1_80421DD8": + + .4byte 0x3C3C2052 + .4byte 0x564C5F53 + .4byte 0x444B202D + .4byte 0x204F5320 + .4byte 0x0972656C + .4byte 0x65617365 + .4byte 0x20627569 + .4byte 0x6C643A20 + .4byte 0x41756720 + .4byte 0x32332032 + .4byte 0x30313020 + .4byte 0x31373A33 + .4byte 0x333A3036 + .4byte 0x20283078 + .4byte 0x34333032 + .4byte 0x5F313435 + .4byte 0x29203E3E + .4byte 0 + .4byte 0x0A526576 + .4byte 0x6F6C7574 + .4byte 0x696F6E20 + .4byte 0x4F530A00 + .4byte 0x4B65726E + .4byte 0x656C2062 + .4byte 0x75696C74 + .4byte 0x203A2025 + .4byte 0x73202573 + .4byte 0x0A000000 + .4byte 0x41756720 + .4byte 0x32332032 + .4byte 0x30313000 + .4byte 0x31373A33 + .4byte 0x333A3036 + .4byte 0 + .4byte 0x436F6E73 + .4byte 0x6F6C6520 + .4byte 0x54797065 + .4byte 0x203A2000 + .4byte 0x5072652D + .4byte 0x70726F64 + .4byte 0x75637469 + .4byte 0x6F6E2062 + .4byte 0x6F617264 + .4byte 0x20310A00 + .4byte 0x5072652D + .4byte 0x70726F64 + .4byte 0x75637469 + .4byte 0x6F6E2062 + .4byte 0x6F617264 + .4byte 0x20322D31 + .4byte 0x0A000000 + .4byte 0x5072652D + .4byte 0x70726F64 + .4byte 0x75637469 + .4byte 0x6F6E2062 + .4byte 0x6F617264 + .4byte 0x20322D32 + .4byte 0x0A000000 + .4byte 0x52657461 + .4byte 0x696C2025 + .4byte 0x640A0000 + .4byte 0x4E444556 + .4byte 0x20322E31 + .4byte 0x0A000000 + .4byte 0x4E444556 + .4byte 0x20322E30 + .4byte 0x0A000000 + .4byte 0x4E444556 + .4byte 0x20312E32 + .4byte 0x0A000000 + .4byte 0x4E444556 + .4byte 0x20312E31 + .4byte 0x0A000000 + .4byte 0x4E444556 + .4byte 0x20312E30 + .4byte 0x0A000000 + .4byte 0x5265766F + .4byte 0x6C757469 + .4byte 0x6F6E2045 + .4byte 0x6D756C61 + .4byte 0x746F720A + .4byte 0 + .4byte 0x456D756C + .4byte 0x6174696F + .4byte 0x6E20706C + .4byte 0x6174666F + .4byte 0x726D2028 + .4byte 0x25303878 + .4byte 0x290A0000 + .4byte 0x54444556 + .4byte 0x2D626173 + .4byte 0x65642065 + .4byte 0x6D756C61 + .4byte 0x74696F6E + .4byte 0x20485725 + .4byte 0x640A0000 + .4byte 0x4669726D + .4byte 0x77617265 + .4byte 0x20202020 + .4byte 0x203A2025 + .4byte 0x642E2564 + .4byte 0x2E256420 + .4byte 0 + .4byte 0x2825642F + .4byte 0x25642F25 + .4byte 0x64290A00 + .4byte 0x4D656D6F + .4byte 0x72792025 + .4byte 0x64204D42 + .4byte 0x0A000000 + .4byte 0x4D454D31 + .4byte 0x20417265 + .4byte 0x6E61203A + .4byte 0x20307825 + .4byte 0x78202D20 + .4byte 0x30782578 + .4byte 0x0A000000 + .4byte 0x4D454D32 + .4byte 0x20417265 + .4byte 0x6E61203A + .4byte 0x20307825 + .4byte 0x78202D20 + .4byte 0x30782578 + .4byte 0x0A000000 + .4byte 0x4F532045 + .4byte 0x52524F52 + .4byte 0x3A20626F + .4byte 0x6F742070 + .4byte 0x726F6772 + .4byte 0x616D2069 + .4byte 0x73206E6F + .4byte 0x7420666F + .4byte 0x72205256 + .4byte 0x4C207461 + .4byte 0x72676574 + .4byte 0x2E20506C + .4byte 0x65617365 + .4byte 0x20757365 + .4byte 0x20636F72 + .4byte 0x72656374 + .4byte 0x20626F6F + .4byte 0x74207072 + .4byte 0x6F677261 + .4byte 0x6D2E0A00 + .4byte 0x4661696C + .4byte 0x65642074 + .4byte 0x6F207275 + .4byte 0x6E206170 + .4byte 0x70000000 + .4byte 0 + .4byte 0x4F532045 + .4byte 0x52524F52 + .4byte 0x3A206170 + .4byte 0x706C6F61 + .4byte 0x6465725B + .4byte 0x445D2E69 + .4byte 0x6D672069 + .4byte 0x73206E6F + .4byte 0x7420666F + .4byte 0x72205256 + .4byte 0x4C207461 + .4byte 0x72676574 + .4byte 0x2E20506C + .4byte 0x65617365 + .4byte 0x20757365 + .4byte 0x20636F72 + .4byte 0x72656374 + .4byte 0x20617070 + .4byte 0x6C6F6164 + .4byte 0x65725B44 + .4byte 0x5D2E696D + .4byte 0x672E0A00 + .4byte 0x4F532045 + .4byte 0x52524F52 + .4byte 0x3A205468 + .4byte 0x69732066 + .4byte 0x69726D77 + .4byte 0x61726520 + .4byte 0x69732061 + .4byte 0x6E20696D + .4byte 0x70726F70 + .4byte 0x65722076 + .4byte 0x65727369 + .4byte 0x6F6E2066 + .4byte 0x6F722074 + .4byte 0x68697320 + .4byte 0x53444B2E + .4byte 0x20506C65 + .4byte 0x61736520 + .4byte 0x75736520 + .4byte 0x6120636F + .4byte 0x72726563 + .4byte 0x74204669 + .4byte 0x726D7761 + .4byte 0x72652E0A + .4byte 0 + .4byte 0x0A0A4552 + .4byte 0x524F5220 + .4byte 0x23303032 + .4byte 0x0A416E20 + .4byte 0x6572726F + .4byte 0x72206861 + .4byte 0x73206F63 + .4byte 0x63757272 + .4byte 0x65642E0A + .4byte 0x50726573 + .4byte 0x73207468 + .4byte 0x6520456A + .4byte 0x65637420 + .4byte 0x42757474 + .4byte 0x6F6E2C20 + .4byte 0x72656D6F + .4byte 0x76652074 + .4byte 0x68650A47 + .4byte 0x616D6520 + .4byte 0x44697363 + .4byte 0x2C20616E + .4byte 0x64207475 + .4byte 0x726E206F + .4byte 0x66662074 + .4byte 0x68652070 + .4byte 0x6F776572 + .4byte 0x20746F20 + .4byte 0x0A746865 + .4byte 0x20636F6E + .4byte 0x736F6C65 + .4byte 0x2E200A50 + .4byte 0x6C656173 + .4byte 0x65207265 + .4byte 0x61642074 + .4byte 0x68652057 + .4byte 0x6969204F + .4byte 0x70657261 + .4byte 0x74696F6E + .4byte 0x73204D61 + .4byte 0x6E75616C + .4byte 0x200A666F + .4byte 0x72206675 + .4byte 0x72746865 + .4byte 0x7220696E + .4byte 0x73747275 + .4byte 0x6374696F + .4byte 0x6E732E0A + .4byte 0 + +.global __OSExceptionLocations +__OSExceptionLocations: + + .4byte 0x00000100 + .4byte 0x00000200 + .4byte 0x00000300 + .4byte 0x00000400 + .4byte 0x00000500 + .4byte 0x00000600 + .4byte 0x00000700 + .4byte 0x00000800 + .4byte 0x00000900 + .4byte 0x00000C00 + .4byte 0x00000D00 + .4byte 0x00000F00 + .4byte 0x00001300 + .4byte 0x00001400 + .4byte 0x00001700 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global __OSRebootParams +__OSRebootParams: + .skip 0x20 + +.global DriveInfo +DriveInfo: + .skip 0x50 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __OSVersion +__OSVersion: + + .4byte "@1_80421DD8" + +.global "@1784" +"@1784": + + .4byte 0x52564120 + .4byte 0x310A0000 + +.global "@1794_80556494" +"@1794_80556494": + + .4byte 0x25303878 + .4byte 0x0A000000 + +.global "@1847_8055649C" +"@1847_8055649C": + + .4byte 0x25730A00 + +.global "@1849_805564A0" +"@1849_805564A0": + + .4byte 0x4F532E63 + .4byte 0 + +.global "@1187" +"@1187": + + .4byte 0x48414541 + .4byte 0 + +.global AppGameNameForSysMenu +AppGameNameForSysMenu: + + .4byte "@1187" + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global __OSInIPL +__OSInIPL: + .skip 0x4 + +.global __OSInNandBoot +__OSInNandBoot: + .skip 0x4 + +.global __OSIsGcam +__OSIsGcam: + .skip 0x8 + +.global ZeroF +ZeroF: + .skip 0x8 + +.global ZeroPS +ZeroPS: + .skip 0x8 + +.global AreWeInitialized +AreWeInitialized: + .skip 0x4 + +.global OSExceptionTable +OSExceptionTable: + .skip 0x4 + +.global GameNameBuffer +GameNameBuffer: + .skip 0x8 + +.global BI2DebugFlagHolder +BI2DebugFlagHolder: + .skip 0x4 + +.global BI2DebugFlag +BI2DebugFlag: + .skip 0x4 + +.global BootInfo_8055C7B0 +BootInfo_8055C7B0: + .skip 0x8 + +.global __OSStartTime +__OSStartTime: + .skip 0x4 + +.global lbl_8055C7BC +lbl_8055C7BC: + .skip 0x4 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@1010" +"@1010": + + .4byte 0x0000FF00 + +.global "@1012" +"@1012": + + .4byte 0xFFFFFF00 diff --git a/asm/os/OSAlarm_8001b7a0.s b/asm/os/OSAlarm.s similarity index 98% rename from asm/os/OSAlarm_8001b7a0.s rename to asm/os/OSAlarm.s index 8f18f6f7..cae4c81a 100644 --- a/asm/os/OSAlarm_8001b7a0.s +++ b/asm/os/OSAlarm.s @@ -664,3 +664,19 @@ lbl_8001C01C: /* 8001C044 00017E84 4E 80 00 20 */ blr /* 8001C048 00017E88 00 00 00 00 */ .4byte 0x00000000 /* 8001C04C 00017E8C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global ShutdownFunctionInfo_804221E8 +ShutdownFunctionInfo_804221E8: + + .4byte OnReset + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global AlarmQueue +AlarmQueue: + .skip 0x8 diff --git a/asm/os/OSAlarm_804221e8.s b/asm/os/OSAlarm_804221e8.s deleted file mode 100644 index 9d41b3da..00000000 --- a/asm/os/OSAlarm_804221e8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global ShutdownFunctionInfo_804221E8 -ShutdownFunctionInfo_804221E8: - - .4byte OnReset - .4byte 0xFFFFFFFF - .4byte 0 - .4byte 0 diff --git a/asm/os/OSAlarm_8055c7c0.s b/asm/os/OSAlarm_8055c7c0.s deleted file mode 100644 index 1018f9be..00000000 --- a/asm/os/OSAlarm_8055c7c0.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global AlarmQueue -AlarmQueue: - .skip 0x8 diff --git a/asm/os/OSAlloc_8001c050.s b/asm/os/OSAlloc.s similarity index 96% rename from asm/os/OSAlloc_8001c050.s rename to asm/os/OSAlloc.s index d783427a..2e90d5ad 100644 --- a/asm/os/OSAlloc_8001c050.s +++ b/asm/os/OSAlloc.s @@ -263,3 +263,29 @@ lbl_8001C35C: lbl_8001C368: /* 8001C368 000181A8 38 60 FF FF */ li r3, -0x1 /* 8001C36C 000181AC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __OSCurrHeap +__OSCurrHeap: + + .4byte 0xFFFFFFFF + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global ArenaEnd +ArenaEnd: + .skip 0x4 + +.global ArenaStart +ArenaStart: + .skip 0x4 + +.global NumHeaps +NumHeaps: + .skip 0x4 + +.global HeapArray +HeapArray: + .skip 0x4 diff --git a/asm/os/OSAlloc_805564b8.s b/asm/os/OSAlloc_805564b8.s deleted file mode 100644 index c617a067..00000000 --- a/asm/os/OSAlloc_805564b8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __OSCurrHeap -__OSCurrHeap: - - .4byte 0xFFFFFFFF - .4byte 0 diff --git a/asm/os/OSAlloc_8055c7c8.s b/asm/os/OSAlloc_8055c7c8.s deleted file mode 100644 index 8b76d245..00000000 --- a/asm/os/OSAlloc_8055c7c8.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global ArenaEnd -ArenaEnd: - .skip 0x4 - -.global ArenaStart -ArenaStart: - .skip 0x4 - -.global NumHeaps -NumHeaps: - .skip 0x4 - -.global HeapArray -HeapArray: - .skip 0x4 diff --git a/asm/os/OSArena_8001c370.s b/asm/os/OSArena.s similarity index 91% rename from asm/os/OSArena_8001c370.s rename to asm/os/OSArena.s index 7588c2ec..9350ff5f 100644 --- a/asm/os/OSArena_8001c370.s +++ b/asm/os/OSArena.s @@ -85,3 +85,25 @@ OSAllocFromMEM2ArenaLo: /* 8001C464 000182A4 00 00 00 00 */ .4byte 0x00000000 /* 8001C468 000182A8 00 00 00 00 */ .4byte 0x00000000 /* 8001C46C 000182AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __OSArenaLo +__OSArenaLo: + + .4byte 0xFFFFFFFF + +.global s_mem2ArenaLo +s_mem2ArenaLo: + + .4byte 0xFFFFFFFF +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global __OSArenaHi +__OSArenaHi: + .skip 0x4 + +.global s_mem2ArenaHi +s_mem2ArenaHi: + .skip 0x4 diff --git a/asm/os/OSArena_805564c0.s b/asm/os/OSArena_805564c0.s deleted file mode 100644 index 468fd23b..00000000 --- a/asm/os/OSArena_805564c0.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __OSArenaLo -__OSArenaLo: - - .4byte 0xFFFFFFFF - -.global s_mem2ArenaLo -s_mem2ArenaLo: - - .4byte 0xFFFFFFFF diff --git a/asm/os/OSArena_8055c7d8.s b/asm/os/OSArena_8055c7d8.s deleted file mode 100644 index c7f5f8d1..00000000 --- a/asm/os/OSArena_8055c7d8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global __OSArenaHi -__OSArenaHi: - .skip 0x4 - -.global s_mem2ArenaHi -s_mem2ArenaHi: - .skip 0x4 diff --git a/asm/os/OSAudioSystem_8001c470.s b/asm/os/OSAudioSystem.s similarity index 96% rename from asm/os/OSAudioSystem_8001c470.s rename to asm/os/OSAudioSystem.s index 967a771b..d573d402 100644 --- a/asm/os/OSAudioSystem_8001c470.s +++ b/asm/os/OSAudioSystem.s @@ -365,3 +365,41 @@ lbl_8001C914: /* 8001C924 00018764 7C 08 03 A6 */ mtlr r0 /* 8001C928 00018768 38 21 00 10 */ addi r1, r1, 0x10 /* 8001C92C 0001876C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global DSPInitCode +DSPInitCode: + + .4byte 0x029F0010 + .4byte 0x029F0033 + .4byte 0x029F0034 + .4byte 0x029F0035 + .4byte 0x029F0036 + .4byte 0x029F0037 + .4byte 0x029F0038 + .4byte 0x029F0039 + .4byte 0x12061203 + .4byte 0x12041205 + .4byte 0x00808000 + .4byte 0x0088FFFF + .4byte 0x00841000 + .4byte 0x0064001D + .4byte 0x02180000 + .4byte 0x81001C1E + .4byte 0x00441B1E + .4byte 0x00840800 + .4byte 0x00640027 + .4byte 0x191E0000 + .4byte 0x00DEFFFC + .4byte 0x02A08000 + .4byte 0x029C0028 + .4byte 0x16FC0054 + .4byte 0x16FD4348 + .4byte 0x002102FF + .4byte 0x02FF02FF + .4byte 0x02FF02FF + .4byte 0x02FF02FF + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/os/OSAudioSystem_804221f8.s b/asm/os/OSAudioSystem_804221f8.s deleted file mode 100644 index f09c4116..00000000 --- a/asm/os/OSAudioSystem_804221f8.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global DSPInitCode -DSPInitCode: - - .4byte 0x029F0010 - .4byte 0x029F0033 - .4byte 0x029F0034 - .4byte 0x029F0035 - .4byte 0x029F0036 - .4byte 0x029F0037 - .4byte 0x029F0038 - .4byte 0x029F0039 - .4byte 0x12061203 - .4byte 0x12041205 - .4byte 0x00808000 - .4byte 0x0088FFFF - .4byte 0x00841000 - .4byte 0x0064001D - .4byte 0x02180000 - .4byte 0x81001C1E - .4byte 0x00441B1E - .4byte 0x00840800 - .4byte 0x00640027 - .4byte 0x191E0000 - .4byte 0x00DEFFFC - .4byte 0x02A08000 - .4byte 0x029C0028 - .4byte 0x16FC0054 - .4byte 0x16FD4348 - .4byte 0x002102FF - .4byte 0x02FF02FF - .4byte 0x02FF02FF - .4byte 0x02FF02FF - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/os/OSCache_8001c930.s b/asm/os/OSCache.s similarity index 92% rename from asm/os/OSCache_8001c930.s rename to asm/os/OSCache.s index d8278f2e..f44edb57 100644 --- a/asm/os/OSCache_8001c930.s +++ b/asm/os/OSCache.s @@ -500,3 +500,107 @@ lbl_8001CF64: /* 8001CF84 00018DC4 4E 80 00 20 */ blr /* 8001CF88 00018DC8 00 00 00 00 */ .4byte 0x00000000 /* 8001CF8C 00018DCC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@909" +"@909": + + .4byte 0x4D616368 + .4byte 0x696E6520 + .4byte 0x63686563 + .4byte 0x6B207265 + .4byte 0x63656976 + .4byte 0x65640A00 + .4byte 0x48494432 + .4byte 0x203D2030 + .4byte 0x78257820 + .4byte 0x20205352 + .4byte 0x5231203D + .4byte 0x20307825 + .4byte 0x780A0000 + .4byte 0 + .4byte 0x4D616368 + .4byte 0x696E6520 + .4byte 0x63686563 + .4byte 0x6B207761 + .4byte 0x73206E6F + .4byte 0x7420444D + .4byte 0x412F6C6F + .4byte 0x636B6564 + .4byte 0x20636163 + .4byte 0x68652072 + .4byte 0x656C6174 + .4byte 0x65640A00 + .4byte 0x444D4145 + .4byte 0x72726F72 + .4byte 0x48616E64 + .4byte 0x6C657228 + .4byte 0x293A2041 + .4byte 0x6E206572 + .4byte 0x726F7220 + .4byte 0x6F636375 + .4byte 0x72726564 + .4byte 0x20776869 + .4byte 0x6C652070 + .4byte 0x726F6365 + .4byte 0x7373696E + .4byte 0x6720444D + .4byte 0x412E0A00 + .4byte 0x54686520 + .4byte 0x666F6C6C + .4byte 0x6F77696E + .4byte 0x67206572 + .4byte 0x726F7273 + .4byte 0x20686176 + .4byte 0x65206265 + .4byte 0x656E2064 + .4byte 0x65746563 + .4byte 0x74656420 + .4byte 0x616E6420 + .4byte 0x636C6561 + .4byte 0x72656420 + .4byte 0x3A0A0000 + .4byte 0x092D2052 + .4byte 0x65717565 + .4byte 0x73746564 + .4byte 0x2061206C + .4byte 0x6F636B65 + .4byte 0x64206361 + .4byte 0x63686520 + .4byte 0x74616720 + .4byte 0x74686174 + .4byte 0x20776173 + .4byte 0x20616C72 + .4byte 0x65616479 + .4byte 0x20696E20 + .4byte 0x74686520 + .4byte 0x63616368 + .4byte 0x650A0000 + .4byte 0x092D2044 + .4byte 0x4D412061 + .4byte 0x7474656D + .4byte 0x70746564 + .4byte 0x20746F20 + .4byte 0x61636365 + .4byte 0x7373206E + .4byte 0x6F726D61 + .4byte 0x6C206361 + .4byte 0x6368650A + .4byte 0 + .4byte 0x092D2044 + .4byte 0x4D41206D + .4byte 0x69737365 + .4byte 0x6420696E + .4byte 0x20646174 + .4byte 0x61206361 + .4byte 0x6368650A + .4byte 0 + .4byte 0x092D2044 + .4byte 0x4D412071 + .4byte 0x75657565 + .4byte 0x206F7665 + .4byte 0x72666C6F + .4byte 0x7765640A + .4byte 0 + .4byte 0 diff --git a/asm/os/OSCache_80422278.s b/asm/os/OSCache_80422278.s deleted file mode 100644 index 4888aa26..00000000 --- a/asm/os/OSCache_80422278.s +++ /dev/null @@ -1,104 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@909" -"@909": - - .4byte 0x4D616368 - .4byte 0x696E6520 - .4byte 0x63686563 - .4byte 0x6B207265 - .4byte 0x63656976 - .4byte 0x65640A00 - .4byte 0x48494432 - .4byte 0x203D2030 - .4byte 0x78257820 - .4byte 0x20205352 - .4byte 0x5231203D - .4byte 0x20307825 - .4byte 0x780A0000 - .4byte 0 - .4byte 0x4D616368 - .4byte 0x696E6520 - .4byte 0x63686563 - .4byte 0x6B207761 - .4byte 0x73206E6F - .4byte 0x7420444D - .4byte 0x412F6C6F - .4byte 0x636B6564 - .4byte 0x20636163 - .4byte 0x68652072 - .4byte 0x656C6174 - .4byte 0x65640A00 - .4byte 0x444D4145 - .4byte 0x72726F72 - .4byte 0x48616E64 - .4byte 0x6C657228 - .4byte 0x293A2041 - .4byte 0x6E206572 - .4byte 0x726F7220 - .4byte 0x6F636375 - .4byte 0x72726564 - .4byte 0x20776869 - .4byte 0x6C652070 - .4byte 0x726F6365 - .4byte 0x7373696E - .4byte 0x6720444D - .4byte 0x412E0A00 - .4byte 0x54686520 - .4byte 0x666F6C6C - .4byte 0x6F77696E - .4byte 0x67206572 - .4byte 0x726F7273 - .4byte 0x20686176 - .4byte 0x65206265 - .4byte 0x656E2064 - .4byte 0x65746563 - .4byte 0x74656420 - .4byte 0x616E6420 - .4byte 0x636C6561 - .4byte 0x72656420 - .4byte 0x3A0A0000 - .4byte 0x092D2052 - .4byte 0x65717565 - .4byte 0x73746564 - .4byte 0x2061206C - .4byte 0x6F636B65 - .4byte 0x64206361 - .4byte 0x63686520 - .4byte 0x74616720 - .4byte 0x74686174 - .4byte 0x20776173 - .4byte 0x20616C72 - .4byte 0x65616479 - .4byte 0x20696E20 - .4byte 0x74686520 - .4byte 0x63616368 - .4byte 0x650A0000 - .4byte 0x092D2044 - .4byte 0x4D412061 - .4byte 0x7474656D - .4byte 0x70746564 - .4byte 0x20746F20 - .4byte 0x61636365 - .4byte 0x7373206E - .4byte 0x6F726D61 - .4byte 0x6C206361 - .4byte 0x6368650A - .4byte 0 - .4byte 0x092D2044 - .4byte 0x4D41206D - .4byte 0x69737365 - .4byte 0x6420696E - .4byte 0x20646174 - .4byte 0x61206361 - .4byte 0x6368650A - .4byte 0 - .4byte 0x092D2044 - .4byte 0x4D412071 - .4byte 0x75657565 - .4byte 0x206F7665 - .4byte 0x72666C6F - .4byte 0x7765640A - .4byte 0 - .4byte 0 diff --git a/asm/os/OSContext_8001cf90.s b/asm/os/OSContext.s similarity index 94% rename from asm/os/OSContext_8001cf90.s rename to asm/os/OSContext.s index b8904304..ddbb5bc5 100644 --- a/asm/os/OSContext_8001cf90.s +++ b/asm/os/OSContext.s @@ -713,3 +713,119 @@ OSFillFPUContext: lbl_8001D988: /* 8001D988 000197C8 4E 80 00 20 */ blr /* 8001D98C 000197CC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@715" +"@715": + + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D20436F + .4byte 0x6E746578 + .4byte 0x74203078 + .4byte 0x25303878 + .4byte 0x202D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D0A00 + .4byte 0 + .4byte 0x72252D32 + .4byte 0x6420203D + .4byte 0x20307825 + .4byte 0x30387820 + .4byte 0x28253134 + .4byte 0x64292020 + .4byte 0x72252D32 + .4byte 0x6420203D + .4byte 0x20307825 + .4byte 0x30387820 + .4byte 0x28253134 + .4byte 0x64290A00 + .4byte 0x4C522020 + .4byte 0x203D2030 + .4byte 0x78253038 + .4byte 0x78202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x43522020 + .4byte 0x203D2030 + .4byte 0x78253038 + .4byte 0x780A0000 + .4byte 0x53525230 + .4byte 0x203D2030 + .4byte 0x78253038 + .4byte 0x78202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x53525231 + .4byte 0x203D2030 + .4byte 0x78253038 + .4byte 0x780A0000 + .4byte 0x0A475152 + .4byte 0x732D2D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D0A + .4byte 0 + .4byte 0x67717225 + .4byte 0x64203D20 + .4byte 0x30782530 + .4byte 0x38782009 + .4byte 0x20677172 + .4byte 0x2564203D + .4byte 0x20307825 + .4byte 0x3038780A + .4byte 0 + .4byte 0x0A0A4650 + .4byte 0x52732D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x0A000000 + .4byte 0x66722564 + .4byte 0x20093D20 + .4byte 0x25642009 + .4byte 0x20667225 + .4byte 0x6420093D + .4byte 0x2025640A + .4byte 0 + .4byte 0x0A0A5053 + .4byte 0x46732D2D + .4byte 0x2D2D2D2D + .4byte 0x2D2D2D2D + .4byte 0x0A000000 + .4byte 0x70732564 + .4byte 0x20093D20 + .4byte 0x30782578 + .4byte 0x20092070 + .4byte 0x73256420 + .4byte 0x093D2030 + .4byte 0x7825780A + .4byte 0 + .4byte 0x0A416464 + .4byte 0x72657373 + .4byte 0x3A202020 + .4byte 0x20202042 + .4byte 0x61636B20 + .4byte 0x43686169 + .4byte 0x6E202020 + .4byte 0x204C5220 + .4byte 0x53617665 + .4byte 0x0A000000 + .4byte 0x30782530 + .4byte 0x38783A20 + .4byte 0x20203078 + .4byte 0x25303878 + .4byte 0x20202020 + .4byte 0x30782530 + .4byte 0x38780A00 diff --git a/asm/os/OSContext_80422400.s b/asm/os/OSContext_80422400.s deleted file mode 100644 index d6ea2e42..00000000 --- a/asm/os/OSContext_80422400.s +++ /dev/null @@ -1,116 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@715" -"@715": - - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D20436F - .4byte 0x6E746578 - .4byte 0x74203078 - .4byte 0x25303878 - .4byte 0x202D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D0A00 - .4byte 0 - .4byte 0x72252D32 - .4byte 0x6420203D - .4byte 0x20307825 - .4byte 0x30387820 - .4byte 0x28253134 - .4byte 0x64292020 - .4byte 0x72252D32 - .4byte 0x6420203D - .4byte 0x20307825 - .4byte 0x30387820 - .4byte 0x28253134 - .4byte 0x64290A00 - .4byte 0x4C522020 - .4byte 0x203D2030 - .4byte 0x78253038 - .4byte 0x78202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x43522020 - .4byte 0x203D2030 - .4byte 0x78253038 - .4byte 0x780A0000 - .4byte 0x53525230 - .4byte 0x203D2030 - .4byte 0x78253038 - .4byte 0x78202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x53525231 - .4byte 0x203D2030 - .4byte 0x78253038 - .4byte 0x780A0000 - .4byte 0x0A475152 - .4byte 0x732D2D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D0A - .4byte 0 - .4byte 0x67717225 - .4byte 0x64203D20 - .4byte 0x30782530 - .4byte 0x38782009 - .4byte 0x20677172 - .4byte 0x2564203D - .4byte 0x20307825 - .4byte 0x3038780A - .4byte 0 - .4byte 0x0A0A4650 - .4byte 0x52732D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x0A000000 - .4byte 0x66722564 - .4byte 0x20093D20 - .4byte 0x25642009 - .4byte 0x20667225 - .4byte 0x6420093D - .4byte 0x2025640A - .4byte 0 - .4byte 0x0A0A5053 - .4byte 0x46732D2D - .4byte 0x2D2D2D2D - .4byte 0x2D2D2D2D - .4byte 0x0A000000 - .4byte 0x70732564 - .4byte 0x20093D20 - .4byte 0x30782578 - .4byte 0x20092070 - .4byte 0x73256420 - .4byte 0x093D2030 - .4byte 0x7825780A - .4byte 0 - .4byte 0x0A416464 - .4byte 0x72657373 - .4byte 0x3A202020 - .4byte 0x20202042 - .4byte 0x61636B20 - .4byte 0x43686169 - .4byte 0x6E202020 - .4byte 0x204C5220 - .4byte 0x53617665 - .4byte 0x0A000000 - .4byte 0x30782530 - .4byte 0x38783A20 - .4byte 0x20203078 - .4byte 0x25303878 - .4byte 0x20202020 - .4byte 0x30782530 - .4byte 0x38780A00 diff --git a/asm/os/OSCrc_800281e0.s b/asm/os/OSCrc.s similarity index 90% rename from asm/os/OSCrc_800281e0.s rename to asm/os/OSCrc.s index fe332b9f..f3770d9d 100644 --- a/asm/os/OSCrc_800281e0.s +++ b/asm/os/OSCrc.s @@ -91,3 +91,25 @@ lbl_8002830C: /* 80028314 00024154 00 00 00 00 */ .4byte 0x00000000 /* 80028318 00024158 00 00 00 00 */ .4byte 0x00000000 /* 8002831C 0002415C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@LOCAL@OSCalcCRC32__FPCvUl@crc32_table" +"@LOCAL@OSCalcCRC32__FPCvUl@crc32_table": + + .4byte 0 + .4byte 0x1DB71064 + .4byte 0x3B6E20C8 + .4byte 0x26D930AC + .4byte 0x76DC4190 + .4byte 0x6B6B51F4 + .4byte 0x4DB26158 + .4byte 0x5005713C + .4byte 0xEDB88320 + .4byte 0xF00F9344 + .4byte 0xD6D6A3E8 + .4byte 0xCB61B38C + .4byte 0x9B64C2B0 + .4byte 0x86D3D2D4 + .4byte 0xA00AE278 + .4byte 0xBDBDF21C diff --git a/asm/os/OSCrc_80407800.s b/asm/os/OSCrc_80407800.s deleted file mode 100644 index 1e590a95..00000000 --- a/asm/os/OSCrc_80407800.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@LOCAL@OSCalcCRC32__FPCvUl@crc32_table" -"@LOCAL@OSCalcCRC32__FPCvUl@crc32_table": - - .4byte 0 - .4byte 0x1DB71064 - .4byte 0x3B6E20C8 - .4byte 0x26D930AC - .4byte 0x76DC4190 - .4byte 0x6B6B51F4 - .4byte 0x4DB26158 - .4byte 0x5005713C - .4byte 0xEDB88320 - .4byte 0xF00F9344 - .4byte 0xD6D6A3E8 - .4byte 0xCB61B38C - .4byte 0x9B64C2B0 - .4byte 0x86D3D2D4 - .4byte 0xA00AE278 - .4byte 0xBDBDF21C diff --git a/asm/os/OSError_8001d990.s b/asm/os/OSError.s similarity index 85% rename from asm/os/OSError_8001d990.s rename to asm/os/OSError.s index 1411de82..eec9c884 100644 --- a/asm/os/OSError_8001d990.s +++ b/asm/os/OSError.s @@ -449,3 +449,211 @@ lbl_8001DF74: /* 8001DFA4 00019DE4 38 21 00 30 */ addi r1, r1, 0x30 /* 8001DFA8 00019DE8 4E 80 00 20 */ blr /* 8001DFAC 00019DEC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@641" +"@641": + + .4byte 0x20696E20 + .4byte 0x22257322 + .4byte 0x206F6E20 + .4byte 0x6C696E65 + .4byte 0x2025642E + .4byte 0x0A000000 + .4byte 0x0A416464 + .4byte 0x72657373 + .4byte 0x3A202020 + .4byte 0x20202042 + .4byte 0x61636B20 + .4byte 0x43686169 + .4byte 0x6E202020 + .4byte 0x204C5220 + .4byte 0x53617665 + .4byte 0x0A000000 + .4byte 0x30782530 + .4byte 0x38783A20 + .4byte 0x20203078 + .4byte 0x25303878 + .4byte 0x20202020 + .4byte 0x30782530 + .4byte 0x38780A00 + .4byte 0x4E6F6E2D + .4byte 0x7265636F + .4byte 0x76657261 + .4byte 0x626C6520 + .4byte 0x45786365 + .4byte 0x7074696F + .4byte 0x6E202564 + .4byte 0 + .4byte 0x556E6861 + .4byte 0x6E646C65 + .4byte 0x64204578 + .4byte 0x63657074 + .4byte 0x696F6E20 + .4byte 0x25640000 + .4byte 0x0A445349 + .4byte 0x5352203D + .4byte 0x20307825 + .4byte 0x30387820 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20204441 + .4byte 0x5220203D + .4byte 0x20307825 + .4byte 0x3038780A + .4byte 0 + .4byte 0x5442203D + .4byte 0x20307825 + .4byte 0x3031366C + .4byte 0x6C780A00 + .4byte 0x0A496E73 + .4byte 0x74727563 + .4byte 0x74696F6E + .4byte 0x20617420 + .4byte 0x30782578 + .4byte 0x20287265 + .4byte 0x61642066 + .4byte 0x726F6D20 + .4byte 0x53525230 + .4byte 0x29206174 + .4byte 0x74656D70 + .4byte 0x74656420 + .4byte 0x746F2061 + .4byte 0x63636573 + .4byte 0x7320696E + .4byte 0x76616C69 + .4byte 0x64206164 + .4byte 0x64726573 + .4byte 0x73203078 + .4byte 0x25782028 + .4byte 0x72656164 + .4byte 0x2066726F + .4byte 0x6D204441 + .4byte 0x52290A00 + .4byte 0x0A417474 + .4byte 0x656D7074 + .4byte 0x65642074 + .4byte 0x6F206665 + .4byte 0x74636820 + .4byte 0x696E7374 + .4byte 0x72756374 + .4byte 0x696F6E20 + .4byte 0x66726F6D + .4byte 0x20696E76 + .4byte 0x616C6964 + .4byte 0x20616464 + .4byte 0x72657373 + .4byte 0x20307825 + .4byte 0x78202872 + .4byte 0x65616420 + .4byte 0x66726F6D + .4byte 0x20535252 + .4byte 0x30290A00 + .4byte 0x0A496E73 + .4byte 0x74727563 + .4byte 0x74696F6E + .4byte 0x20617420 + .4byte 0x30782578 + .4byte 0x20287265 + .4byte 0x61642066 + .4byte 0x726F6D20 + .4byte 0x53525230 + .4byte 0x29206174 + .4byte 0x74656D70 + .4byte 0x74656420 + .4byte 0x746F2061 + .4byte 0x63636573 + .4byte 0x7320756E + .4byte 0x616C6967 + .4byte 0x6E656420 + .4byte 0x61646472 + .4byte 0x65737320 + .4byte 0x30782578 + .4byte 0x20287265 + .4byte 0x61642066 + .4byte 0x726F6D20 + .4byte 0x44415229 + .4byte 0x0A000000 + .4byte 0x0A50726F + .4byte 0x6772616D + .4byte 0x20657863 + .4byte 0x65707469 + .4byte 0x6F6E203A + .4byte 0x20506F73 + .4byte 0x7369626C + .4byte 0x6520696C + .4byte 0x6C656761 + .4byte 0x6C20696E + .4byte 0x73747275 + .4byte 0x6374696F + .4byte 0x6E2F6F70 + .4byte 0x65726174 + .4byte 0x696F6E20 + .4byte 0x6174206F + .4byte 0x72206172 + .4byte 0x6F756E64 + .4byte 0x20307825 + .4byte 0x78202872 + .4byte 0x65616420 + .4byte 0x66726F6D + .4byte 0x20535252 + .4byte 0x30290A00 + .4byte 0x41492044 + .4byte 0x4D412041 + .4byte 0x64647265 + .4byte 0x7373203D + .4byte 0x20202030 + .4byte 0x78253034 + .4byte 0x78253034 + .4byte 0x780A0000 + .4byte 0x4152414D + .4byte 0x20444D41 + .4byte 0x20416464 + .4byte 0x72657373 + .4byte 0x203D2030 + .4byte 0x78253034 + .4byte 0x78253034 + .4byte 0x780A0000 + .4byte 0x44492044 + .4byte 0x4D412041 + .4byte 0x64647265 + .4byte 0x7373203D + .4byte 0x20202030 + .4byte 0x78253038 + .4byte 0x780A0000 + .4byte 0x0A4C6173 + .4byte 0x7420696E + .4byte 0x74657272 + .4byte 0x75707420 + .4byte 0x28256429 + .4byte 0x3A205352 + .4byte 0x5230203D + .4byte 0x20307825 + .4byte 0x30387820 + .4byte 0x20544220 + .4byte 0x3D203078 + .4byte 0x25303136 + .4byte 0x6C6C780A + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global __OSErrorTable +__OSErrorTable: + .skip 0x50 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __OSFpscrEnableBits +__OSFpscrEnableBits: + + .4byte 0x000000F8 + +.global "@703" +"@703": + + .4byte 0x0A000000 diff --git a/asm/os/OSError_804225b8.s b/asm/os/OSError_804225b8.s deleted file mode 100644 index 9a79a5bd..00000000 --- a/asm/os/OSError_804225b8.s +++ /dev/null @@ -1,190 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@641" -"@641": - - .4byte 0x20696E20 - .4byte 0x22257322 - .4byte 0x206F6E20 - .4byte 0x6C696E65 - .4byte 0x2025642E - .4byte 0x0A000000 - .4byte 0x0A416464 - .4byte 0x72657373 - .4byte 0x3A202020 - .4byte 0x20202042 - .4byte 0x61636B20 - .4byte 0x43686169 - .4byte 0x6E202020 - .4byte 0x204C5220 - .4byte 0x53617665 - .4byte 0x0A000000 - .4byte 0x30782530 - .4byte 0x38783A20 - .4byte 0x20203078 - .4byte 0x25303878 - .4byte 0x20202020 - .4byte 0x30782530 - .4byte 0x38780A00 - .4byte 0x4E6F6E2D - .4byte 0x7265636F - .4byte 0x76657261 - .4byte 0x626C6520 - .4byte 0x45786365 - .4byte 0x7074696F - .4byte 0x6E202564 - .4byte 0 - .4byte 0x556E6861 - .4byte 0x6E646C65 - .4byte 0x64204578 - .4byte 0x63657074 - .4byte 0x696F6E20 - .4byte 0x25640000 - .4byte 0x0A445349 - .4byte 0x5352203D - .4byte 0x20307825 - .4byte 0x30387820 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20204441 - .4byte 0x5220203D - .4byte 0x20307825 - .4byte 0x3038780A - .4byte 0 - .4byte 0x5442203D - .4byte 0x20307825 - .4byte 0x3031366C - .4byte 0x6C780A00 - .4byte 0x0A496E73 - .4byte 0x74727563 - .4byte 0x74696F6E - .4byte 0x20617420 - .4byte 0x30782578 - .4byte 0x20287265 - .4byte 0x61642066 - .4byte 0x726F6D20 - .4byte 0x53525230 - .4byte 0x29206174 - .4byte 0x74656D70 - .4byte 0x74656420 - .4byte 0x746F2061 - .4byte 0x63636573 - .4byte 0x7320696E - .4byte 0x76616C69 - .4byte 0x64206164 - .4byte 0x64726573 - .4byte 0x73203078 - .4byte 0x25782028 - .4byte 0x72656164 - .4byte 0x2066726F - .4byte 0x6D204441 - .4byte 0x52290A00 - .4byte 0x0A417474 - .4byte 0x656D7074 - .4byte 0x65642074 - .4byte 0x6F206665 - .4byte 0x74636820 - .4byte 0x696E7374 - .4byte 0x72756374 - .4byte 0x696F6E20 - .4byte 0x66726F6D - .4byte 0x20696E76 - .4byte 0x616C6964 - .4byte 0x20616464 - .4byte 0x72657373 - .4byte 0x20307825 - .4byte 0x78202872 - .4byte 0x65616420 - .4byte 0x66726F6D - .4byte 0x20535252 - .4byte 0x30290A00 - .4byte 0x0A496E73 - .4byte 0x74727563 - .4byte 0x74696F6E - .4byte 0x20617420 - .4byte 0x30782578 - .4byte 0x20287265 - .4byte 0x61642066 - .4byte 0x726F6D20 - .4byte 0x53525230 - .4byte 0x29206174 - .4byte 0x74656D70 - .4byte 0x74656420 - .4byte 0x746F2061 - .4byte 0x63636573 - .4byte 0x7320756E - .4byte 0x616C6967 - .4byte 0x6E656420 - .4byte 0x61646472 - .4byte 0x65737320 - .4byte 0x30782578 - .4byte 0x20287265 - .4byte 0x61642066 - .4byte 0x726F6D20 - .4byte 0x44415229 - .4byte 0x0A000000 - .4byte 0x0A50726F - .4byte 0x6772616D - .4byte 0x20657863 - .4byte 0x65707469 - .4byte 0x6F6E203A - .4byte 0x20506F73 - .4byte 0x7369626C - .4byte 0x6520696C - .4byte 0x6C656761 - .4byte 0x6C20696E - .4byte 0x73747275 - .4byte 0x6374696F - .4byte 0x6E2F6F70 - .4byte 0x65726174 - .4byte 0x696F6E20 - .4byte 0x6174206F - .4byte 0x72206172 - .4byte 0x6F756E64 - .4byte 0x20307825 - .4byte 0x78202872 - .4byte 0x65616420 - .4byte 0x66726F6D - .4byte 0x20535252 - .4byte 0x30290A00 - .4byte 0x41492044 - .4byte 0x4D412041 - .4byte 0x64647265 - .4byte 0x7373203D - .4byte 0x20202030 - .4byte 0x78253034 - .4byte 0x78253034 - .4byte 0x780A0000 - .4byte 0x4152414D - .4byte 0x20444D41 - .4byte 0x20416464 - .4byte 0x72657373 - .4byte 0x203D2030 - .4byte 0x78253034 - .4byte 0x78253034 - .4byte 0x780A0000 - .4byte 0x44492044 - .4byte 0x4D412041 - .4byte 0x64647265 - .4byte 0x7373203D - .4byte 0x20202030 - .4byte 0x78253038 - .4byte 0x780A0000 - .4byte 0x0A4C6173 - .4byte 0x7420696E - .4byte 0x74657272 - .4byte 0x75707420 - .4byte 0x28256429 - .4byte 0x3A205352 - .4byte 0x5230203D - .4byte 0x20307825 - .4byte 0x30387820 - .4byte 0x20544220 - .4byte 0x3D203078 - .4byte 0x25303136 - .4byte 0x6C6C780A - .4byte 0 - .4byte 0 diff --git a/asm/os/OSError_80499110.s b/asm/os/OSError_80499110.s deleted file mode 100644 index 9b492851..00000000 --- a/asm/os/OSError_80499110.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global __OSErrorTable -__OSErrorTable: - .skip 0x50 diff --git a/asm/os/OSError_805564c8.s b/asm/os/OSError_805564c8.s deleted file mode 100644 index f7127b72..00000000 --- a/asm/os/OSError_805564c8.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __OSFpscrEnableBits -__OSFpscrEnableBits: - - .4byte 0x000000F8 - -.global "@703" -"@703": - - .4byte 0x0A000000 diff --git a/asm/os/OSExec_8001dfb0.s b/asm/os/OSExec.s similarity index 94% rename from asm/os/OSExec_8001dfb0.s rename to asm/os/OSExec.s index 8547b705..a378338d 100644 --- a/asm/os/OSExec_8001dfb0.s +++ b/asm/os/OSExec.s @@ -1935,3 +1935,271 @@ lbl_8001F838: /* 8001F854 0001B694 4E 80 00 20 */ blr /* 8001F858 0001B698 00 00 00 00 */ .4byte 0x00000000 /* 8001F85C 0001B69C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@3219" +"@3219": + + .4byte 0x0A446973 + .4byte 0x63206572 + .4byte 0x726F7220 + .4byte 0x6F636375 + .4byte 0x72726564 + .4byte 0x210A0000 + .4byte 0x0A54696D + .4byte 0x656F7574 + .4byte 0x20657272 + .4byte 0x6F72206F + .4byte 0x63637572 + .4byte 0x72656421 + .4byte 0x0A000000 + .4byte 0x0A556E65 + .4byte 0x78706563 + .4byte 0x74656420 + .4byte 0x6572726F + .4byte 0x72206F63 + .4byte 0x63757272 + .4byte 0x6564210A + .4byte 0 + .4byte 0x0A546865 + .4byte 0x20737065 + .4byte 0x63696669 + .4byte 0x65642067 + .4byte 0x616D6520 + .4byte 0x646F6573 + .4byte 0x6E277420 + .4byte 0x65786973 + .4byte 0x7420696E + .4byte 0x20746865 + .4byte 0x20646973 + .4byte 0x630A0000 + .4byte 0x0A4F5345 + .4byte 0x78656328 + .4byte 0x293A2046 + .4byte 0x61696C65 + .4byte 0x6420746F + .4byte 0x20657865 + .4byte 0x63202564 + .4byte 0x20696E20 + .4byte 0x25640A00 + .4byte 0x4F534C61 + .4byte 0x756E6368 + .4byte 0x4469736B + .4byte 0x28293A20 + .4byte 0x596F7520 + .4byte 0x63616E27 + .4byte 0x74206361 + .4byte 0x6C6C2074 + .4byte 0x68697320 + .4byte 0x41504920 + .4byte 0x66726F6D + .4byte 0x20445644 + .4byte 0x20617070 + .4byte 0x6C696361 + .4byte 0x74696F6E + .4byte 0x2E20200A + .4byte 0 + .4byte 0x4F534578 + .4byte 0x65632E63 + .4byte 0 + .4byte 0x4F534C61 + .4byte 0x756E6368 + .4byte 0x4469736B + .4byte 0x28293A20 + .4byte 0x596F7520 + .4byte 0x6D757374 + .4byte 0x2063616C + .4byte 0x6C204456 + .4byte 0x44507265 + .4byte 0x70617265 + .4byte 0x4469736B + .4byte 0x20626566 + .4byte 0x6F726520 + .4byte 0x6C61756E + .4byte 0x6368696E + .4byte 0x67206469 + .4byte 0x73632E0A + .4byte 0 + .4byte 0x4F534C61 + .4byte 0x756E6368 + .4byte 0x4469736B + .4byte 0x28293A20 + .4byte 0x53706563 + .4byte 0x69666965 + .4byte 0x64206964 + .4byte 0x20697320 + .4byte 0x64696666 + .4byte 0x6572656E + .4byte 0x74206672 + .4byte 0x6F6D206F + .4byte 0x6E652073 + .4byte 0x70656369 + .4byte 0x66696564 + .4byte 0x20746F20 + .4byte 0x44564450 + .4byte 0x72657061 + .4byte 0x72654469 + .4byte 0x736B2E0A + .4byte 0 + .4byte 0x30303030 + .4byte 0x30303030 + .4byte 0x30303030 + .4byte 0x30303030 + .4byte 0 + +.global "@3378" +"@3378": + + .4byte 0x32303034 + .4byte 0x2F30322F + .4byte 0x30310000 + +.global "@3432" +"@3432": + + .4byte 0x5761726E + .4byte 0x696E673A + .4byte 0x204F5345 + .4byte 0x78656328 + .4byte 0x293A2054 + .4byte 0x68652073 + .4byte 0x70656369 + .4byte 0x66696564 + .4byte 0x2066696C + .4byte 0x6520646F + .4byte 0x65736E27 + .4byte 0x74206578 + .4byte 0x6973742E + .4byte 0x200A0000 + .4byte 0x4F534C61 + .4byte 0x756E6368 + .4byte 0x50617274 + .4byte 0x6974696F + .4byte 0x6E28293A + .4byte 0x20596F75 + .4byte 0x2063616E + .4byte 0x27742063 + .4byte 0x616C6C20 + .4byte 0x74686973 + .4byte 0x20415049 + .4byte 0x2066726F + .4byte 0x6D204E41 + .4byte 0x4E442061 + .4byte 0x70706C69 + .4byte 0x63617469 + .4byte 0x6F6E2E20 + .4byte 0x200A0000 + .4byte 0x4F534C61 + .4byte 0x756E6368 + .4byte 0x50617274 + .4byte 0x6974696F + .4byte 0x6E28293A + .4byte 0x20537065 + .4byte 0x63696669 + .4byte 0x65642074 + .4byte 0x69746C65 + .4byte 0x20494420 + .4byte 0x6973206E + .4byte 0x6F742044 + .4byte 0x49534320 + .4byte 0x6170706C + .4byte 0x69636174 + .4byte 0x696F6E2E + .4byte 0x20200A00 + .4byte 0x2F746974 + .4byte 0x6C652F25 + .4byte 0x3038782F + .4byte 0x25303878 + .4byte 0 + .4byte 0x0A4F534C + .4byte 0x61756E63 + .4byte 0x68506172 + .4byte 0x74697469 + .4byte 0x6F6E2829 + .4byte 0x3A204661 + .4byte 0x696C6564 + .4byte 0x20746F20 + .4byte 0x67657420 + .4byte 0x66726565 + .4byte 0x20692D6E + .4byte 0x6F646573 + .4byte 0x206E756D + .4byte 0x6265720A + .4byte 0 + .4byte 0x0A4F534C + .4byte 0x61756E63 + .4byte 0x68506172 + .4byte 0x74697469 + .4byte 0x6F6E2829 + .4byte 0x3A205468 + .4byte 0x65726520 + .4byte 0x61726520 + .4byte 0x6E6F7420 + .4byte 0x656E6F75 + .4byte 0x67682069 + .4byte 0x2D6E6F64 + .4byte 0x65732074 + .4byte 0x6F206C61 + .4byte 0x756E6368 + .4byte 0x206E6578 + .4byte 0x74207061 + .4byte 0x72746974 + .4byte 0x696F6E0A + .4byte 0 + .4byte 0x0A4F534C + .4byte 0x61756E63 + .4byte 0x68506172 + .4byte 0x74697469 + .4byte 0x6F6E2829 + .4byte 0x3A204661 + .4byte 0x696C6564 + .4byte 0x20746F20 + .4byte 0x67657420 + .4byte 0x6E616E64 + .4byte 0x20737461 + .4byte 0x7475730A + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global id +id: + .skip 0x20 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@3377_805564D0" +"@3377_805564D0": + + .4byte 0x25303136 + .4byte 0x6C6C7800 + +.global "@3424" +"@3424": + + .4byte 0x25640000 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global __OSNextPartitionType +__OSNextPartitionType: + .skip 0x4 + +.global "@LOCAL@GetApploaderPosition__Fv@apploaderPosition" +"@LOCAL@GetApploaderPosition__Fv@apploaderPosition": + .skip 0x4 + +.global DVDLowIntType +DVDLowIntType: + .skip 0x4 + +.global __OSInReboot +__OSInReboot: + .skip 0x4 + +.global Prepared_8055C7F0 +Prepared_8055C7F0: + .skip 0x8 diff --git a/asm/os/OSExec_80422898.s b/asm/os/OSExec_80422898.s deleted file mode 100644 index 5b8cba76..00000000 --- a/asm/os/OSExec_80422898.s +++ /dev/null @@ -1,226 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@3219" -"@3219": - - .4byte 0x0A446973 - .4byte 0x63206572 - .4byte 0x726F7220 - .4byte 0x6F636375 - .4byte 0x72726564 - .4byte 0x210A0000 - .4byte 0x0A54696D - .4byte 0x656F7574 - .4byte 0x20657272 - .4byte 0x6F72206F - .4byte 0x63637572 - .4byte 0x72656421 - .4byte 0x0A000000 - .4byte 0x0A556E65 - .4byte 0x78706563 - .4byte 0x74656420 - .4byte 0x6572726F - .4byte 0x72206F63 - .4byte 0x63757272 - .4byte 0x6564210A - .4byte 0 - .4byte 0x0A546865 - .4byte 0x20737065 - .4byte 0x63696669 - .4byte 0x65642067 - .4byte 0x616D6520 - .4byte 0x646F6573 - .4byte 0x6E277420 - .4byte 0x65786973 - .4byte 0x7420696E - .4byte 0x20746865 - .4byte 0x20646973 - .4byte 0x630A0000 - .4byte 0x0A4F5345 - .4byte 0x78656328 - .4byte 0x293A2046 - .4byte 0x61696C65 - .4byte 0x6420746F - .4byte 0x20657865 - .4byte 0x63202564 - .4byte 0x20696E20 - .4byte 0x25640A00 - .4byte 0x4F534C61 - .4byte 0x756E6368 - .4byte 0x4469736B - .4byte 0x28293A20 - .4byte 0x596F7520 - .4byte 0x63616E27 - .4byte 0x74206361 - .4byte 0x6C6C2074 - .4byte 0x68697320 - .4byte 0x41504920 - .4byte 0x66726F6D - .4byte 0x20445644 - .4byte 0x20617070 - .4byte 0x6C696361 - .4byte 0x74696F6E - .4byte 0x2E20200A - .4byte 0 - .4byte 0x4F534578 - .4byte 0x65632E63 - .4byte 0 - .4byte 0x4F534C61 - .4byte 0x756E6368 - .4byte 0x4469736B - .4byte 0x28293A20 - .4byte 0x596F7520 - .4byte 0x6D757374 - .4byte 0x2063616C - .4byte 0x6C204456 - .4byte 0x44507265 - .4byte 0x70617265 - .4byte 0x4469736B - .4byte 0x20626566 - .4byte 0x6F726520 - .4byte 0x6C61756E - .4byte 0x6368696E - .4byte 0x67206469 - .4byte 0x73632E0A - .4byte 0 - .4byte 0x4F534C61 - .4byte 0x756E6368 - .4byte 0x4469736B - .4byte 0x28293A20 - .4byte 0x53706563 - .4byte 0x69666965 - .4byte 0x64206964 - .4byte 0x20697320 - .4byte 0x64696666 - .4byte 0x6572656E - .4byte 0x74206672 - .4byte 0x6F6D206F - .4byte 0x6E652073 - .4byte 0x70656369 - .4byte 0x66696564 - .4byte 0x20746F20 - .4byte 0x44564450 - .4byte 0x72657061 - .4byte 0x72654469 - .4byte 0x736B2E0A - .4byte 0 - .4byte 0x30303030 - .4byte 0x30303030 - .4byte 0x30303030 - .4byte 0x30303030 - .4byte 0 - -.global "@3378" -"@3378": - - .4byte 0x32303034 - .4byte 0x2F30322F - .4byte 0x30310000 - -.global "@3432" -"@3432": - - .4byte 0x5761726E - .4byte 0x696E673A - .4byte 0x204F5345 - .4byte 0x78656328 - .4byte 0x293A2054 - .4byte 0x68652073 - .4byte 0x70656369 - .4byte 0x66696564 - .4byte 0x2066696C - .4byte 0x6520646F - .4byte 0x65736E27 - .4byte 0x74206578 - .4byte 0x6973742E - .4byte 0x200A0000 - .4byte 0x4F534C61 - .4byte 0x756E6368 - .4byte 0x50617274 - .4byte 0x6974696F - .4byte 0x6E28293A - .4byte 0x20596F75 - .4byte 0x2063616E - .4byte 0x27742063 - .4byte 0x616C6C20 - .4byte 0x74686973 - .4byte 0x20415049 - .4byte 0x2066726F - .4byte 0x6D204E41 - .4byte 0x4E442061 - .4byte 0x70706C69 - .4byte 0x63617469 - .4byte 0x6F6E2E20 - .4byte 0x200A0000 - .4byte 0x4F534C61 - .4byte 0x756E6368 - .4byte 0x50617274 - .4byte 0x6974696F - .4byte 0x6E28293A - .4byte 0x20537065 - .4byte 0x63696669 - .4byte 0x65642074 - .4byte 0x69746C65 - .4byte 0x20494420 - .4byte 0x6973206E - .4byte 0x6F742044 - .4byte 0x49534320 - .4byte 0x6170706C - .4byte 0x69636174 - .4byte 0x696F6E2E - .4byte 0x20200A00 - .4byte 0x2F746974 - .4byte 0x6C652F25 - .4byte 0x3038782F - .4byte 0x25303878 - .4byte 0 - .4byte 0x0A4F534C - .4byte 0x61756E63 - .4byte 0x68506172 - .4byte 0x74697469 - .4byte 0x6F6E2829 - .4byte 0x3A204661 - .4byte 0x696C6564 - .4byte 0x20746F20 - .4byte 0x67657420 - .4byte 0x66726565 - .4byte 0x20692D6E - .4byte 0x6F646573 - .4byte 0x206E756D - .4byte 0x6265720A - .4byte 0 - .4byte 0x0A4F534C - .4byte 0x61756E63 - .4byte 0x68506172 - .4byte 0x74697469 - .4byte 0x6F6E2829 - .4byte 0x3A205468 - .4byte 0x65726520 - .4byte 0x61726520 - .4byte 0x6E6F7420 - .4byte 0x656E6F75 - .4byte 0x67682069 - .4byte 0x2D6E6F64 - .4byte 0x65732074 - .4byte 0x6F206C61 - .4byte 0x756E6368 - .4byte 0x206E6578 - .4byte 0x74207061 - .4byte 0x72746974 - .4byte 0x696F6E0A - .4byte 0 - .4byte 0x0A4F534C - .4byte 0x61756E63 - .4byte 0x68506172 - .4byte 0x74697469 - .4byte 0x6F6E2829 - .4byte 0x3A204661 - .4byte 0x696C6564 - .4byte 0x20746F20 - .4byte 0x67657420 - .4byte 0x6E616E64 - .4byte 0x20737461 - .4byte 0x7475730A - .4byte 0 - .4byte 0 diff --git a/asm/os/OSExec_80499160.s b/asm/os/OSExec_80499160.s deleted file mode 100644 index 03e63149..00000000 --- a/asm/os/OSExec_80499160.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global id -id: - .skip 0x20 diff --git a/asm/os/OSExec_805564d0.s b/asm/os/OSExec_805564d0.s deleted file mode 100644 index 68401e21..00000000 --- a/asm/os/OSExec_805564d0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@3377_805564D0" -"@3377_805564D0": - - .4byte 0x25303136 - .4byte 0x6C6C7800 - -.global "@3424" -"@3424": - - .4byte 0x25640000 - .4byte 0 diff --git a/asm/os/OSExec_8055c7e0.s b/asm/os/OSExec_8055c7e0.s deleted file mode 100644 index ead529e0..00000000 --- a/asm/os/OSExec_8055c7e0.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global __OSNextPartitionType -__OSNextPartitionType: - .skip 0x4 - -.global "@LOCAL@GetApploaderPosition__Fv@apploaderPosition" -"@LOCAL@GetApploaderPosition__Fv@apploaderPosition": - .skip 0x4 - -.global DVDLowIntType -DVDLowIntType: - .skip 0x4 - -.global __OSInReboot -__OSInReboot: - .skip 0x4 - -.global Prepared_8055C7F0 -Prepared_8055C7F0: - .skip 0x8 diff --git a/asm/os/OSFatal_8001f860.s b/asm/os/OSFatal.s similarity index 97% rename from asm/os/OSFatal_8001f860.s rename to asm/os/OSFatal.s index 843863b4..16a085db 100644 --- a/asm/os/OSFatal_8001f860.s +++ b/asm/os/OSFatal.s @@ -889,3 +889,95 @@ lbl_80020440: /* 80020484 0001C2C4 4E 80 00 20 */ blr /* 80020488 0001C2C8 00 00 00 00 */ .4byte 0x00000000 /* 8002048C 0001C2CC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global FatalContext +FatalContext: + .skip 0x2C8 + +.global FatalParam +FatalParam: + .skip 0x18 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@2599" +"@2599": + + .4byte 0x25730A00 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2586_8055E4D0" +"@2586_8055E4D0": + + .4byte 0x3F000000 + +.global "@2587" +"@2587": + + .4byte 0x41800000 + +.global "@2588" +"@2588": + + .4byte 0x3DC8B439 + +.global "@2589" +"@2589": + + .4byte 0x3E839581 + +.global "@2590_8055E4E0" +"@2590_8055E4E0": + + .4byte 0x3F010625 + +.global "@2591_8055E4E4" +"@2591_8055E4E4": + + .4byte 0x43000000 + +.global "@2592_8055E4E8" +"@2592_8055E4E8": + + .4byte 0x3EE0C49C + +.global "@2593" +"@2593": + + .4byte 0xBE178D50 + +.global "@2594" +"@2594": + + .4byte 0x3E94FDF4 + +.global "@2595" +"@2595": + + .4byte 0x3EBC6A7F + +.global "@2596_8055E4F8" +"@2596_8055E4F8": + + .4byte 0x3D916873 + +.global "@2597_8055E4FC" +"@2597_8055E4FC": + + .4byte 0x436B0000 + +.global "@2598" +"@2598": + + .4byte 0x43700000 + .4byte 0 + +.global "@2602_8055E508" +"@2602_8055E508": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/os/OSFatal_80499180.s b/asm/os/OSFatal_80499180.s deleted file mode 100644 index e6037f97..00000000 --- a/asm/os/OSFatal_80499180.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global FatalContext -FatalContext: - .skip 0x2C8 - -.global FatalParam -FatalParam: - .skip 0x18 diff --git a/asm/os/OSFatal_805564e0.s b/asm/os/OSFatal_805564e0.s deleted file mode 100644 index ffe0af6b..00000000 --- a/asm/os/OSFatal_805564e0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@2599" -"@2599": - - .4byte 0x25730A00 - .4byte 0 diff --git a/asm/os/OSFatal_8055e4d0.s b/asm/os/OSFatal_8055e4d0.s deleted file mode 100644 index dda4204c..00000000 --- a/asm/os/OSFatal_8055e4d0.s +++ /dev/null @@ -1,74 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2586_8055E4D0" -"@2586_8055E4D0": - - .4byte 0x3F000000 - -.global "@2587" -"@2587": - - .4byte 0x41800000 - -.global "@2588" -"@2588": - - .4byte 0x3DC8B439 - -.global "@2589" -"@2589": - - .4byte 0x3E839581 - -.global "@2590_8055E4E0" -"@2590_8055E4E0": - - .4byte 0x3F010625 - -.global "@2591_8055E4E4" -"@2591_8055E4E4": - - .4byte 0x43000000 - -.global "@2592_8055E4E8" -"@2592_8055E4E8": - - .4byte 0x3EE0C49C - -.global "@2593" -"@2593": - - .4byte 0xBE178D50 - -.global "@2594" -"@2594": - - .4byte 0x3E94FDF4 - -.global "@2595" -"@2595": - - .4byte 0x3EBC6A7F - -.global "@2596_8055E4F8" -"@2596_8055E4F8": - - .4byte 0x3D916873 - -.global "@2597_8055E4FC" -"@2597_8055E4FC": - - .4byte 0x436B0000 - -.global "@2598" -"@2598": - - .4byte 0x43700000 - .4byte 0 - -.global "@2602_8055E508" -"@2602_8055E508": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/os/OSFont_80020490.s b/asm/os/OSFont.s similarity index 85% rename from asm/os/OSFont_80020490.s rename to asm/os/OSFont.s index dfbb5e2e..75155024 100644 --- a/asm/os/OSFont_80020490.s +++ b/asm/os/OSFont.s @@ -1504,3 +1504,759 @@ lbl_8002180C: /* 80021814 0001D654 7C 08 03 A6 */ mtlr r0 /* 80021818 0001D658 38 21 00 20 */ addi r1, r1, 0x20 /* 8002181C 0001D65C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global HankakuToCode +HankakuToCode: + + .4byte 0x020C020D + .4byte 0x020E020F + .4byte 0x02100211 + .4byte 0x02120213 + .4byte 0x02140215 + .4byte 0x02160217 + .4byte 0x02180219 + .4byte 0x021A021B + .4byte 0x021C021D + .4byte 0x021E021F + .4byte 0x02200221 + .4byte 0x02220223 + .4byte 0x02240225 + .4byte 0x02260227 + .4byte 0x02280229 + .4byte 0x022A022B + .4byte 0x022C022D + .4byte 0x022E022F + .4byte 0x02300231 + .4byte 0x02320233 + .4byte 0x02340235 + .4byte 0x02360237 + .4byte 0x02380239 + .4byte 0x023A023B + .4byte 0x023C023D + .4byte 0x023E023F + .4byte 0x02400241 + .4byte 0x02420243 + .4byte 0x02440245 + .4byte 0x02460247 + .4byte 0x02480249 + .4byte 0x024A024B + .4byte 0x024C024D + .4byte 0x024E024F + .4byte 0x02500251 + .4byte 0x02520253 + .4byte 0x02540255 + .4byte 0x02560257 + .4byte 0x02580259 + .4byte 0x025A025B + .4byte 0x025C025D + .4byte 0x025E025F + .4byte 0x02600261 + .4byte 0x02620263 + .4byte 0x02640265 + .4byte 0x02660267 + .4byte 0x02680269 + .4byte 0x026A020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C026B + .4byte 0x026C026D + .4byte 0x026E026F + .4byte 0x02700271 + .4byte 0x02720273 + .4byte 0x02740275 + .4byte 0x02760277 + .4byte 0x02780279 + .4byte 0x027A027B + .4byte 0x027C027D + .4byte 0x027E027F + .4byte 0x02800281 + .4byte 0x02820283 + .4byte 0x02840285 + .4byte 0x02860287 + .4byte 0x02880289 + .4byte 0x028A028B + .4byte 0x028C028D + .4byte 0x028E028F + .4byte 0x02900291 + .4byte 0x02920293 + .4byte 0x02940295 + .4byte 0x02960297 + .4byte 0x02980299 + .4byte 0x029A029B + .4byte 0x029C029D + .4byte 0x029E029F + .4byte 0x02A002A1 + .4byte 0x02A202A3 + .4byte 0x02A402A5 + .4byte 0x02A602A7 + .4byte 0x02A802A9 + +.global Zenkaku2Code +Zenkaku2Code: + + .4byte 0x00000001 + .4byte 0x00020003 + .4byte 0x00040005 + .4byte 0x00060007 + .4byte 0x00080009 + .4byte 0x000A000B + .4byte 0x000C000D + .4byte 0x000E000F + .4byte 0x00100011 + .4byte 0x00120013 + .4byte 0x00140015 + .4byte 0x00160017 + .4byte 0x00180019 + .4byte 0x001A001B + .4byte 0x001C001D + .4byte 0x001E001F + .4byte 0x00200021 + .4byte 0x00220023 + .4byte 0x00240025 + .4byte 0x00260027 + .4byte 0x00280029 + .4byte 0x002A002B + .4byte 0x002C002D + .4byte 0x002E002F + .4byte 0x00300031 + .4byte 0x00320033 + .4byte 0x00340035 + .4byte 0x00360037 + .4byte 0x00380039 + .4byte 0x003A003B + .4byte 0x003C003D + .4byte 0x003E003F + .4byte 0x00400041 + .4byte 0x00420043 + .4byte 0x00440045 + .4byte 0x00460047 + .4byte 0x00480049 + .4byte 0x004A004B + .4byte 0x004C004D + .4byte 0x004E004F + .4byte 0x00500051 + .4byte 0x00520053 + .4byte 0x00540055 + .4byte 0x00560057 + .4byte 0x00580059 + .4byte 0x005A005B + .4byte 0x005C005D + .4byte 0x005E005F + .4byte 0x00600061 + .4byte 0x00620063 + .4byte 0x00640065 + .4byte 0x00660067 + .4byte 0x00680069 + .4byte 0x006A006B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000006C + .4byte 0x006D006E + .4byte 0x006F0070 + .4byte 0x00710072 + .4byte 0x00730000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000074 + .4byte 0x00750076 + .4byte 0x00770078 + .4byte 0x0079007A + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000007B + .4byte 0x007C007D + .4byte 0x007E007F + .4byte 0x00800081 + .4byte 0x00820083 + .4byte 0x00840085 + .4byte 0x00860087 + .4byte 0x00880089 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000008A + .4byte 0x008B008C + .4byte 0x008D008E + .4byte 0x008F0090 + .4byte 0x00910000 + .4byte 0 + .4byte 0x00000092 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000093 + .4byte 0x00940095 + .4byte 0x00960097 + .4byte 0x00980099 + .4byte 0x009A009B + .4byte 0x009C0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x009D009E + .4byte 0x009F00A0 + .4byte 0x00A100A2 + .4byte 0x00A300A4 + .4byte 0x00A500A6 + .4byte 0x00A700A8 + .4byte 0x00A900AA + .4byte 0x00AB00AC + .4byte 0x00AD00AE + .4byte 0x00AF00B0 + .4byte 0x00B100B2 + .4byte 0x00B300B4 + .4byte 0x00B500B6 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00B700B8 + .4byte 0x00B900BA + .4byte 0x00BB00BC + .4byte 0x00BD00BE + .4byte 0x00BF00C0 + .4byte 0x00C100C2 + .4byte 0x00C300C4 + .4byte 0x00C500C6 + .4byte 0x00C700C8 + .4byte 0x00C900CA + .4byte 0x00CB00CC + .4byte 0x00CD00CE + .4byte 0x00CF00D0 + .4byte 0 + .4byte 0 + .4byte 0x00D100D2 + .4byte 0x00D300D4 + .4byte 0x00D500D6 + .4byte 0x00D700D8 + .4byte 0x00D900DA + .4byte 0x00DB00DC + .4byte 0x00DD00DE + .4byte 0x00DF00E0 + .4byte 0x00E100E2 + .4byte 0x00E300E4 + .4byte 0x00E500E6 + .4byte 0x00E700E8 + .4byte 0x00E900EA + .4byte 0x00EB00EC + .4byte 0x00ED00EE + .4byte 0x00EF00F0 + .4byte 0x00F100F2 + .4byte 0x00F300F4 + .4byte 0x00F500F6 + .4byte 0x00F700F8 + .4byte 0x00F900FA + .4byte 0x00FB00FC + .4byte 0x00FD00FE + .4byte 0x00FF0100 + .4byte 0x01010102 + .4byte 0x01030104 + .4byte 0x01050106 + .4byte 0x01070108 + .4byte 0x0109010A + .4byte 0x010B010C + .4byte 0x010D010E + .4byte 0x010F0110 + .4byte 0x01110112 + .4byte 0x01130114 + .4byte 0x01150116 + .4byte 0x01170118 + .4byte 0x0119011A + .4byte 0x011B011C + .4byte 0x011D011E + .4byte 0x011F0120 + .4byte 0x01210122 + .4byte 0x01230000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01240125 + .4byte 0x01260127 + .4byte 0x01280129 + .4byte 0x012A012B + .4byte 0x012C012D + .4byte 0x012E012F + .4byte 0x01300131 + .4byte 0x01320133 + .4byte 0x01340135 + .4byte 0x01360137 + .4byte 0x01380139 + .4byte 0x013A013B + .4byte 0x013C013D + .4byte 0x013E013F + .4byte 0x01400141 + .4byte 0x01420143 + .4byte 0x01440145 + .4byte 0x01460147 + .4byte 0x01480149 + .4byte 0x014A014B + .4byte 0x014C014D + .4byte 0x014E014F + .4byte 0x01500151 + .4byte 0x01520153 + .4byte 0x01540155 + .4byte 0x01560157 + .4byte 0x01580159 + .4byte 0x015A015B + .4byte 0x015C015D + .4byte 0x015E015F + .4byte 0x01600161 + .4byte 0x01620163 + .4byte 0x01640165 + .4byte 0x01660167 + .4byte 0x01680169 + .4byte 0x016A016B + .4byte 0x016C016D + .4byte 0x016E016F + .4byte 0x01700171 + .4byte 0x01720173 + .4byte 0x01740175 + .4byte 0x01760177 + .4byte 0x01780179 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x017A017B + .4byte 0x017C017D + .4byte 0x017E017F + .4byte 0x01800181 + .4byte 0x01820183 + .4byte 0x01840185 + .4byte 0x01860187 + .4byte 0x01880189 + .4byte 0x018A018B + .4byte 0x018C018D + .4byte 0x018E018F + .4byte 0x01900191 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01920193 + .4byte 0x01940195 + .4byte 0x01960197 + .4byte 0x01980199 + .4byte 0x019A019B + .4byte 0x019C019D + .4byte 0x019E019F + .4byte 0x01A001A1 + .4byte 0x01A201A3 + .4byte 0x01A401A5 + .4byte 0x01A601A7 + .4byte 0x01A801A9 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01AA01AB + .4byte 0x01AC01AD + .4byte 0x01AE01AF + .4byte 0x01B001B1 + .4byte 0x01B201B3 + .4byte 0x01B401B5 + .4byte 0x01B601B7 + .4byte 0x01B801B9 + .4byte 0x01BA01BB + .4byte 0x01BC01BD + .4byte 0x01BE01BF + .4byte 0x01C001C1 + .4byte 0x01C201C3 + .4byte 0x01C401C5 + .4byte 0x01C601C7 + .4byte 0x01C801C9 + .4byte 0x01CA0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01CB01CC + .4byte 0x01CD01CE + .4byte 0x01CF01D0 + .4byte 0x01D101D2 + .4byte 0x01D301D4 + .4byte 0x01D501D6 + .4byte 0x01D701D8 + .4byte 0x01D901DA + .4byte 0x01DB01DC + .4byte 0x01DD01DE + .4byte 0x01DF01E0 + .4byte 0x01E101E2 + .4byte 0x01E301E4 + .4byte 0x01E501E6 + .4byte 0x01E701E8 + .4byte 0x01E901EA + .4byte 0x01EB0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x01EC01ED + .4byte 0x01EE01EF + .4byte 0x01F001F1 + .4byte 0x01F201F3 + .4byte 0x01F401F5 + .4byte 0x01F601F7 + .4byte 0x01F801F9 + .4byte 0x01FA01FB + .4byte 0x01FC01FD + .4byte 0x01FE01FF + .4byte 0x02000201 + .4byte 0x02020203 + .4byte 0x02040205 + .4byte 0x02060207 + .4byte 0x02080209 + .4byte 0x020A020B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000020C + .4byte 0x020D020E + .4byte 0x020F0210 + .4byte 0x02110212 + .4byte 0x02130214 + .4byte 0x02150216 + .4byte 0x02170218 + .4byte 0x0219021A + .4byte 0x021B021C + .4byte 0x021D021E + .4byte 0x021F0220 + .4byte 0x02210222 + .4byte 0x02230224 + .4byte 0x02250226 + .4byte 0x02270228 + .4byte 0x0229022A + .4byte 0x022B022C + .4byte 0x022D022E + .4byte 0x022F0230 + .4byte 0x02310232 + .4byte 0x02330234 + .4byte 0x02350236 + .4byte 0x02370238 + .4byte 0x0239023A + .4byte 0x023B023C + .4byte 0x023D023E + .4byte 0x023F0240 + .4byte 0x02410242 + .4byte 0x02430244 + .4byte 0x02450246 + .4byte 0x02470248 + .4byte 0x0249024A + .4byte 0x024B024C + .4byte 0x024D024E + .4byte 0x024F0250 + .4byte 0x02510252 + .4byte 0x02530254 + .4byte 0x02550256 + .4byte 0x02570258 + .4byte 0x0259025A + .4byte 0x025B025C + .4byte 0x025D025E + .4byte 0x025F0260 + .4byte 0x02610262 + .4byte 0x02630264 + .4byte 0x02650266 + .4byte 0x02670268 + .4byte 0x0269026A + .4byte 0x026B026C + .4byte 0x026D026E + .4byte 0x026F0270 + .4byte 0x02710272 + .4byte 0x02730274 + .4byte 0x02750276 + .4byte 0x02770278 + .4byte 0x0279027A + .4byte 0x027B027C + .4byte 0x027D027E + .4byte 0x027F0280 + .4byte 0x02810282 + .4byte 0x02830284 + .4byte 0x02850286 + .4byte 0x02870288 + .4byte 0x0289028A + .4byte 0x028B028C + .4byte 0x028D028E + .4byte 0x028F0290 + .4byte 0x02910292 + .4byte 0x02930294 + .4byte 0x02950296 + .4byte 0x02970298 + .4byte 0x0299029A + .4byte 0x029B029C + .4byte 0x029D029E + .4byte 0x029F02A0 + .4byte 0x02A102A2 + .4byte 0x02A302A4 + .4byte 0x02A502A6 + .4byte 0x02A702A8 + .4byte 0x02A902AA + .4byte 0x02AB02AC + .4byte 0x02AD02AE + .4byte 0x02AF02B0 + .4byte 0x02B102B2 + .4byte 0x02B302B4 + .4byte 0x02B502B6 + .4byte 0x02B702B8 + .4byte 0x02B902BA + .4byte 0x02BB02BC + .4byte 0x02BD02BE + .4byte 0x02BF02C0 + .4byte 0x02C102C2 + .4byte 0x02C302C4 + .4byte 0x02C502C6 + .4byte 0x02C702C8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x02C902CA + .4byte 0x02CB02CC + .4byte 0x02CD02CE + .4byte 0x02CF02D0 + .4byte 0x02D102D2 + .4byte 0x02D302D4 + .4byte 0x02D502D6 + .4byte 0x02D702D8 + .4byte 0x02D902DA + .4byte 0x02DB02DC + .4byte 0x02DD02DE + .4byte 0x02DF02E0 + .4byte 0x02E102E2 + .4byte 0x02E302E4 + .4byte 0x02E502E6 + .4byte 0x000002E7 + .4byte 0x02E802E9 + .4byte 0x02EA02EB + .4byte 0x02EC02ED + .4byte 0x02EE02EF + .4byte 0x02F002F1 + .4byte 0x02F202F3 + .4byte 0x02F402F5 + .4byte 0x02F602F7 + .4byte 0x02F802F9 + .4byte 0x02FA02FB + .4byte 0x02FC02FD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x02FE02FF + .4byte 0x03000301 + .4byte 0x03020303 + .4byte 0x03040305 + .4byte 0x03060307 + .4byte 0x03080309 + .4byte 0x030A030B + .4byte 0x030C030D + .4byte 0x030E030F + .4byte 0x03100311 + .4byte 0x03120313 + .4byte 0x03140315 + .4byte 0x03160317 + .4byte 0x03180319 + .4byte 0x031A031B + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global FontEncode +FontEncode: + + .4byte 0xFFFF0000 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global ParseString +ParseString: + .skip 0x4 + +.global FixedPitch +FixedPitch: + .skip 0x4 + +.global FontDataSjis +FontDataSjis: + .skip 0x4 + +.global FontDataAnsi +FontDataAnsi: + .skip 0x4 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@1601_8055E510" +"@1601_8055E510": + + .4byte 0x2ABE003D + +.global lbl_8055E514 +lbl_8055E514: + + .4byte 0x003D003D diff --git a/asm/os/OSFont_80422be8.s b/asm/os/OSFont_80422be8.s deleted file mode 100644 index 14459f18..00000000 --- a/asm/os/OSFont_80422be8.s +++ /dev/null @@ -1,718 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global HankakuToCode -HankakuToCode: - - .4byte 0x020C020D - .4byte 0x020E020F - .4byte 0x02100211 - .4byte 0x02120213 - .4byte 0x02140215 - .4byte 0x02160217 - .4byte 0x02180219 - .4byte 0x021A021B - .4byte 0x021C021D - .4byte 0x021E021F - .4byte 0x02200221 - .4byte 0x02220223 - .4byte 0x02240225 - .4byte 0x02260227 - .4byte 0x02280229 - .4byte 0x022A022B - .4byte 0x022C022D - .4byte 0x022E022F - .4byte 0x02300231 - .4byte 0x02320233 - .4byte 0x02340235 - .4byte 0x02360237 - .4byte 0x02380239 - .4byte 0x023A023B - .4byte 0x023C023D - .4byte 0x023E023F - .4byte 0x02400241 - .4byte 0x02420243 - .4byte 0x02440245 - .4byte 0x02460247 - .4byte 0x02480249 - .4byte 0x024A024B - .4byte 0x024C024D - .4byte 0x024E024F - .4byte 0x02500251 - .4byte 0x02520253 - .4byte 0x02540255 - .4byte 0x02560257 - .4byte 0x02580259 - .4byte 0x025A025B - .4byte 0x025C025D - .4byte 0x025E025F - .4byte 0x02600261 - .4byte 0x02620263 - .4byte 0x02640265 - .4byte 0x02660267 - .4byte 0x02680269 - .4byte 0x026A020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C020C - .4byte 0x020C026B - .4byte 0x026C026D - .4byte 0x026E026F - .4byte 0x02700271 - .4byte 0x02720273 - .4byte 0x02740275 - .4byte 0x02760277 - .4byte 0x02780279 - .4byte 0x027A027B - .4byte 0x027C027D - .4byte 0x027E027F - .4byte 0x02800281 - .4byte 0x02820283 - .4byte 0x02840285 - .4byte 0x02860287 - .4byte 0x02880289 - .4byte 0x028A028B - .4byte 0x028C028D - .4byte 0x028E028F - .4byte 0x02900291 - .4byte 0x02920293 - .4byte 0x02940295 - .4byte 0x02960297 - .4byte 0x02980299 - .4byte 0x029A029B - .4byte 0x029C029D - .4byte 0x029E029F - .4byte 0x02A002A1 - .4byte 0x02A202A3 - .4byte 0x02A402A5 - .4byte 0x02A602A7 - .4byte 0x02A802A9 - -.global Zenkaku2Code -Zenkaku2Code: - - .4byte 0x00000001 - .4byte 0x00020003 - .4byte 0x00040005 - .4byte 0x00060007 - .4byte 0x00080009 - .4byte 0x000A000B - .4byte 0x000C000D - .4byte 0x000E000F - .4byte 0x00100011 - .4byte 0x00120013 - .4byte 0x00140015 - .4byte 0x00160017 - .4byte 0x00180019 - .4byte 0x001A001B - .4byte 0x001C001D - .4byte 0x001E001F - .4byte 0x00200021 - .4byte 0x00220023 - .4byte 0x00240025 - .4byte 0x00260027 - .4byte 0x00280029 - .4byte 0x002A002B - .4byte 0x002C002D - .4byte 0x002E002F - .4byte 0x00300031 - .4byte 0x00320033 - .4byte 0x00340035 - .4byte 0x00360037 - .4byte 0x00380039 - .4byte 0x003A003B - .4byte 0x003C003D - .4byte 0x003E003F - .4byte 0x00400041 - .4byte 0x00420043 - .4byte 0x00440045 - .4byte 0x00460047 - .4byte 0x00480049 - .4byte 0x004A004B - .4byte 0x004C004D - .4byte 0x004E004F - .4byte 0x00500051 - .4byte 0x00520053 - .4byte 0x00540055 - .4byte 0x00560057 - .4byte 0x00580059 - .4byte 0x005A005B - .4byte 0x005C005D - .4byte 0x005E005F - .4byte 0x00600061 - .4byte 0x00620063 - .4byte 0x00640065 - .4byte 0x00660067 - .4byte 0x00680069 - .4byte 0x006A006B - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x0000006C - .4byte 0x006D006E - .4byte 0x006F0070 - .4byte 0x00710072 - .4byte 0x00730000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000074 - .4byte 0x00750076 - .4byte 0x00770078 - .4byte 0x0079007A - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x0000007B - .4byte 0x007C007D - .4byte 0x007E007F - .4byte 0x00800081 - .4byte 0x00820083 - .4byte 0x00840085 - .4byte 0x00860087 - .4byte 0x00880089 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x0000008A - .4byte 0x008B008C - .4byte 0x008D008E - .4byte 0x008F0090 - .4byte 0x00910000 - .4byte 0 - .4byte 0x00000092 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000093 - .4byte 0x00940095 - .4byte 0x00960097 - .4byte 0x00980099 - .4byte 0x009A009B - .4byte 0x009C0000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x009D009E - .4byte 0x009F00A0 - .4byte 0x00A100A2 - .4byte 0x00A300A4 - .4byte 0x00A500A6 - .4byte 0x00A700A8 - .4byte 0x00A900AA - .4byte 0x00AB00AC - .4byte 0x00AD00AE - .4byte 0x00AF00B0 - .4byte 0x00B100B2 - .4byte 0x00B300B4 - .4byte 0x00B500B6 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00B700B8 - .4byte 0x00B900BA - .4byte 0x00BB00BC - .4byte 0x00BD00BE - .4byte 0x00BF00C0 - .4byte 0x00C100C2 - .4byte 0x00C300C4 - .4byte 0x00C500C6 - .4byte 0x00C700C8 - .4byte 0x00C900CA - .4byte 0x00CB00CC - .4byte 0x00CD00CE - .4byte 0x00CF00D0 - .4byte 0 - .4byte 0 - .4byte 0x00D100D2 - .4byte 0x00D300D4 - .4byte 0x00D500D6 - .4byte 0x00D700D8 - .4byte 0x00D900DA - .4byte 0x00DB00DC - .4byte 0x00DD00DE - .4byte 0x00DF00E0 - .4byte 0x00E100E2 - .4byte 0x00E300E4 - .4byte 0x00E500E6 - .4byte 0x00E700E8 - .4byte 0x00E900EA - .4byte 0x00EB00EC - .4byte 0x00ED00EE - .4byte 0x00EF00F0 - .4byte 0x00F100F2 - .4byte 0x00F300F4 - .4byte 0x00F500F6 - .4byte 0x00F700F8 - .4byte 0x00F900FA - .4byte 0x00FB00FC - .4byte 0x00FD00FE - .4byte 0x00FF0100 - .4byte 0x01010102 - .4byte 0x01030104 - .4byte 0x01050106 - .4byte 0x01070108 - .4byte 0x0109010A - .4byte 0x010B010C - .4byte 0x010D010E - .4byte 0x010F0110 - .4byte 0x01110112 - .4byte 0x01130114 - .4byte 0x01150116 - .4byte 0x01170118 - .4byte 0x0119011A - .4byte 0x011B011C - .4byte 0x011D011E - .4byte 0x011F0120 - .4byte 0x01210122 - .4byte 0x01230000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x01240125 - .4byte 0x01260127 - .4byte 0x01280129 - .4byte 0x012A012B - .4byte 0x012C012D - .4byte 0x012E012F - .4byte 0x01300131 - .4byte 0x01320133 - .4byte 0x01340135 - .4byte 0x01360137 - .4byte 0x01380139 - .4byte 0x013A013B - .4byte 0x013C013D - .4byte 0x013E013F - .4byte 0x01400141 - .4byte 0x01420143 - .4byte 0x01440145 - .4byte 0x01460147 - .4byte 0x01480149 - .4byte 0x014A014B - .4byte 0x014C014D - .4byte 0x014E014F - .4byte 0x01500151 - .4byte 0x01520153 - .4byte 0x01540155 - .4byte 0x01560157 - .4byte 0x01580159 - .4byte 0x015A015B - .4byte 0x015C015D - .4byte 0x015E015F - .4byte 0x01600161 - .4byte 0x01620163 - .4byte 0x01640165 - .4byte 0x01660167 - .4byte 0x01680169 - .4byte 0x016A016B - .4byte 0x016C016D - .4byte 0x016E016F - .4byte 0x01700171 - .4byte 0x01720173 - .4byte 0x01740175 - .4byte 0x01760177 - .4byte 0x01780179 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x017A017B - .4byte 0x017C017D - .4byte 0x017E017F - .4byte 0x01800181 - .4byte 0x01820183 - .4byte 0x01840185 - .4byte 0x01860187 - .4byte 0x01880189 - .4byte 0x018A018B - .4byte 0x018C018D - .4byte 0x018E018F - .4byte 0x01900191 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x01920193 - .4byte 0x01940195 - .4byte 0x01960197 - .4byte 0x01980199 - .4byte 0x019A019B - .4byte 0x019C019D - .4byte 0x019E019F - .4byte 0x01A001A1 - .4byte 0x01A201A3 - .4byte 0x01A401A5 - .4byte 0x01A601A7 - .4byte 0x01A801A9 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x01AA01AB - .4byte 0x01AC01AD - .4byte 0x01AE01AF - .4byte 0x01B001B1 - .4byte 0x01B201B3 - .4byte 0x01B401B5 - .4byte 0x01B601B7 - .4byte 0x01B801B9 - .4byte 0x01BA01BB - .4byte 0x01BC01BD - .4byte 0x01BE01BF - .4byte 0x01C001C1 - .4byte 0x01C201C3 - .4byte 0x01C401C5 - .4byte 0x01C601C7 - .4byte 0x01C801C9 - .4byte 0x01CA0000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x01CB01CC - .4byte 0x01CD01CE - .4byte 0x01CF01D0 - .4byte 0x01D101D2 - .4byte 0x01D301D4 - .4byte 0x01D501D6 - .4byte 0x01D701D8 - .4byte 0x01D901DA - .4byte 0x01DB01DC - .4byte 0x01DD01DE - .4byte 0x01DF01E0 - .4byte 0x01E101E2 - .4byte 0x01E301E4 - .4byte 0x01E501E6 - .4byte 0x01E701E8 - .4byte 0x01E901EA - .4byte 0x01EB0000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x01EC01ED - .4byte 0x01EE01EF - .4byte 0x01F001F1 - .4byte 0x01F201F3 - .4byte 0x01F401F5 - .4byte 0x01F601F7 - .4byte 0x01F801F9 - .4byte 0x01FA01FB - .4byte 0x01FC01FD - .4byte 0x01FE01FF - .4byte 0x02000201 - .4byte 0x02020203 - .4byte 0x02040205 - .4byte 0x02060207 - .4byte 0x02080209 - .4byte 0x020A020B - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x0000020C - .4byte 0x020D020E - .4byte 0x020F0210 - .4byte 0x02110212 - .4byte 0x02130214 - .4byte 0x02150216 - .4byte 0x02170218 - .4byte 0x0219021A - .4byte 0x021B021C - .4byte 0x021D021E - .4byte 0x021F0220 - .4byte 0x02210222 - .4byte 0x02230224 - .4byte 0x02250226 - .4byte 0x02270228 - .4byte 0x0229022A - .4byte 0x022B022C - .4byte 0x022D022E - .4byte 0x022F0230 - .4byte 0x02310232 - .4byte 0x02330234 - .4byte 0x02350236 - .4byte 0x02370238 - .4byte 0x0239023A - .4byte 0x023B023C - .4byte 0x023D023E - .4byte 0x023F0240 - .4byte 0x02410242 - .4byte 0x02430244 - .4byte 0x02450246 - .4byte 0x02470248 - .4byte 0x0249024A - .4byte 0x024B024C - .4byte 0x024D024E - .4byte 0x024F0250 - .4byte 0x02510252 - .4byte 0x02530254 - .4byte 0x02550256 - .4byte 0x02570258 - .4byte 0x0259025A - .4byte 0x025B025C - .4byte 0x025D025E - .4byte 0x025F0260 - .4byte 0x02610262 - .4byte 0x02630264 - .4byte 0x02650266 - .4byte 0x02670268 - .4byte 0x0269026A - .4byte 0x026B026C - .4byte 0x026D026E - .4byte 0x026F0270 - .4byte 0x02710272 - .4byte 0x02730274 - .4byte 0x02750276 - .4byte 0x02770278 - .4byte 0x0279027A - .4byte 0x027B027C - .4byte 0x027D027E - .4byte 0x027F0280 - .4byte 0x02810282 - .4byte 0x02830284 - .4byte 0x02850286 - .4byte 0x02870288 - .4byte 0x0289028A - .4byte 0x028B028C - .4byte 0x028D028E - .4byte 0x028F0290 - .4byte 0x02910292 - .4byte 0x02930294 - .4byte 0x02950296 - .4byte 0x02970298 - .4byte 0x0299029A - .4byte 0x029B029C - .4byte 0x029D029E - .4byte 0x029F02A0 - .4byte 0x02A102A2 - .4byte 0x02A302A4 - .4byte 0x02A502A6 - .4byte 0x02A702A8 - .4byte 0x02A902AA - .4byte 0x02AB02AC - .4byte 0x02AD02AE - .4byte 0x02AF02B0 - .4byte 0x02B102B2 - .4byte 0x02B302B4 - .4byte 0x02B502B6 - .4byte 0x02B702B8 - .4byte 0x02B902BA - .4byte 0x02BB02BC - .4byte 0x02BD02BE - .4byte 0x02BF02C0 - .4byte 0x02C102C2 - .4byte 0x02C302C4 - .4byte 0x02C502C6 - .4byte 0x02C702C8 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x02C902CA - .4byte 0x02CB02CC - .4byte 0x02CD02CE - .4byte 0x02CF02D0 - .4byte 0x02D102D2 - .4byte 0x02D302D4 - .4byte 0x02D502D6 - .4byte 0x02D702D8 - .4byte 0x02D902DA - .4byte 0x02DB02DC - .4byte 0x02DD02DE - .4byte 0x02DF02E0 - .4byte 0x02E102E2 - .4byte 0x02E302E4 - .4byte 0x02E502E6 - .4byte 0x000002E7 - .4byte 0x02E802E9 - .4byte 0x02EA02EB - .4byte 0x02EC02ED - .4byte 0x02EE02EF - .4byte 0x02F002F1 - .4byte 0x02F202F3 - .4byte 0x02F402F5 - .4byte 0x02F602F7 - .4byte 0x02F802F9 - .4byte 0x02FA02FB - .4byte 0x02FC02FD - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x02FE02FF - .4byte 0x03000301 - .4byte 0x03020303 - .4byte 0x03040305 - .4byte 0x03060307 - .4byte 0x03080309 - .4byte 0x030A030B - .4byte 0x030C030D - .4byte 0x030E030F - .4byte 0x03100311 - .4byte 0x03120313 - .4byte 0x03140315 - .4byte 0x03160317 - .4byte 0x03180319 - .4byte 0x031A031B - .4byte 0 - .4byte 0 diff --git a/asm/os/OSFont_805564e8.s b/asm/os/OSFont_805564e8.s deleted file mode 100644 index 12287243..00000000 --- a/asm/os/OSFont_805564e8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global FontEncode -FontEncode: - - .4byte 0xFFFF0000 - .4byte 0 diff --git a/asm/os/OSFont_8055c7f8.s b/asm/os/OSFont_8055c7f8.s deleted file mode 100644 index 3c64911d..00000000 --- a/asm/os/OSFont_8055c7f8.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global ParseString -ParseString: - .skip 0x4 - -.global FixedPitch -FixedPitch: - .skip 0x4 - -.global FontDataSjis -FontDataSjis: - .skip 0x4 - -.global FontDataAnsi -FontDataAnsi: - .skip 0x4 diff --git a/asm/os/OSFont_8055e510.s b/asm/os/OSFont_8055e510.s deleted file mode 100644 index a1f5c1d5..00000000 --- a/asm/os/OSFont_8055e510.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@1601_8055E510" -"@1601_8055E510": - - .4byte 0x2ABE003D - -.global lbl_8055E514 -lbl_8055E514: - - .4byte 0x003D003D diff --git a/asm/os/OSInterrupt_80021820.s b/asm/os/OSInterrupt.s similarity index 97% rename from asm/os/OSInterrupt_80021820.s rename to asm/os/OSInterrupt.s index b0e98dfd..c2e128a8 100644 --- a/asm/os/OSInterrupt_80021820.s +++ b/asm/os/OSInterrupt.s @@ -685,3 +685,43 @@ ExternalInterruptHandler: /* 80021FE4 0001DE24 90 04 01 C0 */ stw r0, 0x1c0(r4) /* 80021FE8 0001DE28 94 21 FF F8 */ stwu r1, -0x8(r1) /* 80021FEC 0001DE2C 4B FF FD 04 */ b __OSDispatchInterrupt +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global InterruptPrioTable +InterruptPrioTable: + + .4byte 0x00000100 + .4byte 0x00000040 + .4byte 0xF8000000 + .4byte 0x00000200 + .4byte 0x00000080 + .4byte 0x00000010 + .4byte 0x00003000 + .4byte 0x00000020 + .4byte 0x03FF8C00 + .4byte 0x04000000 + .4byte 0x00004000 + .4byte 0xFFFFFFFF +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global __OSLastInterruptSrr0 +__OSLastInterruptSrr0: + .skip 0x4 + +.global __OSLastInterrupt +__OSLastInterrupt: + .skip 0x4 + +.global __OSLastInterruptTime +__OSLastInterruptTime: + .skip 0x4 + +.global lbl_8055C814 +lbl_8055C814: + .skip 0x4 + +.global InterruptHandlerTable +InterruptHandlerTable: + .skip 0x8 diff --git a/asm/os/OSInterrupt_804236f8.s b/asm/os/OSInterrupt_804236f8.s deleted file mode 100644 index 8c04abba..00000000 --- a/asm/os/OSInterrupt_804236f8.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global InterruptPrioTable -InterruptPrioTable: - - .4byte 0x00000100 - .4byte 0x00000040 - .4byte 0xF8000000 - .4byte 0x00000200 - .4byte 0x00000080 - .4byte 0x00000010 - .4byte 0x00003000 - .4byte 0x00000020 - .4byte 0x03FF8C00 - .4byte 0x04000000 - .4byte 0x00004000 - .4byte 0xFFFFFFFF diff --git a/asm/os/OSInterrupt_8055c808.s b/asm/os/OSInterrupt_8055c808.s deleted file mode 100644 index 877a5420..00000000 --- a/asm/os/OSInterrupt_8055c808.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global __OSLastInterruptSrr0 -__OSLastInterruptSrr0: - .skip 0x4 - -.global __OSLastInterrupt -__OSLastInterrupt: - .skip 0x4 - -.global __OSLastInterruptTime -__OSLastInterruptTime: - .skip 0x4 - -.global lbl_8055C814 -lbl_8055C814: - .skip 0x4 - -.global InterruptHandlerTable -InterruptHandlerTable: - .skip 0x8 diff --git a/asm/os/OSIpc_800261c0.s b/asm/os/OSIpc.s similarity index 79% rename from asm/os/OSIpc_800261c0.s rename to asm/os/OSIpc.s index 8310e684..2ae572d0 100644 --- a/asm/os/OSIpc_800261c0.s +++ b/asm/os/OSIpc.s @@ -23,3 +23,17 @@ __OSInitIPCBuffer: /* 800261F4 00022034 4E 80 00 20 */ blr /* 800261F8 00022038 00 00 00 00 */ .4byte 0x00000000 /* 800261FC 0002203C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global IpcBufferLo +IpcBufferLo: + + .4byte 0xFFFFFFFF + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global IpcBufferHi +IpcBufferHi: + .skip 0x8 diff --git a/asm/os/OSIpc_805564f8.s b/asm/os/OSIpc_805564f8.s deleted file mode 100644 index 50cc545a..00000000 --- a/asm/os/OSIpc_805564f8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global IpcBufferLo -IpcBufferLo: - - .4byte 0xFFFFFFFF - .4byte 0 diff --git a/asm/os/OSIpc_8055c850.s b/asm/os/OSIpc_8055c850.s deleted file mode 100644 index 21c10207..00000000 --- a/asm/os/OSIpc_8055c850.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global IpcBufferHi -IpcBufferHi: - .skip 0x8 diff --git a/asm/os/OSLaunch_80028320.s b/asm/os/OSLaunch.s similarity index 100% rename from asm/os/OSLaunch_80028320.s rename to asm/os/OSLaunch.s diff --git a/asm/os/OSLink_80021ff0.s b/asm/os/OSLink.s similarity index 100% rename from asm/os/OSLink_80021ff0.s rename to asm/os/OSLink.s diff --git a/asm/os/OSMemory_800222f0.s b/asm/os/OSMemory.s similarity index 98% rename from asm/os/OSMemory_800222f0.s rename to asm/os/OSMemory.s index b56c15c8..c7c788c5 100644 --- a/asm/os/OSMemory_800222f0.s +++ b/asm/os/OSMemory.s @@ -602,3 +602,19 @@ lbl_80022B44: /* 80022B54 0001E994 38 21 00 10 */ addi r1, r1, 0x10 /* 80022B58 0001E998 4E 80 00 20 */ blr /* 80022B5C 0001E99C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global ShutdownFunctionInfo_80423728 +ShutdownFunctionInfo_80423728: + + .4byte OnShutdown_80022320 + .4byte 0x0000007F + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global "@LOCAL@__OSInitMemoryProtection__Fv@initialized" +"@LOCAL@__OSInitMemoryProtection__Fv@initialized": + .skip 0x8 diff --git a/asm/os/OSMemory_80423728.s b/asm/os/OSMemory_80423728.s deleted file mode 100644 index 32d2a4a1..00000000 --- a/asm/os/OSMemory_80423728.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global ShutdownFunctionInfo_80423728 -ShutdownFunctionInfo_80423728: - - .4byte OnShutdown_80022320 - .4byte 0x0000007F - .4byte 0 - .4byte 0 diff --git a/asm/os/OSMemory_8055c820.s b/asm/os/OSMemory_8055c820.s deleted file mode 100644 index 69865b8d..00000000 --- a/asm/os/OSMemory_8055c820.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global "@LOCAL@__OSInitMemoryProtection__Fv@initialized" -"@LOCAL@__OSInitMemoryProtection__Fv@initialized": - .skip 0x8 diff --git a/asm/os/OSMessage_80022010.s b/asm/os/OSMessage.s similarity index 100% rename from asm/os/OSMessage_80022010.s rename to asm/os/OSMessage.s diff --git a/asm/os/OSMutex_80022b60.s b/asm/os/OSMutex.s similarity index 100% rename from asm/os/OSMutex_80022b60.s rename to asm/os/OSMutex.s diff --git a/asm/os/OSNandbootInfo_800277f0.s b/asm/os/OSNandbootInfo.s similarity index 96% rename from asm/os/OSNandbootInfo_800277f0.s rename to asm/os/OSNandbootInfo.s index c7d9d755..93c46736 100644 --- a/asm/os/OSNandbootInfo_800277f0.s +++ b/asm/os/OSNandbootInfo.s @@ -155,3 +155,17 @@ lbl_800279E4: /* 800279F4 00023834 4E 80 00 20 */ blr /* 800279F8 00023838 00 00 00 00 */ .4byte 0x00000000 /* 800279FC 0002383C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@1058_8042FAE0" +"@1058_8042FAE0": + + .4byte 0x2F736861 + .4byte 0x72656432 + .4byte 0x2F737973 + .4byte 0x2F4E414E + .4byte 0x44424F4F + .4byte 0x54494E46 + .4byte 0x4F000000 + .4byte 0 diff --git a/asm/os/OSNandbootInfo_8042fae0.s b/asm/os/OSNandbootInfo_8042fae0.s deleted file mode 100644 index abd90ecf..00000000 --- a/asm/os/OSNandbootInfo_8042fae0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@1058_8042FAE0" -"@1058_8042FAE0": - - .4byte 0x2F736861 - .4byte 0x72656432 - .4byte 0x2F737973 - .4byte 0x2F4E414E - .4byte 0x44424F4F - .4byte 0x54494E46 - .4byte 0x4F000000 - .4byte 0 diff --git a/asm/os/OSNet_80027250.s b/asm/os/OSNet.s similarity index 87% rename from asm/os/OSNet_80027250.s rename to asm/os/OSNet.s index e740db36..85452efa 100644 --- a/asm/os/OSNet_80027250.s +++ b/asm/os/OSNet.s @@ -477,3 +477,163 @@ lbl_800277DC: /* 800277E4 00023624 38 60 00 00 */ li r3, 0x0 /* 800277E8 00023628 4E 80 00 20 */ blr /* 800277EC 0002362C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@1053_8042F978" +"@1053_8042F978": + + .4byte 0x4661696C + .4byte 0x65642074 + .4byte 0x6F207265 + .4byte 0x67697374 + .4byte 0x6572206E + .4byte 0x6574776F + .4byte 0x726B2073 + .4byte 0x68757464 + .4byte 0x6F776E20 + .4byte 0x66756E63 + .4byte 0x74696F6E + .4byte 0x2E202564 + .4byte 0x0A000000 + .4byte 0x4661696C + .4byte 0x65642074 + .4byte 0x6F207375 + .4byte 0x7370656E + .4byte 0x64207468 + .4byte 0x65205769 + .4byte 0x69436F6E + .4byte 0x6E656374 + .4byte 0x32342073 + .4byte 0x63686564 + .4byte 0x756C6572 + .4byte 0x2E202564 + .4byte 0x0A000000 + .4byte 0x4661696C + .4byte 0x65642074 + .4byte 0x6F207379 + .4byte 0x6E636872 + .4byte 0x6F6E697A + .4byte 0x65207469 + .4byte 0x6D652077 + .4byte 0x69746820 + .4byte 0x6E657477 + .4byte 0x6F726B20 + .4byte 0x7265736F + .4byte 0x75726365 + .4byte 0x206D616E + .4byte 0x61676572 + .4byte 0x732E2025 + .4byte 0x640A0000 + .4byte 0x4E574332 + .4byte 0x34695072 + .4byte 0x65706172 + .4byte 0x65536875 + .4byte 0x74646F77 + .4byte 0x6E000000 + +.global "@1069" +"@1069": + + .4byte 0x2F646576 + .4byte 0x2F6E6574 + .4byte 0x2F6B642F + .4byte 0x72657175 + .4byte 0x65737400 + .4byte 0x4E574332 + .4byte 0x34537573 + .4byte 0x70656E64 + .4byte 0x53636865 + .4byte 0x64756C65 + .4byte 0x72000000 + .4byte 0x4E574332 + .4byte 0x34526573 + .4byte 0x756D6553 + .4byte 0x63686564 + .4byte 0x756C6572 + .4byte 0 + .4byte 0x4E574332 + .4byte 0x34695265 + .4byte 0x71756573 + .4byte 0x74536875 + .4byte 0x74646F77 + .4byte 0x6E000000 + +.global "@1122_8042FA94" +"@1122_8042FA94": + + .4byte 0x4E574332 + .4byte 0x34536875 + .4byte 0x74646F77 + .4byte 0x6E5F3A20 + .4byte 0x47697665 + .4byte 0x20757021 + .4byte 0x0A000000 + .4byte 0x4E574332 + .4byte 0x34695365 + .4byte 0x74527463 + .4byte 0x436F756E + .4byte 0x7465725F + .4byte 0 + +.global "@1137" +"@1137": + + .4byte 0x2F646576 + .4byte 0x2F6E6574 + .4byte 0x2F6B642F + .4byte 0x74696D65 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global ShutdownFuncInfo +ShutdownFuncInfo: + .skip 0x20 + +.global "@LOCAL@NWC24SuspendScheduler__Fv@susResult" +"@LOCAL@NWC24SuspendScheduler__Fv@susResult": + .skip 0x20 + +.global "@LOCAL@NWC24iRequestShutdown__FUlPl@shtBuffer" +"@LOCAL@NWC24iRequestShutdown__FUlPl@shtBuffer": + .skip 0x20 + +.global "@LOCAL@NWC24iRequestShutdown__FUlPl@shtResult@0" +"@LOCAL@NWC24iRequestShutdown__FUlPl@shtResult@0": + .skip 0x20 + +.global nwc24TimeCommonBuffer +nwc24TimeCommonBuffer: + .skip 0x20 + +.global nwc24TimeCommonResult +nwc24TimeCommonResult: + .skip 0x20 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global nwc24ShtFd +nwc24ShtFd: + + .4byte 0xFFFFFFFF + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global nwc24ShtRetryRest +nwc24ShtRetryRest: + .skip 0x4 + +.global NWC24iIsRequestPending +NWC24iIsRequestPending: + .skip 0x4 + +.global "@LOCAL@NWC24Shutdown___FiUl@shuttingdown" +"@LOCAL@NWC24Shutdown___FiUl@shuttingdown": + .skip 0x4 + +.global "@LOCAL@NWC24Shutdown___FiUl@result@0" +"@LOCAL@NWC24Shutdown___FiUl@result@0": + .skip 0x4 diff --git a/asm/os/OSNet_8042f978.s b/asm/os/OSNet_8042f978.s deleted file mode 100644 index 716ce2aa..00000000 --- a/asm/os/OSNet_8042f978.s +++ /dev/null @@ -1,108 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@1053_8042F978" -"@1053_8042F978": - - .4byte 0x4661696C - .4byte 0x65642074 - .4byte 0x6F207265 - .4byte 0x67697374 - .4byte 0x6572206E - .4byte 0x6574776F - .4byte 0x726B2073 - .4byte 0x68757464 - .4byte 0x6F776E20 - .4byte 0x66756E63 - .4byte 0x74696F6E - .4byte 0x2E202564 - .4byte 0x0A000000 - .4byte 0x4661696C - .4byte 0x65642074 - .4byte 0x6F207375 - .4byte 0x7370656E - .4byte 0x64207468 - .4byte 0x65205769 - .4byte 0x69436F6E - .4byte 0x6E656374 - .4byte 0x32342073 - .4byte 0x63686564 - .4byte 0x756C6572 - .4byte 0x2E202564 - .4byte 0x0A000000 - .4byte 0x4661696C - .4byte 0x65642074 - .4byte 0x6F207379 - .4byte 0x6E636872 - .4byte 0x6F6E697A - .4byte 0x65207469 - .4byte 0x6D652077 - .4byte 0x69746820 - .4byte 0x6E657477 - .4byte 0x6F726B20 - .4byte 0x7265736F - .4byte 0x75726365 - .4byte 0x206D616E - .4byte 0x61676572 - .4byte 0x732E2025 - .4byte 0x640A0000 - .4byte 0x4E574332 - .4byte 0x34695072 - .4byte 0x65706172 - .4byte 0x65536875 - .4byte 0x74646F77 - .4byte 0x6E000000 - -.global "@1069" -"@1069": - - .4byte 0x2F646576 - .4byte 0x2F6E6574 - .4byte 0x2F6B642F - .4byte 0x72657175 - .4byte 0x65737400 - .4byte 0x4E574332 - .4byte 0x34537573 - .4byte 0x70656E64 - .4byte 0x53636865 - .4byte 0x64756C65 - .4byte 0x72000000 - .4byte 0x4E574332 - .4byte 0x34526573 - .4byte 0x756D6553 - .4byte 0x63686564 - .4byte 0x756C6572 - .4byte 0 - .4byte 0x4E574332 - .4byte 0x34695265 - .4byte 0x71756573 - .4byte 0x74536875 - .4byte 0x74646F77 - .4byte 0x6E000000 - -.global "@1122_8042FA94" -"@1122_8042FA94": - - .4byte 0x4E574332 - .4byte 0x34536875 - .4byte 0x74646F77 - .4byte 0x6E5F3A20 - .4byte 0x47697665 - .4byte 0x20757021 - .4byte 0x0A000000 - .4byte 0x4E574332 - .4byte 0x34695365 - .4byte 0x74527463 - .4byte 0x436F756E - .4byte 0x7465725F - .4byte 0 - -.global "@1137" -"@1137": - - .4byte 0x2F646576 - .4byte 0x2F6E6574 - .4byte 0x2F6B642F - .4byte 0x74696D65 - .4byte 0 - .4byte 0 diff --git a/asm/os/OSNet_8049a1a0.s b/asm/os/OSNet_8049a1a0.s deleted file mode 100644 index 66d57167..00000000 --- a/asm/os/OSNet_8049a1a0.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global ShutdownFuncInfo -ShutdownFuncInfo: - .skip 0x20 - -.global "@LOCAL@NWC24SuspendScheduler__Fv@susResult" -"@LOCAL@NWC24SuspendScheduler__Fv@susResult": - .skip 0x20 - -.global "@LOCAL@NWC24iRequestShutdown__FUlPl@shtBuffer" -"@LOCAL@NWC24iRequestShutdown__FUlPl@shtBuffer": - .skip 0x20 - -.global "@LOCAL@NWC24iRequestShutdown__FUlPl@shtResult@0" -"@LOCAL@NWC24iRequestShutdown__FUlPl@shtResult@0": - .skip 0x20 - -.global nwc24TimeCommonBuffer -nwc24TimeCommonBuffer: - .skip 0x20 - -.global nwc24TimeCommonResult -nwc24TimeCommonResult: - .skip 0x20 diff --git a/asm/os/OSNet_80556508.s b/asm/os/OSNet_80556508.s deleted file mode 100644 index 3074d1d0..00000000 --- a/asm/os/OSNet_80556508.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global nwc24ShtFd -nwc24ShtFd: - - .4byte 0xFFFFFFFF - .4byte 0 diff --git a/asm/os/OSNet_8055c8a0.s b/asm/os/OSNet_8055c8a0.s deleted file mode 100644 index d5bc5bad..00000000 --- a/asm/os/OSNet_8055c8a0.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global nwc24ShtRetryRest -nwc24ShtRetryRest: - .skip 0x4 - -.global NWC24iIsRequestPending -NWC24iIsRequestPending: - .skip 0x4 - -.global "@LOCAL@NWC24Shutdown___FiUl@shuttingdown" -"@LOCAL@NWC24Shutdown___FiUl@shuttingdown": - .skip 0x4 - -.global "@LOCAL@NWC24Shutdown___FiUl@result@0" -"@LOCAL@NWC24Shutdown___FiUl@result@0": - .skip 0x4 diff --git a/asm/os/OSPlayRecord_80026910.s b/asm/os/OSPlayRecord.s similarity index 95% rename from asm/os/OSPlayRecord_80026910.s rename to asm/os/OSPlayRecord.s index 73d60efd..946f545e 100644 --- a/asm/os/OSPlayRecord_80026910.s +++ b/asm/os/OSPlayRecord.s @@ -568,3 +568,79 @@ lbl_80027014: /* 80027024 00022E64 38 21 00 20 */ addi r1, r1, 0x20 /* 80027028 00022E68 4E 80 00 20 */ blr /* 8002702C 00022E6C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@933" +"@933": + + .4byte 0x2F746974 + .4byte 0x6C652F30 + .4byte 0x30303030 + .4byte 0x3030312F + .4byte 0x30303030 + .4byte 0x30303032 + .4byte 0x2F646174 + .4byte 0x612F706C + .4byte 0x61795F72 + .4byte 0x65632E64 + .4byte 0x61740000 + +.global "@983" +"@983": + + .4byte lbl_80026990 + .4byte lbl_8002699C + .4byte lbl_80026A18 + .4byte lbl_80026A5C + .4byte lbl_80026A84 + .4byte lbl_80026A90 + .4byte lbl_80026B18 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global PlayRecord +PlayRecord: + .skip 0x200 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global PlayRecordState +PlayRecordState: + + .4byte 0x00000009 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global PlayRecordGet +PlayRecordGet: + .skip 0x4 + +.global PlayRecordError +PlayRecordError: + .skip 0x4 + +.global PlayRecordTerminate +PlayRecordTerminate: + .skip 0x4 + +.global PlayRecordTerminated +PlayRecordTerminated: + .skip 0x4 + +.global PlayRecordRetry +PlayRecordRetry: + .skip 0x4 + +.global PlayRecordLastError +PlayRecordLastError: + .skip 0x4 + +.global PlayRecordLastCloseTime +PlayRecordLastCloseTime: + .skip 0x4 + +.global lbl_8055C89C +lbl_8055C89C: + .skip 0x4 diff --git a/asm/os/OSPlayRecord_8042f908.s b/asm/os/OSPlayRecord_8042f908.s deleted file mode 100644 index 5a6c3997..00000000 --- a/asm/os/OSPlayRecord_8042f908.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@933" -"@933": - - .4byte 0x2F746974 - .4byte 0x6C652F30 - .4byte 0x30303030 - .4byte 0x3030312F - .4byte 0x30303030 - .4byte 0x30303032 - .4byte 0x2F646174 - .4byte 0x612F706C - .4byte 0x61795F72 - .4byte 0x65632E64 - .4byte 0x61740000 - -.global "@983" -"@983": - - .4byte lbl_80026990 - .4byte lbl_8002699C - .4byte lbl_80026A18 - .4byte lbl_80026A5C - .4byte lbl_80026A84 - .4byte lbl_80026A90 - .4byte lbl_80026B18 diff --git a/asm/os/OSPlayRecord_80499f80.s b/asm/os/OSPlayRecord_80499f80.s deleted file mode 100644 index a8f9f58f..00000000 --- a/asm/os/OSPlayRecord_80499f80.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global PlayRecord -PlayRecord: - .skip 0x200 diff --git a/asm/os/OSPlayRecord_80556500.s b/asm/os/OSPlayRecord_80556500.s deleted file mode 100644 index d61dee53..00000000 --- a/asm/os/OSPlayRecord_80556500.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global PlayRecordState -PlayRecordState: - - .4byte 0x00000009 - .4byte 0 diff --git a/asm/os/OSPlayRecord_8055c880.s b/asm/os/OSPlayRecord_8055c880.s deleted file mode 100644 index 575b7cf7..00000000 --- a/asm/os/OSPlayRecord_8055c880.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global PlayRecordGet -PlayRecordGet: - .skip 0x4 - -.global PlayRecordError -PlayRecordError: - .skip 0x4 - -.global PlayRecordTerminate -PlayRecordTerminate: - .skip 0x4 - -.global PlayRecordTerminated -PlayRecordTerminated: - .skip 0x4 - -.global PlayRecordRetry -PlayRecordRetry: - .skip 0x4 - -.global PlayRecordLastError -PlayRecordLastError: - .skip 0x4 - -.global PlayRecordLastCloseTime -PlayRecordLastCloseTime: - .skip 0x4 - -.global lbl_8055C89C -lbl_8055C89C: - .skip 0x4 diff --git a/asm/os/OSPlayTime_80027a00.s b/asm/os/OSPlayTime.s similarity index 95% rename from asm/os/OSPlayTime_80027a00.s rename to asm/os/OSPlayTime.s index 6cab3c53..02384cc2 100644 --- a/asm/os/OSPlayTime_80027a00.s +++ b/asm/os/OSPlayTime.s @@ -597,3 +597,83 @@ lbl_800281BC: /* 800281D4 00024014 4E 80 00 20 */ blr /* 800281D8 00024018 00 00 00 00 */ .4byte 0x00000000 /* 800281DC 0002401C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@1461_8042FB00" +"@1461_8042FB00": + + .4byte 0x2F736861 + .4byte 0x72656432 + .4byte 0x2F657870 + .4byte 0x69726564 + .4byte 0 + +.global "@1519" +"@1519": + + .4byte 0x4F53506C + .4byte 0x61795469 + .4byte 0x6D652E63 + .4byte 0 + +.global "@1521" +"@1521": + + .4byte 0x506C6179 + .4byte 0x54696D65 + .4byte 0x3A202564 + .4byte 0x20736563 + .4byte 0x6F6E6473 + .4byte 0x206C6566 + .4byte 0x740A0000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global __OSExpireAlarm +__OSExpireAlarm: + .skip 0x30 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@1520" +"@1520": + + .4byte 0x45787069 + .4byte 0x72656400 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global __OSExpireAIFade +__OSExpireAIFade: + .skip 0x4 + +.global __OSExpireSetExpiredFlag +__OSExpireSetExpiredFlag: + .skip 0x4 + +.global __OSExpireCallback +__OSExpireCallback: + .skip 0x8 + +.global __OSExpireTime +__OSExpireTime: + .skip 0x4 + +.global lbl_8055C8C4 +lbl_8055C8C4: + .skip 0x4 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@1446" +"@1446": + + .4byte 0x3F7EB852 + .4byte 0 + +.global "@1448_8055E520" +"@1448_8055E520": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/os/OSPlayTime_8042fb00.s b/asm/os/OSPlayTime_8042fb00.s deleted file mode 100644 index 58a0bff4..00000000 --- a/asm/os/OSPlayTime_8042fb00.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@1461_8042FB00" -"@1461_8042FB00": - - .4byte 0x2F736861 - .4byte 0x72656432 - .4byte 0x2F657870 - .4byte 0x69726564 - .4byte 0 - -.global "@1519" -"@1519": - - .4byte 0x4F53506C - .4byte 0x61795469 - .4byte 0x6D652E63 - .4byte 0 - -.global "@1521" -"@1521": - - .4byte 0x506C6179 - .4byte 0x54696D65 - .4byte 0x3A202564 - .4byte 0x20736563 - .4byte 0x6F6E6473 - .4byte 0x206C6566 - .4byte 0x740A0000 diff --git a/asm/os/OSPlayTime_8049a260.s b/asm/os/OSPlayTime_8049a260.s deleted file mode 100644 index 80fe101b..00000000 --- a/asm/os/OSPlayTime_8049a260.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global __OSExpireAlarm -__OSExpireAlarm: - .skip 0x30 diff --git a/asm/os/OSPlayTime_80556510.s b/asm/os/OSPlayTime_80556510.s deleted file mode 100644 index 585d034d..00000000 --- a/asm/os/OSPlayTime_80556510.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@1520" -"@1520": - - .4byte 0x45787069 - .4byte 0x72656400 diff --git a/asm/os/OSPlayTime_8055c8b0.s b/asm/os/OSPlayTime_8055c8b0.s deleted file mode 100644 index e5ade193..00000000 --- a/asm/os/OSPlayTime_8055c8b0.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global __OSExpireAIFade -__OSExpireAIFade: - .skip 0x4 - -.global __OSExpireSetExpiredFlag -__OSExpireSetExpiredFlag: - .skip 0x4 - -.global __OSExpireCallback -__OSExpireCallback: - .skip 0x8 - -.global __OSExpireTime -__OSExpireTime: - .skip 0x4 - -.global lbl_8055C8C4 -lbl_8055C8C4: - .skip 0x4 diff --git a/asm/os/OSPlayTime_8055e518.s b/asm/os/OSPlayTime_8055e518.s deleted file mode 100644 index 98717aba..00000000 --- a/asm/os/OSPlayTime_8055e518.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@1446" -"@1446": - - .4byte 0x3F7EB852 - .4byte 0 - -.global "@1448_8055E520" -"@1448_8055E520": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/os/OSReboot_80022e80.s b/asm/os/OSReboot.s similarity index 92% rename from asm/os/OSReboot_80022e80.s rename to asm/os/OSReboot.s index 9561ac86..2b951c21 100644 --- a/asm/os/OSReboot_80022e80.s +++ b/asm/os/OSReboot.s @@ -41,3 +41,13 @@ OSGetSaveRegion: /* 80022F04 0001ED44 00 00 00 00 */ .4byte 0x00000000 /* 80022F08 0001ED48 00 00 00 00 */ .4byte 0x00000000 /* 80022F0C 0001ED4C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global SaveStart +SaveStart: + .skip 0x4 + +.global SaveEnd +SaveEnd: + .skip 0x4 diff --git a/asm/os/OSReboot_8055c828.s b/asm/os/OSReboot_8055c828.s deleted file mode 100644 index 7164e02c..00000000 --- a/asm/os/OSReboot_8055c828.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global SaveStart -SaveStart: - .skip 0x4 - -.global SaveEnd -SaveEnd: - .skip 0x4 diff --git a/asm/os/OSReset_80022f10.s b/asm/os/OSReset.s similarity index 91% rename from asm/os/OSReset_80022f10.s rename to asm/os/OSReset.s index 672f5c44..ba5d477d 100644 --- a/asm/os/OSReset_80022f10.s +++ b/asm/os/OSReset.s @@ -730,3 +730,193 @@ OSResetSystem: /* 80023834 0001F674 4C C6 31 82 */ crclr 4*cr1+eq /* 80023838 0001F678 48 16 6F B8 */ b OSPanic /* 8002383C 0001F67C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@2083" +"@2083": + + .4byte 0x4F535265 + .4byte 0x7365742E + .4byte 0x63000000 + +.global "@2084_80423744" +"@2084_80423744": + + .4byte 0x5F5F4F53 + .4byte 0x486F7452 + .4byte 0x65736574 + .4byte 0x28293A20 + .4byte 0x46616C69 + .4byte 0x65642074 + .4byte 0x6F207265 + .4byte 0x73657420 + .4byte 0x73797374 + .4byte 0x656D2E0A + .4byte 0 + .4byte 0x5F5F4F53 + .4byte 0x52657475 + .4byte 0x726E546F + .4byte 0x4D656E75 + .4byte 0x28293A20 + .4byte 0x46616C69 + .4byte 0x65642074 + .4byte 0x6F20626F + .4byte 0x6F742073 + .4byte 0x79737465 + .4byte 0x6D206D65 + .4byte 0x6E752E0A + .4byte 0 + +.global "@2131" +"@2131": + + .4byte 0x4F535265 + .4byte 0x7475726E + .4byte 0x546F4D65 + .4byte 0x6E752829 + .4byte 0x3A204661 + .4byte 0x6C696564 + .4byte 0x20746F20 + .4byte 0x626F6F74 + .4byte 0x20737973 + .4byte 0x74656D20 + .4byte 0x6D656E75 + .4byte 0x2E0A0000 + +.global "@2133" +"@2133": + + .4byte 0x4F535265 + .4byte 0x7475726E + .4byte 0x546F4461 + .4byte 0x74614D61 + .4byte 0x6E616765 + .4byte 0x7228293A + .4byte 0x2046616C + .4byte 0x69656420 + .4byte 0x746F2062 + .4byte 0x6F6F7420 + .4byte 0x73797374 + .4byte 0x656D206D + .4byte 0x656E752E + .4byte 0x0A000000 + .4byte 0x43616C65 + .4byte 0x6E646172 + .4byte 0x2F43616C + .4byte 0x656E6461 + .4byte 0x725F696E + .4byte 0x6465782E + .4byte 0x68746D6C + .4byte 0 + .4byte 0x44697370 + .4byte 0x6C61792F + .4byte 0x44697370 + .4byte 0x6C61795F + .4byte 0x696E6465 + .4byte 0x782E6874 + .4byte 0x6D6C0000 + .4byte 0x536F756E + .4byte 0x642F536F + .4byte 0x756E645F + .4byte 0x696E6465 + .4byte 0x782E6874 + .4byte 0x6D6C0000 + .4byte 0x50617265 + .4byte 0x6E74616C + .4byte 0x5F436F6E + .4byte 0x74726F6C + .4byte 0x2F506172 + .4byte 0x656E7461 + .4byte 0x6C5F436F + .4byte 0x6E74726F + .4byte 0x6C5F696E + .4byte 0x6465782E + .4byte 0x68746D6C + .4byte 0 + .4byte 0x496E7465 + .4byte 0x726E6574 + .4byte 0x2F496E74 + .4byte 0x65726E65 + .4byte 0x745F696E + .4byte 0x6465782E + .4byte 0x68746D6C + .4byte 0 + .4byte 0x57696943 + .4byte 0x6F6E6E65 + .4byte 0x63743234 + .4byte 0x2F576969 + .4byte 0x636F6E6E + .4byte 0x65637432 + .4byte 0x345F696E + .4byte 0x6465782E + .4byte 0x68746D6C + .4byte 0 + .4byte 0x55706461 + .4byte 0x74652F55 + .4byte 0x70646174 + .4byte 0x655F696E + .4byte 0x6465782E + .4byte 0x68746D6C + .4byte 0 + .4byte 0x4F535265 + .4byte 0x7475726E + .4byte 0x546F5365 + .4byte 0x7474696E + .4byte 0x6728293A + .4byte 0x20596F75 + .4byte 0x2063616E + .4byte 0x27742073 + .4byte 0x70656369 + .4byte 0x66792025 + .4byte 0x642E2020 + .4byte 0x0A000000 + +.global "@2163" +"@2163": + + .4byte 0x4F535265 + .4byte 0x73657453 + .4byte 0x79737465 + .4byte 0x6D282920 + .4byte 0x6973206F + .4byte 0x62736F6C + .4byte 0x65746564 + .4byte 0x2E204974 + .4byte 0x20646F65 + .4byte 0x736E2774 + .4byte 0x20776F72 + .4byte 0x6B20616E + .4byte 0x79206C6F + .4byte 0x6E676572 + .4byte 0x2E0A0000 + .4byte 0x4F535365 + .4byte 0x74426F6F + .4byte 0x74446F6C + .4byte 0x28292069 + .4byte 0x73206F62 + .4byte 0x736F6C65 + .4byte 0x7465642E + .4byte 0x20497420 + .4byte 0x646F6573 + .4byte 0x6E277420 + .4byte 0x776F726B + .4byte 0x20616E79 + .4byte 0x206C6F6E + .4byte 0x6765722E + .4byte 0x0A000000 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global bootThisDol +bootThisDol: + .skip 0x4 + +.global __OSIsReturnToIdle +__OSIsReturnToIdle: + .skip 0x4 + +.global ShutdownFunctionQueue +ShutdownFunctionQueue: + .skip 0x8 diff --git a/asm/os/OSReset_80423738.s b/asm/os/OSReset_80423738.s deleted file mode 100644 index 64a1b18c..00000000 --- a/asm/os/OSReset_80423738.s +++ /dev/null @@ -1,176 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@2083" -"@2083": - - .4byte 0x4F535265 - .4byte 0x7365742E - .4byte 0x63000000 - -.global "@2084_80423744" -"@2084_80423744": - - .4byte 0x5F5F4F53 - .4byte 0x486F7452 - .4byte 0x65736574 - .4byte 0x28293A20 - .4byte 0x46616C69 - .4byte 0x65642074 - .4byte 0x6F207265 - .4byte 0x73657420 - .4byte 0x73797374 - .4byte 0x656D2E0A - .4byte 0 - .4byte 0x5F5F4F53 - .4byte 0x52657475 - .4byte 0x726E546F - .4byte 0x4D656E75 - .4byte 0x28293A20 - .4byte 0x46616C69 - .4byte 0x65642074 - .4byte 0x6F20626F - .4byte 0x6F742073 - .4byte 0x79737465 - .4byte 0x6D206D65 - .4byte 0x6E752E0A - .4byte 0 - -.global "@2131" -"@2131": - - .4byte 0x4F535265 - .4byte 0x7475726E - .4byte 0x546F4D65 - .4byte 0x6E752829 - .4byte 0x3A204661 - .4byte 0x6C696564 - .4byte 0x20746F20 - .4byte 0x626F6F74 - .4byte 0x20737973 - .4byte 0x74656D20 - .4byte 0x6D656E75 - .4byte 0x2E0A0000 - -.global "@2133" -"@2133": - - .4byte 0x4F535265 - .4byte 0x7475726E - .4byte 0x546F4461 - .4byte 0x74614D61 - .4byte 0x6E616765 - .4byte 0x7228293A - .4byte 0x2046616C - .4byte 0x69656420 - .4byte 0x746F2062 - .4byte 0x6F6F7420 - .4byte 0x73797374 - .4byte 0x656D206D - .4byte 0x656E752E - .4byte 0x0A000000 - .4byte 0x43616C65 - .4byte 0x6E646172 - .4byte 0x2F43616C - .4byte 0x656E6461 - .4byte 0x725F696E - .4byte 0x6465782E - .4byte 0x68746D6C - .4byte 0 - .4byte 0x44697370 - .4byte 0x6C61792F - .4byte 0x44697370 - .4byte 0x6C61795F - .4byte 0x696E6465 - .4byte 0x782E6874 - .4byte 0x6D6C0000 - .4byte 0x536F756E - .4byte 0x642F536F - .4byte 0x756E645F - .4byte 0x696E6465 - .4byte 0x782E6874 - .4byte 0x6D6C0000 - .4byte 0x50617265 - .4byte 0x6E74616C - .4byte 0x5F436F6E - .4byte 0x74726F6C - .4byte 0x2F506172 - .4byte 0x656E7461 - .4byte 0x6C5F436F - .4byte 0x6E74726F - .4byte 0x6C5F696E - .4byte 0x6465782E - .4byte 0x68746D6C - .4byte 0 - .4byte 0x496E7465 - .4byte 0x726E6574 - .4byte 0x2F496E74 - .4byte 0x65726E65 - .4byte 0x745F696E - .4byte 0x6465782E - .4byte 0x68746D6C - .4byte 0 - .4byte 0x57696943 - .4byte 0x6F6E6E65 - .4byte 0x63743234 - .4byte 0x2F576969 - .4byte 0x636F6E6E - .4byte 0x65637432 - .4byte 0x345F696E - .4byte 0x6465782E - .4byte 0x68746D6C - .4byte 0 - .4byte 0x55706461 - .4byte 0x74652F55 - .4byte 0x70646174 - .4byte 0x655F696E - .4byte 0x6465782E - .4byte 0x68746D6C - .4byte 0 - .4byte 0x4F535265 - .4byte 0x7475726E - .4byte 0x546F5365 - .4byte 0x7474696E - .4byte 0x6728293A - .4byte 0x20596F75 - .4byte 0x2063616E - .4byte 0x27742073 - .4byte 0x70656369 - .4byte 0x66792025 - .4byte 0x642E2020 - .4byte 0x0A000000 - -.global "@2163" -"@2163": - - .4byte 0x4F535265 - .4byte 0x73657453 - .4byte 0x79737465 - .4byte 0x6D282920 - .4byte 0x6973206F - .4byte 0x62736F6C - .4byte 0x65746564 - .4byte 0x2E204974 - .4byte 0x20646F65 - .4byte 0x736E2774 - .4byte 0x20776F72 - .4byte 0x6B20616E - .4byte 0x79206C6F - .4byte 0x6E676572 - .4byte 0x2E0A0000 - .4byte 0x4F535365 - .4byte 0x74426F6F - .4byte 0x74446F6C - .4byte 0x28292069 - .4byte 0x73206F62 - .4byte 0x736F6C65 - .4byte 0x7465642E - .4byte 0x20497420 - .4byte 0x646F6573 - .4byte 0x6E277420 - .4byte 0x776F726B - .4byte 0x20616E79 - .4byte 0x206C6F6E - .4byte 0x6765722E - .4byte 0x0A000000 - .4byte 0 diff --git a/asm/os/OSReset_8055c830.s b/asm/os/OSReset_8055c830.s deleted file mode 100644 index bfa3c637..00000000 --- a/asm/os/OSReset_8055c830.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global bootThisDol -bootThisDol: - .skip 0x4 - -.global __OSIsReturnToIdle -__OSIsReturnToIdle: - .skip 0x4 - -.global ShutdownFunctionQueue -ShutdownFunctionQueue: - .skip 0x8 diff --git a/asm/os/OSRtc_80023840.s b/asm/os/OSRtc.s similarity index 99% rename from asm/os/OSRtc_80023840.s rename to asm/os/OSRtc.s index 6ab50e14..e3687c89 100644 --- a/asm/os/OSRtc_80023840.s +++ b/asm/os/OSRtc.s @@ -787,3 +787,9 @@ lbl_800242DC: /* 800242E4 00020124 7C 08 03 A6 */ mtlr r0 /* 800242E8 00020128 38 21 00 20 */ addi r1, r1, 0x20 /* 800242EC 0002012C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global Scb +Scb: + .skip 0x58 diff --git a/asm/os/OSRtc_80499460.s b/asm/os/OSRtc_80499460.s deleted file mode 100644 index 7e6dc407..00000000 --- a/asm/os/OSRtc_80499460.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global Scb -Scb: - .skip 0x58 diff --git a/asm/os/OSSemaphore_800242f0.s b/asm/os/OSSemaphore.s similarity index 100% rename from asm/os/OSSemaphore_800242f0.s rename to asm/os/OSSemaphore.s diff --git a/asm/os/OSStateFlags_80027030.s b/asm/os/OSStateFlags.s similarity index 94% rename from asm/os/OSStateFlags_80027030.s rename to asm/os/OSStateFlags.s index 54c585f6..6790f963 100644 --- a/asm/os/OSStateFlags_80027030.s +++ b/asm/os/OSStateFlags.s @@ -157,3 +157,25 @@ lbl_80027228: /* 80027244 00023084 4E 80 00 20 */ blr /* 80027248 00023088 00 00 00 00 */ .4byte 0x00000000 /* 8002724C 0002308C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@709_8042F950" +"@709_8042F950": + + .4byte 0x2F746974 + .4byte 0x6C652F30 + .4byte 0x30303030 + .4byte 0x3030312F + .4byte 0x30303030 + .4byte 0x30303032 + .4byte 0x2F646174 + .4byte 0x612F7374 + .4byte 0x6174652E + .4byte 0x64617400 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global StateFlags +StateFlags: + .skip 0x20 diff --git a/asm/os/OSStateFlags_8042f950.s b/asm/os/OSStateFlags_8042f950.s deleted file mode 100644 index 15bb61b6..00000000 --- a/asm/os/OSStateFlags_8042f950.s +++ /dev/null @@ -1,16 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@709_8042F950" -"@709_8042F950": - - .4byte 0x2F746974 - .4byte 0x6C652F30 - .4byte 0x30303030 - .4byte 0x3030312F - .4byte 0x30303030 - .4byte 0x30303032 - .4byte 0x2F646174 - .4byte 0x612F7374 - .4byte 0x6174652E - .4byte 0x64617400 diff --git a/asm/os/OSStateFlags_8049a180.s b/asm/os/OSStateFlags_8049a180.s deleted file mode 100644 index 6d263803..00000000 --- a/asm/os/OSStateFlags_8049a180.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global StateFlags -StateFlags: - .skip 0x20 diff --git a/asm/os/OSStateTM_80026200.s b/asm/os/OSStateTM.s similarity index 93% rename from asm/os/OSStateTM_80026200.s rename to asm/os/OSStateTM.s index 5e70500a..a767354e 100644 --- a/asm/os/OSStateTM_80026200.s +++ b/asm/os/OSStateTM.s @@ -553,3 +553,139 @@ lbl_800268EC: /* 80026904 00022744 00 00 00 00 */ .4byte 0x00000000 /* 80026908 00022748 00 00 00 00 */ .4byte 0x00000000 /* 8002690C 0002274C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@980" +"@980": + + .4byte 0x2F646576 + .4byte 0x2F73746D + .4byte 0x2F696D6D + .4byte 0x65646961 + .4byte 0x74650000 + +.global "@981_8042F854" +"@981_8042F854": + + .4byte 0x2F646576 + .4byte 0x2F73746D + .4byte 0x2F657665 + .4byte 0x6E74686F + .4byte 0x6F6B0000 + +.global "@990_8042F868" +"@990_8042F868": + + .4byte 0x4F535374 + .4byte 0x61746554 + .4byte 0x4D2E6300 + +.global "@991_8042F874" +"@991_8042F874": + + .4byte 0x4572726F + .4byte 0x723A2054 + .4byte 0x68652066 + .4byte 0x69726D77 + .4byte 0x61726520 + .4byte 0x646F6573 + .4byte 0x6E277420 + .4byte 0x73757070 + .4byte 0x6F727420 + .4byte 0x73687574 + .4byte 0x646F776E + .4byte 0x20666561 + .4byte 0x74757265 + .4byte 0x2E0A0000 + +.global "@1001" +"@1001": + + .4byte 0x4572726F + .4byte 0x723A2054 + .4byte 0x68652066 + .4byte 0x69726D77 + .4byte 0x61726520 + .4byte 0x646F6573 + .4byte 0x6E277420 + .4byte 0x73757070 + .4byte 0x6F727420 + .4byte 0x7265626F + .4byte 0x6F742066 + .4byte 0x65617475 + .4byte 0x72652E0A + .4byte 0 + +.global "@1045_8042F8E4" +"@1045_8042F8E4": + + .4byte 0x4572726F + .4byte 0x72206F6E + .4byte 0x2053544D + .4byte 0x20737461 + .4byte 0x74652065 + .4byte 0x76656E74 + .4byte 0x2068616E + .4byte 0x646C6572 + .4byte 0x0A000000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global StmEhInBuf +StmEhInBuf: + .skip 0x20 + +.global StmEhOutBuf +StmEhOutBuf: + .skip 0x20 + +.global StmImInBuf +StmImInBuf: + .skip 0x20 + +.global StmImOutBuf +StmImOutBuf: + .skip 0x20 + +.global StmVdInBuf +StmVdInBuf: + .skip 0x20 + +.global StmVdOutBuf +StmVdOutBuf: + .skip 0x20 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global ResetDown +ResetDown: + .skip 0x4 + +.global StmReady +StmReady: + .skip 0x4 + +.global StmImDesc +StmImDesc: + .skip 0x4 + +.global StmEhDesc +StmEhDesc: + .skip 0x4 + +.global StmEhRegistered +StmEhRegistered: + .skip 0x4 + +.global StmVdInUse +StmVdInUse: + .skip 0x4 + +.global PowerCallback +PowerCallback: + .skip 0x4 + +.global ResetCallback +ResetCallback: + .skip 0xC diff --git a/asm/os/OSStateTM_8042f840.s b/asm/os/OSStateTM_8042f840.s deleted file mode 100644 index 0fe58550..00000000 --- a/asm/os/OSStateTM_8042f840.s +++ /dev/null @@ -1,76 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@980" -"@980": - - .4byte 0x2F646576 - .4byte 0x2F73746D - .4byte 0x2F696D6D - .4byte 0x65646961 - .4byte 0x74650000 - -.global "@981_8042F854" -"@981_8042F854": - - .4byte 0x2F646576 - .4byte 0x2F73746D - .4byte 0x2F657665 - .4byte 0x6E74686F - .4byte 0x6F6B0000 - -.global "@990_8042F868" -"@990_8042F868": - - .4byte 0x4F535374 - .4byte 0x61746554 - .4byte 0x4D2E6300 - -.global "@991_8042F874" -"@991_8042F874": - - .4byte 0x4572726F - .4byte 0x723A2054 - .4byte 0x68652066 - .4byte 0x69726D77 - .4byte 0x61726520 - .4byte 0x646F6573 - .4byte 0x6E277420 - .4byte 0x73757070 - .4byte 0x6F727420 - .4byte 0x73687574 - .4byte 0x646F776E - .4byte 0x20666561 - .4byte 0x74757265 - .4byte 0x2E0A0000 - -.global "@1001" -"@1001": - - .4byte 0x4572726F - .4byte 0x723A2054 - .4byte 0x68652066 - .4byte 0x69726D77 - .4byte 0x61726520 - .4byte 0x646F6573 - .4byte 0x6E277420 - .4byte 0x73757070 - .4byte 0x6F727420 - .4byte 0x7265626F - .4byte 0x6F742066 - .4byte 0x65617475 - .4byte 0x72652E0A - .4byte 0 - -.global "@1045_8042F8E4" -"@1045_8042F8E4": - - .4byte 0x4572726F - .4byte 0x72206F6E - .4byte 0x2053544D - .4byte 0x20737461 - .4byte 0x74652065 - .4byte 0x76656E74 - .4byte 0x2068616E - .4byte 0x646C6572 - .4byte 0x0A000000 diff --git a/asm/os/OSStateTM_80499ec0.s b/asm/os/OSStateTM_80499ec0.s deleted file mode 100644 index e3492507..00000000 --- a/asm/os/OSStateTM_80499ec0.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global StmEhInBuf -StmEhInBuf: - .skip 0x20 - -.global StmEhOutBuf -StmEhOutBuf: - .skip 0x20 - -.global StmImInBuf -StmImInBuf: - .skip 0x20 - -.global StmImOutBuf -StmImOutBuf: - .skip 0x20 - -.global StmVdInBuf -StmVdInBuf: - .skip 0x20 - -.global StmVdOutBuf -StmVdOutBuf: - .skip 0x20 diff --git a/asm/os/OSStateTM_8055c858.s b/asm/os/OSStateTM_8055c858.s deleted file mode 100644 index 1fba8e80..00000000 --- a/asm/os/OSStateTM_8055c858.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global ResetDown -ResetDown: - .skip 0x4 - -.global StmReady -StmReady: - .skip 0x4 - -.global StmImDesc -StmImDesc: - .skip 0x4 - -.global StmEhDesc -StmEhDesc: - .skip 0x4 - -.global StmEhRegistered -StmEhRegistered: - .skip 0x4 - -.global StmVdInUse -StmVdInUse: - .skip 0x4 - -.global PowerCallback -PowerCallback: - .skip 0x4 - -.global ResetCallback -ResetCallback: - .skip 0xC diff --git a/asm/os/OSSync_80024420.s b/asm/os/OSSync.s similarity index 100% rename from asm/os/OSSync_80024420.s rename to asm/os/OSSync.s diff --git a/asm/os/OSThread_800244a0.s b/asm/os/OSThread.s similarity index 99% rename from asm/os/OSThread_800244a0.s rename to asm/os/OSThread.s index a4824f35..59730d35 100644 --- a/asm/os/OSThread_800244a0.s +++ b/asm/os/OSThread.s @@ -1835,3 +1835,39 @@ lbl_80025B18: /* 80025B34 00021974 4E 80 00 20 */ blr /* 80025B38 00021978 00 00 00 00 */ .4byte 0x00000000 /* 80025B3C 0002197C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global DefaultThread +DefaultThread: + .skip 0x318 + +.global RunQueue +RunQueue: + .skip 0x100 + +.global IdleContext +IdleContext: + .skip 0x5F0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global SwitchThreadCallback +SwitchThreadCallback: + + .4byte DefaultSwitchThreadCallback + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global Reschedule +Reschedule: + .skip 0x4 + +.global RunQueueHint +RunQueueHint: + .skip 0x4 + +.global RunQueueBits +RunQueueBits: + .skip 0x8 diff --git a/asm/os/OSThread_804994b8.s b/asm/os/OSThread_804994b8.s deleted file mode 100644 index 86555960..00000000 --- a/asm/os/OSThread_804994b8.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global DefaultThread -DefaultThread: - .skip 0x318 - -.global RunQueue -RunQueue: - .skip 0x100 - -.global IdleContext -IdleContext: - .skip 0x5F0 diff --git a/asm/os/OSThread_805564f0.s b/asm/os/OSThread_805564f0.s deleted file mode 100644 index cae0df25..00000000 --- a/asm/os/OSThread_805564f0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global SwitchThreadCallback -SwitchThreadCallback: - - .4byte DefaultSwitchThreadCallback - .4byte 0 diff --git a/asm/os/OSThread_8055c840.s b/asm/os/OSThread_8055c840.s deleted file mode 100644 index c559bc39..00000000 --- a/asm/os/OSThread_8055c840.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global Reschedule -Reschedule: - .skip 0x4 - -.global RunQueueHint -RunQueueHint: - .skip 0x4 - -.global RunQueueBits -RunQueueBits: - .skip 0x8 diff --git a/asm/os/OSTime_80025b40.s b/asm/os/OSTime.s similarity index 96% rename from asm/os/OSTime_80025b40.s rename to asm/os/OSTime.s index 19d86534..57ef9b23 100644 --- a/asm/os/OSTime_80025b40.s +++ b/asm/os/OSTime.s @@ -301,3 +301,37 @@ lbl_80025EC8: /* 80025F64 00021DA4 38 21 00 20 */ addi r1, r1, 0x20 /* 80025F68 00021DA8 4E 80 00 20 */ blr /* 80025F6C 00021DAC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global YearDays +YearDays: + + .4byte 0 + .4byte 0x0000001F + .4byte 0x0000003B + .4byte 0x0000005A + .4byte 0x00000078 + .4byte 0x00000097 + .4byte 0x000000B5 + .4byte 0x000000D4 + .4byte 0x000000F3 + .4byte 0x00000111 + .4byte 0x00000130 + .4byte 0x0000014E + +.global LeapYearDays +LeapYearDays: + + .4byte 0 + .4byte 0x0000001F + .4byte 0x0000003C + .4byte 0x0000005B + .4byte 0x00000079 + .4byte 0x00000098 + .4byte 0x000000B6 + .4byte 0x000000D5 + .4byte 0x000000F4 + .4byte 0x00000112 + .4byte 0x00000131 + .4byte 0x0000014F diff --git a/asm/os/OSTime_804239a0.s b/asm/os/OSTime_804239a0.s deleted file mode 100644 index eb15c2a7..00000000 --- a/asm/os/OSTime_804239a0.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global YearDays -YearDays: - - .4byte 0 - .4byte 0x0000001F - .4byte 0x0000003B - .4byte 0x0000005A - .4byte 0x00000078 - .4byte 0x00000097 - .4byte 0x000000B5 - .4byte 0x000000D4 - .4byte 0x000000F3 - .4byte 0x00000111 - .4byte 0x00000130 - .4byte 0x0000014E - -.global LeapYearDays -LeapYearDays: - - .4byte 0 - .4byte 0x0000001F - .4byte 0x0000003C - .4byte 0x0000005B - .4byte 0x00000079 - .4byte 0x00000098 - .4byte 0x000000B6 - .4byte 0x000000D5 - .4byte 0x000000F4 - .4byte 0x00000112 - .4byte 0x00000131 - .4byte 0x0000014F diff --git a/asm/os/OSUtf_80423a00.s b/asm/os/OSUtf.s similarity index 95% rename from asm/os/OSUtf_80423a00.s rename to asm/os/OSUtf.s index c4f9c928..fd2d2c4c 100644 --- a/asm/os/OSUtf_80423a00.s +++ b/asm/os/OSUtf.s @@ -1,5 +1,218 @@ .include "macros.inc" +.section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 +.global OSUTF8to32 +OSUTF8to32: +/* 80025F70 00021DB0 88 C3 00 00 */ lbz r6, 0x0(r3) +/* 80025F74 00021DB4 2C 06 00 00 */ cmpwi r6, 0x0 +/* 80025F78 00021DB8 41 82 00 08 */ beq lbl_80025F80 +/* 80025F7C 00021DBC 38 63 00 01 */ addi r3, r3, 0x1 +.global lbl_80025F80 +lbl_80025F80: +/* 80025F80 00021DC0 54 C0 06 31 */ rlwinm. r0, r6, 0, 24, 24 +/* 80025F84 00021DC4 40 82 00 0C */ bne lbl_80025F90 +/* 80025F88 00021DC8 38 E0 00 00 */ li r7, 0x0 +/* 80025F8C 00021DCC 48 00 00 54 */ b lbl_80025FE0 +.global lbl_80025F90 +lbl_80025F90: +/* 80025F90 00021DD0 54 C0 06 34 */ rlwinm r0, r6, 0, 24, 26 +/* 80025F94 00021DD4 28 00 00 C0 */ cmplwi r0, 0xc0 +/* 80025F98 00021DD8 40 82 00 10 */ bne lbl_80025FA8 +/* 80025F9C 00021DDC 54 C6 06 FE */ clrlwi r6, r6, 27 +/* 80025FA0 00021DE0 38 E0 00 01 */ li r7, 0x1 +/* 80025FA4 00021DE4 48 00 00 3C */ b lbl_80025FE0 +.global lbl_80025FA8 +lbl_80025FA8: +/* 80025FA8 00021DE8 54 C0 06 36 */ rlwinm r0, r6, 0, 24, 27 +/* 80025FAC 00021DEC 28 00 00 E0 */ cmplwi r0, 0xe0 +/* 80025FB0 00021DF0 40 82 00 10 */ bne lbl_80025FC0 +/* 80025FB4 00021DF4 54 C6 07 3E */ clrlwi r6, r6, 28 +/* 80025FB8 00021DF8 38 E0 00 02 */ li r7, 0x2 +/* 80025FBC 00021DFC 48 00 00 24 */ b lbl_80025FE0 +.global lbl_80025FC0 +lbl_80025FC0: +/* 80025FC0 00021E00 54 C0 06 38 */ rlwinm r0, r6, 0, 24, 28 +/* 80025FC4 00021E04 28 00 00 F0 */ cmplwi r0, 0xf0 +/* 80025FC8 00021E08 40 82 00 10 */ bne lbl_80025FD8 +/* 80025FCC 00021E0C 54 C6 07 7E */ clrlwi r6, r6, 29 +/* 80025FD0 00021E10 38 E0 00 03 */ li r7, 0x3 +/* 80025FD4 00021E14 48 00 00 0C */ b lbl_80025FE0 +.global lbl_80025FD8 +lbl_80025FD8: +/* 80025FD8 00021E18 38 60 00 00 */ li r3, 0x0 +/* 80025FDC 00021E1C 4E 80 00 20 */ blr +.global lbl_80025FE0 +lbl_80025FE0: +/* 80025FE0 00021E20 7C E9 03 A6 */ mtctr r7 +/* 80025FE4 00021E24 28 07 00 00 */ cmplwi r7, 0x0 +/* 80025FE8 00021E28 40 81 00 34 */ ble lbl_8002601C +/* 80025FEC 00021E2C 60 00 00 00 */ nop +.global lbl_80025FF0 +lbl_80025FF0: +/* 80025FF0 00021E30 88 A3 00 00 */ lbz r5, 0x0(r3) +/* 80025FF4 00021E34 54 C6 30 32 */ slwi r6, r6, 6 +/* 80025FF8 00021E38 38 63 00 01 */ addi r3, r3, 0x1 +/* 80025FFC 00021E3C 54 A0 06 32 */ rlwinm r0, r5, 0, 24, 25 +/* 80026000 00021E40 28 00 00 80 */ cmplwi r0, 0x80 +/* 80026004 00021E44 41 82 00 0C */ beq lbl_80026010 +/* 80026008 00021E48 38 60 00 00 */ li r3, 0x0 +/* 8002600C 00021E4C 4E 80 00 20 */ blr +.global lbl_80026010 +lbl_80026010: +/* 80026010 00021E50 54 A0 06 BE */ clrlwi r0, r5, 26 +/* 80026014 00021E54 7C C6 03 78 */ or r6, r6, r0 +/* 80026018 00021E58 42 00 FF D8 */ bdnz lbl_80025FF0 +.global lbl_8002601C +lbl_8002601C: +/* 8002601C 00021E5C 28 06 00 7F */ cmplwi r6, 0x7f +/* 80026020 00021E60 41 81 00 14 */ bgt lbl_80026034 +/* 80026024 00021E64 2C 07 00 00 */ cmpwi r7, 0x0 +/* 80026028 00021E68 41 82 00 3C */ beq lbl_80026064 +/* 8002602C 00021E6C 38 60 00 00 */ li r3, 0x0 +/* 80026030 00021E70 4E 80 00 20 */ blr +.global lbl_80026034 +lbl_80026034: +/* 80026034 00021E74 28 06 07 FF */ cmplwi r6, 0x7ff +/* 80026038 00021E78 41 81 00 14 */ bgt lbl_8002604C +/* 8002603C 00021E7C 28 07 00 01 */ cmplwi r7, 0x1 +/* 80026040 00021E80 41 82 00 24 */ beq lbl_80026064 +/* 80026044 00021E84 38 60 00 00 */ li r3, 0x0 +/* 80026048 00021E88 4E 80 00 20 */ blr +.global lbl_8002604C +lbl_8002604C: +/* 8002604C 00021E8C 28 06 FF FF */ cmplwi r6, 0xffff +/* 80026050 00021E90 41 81 00 14 */ bgt lbl_80026064 +/* 80026054 00021E94 28 07 00 02 */ cmplwi r7, 0x2 +/* 80026058 00021E98 41 82 00 0C */ beq lbl_80026064 +/* 8002605C 00021E9C 38 60 00 00 */ li r3, 0x0 +/* 80026060 00021EA0 4E 80 00 20 */ blr +.global lbl_80026064 +lbl_80026064: +/* 80026064 00021EA4 28 06 D8 00 */ cmplwi r6, 0xd800 +/* 80026068 00021EA8 41 80 00 14 */ blt lbl_8002607C +/* 8002606C 00021EAC 28 06 DF FF */ cmplwi r6, 0xdfff +/* 80026070 00021EB0 41 81 00 0C */ bgt lbl_8002607C +/* 80026074 00021EB4 38 60 00 00 */ li r3, 0x0 +/* 80026078 00021EB8 4E 80 00 20 */ blr +.global lbl_8002607C +lbl_8002607C: +/* 8002607C 00021EBC 90 C4 00 00 */ stw r6, 0x0(r4) +/* 80026080 00021EC0 4E 80 00 20 */ blr +/* 80026084 00021EC4 00 00 00 00 */ .4byte 0x00000000 +/* 80026088 00021EC8 00 00 00 00 */ .4byte 0x00000000 +/* 8002608C 00021ECC 00 00 00 00 */ .4byte 0x00000000 +.global OSUTF16to32 +OSUTF16to32: +/* 80026090 00021ED0 A0 A3 00 00 */ lhz r5, 0x0(r3) +/* 80026094 00021ED4 2C 05 00 00 */ cmpwi r5, 0x0 +/* 80026098 00021ED8 41 82 00 08 */ beq lbl_800260A0 +/* 8002609C 00021EDC 38 63 00 02 */ addi r3, r3, 0x2 +.global lbl_800260A0 +lbl_800260A0: +/* 800260A0 00021EE0 28 05 D8 00 */ cmplwi r5, 0xd800 +/* 800260A4 00021EE4 41 80 00 0C */ blt lbl_800260B0 +/* 800260A8 00021EE8 28 05 DF FF */ cmplwi r5, 0xdfff +/* 800260AC 00021EEC 40 81 00 0C */ ble lbl_800260B8 +.global lbl_800260B0 +lbl_800260B0: +/* 800260B0 00021EF0 7C A6 2B 78 */ mr r6, r5 +/* 800260B4 00021EF4 48 00 00 44 */ b lbl_800260F8 +.global lbl_800260B8 +lbl_800260B8: +/* 800260B8 00021EF8 28 05 DB FF */ cmplwi r5, 0xdbff +/* 800260BC 00021EFC 41 81 00 34 */ bgt lbl_800260F0 +/* 800260C0 00021F00 A0 03 00 00 */ lhz r0, 0x0(r3) +/* 800260C4 00021F04 38 63 00 02 */ addi r3, r3, 0x2 +/* 800260C8 00021F08 28 00 DC 00 */ cmplwi r0, 0xdc00 +/* 800260CC 00021F0C 41 80 00 1C */ blt lbl_800260E8 +/* 800260D0 00021F10 28 00 DF FF */ cmplwi r0, 0xdfff +/* 800260D4 00021F14 41 81 00 14 */ bgt lbl_800260E8 +/* 800260D8 00021F18 54 06 05 BE */ clrlwi r6, r0, 22 +/* 800260DC 00021F1C 50 A6 53 2A */ rlwimi r6, r5, 10, 12, 21 +/* 800260E0 00021F20 3C C6 00 01 */ addis r6, r6, 0x1 +/* 800260E4 00021F24 48 00 00 14 */ b lbl_800260F8 +.global lbl_800260E8 +lbl_800260E8: +/* 800260E8 00021F28 38 60 00 00 */ li r3, 0x0 +/* 800260EC 00021F2C 4E 80 00 20 */ blr +.global lbl_800260F0 +lbl_800260F0: +/* 800260F0 00021F30 38 60 00 00 */ li r3, 0x0 +/* 800260F4 00021F34 4E 80 00 20 */ blr +.global lbl_800260F8 +lbl_800260F8: +/* 800260F8 00021F38 90 C4 00 00 */ stw r6, 0x0(r4) +/* 800260FC 00021F3C 4E 80 00 20 */ blr +.global OSUTF32toANSI +OSUTF32toANSI: +/* 80026100 00021F40 28 03 00 FF */ cmplwi r3, 0xff +/* 80026104 00021F44 40 81 00 0C */ ble lbl_80026110 +/* 80026108 00021F48 38 60 00 00 */ li r3, 0x0 +/* 8002610C 00021F4C 4E 80 00 20 */ blr +.global lbl_80026110 +lbl_80026110: +/* 80026110 00021F50 28 03 00 80 */ cmplwi r3, 0x80 +/* 80026114 00021F54 41 80 00 0C */ blt lbl_80026120 +/* 80026118 00021F58 28 03 00 9F */ cmplwi r3, 0x9f +/* 8002611C 00021F5C 40 81 00 0C */ ble lbl_80026128 +.global lbl_80026120 +lbl_80026120: +/* 80026120 00021F60 54 63 06 3E */ clrlwi r3, r3, 24 +/* 80026124 00021F64 4E 80 00 20 */ blr +.global lbl_80026128 +lbl_80026128: +/* 80026128 00021F68 28 03 01 52 */ cmplwi r3, 0x152 +/* 8002612C 00021F6C 41 80 00 48 */ blt lbl_80026174 +/* 80026130 00021F70 28 03 21 22 */ cmplwi r3, 0x2122 +/* 80026134 00021F74 41 81 00 40 */ bgt lbl_80026174 +/* 80026138 00021F78 3C 80 80 42 */ lis r4, UcsAnsiTable@ha +/* 8002613C 00021F7C 38 00 00 20 */ li r0, 0x20 +/* 80026140 00021F80 38 84 3A 00 */ addi r4, r4, UcsAnsiTable@l +/* 80026144 00021F84 38 A0 00 00 */ li r5, 0x0 +/* 80026148 00021F88 7C 09 03 A6 */ mtctr r0 +/* 8002614C 00021F8C 60 00 00 00 */ nop +.global lbl_80026150 +lbl_80026150: +/* 80026150 00021F90 A0 04 00 00 */ lhz r0, 0x0(r4) +/* 80026154 00021F94 7C 03 00 40 */ cmplw r3, r0 +/* 80026158 00021F98 40 82 00 10 */ bne lbl_80026168 +/* 8002615C 00021F9C 38 05 00 80 */ addi r0, r5, 0x80 +/* 80026160 00021FA0 54 03 06 3E */ clrlwi r3, r0, 24 +/* 80026164 00021FA4 4E 80 00 20 */ blr +.global lbl_80026168 +lbl_80026168: +/* 80026168 00021FA8 38 84 00 02 */ addi r4, r4, 0x2 +/* 8002616C 00021FAC 38 A5 00 01 */ addi r5, r5, 0x1 +/* 80026170 00021FB0 42 00 FF E0 */ bdnz lbl_80026150 +.global lbl_80026174 +lbl_80026174: +/* 80026174 00021FB4 38 60 00 00 */ li r3, 0x0 +/* 80026178 00021FB8 4E 80 00 20 */ blr +/* 8002617C 00021FBC 00 00 00 00 */ .4byte 0x00000000 +.global OSUTF32toSJIS +OSUTF32toSJIS: +/* 80026180 00021FC0 3C 00 00 01 */ lis r0, 0x1 +/* 80026184 00021FC4 7C 03 00 40 */ cmplw r3, r0 +/* 80026188 00021FC8 41 80 00 0C */ blt lbl_80026194 +/* 8002618C 00021FCC 38 60 00 00 */ li r3, 0x0 +/* 80026190 00021FD0 4E 80 00 20 */ blr +.global lbl_80026194 +lbl_80026194: +/* 80026194 00021FD4 3C 80 80 43 */ lis r4, UcsSjisTable@ha +/* 80026198 00021FD8 54 60 D5 BA */ rlwinm r0, r3, 26, 22, 29 +/* 8002619C 00021FDC 38 84 F4 40 */ addi r4, r4, UcsSjisTable@l +/* 800261A0 00021FE0 7C 84 00 2E */ lwzx r4, r4, r0 +/* 800261A4 00021FE4 2C 04 00 00 */ cmpwi r4, 0x0 +/* 800261A8 00021FE8 41 82 00 10 */ beq lbl_800261B8 +/* 800261AC 00021FEC 54 60 0D FC */ rlwinm r0, r3, 1, 23, 30 +/* 800261B0 00021FF0 7C 64 02 2E */ lhzx r3, r4, r0 +/* 800261B4 00021FF4 4E 80 00 20 */ blr +.global lbl_800261B8 +lbl_800261B8: +/* 800261B8 00021FF8 38 60 00 00 */ li r3, 0x0 +/* 800261BC 00021FFC 4E 80 00 20 */ blr +.include "macros.inc" + .section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 .global UcsAnsiTable UcsAnsiTable: diff --git a/asm/os/OSUtf_80025f70.s b/asm/os/OSUtf_80025f70.s deleted file mode 100644 index 8b6dd4b7..00000000 --- a/asm/os/OSUtf_80025f70.s +++ /dev/null @@ -1,213 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 -.global OSUTF8to32 -OSUTF8to32: -/* 80025F70 00021DB0 88 C3 00 00 */ lbz r6, 0x0(r3) -/* 80025F74 00021DB4 2C 06 00 00 */ cmpwi r6, 0x0 -/* 80025F78 00021DB8 41 82 00 08 */ beq lbl_80025F80 -/* 80025F7C 00021DBC 38 63 00 01 */ addi r3, r3, 0x1 -.global lbl_80025F80 -lbl_80025F80: -/* 80025F80 00021DC0 54 C0 06 31 */ rlwinm. r0, r6, 0, 24, 24 -/* 80025F84 00021DC4 40 82 00 0C */ bne lbl_80025F90 -/* 80025F88 00021DC8 38 E0 00 00 */ li r7, 0x0 -/* 80025F8C 00021DCC 48 00 00 54 */ b lbl_80025FE0 -.global lbl_80025F90 -lbl_80025F90: -/* 80025F90 00021DD0 54 C0 06 34 */ rlwinm r0, r6, 0, 24, 26 -/* 80025F94 00021DD4 28 00 00 C0 */ cmplwi r0, 0xc0 -/* 80025F98 00021DD8 40 82 00 10 */ bne lbl_80025FA8 -/* 80025F9C 00021DDC 54 C6 06 FE */ clrlwi r6, r6, 27 -/* 80025FA0 00021DE0 38 E0 00 01 */ li r7, 0x1 -/* 80025FA4 00021DE4 48 00 00 3C */ b lbl_80025FE0 -.global lbl_80025FA8 -lbl_80025FA8: -/* 80025FA8 00021DE8 54 C0 06 36 */ rlwinm r0, r6, 0, 24, 27 -/* 80025FAC 00021DEC 28 00 00 E0 */ cmplwi r0, 0xe0 -/* 80025FB0 00021DF0 40 82 00 10 */ bne lbl_80025FC0 -/* 80025FB4 00021DF4 54 C6 07 3E */ clrlwi r6, r6, 28 -/* 80025FB8 00021DF8 38 E0 00 02 */ li r7, 0x2 -/* 80025FBC 00021DFC 48 00 00 24 */ b lbl_80025FE0 -.global lbl_80025FC0 -lbl_80025FC0: -/* 80025FC0 00021E00 54 C0 06 38 */ rlwinm r0, r6, 0, 24, 28 -/* 80025FC4 00021E04 28 00 00 F0 */ cmplwi r0, 0xf0 -/* 80025FC8 00021E08 40 82 00 10 */ bne lbl_80025FD8 -/* 80025FCC 00021E0C 54 C6 07 7E */ clrlwi r6, r6, 29 -/* 80025FD0 00021E10 38 E0 00 03 */ li r7, 0x3 -/* 80025FD4 00021E14 48 00 00 0C */ b lbl_80025FE0 -.global lbl_80025FD8 -lbl_80025FD8: -/* 80025FD8 00021E18 38 60 00 00 */ li r3, 0x0 -/* 80025FDC 00021E1C 4E 80 00 20 */ blr -.global lbl_80025FE0 -lbl_80025FE0: -/* 80025FE0 00021E20 7C E9 03 A6 */ mtctr r7 -/* 80025FE4 00021E24 28 07 00 00 */ cmplwi r7, 0x0 -/* 80025FE8 00021E28 40 81 00 34 */ ble lbl_8002601C -/* 80025FEC 00021E2C 60 00 00 00 */ nop -.global lbl_80025FF0 -lbl_80025FF0: -/* 80025FF0 00021E30 88 A3 00 00 */ lbz r5, 0x0(r3) -/* 80025FF4 00021E34 54 C6 30 32 */ slwi r6, r6, 6 -/* 80025FF8 00021E38 38 63 00 01 */ addi r3, r3, 0x1 -/* 80025FFC 00021E3C 54 A0 06 32 */ rlwinm r0, r5, 0, 24, 25 -/* 80026000 00021E40 28 00 00 80 */ cmplwi r0, 0x80 -/* 80026004 00021E44 41 82 00 0C */ beq lbl_80026010 -/* 80026008 00021E48 38 60 00 00 */ li r3, 0x0 -/* 8002600C 00021E4C 4E 80 00 20 */ blr -.global lbl_80026010 -lbl_80026010: -/* 80026010 00021E50 54 A0 06 BE */ clrlwi r0, r5, 26 -/* 80026014 00021E54 7C C6 03 78 */ or r6, r6, r0 -/* 80026018 00021E58 42 00 FF D8 */ bdnz lbl_80025FF0 -.global lbl_8002601C -lbl_8002601C: -/* 8002601C 00021E5C 28 06 00 7F */ cmplwi r6, 0x7f -/* 80026020 00021E60 41 81 00 14 */ bgt lbl_80026034 -/* 80026024 00021E64 2C 07 00 00 */ cmpwi r7, 0x0 -/* 80026028 00021E68 41 82 00 3C */ beq lbl_80026064 -/* 8002602C 00021E6C 38 60 00 00 */ li r3, 0x0 -/* 80026030 00021E70 4E 80 00 20 */ blr -.global lbl_80026034 -lbl_80026034: -/* 80026034 00021E74 28 06 07 FF */ cmplwi r6, 0x7ff -/* 80026038 00021E78 41 81 00 14 */ bgt lbl_8002604C -/* 8002603C 00021E7C 28 07 00 01 */ cmplwi r7, 0x1 -/* 80026040 00021E80 41 82 00 24 */ beq lbl_80026064 -/* 80026044 00021E84 38 60 00 00 */ li r3, 0x0 -/* 80026048 00021E88 4E 80 00 20 */ blr -.global lbl_8002604C -lbl_8002604C: -/* 8002604C 00021E8C 28 06 FF FF */ cmplwi r6, 0xffff -/* 80026050 00021E90 41 81 00 14 */ bgt lbl_80026064 -/* 80026054 00021E94 28 07 00 02 */ cmplwi r7, 0x2 -/* 80026058 00021E98 41 82 00 0C */ beq lbl_80026064 -/* 8002605C 00021E9C 38 60 00 00 */ li r3, 0x0 -/* 80026060 00021EA0 4E 80 00 20 */ blr -.global lbl_80026064 -lbl_80026064: -/* 80026064 00021EA4 28 06 D8 00 */ cmplwi r6, 0xd800 -/* 80026068 00021EA8 41 80 00 14 */ blt lbl_8002607C -/* 8002606C 00021EAC 28 06 DF FF */ cmplwi r6, 0xdfff -/* 80026070 00021EB0 41 81 00 0C */ bgt lbl_8002607C -/* 80026074 00021EB4 38 60 00 00 */ li r3, 0x0 -/* 80026078 00021EB8 4E 80 00 20 */ blr -.global lbl_8002607C -lbl_8002607C: -/* 8002607C 00021EBC 90 C4 00 00 */ stw r6, 0x0(r4) -/* 80026080 00021EC0 4E 80 00 20 */ blr -/* 80026084 00021EC4 00 00 00 00 */ .4byte 0x00000000 -/* 80026088 00021EC8 00 00 00 00 */ .4byte 0x00000000 -/* 8002608C 00021ECC 00 00 00 00 */ .4byte 0x00000000 -.global OSUTF16to32 -OSUTF16to32: -/* 80026090 00021ED0 A0 A3 00 00 */ lhz r5, 0x0(r3) -/* 80026094 00021ED4 2C 05 00 00 */ cmpwi r5, 0x0 -/* 80026098 00021ED8 41 82 00 08 */ beq lbl_800260A0 -/* 8002609C 00021EDC 38 63 00 02 */ addi r3, r3, 0x2 -.global lbl_800260A0 -lbl_800260A0: -/* 800260A0 00021EE0 28 05 D8 00 */ cmplwi r5, 0xd800 -/* 800260A4 00021EE4 41 80 00 0C */ blt lbl_800260B0 -/* 800260A8 00021EE8 28 05 DF FF */ cmplwi r5, 0xdfff -/* 800260AC 00021EEC 40 81 00 0C */ ble lbl_800260B8 -.global lbl_800260B0 -lbl_800260B0: -/* 800260B0 00021EF0 7C A6 2B 78 */ mr r6, r5 -/* 800260B4 00021EF4 48 00 00 44 */ b lbl_800260F8 -.global lbl_800260B8 -lbl_800260B8: -/* 800260B8 00021EF8 28 05 DB FF */ cmplwi r5, 0xdbff -/* 800260BC 00021EFC 41 81 00 34 */ bgt lbl_800260F0 -/* 800260C0 00021F00 A0 03 00 00 */ lhz r0, 0x0(r3) -/* 800260C4 00021F04 38 63 00 02 */ addi r3, r3, 0x2 -/* 800260C8 00021F08 28 00 DC 00 */ cmplwi r0, 0xdc00 -/* 800260CC 00021F0C 41 80 00 1C */ blt lbl_800260E8 -/* 800260D0 00021F10 28 00 DF FF */ cmplwi r0, 0xdfff -/* 800260D4 00021F14 41 81 00 14 */ bgt lbl_800260E8 -/* 800260D8 00021F18 54 06 05 BE */ clrlwi r6, r0, 22 -/* 800260DC 00021F1C 50 A6 53 2A */ rlwimi r6, r5, 10, 12, 21 -/* 800260E0 00021F20 3C C6 00 01 */ addis r6, r6, 0x1 -/* 800260E4 00021F24 48 00 00 14 */ b lbl_800260F8 -.global lbl_800260E8 -lbl_800260E8: -/* 800260E8 00021F28 38 60 00 00 */ li r3, 0x0 -/* 800260EC 00021F2C 4E 80 00 20 */ blr -.global lbl_800260F0 -lbl_800260F0: -/* 800260F0 00021F30 38 60 00 00 */ li r3, 0x0 -/* 800260F4 00021F34 4E 80 00 20 */ blr -.global lbl_800260F8 -lbl_800260F8: -/* 800260F8 00021F38 90 C4 00 00 */ stw r6, 0x0(r4) -/* 800260FC 00021F3C 4E 80 00 20 */ blr -.global OSUTF32toANSI -OSUTF32toANSI: -/* 80026100 00021F40 28 03 00 FF */ cmplwi r3, 0xff -/* 80026104 00021F44 40 81 00 0C */ ble lbl_80026110 -/* 80026108 00021F48 38 60 00 00 */ li r3, 0x0 -/* 8002610C 00021F4C 4E 80 00 20 */ blr -.global lbl_80026110 -lbl_80026110: -/* 80026110 00021F50 28 03 00 80 */ cmplwi r3, 0x80 -/* 80026114 00021F54 41 80 00 0C */ blt lbl_80026120 -/* 80026118 00021F58 28 03 00 9F */ cmplwi r3, 0x9f -/* 8002611C 00021F5C 40 81 00 0C */ ble lbl_80026128 -.global lbl_80026120 -lbl_80026120: -/* 80026120 00021F60 54 63 06 3E */ clrlwi r3, r3, 24 -/* 80026124 00021F64 4E 80 00 20 */ blr -.global lbl_80026128 -lbl_80026128: -/* 80026128 00021F68 28 03 01 52 */ cmplwi r3, 0x152 -/* 8002612C 00021F6C 41 80 00 48 */ blt lbl_80026174 -/* 80026130 00021F70 28 03 21 22 */ cmplwi r3, 0x2122 -/* 80026134 00021F74 41 81 00 40 */ bgt lbl_80026174 -/* 80026138 00021F78 3C 80 80 42 */ lis r4, UcsAnsiTable@ha -/* 8002613C 00021F7C 38 00 00 20 */ li r0, 0x20 -/* 80026140 00021F80 38 84 3A 00 */ addi r4, r4, UcsAnsiTable@l -/* 80026144 00021F84 38 A0 00 00 */ li r5, 0x0 -/* 80026148 00021F88 7C 09 03 A6 */ mtctr r0 -/* 8002614C 00021F8C 60 00 00 00 */ nop -.global lbl_80026150 -lbl_80026150: -/* 80026150 00021F90 A0 04 00 00 */ lhz r0, 0x0(r4) -/* 80026154 00021F94 7C 03 00 40 */ cmplw r3, r0 -/* 80026158 00021F98 40 82 00 10 */ bne lbl_80026168 -/* 8002615C 00021F9C 38 05 00 80 */ addi r0, r5, 0x80 -/* 80026160 00021FA0 54 03 06 3E */ clrlwi r3, r0, 24 -/* 80026164 00021FA4 4E 80 00 20 */ blr -.global lbl_80026168 -lbl_80026168: -/* 80026168 00021FA8 38 84 00 02 */ addi r4, r4, 0x2 -/* 8002616C 00021FAC 38 A5 00 01 */ addi r5, r5, 0x1 -/* 80026170 00021FB0 42 00 FF E0 */ bdnz lbl_80026150 -.global lbl_80026174 -lbl_80026174: -/* 80026174 00021FB4 38 60 00 00 */ li r3, 0x0 -/* 80026178 00021FB8 4E 80 00 20 */ blr -/* 8002617C 00021FBC 00 00 00 00 */ .4byte 0x00000000 -.global OSUTF32toSJIS -OSUTF32toSJIS: -/* 80026180 00021FC0 3C 00 00 01 */ lis r0, 0x1 -/* 80026184 00021FC4 7C 03 00 40 */ cmplw r3, r0 -/* 80026188 00021FC8 41 80 00 0C */ blt lbl_80026194 -/* 8002618C 00021FCC 38 60 00 00 */ li r3, 0x0 -/* 80026190 00021FD0 4E 80 00 20 */ blr -.global lbl_80026194 -lbl_80026194: -/* 80026194 00021FD4 3C 80 80 43 */ lis r4, UcsSjisTable@ha -/* 80026198 00021FD8 54 60 D5 BA */ rlwinm r0, r3, 26, 22, 29 -/* 8002619C 00021FDC 38 84 F4 40 */ addi r4, r4, UcsSjisTable@l -/* 800261A0 00021FE0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800261A4 00021FE4 2C 04 00 00 */ cmpwi r4, 0x0 -/* 800261A8 00021FE8 41 82 00 10 */ beq lbl_800261B8 -/* 800261AC 00021FEC 54 60 0D FC */ rlwinm r0, r3, 1, 23, 30 -/* 800261B0 00021FF0 7C 64 02 2E */ lhzx r3, r4, r0 -/* 800261B4 00021FF4 4E 80 00 20 */ blr -.global lbl_800261B8 -lbl_800261B8: -/* 800261B8 00021FF8 38 60 00 00 */ li r3, 0x0 -/* 800261BC 00021FFC 4E 80 00 20 */ blr diff --git a/asm/os/OS_80421dd8.s b/asm/os/OS_80421dd8.s deleted file mode 100644 index 9e7f7eee..00000000 --- a/asm/os/OS_80421dd8.s +++ /dev/null @@ -1,270 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@1_80421DD8" -"@1_80421DD8": - - .4byte 0x3C3C2052 - .4byte 0x564C5F53 - .4byte 0x444B202D - .4byte 0x204F5320 - .4byte 0x0972656C - .4byte 0x65617365 - .4byte 0x20627569 - .4byte 0x6C643A20 - .4byte 0x41756720 - .4byte 0x32332032 - .4byte 0x30313020 - .4byte 0x31373A33 - .4byte 0x333A3036 - .4byte 0x20283078 - .4byte 0x34333032 - .4byte 0x5F313435 - .4byte 0x29203E3E - .4byte 0 - .4byte 0x0A526576 - .4byte 0x6F6C7574 - .4byte 0x696F6E20 - .4byte 0x4F530A00 - .4byte 0x4B65726E - .4byte 0x656C2062 - .4byte 0x75696C74 - .4byte 0x203A2025 - .4byte 0x73202573 - .4byte 0x0A000000 - .4byte 0x41756720 - .4byte 0x32332032 - .4byte 0x30313000 - .4byte 0x31373A33 - .4byte 0x333A3036 - .4byte 0 - .4byte 0x436F6E73 - .4byte 0x6F6C6520 - .4byte 0x54797065 - .4byte 0x203A2000 - .4byte 0x5072652D - .4byte 0x70726F64 - .4byte 0x75637469 - .4byte 0x6F6E2062 - .4byte 0x6F617264 - .4byte 0x20310A00 - .4byte 0x5072652D - .4byte 0x70726F64 - .4byte 0x75637469 - .4byte 0x6F6E2062 - .4byte 0x6F617264 - .4byte 0x20322D31 - .4byte 0x0A000000 - .4byte 0x5072652D - .4byte 0x70726F64 - .4byte 0x75637469 - .4byte 0x6F6E2062 - .4byte 0x6F617264 - .4byte 0x20322D32 - .4byte 0x0A000000 - .4byte 0x52657461 - .4byte 0x696C2025 - .4byte 0x640A0000 - .4byte 0x4E444556 - .4byte 0x20322E31 - .4byte 0x0A000000 - .4byte 0x4E444556 - .4byte 0x20322E30 - .4byte 0x0A000000 - .4byte 0x4E444556 - .4byte 0x20312E32 - .4byte 0x0A000000 - .4byte 0x4E444556 - .4byte 0x20312E31 - .4byte 0x0A000000 - .4byte 0x4E444556 - .4byte 0x20312E30 - .4byte 0x0A000000 - .4byte 0x5265766F - .4byte 0x6C757469 - .4byte 0x6F6E2045 - .4byte 0x6D756C61 - .4byte 0x746F720A - .4byte 0 - .4byte 0x456D756C - .4byte 0x6174696F - .4byte 0x6E20706C - .4byte 0x6174666F - .4byte 0x726D2028 - .4byte 0x25303878 - .4byte 0x290A0000 - .4byte 0x54444556 - .4byte 0x2D626173 - .4byte 0x65642065 - .4byte 0x6D756C61 - .4byte 0x74696F6E - .4byte 0x20485725 - .4byte 0x640A0000 - .4byte 0x4669726D - .4byte 0x77617265 - .4byte 0x20202020 - .4byte 0x203A2025 - .4byte 0x642E2564 - .4byte 0x2E256420 - .4byte 0 - .4byte 0x2825642F - .4byte 0x25642F25 - .4byte 0x64290A00 - .4byte 0x4D656D6F - .4byte 0x72792025 - .4byte 0x64204D42 - .4byte 0x0A000000 - .4byte 0x4D454D31 - .4byte 0x20417265 - .4byte 0x6E61203A - .4byte 0x20307825 - .4byte 0x78202D20 - .4byte 0x30782578 - .4byte 0x0A000000 - .4byte 0x4D454D32 - .4byte 0x20417265 - .4byte 0x6E61203A - .4byte 0x20307825 - .4byte 0x78202D20 - .4byte 0x30782578 - .4byte 0x0A000000 - .4byte 0x4F532045 - .4byte 0x52524F52 - .4byte 0x3A20626F - .4byte 0x6F742070 - .4byte 0x726F6772 - .4byte 0x616D2069 - .4byte 0x73206E6F - .4byte 0x7420666F - .4byte 0x72205256 - .4byte 0x4C207461 - .4byte 0x72676574 - .4byte 0x2E20506C - .4byte 0x65617365 - .4byte 0x20757365 - .4byte 0x20636F72 - .4byte 0x72656374 - .4byte 0x20626F6F - .4byte 0x74207072 - .4byte 0x6F677261 - .4byte 0x6D2E0A00 - .4byte 0x4661696C - .4byte 0x65642074 - .4byte 0x6F207275 - .4byte 0x6E206170 - .4byte 0x70000000 - .4byte 0 - .4byte 0x4F532045 - .4byte 0x52524F52 - .4byte 0x3A206170 - .4byte 0x706C6F61 - .4byte 0x6465725B - .4byte 0x445D2E69 - .4byte 0x6D672069 - .4byte 0x73206E6F - .4byte 0x7420666F - .4byte 0x72205256 - .4byte 0x4C207461 - .4byte 0x72676574 - .4byte 0x2E20506C - .4byte 0x65617365 - .4byte 0x20757365 - .4byte 0x20636F72 - .4byte 0x72656374 - .4byte 0x20617070 - .4byte 0x6C6F6164 - .4byte 0x65725B44 - .4byte 0x5D2E696D - .4byte 0x672E0A00 - .4byte 0x4F532045 - .4byte 0x52524F52 - .4byte 0x3A205468 - .4byte 0x69732066 - .4byte 0x69726D77 - .4byte 0x61726520 - .4byte 0x69732061 - .4byte 0x6E20696D - .4byte 0x70726F70 - .4byte 0x65722076 - .4byte 0x65727369 - .4byte 0x6F6E2066 - .4byte 0x6F722074 - .4byte 0x68697320 - .4byte 0x53444B2E - .4byte 0x20506C65 - .4byte 0x61736520 - .4byte 0x75736520 - .4byte 0x6120636F - .4byte 0x72726563 - .4byte 0x74204669 - .4byte 0x726D7761 - .4byte 0x72652E0A - .4byte 0 - .4byte 0x0A0A4552 - .4byte 0x524F5220 - .4byte 0x23303032 - .4byte 0x0A416E20 - .4byte 0x6572726F - .4byte 0x72206861 - .4byte 0x73206F63 - .4byte 0x63757272 - .4byte 0x65642E0A - .4byte 0x50726573 - .4byte 0x73207468 - .4byte 0x6520456A - .4byte 0x65637420 - .4byte 0x42757474 - .4byte 0x6F6E2C20 - .4byte 0x72656D6F - .4byte 0x76652074 - .4byte 0x68650A47 - .4byte 0x616D6520 - .4byte 0x44697363 - .4byte 0x2C20616E - .4byte 0x64207475 - .4byte 0x726E206F - .4byte 0x66662074 - .4byte 0x68652070 - .4byte 0x6F776572 - .4byte 0x20746F20 - .4byte 0x0A746865 - .4byte 0x20636F6E - .4byte 0x736F6C65 - .4byte 0x2E200A50 - .4byte 0x6C656173 - .4byte 0x65207265 - .4byte 0x61642074 - .4byte 0x68652057 - .4byte 0x6969204F - .4byte 0x70657261 - .4byte 0x74696F6E - .4byte 0x73204D61 - .4byte 0x6E75616C - .4byte 0x200A666F - .4byte 0x72206675 - .4byte 0x72746865 - .4byte 0x7220696E - .4byte 0x73747275 - .4byte 0x6374696F - .4byte 0x6E732E0A - .4byte 0 - -.global __OSExceptionLocations -__OSExceptionLocations: - - .4byte 0x00000100 - .4byte 0x00000200 - .4byte 0x00000300 - .4byte 0x00000400 - .4byte 0x00000500 - .4byte 0x00000600 - .4byte 0x00000700 - .4byte 0x00000800 - .4byte 0x00000900 - .4byte 0x00000C00 - .4byte 0x00000D00 - .4byte 0x00000F00 - .4byte 0x00001300 - .4byte 0x00001400 - .4byte 0x00001700 - .4byte 0 diff --git a/asm/os/OS_804990a0.s b/asm/os/OS_804990a0.s deleted file mode 100644 index 952093e2..00000000 --- a/asm/os/OS_804990a0.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global __OSRebootParams -__OSRebootParams: - .skip 0x20 - -.global DriveInfo -DriveInfo: - .skip 0x50 diff --git a/asm/os/OS_80556488.s b/asm/os/OS_80556488.s deleted file mode 100644 index 7ce89c95..00000000 --- a/asm/os/OS_80556488.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __OSVersion -__OSVersion: - - .4byte "@1_80421DD8" - -.global "@1784" -"@1784": - - .4byte 0x52564120 - .4byte 0x310A0000 - -.global "@1794_80556494" -"@1794_80556494": - - .4byte 0x25303878 - .4byte 0x0A000000 - -.global "@1847_8055649C" -"@1847_8055649C": - - .4byte 0x25730A00 - -.global "@1849_805564A0" -"@1849_805564A0": - - .4byte 0x4F532E63 - .4byte 0 - -.global "@1187" -"@1187": - - .4byte 0x48414541 - .4byte 0 - -.global AppGameNameForSysMenu -AppGameNameForSysMenu: - - .4byte "@1187" - .4byte 0 diff --git a/asm/os/OS_8055c778.s b/asm/os/OS_8055c778.s deleted file mode 100644 index c664b323..00000000 --- a/asm/os/OS_8055c778.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global __OSInIPL -__OSInIPL: - .skip 0x4 - -.global __OSInNandBoot -__OSInNandBoot: - .skip 0x4 - -.global __OSIsGcam -__OSIsGcam: - .skip 0x8 - -.global ZeroF -ZeroF: - .skip 0x8 - -.global ZeroPS -ZeroPS: - .skip 0x8 - -.global AreWeInitialized -AreWeInitialized: - .skip 0x4 - -.global OSExceptionTable -OSExceptionTable: - .skip 0x4 - -.global GameNameBuffer -GameNameBuffer: - .skip 0x8 - -.global BI2DebugFlagHolder -BI2DebugFlagHolder: - .skip 0x4 - -.global BI2DebugFlag -BI2DebugFlag: - .skip 0x4 - -.global BootInfo_8055C7B0 -BootInfo_8055C7B0: - .skip 0x8 - -.global __OSStartTime -__OSStartTime: - .skip 0x4 - -.global lbl_8055C7BC -lbl_8055C7BC: - .skip 0x4 diff --git a/asm/os/OS_8055e4c8.s b/asm/os/OS_8055e4c8.s deleted file mode 100644 index 4716733f..00000000 --- a/asm/os/OS_8055e4c8.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@1010" -"@1010": - - .4byte 0x0000FF00 - -.global "@1012" -"@1012": - - .4byte 0xFFFFFF00 diff --git a/asm/os/__ppc_eabi_init_80028530.s b/asm/os/__ppc_eabi_init.s similarity index 65% rename from asm/os/__ppc_eabi_init_80028530.s rename to asm/os/__ppc_eabi_init.s index a6af0721..0b7e14e9 100644 --- a/asm/os/__ppc_eabi_init_80028530.s +++ b/asm/os/__ppc_eabi_init.s @@ -1,5 +1,39 @@ .include "macros.inc" +.section .init, "ax" # 0x80004000 - 0x80006740 ; 0x00002740 +.global __init_hardware +__init_hardware: +/* 80006620 00002720 7C 00 00 A6 */ mfmsr r0 +/* 80006624 00002724 60 00 20 00 */ ori r0, r0, 0x2000 +/* 80006628 00002728 7C 00 01 24 */ mtmsr r0 +/* 8000662C 0000272C 7F E8 02 A6 */ mflr r31 +/* 80006630 00002730 48 01 50 41 */ bl __OSPSInit +/* 80006634 00002734 48 01 3C 8D */ bl __OSFPRInit +/* 80006638 00002738 48 01 68 69 */ bl __OSCacheInit +/* 8000663C 0000273C 7F E8 03 A6 */ mtlr r31 +/* 80006640 00002740 4E 80 00 20 */ blr +/* 80006644 00002744 00 00 00 00 */ .4byte 0x00000000 +/* 80006648 00002748 00 00 00 00 */ .4byte 0x00000000 +/* 8000664C 0000274C 00 00 00 00 */ .4byte 0x00000000 +.global __flush_cache +__flush_cache: +/* 80006650 00002750 3C A0 FF FF */ lis r5, 0xFFFFFFF1@h +/* 80006654 00002754 60 A5 FF F1 */ ori r5, r5, 0xFFFFFFF1@l +/* 80006658 00002758 7C A5 18 38 */ and r5, r5, r3 +/* 8000665C 0000275C 7C 65 18 50 */ subf r3, r5, r3 +/* 80006660 00002760 7C 84 1A 14 */ add r4, r4, r3 +.global lbl_80006664 +lbl_80006664: +/* 80006664 00002764 7C 00 28 6C */ dcbst r0, r5 +/* 80006668 00002768 7C 00 04 AC */ sync +/* 8000666C 0000276C 7C 00 2F AC */ icbi r0, r5 +/* 80006670 00002770 30 A5 00 08 */ addic r5, r5, 0x8 +/* 80006674 00002774 34 84 FF F8 */ addic. r4, r4, -0x8 +/* 80006678 00002778 40 80 FF EC */ bge lbl_80006664 +/* 8000667C 0000277C 4C 00 01 2C */ isync +/* 80006680 00002780 4E 80 00 20 */ blr +.include "macros.inc" + .section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860 .global __init_user __init_user: diff --git a/asm/os/__ppc_eabi_init_80006620.s b/asm/os/__ppc_eabi_init_80006620.s deleted file mode 100644 index 2ffe9f3b..00000000 --- a/asm/os/__ppc_eabi_init_80006620.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .init, "ax" # 0x80004000 - 0x80006740 ; 0x00002740 -.global __init_hardware -__init_hardware: -/* 80006620 00002720 7C 00 00 A6 */ mfmsr r0 -/* 80006624 00002724 60 00 20 00 */ ori r0, r0, 0x2000 -/* 80006628 00002728 7C 00 01 24 */ mtmsr r0 -/* 8000662C 0000272C 7F E8 02 A6 */ mflr r31 -/* 80006630 00002730 48 01 50 41 */ bl __OSPSInit -/* 80006634 00002734 48 01 3C 8D */ bl __OSFPRInit -/* 80006638 00002738 48 01 68 69 */ bl __OSCacheInit -/* 8000663C 0000273C 7F E8 03 A6 */ mtlr r31 -/* 80006640 00002740 4E 80 00 20 */ blr -/* 80006644 00002744 00 00 00 00 */ .4byte 0x00000000 -/* 80006648 00002748 00 00 00 00 */ .4byte 0x00000000 -/* 8000664C 0000274C 00 00 00 00 */ .4byte 0x00000000 -.global __flush_cache -__flush_cache: -/* 80006650 00002750 3C A0 FF FF */ lis r5, 0xFFFFFFF1@h -/* 80006654 00002754 60 A5 FF F1 */ ori r5, r5, 0xFFFFFFF1@l -/* 80006658 00002758 7C A5 18 38 */ and r5, r5, r3 -/* 8000665C 0000275C 7C 65 18 50 */ subf r3, r5, r3 -/* 80006660 00002760 7C 84 1A 14 */ add r4, r4, r3 -.global lbl_80006664 -lbl_80006664: -/* 80006664 00002764 7C 00 28 6C */ dcbst r0, r5 -/* 80006668 00002768 7C 00 04 AC */ sync -/* 8000666C 0000276C 7C 00 2F AC */ icbi r0, r5 -/* 80006670 00002770 30 A5 00 08 */ addic r5, r5, 0x8 -/* 80006674 00002774 34 84 FF F8 */ addic. r4, r4, -0x8 -/* 80006678 00002778 40 80 FF EC */ bge lbl_80006664 -/* 8000667C 0000277C 4C 00 01 2C */ isync -/* 80006680 00002780 4E 80 00 20 */ blr diff --git a/asm/os/__start_800062c0.s b/asm/os/__start.s similarity index 100% rename from asm/os/__start_800062c0.s rename to asm/os/__start.s diff --git a/obj_files.mk b/obj_files.mk index 829cd3d7..2f69dda6 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -109,44 +109,44 @@ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/target_options.o \ \ $(BUILD_DIR)/asm/base/PPCArch.o \ \ -$(BUILD_DIR)/asm/os/__start_800062c0.o \ -$(BUILD_DIR)/asm/os/__ppc_eabi_init_80006620.o \ +$(BUILD_DIR)/asm/os/OS.o \ +$(BUILD_DIR)/asm/os/OSAlarm.o \ +$(BUILD_DIR)/asm/os/OSAlloc.o \ +$(BUILD_DIR)/asm/os/OSArena.o \ +$(BUILD_DIR)/asm/os/OSAudioSystem.o \ +$(BUILD_DIR)/asm/os/OSCache.o \ +$(BUILD_DIR)/asm/os/OSContext.o \ +$(BUILD_DIR)/asm/os/OSError.o \ +$(BUILD_DIR)/asm/os/OSExec.o \ +$(BUILD_DIR)/asm/os/OSFatal.o \ +$(BUILD_DIR)/asm/os/OSFont.o \ +$(BUILD_DIR)/asm/os/OSInterrupt.o \ +$(BUILD_DIR)/asm/os/OSLink.o \ +$(BUILD_DIR)/asm/os/OSMessage.o \ +$(BUILD_DIR)/asm/os/OSMemory.o \ +$(BUILD_DIR)/asm/os/OSMutex.o \ +$(BUILD_DIR)/asm/os/OSReboot.o \ +$(BUILD_DIR)/asm/os/OSReset.o \ +$(BUILD_DIR)/asm/os/OSRtc.o \ +$(BUILD_DIR)/asm/os/OSSemaphore.o \ +$(BUILD_DIR)/asm/os/OSSync.o \ +$(BUILD_DIR)/asm/os/OSThread.o \ +$(BUILD_DIR)/asm/os/OSTime.o \ +$(BUILD_DIR)/asm/os/OSUtf.o \ +$(BUILD_DIR)/asm/os/OSIpc.o \ +$(BUILD_DIR)/asm/os/OSStateTM.o \ +$(BUILD_DIR)/asm/os/__start.o \ +$(BUILD_DIR)/asm/os/OSPlayRecord.o \ +$(BUILD_DIR)/asm/os/OSStateFlags.o \ +$(BUILD_DIR)/asm/os/OSNet.o \ +$(BUILD_DIR)/asm/os/OSNandbootInfo.o \ +$(BUILD_DIR)/asm/os/OSPlayTime.o \ +$(BUILD_DIR)/asm/os/OSCrc.o \ +$(BUILD_DIR)/asm/os/OSLaunch.o \ +$(BUILD_DIR)/asm/os/__ppc_eabi_init.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/os/OS_8001a2c0.o \ -$(BUILD_DIR)/asm/os/OSAlarm_8001b7a0.o \ -$(BUILD_DIR)/asm/os/OSAlloc_8001c050.o \ -$(BUILD_DIR)/asm/os/OSArena_8001c370.o \ -$(BUILD_DIR)/asm/os/OSAudioSystem_8001c470.o \ -$(BUILD_DIR)/asm/os/OSCache_8001c930.o \ -$(BUILD_DIR)/asm/os/OSContext_8001cf90.o \ -$(BUILD_DIR)/asm/os/OSError_8001d990.o \ -$(BUILD_DIR)/asm/os/OSExec_8001dfb0.o \ -$(BUILD_DIR)/asm/os/OSFatal_8001f860.o \ -$(BUILD_DIR)/asm/os/OSFont_80020490.o \ -$(BUILD_DIR)/asm/os/OSInterrupt_80021820.o \ -$(BUILD_DIR)/asm/os/OSLink_80021ff0.o \ -$(BUILD_DIR)/asm/os/OSMessage_80022010.o \ -$(BUILD_DIR)/asm/os/OSMemory_800222f0.o \ -$(BUILD_DIR)/asm/os/OSMutex_80022b60.o \ -$(BUILD_DIR)/asm/os/OSReboot_80022e80.o \ -$(BUILD_DIR)/asm/os/OSReset_80022f10.o \ -$(BUILD_DIR)/asm/os/OSRtc_80023840.o \ -$(BUILD_DIR)/asm/os/OSSemaphore_800242f0.o \ -$(BUILD_DIR)/asm/os/OSSync_80024420.o \ -$(BUILD_DIR)/asm/os/OSThread_800244a0.o \ -$(BUILD_DIR)/asm/os/OSTime_80025b40.o \ -$(BUILD_DIR)/asm/os/OSUtf_80025f70.o \ -$(BUILD_DIR)/asm/os/OSIpc_800261c0.o \ -$(BUILD_DIR)/asm/os/OSStateTM_80026200.o \ -$(BUILD_DIR)/asm/os/OSPlayRecord_80026910.o \ -$(BUILD_DIR)/asm/os/OSStateFlags_80027030.o \ -$(BUILD_DIR)/asm/os/OSNet_80027250.o \ -$(BUILD_DIR)/asm/os/OSNandbootInfo_800277f0.o \ -$(BUILD_DIR)/asm/os/OSPlayTime_80027a00.o \ -$(BUILD_DIR)/asm/os/OSCrc_800281e0.o \ -$(BUILD_DIR)/asm/os/OSLaunch_80028320.o \ -$(BUILD_DIR)/asm/os/__ppc_eabi_init_80028530.o \ $(BUILD_DIR)/asm/exi/EXIBios_800285f0.o \ $(BUILD_DIR)/asm/exi/EXIUart_80029ef0.o \ $(BUILD_DIR)/asm/exi/EXICommon_8002a230.o \ @@ -2985,7 +2985,6 @@ $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \ $(BUILD_DIR)/asm/src/Alarm_80406528.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \ -$(BUILD_DIR)/asm/os/OSCrc_80407800.o \ $(BUILD_DIR)/asm/mtx/quat_80407840.o \ $(BUILD_DIR)/asm/dvd/dvdFatal_80407850.o \ $(BUILD_DIR)/asm/dvd/dvdDeviceError_80407888.o \ @@ -3219,25 +3218,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \ $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \ $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \ -$(BUILD_DIR)/asm/os/OS_80421dd8.o \ -$(BUILD_DIR)/asm/os/OSAlarm_804221e8.o \ -$(BUILD_DIR)/asm/os/OSAudioSystem_804221f8.o \ -$(BUILD_DIR)/asm/os/OSCache_80422278.o \ -$(BUILD_DIR)/asm/os/OSContext_80422400.o \ -$(BUILD_DIR)/asm/os/OSError_804225b8.o \ -$(BUILD_DIR)/asm/os/OSExec_80422898.o \ -$(BUILD_DIR)/asm/os/OSFont_80422be8.o \ -$(BUILD_DIR)/asm/os/OSInterrupt_804236f8.o \ -$(BUILD_DIR)/asm/os/OSMemory_80423728.o \ -$(BUILD_DIR)/asm/os/OSReset_80423738.o \ -$(BUILD_DIR)/asm/os/OSTime_804239a0.o \ -$(BUILD_DIR)/asm/os/OSUtf_80423a00.o \ -$(BUILD_DIR)/asm/os/OSStateTM_8042f840.o \ -$(BUILD_DIR)/asm/os/OSPlayRecord_8042f908.o \ -$(BUILD_DIR)/asm/os/OSStateFlags_8042f950.o \ -$(BUILD_DIR)/asm/os/OSNet_8042f978.o \ -$(BUILD_DIR)/asm/os/OSNandbootInfo_8042fae0.o \ -$(BUILD_DIR)/asm/os/OSPlayTime_8042fb00.o \ $(BUILD_DIR)/asm/exi/EXIBios_8042fb40.o \ $(BUILD_DIR)/asm/si/SIBios_8042fb88.o \ $(BUILD_DIR)/asm/si/SISamplingRate_8042fbf8.o \ @@ -5058,17 +5038,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \ $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \ $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \ -$(BUILD_DIR)/asm/os/OS_804990a0.o \ -$(BUILD_DIR)/asm/os/OSError_80499110.o \ -$(BUILD_DIR)/asm/os/OSExec_80499160.o \ -$(BUILD_DIR)/asm/os/OSFatal_80499180.o \ -$(BUILD_DIR)/asm/os/OSRtc_80499460.o \ -$(BUILD_DIR)/asm/os/OSThread_804994b8.o \ -$(BUILD_DIR)/asm/os/OSStateTM_80499ec0.o \ -$(BUILD_DIR)/asm/os/OSPlayRecord_80499f80.o \ -$(BUILD_DIR)/asm/os/OSStateFlags_8049a180.o \ -$(BUILD_DIR)/asm/os/OSNet_8049a1a0.o \ -$(BUILD_DIR)/asm/os/OSPlayTime_8049a260.o \ $(BUILD_DIR)/asm/exi/EXIBios_8049a290.o \ $(BUILD_DIR)/asm/si/SIBios_8049a350.o \ $(BUILD_DIR)/asm/vi/vi_8049a570.o \ @@ -5217,18 +5186,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \ $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \ $(BUILD_DIR)/asm/src/Table_80556398.o \ -$(BUILD_DIR)/asm/os/OS_80556488.o \ -$(BUILD_DIR)/asm/os/OSAlloc_805564b8.o \ -$(BUILD_DIR)/asm/os/OSArena_805564c0.o \ -$(BUILD_DIR)/asm/os/OSError_805564c8.o \ -$(BUILD_DIR)/asm/os/OSExec_805564d0.o \ -$(BUILD_DIR)/asm/os/OSFatal_805564e0.o \ -$(BUILD_DIR)/asm/os/OSFont_805564e8.o \ -$(BUILD_DIR)/asm/os/OSThread_805564f0.o \ -$(BUILD_DIR)/asm/os/OSIpc_805564f8.o \ -$(BUILD_DIR)/asm/os/OSPlayRecord_80556500.o \ -$(BUILD_DIR)/asm/os/OSNet_80556508.o \ -$(BUILD_DIR)/asm/os/OSPlayTime_80556510.o \ $(BUILD_DIR)/asm/exi/EXIBios_80556518.o \ $(BUILD_DIR)/asm/si/SIBios_80556520.o \ $(BUILD_DIR)/asm/vi/vi_80556528.o \ @@ -5684,22 +5641,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \ $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \ $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \ -$(BUILD_DIR)/asm/os/OS_8055c778.o \ -$(BUILD_DIR)/asm/os/OSAlarm_8055c7c0.o \ -$(BUILD_DIR)/asm/os/OSAlloc_8055c7c8.o \ -$(BUILD_DIR)/asm/os/OSArena_8055c7d8.o \ -$(BUILD_DIR)/asm/os/OSExec_8055c7e0.o \ -$(BUILD_DIR)/asm/os/OSFont_8055c7f8.o \ -$(BUILD_DIR)/asm/os/OSInterrupt_8055c808.o \ -$(BUILD_DIR)/asm/os/OSMemory_8055c820.o \ -$(BUILD_DIR)/asm/os/OSReboot_8055c828.o \ -$(BUILD_DIR)/asm/os/OSReset_8055c830.o \ -$(BUILD_DIR)/asm/os/OSThread_8055c840.o \ -$(BUILD_DIR)/asm/os/OSIpc_8055c850.o \ -$(BUILD_DIR)/asm/os/OSStateTM_8055c858.o \ -$(BUILD_DIR)/asm/os/OSPlayRecord_8055c880.o \ -$(BUILD_DIR)/asm/os/OSNet_8055c8a0.o \ -$(BUILD_DIR)/asm/os/OSPlayTime_8055c8b0.o \ $(BUILD_DIR)/asm/exi/EXIBios_8055c8c8.o \ $(BUILD_DIR)/asm/exi/EXIUart_8055c8d0.o \ $(BUILD_DIR)/asm/si/SIBios_8055c8e0.o \ @@ -5936,10 +5877,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \ $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \ $(BUILD_DIR)/asm/src/Alarm_8055df68.o \ -$(BUILD_DIR)/asm/os/OS_8055e4c8.o \ -$(BUILD_DIR)/asm/os/OSFatal_8055e4d0.o \ -$(BUILD_DIR)/asm/os/OSFont_8055e510.o \ -$(BUILD_DIR)/asm/os/OSPlayTime_8055e518.o \ $(BUILD_DIR)/asm/exi/EXICommon_8055e528.o \ $(BUILD_DIR)/asm/mtx/mtx_8055e530.o \ $(BUILD_DIR)/asm/mtx/mtx44_8055e550.o \