Somewhat working timer. Increases one instruction too early
This commit is contained in:
@@ -4,6 +4,13 @@ import java.util.Arrays;
|
||||
|
||||
public class Memory
|
||||
{
|
||||
public static void initMemory()
|
||||
{
|
||||
Memory.memory[0x81] = 0xFF; //Option
|
||||
Memory.memory[0x85] = 0x1F; //TrisA
|
||||
Memory.memory[0x86] = 0xFF; //TrisB
|
||||
Memory.setRegister(0x03, 0x18); //Status
|
||||
}
|
||||
private static final int MEMORY_SIZE = 0xFF; //Addressable Memory
|
||||
public static int workingRegister = 0;
|
||||
private static final int[] memory = new int[MEMORY_SIZE];
|
||||
@@ -52,13 +59,18 @@ public class Memory
|
||||
memory[address] = data;
|
||||
return;
|
||||
}
|
||||
if((Arrays.stream(bank1UniqueSpecialRegister).anyMatch(x -> x == address)) && getRegisterBank() == 1)
|
||||
if((Arrays.stream(bank0UniqueSpecialRegister).anyMatch(x -> x == address)) && getRegisterBank() == 1) //bank0
|
||||
// because of 7 Bit address
|
||||
{
|
||||
memory[address + 128] = data;
|
||||
return;
|
||||
}
|
||||
memory[address] = data;
|
||||
memory[address + 128] = data; //Ensure data is written to both banks to simulate mapping
|
||||
if(address == 0x01) //Reset PrescalerCounter if change on Option or Timer Register
|
||||
{
|
||||
Timer.resetTimeToTimerIncrease();
|
||||
}
|
||||
if(address == 0x2) //Check if PCL is destination
|
||||
{
|
||||
ProgramCounter.loadPc();
|
||||
@@ -79,7 +91,11 @@ public class Memory
|
||||
}
|
||||
memory[address % 128] = data; // else: Registers.Registers which are mapped
|
||||
memory[address % 128 + 128] = data; //Ensure data is written to both banks to simulate mapping
|
||||
if(address == 0x2) //Check if PCL is destination
|
||||
if(address == 0x81 || address == 0x01) //Reset PrescalerCounter if change on Option or Timer Register
|
||||
{
|
||||
Timer.resetTimeToTimerIncrease();
|
||||
}
|
||||
if(address == 0x2 || address == 0x82) //Check if PCL is destination
|
||||
{
|
||||
ProgramCounter.loadPc();
|
||||
}
|
||||
@@ -126,6 +142,16 @@ public class Memory
|
||||
return memory[0x81];
|
||||
}
|
||||
|
||||
public static int getTimer()
|
||||
{
|
||||
return memory[0x01];
|
||||
}
|
||||
|
||||
public static void setTimer(int data)
|
||||
{
|
||||
memory[0x01] = data;
|
||||
}
|
||||
|
||||
public static boolean getZeroBit()
|
||||
{
|
||||
return (memory[0x03] & 0x04) == 0x04;
|
||||
|
||||
Reference in New Issue
Block a user