ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add rgbds syntax for GB/C disassembly (#2706) 

* replace current GB/C syntax with rgbds syntax
* make rgbds syntax an option, only works for Gambatte tracelogger

* fix add sp/ld hl,sp+
These opcodes aren't disassembled correctly at all; they seem to just use the exact same logic as jr, which doesn't really work here since these are explicit adds, and these opcodes use sp, not the pc. This is probably the most logical approach to this opcode.

Co-authored-by: YoshiRulz <OSSYoshiRulz@gmail.com>
This commit is contained in:
CasualPokePlayer 2021-05-05 18:52:25 -07:00 committed by GitHub
parent 3372556ef0
commit db97427ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 606 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs generated
View File

@ -31,6 +31,7 @@
this.propertyGrid1 = new System.Windows.Forms.PropertyGrid(); this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
this.buttonDefaults = new System.Windows.Forms.Button(); this.buttonDefaults = new System.Windows.Forms.Button();
this.buttonPalette = new System.Windows.Forms.Button(); this.buttonPalette = new System.Windows.Forms.Button();
this.cbRgbdsSyntax = new System.Windows.Forms.CheckBox();
this.checkBoxMuted = new System.Windows.Forms.CheckBox(); this.checkBoxMuted = new System.Windows.Forms.CheckBox();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -81,9 +82,22 @@
this.checkBoxMuted.UseVisualStyleBackColor = true; this.checkBoxMuted.UseVisualStyleBackColor = true;
this.checkBoxMuted.CheckedChanged += new System.EventHandler(this.CheckBoxMuted_CheckedChanged); this.checkBoxMuted.CheckedChanged += new System.EventHandler(this.CheckBoxMuted_CheckedChanged);
// //
// cbRgbdsSyntax
//
this.cbRgbdsSyntax.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.cbRgbdsSyntax.AutoSize = true;
this.cbRgbdsSyntax.Location = new System.Drawing.Point(130, 292);
this.cbRgbdsSyntax.Name = "cbRgbdsSyntax";
this.cbRgbdsSyntax.Size = new System.Drawing.Size(150, 17);
this.cbRgbdsSyntax.TabIndex = 7;
this.cbRgbdsSyntax.Text = "RGBDS Syntax";
this.cbRgbdsSyntax.UseVisualStyleBackColor = true;
this.cbRgbdsSyntax.CheckedChanged += new System.EventHandler(this.CbRgbdsSyntax_CheckedChanged);
//
// GBPrefControl // GBPrefControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.cbRgbdsSyntax);
this.Controls.Add(this.checkBoxMuted); this.Controls.Add(this.checkBoxMuted);
this.Controls.Add(this.buttonPalette); this.Controls.Add(this.buttonPalette);
this.Controls.Add(this.buttonDefaults); this.Controls.Add(this.buttonDefaults);
@ -100,6 +114,7 @@
private System.Windows.Forms.PropertyGrid propertyGrid1; private System.Windows.Forms.PropertyGrid propertyGrid1;
private System.Windows.Forms.Button buttonDefaults; private System.Windows.Forms.Button buttonDefaults;
private System.Windows.Forms.Button buttonPalette; private System.Windows.Forms.Button buttonPalette;
private System.Windows.Forms.CheckBox cbRgbdsSyntax;
private System.Windows.Forms.CheckBox checkBoxMuted; private System.Windows.Forms.CheckBox checkBoxMuted;
} }
} }

6
src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.cs
View File

@ -42,6 +42,7 @@ namespace BizHawk.Client.EmuHawk
propertyGrid1.SelectedObject = _ss; propertyGrid1.SelectedObject = _ss;
propertyGrid1.Enabled = movieSession.Movie.NotActive(); propertyGrid1.Enabled = movieSession.Movie.NotActive();
checkBoxMuted.Checked = _s.Muted; checkBoxMuted.Checked = _s.Muted;
cbRgbdsSyntax.Checked = _s.RgbdsSyntax;
} }
public void GetSettings(out Gameboy.GambatteSettings s, out Gameboy.GambatteSyncSettings ss) public void GetSettings(out Gameboy.GambatteSettings s, out Gameboy.GambatteSyncSettings ss)
@ -80,5 +81,10 @@ namespace BizHawk.Client.EmuHawk
{ {
_s.Muted = ((CheckBox)sender).Checked; _s.Muted = ((CheckBox)sender).Checked;
} }
private void CbRgbdsSyntax_CheckedChanged(object sender, EventArgs e)
{
_s.RgbdsSyntax = ((CheckBox)sender).Checked;
}
} }
} }

18
src/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
View File

