--- M6502/Orao.pm	2007/07/30 22:27:47	37
+++ M6502/Orao.pm	2007/07/30 23:28:25	38
@@ -61,35 +61,52 @@
 
 #	$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',
-	);
-
-	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 = $orao->read( $a );
-				$orao->vram( $a - 0x6000, $b );
-			} else {
-				$orao->read( $a );
+	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 );
+				}
 			}
 		}
-		$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";
 
 }