--- M6502/Orao.pm	2007/07/31 12:57:35	52
+++ M6502/Orao.pm	2007/07/31 16:22:10	61
@@ -3,15 +3,15 @@
 use warnings;
 use strict;
 
-use Carp;
+use Carp qw/confess/;
 use lib './lib';
 #use Time::HiRes qw(time);
 use File::Slurp;
 use Data::Dump qw/dump/;
 use M6502;
 
-use base qw(Class::Accessor M6502 Screen);
-__PACKAGE__->mk_accessors(qw(debug trace run_for mem_dump trace));
+use base qw(Class::Accessor M6502 Screen Prefs);
+__PACKAGE__->mk_accessors(qw(run_for));
 
 =head1 NAME
 
@@ -33,7 +33,7 @@
 
 =head2 init
 
-Start emulator
+Start emulator, open L<Screen>, load initial ROM images, and render memory
 
 =cut
 
@@ -46,7 +46,7 @@
 	warn "Orao calling upstream init\n";
 	$self->SUPER::init( $self, @_ );
 
-	warn "Orao $Orao::VERSION emulation starting\n", dump( $self );
+	warn "Orao $Orao::VERSION emulation starting\n";
 
 	$self->open_screen;
 	$self->load_rom({
@@ -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
@@ -287,7 +300,7 @@
 	}
 
 	if ( $addr > 0xafff ) {
-		confess sprintf "write access %04x > afff aborting\n", $self, $addr;
+		confess sprintf "write access 0x%04x > 0xafff aborting\n", $addr;
 	}
 
 	$self->mmap_pixel( $addr, $byte, 0, 0 );
@@ -303,7 +316,7 @@
 
 =head2 prompt
 
-  $orao->prompt( $address, $last_command );
+  my ( $entered_line, @p ) = $orao->prompt( $address, $last_command );
 
 =cut
 
@@ -321,7 +334,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
@@ -333,8 +346,9 @@
 sub cli {
 	my $self = shift;
 	my $a = $PC || confess "no pc?"; 
-	while ( my @v = $self->prompt( $a, $last ) ) {
+	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;
@@ -361,12 +375,11 @@
 			$a = $v if defined($v);
 			my $to = shift @v;
 			$to = $a + 32 if ( ! $to || $to <= $a );
-			my $lines = int( ($to - $a - 8) / 8 );
-			printf "## m %04x %04x lines: %d\n", $a, $to, $lines;
-			while ( $lines ) {
+			my $lines = int( ($to - $a + 8) / 8 );
+			printf "## e %04x %04x (%d bytes) lines: %d\n", $a, $to, ($to-$a), $lines;
+			while ( --$lines ) {
 				print $self->hexdump( $a );
 				$a += 8;
-				$lines--;
 			}
 			$last = '+';
 		} elsif ( $c =~ m/^\+/ ) {
@@ -404,12 +417,11 @@
 			$self->debug( not $self->debug );
 			print "debug ", $self->debug ? 'on' : 'off', "\n";
 		} else {
-			warn "# ignore $c\n";
-			last;
+			warn "# ignored $line\n" if ($line);
+			$last = '';
 		}
 	}
 
-
 }
 
 =head1 AUTHOR