--- M6502/Orao.pm	2007/07/31 16:33:41	64
+++ M6502/Orao.pm	2007/07/31 17:42:03	71
@@ -248,7 +248,11 @@
 	return sprintf(" %04x %s\n", $a,
 		join(" ",
 			map {
-				sprintf( "%02x", $_ )
+				if ( defined($_) ) {
+					sprintf( "%02x", $_ )
+				} else {
+					'  '
+				}
 			} @mem[ $a .. $a+8 ]
 		)
 	);
@@ -300,7 +304,8 @@
 	}
 
 	if ( $addr > 0xafff ) {
-		confess sprintf "write access 0x%04x > 0xafff aborting\n", $addr;
+		warn sprintf "write access 0x%04x > 0xafff aborting\n", $addr;
+		return;
 	}
 
 	$self->mmap_pixel( $addr, $byte, 0, 0 );
@@ -343,9 +348,12 @@
 
 =cut
 
+my $show_R = 0;
+
 sub cli {
 	my $self = shift;
 	my $a = $PC || confess "no pc?"; 
+	warn $self->dump_R() if $show_R;
 	while ( my ($line, @v) = $self->prompt( $a, $last ) ) {
 		my $c = shift @v;
 		next unless defined($c);
@@ -370,11 +378,12 @@
 d\t\tdebug [$d]
 
 __USAGE__
-			warn sprintf(" PC: %04x A:%02x P:%02x X:%02x Y:%02x S:%02x\n", $PC, $A, $P, $X, $Y, $S);
+			warn $self->dump_R;
 		} elsif ( $c =~ m/^e/i ) {
 			$a = $v if defined($v);
 			my $to = shift @v;
 			$to = $a + 32 if ( ! $to || $to <= $a );
+			$to = 0xffff if ( $to > 0xffff );
 			my $lines = int( ($to - $a + 8) / 8 );
 			printf "## e %04x %04x (%d bytes) lines: %d\n", $a, $to, ($to-$a), $lines;
 			while ( --$lines ) {
@@ -382,15 +391,19 @@
 				$a += 8;
 			}
 			$last = '+';
+			$show_R = 0;
 		} elsif ( $c =~ m/^\+/ ) {
 			$a += 8;
+			$show_R = 0;
 		} elsif ( $c =~ m/^\-/ ) {
 			$a -= 8;
+			$show_R = 0;
 		} elsif ( $c =~ m/^m/i ) {
-			$a = $v;
+			$a = $v if defined($v);
 			$self->poke_code( $a, @v );
 			printf "poke %d bytes at %04x\n", $#v + 1, $a;
 			$last = '+';
+			$show_R = 0;
 		} elsif ( $c =~ m/^l/i ) {
 			my $to = shift @v || 0x1000;
 			$a = $to;
@@ -402,6 +415,7 @@
 		} elsif ( $c =~ m/^r/i ) {
 			$run_for = $v || 1;
 			print "run_for $run_for instructions\n";
+			$show_R = 1;
 			last;
 		} elsif ( $c =~ m/^(u|j)/ ) {
 			my $to = $v || $a;
@@ -409,6 +423,7 @@
 			$PC = $to;	# remember for restart
 			$run_for = 1;
 			$last = "r $run_for";
+			$show_R = 1;
 			last;
 		} elsif ( $c =~ m/^t/ ) {
 			$self->trace( not $self->trace );