Store original file name in ProgramStatement.

The sourceProgram is not correct for statements that come from an .include, and the assembler depends on the sourceProgram actually being the "top-level" program, not the actual file. Fixes TheThirdOne#160.
diku-dk · Sep 23, 2022 · bba0b97 · bba0b97
1 parent 27a7c1f
commit bba0b97
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/rars/ErrorMessage.java b/src/rars/ErrorMessage.java
@@ -114,8 +114,7 @@ public ErrorMessage(boolean isWarning, RISCVprogram sourceProgram, int line, int
     // Added January 2013
     public ErrorMessage(ProgramStatement statement, String message) {
         this.isWarning = ERROR;
-        this.filename = (statement.getSourceProgram() == null)
-                ? "" : statement.getSourceProgram().getFilename();
+        this.filename = statement.getSourceFile();
         this.position = 0;
         this.message = message;
         // Somewhere along the way we lose the macro history, but can
@@ -243,4 +242,4 @@ private static String getExpansionHistory(RISCVprogram sourceProgram) {
         return sourceProgram.getLocalMacroPool().getExpansionHistory();
     }
 
-}  // ErrorMessage
+}  // ErrorMessage
diff --git a/src/rars/ProgramStatement.java b/src/rars/ProgramStatement.java
@@ -63,6 +63,7 @@ public class ProgramStatement implements Comparable<ProgramStatement> {
     private int numOperands;
     private Instruction instruction;
     private int textAddress;
+    private String sourceFilename;
     private int sourceLine;
     private int binaryStatement;
     private boolean altered;
@@ -83,7 +84,7 @@ public class ProgramStatement implements Comparable<ProgramStatement> {
      *                          is stored.
      **/
     public ProgramStatement(RISCVprogram sourceProgram, String source, TokenList origTokenList, TokenList strippedTokenList,
-                            Instruction inst, int textAddress, int sourceLine) {
+                            Instruction inst, int textAddress, String filename, int sourceLine) {
         this.sourceProgram = sourceProgram;
         this.source = source;
         this.originalTokenList = origTokenList;
@@ -92,6 +93,7 @@ public ProgramStatement(RISCVprogram sourceProgram, String source, TokenList ori
         this.numOperands = 0;
         this.instruction = inst;
         this.textAddress = textAddress;
+        this.sourceFilename = filename;
         this.sourceLine = sourceLine;
         this.basicAssemblyStatement = null;
         this.basicStatementList = new BasicStatementList();
@@ -533,7 +535,7 @@ public RISCVprogram getSourceProgram() {
      * @return The file name.
      **/
     public String getSourceFile() {
-        return (sourceProgram == null) ? "" : sourceProgram.getFilename();
+        return sourceFilename;
     }
 
 

diff --git a/src/rars/assembler/Assembler.java b/src/rars/assembler/Assembler.java
@@ -262,7 +262,7 @@ public ArrayList<ProgramStatement> assemble(ArrayList<RISCVprogram> tokenizedPro
                         ProgramStatement ps = new ProgramStatement(
                                 this.fileCurrentlyBeingAssembled,
                                 (instrNumber == 0) ? statement.getSource() : "", newTokenList,
-                                newTokenList, instr, textAddress.get(), statement.getSourceLine());
+                                newTokenList, instr, textAddress.get(), statement.getSourceFile(), statement.getSourceLine());
                         textAddress.increment(Instruction.INSTRUCTION_LENGTH);
                         ps.buildBasicStatementFromBasicInstruction(errors);
                         machineList.add(ps);
@@ -488,8 +488,9 @@ private ArrayList<ProgramStatement> parseLine(TokenList tokenList, String source
                         "Extended (pseudo) instruction or format not permitted.  See Settings."));
             }
             if (OperandFormat.tokenOperandMatch(tokens, inst, errors)) {
-                programStatement = new ProgramStatement(this.fileCurrentlyBeingAssembled, source,
-                        tokenList, tokens, inst, textAddress.get(), sourceLineNumber);
+                programStatement = new ProgramStatement(this.fileCurrentlyBeingAssembled,
+                                                        source,
+                                                        tokenList, tokens, inst, textAddress.get(), token.getOriginalProgram().getFilename(), sourceLineNumber);
                 // instruction length is 4 for all basic instruction, varies for extended instruction
                 // Modified to permit use of compact expansion if address fits
                 // in 15 bits. DPS 4-Aug-2009

diff --git a/src/rars/assembler/SourceLine.java b/src/rars/assembler/SourceLine.java
@@ -97,4 +97,4 @@ public int getLineNumber() {
     public RISCVprogram getRISCVprogram() {
         return program;
     }
-}
+}