--- M6502/Orao.pm	2007/07/31 16:06:27	59
+++ M6502/Orao.pm	2007/07/31 17:42:03	71
@@ -135,11 +135,7 @@
 	}
 }
 
-
-=head2 load_oraoemu
-
-=cut
-
+# write chunk directly into memory, updateing vram if needed
 sub _write_chunk {
 	my $self = shift;
 	my ( $addr, $chunk ) = @_;
@@ -161,10 +157,25 @@
 	}
 }
 
+=head2 load_oraoemu
+
+Load binary files, ROM images and Orao Emulator files
+
+  $orao->load_oraoemu( '/path/to/file', 0x1000 );
+
+Returns true on success.
+
+=cut
+
 sub load_oraoemu {
 	my $self = shift;
 	my ( $path, $addr ) = @_;
 
+	if ( ! -e $path ) {
+		warn "ERROR: file $path doesn't exist\n";
+		return;
+	}
+
 	my $size = -s $path || confess "no size for $path: $!";
 
 	my $buff = read_file( $path );
@@ -173,15 +184,16 @@
 		$addr = 0;
 		warn sprintf "loading oraoemu 64k dump %s at %04x - %04x %02x\n", $path, $addr, $addr+$size-1, $size;
 		$self->_write_chunk( $addr, substr($buff,2) );
-		return;
+		return 1;
 	} elsif ( $size == 32800 ) {
 		$addr = 0;
 		warn sprintf "loading oraoemu 1.3 dump %s at %04x - %04x %02x\n", $path, $addr, $addr+$size-1, $size;
 		$self->_write_chunk( $addr, substr($buff,0x20) );
-		return;
+		return 1;
 	}
 	printf "loading %s at %04x - %04x %02x\n", $path, $addr, $addr+$size-1, $size;
-	return $self->_write_chunk( $addr, $buff );
+	$self->_write_chunk( $addr, $buff );
+	return 1;
 
 	my $chunk;
 
@@ -199,6 +211,7 @@
 
 	$self->_write_chunk( $addr, $chunk );
 
+	return 1;
 };
 
 =head2 save_dump
@@ -235,7 +248,11 @@
 	return sprintf(" %04x %s\n", $a,
 		join(" ",
 			map {
-				sprintf( "%02x", $_ )
+				if ( defined($_) ) {
+					sprintf( "%02x", $_ )
+				} else {
+					'  '
+				}
 			} @mem[ $a .. $a+8 ]
 		)
 	);
@@ -287,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 );
@@ -303,7 +321,7 @@
 
 =head2 prompt
 
-  $orao->prompt( $address, $last_command );
+  my ( $entered_line, @p ) = $orao->prompt( $address, $last_command );
 
 =cut
 
@@ -321,7 +339,7 @@
 	warn "## prompt got: $in\n" if $self->debug;
 	$in ||= $last;
 	$last = $in;
-	return split(/\s+/, $in) if $in;
+	return ( $in, split(/\s+/, $in) ) if $in;
 }
 
 =head2 cli
@@ -330,11 +348,15 @@
 
 =cut
 
+my $show_R = 0;
+
 sub cli {
 	my $self = shift;
 	my $a = $PC || confess "no pc?"; 
-	while ( my @v = $self->prompt( $a, $last ) ) {
+	warn $self->dump_R() if $show_R;
+	while ( my ($line, @v) = $self->prompt( $a, $last ) ) {
 		my $c = shift @v;
+		next unless defined($c);
 		my $v = shift @v;
 		$v = hex($v) if $v && $v =~ m/^[0-9a-f]+$/;
 		@v = map { hex($_) } @v;
@@ -356,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 ) {
@@ -368,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;
@@ -388,27 +415,30 @@
 		} 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;
 			printf "set pc to %04x\n", $to;
 			$PC = $to;	# remember for restart
 			$run_for = 1;
-			$last = sprintf('m %04x', $to);
+			$last = "r $run_for";
+			$show_R = 1;
 			last;
 		} elsif ( $c =~ m/^t/ ) {
 			$self->trace( not $self->trace );
 			print "trace ", $self->trace ? 'on' : 'off', "\n";
+			$last = '';
 		} elsif ( $c =~ m/^d/ ) {
 			$self->debug( not $self->debug );
 			print "debug ", $self->debug ? 'on' : 'off', "\n";
+			$last = '';
 		} else {
-			warn "# ignore $c\n";
-			last;
+			warn "# ignored $line\n" if ($line);
+			$last = '';
 		}
 	}
 
-
 }
 
 =head1 AUTHOR