--- M6502/Orao.pm 2007/08/01 13:01:17 77 +++ M6502/Orao.pm 2007/08/02 16:01:16 98 @@ -8,10 +8,11 @@ #use Time::HiRes qw(time); use File::Slurp; use Data::Dump qw/dump/; +use List::Util qw/first/; use M6502; use base qw(Class::Accessor M6502 Screen Prefs); -__PACKAGE__->mk_accessors(qw(run_for)); +__PACKAGE__->mk_accessors(qw(booted)); =head1 NAME @@ -19,11 +20,11 @@ =head1 VERSION -Version 0.02 +Version 0.04 =cut -our $VERSION = '0.02'; +our $VERSION = '0.04'; =head1 SUMMARY @@ -31,23 +32,40 @@ =cut -=head2 init +my @kbd_ports = ( + 0x87FC,0x87FD,0x87FA,0x87FB,0x87F6,0x87F7, + 0x87EE,0x87EF,0x87DE,0x87DF,0x87BE,0x87BF, + 0x877E,0x877F,0x86FE,0x86FF,0x85FE,0x85FF, + 0x83FE,0x83FF, +); + +=head1 FUNCTIONS + +=head2 boot Start emulator, open L, load initial ROM images, and render memory + my $orao = Orao->new({}); + $orao->boot; + =cut our $orao; select(STDERR); $| = 1; -sub init { +sub boot { my $self = shift; warn "Orao calling upstream init\n"; - $self->SUPER::init( $self, @_ ); + $self->SUPER::init( + read => sub { $self->read( @_ ) }, + write => sub { $self->write( @_ ) }, + ); warn "Orao $Orao::VERSION emulation starting\n"; + warn "emulating ", $#mem, " bytes of memory\n"; + $self->open_screen; $self->load_rom({ 0x1000 => 'dump/SCRINV.BIN', @@ -60,6 +78,8 @@ # $PC = 0xDD11; # BC # $PC = 0xC274; # MC + $PC = 0xff89; + $orao = $self; # $self->prompt( 0x1000 ); @@ -99,13 +119,35 @@ #( $A, $P, $X, $Y, $S, $IPeriod ) = ( 1, 2, 3, 4, 5, 6 ); - warn "Orao init finished", + warn "Orao boot finished", $self->trace ? ' trace' : '', $self->debug ? ' debug' : '', "\n"; + M6502::reset(); + + $self->booted( 1 ); } +=head2 run + +Run interactive emulation loop + + $orao->run; + +=cut + +sub run { + my $self = shift; + + $self->show_mem( 1 ); + + $self->boot if ( ! $self->booted ); + $self->loop; +}; + +=head1 Helper functions + =head2 load_rom called to init memory and load initial rom images @@ -121,7 +163,7 @@ foreach my $addr ( sort keys %$loaded_files ) { my $path = $loaded_files->{$addr}; - $self->load_oraoemu( $path, $addr ); + $self->load_image( $path, $addr ); } } @@ -149,17 +191,17 @@ $self->render_mem( @mem ) if $self->show_mem; } -=head2 load_oraoemu +=head2 load_image Load binary files, ROM images and Orao Emulator files - $orao->load_oraoemu( '/path/to/file', 0x1000 ); + $orao->load_image( '/path/to/file', 0x1000 ); Returns true on success. =cut -sub load_oraoemu { +sub load_image { my $self = shift; my ( $path, $addr ) = @_; @@ -265,11 +307,147 @@ =cut +my $keyboard = { + 0x87FC => { + 'right' => 16, + 'down' => 128, + 'up' => 192, + 'left' => 224, + 'backspace' => 224, + }, + 0x87FD => { + 'return' => sub { + M6502::write( 0xfc, 13 ); + return 0; + }, + 'left ctrl' => 16, + 'right ctrl' => 16, + }, + 0x87FA => { + 'f4' => 16, + 'f3' => 128, + 'f2' => 192, + 'f1' => 224, + }, + 0x87FB => { + 'space' => 32, + 'left shift' => 16, + 'right shift' => 16, + }, + 0x87F6 => { + '6' => 16, + 't' => 128, + 'z' => 192, + 'r' => 224, + }, + 0x87F7 => { + '5' => 32, + '4' => 16, + }, + 0x87EE => { + '7' => 16, + 'u' => 128, + 'i' => 192, + 'o' => 224, + }, + 0x87EF => { + '8' => 32, + '9' => 16, + }, + 0x87DE => { + '1' => 16, + 'w' => 128, + 'q' => 192, + 'e' => 224, + }, + 0x87DF => { + '2' => 32, + '3' => 16, + }, + 0x87BE => { + 'm' => 16, + 'k' => 128, + 'j' => 192, + 'l' => 224, + }, + 0x87BF => { + ',' => 32, + '.' => 16, + }, + 0x877E => { + 'y' => 16, + 's' => 128, + 'a' => 192, + 'd' => 224, + }, + 0x877F => { + 'x' => 32, + 'c' => 16, + }, + 0x86FE => { + 'n' => 16, + 'g' => 128, + 'h' => 192, + 'f' => 224, + }, + 0x86FF => { + 'b' => 32, + 'c' => 16, + }, + 0x85FE => { + ':' => 16, + '\\' => 128, + '\'' => 192, + ';' => 224, + '8' => 16, # FIXME? + }, + 0x85FF => { + '/' => 32, + '6' => 16, # FIXME? + }, + 0x83FE => { + ';' => 16, + '[' => 128, + ']' => 192, + 'p' => 224, + '=' => 16, # FIXME? + }, + 0x83FF => { + '-' => 32, + '0' => 16, + }, +}; + + sub read { my $self = shift; my ($addr) = @_; my $byte = $mem[$addr]; + confess sprintf("can't find memory at address %04x",$addr) unless defined($byte); warn sprintf("# Orao::read(%04x) = %02x\n", $addr, $byte) if $self->trace; + + # keyboard + + if ( first { $addr == $_ } @kbd_ports ) { + warn sprintf("keyboard port: %04x\n",$addr) if $self->trace; + if ( my $key = $self->key_pressed ) { + my $r = $keyboard->{$addr} || confess "no definition for keyboard port found"; + if ( my $ret = $r->{$key} ) { + if ( ref($ret) eq 'CODE' ) { + $ret = $ret->(); + warn "executed $key and got: $ret\n"; + } else { + warn sprintf("keyboard port: %04x key: '%s' code: %02x\n", $addr, $key, $ret); + } + $mem[$addr] = $ret; + return $ret; + } else { + warn sprintf("keyboard port: %04x unknown key: '%s'\n", $addr, $key); + } + warn sprintf("keyboard port: %04x %s\n",$addr,dump( $r )) if $self->trace; + } + } + $self->mmap_pixel( $addr, 0, $byte, 0 ); return $byte; } @@ -296,8 +474,7 @@ } if ( $addr > 0xafff ) { - warn sprintf "write access 0x%04x > 0xafff aborting\n", $addr; - return; + confess sprintf "write access 0x%04x > 0xafff aborting\n", $addr; } $self->mmap_pixel( $addr, $byte, 0, 0 ); @@ -323,7 +500,7 @@ my $self = shift; $self->app->sync; my $a = shift; - print STDERR $self->hexdump( $a ), + print $self->hexdump( $a ), $last ? "[$last] " : '', "> "; my $in = ; @@ -345,6 +522,7 @@ sub cli { my $self = shift; my $a = $PC || confess "no pc?"; + my $run_for = 0; warn $self->dump_R() if $show_R; while ( my ($line, @v) = $self->prompt( $a, $last ) ) { my $c = shift @v; @@ -371,6 +549,7 @@ __USAGE__ warn $self->dump_R; + $last = ''; } elsif ( $c =~ m/^e/i ) { $a = $v if defined($v); my $to = shift @v; @@ -399,7 +578,7 @@ } elsif ( $c =~ m/^l/i ) { my $to = shift @v || 0x1000; $a = $to; - $self->load_oraoemu( $v, $a ); + $self->load_image( $v, $a ); $last = ''; } elsif ( $c =~ m/^s/i ) { $self->save_dump( $v || 'mem.dump', @v ); @@ -431,6 +610,7 @@ } } + return $run_for; } =head1 AUTHOR