Compare commits

..

1 Commits

Author SHA1 Message Date
Darkress
e58624dacd implemented Goto Instruction; Increment ProgramCounter; 2023-05-29 18:05:26 +02:00
5 changed files with 7 additions and 25 deletions

View File

@@ -13,12 +13,13 @@ class Main
ArrayList<Command> program = new ArrayList<>(); ArrayList<Command> program = new ArrayList<>();
Memory.workingRegister = 0xAA; Memory.workingRegister = 0xAA;
int input1 = 0x27FF; int input1 = 0x2FFF;
program.add(CommandDecoder.decode(input1)); program.add(CommandDecoder.decode(input1));
Memory.setPCLATH(0xFF); Memory.setPCLATH(0xFF);
program.get(0).execute(); program.get(0).execute();
//ProgramCounter.incPC(); //ProgramCounter.incPC();
} }
} }

View File

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

View File

@@ -1,5 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Goto extends CommandUtils implements Command public class Goto extends CommandUtils implements Command
@@ -14,6 +15,6 @@ public class Goto extends CommandUtils implements Command
@Override @Override
public void execute() public void execute()
{ {
ProgramCounter.setPcFrom11BitLiteral(literal); ProgramCounter.setPcForGotoCall(literal);
} }
} }

View File

@@ -100,7 +100,8 @@ public class CommandDecoder
switch(input & 0x3800) switch(input & 0x3800)
{ {
case 0x2000: case 0x2000:
return new Call(input); //call();
break;
case 0x2800: case 0x2800:
return new Goto(input); return new Goto(input);
} }

View File

@@ -11,7 +11,7 @@ public class ProgramCounter
return pc; return pc;
} }
public static void setPcFrom11BitLiteral(int data) public static void setPcForGotoCall(int data)
{ {
int pcl = data & 0x00FF; int pcl = data & 0x00FF;
int pch = Memory.getPCLATH(); int pch = Memory.getPCLATH();