From ed6db75b4837a2aaf8e6d28a352c091b0523244c Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 30 May 2021 14:36:36 -0500 Subject: [PATCH] Moved .rodata in unknown_079F50 from asm to C. --- data/unknown_079F50.rodata.s | 41 ------------------------------------ src/unknown_079F50.c | 32 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 41 deletions(-) delete mode 100644 data/unknown_079F50.rodata.s diff --git a/data/unknown_079F50.rodata.s b/data/unknown_079F50.rodata.s deleted file mode 100644 index d7828698..00000000 --- a/data/unknown_079F50.rodata.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macros.inc" - -.macro .aligned_text ascii - .asciz "\ascii" - .balign 4 -.endm - -.section .rodata - -.aligned_text "(Audio task)" -.aligned_text "(Game task)" -.aligned_text "(DI task)\n" -.aligned_text "(DI benchmark test)\n" -.aligned_text "(Unknown task type %d)\n" -.aligned_text "\nRCP TASK INFO\n" -.aligned_text "-------------\n" -.aligned_text "\ttype\t\t= %u\n" -.aligned_text "\tflags\t\t= %u\n" -.aligned_text "\tucode_boot\t\t= %p\n" -.aligned_text "\tucode_boot_size\t\t= %u\n" -.aligned_text "\tucode\t\t= %p\n" -.aligned_text "\tucode_size\t\t= %u\n" -.aligned_text "\tucode_data\t\t= %p\n" -.aligned_text "\tucode_data_size\t\t= %u\n" -.aligned_text "\toutput_buff\t\t= %p\n" -.aligned_text "\toutput_buff_size\t\t= %u\n" -.aligned_text "\tdata_ptr\t\t= %p\n" -.aligned_text "\tdata_size\t\t= %u\n" - -glabel D_800E796C -.word 0x48E4E1C0 - -glabel D_800E7970 -.word 0x8007A2A4 -.word 0x8007A248 -.word 0x8007A1BC -.word 0x8007A2A4 -.word 0x8007A2A4 -.word 0x8007A248 -.word 0x8007A248 -.word 0x00000000 diff --git a/src/unknown_079F50.c b/src/unknown_079F50.c index 30663b6f..ae78025d 100644 --- a/src/unknown_079F50.c +++ b/src/unknown_079F50.c @@ -83,6 +83,38 @@ s32 D_800DE764 = 0; // Currently unknown, might be a different type. /*******************************/ +/************ .rodata ************/ + +const char D_800E7800[] = "(Audio task)"; +const char D_800E7810[] = "(Game task)"; +const char D_800E781C[] = "(DI task)\n"; +const char D_800E7828[] = "(DI benchmark test)\n"; +const char D_800E7840[] = "(Unknown task type %d)\n"; +const char D_800E7858[] = "\nRCP TASK INFO\n"; +const char D_800E7868[] = "-------------\n"; +const char D_800E7878[] = "\ttype\t\t= %u\n"; +const char D_800E7888[] = "\tflags\t\t= %u\n"; +const char D_800E7898[] = "\tucode_boot\t\t= %p\n"; +const char D_800E78AC[] = "\tucode_boot_size\t\t= %u\n"; +const char D_800E78C4[] = "\tucode\t\t= %p\n"; +const char D_800E78D4[] = "\tucode_size\t\t= %u\n"; +const char D_800E78E8[] = "\tucode_data\t\t= %p\n"; +const char D_800E78FC[] = "\tucode_data_size\t\t= %u\n"; +const char D_800E7914[] = "\toutput_buff\t\t= %p\n"; +const char D_800E7928[] = "\toutput_buff_size\t\t= %u\n"; +const char D_800E7944[] = "\tdata_ptr\t\t= %p\n"; +const char D_800E7958[] = "\tdata_size\t\t= %u\n"; + +const FloatLiteral D_800E796C = { 468750.0f }; + +// Jump table in __scSchedule +const u32 D_800E7970[] = { + 0x8007A2A4, 0x8007A248, 0x8007A1BC, 0x8007A2A4, + 0x8007A2A4, 0x8007A248, 0x8007A248 +}; + +/*********************************/ + extern OSViMode D_800E3900[];//osViModeTable; extern s32 D_80126120;