6502/x65
1
0
Fork 0
mirror of https://github.com/ksherlock/x65.git synced 2024-12-30 17:30:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix for bug #1

Browse Source 
Force absolute addressing failed when presented with a known long address.
This commit is contained in:
Carl-Henrik Skårstedt 2019-09-18 12:16:58 -07:00
parent df820f689a
commit ce950ff513
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/x65_win32.zip
View File

Binary file not shown.

BIN
bin/x65_x64.zip
View File

Binary file not shown.

14
x65.cpp
View File

@ -1652,7 +1652,7 @@ public:
StatusCode Directive_ENUM_STRUCT(strref line, AssemblerDirective dir); StatusCode Directive_ENUM_STRUCT(strref line, AssemblerDirective dir);
// Assembler steps // Assembler steps
StatusCode GetAddressMode(strref line, bool flipXY, uint32_t validModes, StatusCode GetAddressMode(strref line, bool flipXY, uint32_t &validModes,
AddrMode &addrMode, int &len, strref &expression); AddrMode &addrMode, int &len, strref &expression);
StatusCode AddOpcode(strref line, int index, strref source_file); StatusCode AddOpcode(strref line, int index, strref source_file);
StatusCode BuildLine(strref line); StatusCode BuildLine(strref line);
@ -5255,7 +5255,7 @@ StatusCode Asm::ApplyDirective(AssemblerDirective dir, strref line, strref sourc
} }
// Make an educated guess at the intended address mode from an opcode argument // Make an educated guess at the intended address mode from an opcode argument
StatusCode Asm::GetAddressMode(strref line, bool flipXY, uint32_t validModes, AddrMode &addrMode, int &len, strref &expression) StatusCode Asm::GetAddressMode(strref line, bool flipXY, uint32_t &validModes, AddrMode &addrMode, int &len, strref &expression)
{ {
bool force_zp = false; bool force_zp = false;
bool force_24 = false; bool force_24 = false;
@ -5298,18 +5298,18 @@ StatusCode Asm::GetAddressMode(strref line, bool flipXY, uint32_t validModes, Ad
case 'z': force_zp = true; line += 3; need_more = true; len = 1; break; case 'z': force_zp = true; line += 3; need_more = true; len = 1; break;
case 'b': line += 3; need_more = true; len = 1; break; case 'b': line += 3; need_more = true; len = 1; break;
case 'w': line += 3; need_more = true; len = 2; break; case 'w': line += 3; need_more = true; len = 2; break;
case 'l': force_24 = true; line += 3; need_more = true; len = 3; break; case 'l': force_24 = true; line += 3; need_more = true; len = 3; break;
case 'a': force_abs = true; line += 3; need_more = true; break; case 'a': force_abs = true; line += 3; need_more = true; break;
} }
} }
if (!need_more) { if (!need_more) {
if (strref("A").is_prefix_word(line)) { if( strref( "A" ).is_prefix_word( line ) ) {
addrMode = AMB_ACC; addrMode = AMB_ACC;
} else { // absolute (zp, offs x, offs y) } else { // absolute (zp, offs x, offs y)
addrMode = force_24 ? AMB_ABS_L : (force_zp ? AMB_ZP : AMB_ABS); addrMode = force_24 ? AMB_ABS_L : (force_zp ? AMB_ZP : AMB_ABS);
expression = line.split_token_trim(','); expression = line.split_token_trim(',');
if (line && (line[0]=='s' || line[0]=='S')) if( force_abs ) { validModes &= AMM_ABS | AMM_ABS_X | AMM_ABS_Y | AMM_REL | AMM_REL_X; }
addrMode = AMB_STK; if( line && (line[ 0 ] == 's' || line[ 0 ] == 'S') ) { addrMode = AMB_STK; }
else { else {
bool relX = line && (line[0]=='x' || line[0]=='X'); bool relX = line && (line[0]=='x' || line[0]=='X');
bool relY = line && (line[0]=='y' || line[0]=='Y'); bool relY = line && (line[0]=='y' || line[0]=='Y');