--- M6502/Orao.pm	2007/07/30 21:00:36	33
+++ M6502/Orao.pm	2007/07/31 09:43:21	43
@@ -8,6 +8,7 @@
 #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));
@@ -38,11 +39,11 @@
 
 our $orao;
 
-our $PC = 0x1000;
+select(STDERR); $| = 1;
 
 sub init {
 	my $self = shift;
-	warn "call upstream init\n";
+	warn "Orao calling upstream init\n";
 	$self->SUPER::init( $self, @_ );
 
 	warn "staring Orao $Orao::VERSION emulation\n";
@@ -54,32 +55,60 @@
 		0xE000 => 'rom/CRT12.ROM',
 	});
 
+	$self->load_oraoemu( 'dump/orao-1.2' );
+	$self->load_oraoemu( 'dump/SCRINV.BIN', 0x1000 );
+	$PC = 0x1000;
+
 	$orao = $self;
 
 #	$self->prompt( 0x1000 );
 
-	warn "rendering memory map\n";
+	my $trace = $self->trace;
+	$self->trace( 0 );
 
-	my @mmap = (
-		0x0000, 0x03FF, 'nulti blok',
-		0x0400, 0x5FFF, 'korisnički RAM (23K)',
-		0x6000, 0x7FFF, 'video RAM',
-		0x8000, 0x9FFF, 'sistemske lokacije',
-		0xA000, 0xAFFF, 'ekstenzija',
-		0xB000, 0xBFFF, 'DOS',
-		0xC000, 0xDFFF, 'BASIC ROM',
-		0xE000, 0xFFFF, 'sistemski ROM',
-	);
+	if ( $self->show_mem ) {
+
+		warn "rendering memory map\n";
 
-	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 ) {
-#			$orao->read( $a );
-#		}
-#		$self->sync;
+		my @mmap = (
+			0x0000, 0x03FF, 'nulti blok',
+			0x0400, 0x5FFF, 'korisnički RAM (23K)',
+			0x6000, 0x7FFF, 'video RAM',
+			0x8000, 0x9FFF, 'sistemske lokacije',
+			0xA000, 0xAFFF, 'ekstenzija',
+			0xB000, 0xBFFF, 'DOS',
+			0xC000, 0xDFFF, 'BASIC ROM',
+			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 );
+
+	#( $A, $P, $X, $Y, $S, $IPeriod ) = ( 1, 2, 3, 4, 5, 6 );
+
+	warn "Orao init finished", $self->trace ? ' trace on' : '', "\n";
 
 }
 
@@ -123,8 +152,7 @@
 	} elsif ( $size == 32800 ) {
 		$addr = 0;
 		warn sprintf "loading oraoemu 1.3 dump %s at %04x - %04x %02x\n", $path, $addr, $addr+$size-1, $size;
-		#$self->write_chunk( $addr, substr($buff,0x20) );
-		$self->poke_code( $addr, map { ord($_) } split(//,substr($buff,0x20)) );
+		$self->write_chunk( $addr, substr($buff,0x20) );
 		return;
 	}
 	printf "loading %s at %04x - %04x %02x\n", $path, $addr, $addr+$size-1, $size;
@@ -196,6 +224,7 @@
 
 sub prompt {
 	my $self = shift;
+	$self->app->sync;
 	my $a = shift;
 	my $last = shift;
 	print STDERR $self->hexdump( $a ),
@@ -215,8 +244,6 @@
 
 =cut
 
-my @mem = (0xff) x 0x100000; # 64Mb
-
 =head2 read
 
 Read from memory
@@ -229,7 +256,7 @@
 	my $self = shift;
 	my ($addr) = @_;
 	my $byte = $mem[$addr];
-	warn "# Orao::read(",dump(@_),") = ",dump( $byte ),"\n" if $self->debug;
+	warn sprintf("# Orao::read(%04x) = %02x\n", $addr, $byte) if $self->trace;
 	$self->mmap_pixel( $addr, 0, $byte, 0 );
 	return $byte;
 }
@@ -244,8 +271,8 @@
 
 sub write {
 	my $self = shift;
-	warn "# Orao::write(",dump(@_),")\n" if $self->debug;
 	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 );
@@ -262,8 +289,89 @@
 	$self->mmap_pixel( $addr, $byte, 0, 0 );
 
 	$mem[$addr] = $byte;
+	return;
 }
 
+=head1 Command Line
+
+Command-line debugging intrerface is implemented for communication with
+emulated device
+
+=head2 cli
+
+  $orao->cli();
+
+=cut
+
+my $last = 'r 1';
+
+sub cli {
+	my $self = shift;
+	my $a = $PC || confess "no pc?"; 
+	while ( my @v = $self->prompt( $a, $last ) ) {
+		my $c = shift @v;
+		my $v = shift @v;
+		$v = hex($v) if $v && $v =~ m/^[0-9a-f]+$/;
+		printf "## [%s] %s\n", ($v || 'undef'), join(",",@v) if $self->debug;
+		@v = map { hex($_) } @v;
+		if ( $c =~ m/^[qx]/i ) {
+			exit;
+		} elsif ( $c eq '?' ) {
+			warn <<__USAGE__;
+uage:
+x|q\t\texit
+e 6000 6010\tdump memory, +/- to walk forward/backward
+m 1000 ff 00\tput ff 00 on 1000
+j|u 1000\t\tjump (change pc)
+r 42\t\trun 42 instruction opcodes
+__USAGE__
+		} elsif ( $c =~ m/^e/i ) {
+			$a ||= $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 ) {
+				print $self->hexdump( $a );
+				$a += 8;
+				$lines--;
+			}
+			$last = '+';
+		} elsif ( $c =~ m/^\+/ ) {
+			$a += 8;
+		} elsif ( $c =~ m/^\-/ ) {
+			$a -= 8;
+		} elsif ( $c =~ m/^m/i ) {
+			$a = $v;
+			$self->poke_code( $a, @v );
+			printf "poke %d bytes at %04x\n", $#v + 1, $a;
+		} elsif ( $c =~ m/^l/i ) {
+			my $to = shift @v || 0x1000;
+			$a = $to;
+			$self->load_oraoemu( $v, $a );
+		} elsif ( $c =~ m/^s/i ) {
+			$self->save_dump( $v || 'mem.dump', @v );
+		} elsif ( $c =~ m/^r/i ) {
+			$run_for = $v || 1;
+			print "run_for $run_for instructions\n";
+			last;
+		} elsif ( $c =~ m/^(u|j)/ ) {
+			my $to = $v || $a;
+			printf "set pc to %04x\n", $to;
+			$PC = $to;	# remember for restart
+			$run_for = 1;
+			last;
+		} elsif ( $c =~ m/^t/ ) {
+			$self->trace( not $self->trace );
+			print "trace ", $self->trace ? 'on' : 'off', "\n";
+		} else {
+			warn "# ignore $c\n";
+			last;
+		}
+	}
+
+
+}
 
 =head1 AUTHOR