--- M6502/Orao.pm	2007/08/02 11:08:10	87
+++ M6502/Orao.pm	2007/08/02 14:07:52	97
@@ -12,7 +12,7 @@
 use M6502;
 
 use base qw(Class::Accessor M6502 Screen Prefs);
-__PACKAGE__->mk_accessors(qw(run_for));
+__PACKAGE__->mk_accessors(qw(booted));
 
 =head1 NAME
 
@@ -20,11 +20,11 @@
 
 =head1 VERSION
 
-Version 0.02
+Version 0.04
 
 =cut
 
-our $VERSION = '0.02';
+our $VERSION = '0.04';
 
 =head1 SUMMARY
 
@@ -39,6 +39,8 @@
     0x83FE,0x83FF,
 );
 
+=head1 FUNCTIONS
+
 =head2 boot
 
 Start emulator, open L<Screen>, load initial ROM images, and render memory
@@ -55,10 +57,15 @@
 sub boot {
 	my $self = shift;
 	warn "Orao calling upstream init\n";
-	$self->SUPER::init( $self, @_ );
+	$self->SUPER::init(
+		read => sub { $self->read( @_ ) },
+		write => sub { $self->write( @_ ) },
+	);
 
 	warn "Orao $Orao::VERSION emulation starting\n";
 
+	warn "emulating ", $#mem, " bytes of memory\n";
+
 	$self->open_screen;
 	$self->load_rom({
 		0x1000 => 'dump/SCRINV.BIN',
@@ -119,8 +126,28 @@
 
 	M6502::reset();
 
+	$self->booted( 1 );
 }
 
+=head2 run
+
+Run interactive emulation loop
+
+  $orao->run;
+
+=cut
+
+sub run {
+	my $self = shift;
+
+	$self->show_mem( 1 );
+
+	$self->boot if ( ! $self->booted );
+	$self->loop;
+};
+
+=head1 Helper functions
+
 =head2 load_rom
 
 called to init memory and load initial rom images
@@ -136,7 +163,7 @@
 
 	foreach my $addr ( sort keys %$loaded_files ) {
 		my $path = $loaded_files->{$addr};
-		$self->load_oraoemu( $path, $addr );
+		$self->load_image( $path, $addr );
 	}
 }
 
@@ -164,17 +191,17 @@
 	$self->render_mem( @mem ) if $self->show_mem;
 }
 
-=head2 load_oraoemu
+=head2 load_image
 
 Load binary files, ROM images and Orao Emulator files
 
-  $orao->load_oraoemu( '/path/to/file', 0x1000 );
+  $orao->load_image( '/path/to/file', 0x1000 );
 
 Returns true on success.
 
 =cut
 
-sub load_oraoemu {
+sub load_image {
 	my $self = shift;
 	my ( $path, $addr ) = @_;
 
@@ -284,12 +311,13 @@
 	my $self = shift;
 	my ($addr) = @_;
 	my $byte = $mem[$addr];
+	confess sprintf("can't find memory at address %04x",$addr) unless defined($byte);
 	warn sprintf("# Orao::read(%04x) = %02x\n", $addr, $byte) if $self->trace;
 
 	# keyboard
 
 	if ( first { $addr == $_ } @kbd_ports ) {
-		warn sprintf("keyboard port: %04x\n",$addr);
+		warn sprintf("keyboard port: %04x\n",$addr) if $self->trace;
 	} elsif ( $addr == 0x87fc ) {
 		warn "0x87fc - arrows/back\n";
 =for pascal
@@ -363,8 +391,7 @@
 	}
 
 	if ( $addr > 0xafff ) {
-		warn sprintf "write access 0x%04x > 0xafff aborting\n", $addr;
-		return;
+		confess sprintf "write access 0x%04x > 0xafff aborting\n", $addr;
 	}
 
 	$self->mmap_pixel( $addr, $byte, 0, 0 );
@@ -390,7 +417,7 @@
 	my $self = shift;
 	$self->app->sync;
 	my $a = shift;
-	print STDERR $self->hexdump( $a ),
+	print $self->hexdump( $a ),
 		$last ? "[$last] " : '',
 		"> ";
 	my $in = <STDIN>;
@@ -412,6 +439,7 @@
 sub cli {
 	my $self = shift;
 	my $a = $PC || confess "no pc?"; 
+	my $run_for = 0;
 	warn $self->dump_R() if $show_R;
 	while ( my ($line, @v) = $self->prompt( $a, $last ) ) {
 		my $c = shift @v;
@@ -438,6 +466,7 @@
 
 __USAGE__
 			warn $self->dump_R;
+			$last = '';
 		} elsif ( $c =~ m/^e/i ) {
 			$a = $v if defined($v);
 			my $to = shift @v;
@@ -466,7 +495,7 @@
 		} elsif ( $c =~ m/^l/i ) {
 			my $to = shift @v || 0x1000;
 			$a = $to;
-			$self->load_oraoemu( $v, $a );
+			$self->load_image( $v, $a );
 			$last = '';
 		} elsif ( $c =~ m/^s/i ) {
 			$self->save_dump( $v || 'mem.dump', @v );
@@ -498,6 +527,7 @@
 		}
 	}
 
+	return $run_for;
 }
 
 =head1 AUTHOR