@ -142,7 +142,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
} }
// Execute instructions // Execute instructions
public void ExecuteOne() public void ExecuteOne(bool useRGBDSSyntax)
{ {
switch (instr_table[instr_pntr++]) switch (instr_table[instr_pntr++])
{ {
@ -177,7 +177,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
else else
{ {
OnExecFetch?.Invoke(RegPC); OnExecFetch?.Invoke(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State()); if (TraceCallback != null && !CB_prefix) TraceCallback(State(useRGBDSSyntax));
CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst); CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst);
FetchInstruction(ReadMemory(RegPC++)); FetchInstruction(ReadMemory(RegPC++));
} }
@ -354,7 +354,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
}); });
OnExecFetch?.Invoke(RegPC); OnExecFetch?.Invoke(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State()); if (TraceCallback != null && !CB_prefix) TraceCallback(State(useRGBDSSyntax));
CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst); CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst);
FetchInstruction(ReadMemory(RegPC)); FetchInstruction(ReadMemory(RegPC));
@ -420,7 +420,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
if (Halt_bug_3) if (Halt_bug_3)
{ {
OnExecFetch?.Invoke(RegPC); OnExecFetch?.Invoke(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State()); if (TraceCallback != null && !CB_prefix) TraceCallback(State(useRGBDSSyntax));
CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst); CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst);
RegPC++; RegPC++;
@ -436,7 +436,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
else else
{ {
OnExecFetch?.Invoke(RegPC); OnExecFetch?.Invoke(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State()); if (TraceCallback != null && !CB_prefix) TraceCallback(State(useRGBDSSyntax));
CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst); CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst);
if (Halt_bug_3) if (Halt_bug_3)
@ -563,7 +563,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
stopped = false; stopped = false;
OnExecFetch?.Invoke(RegPC); OnExecFetch?.Invoke(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State()); if (TraceCallback != null && !CB_prefix) TraceCallback(State(useRGBDSSyntax));
CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst); CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst);
FetchInstruction(ReadMemory(RegPC++)); FetchInstruction(ReadMemory(RegPC++));
@ -587,7 +587,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
break; break;
case OP_G: case OP_G:
OnExecFetch?.Invoke(RegPC); OnExecFetch?.Invoke(RegPC);
TraceCallback?.Invoke(State()); TraceCallback?.Invoke(State(useRGBDSSyntax));
CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst); CDLCallback?.Invoke(RegPC, eCDLogMemFlags.FetchFirst);
FetchInstruction(ReadMemory(RegPC)); // note no increment FetchInstruction(ReadMemory(RegPC)); // note no increment
@ -752,11 +752,11 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
public string TraceHeader => "LR35902: PC, machine code, mnemonic, operands, registers (A, F, B, C, D, E, H, L, SP), Cy, flags (ZNHCI)"; public string TraceHeader => "LR35902: PC, machine code, mnemonic, operands, registers (A, F, B, C, D, E, H, L, SP), Cy, flags (ZNHCI)";
public TraceInfo State(bool disassemble = true) public TraceInfo State(bool useRGBDSSyntax, bool disassemble = true)
{ {
return new TraceInfo return new TraceInfo
{ {
Disassembly = $"{(disassemble ? Disassemble(RegPC, ReadMemory, out _) : "---")} ".PadRight(40), Disassembly = $"{(disassemble ? Disassemble(RegPC, ReadMemory, useRGBDSSyntax, out _) : "---")} ".PadRight(40),
RegisterInfo = string.Join(" ", RegisterInfo = string.Join(" ",
$"A:{Regs[A]:X2}", $"A:{Regs[A]:X2}",
$"F:{Regs[F]:X2}", $"F:{Regs[F]:X2}",

552
src/BizHawk.Emulation.Cores/CPUs/LR35902/NewDisassembler.cs
View File

@ -1,10 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace BizHawk.Emulation.Cores.Components.LR35902 namespace BizHawk.Emulation.Cores.Components.LR35902
{ {
// adapted from the information at http://www.pastraiser.com/cpu/gameboy/gameboy_opcodes.html // adapted from http://www.pastraiser.com/cpu/gameboy/gameboy_opcodes.html
// and https://rgbds.gbdev.io/docs/gbz80.7
public sealed partial class LR35902 public sealed partial class LR35902
{ {
private static readonly string[] table = private static readonly string[] table =
@ -241,8 +242,8 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
"PUSH HL", // e5 "PUSH HL", // e5
"AND d8", // e6 "AND d8", // e6
"RST 20H", // e7 "RST 20H", // e7
"ADD SP,r8", // e8 "ADD SP,e8", // e8
"JP (HL)", // e9 "JP HL", // e9
"LD (a16),A", // ea "LD (a16),A", // ea
"???", // eb "???", // eb
"???", // ec "???", // ec
@ -257,7 +258,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
"PUSH AF", // f5 "PUSH AF", // f5
"OR d8", // f6 "OR d8", // f6
"RST 30H", // f7 "RST 30H", // f7
"LD HL,SP+r8", // f8 "LD HL,SP+e8", // f8
"LD SP,HL", // f9 "LD SP,HL", // f9
"LD A,(a16)", // fa "LD A,(a16)", // fa
"EI ", // fb "EI ", // fb
@ -523,7 +524,523 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
"SET 7,A", // ff "SET 7,A", // ff
}; };
public static string Disassemble(ushort addr, Func<ushort, byte> reader, out ushort size) private static readonly string[] rgbds_table =
{
"nop", // 00
"ld bc, d16", // 01
"ld [bc], a", // 02
"inc bc", // 03
"inc b", // 04
"dec b", // 05
"ld b, d8", // 06
"rlca", // 07
"ld [a16], sp", // 08
"add hl, bc", // 09
"ld a, [bc]", // 0a
"dec bc", // 0b
"inc c", // 0c
"dec c", // 0d
"ld c, d8", // 0e
"rrca", // 0f
"stop d8", // 10
"ld de, d16", // 11
"ld [de], a", // 12
"inc de", // 13
"inc d", // 14
"dec d", // 15
"ld d, d8", // 16
"rla", // 17
"jr r8", // 18
"add hl, de", // 19
"ld a, [de]", // 1a
"dec de", // 1b
"inc e", // 1c
"dec e", // 1d
"ld e, d8", // 1e
"rra", // 1f
"jr nz, r8", // 20
"ld hl, d16", // 21
"ld [hl+], a", // 22
"inc hl", // 23
"inc h", // 24
"dec h", // 25
"ld h, d8", // 26
"daa", // 27
"jr z, r8", // 28
"add hl, hl", // 29
"ld a, [hl+]", // 2a
"dec hl", // 2b
"inc l", // 2c
"dec l", // 2d
"ld l, d8", // 2e
"cpl", // 2f
"jr nc, r8", // 30
"ld sp, d16", // 31
"ld [hl-], a", // 32
"inc sp", // 33
"inc [hl]", // 34
"dec [hl]", // 35
"ld [hl], d8", // 36
"scf", // 37
"jr c, r8", // 38
"add hl, sp", // 39
"ld a, [hl-]", // 3a
"dec sp", // 3b
"inc a", // 3c
"dec a", // 3d
"ld a, d8", // 3e
"ccf", // 3f
"ld b, b", // 40
"ld b, c", // 41
"ld b, d", // 42
"ld b, e", // 43
"ld b, h", // 44
"ld b, l", // 45
"ld b, [hl]", // 46
"ld b, a", // 47
"ld c, b", // 48
"ld c, c", // 49
"ld c, d", // 4a
"ld c, e", // 4b
"ld c, h", // 4c
"ld c, l", // 4d
"ld c, [hl]", // 4e
"ld c, a", // 4f
"ld d, b", // 50
"ld d, c", // 51
"ld d, d", // 52
"ld d, e", // 53
"ld d, h", // 54
"ld d, l", // 55
"ld d, [hl]", // 56
"ld d, a", // 57
"ld e, b", // 58
"ld e, c", // 59
"ld e, d", // 5a
"ld e, e", // 5b
"ld e, h", // 5c
"ld e, l", // 5d
"ld e, [hl]", // 5e
"ld e, a", // 5f
"ld h, b", // 60
"ld h, c", // 61
"ld h, d", // 62
"ld h, e", // 63
"ld h, h", // 64
"ld h, l", // 65
"ld h, [hl]", // 66
"ld h, a", // 67
"ld l, b", // 68
"ld l, c", // 69
"ld l, d", // 6a
"ld l, e", // 6b
"ld l, h", // 6c
"ld l, l", // 6d
"ld l, [hl]", // 6e
"ld l, a", // 6f
"ld [hl], b", // 70
"ld [hl], c", // 71
"ld [hl], d", // 72
"ld [hl], e", // 73
"ld [hl], h", // 74
"ld [hl], l", // 75
"halt", // 76
"ld [hl], a", // 77
"ld a, b", // 78
"ld a, c", // 79
"ld a, d", // 7a
"ld a, e", // 7b
"ld a, h", // 7c
"ld a, l", // 7d
"ld a, [hl]", // 7e
"ld a, a", // 7f
"add a, b", // 80
"add a, c", // 81
"add a, d", // 82
"add a, e", // 83
"add a, h", // 84
"add a, l", // 85
"add a, [hl]", // 86
"add a, a", // 87
"adc a, b", // 88
"adc a, c", // 89
"adc a, d", // 8a
"adc a, e", // 8b
"adc a, h", // 8c
"adc a, l", // 8d
"adc a, [hl]", // 8e
"adc a, a", // 8f
"sub a, b", // 90
"sub a, c", // 91
"sub a, d", // 92
"sub a, e", // 93
"sub a, h", // 94
"sub a, l", // 95
"sub a, [hl]", // 96
"sub a, a", // 97
"sbc a, b", // 98
"sbc a, c", // 99
"sbc a, d", // 9a
"sbc a, e", // 9b
"sbc a, h", // 9c
"sbc a, l", // 9d
"sbc a, [hl]", // 9e
"sbc a, a", // 9f
"and a, b", // a0
"and a, c", // a1
"and a, d", // a2
"and a, e", // a3
"and a, h", // a4
"and a, l", // a5
"and a, [hl]", // a6
"and a, a", // a7
"xor a, b", // a8
"xor a, c", // a9
"xor a, d", // aa
"xor a, e", // ab
"xor a, h", // ac
"xor a, l", // ad
"xor a, [hl]", // ae
"xor a, a", // af
"or a, b", // b0
"or a, c", // b1
"or a, d", // b2
"or a, e", // b3
"or a, h", // b4
"or a, l", // b5
"or a, [hl]", // b6
"or a, a", // b7
"cp a, b", // b8
"cp a, c", // b9
"cp a, d", // ba
"cp a, e", // bb
"cp a, h", // bc
"cp a, l", // bd
"cp a, [hl]", // be
"cp a, a", // bf
"ret nz", // c0
"pop bc", // c1
"jp nz, a16", // c2
"jp a16", // c3
"call nz, a16", // c4
"push bc", // c5
"add a, d8", // c6
"rst $00", // c7
"ret z", // c8
"ret", // c9
"jp z, a16", // ca
"prefix", // cb
"call z, a16", // cc
"call a16", // cd
"adc a, d8", // ce
"rst $08", // cf
"ret nc", // d0
"pop de", // d1
"jp nc, a16", // d2
"invalid opcode $D3", // d3
"call nc, a16", // d4
"push de", // d5
"sub a, d8", // d6
"rst $10", // d7
"ret c", // d8
"reti", // d9
"jp c, a16", // da
"invalid opcode $DB", // db
"call c, a16", // dc
"invalid opcode $DD", // dd
"sbc a, d8", // de
"rst $18", // df
"ldh [a8], a", // e0
"pop hl", // e1
"ldh [c], a", // e2
"invalid opcode $E3", // e3
"invalid opcode $E4", // e4
"push hl", // e5
"and a, d8", // e6
"rst $20", // e7
"add sp, e8", // e8
"jp hl", // e9
"ld [a16], a", // ea
"invalid opcode $EB", // eb
"invalid opcode $EC", // ec
"invalid opcode $ED", // ed
"xor a, d8", // ee
"rst $28", // ef
"ldh a, [a8]", // f0
"pop af", // f1
"ldh a, [c]", // f2
"di", // f3
"invalid opcode $DB", // f4
"push af", // f5
"or a, d8", // f6
"rst $30", // f7
"ld hl, sp + e8", // f8
"ld sp, hl", // f9
"ld a, [a16]", // fa
"ei", // fb
"invalid opcode $FC", // fc
"invalid opcode $FD", // fd
"cp a, d8", // fe
"rst $38", // ff
"rlc b", // 00
"rlc c", // 01
"rlc d", // 02
"rlc e", // 03
"rlc h", // 04
"rlc l", // 05
"rlc [hl]", // 06
"rlc a", // 07
"rrc b", // 08
"rrc c", // 09
"rrc d", // 0a
"rrc e", // 0b
"rrc h", // 0c
"rrc l", // 0d
"rrc [hl]", // 0e
"rrc a", // 0f
"rl b", // 10
"rl c", // 11
"rl d", // 12
"rl e", // 13
"rl h", // 14
"rl l", // 15
"rl [hl]", // 16
"rl a", // 17
"rr b", // 18
"rr c", // 19
"rr d", // 1a
"rr e", // 1b
"rr h", // 1c
"rr l", // 1d
"rr [hl]", // 1e
"rr a", // 1f
"sla b", // 20
"sla c", // 21
"sla d", // 22
"sla e", // 23
"sla h", // 24
"sla l", // 25
"sla [hl]", // 26
"sla a", // 27
"sra b", // 28
"sra c", // 29
"sra d", // 2a
"sra e", // 2b
"sra h", // 2c
"sra l", // 2d
"sra [hl]", // 2e
"sra a", // 2f
"swap b", // 30
"swap c", // 31
"swap d", // 32
"swap e", // 33
"swap h", // 34
"swap l", // 35
"swap [hl]", // 36
"swap a", // 37
"srl b", // 38
"srl c", // 39
"srl d", // 3a
"srl e", // 3b
"srl h", // 3c
"srl l", // 3d
"srl [hl]", // 3e
"srl a", // 3f
"bit 0, b", // 40
"bit 0, c", // 41
"bit 0, d", // 42
"bit 0, e", // 43
"bit 0, h", // 44
"bit 0, l", // 45
"bit 0, [hl]", // 46
"bit 0, a", // 47
"bit 1, b", // 48
"bit 1, c", // 49
"bit 1, d", // 4a
"bit 1, e", // 4b
"bit 1, h", // 4c
"bit 1, l", // 4d
"bit 1, [hl]", // 4e
"bit 1, a", // 4f
"bit 2, b", // 50
"bit 2, c", // 51
"bit 2, d", // 52
"bit 2, e", // 53
"bit 2, h", // 54
"bit 2, l", // 55
"bit 2, [hl]", // 56
"bit 2, a", // 57
"bit 3, b", // 58
"bit 3, c", // 59
"bit 3, d", // 5a
"bit 3, e", // 5b
"bit 3, h", // 5c
"bit 3, l", // 5d
"bit 3, [hl]", // 5e
"bit 3, a", // 5f
"bit 4, b", // 60
"bit 4, c", // 61
"bit 4, d", // 62
"bit 4, e", // 63
"bit 4, h", // 64
"bit 4, l", // 65
"bit 4, [hl]", // 66
"bit 4, a", // 67
"bit 5, b", // 68
"bit 5, c", // 69
"bit 5, d", // 6a
"bit 5, e", // 6b
"bit 5, h", // 6c
"bit 5, l", // 6d
"bit 5, [hl]", // 6e
"bit 5, a", // 6f
"bit 6, b", // 70
"bit 6, c", // 71
"bit 6, d", // 72
"bit 6, e", // 73
"bit 6, h", // 74
"bit 6, l", // 75
"bit 6, [hl]", // 76
"bit 6, a", // 77
"bit 7, b", // 78
"bit 7, c", // 79
"bit 7, d", // 7a
"bit 7, e", // 7b
"bit 7, h", // 7c
"bit 7, l", // 7d
"bit 7, [hl]", // 7e
"bit 7, a", // 7f
"res 0, b", // 80
"res 0, c", // 81
"res 0, d", // 82
"res 0, e", // 83
"res 0, h", // 84
"res 0, l", // 85
"res 0, [hl]", // 86
"res 0, a", // 87
"res 1, b", // 88
"res 1, c", // 89
"res 1, d", // 8a
"res 1, e", // 8b
"res 1, h", // 8c
"res 1, l", // 8d
"res 1, [hl]", // 8e
"res 1, a", // 8f
"res 2, b", // 90
"res 2, c", // 91
"res 2, d", // 92
"res 2, e", // 93
"res 2, h", // 94
"res 2, l", // 95
"res 2, [hl]", // 96
"res 2, a", // 97
"res 3, b", // 98
"res 3, c", // 99
"res 3, d", // 9a
"res 3, e", // 9b
"res 3, h", // 9c
"res 3, l", // 9d
"res 3, [hl]", // 9e
"res 3, a", // 9f
"res 4, b", // a0
"res 4, c", // a1
"res 4, d", // a2
"res 4, e", // a3
"res 4, h", // a4
"res 4, l", // a5
"res 4, [hl]", // a6
"res 4, a", // a7
"res 5, b", // a8
"res 5, c", // a9
"res 5, d", // aa
"res 5, e", // ab
"res 5, h", // ac
"res 5, l", // ad
"res 5, [hl]", // ae
"res 5, a", // af
"res 6, b", // b0
"res 6, c", // b1
"res 6, d", // b2
"res 6, e", // b3
"res 6, h", // b4
"res 6, l", // b5
"res 6, [hl]", // b6
"res 6, a", // b7
"res 7, b", // b8
"res 7, c", // b9
"res 7, d", // ba
"res 7, e", // bb
"res 7, h", // bc
"res 7, l", // bd
"res 7, [hl]", // be
"res 7, a", // bf
"set 0, b", // c0
"set 0, c", // c1
"set 0, d", // c2
"set 0, e", // c3
"set 0, h", // c4
"set 0, l", // c5
"set 0, [hl]", // c6
"set 0, a", // c7
"set 1, b", // c8
"set 1, c", // c9
"set 1, d", // ca
"set 1, e", // cb
"set 1, h", // cc
"set 1, l", // cd
"set 1, [hl]", // ce
"set 1, a", // cf
"set 2, b", // d0
"set 2, c", // d1
"set 2, d", // d2
"set 2, e", // d3
"set 2, h", // d4
"set 2, l", // d5
"set 2, [hl]", // d6
"set 2, a", // d7
"set 3, b", // d8
"set 3, c", // d9
"set 3, d", // da
"set 3, e", // db
"set 3, h", // dc
"set 3, l", // dd
"set 3, [hl]", // de
"set 3, a", // df
"set 4, b", // e0
"set 4, c", // e1
"set 4, d", // e2
"set 4, e", // e3
"set 4, h", // e4
"set 4, l", // e5
"set 4, [hl]", // e6
"set 4, a", // e7
"set 5, b", // e8
"set 5, c", // e9
"set 5, d", // ea
"set 5, e", // eb
"set 5, h", // ec
"set 5, l", // ed
"set 5, [hl]", // ee
"set 5, a", // ef
"set 6, b", // f0
"set 6, c", // f1
"set 6, d", // f2
"set 6, e", // f3
"set 6, h", // f4
"set 6, l", // f5
"set 6, [hl]", // f6
"set 6, a", // f7
"set 7, b", // f8
"set 7, c", // f9
"set 7, d", // fa
"set 7, e", // fb
"set 7, h", // fc
"set 7, l", // fd
"set 7, [hl]", // fe
"set 7, a", // ff
};
public static string Disassemble(ushort addr, Func<ushort, byte> reader, bool rgbds, out ushort size)
{ {
ushort origaddr = addr; ushort origaddr = addr;
var bytes = new List<byte> var bytes = new List<byte>
@ -531,18 +1048,18 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
reader(addr++) reader(addr++)
}; };
string result = table[bytes[0]]; string result = (rgbds ? rgbds_table : table)[bytes[0]];
if (bytes[0] == 0xcb) if (bytes[0] == 0xcb)
{ {
bytes.Add(reader(addr++)); bytes.Add(reader(addr++));
result = table[bytes[1] + 256]; result = (rgbds ? rgbds_table : table)[bytes[1] + 256];
} }
if (result.Contains("d8")) if (result.Contains("d8"))
{ {
byte d = reader(addr++); byte d = reader(addr++);
bytes.Add(d); bytes.Add(d);
result = result.Replace("d8", $"#{d:X2}h"); result = result.Replace("d8", rgbds ? $"${d:X2}" : $"#{d:X2}h");
} }
else if (result.Contains("d16")) else if (result.Contains("d16"))
{ {
@ -550,7 +1067,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
byte dhi = reader(addr++); byte dhi = reader(addr++);
bytes.Add(dlo); bytes.Add(dlo);
bytes.Add(dhi); bytes.Add(dhi);
result = result.Replace("d16", $"#{dhi:X2}{dlo:X2}h"); result = result.Replace("d16", rgbds ? $"${dhi:X2}{dlo:X2}" : $"#{dhi:X2}{dlo:X2}h");
} }
else if (result.Contains("a16")) else if (result.Contains("a16"))
{ {
@ -558,13 +1075,13 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
byte dhi = reader(addr++); byte dhi = reader(addr++);
bytes.Add(dlo); bytes.Add(dlo);
bytes.Add(dhi); bytes.Add(dhi);
result = result.Replace("a16", $"#{dhi:X2}{dlo:X2}h"); result = result.Replace("a16", rgbds ? $"${dhi:X2}{dlo:X2}" : $"#{dhi:X2}{dlo:X2}h");
} }
else if (result.Contains("a8")) else if (result.Contains("a8"))
{ {
byte d = reader(addr++); byte d = reader(addr++);
bytes.Add(d); bytes.Add(d);
result = result.Replace("a8", $"#FF{d:X2}h"); result = result.Replace("a8", rgbds ? $"$FF{d:X2}" : $"#FF{d:X2}h");
} }
else if (result.Contains("r8")) else if (result.Contains("r8"))
{ {
@ -573,7 +1090,16 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
int offs = d; int offs = d;
if (offs >= 128) if (offs >= 128)
offs -= 256; offs -= 256;
result = result.Replace("r8", $"{(ushort)(addr + offs):X4}h"); var u = (ushort) (addr + offs);
result = result.Replace("r8", rgbds ? $"${u:X4}" : $"{u:X4}h");
}
else if (result.Contains("e8"))
{
byte d = reader(addr++);
bytes.Add(d);
int offs = (d >= 128) ? (256 - d) : d;
string sign = (d >= 128) ? "-" : "";
result = result.Replace("e8", rgbds ? sign + $"${offs:X2}" : sign + $"{offs:X2}h");
} }
var ret = new StringBuilder(); var ret = new StringBuilder();
ret.Append($"{origaddr:X4}: "); ret.Append($"{origaddr:X4}: ");

8
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs
View File

@ -114,7 +114,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
DIV_edge_old = (timer.divider_reg & 0x2000) == 0x2000; DIV_edge_old = (timer.divider_reg & 0x2000) == 0x2000;
timer.tick(); timer.tick();
cpu.ExecuteOne(); cpu.ExecuteOne(_settings.UseRGBDSSyntax);
timer.divider_reg++; timer.divider_reg++;
DIV_falling_edge |= DIV_edge_old & ((timer.divider_reg & 0x2000) == 0); DIV_falling_edge |= DIV_edge_old & ((timer.divider_reg & 0x2000) == 0);
@ -131,7 +131,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
DIV_edge_old = double_speed ? ((timer.divider_reg & 0x2000) == 0x2000) : ((timer.divider_reg & 0x1000) == 0x1000); DIV_edge_old = double_speed ? ((timer.divider_reg & 0x2000) == 0x2000) : ((timer.divider_reg & 0x1000) == 0x1000);
timer.tick(); timer.tick();
cpu.ExecuteOne(); cpu.ExecuteOne(_settings.UseRGBDSSyntax);
timer.divider_reg++; timer.divider_reg++;
DIV_falling_edge |= DIV_edge_old & (double_speed ? ((timer.divider_reg & 0x2000) == 0) : ((timer.divider_reg & 0x1000) == 0)); DIV_falling_edge |= DIV_edge_old & (double_speed ? ((timer.divider_reg & 0x2000) == 0) : ((timer.divider_reg & 0x1000) == 0));
@ -201,7 +201,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
DIV_edge_old = (timer.divider_reg & 0x2000) == 0x2000; DIV_edge_old = (timer.divider_reg & 0x2000) == 0x2000;
timer.tick(); timer.tick();
cpu.ExecuteOne(); cpu.ExecuteOne(_settings.UseRGBDSSyntax);
timer.divider_reg++; timer.divider_reg++;
DIV_falling_edge |= DIV_edge_old & ((timer.divider_reg & 0x2000) == 0); DIV_falling_edge |= DIV_edge_old & ((timer.divider_reg & 0x2000) == 0);
@ -218,7 +218,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
DIV_edge_old = double_speed ? ((timer.divider_reg & 0x2000) == 0x2000) : ((timer.divider_reg & 0x1000) == 0x1000); DIV_edge_old = double_speed ? ((timer.divider_reg & 0x2000) == 0x2000) : ((timer.divider_reg & 0x1000) == 0x1000);
timer.tick(); timer.tick();
cpu.ExecuteOne(); cpu.ExecuteOne(_settings.UseRGBDSSyntax);
timer.divider_reg++; timer.divider_reg++;
DIV_falling_edge |= DIV_edge_old & (double_speed ? ((timer.divider_reg & 0x2000) == 0) : ((timer.divider_reg & 0x1000) == 0)); DIV_falling_edge |= DIV_edge_old & (double_speed ? ((timer.divider_reg & 0x2000) == 0) : ((timer.divider_reg & 0x1000) == 0));

6
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
View File

@ -23,6 +23,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public PutSettingsDirtyBits PutSettings(GBSettings o) public PutSettingsDirtyBits PutSettings(GBSettings o)
{ {
_settings = o; _settings = o;
_disassembler.UseRGBDSSyntax = _settings.UseRGBDSSyntax;
return PutSettingsDirtyBits.None; return PutSettingsDirtyBits.None;
} }
@ -65,6 +66,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
[DefaultValue(Cycle_Return.CPU)] [DefaultValue(Cycle_Return.CPU)]
public Cycle_Return cycle_return_setting { get; set; } public Cycle_Return cycle_return_setting { get; set; }
[DisplayName("Use RGBDS syntax")]
[Description("When true, rgbds' syntax is used for disassembly.")]
[DefaultValue(true)]
public bool UseRGBDSSyntax { get; set; }
public GBSettings Clone() public GBSettings Clone()
{ {
return (GBSettings)MemberwiseClone(); return (GBSettings)MemberwiseClone();

12
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
View File

@ -94,6 +94,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public MapperBase mapper; public MapperBase mapper;
private readonly GBHawkDisassembler _disassembler = new();
private readonly ITraceable _tracer; private readonly ITraceable _tracer;
public LR35902 cpu; public LR35902 cpu;
@ -127,7 +129,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
audio = new Audio(); audio = new Audio();
serialport = new SerialPort(); serialport = new SerialPort();
_settings = (GBSettings)settings ?? new GBSettings(); _ = PutSettings(settings ?? new GBSettings());
_syncSettings = (GBSyncSettings)syncSettings ?? new GBSyncSettings(); _syncSettings = (GBSyncSettings)syncSettings ?? new GBSyncSettings();
byte[] Bios = null; byte[] Bios = null;
@ -213,13 +215,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Register<ISoundProvider>(audio); ser.Register<ISoundProvider>(audio);
ServiceProvider = ser; ServiceProvider = ser;
_settings = (GBSettings)settings ?? new GBSettings(); _ = PutSettings(settings ?? new GBSettings());
_syncSettings = (GBSyncSettings)syncSettings ?? new GBSyncSettings(); _syncSettings = (GBSyncSettings)syncSettings ?? new GBSyncSettings();
_tracer = new TraceBuffer { Header = cpu.TraceHeader }; _tracer = new TraceBuffer { Header = cpu.TraceHeader };
ser.Register<ITraceable>(_tracer); ser.Register<ITraceable>(_tracer);
ser.Register<IStatable>(new StateSerializer(SyncState)); ser.Register<IStatable>(new StateSerializer(SyncState));
ser.Register<IDisassemblable>(new GBHawkDisassembler()); ser.Register<IDisassemblable>(_disassembler);
SetupMemoryDomains(); SetupMemoryDomains();
cpu.SetCallbacks(ReadMemory, PeekMemory, PeekMemory, WriteMemory); cpu.SetCallbacks(ReadMemory, PeekMemory, PeekMemory, WriteMemory);
HardReset(); HardReset();
@ -740,6 +742,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public class GBHawkDisassembler : VerifiedDisassembler public class GBHawkDisassembler : VerifiedDisassembler
{ {
public bool UseRGBDSSyntax;
public override IEnumerable<string> AvailableCpus public override IEnumerable<string> AvailableCpus
{ {
get { yield return "LR35902"; } get { yield return "LR35902"; }
@ -749,7 +753,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public override string Disassemble(MemoryDomain m, uint addr, out int length) public override string Disassemble(MemoryDomain m, uint addr, out int length)
{ {
string ret = LR35902.Disassemble((ushort)addr, a => m.PeekByte(a), out var tmp); var ret = LR35902.Disassemble((ushort) addr, a => m.PeekByte(a), UseRGBDSSyntax, out var tmp);
length = tmp; length = tmp;
return ret; return ret;
} }

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBDisassembler.cs
View File

@ -7,6 +7,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
public class GBDisassembler : VerifiedDisassembler public class GBDisassembler : VerifiedDisassembler
{ {
public bool UseRGBDSSyntax;
public override IEnumerable<string> AvailableCpus public override IEnumerable<string> AvailableCpus
{ {
get { yield return "Z80GB"; } get { yield return "Z80GB"; }
@ -16,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public override string Disassemble(MemoryDomain m, uint addr, out int length) public override string Disassemble(MemoryDomain m, uint addr, out int length)
{ {
string ret = LR35902.Disassemble((ushort)addr, a => m.PeekByte(a), out var tmp); var ret = LR35902.Disassemble((ushort) addr, a => m.PeekByte(a), UseRGBDSSyntax, out var tmp);
length = tmp; length = tmp;
return ret; return ret;
} }

7
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
View File

@ -18,6 +18,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public PutSettingsDirtyBits PutSettings(GambatteSettings o) public PutSettingsDirtyBits PutSettings(GambatteSettings o)
{ {
_settings = o; _settings = o;
_disassembler.UseRGBDSSyntax = _settings.RgbdsSyntax;
if (IsCGBMode()) if (IsCGBMode())
{ {
SetCGBColors(_settings.CGBColors); SetCGBColors(_settings.CGBColors);
@ -71,10 +72,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
/// </summary> /// </summary>
public bool Muted; public bool Muted;
/// <summary>
/// true to use rgbds syntax
/// </summary>
public bool RgbdsSyntax;
public GambatteSettings() public GambatteSettings()
{ {
GBPalette = (int[])DefaultPalette.Clone(); GBPalette = (int[])DefaultPalette.Clone();
CGBColors = GBColors.ColorType.gambatte; CGBColors = GBColors.ColorType.gambatte;
RgbdsSyntax = true;
} }

8
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ITraceable.cs
View File

@ -14,13 +14,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
int[] s = new int[14]; int[] s = new int[14];
System.Runtime.InteropServices.Marshal.Copy(_s, s, 0, 14); System.Runtime.InteropServices.Marshal.Copy(_s, s, 0, 14);
ushort unused;
Tracer.Put(new TraceInfo Tracer.Put(new TraceInfo
{ {
Disassembly = Disassembly =
LR35902.Disassemble((ushort)s[1], addr => LibGambatte.gambatte_cpuread(GambatteState, addr), out unused) LR35902.Disassemble(
.PadRight(36), (ushort) s[1],
addr => LibGambatte.gambatte_cpuread(GambatteState, addr),
_settings.RgbdsSyntax,
out _).PadRight(36),
RegisterInfo = RegisterInfo =
string.Format( string.Format(
"A:{3:x2} B:{4:x2} C:{5:x2} D:{6:x2} E:{7:x2} F:{8:x2} H:{9:x2} L:{10:x2} LY:{13:x2} SP:{2:x2} {11} Cy:{0}", "A:{3:x2} B:{4:x2} C:{5:x2} D:{6:x2} E:{7:x2} F:{8:x2} H:{9:x2} L:{10:x2} LY:{13:x2} SP:{2:x2} {11} Cy:{0}",

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
View File

@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public Gameboy(CoreComm comm, GameInfo game, byte[] file, Gameboy.GambatteSettings settings, Gameboy.GambatteSyncSettings syncSettings, bool deterministic) public Gameboy(CoreComm comm, GameInfo game, byte[] file, Gameboy.GambatteSettings settings, Gameboy.GambatteSyncSettings syncSettings, bool deterministic)
{ {
var ser = new BasicServiceProvider(this); var ser = new BasicServiceProvider(this);
ser.Register<IDisassemblable>(new GBDisassembler()); ser.Register<IDisassemblable>(_disassembler);
ServiceProvider = ser; ServiceProvider = ser;
Tracer = new TraceBuffer Tracer = new TraceBuffer
{ {
@ -194,6 +194,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
} }
} }
private readonly GBDisassembler _disassembler = new();
public string RomDetails { get; } public string RomDetails { get; }
/// <summary> /// <summary>