simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-24 13:05:51 +00:00
Code Issues Projects Releases Wiki Activity

Bug fix with [reg] as source operand

Browse Source
This commit is contained in:
simon 2017-11-16 18:41:57 -05:00
parent c703dec3cf
commit e09d2c1b16
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Server/src/net/simon987/server/assembly/CPU.java
View File

@ -62,8 +62,8 @@ public class CPU implements JSONSerialisable{
private int registerSetSize; private int registerSetSize;
private static final char EXECUTION_COST_ADDR = 0x0300; private static final char EXECUTION_COST_ADDR = 0x0050;
private static final char EXECUTED_INS_ADDR = 0x0301; private static final char EXECUTED_INS_ADDR = 0x0051;
/** /**
* Creates a new CPU * Creates a new CPU
@ -128,13 +128,13 @@ public class CPU implements JSONSerialisable{
counter++; counter++;
if (counter % 10000 == 0) { if (counter % 10000 == 0) {
if (System.currentTimeMillis() >= (startTime + timeout)) { if (System.currentTimeMillis() > (startTime + timeout)) {
LogManager.LOGGER.fine("CPU Timeout " + this + " after " + counter + "instructions (" + timeout + "ms): " + (double) counter / ((double) timeout / 1000) / 1000000 + "MHz"); LogManager.LOGGER.fine("CPU Timeout " + this + " after " + counter + "instructions (" + timeout + "ms): " + (double) counter / ((double) timeout / 1000) / 1000000 + "MHz");
//Write execution cost and instruction count to memory //Write execution cost and instruction count to memory
memory.set(EXECUTION_COST_ADDR, timeout); memory.set(EXECUTION_COST_ADDR, timeout);
memory.set(EXECUTED_INS_ADDR, Util.getHigherWord(counter)); memory.set(EXECUTED_INS_ADDR, Util.getHigherWord(counter));
memory.set(EXECUTED_INS_ADDR, Util.getLowerWord(counter)); memory.set(EXECUTED_INS_ADDR + 1, Util.getLowerWord(counter));
return timeout; return timeout;
} }
@ -164,7 +164,7 @@ public class CPU implements JSONSerialisable{
//Write execution cost and instruction count to memory //Write execution cost and instruction count to memory
memory.set(EXECUTION_COST_ADDR, elapsed); memory.set(EXECUTION_COST_ADDR, elapsed);
memory.set(EXECUTED_INS_ADDR, Util.getHigherWord(counter)); memory.set(EXECUTED_INS_ADDR, Util.getHigherWord(counter));
memory.set(EXECUTED_INS_ADDR, Util.getLowerWord(counter)); memory.set(EXECUTED_INS_ADDR + 1, Util.getLowerWord(counter));
return elapsed; return elapsed;
} }
@ -295,7 +295,7 @@ public class CPU implements JSONSerialisable{
} else if (destination <= registerSetSize) { } else if (destination <= registerSetSize) {
//Destination is a register //Destination is a register
ip++; ip++;
instruction.execute(registerSet, destination, memory, registerSet.get(source), status); instruction.execute(registerSet, destination, memory, registerSet.get(source - registerSetSize), status);
} else if (destination <= registerSetSize * 2) { } else if (destination <= registerSetSize * 2) {
//Destination is [reg] //Destination is [reg]
ip++; ip++;