6502/as65
1
0
Fork 0
mirror of https://github.com/softwarejanitor/as65.git synced 2024-11-21 17:32:10 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug in addressing mode detection

Browse Source
This commit is contained in:
Leeland Heins 2018-12-20 14:50:17 -06:00 committed by GitHub
parent 6d14c3fdca
commit f6dcaa682a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
as65.pl
View File

@ -1062,6 +1062,9 @@ sub is_Zero_Page {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
# Allow symbol arithmetic # Allow symbol arithmetic
@ -1074,6 +1077,9 @@ sub is_Zero_Page {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} }
@ -1149,6 +1155,9 @@ sub is_Zero_Page_X {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]|^%[01]{8}$$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]|^%[01]{8}$$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} elsif ($operand =~ /^([A-Za-z\.\?][A-Za-z0-9_\.\?]*)\s*[+-]\s*\$*[0-9a-fA-F]+,[Xx]$/) { } elsif ($operand =~ /^([A-Za-z\.\?][A-Za-z0-9_\.\?]*)\s*[+-]\s*\$*[0-9a-fA-F]+,[Xx]$/) {
@ -1160,6 +1169,9 @@ sub is_Zero_Page_X {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]|^%[01]{8}$$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]|^%[01]{8}$$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} }
@ -1220,6 +1232,9 @@ sub is_Zero_Page_Y {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} elsif ($operand =~ /^([A-Za-z\.\?][A-Za-z0-9_\.\?]*)\s*[+-]\s*\$*[0-9a-fA-F]+,[Yy]$/) { } elsif ($operand =~ /^([A-Za-z\.\?][A-Za-z0-9_\.\?]*)\s*[+-]\s*\$*[0-9a-fA-F]+,[Yy]$/) {
@ -1231,6 +1246,9 @@ sub is_Zero_Page_Y {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} }
@ -1652,6 +1670,9 @@ sub is_Indirect_Zero_Page_X {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} elsif ($operand =~ /^\(([A-Za-z\.\?][A-Za-z0-9_\.\?]*)\s*[+-]\s*(\$*[0-9a-fA-F]+),[Xx]\)/) { } elsif ($operand =~ /^\(([A-Za-z\.\?][A-Za-z0-9_\.\?]*)\s*[+-]\s*(\$*[0-9a-fA-F]+),[Xx]\)/) {
@ -1663,6 +1684,9 @@ sub is_Indirect_Zero_Page_X {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} }
@ -1728,6 +1752,9 @@ sub is_Indirect_Zero_Page_Y {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} elsif ($operand =~ /^\(([A-Za-z\.\?][A-Za-z0-9_\.\?]*)\s*[+-]\s*(\$*[0-9a-fA-F]+)\),[Yy]/) { } elsif ($operand =~ /^\(([A-Za-z\.\?][A-Za-z0-9_\.\?]*)\s*[+-]\s*(\$*[0-9a-fA-F]+)\),[Yy]/) {
@ -1739,6 +1766,9 @@ sub is_Indirect_Zero_Page_Y {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} }
@ -1804,6 +1834,9 @@ sub is_Indirect_Zero_Page {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} 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]+)\)$/) {
@ -1815,6 +1848,9 @@ sub is_Indirect_Zero_Page {
} else { } else {
return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/; return 0 unless $symval =~ /^\$[0-9a-fA-F][0-9a-fA-F]$|^%[01]{8}$/;
} }
} else {
# Assume that forward declared symbols are addresses.
return 0;
} }
return 2; return 2;
} }