Refresh 8

CHANGES

@@ -1,3 +1,45 @@
+Refresh #8
+1.) Use INT_STATUS_ macros for oInteractStatus (#911)
+2.) Update bullet_bill.inc.c (#912)
+3.) Make geo.c in levels nonconst to reduce diffs with gcc enhancement patch in future (#913)
+4.) Improve process_level_music_dynamics (#915)
+5.) add AVOID_UB define for fixing libultra aliasing. (#916)
+6.) const hack to TARGET_N64 and tweak ld script (#918)
+7.) Replace raw level/course numbers with defines (#919)
+8.) Label all graph node flags. (#920)
+9.) readme.md capitalization
+10.) The Big Function PR (Part 5) (#910)
+11.) Label hardware registers (#922)
+12.) Match EU synthesis_process_note (#923)
+13.) Some quick value changes (#909)
+14.) Added sequence player defines (#926)
+15.) Shindou diffs 2 [merge game.c and display.c, required for SH] (#927)
+16.) Match synthesis_process_notes and use -sopt for synthesis.c (#928)
+17.) Fix mips64-binutils for Fedora 31 and similar Linux distros (#931)
+18.) Update first-diff.py to work with Shindou (#933)
+19.) Labelled behavior_script.c (#929)
+20.) shindou diffs up to level_update (#932)
+21.) Update diff.py and diff_settings.py to work with SH (#936)
+22.) Add some Shindou resources to extract_assets.py (#939)
+23.) Label and document gd_math.c (#930)
+24.) Label all of Mario's actions. (#941)
+25.) Label all particles. (#940)
+26.) Renamed death related warpBhvs (#942)
+27.) Small Shindou differences (#945)
+28.) match player_performed_grab_escape_action in all versions (#943)
+29.) add main alignment (aglab2, #947)
+30.) Match a bunch of fake EU matchings (#944)
+31.) Shindou diffs round 4 (#937)
+32.) Easy PAL fake matchings (#946)
+33.) Merge object_helpers and object_helpers2 headers (#948)
+34.) match cap_check_quicksand (#950)
+35.) Shindou crash screen diffs (#938)
+36.) Thread6 (#951)
+37.) Correct IPL3 function and label addresses (#952)
+38.) Add COMPILER flag for Makefile and add official mips gcc support. (#953)
+39.) add align to sequence_00 (fixes gcc build) (#957)
+40.) Fixed itty bitty typo (#959)
+
 Refresh #7
 1.) update README.md (#861)
 2.) [eu] fix decompilation bugs in synthesis_process_note (#862)

Makefile

@@ -19,6 +19,12 @@ COMPARE ?= 1
 NON_MATCHING ?= 0
 # Build for the N64 (turn this off for ports)
 TARGET_N64 ?= 1
+# Compiler to use (ido or gcc)
+COMPILER ?= ido
+
+ifeq ($(COMPILER),gcc)
+  NON_MATCHING := 1
+endif
 
 # Release
 
@@ -51,7 +57,7 @@ ifeq ($(VERSION),sh)
   GRUCODE_ASFLAGS := --defsym F3D_NEW=1
   TARGET := sm64.sh
 # TODO: GET RID OF THIS!!! We should mandate assets for Shindou like EU but we dont have the addresses extracted yet so we'll just pretend you have everything extracted for now.
-  NOEXTRACT := 1
+  NOEXTRACT := 1 
 else
   $(error unknown version "$(VERSION)")
 endif
@@ -96,6 +102,7 @@ endif
 
 ifeq ($(NON_MATCHING),1)
   VERSION_CFLAGS := $(VERSION_CFLAGS) -DNON_MATCHING -DAVOID_UB
+  VERSION_ASFLAGS := --defsym AVOID_UB=1
   COMPARE := 0
 endif
 
@@ -153,8 +160,12 @@ ULTRA_BIN_DIRS := lib/bin
 
 GODDARD_SRC_DIRS := src/goddard src/goddard/dynlists
 
+MIPSISET := -mips2
+MIPSBIT := -32
 
-MIPSISET := -mips2 -32
+ifeq ($(COMPILER),gcc)
+  MIPSISET := -mips3
+endif
 
 ifeq ($(VERSION),eu)
   OPT_FLAGS := -O2
@@ -166,6 +177,11 @@ else
 endif
 endif
 
+# Use a default opt flag for gcc
+ifeq ($(COMPILER),gcc)
+  OPT_FLAGS := -O2
+endif
+
 # File dependencies and variables for specific files
 include Makefile.split
 
@@ -228,6 +244,8 @@ IRIX_ROOT := tools/ido5.3_compiler
 
 ifeq ($(shell type mips-linux-gnu-ld >/dev/null 2>/dev/null; echo $$?), 0)
   CROSS := mips-linux-gnu-
+else ifeq ($(shell type mips64-linux-gnu-ld >/dev/null 2>/dev/null; echo $$?), 0)
+  CROSS := mips64-linux-gnu-
 else
   CROSS := mips64-elf-
 endif
@@ -249,6 +267,11 @@ OBJDUMP   := $(CROSS)objdump
 OBJCOPY   := $(CROSS)objcopy
 PYTHON    := python3
 
+# change the compiler to gcc, to use the default, install the gcc-mips-linux-gnu package
+ifeq ($(COMPILER),gcc)
+  CC        := $(CROSS)gcc
+endif
+
 ifeq ($(TARGET_N64),1)
   TARGET_CFLAGS := -nostdinc -I include/libc -DTARGET_N64
   CC_CFLAGS := -fno-builtin
@@ -259,13 +282,19 @@ INCLUDE_CFLAGS := -I include -I $(BUILD_DIR) -I $(BUILD_DIR)/include -I src -I .
 # Check code syntax with host compiler
 CC_CHECK := gcc -fsyntax-only -fsigned-char $(CC_CFLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-main -DNON_MATCHING -DAVOID_UB $(VERSION_CFLAGS) $(GRUCODE_CFLAGS)
 
+COMMON_CFLAGS = $(OPT_FLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(MIPSISET) $(GRUCODE_CFLAGS)
+
 ASFLAGS := -march=vr4300 -mabi=32 -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS) $(GRUCODE_ASFLAGS)
-CFLAGS = -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed $(OPT_FLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(MIPSISET) $(GRUCODE_CFLAGS)
+CFLAGS = -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed $(COMMON_CFLAGS) $(MIPSBIT)
 OBJCOPYFLAGS := --pad-to=0x800000 --gap-fill=0xFF
 SYMBOL_LINKING_FLAGS := $(addprefix -R ,$(SEG_FILES))
 LDFLAGS := -T undefined_syms.txt -T $(BUILD_DIR)/$(LD_SCRIPT) -Map $(BUILD_DIR)/sm64.$(VERSION).map --no-check-sections $(SYMBOL_LINKING_FLAGS)
 ENDIAN_BITWIDTH := $(BUILD_DIR)/endian-and-bitwidth
 
+ifeq ($(COMPILER),gcc)
+  CFLAGS := -march=vr4300 -mfix4300 -mno-shared -G 0 -mhard-float -fno-stack-protector -fno-common -I include -I src/ -I $(BUILD_DIR)/include -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra $(COMMON_CFLAGS)
+endif
+
 ifeq ($(shell getconf LONG_BIT), 32)
   # Work around memory allocation bug in QEMU
   export QEMU_GUEST_BASE := 1
@@ -297,6 +326,11 @@ LOADER = loader64
 LOADER_FLAGS = -vwf
 SHA1SUM = sha1sum
 
+# Use Objcopy instead of extract_data_for_mio
+ifeq ($(COMPILER),gcc)
+EXTRACT_DATA_FOR_MIO := $(OBJCOPY) -O binary --only-section=.data
+endif
+
 ###################### Dependency Check #####################
 
 BINUTILS_VER_MAJOR := $(shell $(LD) --version | grep ^GNU | sed 's/^.* //; s/\..*//g')
@@ -339,6 +373,10 @@ $(BUILD_DIR)/include/text_strings.h: include/text_strings.h.in
 $(BUILD_DIR)/include/text_menu_strings.h: include/text_menu_strings.h.in
 	$(TEXTCONV) charmap_menu.txt $< $@
 
+ifeq ($(COMPILER),gcc)
+$(BUILD_DIR)/lib/src/math/%.o: CFLAGS += -fno-builtin
+endif
+
 ifeq ($(VERSION),eu)
 TEXT_DIRS := text/de text/us text/fr
 
@@ -486,7 +524,7 @@ $(BUILD_DIR)/assets/mario_anim_data.c: $(wildcard assets/anims/*.inc.c)
 $(BUILD_DIR)/assets/demo_data.c: assets/demo_data.json $(wildcard assets/demos/*.bin)
 	$(PYTHON) tools/demo_data_converter.py assets/demo_data.json $(VERSION_CFLAGS) > $@
 
-
+ifeq ($(COMPILER),ido)
 # Source code
 $(BUILD_DIR)/levels/%/leveldata.o: OPT_FLAGS := -g
 $(BUILD_DIR)/actors/%.o: OPT_FLAGS := -g
@@ -520,6 +558,7 @@ else
 # The source-to-source optimizer copt is enabled for audio. This makes it use
 # acpp, which needs -Wp,-+ to handle C++-style comments.
 $(BUILD_DIR)/src/audio/effects.o: OPT_FLAGS := -O2 -Wo,-loopunroll,0 -sopt,-inline=sequence_channel_process_sound,-scalaroptimize=1 -Wp,-+
+$(BUILD_DIR)/src/audio/synthesis.o: OPT_FLAGS := -O2 -sopt,-scalaroptimize=1 -Wp,-+
 
 # Add a target for build/eu/src/audio/*.copt to make it easier to see debug
 $(BUILD_DIR)/src/audio/%.acpp: src/audio/%.c
@@ -527,6 +566,7 @@ $(BUILD_DIR)/src/audio/%.acpp: src/audio/%.c
 $(BUILD_DIR)/src/audio/%.copt: $(BUILD_DIR)/src/audio/%.acpp
 	$(QEMU_IRIX) -silent -L $(IRIX_ROOT) $(IRIX_ROOT)/usr/lib/copt -signed -I=$< -CMP=$@ -cp=i -scalaroptimize=1
 endif
+endif
 
 ifeq ($(NON_MATCHING),0)
 $(GLOBAL_ASM_O_FILES): CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --

README.md

@@ -113,4 +113,4 @@ discuss what you would like to change.
 
 Run clang-format on your code to ensure it meets the project's coding standards.
 
-Official discord: https://discord.gg/27JtCWs
+Official Discord: https://discord.gg/27JtCWs

asm/boot.s

@@ -5,15 +5,24 @@
 
 .include "macros.inc"
 
+# 0xA0000000-0xBFFFFFFF: KSEG1 direct map non-cache mirror of 0x00000000
+# 0xA4000000-0xA4000FFF: RSP DMEM
+
+# 0xA4000000-0xA400003F: ROM header
 
 .section .text, "ax"
+
+# 0xA4000040-0xA4000B6F: IPL3
+
+# IPL3 entry point jumped to from IPL2
+glabel ipl3_entry # 0xA4000040
     mtc0  $zero, $13
     mtc0  $zero, $9
     mtc0  $zero, $11
-    lui   $t0, %hi(D_A4700000)
-    addiu $t0, %lo(D_A4700000)
+    lui   $t0, %hi(RI_MODE_REG)
+    addiu $t0, %lo(RI_MODE_REG)
     lw    $t1, 0xc($t0)
-    bnez  $t1, .L000003D0
+    bnez  $t1, .LA4000410
      nop
     addiu $sp, $sp, -0x18
     sw    $s3, ($sp)
@@ -21,47 +30,47 @@
     sw    $s5, 8($sp)
     sw    $s6, 0xc($sp)
     sw    $s7, 0x10($sp)
-    lui   $t0, %hi(D_A4700000)
-    addiu $t0, %lo(D_A4700000)
-    lui   $t2, (0xa3f80000 >> 16) # $t2, 0xa3f8
-    lui   $t3, (0xa3f00000 >> 16) # $t3, 0xa3f0
-    lui   $t4, %hi(D_A4300000)
-    addiu $t4, %lo(D_A4300000)
+    lui   $t0, %hi(RI_MODE_REG)
+    addiu $t0, %lo(RI_MODE_REG)
+    lui   $t2, (0xa3f80000 >> 16)
+    lui   $t3, (0xa3f00000 >> 16)
+    lui   $t4, %hi(MI_MODE_REG)
+    addiu $t4, %lo(MI_MODE_REG)
     ori   $t1, $zero, 64
     sw    $t1, 4($t0)
     li   $s1, 8000
-.L0000005C:
+.LA400009C:
     nop
     addi  $s1, $s1, -1
-    bnez  $s1, .L0000005C
+    bnez  $s1, .LA400009C
      nop
     sw    $zero, 8($t0)
     ori   $t1, $zero, 20
     sw    $t1, 0xc($t0)
     sw    $zero, ($t0)
     li    $s1, 4
-.L00000080:
+.LA40000C0:
     nop
     addi  $s1, $s1, -1
-    bnez  $s1, .L00000080
+    bnez  $s1, .LA40000C0
      nop
     ori   $t1, $zero, 14
     sw    $t1, ($t0)
     li    $s1, 32
-.L0000009C:
+.LA40000DC:
     addi  $s1, $s1, -1
-    bnez  $s1, .L0000009C
+    bnez  $s1, .LA40000DC
     ori   $t1, $zero, 271
     sw    $t1, ($t4)
-    lui   $t1, (0x18082838 >> 16) # lui $t1, 0x1808
-    ori   $t1, (0x18082838 & 0xFFFF) # ori $t1, $t1, 0x2838
+    lui   $t1, (0x18082838 >> 16)
+    ori   $t1, (0x18082838 & 0xFFFF)
     sw    $t1, 0x8($t2)
     sw    $zero, 0x14($t2)
     lui   $t1, 0x8000
     sw    $t1, 0x4($t2)
     move  $t5, $zero
     move  $t6, $zero
-    lui   $t7, (0xA3F00000 >> 16) # $t7, 0xa3f0
+    lui   $t7, (0xA3F00000 >> 16)
     move  $t8, $zero
     lui   $t9, (0xA3F00000 >> 16)
     lui   $s6, (0xA0000000 >> 16)
@@ -72,25 +81,25 @@
     lui   $s4, (0xA0000000 >> 16)
     addiu $sp, $sp, -0x48
     move  $fp, $sp
-    lui   $s0, %hi(D_A4300004) # $s0, 0xa430
-    lw    $s0, %lo(D_A4300004)($s0)
-    lui   $s1, 0x0101 # $s1, 0x101
-    addiu $s1, 0x0101 # addiu $s1, $s1, 0x101
-    bne   $s0, $s1, .L00000120
+    lui   $s0, %hi(MI_VERSION_REG)
+    lw    $s0, %lo(MI_VERSION_REG)($s0)
+    lui   $s1, (0x01010101 >> 16)
+    addiu $s1, (0x01010101 & 0xFFFF)
+    bne   $s0, $s1, .LA4000160
      nop
     li    $s0, 512
     ori   $s1, $t3, 0x4000
-    b     .L00000128
+    b     .LA4000168
      nop
-.L00000120:
+.LA4000160:
     li    $s0, 1024
     ori   $s1, $t3, 0x8000
-.L00000128:
+.LA4000168:
     sw    $t6, 4($s1)
     addiu $s5, $t7, 0xc
-    jal   func_04000778
+    jal   func_A4000778
      nop
-    beqz  $v0, .L0000021C
+    beqz  $v0, .LA400025C
      nop
     sw    $v0, ($sp)
     li    $t1, 8192
@@ -103,7 +112,7 @@
     li    $t1, 4096
     sw    $t1, ($t4)
     lui   $t0, 0xb019
-    bne   $t3, $t0, .L000001A0
+    bne   $t3, $t0, .LA40001E0
      nop
     lui   $t0, 0x800
     add   $t8, $t8, $t0
@@ -114,12 +123,12 @@
     add   $s4, $s4, $t0
     sll   $s2, $s2, 1
     addi  $s2, $s2, 1
-    b     .L000001A8
+    b     .LA40001E8
      nop
-.L000001A0:
+.LA40001E0:
     lui   $t0, 0x10
     add   $s4, $s4, $t0
-.L000001A8:
+.LA40001E8:
     li    $t0, 8192
     sw    $t0, ($t4)
     lw    $t1, 0x24($t7)
@@ -128,47 +137,47 @@
     sw    $t0, ($t4)
     andi  $t1, $t1, 0xffff
     li    $t0, 1280
-    bne   $t1, $t0, .L000001F0
+    bne   $t1, $t0, .LA4000230
      nop
     lui   $k1, 0x100
     and   $k0, $k0, $k1
-    bnez  $k0, .L000001F0
+    bnez  $k0, .LA4000230
      nop
-    lui   $t0, (0x101C0A04 >> 16) # lui $t0, 0x101c
-    ori   $t0, (0x101C0A04 & 0xFFFF) # ori $t0, $t0, 0xa04
+    lui   $t0, (0x101C0A04 >> 16)
+    ori   $t0, (0x101C0A04 & 0xFFFF)
     sw    $t0, 0x18($t7)
-    b     .L000001FC
-.L000001F0:
-     lui   $t0, (0x080C1204 >> 16) # lui $t0, 0x80c
-    ori   $t0, (0x080C1204 & 0xFFFF) # ori $t0, $t0, 0x1204
+    b     .LA400023C
+.LA4000230:
+     lui   $t0, (0x080C1204 >> 16)
+    ori   $t0, (0x080C1204 & 0xFFFF)
     sw    $t0, 0x18($t7)
-.L000001FC:
+.LA400023C:
     lui   $t0, 0x800
     add   $t6, $t6, $t0
     add   $t7, $t7, $s0
     add   $t7, $t7, $s0
     addiu $t5, $t5, 1
     sltiu $t0, $t5, 8
-    bnez  $t0, .L00000128
+    bnez  $t0, .LA4000168
      nop
-.L0000021C:
+.LA400025C:
     li    $t0, 0xc4000000
     sw    $t0, 0xc($t2)
     li    $t0, 0x80000000
     sw    $t0, 0x4($t2)
     move  $sp, $fp
     move  $v1, $zero
-.L00000234:
+.LA4000274:
     lw    $t1, 4($sp)
     lui   $t0, 0xb009
-    bne   $t1, $t0, .L00000298
+    bne   $t1, $t0, .LA40002D8
      nop
     sw    $t8, 4($s1)
     addiu $s5, $t9, 0xc
     lw    $a0, ($sp)
     addi  $sp, $sp, 8
     li    $a1, 1
-    jal   func_04000A40
+    jal   func_A4000A40
      nop
     lw    $t0, ($s6)
     lui   $t0, 8
@@ -183,14 +192,14 @@
     add   $t9, $t9, $s0
     lui   $t0, 0x10
     add   $s6, $s6, $t0
-    b     .L0000031C
-.L00000298:
+    b     .LA400035C
+.LA40002D8:
      sw    $s7, 4($s1)
     addiu $s5, $a2, 0xc
     lw    $a0, ($sp)
     addi  $sp, $sp, 8
     li    $a1, 1
-    jal   func_04000A40
+    jal   func_A4000A40
      nop
     lw    $t0, ($a3)
     lui   $t0, 8
@@ -218,22 +227,22 @@
     add   $a2, $a2, $s0
     lui   $t0, 0x20
     add   $a3, $a3, $t0
-.L0000031C:
+.LA400035C:
     addiu $v1, $v1, 1
     slt   $t0, $v1, $t5
-    bnez  $t0, .L00000234
+    bnez  $t0, .LA4000274
      nop
-    lui   $t2, %hi(D_A4700010) # $t2, 0xa470
+    lui   $t2, %hi(RI_REFRESH_REG)
     sll   $s2, $s2, 0x13
-    lui   $t1, (0x00063634 >> 16) # lui $t1, 6
-    ori   $t1, (0x00063634 & 0xFFFF) # ori $t1, $t1, 0x3634
+    lui   $t1, (0x00063634 >> 16)
+    ori   $t1, (0x00063634 & 0xFFFF)
     or    $t1, $t1, $s2
-    sw    $t1, %lo(D_A4700010)($t2)
-    lw    $t1, %lo(D_A4700010)($t2)
-    lui   $t0, (0xA0000300 >> 16) # $t0, 0xa000
-    ori   $t0, (0xA0000300 & 0xFFFF) # ori $t0, $t0, 0x300
-    lui   $t1, (0x0FFFFFFF >> 16) # lui $t1, 0xfff
-    ori   $t1, (0x0FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff
+    sw    $t1, %lo(RI_REFRESH_REG)($t2)
+    lw    $t1, %lo(RI_REFRESH_REG)($t2)
+    lui   $t0, (0xA0000300 >> 16)
+    ori   $t0, (0xA0000300 & 0xFFFF)
+    lui   $t1, (0x0FFFFFFF >> 16)
+    ori   $t1, (0x0FFFFFFF & 0xFFFF)
     and   $s6, $s6, $t1
     sw    $s6, 0x18($t0)
     move  $sp, $fp
@@ -244,101 +253,101 @@
     lw    $s6, 0xc($sp)
     lw    $s7, 0x10($sp)
     addiu $sp, $sp, 0x18
-    lui   $t0, %hi(D_80000000)
-    addiu $t0, $t0, %lo(D_80000000)
+    lui   $t0, %hi(EXCEPTION_TLB_MISS)
+    addiu $t0, $t0, %lo(EXCEPTION_TLB_MISS)
     addiu $t1, $t0, 0x4000
     addiu $t1, $t1, -0x20
     mtc0  $zero, $28
     mtc0  $zero, $29
-.L00000398:
+.LA40003D8:
     cache 8, ($t0)
     sltu  $at, $t0, $t1
-    bnez  $at, .L00000398
+    bnez  $at, .LA40003D8
      addiu $t0, $t0, 0x20
-    lui   $t0, %hi(D_80000000)
-    addiu $t0, %lo(D_80000000)
+    lui   $t0, %hi(EXCEPTION_TLB_MISS)
+    addiu $t0, %lo(EXCEPTION_TLB_MISS)
     addiu $t1, $t0, 0x2000
     addiu $t1, $t1, -0x10
-.L000003B8:
+.LA40003F8:
     cache 9, ($t0)
     sltu  $at, $t0, $t1
-    bnez  $at, .L000003B8
+    bnez  $at, .LA40003F8
      addiu $t0, $t0, 0x10
-    b     .L00000418
+    b     .LA4000458
      nop
-.L000003D0:
-    lui   $t0, %hi(D_80000000)
-    addiu $t0, %lo(D_80000000)
+.LA4000410:
+    lui   $t0, %hi(EXCEPTION_TLB_MISS)
+    addiu $t0, %lo(EXCEPTION_TLB_MISS)
     addiu $t1, $t0, 0x4000
     addiu $t1, $t1, -0x20
     mtc0  $zero, $28
     mtc0  $zero, $29
-.L000003E8:
+.LA4000428:
     cache 8, ($t0)
     sltu  $at, $t0, $t1
-    bnez  $at, .L000003E8
+    bnez  $at, .LA4000428
      addiu $t0, $t0, 0x20
-    lui   $t0, %hi(D_80000000)
-    addiu $t0, %lo(D_80000000)
+    lui   $t0, %hi(EXCEPTION_TLB_MISS)
+    addiu $t0, %lo(EXCEPTION_TLB_MISS)
     addiu $t1, $t0, 0x2000
     addiu $t1, $t1, -0x10
-.L00000408:
+.LA4000448:
     cache 1, ($t0)
     sltu  $at, $t0, $t1
-    bnez  $at, .L00000408
+    bnez  $at, .LA4000448
      addiu $t0, $t0, 0x10
-.L00000418:
-    lui   $t2, %hi(D_A4000000)
-    addiu $t2, $t2, %lo(D_A4000000)
+.LA4000458:
+    lui   $t2, %hi(SP_DMEM)
+    addiu $t2, $t2, %lo(SP_DMEM)
     lui   $t3, 0xfff0
-    lui   $t1, 0x0010 # $t1, 0x10
+    lui   $t1, 0x0010
     and   $t2, $t2, $t3
-    lui   $t0, %hi(D_A40004C0) # $t0, 0xa400
-    addiu $t1, -1 # addiu $t1, $t1, -1
-    lui   $t3, %hi(D_A4000774) # $t3, 0xa400
-    addiu $t0, %lo(D_A40004C0) # addiu $t0, $t0, 0x4c0
-    addiu $t3, %lo(D_A4000774) # addiu $t3, $t3, 0x774
+    lui   $t0, %hi(SP_DMEM_UNK0)
+    addiu $t1, -1
+    lui   $t3, %hi(SP_DMEM_UNK1)
+    addiu $t0, %lo(SP_DMEM_UNK0)
+    addiu $t3, %lo(SP_DMEM_UNK1)
     and   $t0, $t0, $t1
     and   $t3, $t3, $t1
     lui   $t1, 0xa000
     or    $t0, $t0, $t2
     or    $t3, $t3, $t2
     addiu $t1, $t1, 0
-.L00000458:
+.LA4000498:
     lw    $t5, ($t0)
     addiu $t0, $t0, 4
     sltu  $at, $t0, $t3
     addiu $t1, $t1, 4
-    bnez  $at, .L00000458
+    bnez  $at, .LA4000498
      sw    $t5, -4($t1)
-    lui   $t4, %hi(D_80000000)
-    addiu $t4, %lo(D_80000000)
+    lui   $t4, %hi(EXCEPTION_TLB_MISS)
+    addiu $t4, %lo(EXCEPTION_TLB_MISS)
     jr    $t4
      nop
-    lui   $t3, %hi(D_B0000008) # $t3, 0xb000
+    lui   $t3, %hi(D_B0000008)
     lw    $t1, %lo(D_B0000008)($t3)
-    lui   $t2, (0x1FFFFFFF >> 16) # lui $t2, 0x1fff
-    ori   $t2, (0x1FFFFFFF & 0xFFFF) # ori $t2, $t2, 0xffff
-    lui   $at, %hi(D_A4600000)
+    lui   $t2, (0x1FFFFFFF >> 16)
+    ori   $t2, (0x1FFFFFFF & 0xFFFF)
+    lui   $at, %hi(PI_DRAM_ADDR_REG)
     and   $t1, $t1, $t2
-    sw    $t1, %lo(D_A4600000)($at)
-    lui   $t0, %hi(D_A4600010) # $t0, 0xa460
-.L000004A0:
-    lw    $t0, %lo(D_A4600010)($t0)
+    sw    $t1, %lo(PI_DRAM_ADDR_REG)($at)
+    lui   $t0, %hi(PI_STATUS_REG)
+.LA40004D0:
+    lw    $t0, %lo(PI_STATUS_REG)($t0)
     andi  $t0, $t0, 2
-    bnezl $t0, .L000004A0
-     lui   $t0, %hi(D_A4600010)
+    bnezl $t0, .LA40004D0
+     lui   $t0, %hi(PI_STATUS_REG)
     li    $t0, 0x1000
     add   $t0, $t0, $t3
     and   $t0, $t0, $t2
-    lui   $at, %hi(D_A4600004) # $at, 0xa460
-    sw    $t0, %lo(D_A4600004)($at)
-    lui   $t2, 0x0010 # $t2, 0x10
-    addiu $t2, 0xFFFF # addiu $t2, $t2, -1
-    lui   $at, %hi(D_A460000C) # $at, 0xa460
-    sw    $t2, %lo(D_A460000C)($at)
+    lui   $at, %hi(PI_CART_ADDR_REG)
+    sw    $t0, %lo(PI_CART_ADDR_REG)($at)
+    lui   $t2, 0x0010
+    addiu $t2, 0xFFFF
+    lui   $at, %hi(PI_WR_LEN_REG)
+    sw    $t2, %lo(PI_WR_LEN_REG)($at)
 
-.L000004D4:
+.LA4000514:
     nop
     nop
     nop
@@ -367,16 +376,16 @@
     nop
     nop
     nop
-    lui   $t3, %hi(D_A4600010) # $t3, 0xa460
-    lw    $t3, %lo(D_A4600010)($t3)
-    andi  $t3, $t3, 1
-    bnez  $t3, .L000004D4
+    lui   $t3, %hi(PI_STATUS_REG)
+    lw    $t3, %lo(PI_STATUS_REG)($t3)
+    andi  $t3, $t3, 0x1
+    bnez  $t3, .LA4000514
      nop
-    lui   $t3, %hi(D_B0000008) # $t3, 0xb000
+    lui   $t3, %hi(D_B0000008)
     lw    $a0, %lo(D_B0000008)($t3)
     move  $a1, $s6
-    lui   $at, (0x5D588B65 >> 16) # lui $at, 0x5d58
-    ori   $at, (0x5D588B65 & 0xFFFF) # ori $at, $at, 0x8b65
+    lui   $at, (0x5D588B65 >> 16)
+    ori   $at, (0x5D588B65 & 0xFFFF)
     multu $a1, $at
     addiu $sp, $sp, -0x20
     sw    $ra, 0x1c($sp)
@@ -394,14 +403,14 @@
     move  $s0, $v0
     move  $a2, $v0
     move  $t4, $v0
-.L000005B0:
+.LA40005F0:
     lw    $v0, ($t1)
     addu  $v1, $a3, $v0
     sltu  $at, $v1, $a3
-    beqz  $at, .L000005C8
+    beqz  $at, .LA4000608
      move  $a1, $v1
     addiu $t2, $t2, 1
-.L000005C8:
+.LA4000608:
     andi  $v1, $v0, 0x1f
     subu  $t7, $t5, $v1
     srlv  $t8, $v0, $t7
@@ -410,104 +419,103 @@
     sltu  $at, $a2, $v0
     move  $a3, $a1
     xor   $t3, $t3, $v0
-    beqz  $at, .L000005FC
+    beqz  $at, .LA400063C
      addu  $s0, $s0, $a0
     xor   $t9, $a3, $v0
-    b     .L00000600
+    b     .LA4000640
      xor   $a2, $t9, $a2
-.L000005FC:
+.LA400063C:
     xor   $a2, $a2, $a0
-.L00000600:
+.LA4000640:
     addiu $t0, $t0, 4
     xor   $t7, $v0, $s0
     addiu $t1, $t1, 4
-    bne   $t0, $ra, .L000005B0
+    bne   $t0, $ra, .LA40005F0
      addu  $t4, $t7, $t4
     xor   $t6, $a3, $t2
     xor   $a3, $t6, $t3
     xor   $t8, $s0, $a2
     xor   $s0, $t8, $t4
-    lui   $t3, %hi(D_B0000010) # $t3, 0xb000
+    lui   $t3, %hi(D_B0000010)
     lw    $t0, %lo(D_B0000010)($t3)
-    bne   $a3, $t0, .L00000648
+    bne   $a3, $t0, halt
      nop
     lw    $t0, %lo(D_B0000014)($t3)
-    bne   $s0, $t0, .L00000648
+    bne   $s0, $t0, halt
      nop
-    bal   func_00000650
+    bal   func_A4000690
      nop
 
-func_00000648:
-.L00000648:
-    bal   func_00000648
+halt:
+    bal   halt
      nop
 
-func_00000650:
-    lui   $t1, %hi(D_A4080000)
-    lw    $t1, %lo(D_A4080000)($t1)
+func_A4000690:
+    lui   $t1, %hi(SP_PC)
+    lw    $t1, %lo(SP_PC)($t1)
     lw    $s0, 0x14($sp)
     lw    $ra, 0x1c($sp)
-    beqz  $t1, .L0000067C
+    beqz  $t1, .LA40006BC
      addiu $sp, $sp, 0x20
     li    $t2, 65
-    lui   $at, %hi(D_A4040010) # $at, 0xa404
-    sw    $t2, %lo(D_A4040010)($at)
-    lui   $at, %hi(D_A4080000)
-    sw    $zero, %lo(D_A4080000)($at)
-.L0000067C:
-    lui   $t3, (0x00AAAAAE >> 16) # lui $t3, 0xaa
-    ori   $t3, (0x00AAAAAE & 0xFFFF) # ori $t3, $t3, 0xaaae
-    lui   $at, %hi(D_A4040010) # $at, 0xa404
-    sw    $t3, %lo(D_A4040010)($at)
-    lui   $at, %hi(D_A430000C) # $at, 0xa430
+    lui   $at, %hi(SP_STATUS_REG)
+    sw    $t2, %lo(SP_STATUS_REG)($at)
+    lui   $at, %hi(SP_PC)
+    sw    $zero, %lo(SP_PC)($at)
+.LA40006BC:
+    lui   $t3, (0x00AAAAAE >> 16)
+    ori   $t3, (0x00AAAAAE & 0xFFFF)
+    lui   $at, %hi(SP_STATUS_REG)
+    sw    $t3, %lo(SP_STATUS_REG)($at)
+    lui   $at, %hi(MI_INTR_MASK_REG)
     li    $t0, 1365
-    sw    $t0, %lo(D_A430000C)($at)
-    lui   $at, %hi(D_A4800018) # $at, 0xa480
-    sw    $zero, %lo(D_A4800018)($at)
-    lui   $at, %hi(D_A450000C) # $at, 0xa450
-    sw    $zero, %lo(D_A450000C)($at)
-    lui   $at, %hi(D_A4300000)
+    sw    $t0, %lo(MI_INTR_MASK_REG)($at)
+    lui   $at, %hi(SI_STATUS_REG)
+    sw    $zero, %lo(SI_STATUS_REG)($at)
+    lui   $at, %hi(AI_STATUS_REG)
+    sw    $zero, %lo(AI_STATUS_REG)($at)
+    lui   $at, %hi(MI_MODE_REG)
     li    $t1, 2048
-    sw    $t1, %lo(D_A4300000)($at)
+    sw    $t1, %lo(MI_MODE_REG)($at)
     li    $t1, 2
-    lui   $at, %hi(D_A4600010) # $at, 0xa460
-    lui   $t0, (0xA0000300 >> 16) # $t0, 0xa000
-    ori   $t0, (0xA0000300 & 0xFFFF) # ori $t0, $t0, 0x300
-    sw    $t1, %lo(D_A4600010)($at)
+    lui   $at, %hi(PI_STATUS_REG)
+    lui   $t0, (0xA0000300 >> 16)
+    ori   $t0, (0xA0000300 & 0xFFFF)
+    sw    $t1, %lo(PI_STATUS_REG)($at)
     sw    $s7, 0x14($t0)
     sw    $s5, 0xc($t0)
     sw    $s3, 0x4($t0)
-    beqz  $s3, .L000006E8
+    beqz  $s3, .LA4000728
      sw    $s4, ($t0)
     lui   $t1, 0xa600
-    b     .L000006F0
+    b     .LA4000730
      addiu $t1, $t1, 0
-.L000006E8:
+.LA4000728:
     lui   $t1, 0xb000
     addiu $t1, $t1, 0
-.L000006F0:
+.LA4000730:
     sw    $t1, 0x8($t0)
-    lui   $t0, %hi(D_A4000000)
-    addiu $t0, %lo(D_A4000000)
+    lui   $t0, %hi(SP_DMEM)
+    addiu $t0, %lo(SP_DMEM)
     addi  $t1, $t0, 0x1000
-.L00000700:
+.LA4000740:
     addiu $t0, $t0, 4
-    bne   $t0, $t1, .L00000700
+    bne   $t0, $t1, .LA4000740
      sw    $zero, -4($t0)
-    lui   $t0, %hi(D_A4001000) # $t0, 0xa400
-    addiu $t0, %lo(D_A4001000) # addiu $t0, $t0, 0x1000
+    lui   $t0, %hi(SP_IMEM)
+    addiu $t0, %lo(SP_IMEM)
     addi  $t1, $t0, 0x1000
-.L00000718:
+.LA4000758:
     addiu $t0, $t0, 4
-    bne   $t0, $t1, .L00000718
+    bne   $t0, $t1, .LA4000758
      sw    $zero, -4($t0)
-    lui   $t3, %hi(D_B0000008) # $t3, 0xb000
+    lui   $t3, %hi(D_B0000008)
     lw    $t1, %lo(D_B0000008)($t3)
     jr    $t1
      nop
     nop
 
-func_04000778:
+func_A4000778:
     addiu $sp, $sp, -0xa0
     sw    $s0, 0x40($sp)
     sw    $s1, 0x44($sp)
@@ -537,15 +545,15 @@ func_04000778:
     sw    $s7, 0x5c($sp)
     sw    $fp, 0x60($sp)
     sw    $ra, 0x64($sp)
-.L000007AC:
-    jal   func_04000880
+.LA40007EC:
+    jal   func_A4000880
      nop
     addiu $s0, $s0, 1
     slti  $t1, $s0, 4
-    bnez  $t1, .L000007AC
+    bnez  $t1, .LA40007EC
      addu  $s1, $s1, $v0
     srl   $a0, $s1, 2
-    jal   func_04000A40
+    jal   func_A4000A40
      li    $a1, 1
     lw    $ra, 0x64($sp)
     srl   $v0, $s1, 2
@@ -576,19 +584,19 @@ func_04000778:
     jr    $ra
      addiu $sp, $sp, 0xa0
 
-func_04000880:
+func_A4000880:
     addiu $sp, $sp, -0x20
     sw    $ra, 0x1c($sp)
     move  $t1, $zero
     move  $t3, $zero
     move  $t4, $zero
-.L00000854:
+.LA4000894:
     slti  $k0, $t4, 0x40
-    beql  $k0, $zero, .L000008BC
+    beql  $k0, $zero, .LA40008FC
      move  $v0, $zero
-    jal   func_0400090C
+    jal   func_A400090C
      move  $a0, $t4
-    blezl $v0, .L0000088C
+    blezl $v0, .LA40008CC
      slti  $k0, $t1, 0x50
     subu  $k0, $v0, $t1
     multu $k0, $t4
@@ -597,61 +605,61 @@ func_04000880:
     addu  $t3, $t3, $k0
     nop
     slti  $k0, $t1, 0x50
-.L0000088C:
-    bnez  $k0, .L00000854
+.LA40008CC:
+    bnez  $k0, .LA4000894
      addiu $t4, $t4, 1
     sll   $a0, $t3, 2
     subu  $a0, $a0, $t3
     sll   $a0, $a0, 2
     subu  $a0, $a0, $t3
     sll   $a0, $a0, 1
-    jal   func_04000980
-     addiu $a0, $a0, -0x370 # compute (t3 - 40) * 22
-    b     .L000008C0
+    jal   func_A4000980
+     addiu $a0, $a0, -0x370
+    b     .LA4000900
      lw    $ra, 0x1c($sp)
     move  $v0, $zero
-.L000008BC:
+.LA40008FC:
     lw    $ra, 0x1c($sp)
-.L000008C0:
+.LA4000900:
     addiu $sp, $sp, 0x20
     jr    $ra
      nop
 
-func_0400090C:
+func_A400090C:
     addiu $sp, $sp, -0x28
     sw    $ra, 0x1c($sp)
     move  $v0, $zero
-    jal   func_04000A40
+    jal   func_A4000A40
      li    $a1, 2
     move  $fp, $zero
     li    $k0, -1
-.L000008E8:
+.LA4000928:
     sw    $k0, 4($s4)
     lw    $v1, 4($s4)
     sw    $k0, ($s4)
     sw    $k0, ($s4)
     move  $gp, $zero
     srl   $v1, $v1, 0x10
-.L00000900:
+.LA4000940:
     andi  $k0, $v1, 1
-    beql  $k0, $zero, .L00000914
+    beql  $k0, $zero, .LA4000954
      addiu $gp, $gp, 1
     addiu $v0, $v0, 1
     addiu $gp, $gp, 1
-.L00000914:
+.LA4000954:
     slti  $k0, $gp, 8
-    bnez  $k0, .L00000900
+    bnez  $k0, .LA4000940
      srl   $v1, $v1, 1
     addiu $fp, $fp, 1
     slti  $k0, $fp, 0xa
-    bnezl $k0, .L000008E8
+    bnezl $k0, .LA4000928
      li    $k0, -1
     lw    $ra, 0x1c($sp)
     addiu $sp, $sp, 0x28
     jr    $ra
      nop
 
-func_04000980:
+func_A4000980:
     addiu $sp, $sp, -0x28
     sw    $ra, 0x1c($sp)
     sw    $a0, 0x20($sp)
@@ -661,18 +669,18 @@ func_04000980:
     li    $t5, 51200
     move  $t6, $zero
     slti  $k0, $t6, 0x40
-.L00000964:
-    bnezl $k0, .L00000978
+.LA40009A4:
+    bnezl $k0, .LA40009B8
      move  $a0, $t6
-    b     .L000009F0
+    b     .LA4000A30
      move  $v0, $zero
     move  $a0, $t6
-.L00000978:
-    jal   func_04000A40
+.LA40009B8:
+    jal   func_A4000A40
      li    $a1, 1
-    jal   func_04000AD0
+    jal   func_A4000AD0
      addiu $a0, $sp, 0x27
-    jal   func_04000AD0
+    jal   func_A4000AD0
      addiu $a0, $sp, 0x27
     lbu   $k0, 0x27($sp)
     li    $k1, 800
@@ -680,44 +688,44 @@ func_04000980:
     multu $k0, $k1
     mflo  $t0
     subu  $k0, $t0, $a0
-    bgezl $k0, .L000009B8
+    bgezl $k0, .LA40009F8
      slt   $k1, $k0, $t5
     subu  $k0, $a0, $t0
     slt   $k1, $k0, $t5
-.L000009B8:
-    beql  $k1, $zero, .L000009CC
+.LA40009F8:
+    beql  $k1, $zero, .LA4000A0C
      lw    $a0, 0x20($sp)
     move  $t5, $k0
     move  $t2, $t6
     lw    $a0, 0x20($sp)
-.L000009CC:
+.LA4000A0C:
     slt   $k1, $t0, $a0
-    beql  $k1, $zero, .L000009EC
+    beql  $k1, $zero, .LA4000A2C
      addu  $v0, $t2, $t6
     addiu $t6, $t6, 1
     slti  $k1, $t6, 0x41
-    bnezl $k1, .L00000964
+    bnezl $k1, .LA40009A4
      slti  $k0, $t6, 0x40
     addu  $v0, $t2, $t6
-.L000009EC:
+.LA4000A2C:
     srl   $v0, $v0, 1
-.L000009F0:
+.LA4000A30:
     lw    $ra, 0x1c($sp)
     addiu $sp, $sp, 0x28
     jr    $ra
      nop
 
-func_04000A40:
+func_A4000A40:
     addiu $sp, $sp, -0x28
     andi  $a0, $a0, 0xff
     li    $k1, 1
     xori  $a0, $a0, 0x3f
     sw    $ra, 0x1c($sp)
-    bne   $a1, $k1, .L00000A24
+    bne   $a1, $k1, .LA4000A64
      lui   $t7, 0x4600
     lui   $k0, 0x8000
     or    $t7, $t7, $k0
-.L00000A24:
+.LA4000A64:
     andi  $k0, $a0, 1
     sll   $k0, $k0, 6
     or    $t7, $t7, $k0
@@ -737,26 +745,26 @@ func_04000A40:
     sll   $k0, $k0, 0x12
     or    $t7, $t7, $k0
     li    $k1, 1
-    bne   $a1, $k1, .L00000A80
+    bne   $a1, $k1, .LA4000AC0
      sw    $t7, ($s5)
-    lui   $k0, %hi(D_A4300000)
-    sw    $zero, %lo(D_A4300000)($k0)
-.L00000A80:
+    lui   $k0, %hi(MI_MODE_REG)
+    sw    $zero, %lo(MI_MODE_REG)($k0)
+.LA4000AC0:
     lw    $ra, 0x1c($sp)
     addiu $sp, $sp, 0x28
     jr    $ra
      nop
 
-func_04000AD0:
+func_A4000AD0:
     addiu $sp, $sp, -0x28
     sw    $ra, 0x1c($sp)
     li    $k0, 0x2000
-    lui   $k1, %hi(D_A4300000)
-    sw    $k0, %lo(D_A4300000)($k1)
+    lui   $k1, %hi(MI_MODE_REG)
+    sw    $k0, %lo(MI_MODE_REG)($k1)
     move  $fp, $zero
     lw    $fp, ($s5)
     li    $k0, 0x1000
-    sw    $k0, %lo(D_A4300000)($k1)
+    sw    $k0, %lo(MI_MODE_REG)($k1)
     li    $k1, 0x40
     and   $k1, $k1, $fp
     srl   $k1, $k1, 6
@@ -789,4 +797,6 @@ func_04000AD0:
      nop
     nop
 
+# 0xA4000B70-0xA4000FFF: IPL3 Font
+glabel ipl3_font
 .incbin "lib/bin/ipl3_font.bin"

asm/decompress.s

@@ -11,7 +11,51 @@
 # This file is handwritten.
 
 glabel decompress
-.ifdef VERSION_EU
+.if VERSION_SH == 1
+    lw    $a3, 8($a0)
+    lw    $t9, 0xc($a0)
+    lw    $t8, 4($a0)
+    add   $a3, $a3, $a0
+    add   $t9, $t9, $a0
+    move  $a2, $zero
+    addi  $a0, $a0, 0