--- M6502/Orao.pm	2007/07/31 17:34:52	70
+++ M6502/Orao.pm	2007/08/03 10:29:33	109
@@ -10,8 +10,8 @@
 use Data::Dump qw/dump/;
 use M6502;
 
-use base qw(Class::Accessor M6502 Screen Prefs);
-__PACKAGE__->mk_accessors(qw(run_for));
+use base qw(Class::Accessor M6502 Screen Prefs Tape);
+__PACKAGE__->mk_accessors(qw(booted));
 
 =head1 NAME
 
@@ -19,11 +19,11 @@
 
 =head1 VERSION
 
-Version 0.02
+Version 0.04
 
 =cut
 
-our $VERSION = '0.02';
+our $VERSION = '0.04';
 
 =head1 SUMMARY
 
@@ -31,33 +31,49 @@
 
 =cut
 
-=head2 init
+=head1 FUNCTIONS
+
+=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',
-		0xC000 => 'rom/BAS12.ROM',
-		0xE000 => 'rom/CRT12.ROM',
+		# should be 0x6000, but oraoemu has 2 byte prefix
+		0x5FFE => 'dump/screen.dmp',
+#		0xC000 => 'rom/BAS12.ROM',
+#		0xE000 => 'rom/CRT12.ROM',
+		0xC000 => 'rom/BAS13.ROM',
+		0xE000 => 'rom/CRT13.ROM',
 	});
 
-	$PC = 0xDD11;	# BC
+#	$PC = 0xDD11;	# BC
 #	$PC = 0xC274;	# MC
 
+	$PC = 0xff89;
+
 	$orao = $self;
 
 #	$self->prompt( 0x1000 );
@@ -66,10 +82,15 @@
 	$self->trace( 0 );
 	$self->debug( 0 );
 
+	warn "rendering video memory\n";
+	$self->render_vram( @mem[ 0x6000 .. 0x7fff ] );
+
 	if ( $self->show_mem ) {
 
 		warn "rendering memory map\n";
 
+		$self->render_mem( @mem );
+
 		my @mmap = (
 			0x0000, 0x03FF, 'nulti blok',
 			0x0400, 0x5FFF, 'korisnički RAM (23K)',
@@ -81,27 +102,6 @@
 			0xE000, 0xFFFF, 'sistemski ROM',
 		);
 
-		foreach my $i ( 0 .. $#mmap / 3 ) {
-			my $o = $i * 3;
-			my ( $from, $to, $desc ) = @mmap[$o,$o+1,$o+2];
-			printf "%04x - %04x - %s\n", $from, $to, $desc;
-			for my $a ( $from .. $to ) {
-				if ( $a >= 0x6000 && $a < 0x8000 ) {
-					my $b = $self->read( $a );
-					$self->vram( $a - 0x6000, $b );
-				} else {
-					$self->read( $a );
-				}
-			}
-		}
-
-	} else {
-
-		warn "rendering video memory\n";
-		for my $a ( 0x6000 .. 0x7fff ) {
-			$self->vram( $a - 0x6000, $mem[$a] );
-		}
-	
 	}
 	$self->sync;
 	$self->trace( $trace );
@@ -109,13 +109,33 @@
 
 	#( $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();
+
+	$self->booted( 1 );
 }
 
+=head2 run
+
+Run interactive emulation loop
+
+  $orao->run;
+
+=cut
+
+sub run {
+	my $self = shift;
+
+	$self->boot if ( ! $self->booted );
+	$self->loop;
+};
+
+=head1 Helper functions
+
 =head2 load_rom
 
 called to init memory and load initial rom images
@@ -131,7 +151,7 @@
 
 	foreach my $addr ( sort keys %$loaded_files ) {
 		my $path = $loaded_files->{$addr};
-		$self->load_oraoemu( $path, $addr );
+		$self->load_image( $path, $addr );
 	}
 }
 
@@ -152,22 +172,21 @@
 	$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_vram( @mem[ 0x6000 .. 0x7fff ] );
+	$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 ) = @_;
 
@@ -248,7 +267,11 @@
 	return sprintf(" %04x %s\n", $a,
 		join(" ",
 			map {
-				sprintf( "%02x", $_ )
+				if ( defined($_) ) {
+					sprintf( "%02x", $_ )
+				} else {
+					'  '
+				}
 			} @mem[ $a .. $a+8 ]
 		)
 	);
@@ -269,11 +292,161 @@
 
 =cut
 
