--- M6502/Orao.pm	2007/07/30 21:34:30	34
+++ M6502/Orao.pm	2007/07/30 23:39:57	39
@@ -39,8 +39,6 @@
 
 our $orao;
 
-our $PC = 0x1000;
-
 sub init {
 	my $self = shift;
 	warn "Orao calling upstream init\n";
@@ -55,34 +53,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 );
+		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 );
+				}
+			}
 		}
-		$self->sync;
+
+	} 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\n";
+	warn "Orao init finished", $self->trace ? ' trace on' : '', "\n";
 
 }
 
@@ -231,7 +255,7 @@
 	my $self = shift;
 	my ($addr) = @_;
 	my $byte = $mem[$addr];
-	warn "# Orao::read(",dump(@_),") = ",dump( $byte ),"\n" if $self->debug;
+	warn "# Orao::read(",dump(@_),") = ",dump( $byte ),"\n" if $self->trace;
 	$self->mmap_pixel( $addr, 0, $byte, 0 );
 	return $byte;
 }
@@ -246,7 +270,7 @@
 
 sub write {
 	my $self = shift;
-	warn "# Orao::write(",dump(@_),")\n" if $self->debug;
+	warn "# Orao::write(",dump(@_),")\n" if $self->trace;
 	my ($addr,$byte) = @_;
 
 	if ( $addr >= 0x6000 && $addr < 0x8000 ) {
@@ -264,6 +288,7 @@
 	$self->mmap_pixel( $addr, $byte, 0, 0 );
 
 	$mem[$addr] = $byte;
+	return;
 }