Skip to content

Keep the git textAddress pointer always up-to-date when instructions. Fixes issue #120. #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ricferpas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Keep the git textAddress pointer always up-to-date when instructions. Fixes issue #120. #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/rars/assembler/Assembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ else if (Memory.inDataSegment(statement.getAddress())) {
statement.getStrippedTokenList().get(0), errors);
}
textSegmentLines.add(statement);
// Update the textAddress pointer because the logic for adding fake instructions when START AT MAIN is enabled also needs this value to point after the last inserted instruction, and the logic for expanding pseudoinstructions modifies it
textAddress.set(statement.getAddress());
textAddress.increment(Instruction.INSTRUCTION_LENGTH);
} else if (statement.getInstruction() != null) {
// It is a pseudo-instruction:
// 1. Fetch its basic instruction template list
Expand Down Expand Up @@ -232,7 +235,7 @@ else if (Memory.inDataSegment(statement.getAddress())) {
templateList = inst.getBasicIntructionTemplateList();


// subsequent ProgramStatement constructor needs the correct text segment address.
// subsequent ProgramStatement constructor needs the correct text segment address. The logic for adding fake instructions when START AT MAIN is enabled also needs this value to point after the last inserted instruction.
textAddress.set(statement.getAddress());
// Will generate one basic instruction for each template in the list.
int PC = textAddress.get(); // Save the starting PC so that it can be used for PC relative stuff
Expand Down