--- M6502/Orao.pm	2007/07/30 18:37:37	32
+++ M6502/Orao.pm	2007/07/30 21:00:36	33
@@ -38,25 +38,50 @@
 
 our $orao;
 
+our $PC = 0x1000;
+
 sub init {
 	my $self = shift;
 	warn "call upstream init\n";
-	$self->SUPER::init( @_ );
+	$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',
+	});
 
 	$orao = $self;
 
-	$self->prompt( 0x1000 );
-}
+#	$self->prompt( 0x1000 );
 
-my $loaded_files = {
-	0xC000 => 'rom/BAS12.ROM',
-	0xE000 => 'rom/CRT12.ROM',
-};
+	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 ) {
+#			$orao->read( $a );
+#		}
+#		$self->sync;
+	}
+
+}
 
 =head2 load_rom
 
@@ -67,13 +92,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 +117,17 @@
 
 	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->write_chunk( $addr, $buff );
 
 	my $chunk;
@@ -202,11 +226,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 );
+	$self->mmap_pixel( $addr, 0, $byte, 0 );
 	return $byte;
 }
 
@@ -219,7 +243,7 @@
 =cut
 
 sub write {
-	my $self = $orao;
+	my $self = shift;
 	warn "# Orao::write(",dump(@_),")\n" if $self->debug;
 	my ($addr,$byte) = @_;
 
@@ -235,7 +259,7 @@
 		warn sprintf "sound ignored: %x\n", $byte;
 	}
 
-	mmap_pixel( $addr, $byte, 0, 0 );
+	$self->mmap_pixel( $addr, $byte, 0, 0 );
 
 	$mem[$addr] = $byte;
 }