--- M6502/Orao.pm	2007/07/30 18:37:37	32
+++ M6502/Orao.pm	2007/07/31 08:49:22	41
@@ -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));
@@ -40,23 +41,74 @@
 
 sub init {
 	my $self = shift;
-	warn "call upstream init\n";
-	$self->SUPER::init( @_ );
+	warn "Orao calling upstream init\n";
+	$self->SUPER::init( $self, @_ );
 
 	warn "staring Orao $Orao::VERSION emulation\n";
 
 	$self->open_screen;
-	$self->load_rom;
+	$self->load_rom({
+		0x1000 => 'dump/SCRINV.BIN',
+		0xC000 => 'rom/BAS12.ROM',
+		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 );
-}
+#	$self->prompt( 0x1000 );
 
-my $loaded_files = {
-	0xC000 => 'rom/BAS12.ROM',
-	0xE000 => 'rom/CRT12.ROM',
-};
+	my $trace = $self->trace;
+	$self->trace( 0 );
+
+	if ( $self->show_mem ) {
+
+		warn "rendering memory map\n";
+
+		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";
+
+}
 
 =head2 load_rom
 
@@ -67,13 +119,12 @@
 =cut
 
 sub load_rom {
-    my ($self) = @_;
+    my ($self, $loaded_files) = @_;
 
     #my $time_base = time();
 
 	foreach my $addr ( sort keys %$loaded_files ) {
 		my $path = $loaded_files->{$addr};
-		warn sprintf "loading '%s' at %04x\n", $path, $addr;
 		$self->load_oraoemu( $path, $addr );
 	}
 }
@@ -93,17 +144,18 @@
 
 	if ( $size == 65538 ) {
 		$addr = 0;
-		warn sprintf "loading oraoemu 64k dump %s at %04x - %04x %02x\n", $path, $addr, $addr+$size, $size;
+		warn sprintf "loading oraoemu 64k dump %s at %04x - %04x %02x\n", $path, $addr, $addr+$size-1, $size;
 		$self->write_chunk( $addr, substr($buff,2) );
 		return;
 	} elsif ( $size == 32800 ) {
 		$addr = 0;
-		warn sprintf "loading oraoemu 1.3 dump %s at %04x - %04x %02x\n", $path, $addr, $addr+$size, $size;
+		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)) );
 		return;
 	}
-	printf "loading %s at %04x - %04x %02x\n", $path, $addr, $addr+$size, $size;
+	printf "loading %s at %04x - %04x %02x\n", $path, $addr, $addr+$size-1, $size;
+	return $self->poke_code( $addr, map { ord($_) } split(//,$buff) );
 	return $self->write_chunk( $addr, $buff );
 
 	my $chunk;
@@ -191,8 +243,6 @@
 
 =cut
 
-my @mem = (0xff) x 0x100000; # 64Mb
-
 =head2 read
 
 Read from memory
@@ -202,11 +252,11 @@
 =cut
 
 sub read {
-	my $self = $orao;
+	my $self = shift;
 	my ($addr) = @_;
 	my $byte = $mem[$addr];
-	warn "# Orao::read(",dump(@_),") = ",dump( $byte ),"\n" if $self->debug;
-	mmap_pixel( $addr, 0, $byte, 0 );
+	warn sprintf("# Orao::read(%04x) = %02x\n", $addr, $byte) if $self->trace;
+	$self->mmap_pixel( $addr, 0, $byte, 0 );
 	return $byte;
 }
 
@@ -219,9 +269,9 @@
 =cut
 
 sub write {
-	my $self = $orao;
-	warn "# Orao::write(",dump(@_),")\n" if $self->debug;
+	my $self = shift;
 	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 );
@@ -235,9 +285,10 @@
 		warn sprintf "sound ignored: %x\n", $byte;
 	}
 
-	mmap_pixel( $addr, $byte, 0, 0 );
+	$self->mmap_pixel( $addr, $byte, 0, 0 );
 
 	$mem[$addr] = $byte;
+	return;
 }