6502/as65
1
0
Fork 0
mirror of https://github.com/softwarejanitor/as65.git synced 2024-06-16 10:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Bug fixes for macros

Browse Source
This commit is contained in:
Leeland Heins 2018-12-28 13:27:44 -06:00 committed by GitHub
parent 2037fe0c11
commit 2db741e827
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
as65.pl
View File

@ -2800,7 +2800,7 @@ if (open($ifh, "<$input_file")) {
# Hex # Hex
} elsif ($operand =~ /^\$([0-9a-fA-F][0-9a-fA-F])/) { } elsif ($operand =~ /^\$([0-9a-fA-F][0-9a-fA-F])/) {
$strlen = hex(lc($1)); $strlen = hex(lc($1));
##FIXME -- probably need to add ," " support here. ##FIXME -- probably need to add ," " support here.
} }
my @bytes; my @bytes;
for (my $loopc = 0; $loopc < $strlen; $loopc++) { for (my $loopc = 0; $loopc < $strlen; $loopc++) {
@ -2850,7 +2850,6 @@ if (open($ifh, "<$input_file")) {
} elsif (defined $macros{$ucmnemonic}) { } elsif (defined $macros{$ucmnemonic}) {
#print "#### MACRO $ucmnemonic ####\n" if $debug; #print "#### MACRO $ucmnemonic ####\n" if $debug;
print sprintf(" %-4d %s\n", $lineno, $line) if $code_listing; print sprintf(" %-4d %s\n", $lineno, $line) if $code_listing;
#print "operand=$operand\n";
my $opval1 = ''; my $opval1 = '';
my $opval2 = ''; my $opval2 = '';
@ -2870,9 +2869,7 @@ if (open($ifh, "<$input_file")) {
$opval2 = hex(lc(substr($opval, 2, 2))); $opval2 = hex(lc(substr($opval, 2, 2)));
# Return symbol value # Return symbol value
} elsif ($operand =~ /^([A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)$/) { } elsif ($operand =~ /^([A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)$/) {
#print "symbol=$1\n";
my $symval = $symbols{$1}; my $symval = $symbols{$1};
#print "symval='$symval'\n";
if ($symval =~ /^\$([0-9a-fA-F]{0,1}[0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/) { if ($symval =~ /^\$([0-9a-fA-F]{0,1}[0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/) {
$opval1 = hex(lc($1)); $opval1 = hex(lc($1));
$opval2 = hex(lc($2)); $opval2 = hex(lc($2));
@ -2881,7 +2878,6 @@ if (open($ifh, "<$input_file")) {
$opval2 = 0x00; $opval2 = 0x00;
} else { } else {
$symval =~ s/^\$//; $symval =~ s/^\$//;
#print "symval='$symval'\n";
my $opval = sprintf("%04x", $symval); my $opval = sprintf("%04x", $symval);
$opval1 = hex(lc(substr($opval, 0, 2))); $opval1 = hex(lc(substr($opval, 0, 2)));
$opval2 = hex(lc(substr($opval, 2, 2))); $opval2 = hex(lc(substr($opval, 2, 2)));
@ -2890,9 +2886,7 @@ if (open($ifh, "<$input_file")) {
} elsif ($operand =~ /^([A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)\s*[+]\s*(\$*[0-9a-fA-F]+)$/) { } elsif ($operand =~ /^([A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)\s*[+]\s*(\$*[0-9a-fA-F]+)$/) {
# Add # Add
#handle_16_bit_symbol_add($ofh, $lineno, $addr, $opcode, $1, $2, $line); #handle_16_bit_symbol_add($ofh, $lineno, $addr, $opcode, $1, $2, $line);
#print "symbol=$1 add=$2\n";
my $symval = $symbols{$1}; my $symval = $symbols{$1};
#print "symval='$symval'\n";
if ($symval =~ /^\$([0-9a-fA-F]{0,1}[0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/) { if ($symval =~ /^\$([0-9a-fA-F]{0,1}[0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/) {
$opval1 = hex(lc($1)); $opval1 = hex(lc($1));
$opval2 = hex(lc($2)); $opval2 = hex(lc($2));
@ -2901,18 +2895,15 @@ if (open($ifh, "<$input_file")) {
$opval2 = 0x00; $opval2 = 0x00;
} else { } else {
$symval =~ s/^\$//; $symval =~ s/^\$//;
#print "symval='$symval'\n";
my $opval = sprintf("%04x", $symval); my $opval = sprintf("%04x", $symval);
$opval1 = hex(lc(substr($opval, 0, 2))); $opval1 = hex(lc(substr($opval, 0, 2)));
$opval2 = hex(lc(substr($opval, 2, 2))); $opval2 = hex(lc(substr($opval, 2, 2)));
} }
##FIXME -- need to do add here ##FIXME -- need to do add here
} elsif ($operand =~ /^([A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)\s*[-]\s*(\$*[0-9a-fA-F]+)$/) { } elsif ($operand =~ /^([A-Za-z\.\?:][A-Za-z0-9_\.\?:]*)\s*[-]\s*(\$*[0-9a-fA-F]+)$/) {
# Subtract # Subtract
#handle_16_bit_symbol_sub($ofh, $lineno, $addr, $opcode, $1, $2, $line); #handle_16_bit_symbol_sub($ofh, $lineno, $addr, $opcode, $1, $2, $line);
#print "symbol=$1 sub=$2\n";
my $symval = $symbols{$1}; my $symval = $symbols{$1};
#print "symval='$symval'\n";
if ($symval =~ /^\$([0-9a-fA-F]{0,1}[0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/) { if ($symval =~ /^\$([0-9a-fA-F]{0,1}[0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/) {
$opval1 = hex(lc($1)); $opval1 = hex(lc($1));
$opval2 = hex(lc($2)); $opval2 = hex(lc($2));
@ -2921,12 +2912,11 @@ if (open($ifh, "<$input_file")) {
$opval2 = 0x00; $opval2 = 0x00;
} else { } else {
$symval =~ s/^\$//; $symval =~ s/^\$//;
#print "symval='$symval'\n";
my $opval = sprintf("%04x", $symval); my $opval = sprintf("%04x", $symval);
$opval1 = hex(lc(substr($opval, 0, 2))); $opval1 = hex(lc(substr($opval, 0, 2)));
$opval2 = hex(lc(substr($opval, 2, 2))); $opval2 = hex(lc(substr($opval, 2, 2)));
} }
##FIXME -- need to do sub here ##FIXME -- need to do sub here
#} else { #} else {
# print ">>>> $lineno - Macro Bad Operand '$operand' in '$line'\n"; # print ">>>> $lineno - Macro Bad Operand '$operand' in '$line'\n";
} }