1
0
mirror of https://github.com/pfusik/xasm.git synced 2024-06-01 01:41:29 +00:00

fixed space handling around inOpcode assembly lda #{lda #}

This commit is contained in:
Jakub Husak 2022-12-01 14:48:08 +01:00
parent 9aae1ad4c4
commit 4d80ec3513

View File

@ -594,6 +594,8 @@ void readValue() {
valOpStack.length = 0; valOpStack.length = 0;
inOpcode = true; inOpcode = true;
assemblyInstruction(readInstruction()); assemblyInstruction(readInstruction());
if (line[column] == ' ' || line[column]=='\t' )
readSpaces();
if (readChar() != '}') if (readChar() != '}')
throw new AssemblyError("Missing '}'"); throw new AssemblyError("Missing '}'");
assert(!instructionBegin); assert(!instructionBegin);
@ -850,6 +852,8 @@ void readAddrMode() {
case '<': case '<':
case '>': case '>':
addrMode = AddrMode.IMMEDIATE; addrMode = AddrMode.IMMEDIATE;
if (inOpcode && line[column] == ' ' || line[column] == '\t')
readSpaces();
if (inOpcode && line[column] == '}') if (inOpcode && line[column] == '}')
return; return;
readWord(); readWord();
@ -2479,7 +2483,7 @@ void assemblyInstruction(string instruction) {
assemblyConditionalJump(0x50); assemblyConditionalJump(0x50);
break; break;
case "LDA": case "LDA":
assemblyAccumulator(0xa0, 0, 0); assemblyLda(0);
break; break;
case "LDX": case "LDX":
assemblyLdx(0); assemblyLdx(0);
@ -2602,7 +2606,7 @@ void assemblyInstruction(string instruction) {
assemblySkip(0x10); assemblySkip(0x10);
break; break;
case "STA": case "STA":
assemblyAccumulator(0x80, 0, 0); assemblySta(0);
break; break;
case "STX": case "STX":
assemblyStx(0); assemblyStx(0);