aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/cpu/opcodes/Rotates.kt
diff options
context:
space:
mode:
authorJames Barnett <noreply@jamesbarnett.xyz>2018-07-23 20:16:07 +0100
committerJames Barnett <noreply@jamesbarnett.xyz>2018-07-23 20:16:07 +0100
commit6acdde8f7093c0fb2e95d8dbc14dfab096b0a027 (patch)
treeb9608e85db3704eca7d571cc059e7723448823a9 /src/main/kotlin/cpu/opcodes/Rotates.kt
parentc6a953d722b1fdc27a9db6f78f00c52fe43a7222 (diff)
downloadKGB-6acdde8f7093c0fb2e95d8dbc14dfab096b0a027.tar.xz
KGB-6acdde8f7093c0fb2e95d8dbc14dfab096b0a027.zip
Move lambda calls outside of parens
Diffstat (limited to 'src/main/kotlin/cpu/opcodes/Rotates.kt')
-rw-r--r--src/main/kotlin/cpu/opcodes/Rotates.kt78
1 files changed, 39 insertions, 39 deletions
diff --git a/src/main/kotlin/cpu/opcodes/Rotates.kt b/src/main/kotlin/cpu/opcodes/Rotates.kt
index 1638f20..71a545d 100644
--- a/src/main/kotlin/cpu/opcodes/Rotates.kt
+++ b/src/main/kotlin/cpu/opcodes/Rotates.kt
@@ -7,53 +7,53 @@ import BitManipulation as bm
val rotates = mapOf(
- 0x07 to Operation("RLCA", 0, 4, {r, _, _ -> r.A = rotateLeft(r.A, r) }),
+ 0x07 to Operation("RLCA", 0, 4) { r, _, _ -> r.A = rotateLeft(r.A, r) },
- 0x17 to Operation("RLA", 0, 4, {r, _, _ -> r.A = rotateLeftThroughCarry(r.A, r) }),
+ 0x17 to Operation("RLA", 0, 4) { r, _, _ -> r.A = rotateLeftThroughCarry(r.A, r) },
- 0x0F to Operation("RRCA", 0, 4, {r, _, _ -> r.A = rotateRight(r.A, r) }),
+ 0x0F to Operation("RRCA", 0, 4) { r, _, _ -> r.A = rotateRight(r.A, r) },
- 0x1F to Operation("RRA", 0, 4, {r, _, _ -> r.A = rotateRightThroughCarry(r.A, r) })
+ 0x1F to Operation("RRA", 0, 4) { r, _, _ -> r.A = rotateRightThroughCarry(r.A, r) }
)
val rotatesExtended = mapOf(
- 0x07 to Operation("RLC A", 0, 8, {r, _, _ -> r.A = rotateLeft(r.A, r) }),
- 0x00 to Operation("RLC B", 0, 8, {r, _, _ -> r.A = rotateLeft(r.B, r) }),
- 0x01 to Operation("RLC C", 0, 8, {r, _, _ -> r.A = rotateLeft(r.C, r) }),
- 0x02 to Operation("RLC D", 0, 8, {r, _, _ -> r.A = rotateLeft(r.D, r) }),
- 0x03 to Operation("RLC E", 0, 8, {r, _, _ -> r.A = rotateLeft(r.E, r) }),
- 0x04 to Operation("RLC H", 0, 8, {r, _, _ -> r.A = rotateLeft(r.H, r) }),
- 0x05 to Operation("RLC L", 0, 8, {r, _, _ -> r.A = rotateLeft(r.L, r) }),
- 0x06 to Operation("RLC (HL)", 0, 16, {r, m, _ -> m.writeByte(r.HL, rotateLeft(m.readByte(r.HL), r))}),
-
- 0x17 to Operation("RL A", 0, 8, {r, _, _ -> r.A = rotateLeftThroughCarry(r.A, r) }),
- 0x10 to Operation("RL B", 0, 8, {r, _, _ -> r.A = rotateLeftThroughCarry(r.B, r) }),
- 0x11 to Operation("RL C", 0, 8, {r, _, _ -> r.A = rotateLeftThroughCarry(r.C, r) }),
- 0x12 to Operation("RL D", 0, 8, {r, _, _ -> r.A = rotateLeftThroughCarry(r.D, r) }),
- 0x13 to Operation("RL E", 0, 8, {r, _, _ -> r.A = rotateLeftThroughCarry(r.E, r) }),
- 0x14 to Operation("RL H", 0, 8, {r, _, _ -> r.A = rotateLeftThroughCarry(r.H, r) }),
- 0x15 to Operation("RL L", 0, 8, {r, _, _ -> r.A = rotateLeftThroughCarry(r.L, r) }),
- 0x16 to Operation("RL (HL)", 0, 16, {r, m, _ -> m.writeByte(r.HL, rotateLeftThroughCarry(m.readByte(r.HL), r))}),
-
- 0x0F to Operation("RRC A", 0, 8, {r, _, _ -> r.A = rotateRight(r.A, r) }),
- 0x08 to Operation("RRC B", 0, 8, {r, _, _ -> r.A = rotateRight(r.B, r) }),
- 0x09 to Operation("RRC C", 0, 8, {r, _, _ -> r.A = rotateRight(r.C, r) }),
- 0x0A to Operation("RRC D", 0, 8, {r, _, _ -> r.A = rotateRight(r.D, r) }),
- 0x0B to Operation("RRC E", 0, 8, {r, _, _ -> r.A = rotateRight(r.E, r) }),
- 0x0C to Operation("RRC H", 0, 8, {r, _, _ -> r.A = rotateRight(r.H, r) }),
- 0x0D to Operation("RRC L", 0, 8, {r, _, _ -> r.A = rotateRight(r.L, r) }),
- 0x0E to Operation("RRC (HL)", 0, 16, {r, m, _ -> m.writeByte(r.HL, rotateRight(m.readByte(r.HL), r))}),
-
- 0x1F to Operation("RR A", 0, 8, {r, _, _ -> r.A = rotateRightThroughCarry(r.A, r) }),
- 0x18 to Operation("RR B", 0, 8, {r, _, _ -> r.A = rotateRightThroughCarry(r.B, r) }),
- 0x19 to Operation("RR C", 0, 8, {r, _, _ -> r.A = rotateRightThroughCarry(r.C, r) }),
- 0x1A to Operation("RR D", 0, 8, {r, _, _ -> r.A = rotateRightThroughCarry(r.D, r) }),
- 0x1B to Operation("RR E", 0, 8, {r, _, _ -> r.A = rotateRightThroughCarry(r.E, r) }),
- 0x1C to Operation("RR H", 0, 8, {r, _, _ -> r.A = rotateRightThroughCarry(r.H, r) }),
- 0x1D to Operation("RR L", 0, 8, {r, _, _ -> r.A = rotateRightThroughCarry(r.L, r) }),
- 0x1E to Operation("RR (HL)", 0, 16, {r, m, _ -> m.writeByte(r.HL, rotateRightThroughCarry(m.readByte(r.HL), r))})
+ 0x07 to Operation("RLC A", 0, 8) { r, _, _ -> r.A = rotateLeft(r.A, r) },
+ 0x00 to Operation("RLC B", 0, 8) { r, _, _ -> r.A = rotateLeft(r.B, r) },
+ 0x01 to Operation("RLC C", 0, 8) { r, _, _ -> r.A = rotateLeft(r.C, r) },
+ 0x02 to Operation("RLC D", 0, 8) { r, _, _ -> r.A = rotateLeft(r.D, r) },
+ 0x03 to Operation("RLC E", 0, 8) { r, _, _ -> r.A = rotateLeft(r.E, r) },
+ 0x04 to Operation("RLC H", 0, 8) { r, _, _ -> r.A = rotateLeft(r.H, r) },
+ 0x05 to Operation("RLC L", 0, 8) { r, _, _ -> r.A = rotateLeft(r.L, r) },
+ 0x06 to Operation("RLC (HL)", 0, 16) { r, m, _ -> m.writeByte(r.HL, rotateLeft(m.readByte(r.HL), r))},
+
+ 0x17 to Operation("RL A", 0, 8) { r, _, _ -> r.A = rotateLeftThroughCarry(r.A, r) },
+ 0x10 to Operation("RL B", 0, 8) { r, _, _ -> r.A = rotateLeftThroughCarry(r.B, r) },
+ 0x11 to Operation("RL C", 0, 8) { r, _, _ -> r.A = rotateLeftThroughCarry(r.C, r) },
+ 0x12 to Operation("RL D", 0, 8) { r, _, _ -> r.A = rotateLeftThroughCarry(r.D, r) },
+ 0x13 to Operation("RL E", 0, 8) { r, _, _ -> r.A = rotateLeftThroughCarry(r.E, r) },
+ 0x14 to Operation("RL H", 0, 8) { r, _, _ -> r.A = rotateLeftThroughCarry(r.H, r) },
+ 0x15 to Operation("RL L", 0, 8) { r, _, _ -> r.A = rotateLeftThroughCarry(r.L, r) },
+ 0x16 to Operation("RL (HL)", 0, 16) { r, m, _ -> m.writeByte(r.HL, rotateLeftThroughCarry(m.readByte(r.HL), r))},
+
+ 0x0F to Operation("RRC A", 0, 8) { r, _, _ -> r.A = rotateRight(r.A, r) },
+ 0x08 to Operation("RRC B", 0, 8) { r, _, _ -> r.A = rotateRight(r.B, r) },
+ 0x09 to Operation("RRC C", 0, 8) { r, _, _ -> r.A = rotateRight(r.C, r) },
+ 0x0A to Operation("RRC D", 0, 8) { r, _, _ -> r.A = rotateRight(r.D, r) },
+ 0x0B to Operation("RRC E", 0, 8) { r, _, _ -> r.A = rotateRight(r.E, r) },
+ 0x0C to Operation("RRC H", 0, 8) { r, _, _ -> r.A = rotateRight(r.H, r) },
+ 0x0D to Operation("RRC L", 0, 8) { r, _, _ -> r.A = rotateRight(r.L, r) },
+ 0x0E to Operation("RRC (HL)", 0, 16) { r, m, _ -> m.writeByte(r.HL, rotateRight(m.readByte(r.HL), r))},
+
+ 0x1F to Operation("RR A", 0, 8) { r, _, _ -> r.A = rotateRightThroughCarry(r.A, r) },
+ 0x18 to Operation("RR B", 0, 8) { r, _, _ -> r.A = rotateRightThroughCarry(r.B, r) },
+ 0x19 to Operation("RR C", 0, 8) { r, _, _ -> r.A = rotateRightThroughCarry(r.C, r) },
+ 0x1A to Operation("RR D", 0, 8) { r, _, _ -> r.A = rotateRightThroughCarry(r.D, r) },
+ 0x1B to Operation("RR E", 0, 8) { r, _, _ -> r.A = rotateRightThroughCarry(r.E, r) },
+ 0x1C to Operation("RR H", 0, 8) { r, _, _ -> r.A = rotateRightThroughCarry(r.H, r) },
+ 0x1D to Operation("RR L", 0, 8) { r, _, _ -> r.A = rotateRightThroughCarry(r.L, r) },
+ 0x1E to Operation("RR (HL)", 0, 16) { r, m, _ -> m.writeByte(r.HL, rotateRightThroughCarry(m.readByte(r.HL), r))}
)