pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

split rsp ucode (#560)

Browse Source 
* define rspboot

* define rspaudio and f3dex2

* some changes as requested
This commit is contained in:
Alto1772 2021-12-25 00:32:52 +08:00 committed by GitHub
parent 585c0dc428
commit be35cf4fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bss.c
View File

@ -345,7 +345,8 @@ BSS s8 D_800D95E8[0x38];
BSS s8 D_800D9620[0x48]; BSS s8 D_800D9620[0x48];
BSS s8 D_800D9668[0x18]; BSS s8 D_800D9668[0x18];
BSS s8 D_800D9680[0x100]; BSS s8 D_800D9680[0x100];
BSS s8 D_800D9780[0x800]; BSS s8 rspbootUcodeBuffer[0x100];
BSS s8 D_800D9880[0x700];
BSS s8 D_800D9F80[0x80]; BSS s8 D_800D9F80[0x80];
BSS s8 D_800DA000[0x3C]; BSS s8 D_800DA000[0x3C];
BSS s32 D_800DA03C; BSS s32 D_800DA03C;

6
src/os/nusys/nuGfxTaskMgr.c
View File

@ -16,7 +16,7 @@ extern NUScTask nuGfxTask[NU_GFX_TASK_NUM];
extern s32 D_800DA040; extern s32 D_800DA040;
extern s32 D_800B91D0; extern s32 D_800B91D0;
extern s32 D_800D91D0; extern s32 D_800D91D0;
extern void D_800D9780; extern u8 rspbootUcodeBuffer[];
extern u32 nuGfxCfbCounter; extern u32 nuGfxCfbCounter;
extern OSMesgQueue D_800DA47C; extern OSMesgQueue D_800DA47C;
@ -71,8 +71,8 @@ void nuGfxTaskMgrInit(void) {
nuGfxTask[i].msgQ = &D_800DAC90; nuGfxTask[i].msgQ = &D_800DAC90;
nuGfxTask[i].list.t.type = M_GFXTASK; nuGfxTask[i].list.t.type = M_GFXTASK;
nuGfxTask[i].list.t.flags = 0; nuGfxTask[i].list.t.flags = 0;
dma_copy((u8* )0xB0000B70, (u8* )0xB0000C70, &D_800D9780); dma_copy((u8* )0xB0000B70, (u8* )0xB0000C70, rspbootUcodeBuffer);
nuGfxTask[i].list.t.ucode_boot = &D_800D9780; nuGfxTask[i].list.t.ucode_boot = rspbootUcodeBuffer;
nuGfxTask[i].list.t.ucode_boot_size = 0x100; nuGfxTask[i].list.t.ucode_boot_size = 0x100;
nuGfxTask[i].list.t.ucode_size = SP_UCODE_SIZE; nuGfxTask[i].list.t.ucode_size = SP_UCODE_SIZE;
nuGfxTask[i].list.t.ucode_data_size = SP_UCODE_DATA_SIZE; nuGfxTask[i].list.t.ucode_data_size = SP_UCODE_DATA_SIZE;

21
ver/us/asm/data/1000_len_60.data.s
View File

File diff suppressed because one or more lines are too long

18
ver/us/asm/data/4F200.data.s Normal file
View File

@ -0,0 +1,18 @@
.include "macro.inc"
.section .data
dlabel D_80073E00
.word 0x00000000
dlabel D_80073E04
.word 0x00000000
dlabel D_80073E08
.short 0x0000
dlabel D_80073E0A
.short 0x0000, 0x0000, 0x0000
dlabel D_80073E10
.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000

2
ver/us/asm/data/6EAC0.data.s
View File

@ -18,7 +18,7 @@ dlabel D_80093B94
.word D_80093B84, 0x00000000, 0x00000000 .word D_80093B84, 0x00000000, 0x00000000
dlabel nugfx_ucode dlabel nugfx_ucode
.word 0x80096030, 0x80097660 .word gspF3DEX2kawase_fifo_text_bin, gspF3DEX2kawase_fifo_data_bin
dlabel FrameBuf dlabel FrameBuf
.word D_8038F800, D_803B5000, heap_battleHead, 0x00000000 .word D_8038F800, D_803B5000, heap_battleHead, 0x00000000

9
ver/us/asm/data/71430.data.s
View File

File diff suppressed because one or more lines are too long

12
ver/us/asm/nonmatchings/25f00_len_940/create_audio_system.s
View File

@ -73,13 +73,13 @@ glabel create_audio_system
/* 2600C 8004AC0C 26520004 */ addiu $s2, $s2, 4 /* 2600C 8004AC0C 26520004 */ addiu $s2, $s2, 4
/* 26010 8004AC10 0000882D */ daddu $s1, $zero, $zero /* 26010 8004AC10 0000882D */ daddu $s1, $zero, $zero
/* 26014 8004AC14 24090002 */ addiu $t1, $zero, 2 /* 26014 8004AC14 24090002 */ addiu $t1, $zero, 2
/* 26018 8004AC18 3C08800E */ lui $t0, %hi(D_800D9780) /* 26018 8004AC18 3C08800E */ lui $t0, %hi(rspbootUcodeBuffer)
/* 2601C 8004AC1C 25089780 */ addiu $t0, $t0, %lo(D_800D9780) /* 2601C 8004AC1C 25089780 */ addiu $t0, $t0, %lo(rspbootUcodeBuffer)
/* 26020 8004AC20 24070100 */ addiu $a3, $zero, 0x100 /* 26020 8004AC20 24070100 */ addiu $a3, $zero, 0x100
/* 26024 8004AC24 3C068007 */ lui $a2, %hi(D_800731A0) /* 26024 8004AC24 3C068007 */ lui $a2, %hi(n_aspMain_text_bin)
/* 26028 8004AC28 24C631A0 */ addiu $a2, $a2, %lo(D_800731A0) /* 26028 8004AC28 24C631A0 */ addiu $a2, $a2, %lo(n_aspMain_text_bin)
/* 2602C 8004AC2C 3C058009 */ lui $a1, %hi(D_80097A80) /* 2602C 8004AC2C 3C058009 */ lui $a1, %hi(n_aspMain_data_bin)
/* 26030 8004AC30 24A57A80 */ addiu $a1, $a1, %lo(D_80097A80) /* 26030 8004AC30 24A57A80 */ addiu $a1, $a1, %lo(n_aspMain_data_bin)
/* 26034 8004AC34 24040800 */ addiu $a0, $zero, 0x800 /* 26034 8004AC34 24040800 */ addiu $a0, $zero, 0x800
/* 26038 8004AC38 3C03800A */ lui $v1, %hi(D_800A3520) /* 26038 8004AC38 3C03800A */ lui $v1, %hi(D_800A3520)
/* 2603C 8004AC3C 24633520 */ addiu $v1, $v1, %lo(D_800A3520) /* 2603C 8004AC3C 24633520 */ addiu $v1, $v1, %lo(D_800A3520)

9
ver/us/splat.yaml
View File

@ -36,7 +36,7 @@ segments:
vram: 0xA4000040 vram: 0xA4000040
subsegments: subsegments:
- [0x0040, asm, boot] - [0x0040, asm, boot]
- [0x0B70, bin, bootcode_font] - [0x0B70, bin, rspboot_font]
- type: code - type: code
start: 0x1000 start: 0x1000
vram: 0x80025C00 vram: 0x80025C00
@ -254,7 +254,8 @@ segments:
- [0x4A2A0, c, os/osFlash] - [0x4A2A0, c, os/osFlash]
- [0x4AC90, pm_effect_loads, effect_loads] - [0x4AC90, pm_effect_loads, effect_loads]
- [0x4DF30, c, battle/battle] - [0x4DF30, c, battle/battle]
- [0x4E5A0, data, 1000_len_60] - [0x4E5A0, bin, n_aspMain_text]
- [0x4F200, data]
- [0x4F410, .data, main] - [0x4F410, .data, main]
- [0x4F420, .data, main_loop] - [0x4F420, .data, main_loop]
- [0x4F660, .data, rumble] - [0x4F660, .data, rumble]
@ -320,7 +321,9 @@ segments:
- [0x6FA50, .data, os/osSetThreadPri] - [0x6FA50, .data, os/osSetThreadPri]
- [0x6FA70, data] # has scripts? - [0x6FA70, data] # has scripts?
- [0x70E30, .data, battle/battle] - [0x70E30, .data, battle/battle]
- [0x71430, data] - [0x71430, bin, gspF3DEX2kawase_fifo_text]
- [0x72A60, bin, gspF3DEX2kawase_fifo_data]
- [0x72E80, bin, n_aspMain_data]
- [0x73130, .rodata, is_debug] - [0x73130, .rodata, is_debug]
- [0x73148, .rodata, main_loop] - [0x73148, .rodata, main_loop]
- [0x73160, .rodata, 43F0] - [0x73160, .rodata, 43F0]

2
ver/us/symbol_addrs.txt
View File

@ -18614,7 +18614,7 @@ D_800D95E8 = 0x800D95E8; // type:data
D_800D9620 = 0x800D9620; // type:data D_800D9620 = 0x800D9620; // type:data
D_800D9668 = 0x800D9668; // type:data D_800D9668 = 0x800D9668; // type:data
D_800D9680 = 0x800D9680; // type:data D_800D9680 = 0x800D9680; // type:data
D_800D9780 = 0x800D9780; // type:data rspbootUcodeBuffer = 0x800D9780; // type:data
D_800D9F80 = 0x800D9F80; // type:data D_800D9F80 = 0x800D9F80; // type:data
D_800DA000 = 0x800DA000; // type:data D_800DA000 = 0x800DA000; // type:data
D_800DA03C = 0x800DA03C; // type:data D_800DA03C = 0x800DA03C; // type:data