--- M6502/Orao.pm	2007/08/01 13:52:39	78
+++ M6502/Orao.pm	2007/08/02 13:04:29	94
@@ -20,11 +20,11 @@
 
 =head1 VERSION
 
-Version 0.02
+Version 0.03
 
 =cut
 
-our $VERSION = '0.02';
+our $VERSION = '0.03';
 
 =head1 SUMMARY
 
@@ -39,23 +39,31 @@
     0x83FE,0x83FF,
 );
 
-=head2 init
+=head2 boot
 
 Start emulator, open L<Screen>, load initial ROM images, and render memory
 
+  my $orao = Orao->new({});
+  $orao->boot;
+
 =cut
 
 our $orao;
 
 select(STDERR); $| = 1;
 
-sub init {
+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',
@@ -109,11 +117,13 @@
 
 	#( $A, $P, $X, $Y, $S, $IPeriod ) = ( 1, 2, 3, 4, 5, 6 );
 
-	warn "Orao init finished",
+	warn "Orao boot finished",
 		$self->trace ? ' trace' : '',
 		$self->debug ? ' debug' : '',
 		"\n";
 
+	M6502::reset();
+
 }
 
 =head2 load_rom
@@ -131,7 +141,7 @@
 
 	foreach my $addr ( sort keys %$loaded_files ) {
 		my $path = $loaded_files->{$addr};
-		$self->load_oraoemu( $path, $addr );
+		$self->load_image( $path, $addr );
 	}
 }
 
@@ -159,17 +169,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 ) = @_;
 
@@ -279,6 +289,7 @@
 	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
@@ -358,8 +369,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 );
@@ -461,7 +471,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 );