From c95fd196a8a9c353d5497724eb91378f3b47a5d0 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 30 May 2021 16:02:34 -0500 Subject: [PATCH] Moved .rodata in unknown_061D30 from asm to C. --- data/unknown_061D30.rodata.s | 161 ----------------------------------- src/unknown_061D30.c | 54 ++++++++++++ tools/python/generate_ld.py | 1 + 3 files changed, 55 insertions(+), 161 deletions(-) delete mode 100644 data/unknown_061D30.rodata.s diff --git a/data/unknown_061D30.rodata.s b/data/unknown_061D30.rodata.s deleted file mode 100644 index 7a937001..00000000 --- a/data/unknown_061D30.rodata.s +++ /dev/null @@ -1,161 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -.aligned_text "CSP: oh oh \n" - -glabel D_800E6C30 -.word 0x8006247C -.word 0x80062978 -.word 0x800626F8 -.word 0x80062978 -.word 0x80062978 -.word 0x800624AC -.word 0x800624FC -.word 0x8006270C -.word 0x80062978 -.word 0x8006248C -.word 0x80062720 -.word 0x80062978 -.word 0x80062924 -.word 0x80062944 -.word 0x80062968 -.word 0x80062788 -.word 0x800627AC -.word 0x80062880 -.word 0x80062978 -.word 0x80062978 -.word 0x80062978 -.word 0x800626F8 -.word 0x80062564 -.word 0x80062668 - -glabel D_800E6C90 -.word 0x80062A90 -.word 0x80062AF0 -.word 0x80062AA8 -.word 0x80062AC0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AF0 -.word 0x80062AE8 -.word 0x80062AE8 -.word 0x80062AE8 - -glabel D_800E6CE0 -.word 0x80063068 -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x80062C38 -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800630C0 -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x8006319C -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800636E0 -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x80063124 -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x800637CC -.word 0x80063714 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - diff --git a/src/unknown_061D30.c b/src/unknown_061D30.c index 2268bc29..095e4eb7 100644 --- a/src/unknown_061D30.c +++ b/src/unknown_061D30.c @@ -4,6 +4,60 @@ #include "types.h" #include "macros.h" +/************ .rodata ************/ + +const char D_800E6C20[] = "CSP: oh oh \n"; + +// Jump table in __CSPVoiceHandler +const u32 D_800E6C30[] = { + 0x8006247C, 0x80062978, 0x800626F8, 0x80062978, + 0x80062978, 0x800624AC, 0x800624FC, 0x8006270C, + 0x80062978, 0x8006248C, 0x80062720, 0x80062978, + 0x80062924, 0x80062944, 0x80062968, 0x80062788, + 0x800627AC, 0x80062880, 0x80062978, 0x80062978, + 0x80062978, 0x800626F8, 0x80062564, 0x80062668 +}; + +// Jump table in __CSPHandleNextSeqEvent +const u32 D_800E6C90[] = { + 0x80062A90, 0x80062AF0, 0x80062AA8, 0x80062AC0, + 0x80062AF0, 0x80062AF0, 0x80062AF0, 0x80062AF0, + 0x80062AF0, 0x80062AF0, 0x80062AF0, 0x80062AF0, + 0x80062AF0, 0x80062AF0, 0x80062AF0, 0x80062AF0, + 0x80062AF0, 0x80062AE8, 0x80062AE8, 0x80062AE8 +}; + +// Jump table in __CSPHandleMIDIMsg +const u32 D_800E6CE0[] = { + 0x80063068, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x80062C38, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800630C0, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x8006319C, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800636E0, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x80063124, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC, + 0x80063714 +}; + +/*********************************/ + GLOBAL_ASM("asm/non_matchings/unknown_061D30/alCSPNew.s") GLOBAL_ASM("asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s") GLOBAL_ASM("asm/non_matchings/unknown_061D30/__CSPPostNextSeqEvent.s") diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index cdf75cea..9e32a4c0 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -34,6 +34,7 @@ class GenerateLD: self.indentLevel = 0 self.file = file self.gen_comment('linker script generated by generate_ld.py') + self.gen_comment('If you want to make any changes, then edit the generate_ld.py script!') self.gen_newline() self.gen_line('OUTPUT_ARCH (mips)') self.gen_newline()