Compare commits

..

11 Commits

Author SHA1 Message Date
darkress
97e2c26d01 increase Cycles after every Instruction 2023-06-12 13:34:25 +02:00
darkress
2a24c2058f increment PC after every Instruction (#29)
Co-authored-by: darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#29
2023-06-12 13:24:46 +02:00
darkress
184c49f3ae implemented btfss Instruction (#28)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#28
2023-06-07 21:34:23 +02:00
darkress
5cb1573a08 implemented btfsc Instruction (#27)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#27
2023-06-07 21:31:11 +02:00
darkress
d11f1b06f6 implemented bsf Instruction (#26)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#26
2023-06-07 21:19:12 +02:00
darkress
fa89faa979 implemented bcfInstruction (#25)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#25
2023-06-07 20:50:48 +02:00
darkress
b10ad35ae8 Added Xorwf Instruction (#24)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#24
2023-06-07 20:21:28 +02:00
darkress
b298b97652 Added swapf Instruction (#23)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#23
2023-06-07 20:17:31 +02:00
darkress
d8ed3ab9b1 implemented subwf Instruction (#22)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#22
2023-06-06 07:35:12 +02:00
darkress
d25a66134a implemented Rrf Instruction (#21)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#21
2023-06-06 02:42:28 +02:00
darkress
01bd5acb46 implemented Rlf Instruction (#20)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#20
2023-06-06 02:22:29 +02:00
37 changed files with 368 additions and 31 deletions

View File

@@ -12,9 +12,9 @@ class Main
public static void main(String[] args) { public static void main(String[] args) {
ArrayList<Command> program = new ArrayList<>(); ArrayList<Command> program = new ArrayList<>();
Memory.clearCarryBit(); Memory.workingRegister = 0x01;
Memory.setRegister(0x14, 0B11110000); //240 << 224 Memory.setRegister(0x14, 0xA7); //240 << 224
program.add(CommandDecoder.decode(0x0D94)); program.add(CommandDecoder.decode(0x1C94));
for(int i = 0; i < program.size(); i++) for(int i = 0; i < program.size(); i++)
{ {
program.get(ProgramCounter.getPc()).execute(); program.get(ProgramCounter.getPc()).execute();

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -23,5 +24,6 @@ public class Addlw extends LiteralCommandUtils implements Command
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -25,5 +26,6 @@ public class Addwf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result); writeToDestination(destinationBit, address, result);
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,6 +1,8 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Andlw extends LiteralCommandUtils implements Command public class Andlw extends LiteralCommandUtils implements Command
{ {
@@ -18,5 +20,7 @@ public class Andlw extends LiteralCommandUtils implements Command
checkZeroBit(result); checkZeroBit(result);
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -23,5 +24,6 @@ public class Andwf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result); writeToDestination(destinationBit, address, result);
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -0,0 +1,28 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
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();
Cycles.addToCycles(1);
}
}

View File

@@ -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);
}
}

View File

@@ -0,0 +1,28 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
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();
Cycles.addToCycles(1);
}
}

View File

@@ -0,0 +1,32 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
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();
Cycles.addToCycles(1);
}
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

View File

@@ -0,0 +1,32 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
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();
Cycles.addToCycles(1);
}
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
import de.darkress.pic16f84sim.microcontroller.Stack; import de.darkress.pic16f84sim.microcontroller.Stack;
@@ -17,5 +18,6 @@ public class Call extends LiteralCommandUtils implements Command
{ {
Stack.push(ProgramCounter.getPc() + 1); Stack.push(ProgramCounter.getPc() + 1);
ProgramCounter.setPcFrom11BitLiteral(literal); ProgramCounter.setPcFrom11BitLiteral(literal);
Cycles.addToCycles(2);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -23,5 +24,6 @@ public class Clrf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result); writeToDestination(destinationBit, address, result);
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -14,5 +15,6 @@ public class Clrw extends FileRegisterCommandUtils implements Command
Memory.workingRegister = result; Memory.workingRegister = result;
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -23,5 +24,6 @@ public class Comf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result); writeToDestination(destinationBit, address, result);
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -23,5 +24,6 @@ public class Decf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result % 256); // Catch underflow writeToDestination(destinationBit, address, result % 256); // Catch underflow
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -25,9 +26,10 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
if((result % 256) == 0) if((result % 256) == 0)
{ {
Nop nop = new Nop(); ProgramCounter.incPC();
nop.execute(); Cycles.addToCycles(1);
} }
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Goto extends LiteralCommandUtils implements Command public class Goto extends LiteralCommandUtils implements Command
@@ -15,5 +16,6 @@ public class Goto extends LiteralCommandUtils implements Command
public void execute() public void execute()
{ {
ProgramCounter.setPcFrom11BitLiteral(literal); ProgramCounter.setPcFrom11BitLiteral(literal);
Cycles.addToCycles(2);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -23,5 +24,6 @@ public class Incf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result % 256); // Catch underflow writeToDestination(destinationBit, address, result % 256); // Catch underflow
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -25,9 +26,10 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
if((result % 256) == 0) if((result % 256) == 0)
{ {
Nop nop = new Nop(); ProgramCounter.incPC();
nop.execute(); Cycles.addToCycles(1);
} }
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,6 +1,8 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Iorlw extends LiteralCommandUtils implements Command public class Iorlw extends LiteralCommandUtils implements Command
{ {
@@ -18,5 +20,7 @@ public class Iorlw extends LiteralCommandUtils implements Command
checkZeroBit(result); checkZeroBit(result);
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -23,5 +24,6 @@ public class Iorwf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result); writeToDestination(destinationBit, address, result);
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -23,5 +24,6 @@ public class Movf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result); writeToDestination(destinationBit, address, result);
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -17,5 +18,6 @@ public class Movlw extends LiteralCommandUtils implements Command
{ {
Memory.workingRegister = literal; Memory.workingRegister = literal;
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -21,5 +22,6 @@ public class Movwf extends FileRegisterCommandUtils implements Command
writeToDestination(destinationBit, address, result); writeToDestination(destinationBit, address, result);
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Nop extends LiteralCommandUtils implements Command public class Nop extends LiteralCommandUtils implements Command
@@ -10,5 +11,6 @@ public class Nop extends LiteralCommandUtils implements Command
{ {
// Do nothing, just increment the PC // Do nothing, just increment the PC
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
import de.darkress.pic16f84sim.microcontroller.Stack; import de.darkress.pic16f84sim.microcontroller.Stack;
@@ -18,5 +19,6 @@ public class Retlw extends LiteralCommandUtils implements Command
{ {
Memory.workingRegister = literal; Memory.workingRegister = literal;
ProgramCounter.setPcFromStack(Stack.pop()); ProgramCounter.setPcFromStack(Stack.pop());
Cycles.addToCycles(2);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
import de.darkress.pic16f84sim.microcontroller.Stack; import de.darkress.pic16f84sim.microcontroller.Stack;
@@ -9,5 +10,6 @@ public class Return extends LiteralCommandUtils implements Command
public void execute() public void execute()
{ {
ProgramCounter.setPcFromStack(Stack.pop()); ProgramCounter.setPcFromStack(Stack.pop());
Cycles.addToCycles(2);
} }
} }

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
@@ -18,19 +19,19 @@ public class Rlf extends FileRegisterCommandUtils implements Command
public void execute() public void execute()
{ {
int register = Memory.getRegister(address); int register = Memory.getRegister(address);
int carry = Memory.getCarryBit(); int newCarry = register >>7;
int tmp = carry; int oldCarry = Memory.getCarryBit();
carry = register >>7; register = ((register <<1) + oldCarry) & 0xFF;
register = ((register <<1) + tmp) & 0xFF;
if(carry == 1) if(newCarry == 1)
{ {
Memory.setCarryBit(); Memory.setCarryBit();
} else if(carry == 0){ } else if(newCarry == 0){
Memory.clearCarryBit(); Memory.clearCarryBit();
} }
writeToDestination(destinationBit, address, register); writeToDestination(destinationBit, address, register);
ProgramCounter.incPC(); ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -0,0 +1,37 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Rrf extends FileRegisterCommandUtils implements Command
{
private final int address;
private final boolean destinationBit;
public Rrf(int input)
{
address = input & 0x007F;
destinationBit = checkDestinationBit(input);
}
@Override
public void execute()
{
int register = Memory.getRegister(address);
int newCarry = register & 0x01;
int oldCarry = Memory.getCarryBit();
register = (oldCarry << 7) + (register >>1);
if(newCarry == 1)
{
Memory.setCarryBit();
} else if(newCarry == 0){
Memory.clearCarryBit();
}
writeToDestination(destinationBit, address, register);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

View File

@@ -1,6 +1,8 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Sublw extends LiteralCommandUtils implements Command public class Sublw extends LiteralCommandUtils implements Command
{ {
@@ -41,5 +43,7 @@ public class Sublw extends LiteralCommandUtils implements Command
checkDigitCarryBit(literal); checkDigitCarryBit(literal);
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -0,0 +1,51 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Subwf extends FileRegisterCommandUtils implements Command
{
private final int address;
private final boolean destinationBit;
public Subwf(int input)
{
address = input & 0x007F;
destinationBit = checkDestinationBit(input);
}
@Override
protected void checkCarryBit(int result)
{
if(result <= 255){
Memory.clearCarryBit();
} else{
Memory.setCarryBit();
}
}
@Override
protected void checkDigitCarryBit(int literal)
{
if(((literal & 0x0F) - (Memory.workingRegister & 0x0F)) < 0){
Memory.clearDigitCarryBit();
} else{
Memory.setDigitCarryBit();
}
}
@Override
public void execute()
{
int result = Memory.getRegister(address) - Memory.workingRegister + 256;
checkZeroBit(result);
checkCarryBit(result);
checkDigitCarryBit(Memory.getRegister(address));
writeToDestination(destinationBit, address, result % 256);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

View File

@@ -0,0 +1,29 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
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();
Cycles.addToCycles(1);
}
}

View File

@@ -1,6 +1,8 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Xorlw extends LiteralCommandUtils implements Command public class Xorlw extends LiteralCommandUtils implements Command
{ {
@@ -18,5 +20,7 @@ public class Xorlw extends LiteralCommandUtils implements Command
checkZeroBit(result); checkZeroBit(result);
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
} }
} }

View File

@@ -0,0 +1,29 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
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();
Cycles.addToCycles(1);
}
}

View File

@@ -29,17 +29,13 @@ public class CommandDecoder
case 0xD00: case 0xD00:
return new Rlf(input); return new Rlf(input);
case 0xC00: case 0xC00:
//rrf(); return new Rrf(input);
break;
case 0x200: case 0x200:
//subwf(); return new Subwf(input);
break;
case 0xE00: case 0xE00:
//swapf(); return new Swapf(input);
break;
case 0x600: case 0x600:
//xorwf(); return new Xorwf(input);
break;
case 0x3900: case 0x3900:
return new Andlw(input); return new Andlw(input);
case 0x3800: case 0x3800:
@@ -61,25 +57,19 @@ public class CommandDecoder
switch(input & 0x3C00) switch(input & 0x3C00)
{ {
case 0x1000: case 0x1000:
//bcf(); return new Bcf(input);
break;
case 0x1400: case 0x1400:
//bsf(); return new Bsf(input);
break;
case 0x1800: case 0x1800:
//btfsc(); return new Btfsc(input);
break;
case 0x1C00: case 0x1C00:
//btfss(); return new Btfss(input);
break;
} }
switch(input & 0x3E00) switch(input & 0x3E00)
{ {
case 0x3E00: case 0x3E00:
//addlw();
return new Addlw(input); return new Addlw(input);
//break;
case 0x3C00: case 0x3C00:
return new Sublw(input); return new Sublw(input);
} }

View File

@@ -0,0 +1,14 @@
package de.darkress.pic16f84sim.microcontroller;
public class Cycles {
private static int cycles = 0;
public static void addToCycles(int increase)
{
cycles += increase;
}
public static int getCycles() {
return cycles;
}
}

View File

@@ -62,6 +62,7 @@ public class Memory
if(address == 0x2) //Check if PCL is destination if(address == 0x2) //Check if PCL is destination
{ {
ProgramCounter.loadPc(); ProgramCounter.loadPc();
Cycles.addToCycles(1);
} }
} }