--- M6502/t/05-M6502.t	2007/08/02 12:37:06	91
+++ M6502/t/05-M6502.t	2008/04/13 11:05:29	198
@@ -6,7 +6,7 @@
 use blib;
 use lib './lib';
 
-use Test::More tests => 36;
+use Test::More tests => 164;
 use Test::Exception;
 use Data::Dump qw/dump/;
 
@@ -65,10 +65,7 @@
 	cmp_ok( M6502::_read($a), '==', $byte, 'M6502::_read' );
 }
 
-
-$mem[$_] = 0 foreach ( 0x6000 .. 0x7ffff );
-
-# invert screen in 6502 asm
+# flip bytes 6502 asm
 my $a = 0x1000;
 
 $mem[$a++] = $_ foreach (
@@ -81,18 +78,33 @@
 	0xd9, 0x60, 0x00,
 );
 
-diag dump_R();
-$PC = 0x1000;
+my @flip_tests = (
+	{ fill => 0b11101101, expect => 0b10110111, callbacks => 0x33 },
+	{ fill => 0b11101101, expect => 0b10110111, callbacks => 0x22 },
+	{ fill => 0b11110000, expect => 0b00001111, callbacks => 0x11 },
+	{ fill => 0b11110011, expect => 0b11001111, callbacks => 0x00 },
+);
 
-ok( ! M6502::exec( 1 ), 'M6502::exec(1)' );
-cmp_ok( $PC, '>', 0x1000, 'PC moved' );
+foreach my $test ( @flip_tests ) {
 
-diag dump_R();
+	diag "test ",dump( $test );
+
+	is( M6502::set_all_callbacks( $test->{callbacks} ), $test->{callbacks}, 'set_all_callbacks' );
+
+	$mem[$_] = $test->{fill} foreach ( 0x6000 .. 0x7ffff );
+
+	diag dump_R();
+	$PC = 0x1000;
 
-ok( my $left = M6502::exec( 10000 ), 'M6502::exec' );
+	ok( my $left = M6502::exec( 1 ), 'M6502::exec(1)' );
+	cmp_ok( $PC, '==', 0x1002, 'PC moved' );
+	cmp_ok( $left, '==', -1, 'no cycles left' );
 
-diag dump_R(), "cycles left: $left";
+	ok( ! M6502::exec( 1000 ), 'M6502::exec' );
+	cmp_ok( $PC, '==', 0x1016, 'PC moved' );
 
-foreach my $a ( 0x6000 .. 0x6001 ) {
-	cmp_ok( $mem[$a], '==', 0xff, sprintf('inverted %04x',$a) );
+	foreach my $a ( 0x6000 .. 0x600c ) {
+		cmp_ok( $mem[$a], '==', $test->{expect}, sprintf('flipped %04x %08b -> %08b',$a, $test->{fill}, $mem[$a]) );
+		cmp_ok( M6502::get_callback( $a ), '==', $test->{callbacks}, 'callback' );
+	}
 }