From 6fc191b45bd92d8495712d3f4bb3b8e0c1638e11 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Tue, 17 Mar 2020 16:33:41 -0400 Subject: [PATCH] Migrated rodata --- .../actors/ovl_Demo_Geff/DemoGeff_Draw.s | 9 ++ .../actors/ovl_Demo_Geff/DemoGeff_Init.s | 9 ++ .../actors/ovl_Demo_Geff/DemoGeff_Update.s | 8 ++ .../actors/ovl_Demo_Geff/func_80977EA8.s | 16 ++++ .../actors/ovl_Demo_Geff/func_80977F80.s | 12 +++ .../actors/ovl_Demo_Geff/func_80978030.s | 18 ++++ .../actors/ovl_Demo_Geff/func_809780E0.s | 21 +++++ .../actors/ovl_Demo_Geff/func_80978370.s | 8 ++ .../actors/ovl_Demo_Geff/func_809783D4.s | 9 ++ data/overlays/actors/z_demo_geff.rodata.s | 80 ------------------ spec | 1 - tools/ido5.3_compiler/LICENSE.md | 0 tools/ido5.3_compiler/lib/libmalloc.so | Bin tools/ido5.3_compiler/lib/libmalloc_old.so | Bin tools/ido5.3_compiler/lib/rld | Bin tools/ido5.3_compiler/usr/bin/cc | Bin tools/ido5.3_compiler/usr/lib/as0 | Bin tools/ido5.3_compiler/usr/lib/as1 | Bin tools/ido5.3_compiler/usr/lib/cfe | Bin tools/ido5.3_compiler/usr/lib/crt1.o | Bin tools/ido5.3_compiler/usr/lib/err.english.cc | 0 tools/ido5.3_compiler/usr/lib/libc.so.1 | Bin tools/ido5.3_compiler/usr/lib/libexc.so | Bin tools/ido5.3_compiler/usr/lib/libgen.so | Bin tools/ido5.3_compiler/usr/lib/libm.so | Bin tools/ido5.3_compiler/usr/lib/ugen | Bin tools/ido5.3_compiler/usr/lib/ujoin | Bin tools/ido5.3_compiler/usr/lib/uld | Bin tools/ido5.3_compiler/usr/lib/umerge | Bin tools/ido5.3_compiler/usr/lib/uopt | Bin tools/ido5.3_compiler/usr/lib/usplit | Bin 31 files changed, 110 insertions(+), 81 deletions(-) delete mode 100644 data/overlays/actors/z_demo_geff.rodata.s mode change 100644 => 100755 tools/ido5.3_compiler/LICENSE.md mode change 100644 => 100755 tools/ido5.3_compiler/lib/libmalloc.so mode change 100644 => 100755 tools/ido5.3_compiler/lib/libmalloc_old.so mode change 100644 => 100755 tools/ido5.3_compiler/lib/rld mode change 100644 => 100755 tools/ido5.3_compiler/usr/bin/cc mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/as0 mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/as1 mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/cfe mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/crt1.o mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/err.english.cc mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/libc.so.1 mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/libexc.so mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/libgen.so mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/libm.so mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/ugen mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/ujoin mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/uld mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/umerge mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/uopt mode change 100644 => 100755 tools/ido5.3_compiler/usr/lib/usplit diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Draw.s index 7be00a7160..3afafed3d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Draw.s @@ -1,3 +1,12 @@ +.rdata + + +glabel D_80978740 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text + glabel DemoGeff_Draw /* 006A0 809784E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 006A4 809784E4 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Init.s index dfd28b9e27..426d489ca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Init.s @@ -1,3 +1,12 @@ +.rdata + + +glabel D_809785E0 + .asciz "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" + .balign 4 + +.text + glabel DemoGeff_Init /* 0000C 80977E4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00010 80977E50 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Update.s index 9df7106d09..c4992029af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Update.s @@ -1,3 +1,11 @@ +.rdata + +glabel D_80978704 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text + glabel DemoGeff_Update /* 00638 80978478 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0063C 8097847C AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977EA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977EA8.s index 70b44521f4..628433d3fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977EA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977EA8.s @@ -1,3 +1,19 @@ +.rdata + +glabel D_8097861C + .asciz "../z_demo_geff.c" + .balign 4 + +glabel D_80978630 + .asciz "../z_demo_geff.c" + .balign 4 + +glabel D_80978644 + .asciz "../z_demo_geff.c" + .balign 4 + +.text + glabel func_80977EA8 /* 00068 80977EA8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 0006C 80977EAC AFBF001C */ sw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s index 23cda1aae2..ee035d3a8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s @@ -1,3 +1,15 @@ +.rdata + +glabel D_80978658 + .asciz "../z_demo_geff.c" + .balign 4 + +glabel D_8097866C + .asciz "../z_demo_geff.c" + .balign 4 + +.text + glabel func_80977F80 /* 00140 80977F80 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 00144 80977F84 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978030.s index 5731a2e104..ab3a164015 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978030.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978030.s @@ -1,3 +1,21 @@ +.late_rodata + +glabel jtbl_80978778 +.word L80978064 +.word func_809780E0 +.word L8097816C +.word L80978064 +.word func_809780E0 +.word L8097816C +.word L80978064 +.word func_809780E0 +glabel D_80978798 + .word 0x3C23D70A +glabel D_8097879C + .word 0x3E99999A + +.text + glabel func_80978030 /* 001F0 80978030 AFA50004 */ sw $a1, 0x0004($sp) /* 001F4 80978034 948E001C */ lhu $t6, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809780E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809780E0.s index c140b9e4ae..a34fe5d913 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809780E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809780E0.s @@ -1,3 +1,24 @@ +.late_rodata + +glabel D_809787A0 + .word 0x3C23D70A +glabel D_809787A4 + .word 0x3E19999A +glabel D_809787A8 + .word 0x3E947AE1 +glabel D_809787AC + .word 0x3DF5C28F +glabel D_809787B0 + .word 0x3C23D70A +glabel D_809787B4 + .word 0x3DCCCCCD +glabel D_809787B8 + .word 0x3E19999A +glabel D_809787BC + .word 0x3E4CCCCD + +.text + glabel func_809780E0 /* 002A0 809780E0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 002A4 809780E4 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978370.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978370.s index fa79bc57a7..22f7325187 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978370.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978370.s @@ -1,3 +1,11 @@ +.rdata + +glabel D_80978680 + .asciz " Demo_Geff_main_init:初期化処理がおかしいarg_data = %d!\n" + .balign 4 + +.text + glabel func_80978370 /* 00530 80978370 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00534 80978374 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809783D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809783D4.s index 2a2cbdeb76..f06fb64efe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809783D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809783D4.s @@ -1,3 +1,12 @@ +.rdata + + +glabel D_809786C4 + .asciz "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" + .balign 4 + +.text + glabel func_809783D4 /* 00594 809783D4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00598 809783D8 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/data/overlays/actors/z_demo_geff.rodata.s b/data/overlays/actors/z_demo_geff.rodata.s deleted file mode 100644 index cf738192db..0000000000 --- a/data/overlays/actors/z_demo_geff.rodata.s +++ /dev/null @@ -1,80 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_809785E0 - .asciz "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8097861C - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_80978630 - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_80978644 - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_80978658 - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_8097866C - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_80978680 - .asciz " Demo_Geff_main_init:初期化処理がおかしいarg_data = %d!\n" - .balign 4 - -glabel D_809786C4 - .asciz "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" - .balign 4 - -glabel D_80978704 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80978740 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel jtbl_80978778 -.word L80978064 -.word func_809780E0 -.word L8097816C -.word L80978064 -.word func_809780E0 -.word L8097816C -.word L80978064 -.word func_809780E0 -glabel D_80978798 - .word 0x3C23D70A -glabel D_8097879C - .word 0x3E99999A -glabel D_809787A0 - .word 0x3C23D70A -glabel D_809787A4 - .word 0x3E19999A -glabel D_809787A8 - .word 0x3E947AE1 -glabel D_809787AC - .word 0x3DF5C28F -glabel D_809787B0 - .word 0x3C23D70A -glabel D_809787B4 - .word 0x3DCCCCCD -glabel D_809787B8 - .word 0x3E19999A -glabel D_809787BC - .word 0x3E4CCCCD - - diff --git a/spec b/spec index 00c5891b03..697c0bb262 100644 --- a/spec +++ b/spec @@ -1796,7 +1796,6 @@ beginseg name "ovl_Demo_Geff" include "build/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.o" include "build/data/overlays/actors/z_demo_geff.data.o" - include "build/data/overlays/actors/z_demo_geff.rodata.o" include "build/data/overlays/actors/z_demo_geff.reloc.o" endseg diff --git a/tools/ido5.3_compiler/LICENSE.md b/tools/ido5.3_compiler/LICENSE.md old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/lib/libmalloc.so b/tools/ido5.3_compiler/lib/libmalloc.so old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/lib/libmalloc_old.so b/tools/ido5.3_compiler/lib/libmalloc_old.so old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/lib/rld b/tools/ido5.3_compiler/lib/rld old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/bin/cc b/tools/ido5.3_compiler/usr/bin/cc old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/as0 b/tools/ido5.3_compiler/usr/lib/as0 old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/as1 b/tools/ido5.3_compiler/usr/lib/as1 old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/cfe b/tools/ido5.3_compiler/usr/lib/cfe old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/crt1.o b/tools/ido5.3_compiler/usr/lib/crt1.o old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/err.english.cc b/tools/ido5.3_compiler/usr/lib/err.english.cc old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/libc.so.1 b/tools/ido5.3_compiler/usr/lib/libc.so.1 old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/libexc.so b/tools/ido5.3_compiler/usr/lib/libexc.so old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/libgen.so b/tools/ido5.3_compiler/usr/lib/libgen.so old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/libm.so b/tools/ido5.3_compiler/usr/lib/libm.so old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/ugen b/tools/ido5.3_compiler/usr/lib/ugen old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/ujoin b/tools/ido5.3_compiler/usr/lib/ujoin old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/uld b/tools/ido5.3_compiler/usr/lib/uld old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/umerge b/tools/ido5.3_compiler/usr/lib/umerge old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/uopt b/tools/ido5.3_compiler/usr/lib/uopt old mode 100644 new mode 100755 diff --git a/tools/ido5.3_compiler/usr/lib/usplit b/tools/ido5.3_compiler/usr/lib/usplit old mode 100644 new mode 100755