--- M6502/Orao.pm	2007/07/31 17:15:54	68
+++ 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 ]
 		)
 	);
@@ -379,6 +383,7 @@
 			$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 ) {
@@ -394,7 +399,7 @@
 			$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 = '+';