Skip to content

Compile time constant evaluation #241

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
chromapid wants to merge 8 commits into
base: refactor-1.6
Choose a base branch
from
Open

Compile time constant evaluation #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
36edfc5
Began work on compile time math expressions.
chromapid Dec 19, 2021
23ddff6
Tests, fixes for constant folding
chromapid Dec 20, 2021
74ab5b6
EQU and Mnemonic constant folding support.
chromapid Dec 20, 2021
292f737
DW and relative addressing constant folding support.
chromapid Dec 21, 2021
ad16df3
Fixed crash when an empty item is cleared.
chromapid Dec 21, 2021
434abb0
Minor formatting changes
chromapid Dec 21, 2021
874b7ae
Comments, more testing, and formatting.
chromapid Dec 21, 2021
ef1b9ee
Update CubotInventory.java
chromapid Dec 21, 2021
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
11 changes: 7 additions & 4 deletions src/main/java/net/simon987/mar/cubot/CubotInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,17 @@ public void putItem(Item item) {
private void scanItem() {
int x = getCpu().getRegisterSet().getRegister("X").getValue();
Item item = inventory.get(position);
item.digitize(unit.getCpu().getMemory(), x);
if (item != null) {
item.digitize(unit.getCpu().getMemory(), x);
}
}

public Item clearItem() {
Item item = inventory.get(position);
item.clear(unit);
inventory.remove(position);

if (item != null) {
item.clear(unit);
inventory.remove(position);
}
return item;
}

Expand Down
189 changes: 62 additions & 127 deletions src/main/java/net/simon987/mar/server/assembly/Assembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private static void checkForORGInstruction(String line, AssemblyResult result, i
String[] tokens = line.trim().split("\\s+");
String mnemonic = tokens[0];

if (mnemonic.toUpperCase().equals("ORG")) {
if (mnemonic.equalsIgnoreCase("ORG")) {
if (tokens.length > 1) {
try {
result.origin = (Integer.decode(tokens[1]));
Expand Down Expand Up @@ -124,6 +124,9 @@ private static boolean isLineEmpty(String line) {
return line.replaceAll("\\s+", "").isEmpty();
}


private static final Pattern DUP_PATTERN = Pattern.compile("(.+)\\s+DUP(.+)");
private static final Pattern STRING_PATTERN = Pattern.compile("\"(.*)\"$");
/**
* Parse the DW instruction (Define word). Handles DUP operator
*
Expand All @@ -132,15 +135,15 @@ private static boolean isLineEmpty(String line) {
* @param labels Map of labels
* @return Encoded instruction, null if the line is not a DW instruction
*/
private static byte[] parseDWInstruction(String line, HashMap<String, Character> labels, int currentLine)
private byte[] parseDWInstruction(String line, HashMap<String, Character> labels, int currentLine)
throws InvalidOperandException {

ByteArrayOutputStream bos = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(bos);

//System.out.println(line);

if (line.length() >= 2 && line.substring(0, 2).toUpperCase().equals("DW")) {
if (line.length() >= 2 && line.substring(0, 2).equalsIgnoreCase("DW")) {

try {

Expand All @@ -150,58 +153,50 @@ private static byte[] parseDWInstruction(String line, HashMap<String, Character>
for (String value : values) {

value = value.trim();

String[] valueTokens = value.split("\\s+");

//Handle DUP operator
if (valueTokens.length == 2 && valueTokens[1].toUpperCase().contains("DUP(")) {
out.write(parseDUPOperator16(valueTokens, labels, currentLine));
} else if (value.startsWith("\"") && value.endsWith("\"")) {
//Handle string

//Unescape the string
String string = value.substring(1, value.length() - 1);

Matcher m = STRING_PATTERN.matcher(value);
if (m.lookingAt()) {
// Parse string
String string = m.group(1);
try {
string = StringEscapeUtils.unescapeJava(string);
} catch (IllegalArgumentException e) {
throw new InvalidOperandException(
"Invalid string operand \"" + string + "\": " + e.getMessage(),
currentLine);
}

out.write(string.getBytes(StandardCharsets.UTF_16BE));
} else if (labels != null && labels.containsKey(value)) {
//Handle label
out.writeChar(labels.get(value));

} else {
//Handle integer value
continue;
}
int factor;
if (m.usePattern(DUP_PATTERN).lookingAt()) {
// Get DUP factor
TokenParser parser = new TokenParser(m.group(1), currentLine, new HashMap<>());
try {
out.writeChar(Integer.decode(value));

} catch (NumberFormatException e) {
//Handle assumed label
if (labels == null) {

// Write placeholder word
out.writeChar(0);

} else {

//Integer.decode failed, try binary
if (value.startsWith("0b")) {
try {
out.writeChar(Integer.parseInt(value.substring(2), 2));
} catch (NumberFormatException e2) {
throw new InvalidOperandException("Invalid operand \"" + value + '"', currentLine);
}
} else {
throw new InvalidOperandException("Invalid operand \"" + value + '"', currentLine);

}
if (TokenParser.TokenType.Constant !=
parser.getNextToken(true, TokenParser.ParseContext.Value)) {
throw new InvalidOperandException("Invalid DUP factor " + m.group(1), currentLine);
}
} catch (AssemblyException ae) {
throw new InvalidOperandException("Couldn't parse DUP factor " + m.group(1), currentLine);
}
factor = parser.lastInt;
if (factor > MEM_SIZE) {
throw new InvalidOperandException(
"Factor '" + factor + "' exceeds total memory size", currentLine);
}

value = m.group(2);
}
else {
// Parse as single number
factor = 1;
}

Operand operand = new Operand(value, labels, registerSet, currentLine);
char s = (char)operand.getData();
for (int i = 0; i < factor; i++) {
out.write(Util.getHigherByte(s));
out.write(Util.getLowerByte(s));
}
}

Expand All @@ -224,61 +219,10 @@ private static byte[] parseDWInstruction(String line, HashMap<String, Character>
* @param currentLine Current line number
* @return Encoded instruction, null if the line is not a DW instruction
*/
private static byte[] parseDWInstruction(String line, int currentLine) throws AssemblyException {
private byte[] parseDWInstruction(String line, int currentLine) throws AssemblyException {
return parseDWInstruction(line, null, currentLine);
}

/**
* Parse the dup operator
*
* @param valueTokens Value tokens e.g. {"8", "DUP(12)"}
* @param labels Map of labels
* @return The encoded instruction
*/
private static byte[] parseDUPOperator16(String[] valueTokens, HashMap<String, Character> labels, int currentLine)
throws InvalidOperandException {

ByteArrayOutputStream out = new ByteArrayOutputStream();

try {

int factor = Integer.decode(valueTokens[0]);

if (factor > MEM_SIZE) {
throw new InvalidOperandException("Factor '" + factor + "' exceeds total memory size", currentLine);
}

String value = valueTokens[1].substring(4, valueTokens[1].lastIndexOf(')'));

//Handle label
if (labels != null && labels.containsKey(value)) {
//Label value is casted to byte
for (int i = 0; i < factor; i++) {
char s = labels.get(value);

out.write(Util.getHigherByte(s));
out.write(Util.getLowerByte(s));
}

} else {
//Handle integer value
char s = (char) (int) Integer.decode(value);

for (int i = 0; i < factor; i++) {
out.write(Util.getHigherByte(s));
out.write(Util.getLowerByte(s));
}
}


} catch (NumberFormatException e) {
throw new InvalidOperandException("Usage: <factor> DUP(<value>)", currentLine);
}

return out.toByteArray();

}

/**
* Check for and handle section declarations (.text and .data)
*
Expand All @@ -289,13 +233,13 @@ private void checkForSectionDeclaration(String line, AssemblyResult result,

String[] tokens = line.split("\\s+");

if (tokens[0].toUpperCase().equals(".TEXT")) {
if (tokens[0].equalsIgnoreCase(".TEXT")) {

result.defineSection(Section.TEXT, currentLine, currentOffset);
result.disassemblyLines.add(".text");
throw new PseudoInstructionException(currentLine);

} else if (tokens[0].toUpperCase().equals(".DATA")) {
} else if (tokens[0].equalsIgnoreCase(".DATA")) {

LogManager.LOGGER.fine("DEBUG: .data @" + currentLine);

Expand All @@ -304,37 +248,35 @@ private void checkForSectionDeclaration(String line, AssemblyResult result,
}
}

private static final Pattern EQU_PATTERN = Pattern.compile("([\\w]+)\\s+EQU\\s+(.+)",
Pattern.CASE_INSENSITIVE);

/**
* Check for and handle the EQU instruction
*
* @param line Current line. The method is assuming that comments and labels are removed
* @param labels Map of labels. Constants will be added as labels
* @param currentLine Current line number
*/
private static void checkForEQUInstruction(String line, HashMap<String, Character> labels, int currentLine)
private static void checkForEQUInstruction(String line, HashMap<String, Character> labels,
int currentLine)
throws AssemblyException {
/* the EQU pseudo instruction is equivalent to the #define compiler directive in C/C++
* usage: constant_name EQU <immediate_value>
* A constant treated the same way as a label.
*/
line = line.trim();
String[] tokens = line.split("\\s+");

Matcher matcher = EQU_PATTERN.matcher(line);

if (line.toUpperCase().matches(".*\\bEQU\\b.*")) {
if (tokens[1].toUpperCase().equals("EQU") && tokens.length == 3) {
try {
//Save value as a label
labels.put(tokens[0], (char) (int) Integer.decode(tokens[2]));
} catch (NumberFormatException e) {
throw new InvalidOperandException("Usage: constant_name EQU immediate_value", currentLine);
}
} else {
throw new InvalidOperandException("Usage: constant_name EQU immediate_value", currentLine);
}

if (matcher.lookingAt()) {
//Save value as a label
TokenParser parser = new TokenParser(matcher.group(2), currentLine, labels);
char value = (char)parser.parseConstExpression();
labels.put(matcher.group(1), value);
throw new PseudoInstructionException(currentLine);
}

}

/**
Expand All @@ -348,9 +290,6 @@ private static void checkForEQUInstruction(String line, HashMap<String, Characte
* the errors, if any.
*/
public AssemblyResult parse(String text) {

int currentLine;

//Split in lines
AssemblyResult result = new AssemblyResult(config);
String[] lines = text.split("\n");
Expand Down Expand Up @@ -541,19 +480,15 @@ private byte[] parseInstruction(AssemblyResult result, String line, int currentL

//Check for DW instruction
try {
if (assumeLabels) {
byte[] bytes = parseDWInstruction(line, currentLine);
if (bytes != null) {
out.write(bytes);
return out.toByteArray();
}
} else {
byte[] bytes = parseDWInstruction(line, labels, currentLine);
if (bytes != null) {
out.write(bytes);
return out.toByteArray();
}
byte[] bytes;
if (assumeLabels) bytes = parseDWInstruction(line, currentLine);
else bytes = parseDWInstruction(line, labels, currentLine);

if (bytes != null) {
out.write(bytes);
return out.toByteArray();
}

} catch (IOException e) {
e.printStackTrace();
}
Expand Down
Loading