+my $keyboard_none = 255;
+
+my $keyboard = {
+	0x87FC => {
+		'right'		=> 16,
+		'down'		=> 128,
+		'up'		=> 192,
+		'left'		=> 224,
+		'backspace' => 224,
+	},
+	0x87FD => sub {
+		my ( $self, $key ) = @_;
+		if ( $key eq 'return' ) {
+			M6502::_write( 0xfc, 13 );
+			warn "return\n";
+			return 0;
+		} elsif ( $key =~ m/ ctrl/ || $self->key_down( 'left ctrl' ) || $self->key_down( 'right ctrl' ) ) {
+			warn "ctrl\n";
+			return 16;
+		}
+		return $keyboard_none;
+	},
+	0x87FA => {
+		'f4' => 16,
+		'f3' => 128,
+		'f2' => 192,
+		'f1' => 224,
+	},
+	0x87FB => sub {
+		my ( $self, $key ) = @_;
+		if ( $key eq 'space' ) {
+			return 32;
+		} elsif ( $self->key_down( 'left shift' ) || $self->key_down( 'right shift' ) ) {
+			warn "shift\n";
+			return 16;
+		}
+		return $keyboard_none;
+	},
+	0x87F6 => {
+		'6' => 16,
+		't' => 128,
+		'y' => 192,	# hr: z
+		'r' => 224,
+	},
+	0x87F7 => {
+		'5' => 32,
+		'4' => 16,
+	},
+	0x87EE => {
+		'7' => 16,
+		'u' => 128,
+		'i' => 192,
+		'o' => 224,
+	},
+	0x87EF => {
+		'8' => 32,
+		'9' => 16,
+	},
+	0x87DE => {
+		'1' => 16,
+		'w' => 128,
+		'q' => 192,
+		'e' => 224,
+	},
+	0x87DF => {
+		'2' => 32,
+		'3' => 16,
+	},
+	0x87BE => {
+		'm' => 16,
+		'k' => 128,
+		'j' => 192,
+		'l' => 224,
+	},
+	0x87BF => {
+		',' => 32,	# <
+		'.' => 16,	# >
+	},
+	0x877E => {
+		'z' => 16,	# hr:y
+		's' => 128,
+		'a' => 192,
+		'd' => 224,
+	},
+	0x877F => {
+		'x' => 32,
+		'c' => 16,
+	},
+	0x86FE => {
+		'n' => 16,
+		'g' => 128,
+		'h' => 192,
+		'f' => 224,
+	},
+	0x86FF => {
+		'b' => 32,
+		'v' => 16,
+	},
+	0x85FE => {
+		'<' => 16,		# :
+		'\\' => 128,	# ¾
+		'\'' => 192,	# ę
+		';' => 224,		# č
+	},
+	0x85FF => {
+		'/' => 32,
+		'f11' => 16,	# ^
+	},
+	0x83FE => {
+		'f12' => 16,	# ;
+		'[' => 128,		# ¹
+		']' => 192,		# š
+		'p' => 224,
+	},
+	0x83FF => {
+		'-' => 32,
+		'0' => 16,
+	},
+};
+
 sub read {
 	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 ( defined( $keyboard->{$addr} ) ) {
+		warn sprintf("keyboard port: %04x\n",$addr) if $self->trace;
+		my $key = $self->key_pressed;
+		if ( defined($key) ) {
+			my $ret = $keyboard_none;
+			my $r = $keyboard->{$addr} || confess "no definition for keyboard port found";
+			if ( ref($r) eq 'CODE' ) {
+				$ret = $r->($self, $key);
+			} elsif ( defined($r->{$key}) ) {
+				$ret = $r->{$key};
+				if ( ref($ret) eq 'CODE' ) {
+					$ret = $ret->($self);
+				}
+			} else {
+				warn sprintf("keyboard port: %04x unknown key: '%s'\n", $addr, $key) if $debug;
+			}
+			warn sprintf("keyboard port: %04x key:%s code:%d\n",$addr,$key,$ret) if ( $ret != $keyboard_none );
+			return $ret;
+		}
+		return $keyboard_none;
+	}
+
+	if ( $addr == 0x87ff ) {
+		return $self->read_tape;
+	}
+
 	$self->mmap_pixel( $addr, 0, $byte, 0 );
 	return $byte;
 }
@@ -291,17 +464,12 @@
 	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;
 	}
 
 	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 );
@@ -327,7 +495,7 @@
 	my $self = shift;
 	$self->app->sync;
 	my $a = shift;
-	print STDERR $self->hexdump( $a ),
+	print $self->hexdump( $a ),
 		$last ? "[$last] " : '',
 		"> ";
 	my $in = <STDIN>;
@@ -349,6 +517,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;
@@ -375,10 +544,12 @@
 
 __USAGE__
 			warn $self->dump_R;
+			$last = '';
 		} elsif ( $c =~ m/^e/i ) {
 			$a = $v if defined($v);
 			my $to = shift @v;
 			$to = $a + 32 if ( ! $to || $to <= $a );
+			$to = 0xffff if ( $to > 0xffff );
 			my $lines = int( ($to - $a + 8) / 8 );
 			printf "## e %04x %04x (%d bytes) lines: %d\n", $a, $to, ($to-$a), $lines;
 			while ( --$lines ) {
@@ -402,7 +573,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 );
@@ -412,7 +583,7 @@
 			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
@@ -420,11 +591,20 @@
 			$last = "r $run_for";
 			$show_R = 1;
 			last;
-		} elsif ( $c =~ m/^t/ ) {
+		} elsif ( $c =~ m/^tape/ ) {
+			if ( ! $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 = '';
@@ -434,6 +614,7 @@
 		}
 	}
 
+	return $run_for;
 }
 
 =head1 AUTHOR