simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-14 15:19:04 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #107

Browse Source
This commit is contained in:
simon
2018-01-05 22:08:53 -05:00
parent c7b9df0690
commit 24d81d194e
8 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Server/src/main/java/net/simon987/server/assembly/Assembler.java
View File

@@ -175,7 +175,18 @@ public class Assembler {
out.writeChar(0);
} else {
throw new InvalidOperandException("Invalid operand \"" + value + '"', currentLine);
//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);
}
}
}
}

21
Server/src/main/java/net/simon987/server/assembly/Operand.java
View File

@@ -224,11 +224,30 @@ public class Operand {
}
//label is invalid
data = Integer.decode(expr);
value += registerSet.size() * 2; //refers to memory with disp
return true;
} catch (NumberFormatException e) {
//Integer.decode failed, try binary
if (expr.startsWith("+0b")) {
try {
data = Integer.parseInt(expr.substring(3), 2);
value += registerSet.size() * 2; //refers to memory with disp
return true;
} catch (NumberFormatException e2) {
return false;
}
} else if (expr.startsWith("-0b")) {
try {
data = -Integer.parseInt(expr.substring(3), 2);
value += registerSet.size() * 2; //refers to memory with disp
return true;
} catch (NumberFormatException e2) {
return false;
}
}
return false;
}
}

3
Server/src/main/java/net/simon987/server/webserver/MessageEventDispatcher.java
View File

@@ -35,6 +35,9 @@ public class MessageEventDispatcher {
handler.handle(user, json);
} catch (WebsocketNotConnectedException e) {
LogManager.LOGGER.fine("Catched WebsocketNotConnectedException");
} catch (Exception e1) {
LogManager.LOGGER.severe(e1.getMessage());
e1.printStackTrace();
}
}
} else {