Skip to content

Update tests because latest spimdisasm output is slightly different #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethteck merged 1 commit into from
Sep 8, 2025
Merged

Update tests because latest spimdisasm output is slightly different #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# splat Release Notes

* `spimdisasm` 1.36.1 or above is now required.

### 0.35.2

* Miscellaneous updates to generated macro labels.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies = [

[project.optional-dependencies]
mips = [
"spimdisasm>=1.36.0,<2.0.0", # This value should be keep in sync with the version listed on disassembler/spimdisasm_disassembler.py
"spimdisasm>=1.36.1,<2.0.0", # This value should be keep in sync with the version listed on disassembler/spimdisasm_disassembler.py
"rabbitizer>=1.12.0,<2.0.0",
"pygfxd",
"n64img>=0.3.3",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ tqdm
intervaltree
colorama
# This value should be keep in sync with the version listed on disassembler/spimdisasm_disassembler.py and pyproject.toml
spimdisasm>=1.36.0
spimdisasm>=1.36.1
rabbitizer>=1.10.0
pygfxd
n64img>=0.1.4
Expand Down
2 changes: 1 addition & 1 deletion src/splat/disassembler/spimdisasm_disassembler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class SpimdisasmDisassembler(disassembler.Disassembler):
# This value should be kept in sync with the version listed on requirements.txt and pyproject.toml
SPIMDISASM_MIN = (1, 36, 0)
SPIMDISASM_MIN = (1, 36, 1)

def configure(self):
# Configure spimdisasm
Expand Down
3 changes: 2 additions & 1 deletion test/basic_app/expected/asm/data/main.bss.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

.section .bss, "wa"

dlabel D_80000540
nonmatching D_80000540, 0x80

dlabel D_80000540
/* 80000540 */ .space 0x80
6 changes: 4 additions & 2 deletions test/basic_app/expected/asm/data/main.data.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

.section .data, "wa"

dlabel D_80000500
nonmatching D_80000500

dlabel D_80000500
/* 1100 80000500 00000001 */ .word 0x00000001
enddlabel D_80000500

dlabel D_80000504
nonmatching D_80000504

dlabel D_80000504
/* 1104 80000504 00000000 */ .word 0x00000000
/* 1108 80000508 00000000 */ .word 0x00000000
/* 110C 8000050C 00000000 */ .word 0x00000000
Expand Down
6 changes: 4 additions & 2 deletions test/basic_app/expected/asm/data/main.rodata.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

.section .rodata, "a"

dlabel D_80000510
nonmatching D_80000510

dlabel D_80000510
/* 1110 80000510 00010203 */ .word 0x00010203
/* 1114 80000514 04050607 */ .word 0x04050607
enddlabel D_80000510

.align 3
dlabel jtbl_80000518
nonmatching jtbl_80000518

dlabel jtbl_80000518
/* 1118 80000518 80000448 */ .word .L80000448
/* 111C 8000051C 80000450 */ .word .L80000450
/* 1120 80000520 80000458 */ .word .L80000458
Expand Down
3 changes: 2 additions & 1 deletion test/basic_app/expected/asm/handwritten.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
.section .text, "ax"

/* Handwritten function */
glabel func_800004F0
nonmatching func_800004F0, 0xC

glabel func_800004F0
/* 10F0 800004F0 00851020 */ add $v0, $a0, $a1 /* handwritten instruction */
/* 10F4 800004F4 03E00008 */ jr $ra
/* 10F8 800004F8 00000000 */ nop
Expand Down
6 changes: 4 additions & 2 deletions test/basic_app/expected/asm/main.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@

.section .text, "ax"

glabel func_80000400
nonmatching func_80000400, 0xA0

glabel func_80000400
/* 1000 80000400 27BDFFF8 */ addiu $sp, $sp, -0x8
/* 1004 80000404 AFBE0000 */ sw $fp, 0x0($sp)
/* 1008 80000408 03A0F021 */ addu $fp, $sp, $zero
Expand Down Expand Up @@ -60,8 +61,9 @@ nonmatching func_80000400, 0xA0
/* 109C 8000049C 27BD0008 */ addiu $sp, $sp, 0x8
endlabel func_80000400

glabel func_800004A0
nonmatching func_800004A0, 0x4C

glabel func_800004A0
/* 10A0 800004A0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 10A4 800004A4 AFBF0014 */ sw $ra, 0x14($sp)
/* 10A8 800004A8 AFBE0010 */ sw $fp, 0x10($sp)
Expand Down
3 changes: 2 additions & 1 deletion test/basic_app/expected/asm/nonmatchings/main/D_80000510.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.section .rodata

dlabel D_80000510
nonmatching D_80000510

dlabel D_80000510
/* 1110 80000510 00010203 */ .word 0x00010203
/* 1114 80000514 04050607 */ .word 0x04050607
enddlabel D_80000510
6 changes: 4 additions & 2 deletions test/basic_app/expected/asm/nonmatchings/main/func_80000400.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.section .rodata
.align 3
dlabel jtbl_80000518
nonmatching jtbl_80000518

dlabel jtbl_80000518
/* 1118 80000518 80000448 */ .word .L80000448
/* 111C 8000051C 80000450 */ .word .L80000450
/* 1120 80000520 80000458 */ .word .L80000458
Expand All @@ -16,8 +17,9 @@ enddlabel jtbl_80000518


.section .text
glabel func_80000400
nonmatching func_80000400, 0xA0

glabel func_80000400
/* 1000 80000400 27BDFFF8 */ addiu $sp, $sp, -0x8
/* 1004 80000404 AFBE0000 */ sw $fp, 0x0($sp)
/* 1008 80000408 03A0F021 */ addu $fp, $sp, $zero
Expand Down
3 changes: 2 additions & 1 deletion test/basic_app/expected/asm/nonmatchings/main/func_800004A0.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
glabel func_800004A0
nonmatching func_800004A0, 0x4C

glabel func_800004A0
/* 10A0 800004A0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 10A4 800004A4 AFBF0014 */ sw $ra, 0x14($sp)
/* 10A8 800004A8 AFBE0010 */ sw $fp, 0x10($sp)
Expand Down