diff options
| author | James Barnett <noreply@jamesbarnett.xyz> | 2018-07-10 20:22:45 +0100 |
|---|---|---|
| committer | James Barnett <noreply@jamesbarnett.xyz> | 2018-07-10 20:22:45 +0100 |
| commit | d12c7fdd3860ae3a901e0f26627eab5f47af96d4 (patch) | |
| tree | 5cd4e857f5fb20ab8a0f2b3586dcc8df21357c67 /src/main/kotlin/cpu/opcodes | |
| parent | 1193b3a6707e0a6a5626d8a3238252dd2eeaa31b (diff) | |
| download | KGB-d12c7fdd3860ae3a901e0f26627eab5f47af96d4.tar.xz KGB-d12c7fdd3860ae3a901e0f26627eab5f47af96d4.zip | |
Move SWAP ops into the extended CB prefixed set
Diffstat (limited to 'src/main/kotlin/cpu/opcodes')
| -rw-r--r-- | src/main/kotlin/cpu/opcodes/Misc.kt | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/kotlin/cpu/opcodes/Misc.kt b/src/main/kotlin/cpu/opcodes/Misc.kt index 2b8f673..a72f6dc 100644 --- a/src/main/kotlin/cpu/opcodes/Misc.kt +++ b/src/main/kotlin/cpu/opcodes/Misc.kt @@ -7,15 +7,6 @@ import BitManipulation as bm var misc = mapOf( - 0x37 to Operation("SWAP A", 0, 8, {r, _, _ -> r.A = swap(r.A, r)}), - 0x30 to Operation("SWAP B", 0, 8, {r, _, _ -> r.B = swap(r.B, r)}), - 0x31 to Operation("SWAP C", 0, 8, {r, _, _ -> r.C = swap(r.C, r)}), - 0x32 to Operation("SWAP D", 0, 8, {r, _, _ -> r.D = swap(r.D, r)}), - 0x33 to Operation("SWAP E", 0, 8, {r, _, _ -> r.E = swap(r.E, r)}), - 0x34 to Operation("SWAP H", 0, 8, {r, _, _ -> r.H = swap(r.H, r)}), - 0x35 to Operation("SWAP L", 0, 8, {r, _, _ -> r.L = swap(r.L, r)}), - 0x36 to Operation("SWAP (HL)", 0, 16, {r, m, _ -> m.writeByte(r.HL, swap(m.readByte(r.HL), r))}), - 0x27 to Operation("DAA", 0, 4, {r, _, _ -> // TODO }), @@ -48,6 +39,17 @@ var misc = mapOf( ) +val miscExtended = mapOf( + 0x37 to Operation("SWAP A", 0, 8, {r, _, _ -> r.A = swap(r.A, r)}), + 0x30 to Operation("SWAP B", 0, 8, {r, _, _ -> r.B = swap(r.B, r)}), + 0x31 to Operation("SWAP C", 0, 8, {r, _, _ -> r.C = swap(r.C, r)}), + 0x32 to Operation("SWAP D", 0, 8, {r, _, _ -> r.D = swap(r.D, r)}), + 0x33 to Operation("SWAP E", 0, 8, {r, _, _ -> r.E = swap(r.E, r)}), + 0x34 to Operation("SWAP H", 0, 8, {r, _, _ -> r.H = swap(r.H, r)}), + 0x35 to Operation("SWAP L", 0, 8, {r, _, _ -> r.L = swap(r.L, r)}), + 0x36 to Operation("SWAP (HL)", 0, 16, {r, m, _ -> m.writeByte(r.HL, swap(m.readByte(r.HL), r))}) +) + private fun swap(n: Int, r: Registers): Int { |