Compare commits
6 Commits
swapfInstr
...
btfssInstr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f1ba4e9e6 | ||
|
|
5cb1573a08 | ||
|
|
d11f1b06f6 | ||
|
|
fa89faa979 | ||
|
|
b10ad35ae8 | ||
|
|
b298b97652 |
@@ -13,8 +13,8 @@ class Main
|
||||
|
||||
ArrayList<Command> program = new ArrayList<>();
|
||||
Memory.workingRegister = 0x01;
|
||||
Memory.setRegister(0x14, 0x01); //240 << 224
|
||||
program.add(CommandDecoder.decode(0x0294));
|
||||
Memory.setRegister(0x14, 0xA7); //240 << 224
|
||||
program.add(CommandDecoder.decode(0x1C94));
|
||||
for(int i = 0; i < program.size(); i++)
|
||||
{
|
||||
program.get(ProgramCounter.getPc()).execute();
|
||||
|
||||
26
de/darkress/pic16f84sim/commands/Bcf.java
Normal file
26
de/darkress/pic16f84sim/commands/Bcf.java
Normal file
@@ -0,0 +1,26 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Bcf extends BitOrientedCommandUtils implements Command
|
||||
{
|
||||
private final int address;
|
||||
private int bitPlacement;
|
||||
|
||||
public Bcf(int input)
|
||||
{
|
||||
address = input & 0x007F;
|
||||
bitPlacement = checkBitPlacement(input);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
int result = Memory.getRegister(address);
|
||||
result &= ~(1 << bitPlacement); //Mask n-th bit with 0
|
||||
|
||||
Memory.setRegister(address, result);
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
|
||||
public class BitOrientedCommandUtils
|
||||
{
|
||||
protected int checkBitPlacement(int input)
|
||||
{
|
||||
return ((input & 0x0380) >>7);
|
||||
}
|
||||
}
|
||||
26
de/darkress/pic16f84sim/commands/Bsf.java
Normal file
26
de/darkress/pic16f84sim/commands/Bsf.java
Normal file
@@ -0,0 +1,26 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Bsf extends BitOrientedCommandUtils implements Command
|
||||
{
|
||||
private final int address;
|
||||
private int bitPlacement;
|
||||
|
||||
public Bsf(int input)
|
||||
{
|
||||
address = input & 0x007F;
|
||||
bitPlacement = checkBitPlacement(input);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
int result = Memory.getRegister(address);
|
||||
result |= (1 << bitPlacement);
|
||||
|
||||
Memory.setRegister(address, result);
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
29
de/darkress/pic16f84sim/commands/Btfsc.java
Normal file
29
de/darkress/pic16f84sim/commands/Btfsc.java
Normal file
@@ -0,0 +1,29 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Btfsc extends BitOrientedCommandUtils implements Command
|
||||
{
|
||||
private final int address;
|
||||
private int bitPlacement;
|
||||
|
||||
public Btfsc(int input)
|
||||
{
|
||||
address = input & 0x007F;
|
||||
bitPlacement = checkBitPlacement(input);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
int result = Memory.getRegister(address);
|
||||
|
||||
if((result & (1 << bitPlacement)) == 0) //Test if bit is clear
|
||||
{
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
29
de/darkress/pic16f84sim/commands/Btfss.java
Normal file
29
de/darkress/pic16f84sim/commands/Btfss.java
Normal file
@@ -0,0 +1,29 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Btfss extends BitOrientedCommandUtils implements Command
|
||||
{
|
||||
private final int address;
|
||||
private int bitPlacement;
|
||||
|
||||
public Btfss(int input)
|
||||
{
|
||||
address = input & 0x007F;
|
||||
bitPlacement = checkBitPlacement(input);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
int result = Memory.getRegister(address);
|
||||
|
||||
if((result & (1 << bitPlacement)) > 0) //Test if bit is set
|
||||
{
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
|
||||
if((result % 256) == 0)
|
||||
{
|
||||
Nop nop = new Nop();
|
||||
nop.execute();
|
||||
nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
|
||||
}
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
|
||||
if((result % 256) == 0)
|
||||
{
|
||||
Nop nop = new Nop();
|
||||
nop.execute();
|
||||
nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
|
||||
}
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
|
||||
27
de/darkress/pic16f84sim/commands/Swapf.java
Normal file
27
de/darkress/pic16f84sim/commands/Swapf.java
Normal file
@@ -0,0 +1,27 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Swapf extends FileRegisterCommandUtils implements Command
|
||||
{
|
||||
private final int address;
|
||||
private final boolean destinationBit;
|
||||
|
||||
public Swapf(int input)
|
||||
{
|
||||
address = input & 0x007F;
|
||||
destinationBit = checkDestinationBit(input);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
int result = (Memory.getRegister(address) <<4) & 0xF0;
|
||||
int tmp = Memory.getRegister(address) >>4;
|
||||
result += tmp;
|
||||
|
||||
writeToDestination(destinationBit, address, result);
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
27
de/darkress/pic16f84sim/commands/Xorwf.java
Normal file
27
de/darkress/pic16f84sim/commands/Xorwf.java
Normal file
@@ -0,0 +1,27 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Xorwf extends FileRegisterCommandUtils implements Command
|
||||
{
|
||||
private final int address;
|
||||
private final boolean destinationBit;
|
||||
|
||||
public Xorwf(int input)
|
||||
{
|
||||
address = input & 0x007F;
|
||||
destinationBit = checkDestinationBit(input);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
int result = Memory.getRegister(address) ^ Memory.workingRegister;
|
||||
|
||||
checkZeroBit(result);
|
||||
|
||||
writeToDestination(destinationBit, address, result);
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
@@ -33,11 +33,9 @@ public class CommandDecoder
|
||||
case 0x200:
|
||||
return new Subwf(input);
|
||||
case 0xE00:
|
||||
//swapf();
|
||||
break;
|
||||
return new Swapf(input);
|
||||
case 0x600:
|
||||
//xorwf();
|
||||
break;
|
||||
return new Xorwf(input);
|
||||
case 0x3900:
|
||||
return new Andlw(input);
|
||||
case 0x3800:
|
||||
@@ -59,25 +57,19 @@ public class CommandDecoder
|
||||
switch(input & 0x3C00)
|
||||
{
|
||||
case 0x1000:
|
||||
//bcf();
|
||||
break;
|
||||
return new Bcf(input);
|
||||
case 0x1400:
|
||||
//bsf();
|
||||
break;
|
||||
return new Bsf(input);
|
||||
case 0x1800:
|
||||
//btfsc();
|
||||
break;
|
||||
return new Btfsc(input);
|
||||
case 0x1C00:
|
||||
//btfss();
|
||||
break;
|
||||
return new Btfss(input);
|
||||
}
|
||||
|
||||
switch(input & 0x3E00)
|
||||
{
|
||||
case 0x3E00:
|
||||
//addlw();
|
||||
return new Addlw(input);
|
||||
//break;
|
||||
case 0x3C00:
|
||||
return new Sublw(input);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user