Compare commits

..

1 Commits

Author SHA1 Message Date
Darkress
36f018835f implemented Movf Instruction 2023-06-04 20:41:56 +02:00
7 changed files with 13 additions and 157 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.workingRegister = 0x01; Memory.workingRegister = 0x1A;
Memory.setRegister(0x14, 0x01); //240 << 224 Memory.setRegister(0x14, 0x1B);
program.add(CommandDecoder.decode(0x0294)); program.add(CommandDecoder.decode(0x0894));
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,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,35 +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 newCarry = register >>7;
int oldCarry = Memory.getCarryBit();
register = ((register <<1) + oldCarry) & 0xFF;
if(newCarry == 1)
{
Memory.setCarryBit();
} else if(newCarry == 0){
Memory.clearCarryBit();
}
writeToDestination(destinationBit, address, register);
ProgramCounter.incPC();
}
}

View File

@@ -1,35 +0,0 @@
package de.darkress.pic16f84sim.commands;
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();
}
}

View File

@@ -1,49 +0,0 @@
package de.darkress.pic16f84sim.commands;
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();
}
}

View File

@@ -27,11 +27,14 @@ public class CommandDecoder
case 0x800: case 0x800:
return new Movf(input); return new Movf(input);
case 0xD00: case 0xD00:
return new Rlf(input); //rlf();
break;
case 0xC00: case 0xC00:
return new Rrf(input); //rrf();
break;
case 0x200: case 0x200:
return new Subwf(input); //subwf();
break;
case 0xE00: case 0xE00:
//swapf(); //swapf();
break; break;
@@ -53,7 +56,8 @@ public class CommandDecoder
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()