Compare commits

..

1 Commits

Author SHA1 Message Date
darkress
a1992b6fda implemented Clrw instruction 2023-06-02 23:26:50 +02:00
8 changed files with 14 additions and 156 deletions

View File

@@ -12,9 +12,8 @@ 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 = 0x10;
Memory.setRegister(0x14, 0B11110000); //240 << 224 program.add(CommandDecoder.decode(0x123)); //Write 0x11 to W
program.add(CommandDecoder.decode(0x0D94));
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,27 +0,0 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Clrf extends FileRegisterCommandUtils implements Command
{
private final int address;
private final boolean destinationBit;
public Clrf(int input)
{
address = input & 0x007F;
destinationBit = true;
}
@Override
public void execute()
{
final int result = 0;
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
}
}

View File

@@ -1,27 +0,0 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Iorwf extends FileRegisterCommandUtils implements Command
{
private final int address;
private final boolean destinationBit;
public Iorwf(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();
}
}

View File

@@ -1,27 +0,0 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Movf extends FileRegisterCommandUtils implements Command
{
private final int address;
private final boolean destinationBit;
public Movf(int input)
{
address = input & 0x007F;
destinationBit = checkDestinationBit(input);
}
@Override
public void execute()
{
int result = Memory.getRegister(address);
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
}
}

View File

@@ -1,25 +0,0 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Movwf extends FileRegisterCommandUtils implements Command
{
private final int address;
private final boolean destinationBit;
public Movwf(int input)
{
address = input & 0x007F;
destinationBit = true;
}
@Override
public void execute()
{
int result = Memory.workingRegister;
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
}
}

View File

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

View File

@@ -23,11 +23,14 @@ public class CommandDecoder
case 0xF00: case 0xF00:
return new Incfsz(input); return new Incfsz(input);
case 0x400: case 0x400:
return new Iorwf(input); //iorwf();
break;
case 0x800: case 0x800:
return new Movf(input); //movf();
break;
case 0xD00: case 0xD00:
return new Rlf(input); //rlf();
break;
case 0xC00: case 0xC00:
//rrf(); //rrf();
break; break;
@@ -51,11 +54,13 @@ public class CommandDecoder
switch(input & 0x3F80) switch(input & 0x3F80)
{ {
case 0x180: case 0x180:
return new Clrf(input); //clrf();
break;
case 0x100: case 0x100:
return new Clrw(); return new Clrw();
case 0x80: case 0x80:
return new Movwf(input); //movwf();
break;
} }
switch(input & 0x3C00) switch(input & 0x3C00)

View File

@@ -153,13 +153,9 @@ public class Memory
memory[0x03] &= 0xFD; memory[0x03] &= 0xFD;
} }
public static int getCarryBit() public static boolean getCarryBit()
{ {
if((memory[0x03] & 0x01) == 0x01) return (memory[0x03] & 0x01) == 0x01;
{
return 1;
}
else return 0;
} }
public static void setCarryBit() public static void setCarryBit()