fixed PC

Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#5

de/darkress/pic16f84sim/Main.java

@@ -12,14 +12,14 @@ class Main
     public static void main(String[] args) {
 
         ArrayList<Command> program = new ArrayList<>();
-        Memory.workingRegister = 0xAA;
+        int input1 = 0x27FF;
-        int input1 = 0x2FFF;
+        program.add(CommandDecoder.decode(0x3011));
-        program.add(CommandDecoder.decode(input1));
+        program.add(CommandDecoder.decode(0x2003));
-
+        program.add(CommandDecoder.decode(0x3022));
-        Memory.setPCLATH(0xFF);
+        program.add(CommandDecoder.decode(0x0008));
-        program.get(0).execute();
+        while(true)
-
+        {
-        //ProgramCounter.incPC();
+            program.get(ProgramCounter.getPc()).execute();
-
+        }
     }
 }

de/darkress/pic16f84sim/commands/Call.java

@@ -0,0 +1,21 @@
+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);
+    }
+}

de/darkress/pic16f84sim/commands/Goto.java

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

de/darkress/pic16f84sim/commands/Retlw.java

@@ -0,0 +1,22 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+import de.darkress.pic16f84sim.microcontroller.Stack;
+
+public class Retlw extends CommandUtils implements Command
+{
+    private final int literal;
+
+    public Retlw(int input)
+    {
+        literal = input & 0x00FF;
+    }
+
+    @Override
+    public void execute()
+    {
+        Memory.workingRegister = literal;
+        ProgramCounter.setPcFromStack(Stack.pop());
+    }
+}

de/darkress/pic16f84sim/commands/Return.java

@@ -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.setPcFromStack(Stack.pop());
+    }
+}

de/darkress/pic16f84sim/decoder/CommandDecoder.java

@@ -100,8 +100,7 @@ public class CommandDecoder
         switch(input & 0x3800)
         {
             case 0x2000:
-                //call();
+                return new Call(input);
-                break;
             case 0x2800:
                 return new Goto(input);
         }
@@ -111,8 +110,7 @@ public class CommandDecoder
             case 0x3000:
                 return new Movlw(input);
             case 0x3400:
-                //retlw();
+                return new Retlw(input);
-                break;
         }
 
         if ((input | 0x0060) == 0x0060)
@@ -132,8 +130,7 @@ public class CommandDecoder
 
         if (input == 0x0008)
         {
-            //return();
+            return new Return();
-            //This is the function name. Do not mistake this for a normal return!
         }
 
         if (input == 0x0063)

de/darkress/pic16f84sim/microcontroller/Memory.java

@@ -59,6 +59,10 @@ public class Memory
         }
         memory[address] = data;
         memory[address + 128] = data; //Ensure data is written to both banks to simulate mapping
+        if(address == 0x2) //Check if PCL is destination
+        {
+            ProgramCounter.loadPc();
+        }
     }
 
     private static int getDataFromIndirectAddress(int address)
@@ -75,6 +79,10 @@ public class Memory
         }
         memory[address % 128] = data; // else: Registers.Registers which are mapped
         memory[address % 128 + 128] = data; //Ensure data is written to both banks to simulate mapping
+        if(address == 0x2) //Check if PCL is destination
+        {
+            ProgramCounter.loadPc();
+        }
     }
 
     private static int getRegisterBank()

de/darkress/pic16f84sim/microcontroller/ProgramCounter.java

@@ -11,7 +11,7 @@ public class ProgramCounter
         return pc;
     }
 
-    public static void setPcForGotoCall(int data)
+    public static void setPcFrom11BitLiteral(int data)
     {
         int pcl = data & 0x00FF;
         int pch = Memory.getPCLATH();
@@ -20,19 +20,20 @@ public class ProgramCounter
         pc = (pch) + pcl;
     }
 
+    public static void setPcFromStack(int stack)
+    {
+        pc = stack;
+        Memory.setPCL(pc & 0x00FF);
+    }
+
+    public static void loadPc()
+    {
+        pc = (Memory.getPCLATH() <<8) + Memory.getPCL();
+    }
+
     public static void incPC() //is called after every instruction execution
     {
-        int pcl = Memory.getPCL();
+        pc++;
-        int pclath = Memory.getPCLATH();
+        Memory.setPCL(pc & 0x00FF);
-        if(pcl == 0xFF)
-        {
-            pclath++;
-            pcl = 0;
-        } else {
-            pcl++;
-        }
-        Memory.setPCL(pcl);
-        Memory.setPCLATH(pclath);
-        pc = (pclath <<8) + pcl;
     }
 }

de/darkress/pic16f84sim/microcontroller/Stack.java

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