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

Added memory location option for LiDAR GET_PATH. Fixes #140

Browse Source
This commit is contained in:
Simon
2018-11-27 13:52:00 -05:00
parent 04c837d692
commit b361583252
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,9 +540,10 @@ public class Assembler {
}
//Check operands and encode instruction
final int beginIndex = line.indexOf(mnemonic) + mnemonic.length();
if (line.contains(",")) {
//2 operands
String strO1 = line.substring(line.indexOf(mnemonic) + mnemonic.length(), line.indexOf(','));
String strO1 = line.substring(beginIndex, line.indexOf(','));
String strO2 = line.substring(line.indexOf(','));
Operand o1, o2;
@@ -562,7 +563,7 @@ public class Assembler {
} else if (tokens.length > 1) {
//1 operand
String strO1 = line.substring(line.indexOf(mnemonic) + mnemonic.length());
String strO1 = line.substring(beginIndex);
Operand o1;
if (assumeLabels) {
@@ -583,6 +584,5 @@ public class Assembler {
}
return out.toByteArray();
}
}

2
Server/src/main/resources/config.properties
View File

@@ -9,7 +9,7 @@ keyStore_password=
#Server
mar_address=ws://localhost:4567/socket
server_name=MAR dev
# ALLOW | TEMPORARY | BLOCK
# ALLOW | BLOCK
guest_policy=ALLOW
#Database