implemented return instruction; Fixed Bug in Stack.pop()

This commit is contained in:
Darkress
2023-05-31 01:29:26 +02:00
parent 666cc2881b
commit 87bacdb1e6
4 changed files with 23 additions and 11 deletions

View File

@@ -12,13 +12,14 @@ 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 = 0xAA;
int input1 = 0x27FF; int input1 = 0x27FF;
program.add(CommandDecoder.decode(input1)); program.add(CommandDecoder.decode(0x3011));
program.add(CommandDecoder.decode(0x2003));
Memory.setPCLATH(0xFF); program.add(CommandDecoder.decode(0x3022));
program.get(0).execute(); program.add(CommandDecoder.decode(0x0008));
while(true)
//ProgramCounter.incPC(); {
program.get(ProgramCounter.getPc()).execute();
}
} }
} }

View File

@@ -0,0 +1,13 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
import de.darkress.pic16f84sim.microcontroller.Stack;
public class Return extends CommandUtils implements Command
{
@Override
public void execute()
{
ProgramCounter.setPcFrom11BitLiteral(Stack.pop());
}
}

View File

@@ -131,8 +131,7 @@ public class CommandDecoder
if (input == 0x0008) if (input == 0x0008)
{ {
//return(); return new Return();
//This is the function name. Do not mistake this for a normal return!
} }
if (input == 0x0063) if (input == 0x0063)

View File

@@ -14,9 +14,8 @@ public class Stack
public static int pop() public static int pop()
{ {
int tmp = stack[stackPointer];
pointPrevious(); pointPrevious();
return tmp; return stack[stackPointer];
} }
public static int peek() public static int peek()