--- M6502/Orao.pm	2007/08/03 08:44:45	106
+++ M6502/Orao.pm	2007/08/03 20:04:00	115
@@ -10,7 +10,7 @@
 use Data::Dump qw/dump/;
 use M6502;
 
-use base qw(Class::Accessor M6502 Screen Prefs);
+use base qw(Class::Accessor M6502 Screen Prefs Tape);
 __PACKAGE__->mk_accessors(qw(booted));
 
 =head1 NAME
@@ -37,12 +37,12 @@
 
 Start emulator, open L<Screen>, load initial ROM images, and render memory
 
-  my $orao = Orao->new({});
-  $orao->boot;
+  my $emu = Orao->new({});
+  $emu->boot;
 
 =cut
 
-our $orao;
+our $emu;
 
 select(STDERR); $| = 1;
 
@@ -74,7 +74,7 @@
 
 	$PC = 0xff89;
 
-	$orao = $self;
+	$emu = $self;
 
 #	$self->prompt( 0x1000 );
 
@@ -82,7 +82,8 @@
 	$self->trace( 0 );
 	$self->debug( 0 );
 
-	$self->render( @mem[ 0x6000 .. 0x7fff ] );
+	warn "rendering video memory\n";
+	$self->render_vram( @mem[ 0x6000 .. 0x7fff ] );
 
 	if ( $self->show_mem ) {
 
@@ -101,11 +102,6 @@
 			0xE000, 0xFFFF, 'sistemski ROM',
 		);
 
-	} else {
-
-		warn "rendering video memory\n";
-		$self->render( @mem[ 0x6000 .. 0x7fff ] );
-	
 	}
 	$self->sync;
 	$self->trace( $trace );
@@ -127,7 +123,7 @@
 
 Run interactive emulation loop
 
-  $orao->run;
+  $emu->run;
 
 =cut
 
@@ -135,6 +131,9 @@
 	my $self = shift;
 
 	$self->boot if ( ! $self->booted );
+
+	$self->load_tape( '../oraoigre/bdash.tap' );
+
 	$self->loop;
 };
 
@@ -144,7 +143,7 @@
 
 called to init memory and load initial rom images
 
-  $orao->load_rom;
+  $emu->load_rom;
 
 =cut
 
@@ -176,10 +175,7 @@
 	$t = $end if ( $end < $t );
 
 	warn sprintf("refresh video ram %04x-%04x\n", $f, $t);
-#	foreach my $a ( $f .. $t ) {
-#		$self->vram( $a - 0x6000 , $mem[ $a ] );
-#	}
-	$self->render( @mem[ 0x6000 .. 0x7fff ] );
+	$self->render_vram( @mem[ 0x6000 .. 0x7fff ] );
 	$self->render_mem( @mem ) if $self->show_mem;
 }
 
@@ -187,7 +183,7 @@
 
 Load binary files, ROM images and Orao Emulator files
 
-  $orao->load_image( '/path/to/file', 0x1000 );
+  $emu->load_image( '/path/to/file', 0x1000 );
 
 Returns true on success.
 
@@ -242,7 +238,7 @@
 
 =head2 save_dump
 
-  $orao->save_dump( 'filename', $from, $to );
+  $emu->save_dump( 'filename', $from, $to );
 
 =cut
 
@@ -264,7 +260,7 @@
 
 =head2 hexdump
 
-  $orao->hexdump( $address );
+  $emu->hexdump( $address );
 
 =cut
 
@@ -334,6 +330,9 @@
 		} elsif ( $self->key_down( 'left shift' ) || $self->key_down( 'right shift' ) ) {
 			warn "shift\n";
 			return 16;
+#		} elsif ( $self->tape ) {
+#			warn "has tape!";
+#			return 0;
 		}
 		return $keyboard_none;
 	},
@@ -450,6 +449,10 @@
 		return $keyboard_none;
 	}
 
+	if ( $addr == 0x87ff ) {
+		return $self->read_tape;
+	}
+
 	$self->mmap_pixel( $addr, 0, $byte, 0 );
 	return $byte;
 }
@@ -467,10 +470,6 @@
 	my ($addr,$byte) = @_;
 	warn sprintf("# Orao::write(%04x,%02x)\n", $addr, $byte) if $self->trace;
 
-	if ( $addr >= 0x6000 && $addr < 0x8000 ) {
-#		$self->vram( $addr - 0x6000 , $byte );
-	}
-
 	if ( $addr == 0x8800 ) {
 		warn sprintf "sound ignored: %x\n", $byte;
 	}
@@ -492,7 +491,7 @@
 
 =head2 prompt
 
-  my ( $entered_line, @p ) = $orao->prompt( $address, $last_command );
+  my ( $entered_line, @p ) = $emu->prompt( $address, $last_command );
 
 =cut
 
@@ -515,7 +514,7 @@
 
 =head2 cli
 
-  $orao->cli();
+  $emu->cli();
 
 =cut
 
@@ -585,12 +584,15 @@
 		} elsif ( $c =~ m/^s/i ) {
 			$self->save_dump( $v || 'mem.dump', @v );
 			$last = '';
-		} elsif ( $c =~ m/^r/i ) {
+		} elsif ( $c =~ m/^re/i ) { # reset
+			M6502::reset();
+			$last = 'r 1';
+		} elsif ( $c =~ m/^r/i ) {	# run
 			$run_for = $v || 1;
 			print "run_for $run_for instructions\n";
 			$show_R = 1;
 			last;
-		} elsif ( $c =~ m/^(u|j)/ ) {
+		} elsif ( $c =~ m/^(u|j)/i ) {
 			my $to = $v || $a;
 			printf "set pc to %04x\n", $to;
 			$PC = $to;	# remember for restart
@@ -598,11 +600,23 @@
 			$last = "r $run_for";
 			$show_R = 1;
 			last;
-		} elsif ( $c =~ m/^t/ ) {
+		} elsif ( $c =~ m/^tape/ ) {
+			if ( $c =~ m/rate/ ) {
+				$self->tape_rate( $v );
+				warn "will read table with rate $v\n";
+			} elsif ( ! $v ) {
+				warn "ERROR: please specify tape name!\n";
+			} elsif ( ! -e $v ) {
+				warn "ERROR: tape $v: $!\n";
+			} else {
+				$self->load_tape( $v );
+			}
+			$last = '';
+		} elsif ( $c =~ m/^t/i ) {
 			$self->trace( not $self->trace );
 			print "trace ", $self->trace ? 'on' : 'off', "\n";
 			$last = '';
-		} elsif ( $c =~ m/^d/ ) {
+		} elsif ( $c =~ m/^d/i ) {
 			$self->debug( not $self->debug );
 			print "debug ", $self->debug ? 'on' : 'off', "\n";
 			$last = '';