Skip to content
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

Multiline comment support #203

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Multiline comment support #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61304d3
First attempt at multiline comments
sdasda7777 Oct 19, 2023
1e4d627
Fixed bugs in the highlighting, added block comment color options to …
sdasda7777 Oct 19, 2023
769220b
Fixed a bug with multiline comments termination check
sdasda7777 Oct 25, 2023
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
10 changes: 9 additions & 1 deletion build-jar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
#!/bin/bash
if git submodule status | grep \( > /dev/null ; then
if git submodule status | grep \( > /dev/null ; then
# Create build folder
mkdir -p build
# Compile src/*.java files
find src -name "*.java" | xargs javac -d build
# Exit if compilation error happened
if [ $? -ne 0 ]; then
exit 1
fi
# Copy src/*.java files to build/
if [[ "$OSTYPE" == "darwin"* ]]; then
find src -type f -not -name "*.java" -exec rsync -R {} build \;
else
Expand All @@ -11,6 +18,7 @@ if git submodule status | grep \( > /dev/null ; then
rm -r build/src
cp README.md License.txt build
cd build
# Create .jar file from build/
jar cfm ../rars.jar ./META-INF/MANIFEST.MF *
else
echo "It looks like JSoftFloat is not cloned. Consider running \"git submodule update --init\""
Expand Down
48 changes: 27 additions & 21 deletions src/rars/assembler/Assembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,9 @@ public ArrayList<ProgramStatement> assemble(ArrayList<RISCVprogram> tokenizedPro
ExtendedInstruction inst = (ExtendedInstruction) statement.getInstruction();
String basicAssembly = statement.getBasicAssemblyStatement();
int sourceLine = statement.getSourceLine();
TokenList theTokenList = new Tokenizer().tokenizeLine(sourceLine,
basicAssembly, errors, false);
Tokenizer.TokenizationResult tr = new Tokenizer().tokenizeLine(
sourceLine, basicAssembly, errors, false, false);
boolean inMultilineComment = tr.unterminatedMultilineComment;

// ////////////////////////////////////////////////////////////////////////////
// If we are using compact memory config and there is a compact expansion, use it
Expand All @@ -245,27 +246,29 @@ public ArrayList<ProgramStatement> assemble(ArrayList<RISCVprogram> tokenizedPro
for (int instrNumber = 0; instrNumber < templateList.size(); instrNumber++) {
String instruction = ExtendedInstruction.makeTemplateSubstitutions(
this.fileCurrentlyBeingAssembled,
templateList.get(instrNumber), theTokenList, PC);
templateList.get(instrNumber), tr.tokenList, PC);

// All substitutions have been made so we have generated
// a valid basic instruction!
if (Globals.debug)
System.out.println("PSEUDO generated: " + instruction);
// For generated instruction: tokenize, build program
// statement, add to list.
TokenList newTokenList = new Tokenizer().tokenizeLine(sourceLine,
instruction, errors, false);
ArrayList<Instruction> instrMatches = this.matchInstruction(newTokenList.get(0));
Instruction instr = OperandFormat.bestOperandMatch(newTokenList,
Tokenizer.TokenizationResult newTR = new Tokenizer().tokenizeLine(sourceLine, instruction,
errors, false, inMultilineComment);

ArrayList<Instruction> instrMatches = this.matchInstruction(newTR.tokenList.get(0));
Instruction instr = OperandFormat.bestOperandMatch(newTR.tokenList,
instrMatches);
// Only first generated instruction is linked to original source
ProgramStatement ps = new ProgramStatement(
this.fileCurrentlyBeingAssembled,
(instrNumber == 0) ? statement.getSource() : "", newTokenList,
newTokenList, instr, textAddress.get(), statement.getSourceLine());
(instrNumber == 0) ? statement.getSource() : "", newTR.tokenList,
newTR.tokenList, instr, textAddress.get(), statement.getSourceLine());
textAddress.increment(Instruction.INSTRUCTION_LENGTH);
ps.buildBasicStatementFromBasicInstruction(errors);
machineList.add(ps);
inMultilineComment = newTR.unterminatedMultilineComment;
} // end of FOR loop, repeated for each template in list.
} // end of ELSE part for extended instruction.

Expand Down Expand Up @@ -352,7 +355,7 @@ private ArrayList<ProgramStatement> parseLine(TokenList tokenList, String source
ArrayList<ProgramStatement> ret = new ArrayList<>();

ProgramStatement programStatement;
TokenList tokens = this.stripComment(tokenList);
TokenList tokens = this.stripComments(tokenList);

// Labels should not be processed in macro definition segment.
MacroPool macroPool = fileCurrentlyBeingAssembled.getLocalMacroPool();
Expand Down Expand Up @@ -413,16 +416,17 @@ private ArrayList<ProgramStatement> parseLine(TokenList tokenList, String source
for (int i = macro.getFromLine() + 1; i < macro.getToLine(); i++) {

String substituted = macro.getSubstitutedLine(i, tokens, counter, errors);
TokenList tokenList2 = fileCurrentlyBeingAssembled.getTokenizer().tokenizeLine(
i, substituted, errors);
Tokenizer.TokenizationResult tokenizationResult2 = fileCurrentlyBeingAssembled.getTokenizer().tokenizeLine(
i, substituted, errors);

// If token list getProcessedLine() is not empty, then .eqv was performed and it contains the modified source.
// Put it into the line to be parsed, so it will be displayed properly in text segment display. DPS 23 Jan 2013
if (tokenList2.getProcessedLine().length() > 0)
substituted = tokenList2.getProcessedLine();
if (tokenizationResult2.tokenList.getProcessedLine().length() > 0)
substituted = tokenizationResult2.tokenList.getProcessedLine();

// recursively parse lines of expanded macro
ArrayList<ProgramStatement> statements = parseLine(tokenList2, "<" + (i - macro.getFromLine() + macro.getOriginalFromLine()) + "> "
ArrayList<ProgramStatement> statements = parseLine(tokenizationResult2.tokenList,
"<" + (i - macro.getFromLine() + macro.getOriginalFromLine()) + "> "
+ substituted.trim(), sourceLineNumber, extendedAssemblerEnabled);
if (statements != null)
ret.addAll(statements);
Expand Down Expand Up @@ -511,17 +515,19 @@ private void detectLabels(TokenList tokens, Macro current) {
// Pre-process the token list for a statement by stripping off any comment.
// NOTE: the ArrayList parameter is not modified; a new one is cloned and
// returned.
private TokenList stripComment(TokenList tokenList) {
private TokenList stripComments(TokenList tokenList) {
if (tokenList.isEmpty())
return tokenList;
TokenList tokens = (TokenList) tokenList.clone();
// If there is a comment, strip it off.
int last = tokens.size() - 1;
if (tokens.get(last).getType() == TokenTypes.COMMENT) {
tokens.remove(last);
// Remove all comments
for (int ii = 0; ii < tokens.size(); ++ii) {
if (tokens.get(ii).getType() == TokenTypes.COMMENT) {
tokens.remove(ii);
--ii;
}
}
return tokens;
} // stripComment()
} // stripComments()

/**
* Pre-process the token list for a statement by stripping off any label, if
Expand Down
Loading