From cd8500dbcd23abaebd5c02b8b04ef4bc26c6c457 Mon Sep 17 00:00:00 2001 From: edmccard Date: Fri, 30 Mar 2012 14:21:15 -0400 Subject: [PATCH] test_decimal to match framework --- test/test_decimal.d | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/test_decimal.d b/test/test_decimal.d index aa78dc3..a6df0f6 100644 --- a/test/test_decimal.d +++ b/test/test_decimal.d @@ -212,7 +212,8 @@ if (isCpu!T) mem.write(0x8055, 0x84); } - auto cpu = makeCpu!T(mem); + auto cpu = new T(); + connectCpu(cpu, mem); setPC(cpu, 0x8000); runUntilBRK(cpu); if (mem[0x8003]) @@ -226,24 +227,24 @@ if (isCpu!T) unittest { writeln("Testing decimal mode, NMOS(Strict.no, Cumulative.no)"); - testDecimalMode!(NmosUndoc!(false, false))(); + testDecimalMode!(CPU!("6502", false, false))(); writeln("Testing decimal mode, CMOS(Strict.no, Cumulative.no)"); - testDecimalMode!(Cmos!(false, false))(); + testDecimalMode!(CPU!("65C02", false, false))(); /+ writeln("Testing decimal mode, NMOS(Strict.no, Cumulative.yes)"); - testDecimalMode!(NmosUndoc!(false, true))(); + testDecimalMode!(CPU!("6502", false, true))(); writeln("Testing decimal mode, CMOS(Strict.no, Cumulative.yes)"); - testDecimalMode!(Cmos!(false, true))(); + testDecimalMode!(CPU!("65C02", false, true))(); writeln("Testing decimal mode, NMOS(Strict.yes, Cumulative.no)"); - testDecimalMode!(NmosUndoc!(true, false))(); + testDecimalMode!(CPU!("6502", true, false))(); writeln("Testing decimal mode, CMOS(Strict.yes, Cumulative.no)"); - testDecimalMode!(Cmos!(true, false))(); + testDecimalMode!(CPU!("65C02", true, false))(); writeln("Testing decimal mode, NMOS(Strict.yes, Cumulative.yes)"); - testDecimalMode!(NmosUndoc!(true, true))(); + testDecimalMode!(CPU!("6502", true, true))(); writeln("Testing decimal mode, CMOS(Strict.yes, Cumulative.yes)"); - testDecimalMode!(Cmos!(true, true))(); + testDecimalMode!(CPU!("65C02", true, true))(); +/ }