--- M6502/Orao.pm	2007/07/31 11:14:19	50
+++ M6502/Orao.pm	2007/07/31 16:06:27	59
@@ -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 "staring Orao $Orao::VERSION emulation\n";
+	warn "Orao $Orao::VERSION emulation starting\n";
 
 	$self->open_screen;
 	$self->load_rom({
@@ -282,14 +282,14 @@
 		$self->vram( $addr - 0x6000 , $byte );
 	}
 
-	if ( $addr > 0xafff ) {
-		warn sprintf "access to %04x above affff aborting\n", $addr;
-		return -1;
-	}
 	if ( $addr == 0x8800 ) {
 		warn sprintf "sound ignored: %x\n", $byte;
 	}
 
+	if ( $addr > 0xafff ) {
+		confess sprintf "write access 0x%04x > 0xafff aborting\n", $addr;
+	}
+
 	$self->mmap_pixel( $addr, $byte, 0, 0 );
 
 	$mem[$addr] = $byte;
@@ -361,12 +361,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/^\+/ ) {