From 6acdde8f7093c0fb2e95d8dbc14dfab096b0a027 Mon Sep 17 00:00:00 2001 From: James Barnett Date: Mon, 23 Jul 2018 20:16:07 +0100 Subject: Move lambda calls outside of parens --- src/main/kotlin/cpu/opcodes/Arithmetic16Bit.kt | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/main/kotlin/cpu/opcodes/Arithmetic16Bit.kt') diff --git a/src/main/kotlin/cpu/opcodes/Arithmetic16Bit.kt b/src/main/kotlin/cpu/opcodes/Arithmetic16Bit.kt index 0eff88a..8d21224 100644 --- a/src/main/kotlin/cpu/opcodes/Arithmetic16Bit.kt +++ b/src/main/kotlin/cpu/opcodes/Arithmetic16Bit.kt @@ -7,12 +7,12 @@ import BitManipulation as bm var arithmetic16Bit = mapOf( - 0x09 to Operation("ADD HL,BC", 0, 8, {r, _, _ -> r.HL = add(r.HL, r.BC, r)}), - 0x19 to Operation("ADD HL,DE", 0, 8, {r, _, _ -> r.HL = add(r.HL, r.DE, r)}), - 0x29 to Operation("ADD HL,HL", 0, 8, {r, _, _ -> r.HL = add(r.HL, r.HL, r)}), - 0x39 to Operation("ADD HL,SP", 0, 8, {r, _, _ -> r.HL = add(r.HL, r.SP, r)}), + 0x09 to Operation("ADD HL,BC", 0, 8) { r, _, _ -> r.HL = add(r.HL, r.BC, r)}, + 0x19 to Operation("ADD HL,DE", 0, 8) { r, _, _ -> r.HL = add(r.HL, r.DE, r)}, + 0x29 to Operation("ADD HL,HL", 0, 8) { r, _, _ -> r.HL = add(r.HL, r.HL, r)}, + 0x39 to Operation("ADD HL,SP", 0, 8) { r, _, _ -> r.HL = add(r.HL, r.SP, r)}, - 0xE8 to Operation("ADD SP,n", 1, 16, {r, _, a -> + 0xE8 to Operation("ADD SP,n", 1, 16) { r, _, a -> r.clearFlags() val absoluteValue = bm.getAbsoluteValue(a[0]) @@ -27,17 +27,17 @@ var arithmetic16Bit = mapOf( r.setFlagFromBool(Flag.CARRY,(r.SP and 0xFF) + absoluteValue > 0xFF) r.SP = r.SP + absoluteValue } - }), + }, - 0x03 to Operation("INC BC", 0, 8, {r, _, _ -> r.BC = inc(r.BC)}), - 0x13 to Operation("INC DE", 0, 8, {r, _, _ -> r.DE = inc(r.DE)}), - 0x23 to Operation("INC HL", 0, 8, {r, _, _ -> r.HL = inc(r.HL)}), - 0x33 to Operation("INC SP", 0, 8, {r, _, _ -> r.SP = inc(r.SP)}), + 0x03 to Operation("INC BC", 0, 8) { r, _, _ -> r.BC = inc(r.BC)}, + 0x13 to Operation("INC DE", 0, 8) { r, _, _ -> r.DE = inc(r.DE)}, + 0x23 to Operation("INC HL", 0, 8) { r, _, _ -> r.HL = inc(r.HL)}, + 0x33 to Operation("INC SP", 0, 8) { r, _, _ -> r.SP = inc(r.SP)}, - 0x0B to Operation("DEC BC", 0, 8, {r, _, _ -> r.BC = dec(r.BC)}), - 0x1B to Operation("DEC DE", 0, 8, {r, _, _ -> r.DE = dec(r.DE)}), - 0x2B to Operation("DEC HL", 0, 8, {r, _, _ -> r.HL = dec(r.HL)}), - 0x3B to Operation("DEC SP", 0, 8, {r, _, _ -> r.SP = dec(r.SP)}) + 0x0B to Operation("DEC BC", 0, 8) { r, _, _ -> r.BC = dec(r.BC)}, + 0x1B to Operation("DEC DE", 0, 8) { r, _, _ -> r.DE = dec(r.DE)}, + 0x2B to Operation("DEC HL", 0, 8) { r, _, _ -> r.HL = dec(r.HL)}, + 0x3B to Operation("DEC SP", 0, 8) { r, _, _ -> r.SP = dec(r.SP)} ) -- cgit v1.2.3