Compare commits
2 Commits
callInstru
...
XorlwInstr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bbe1229670 | ||
|
|
0d1db917c0 |
@@ -3,22 +3,16 @@ package de.darkress.pic16f84sim;
|
||||
import de.darkress.pic16f84sim.commands.Command;
|
||||
import de.darkress.pic16f84sim.decoder.CommandDecoder;
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
class Main
|
||||
{
|
||||
public static void main(String[] args) {
|
||||
|
||||
ArrayList<Command> program = new ArrayList<>();
|
||||
Memory.workingRegister = 0xAA;
|
||||
int input1 = 0x27FF;
|
||||
int input1 = 0x3AFF;
|
||||
program.add(CommandDecoder.decode(input1));
|
||||
|
||||
Memory.setPCLATH(0xFF);
|
||||
program.get(0).execute();
|
||||
|
||||
//ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Addlw extends CommandUtils implements Command
|
||||
{
|
||||
@@ -22,6 +21,5 @@ public class Addlw extends CommandUtils implements Command
|
||||
checkDigitCarryBit(literal);
|
||||
|
||||
Memory.workingRegister = result % 256;
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
import de.darkress.pic16f84sim.microcontroller.Stack;
|
||||
|
||||
public class Call extends CommandUtils implements Command
|
||||
{
|
||||
private final int literal;
|
||||
|
||||
public Call(int input)
|
||||
{
|
||||
literal = input & 0x07FF;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
Stack.push(ProgramCounter.getPc() + 1);
|
||||
ProgramCounter.setPcFrom11BitLiteral(literal);
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Goto extends CommandUtils implements Command
|
||||
{
|
||||
private final int literal;
|
||||
|
||||
public Goto(int input)
|
||||
{
|
||||
literal = input & 0x07FF;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
ProgramCounter.setPcFrom11BitLiteral(literal);
|
||||
}
|
||||
}
|
||||
@@ -100,9 +100,11 @@ public class CommandDecoder
|
||||
switch(input & 0x3800)
|
||||
{
|
||||
case 0x2000:
|
||||
return new Call(input);
|
||||
//call();
|
||||
break;
|
||||
case 0x2800:
|
||||
return new Goto(input);
|
||||
//goto();
|
||||
break;
|
||||
}
|
||||
|
||||
switch(input & 0x3C00)
|
||||
|
||||
@@ -91,28 +91,6 @@ public class Memory
|
||||
return memory[0x4];
|
||||
}
|
||||
|
||||
public static int getPCL()
|
||||
{
|
||||
return memory[0x2];
|
||||
}
|
||||
|
||||
public static void setPCL(int data)
|
||||
{
|
||||
memory[0x2] = data;
|
||||
memory[0x82] = data;
|
||||
}
|
||||
|
||||
public static int getPCLATH()
|
||||
{
|
||||
return memory[0xA] & 0x1F;
|
||||
}
|
||||
|
||||
public static void setPCLATH(int data)
|
||||
{
|
||||
memory[0xA] = data & 0x1F;
|
||||
memory[0x8A] = data & 0x1F;
|
||||
}
|
||||
|
||||
public static boolean getZeroBit()
|
||||
{
|
||||
return (memory[0x03] & 0x04) == 0x04;
|
||||
@@ -121,7 +99,6 @@ public class Memory
|
||||
public static void setZeroBit()
|
||||
{
|
||||
memory[0x03] |= 0x04;
|
||||
memory[0x83] |= 0x04;
|
||||
}
|
||||
|
||||
public static void clearZeroBit()
|
||||
@@ -137,7 +114,6 @@ public class Memory
|
||||
public static void setDigitCarryBit()
|
||||
{
|
||||
memory[0x03] |= 0x02;
|
||||
memory[0x83] |= 0x02;
|
||||
}
|
||||
|
||||
public static void clearDigitCarryBit()
|
||||
@@ -153,7 +129,6 @@ public class Memory
|
||||
public static void setCarryBit()
|
||||
{
|
||||
memory[0x03] |= 0x01;
|
||||
memory[0x83] |= 0x01;
|
||||
}
|
||||
|
||||
public static void clearCarryBit()
|
||||
|
||||
@@ -4,35 +4,20 @@ public class ProgramCounter
|
||||
|
||||
//This class is not actual part of the µC. It is a storage for the current value of the PC
|
||||
{
|
||||
private static int pc = 0;
|
||||
private static int PC = 0;
|
||||
|
||||
public static int getPc()
|
||||
public static int getPC()
|
||||
{
|
||||
return pc;
|
||||
return PC;
|
||||
}
|
||||
|
||||
public static void setPcFrom11BitLiteral(int data)
|
||||
public static void setPC(int PC)
|
||||
{
|
||||
int pcl = data & 0x00FF;
|
||||
int pch = Memory.getPCLATH();
|
||||
pch = ((pch & 0xF8) <<8) + (data & 0x700);
|
||||
Memory.setPCL(pcl);
|
||||
pc = (pch) + pcl;
|
||||
ProgramCounter.PC = PC;
|
||||
}
|
||||
|
||||
public static void incPC() //is called after every instruction execution
|
||||
public static void incPC()
|
||||
{
|
||||
int pcl = Memory.getPCL();
|
||||
int pclath = Memory.getPCLATH();
|
||||
if(pcl == 0xFF)
|
||||
{
|
||||
pclath++;
|
||||
pcl = 0;
|
||||
} else {
|
||||
pcl++;
|
||||
}
|
||||
Memory.setPCL(pcl);
|
||||
Memory.setPCLATH(pclath);
|
||||
pc = (pclath <<8) + pcl;
|
||||
PC++;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user