romych/z80go
1
0
Fork 0
mirror of https://github.com/romychs/z80go.git synced 2026-04-16 08:44:20 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix relative jump disasm

Browse Source
This commit is contained in:
Роман Бойков 2026-04-15 15:57:33 +03:00
parent 16e7d1dfb6
commit 3b05332d28
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dis/z80disasm.go
View File

@ -39,12 +39,12 @@ func (d *Disassembler) jp(op, cond string) string {
} }
func (d *Disassembler) jr(op, cond string) string { func (d *Disassembler) jr(op, cond string) string {
addr := d.pc addr := d.pc + 1
offset := d.getByte() offset := d.getByte()
if offset&0x80 != 0 { if offset&0x80 != 0 {
addr += 0xFF00 | uint16(offset) addr += 0xFF00 | uint16(offset)
} else { } else {
addr += d.pc + uint16(offset) addr += uint16(offset)
} }
if cond != "" { if cond != "" {
cond += sep cond += sep

22
dis/z80disasm_test.go
View File

@ -90,3 +90,25 @@ func Test_JP_nn(t *testing.T) {
t.Errorf("Error disassm JP nn, result '%s', expected '%s'", res, expected) t.Errorf("Error disassm JP nn, result '%s', expected '%s'", res, expected)
} }
} }
var testJRf = []byte{0x28, 0x09} // JR Z,+9
func Test_JR_Z_nn(t *testing.T) {
expected := " 31EF JR Z, 0x31FA" // PC+2+9
setMemory(0x31EF, testJRf)
res := disasm.Disassm(0x31EF)
if res != expected {
t.Errorf("Error disassm JR Z,nn, result '%s', expected '%s'", res, expected)
}
}
var testJRb = []byte{0x18, 0xf1} // JR Z,+9
func Test_JR_mnn(t *testing.T) {
expected := " 31F8 JR 0x31EB" // JR back
setMemory(0x31F8, testJRb)
res := disasm.Disassm(0x31F8)
if res != expected {
t.Errorf("Error disassm JR -nn, result '%s', expected '%s'", res, expected)
}
}