fixed PC

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

de/darkress/pic16f84sim/Main.java

@@ -1,29 +1,25 @@
 package de.darkress.pic16f84sim;
 
-import de.darkress.pic16f84sim.microcontroller.Stack;
+import de.darkress.pic16f84sim.commands.Command;
+import de.darkress.pic16f84sim.decoder.CommandDecoder;
+import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+
+import java.util.ArrayList;
 
 class Main
 {
     public static void main(String[] args) {
-        /*
+
         ArrayList<Command> program = new ArrayList<>();
-        int input1 = 0x3EFF;
-        program.add(CommandDecoder.decode(input1));
-        program.get(0).execute();
-        */
-
-
-        for(int i = 0; i < 8; i++)
+        int input1 = 0x27FF;
+        program.add(CommandDecoder.decode(0x3011));
+        program.add(CommandDecoder.decode(0x2003));
+        program.add(CommandDecoder.decode(0x3022));
+        program.add(CommandDecoder.decode(0x0008));
+        while(true)
         {
-            Stack.push(i);
+            program.get(ProgramCounter.getPc()).execute();
         }
-
-        for(int i = 0; i < 16; i++)
-        {
-            System.out.println(Stack.peek());
-            Stack.pop();
-        }
-
-
     }
 }

de/darkress/pic16f84sim/commands/Addlw.java

@@ -1,6 +1,7 @@
 package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Addlw extends CommandUtils implements Command
 {
@@ -21,5 +22,6 @@ public class Addlw extends CommandUtils implements Command
         checkDigitCarryBit(literal);
 
         Memory.workingRegister = result % 256;
+        ProgramCounter.incPC();
     }
 }

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

@@ -0,0 +1,19 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+
+public class Goto extends CommandUtils implements Command
+{
+    private final int literal;
+
+    public Goto(int input)
+    {
+        literal = input & 0x07FF;
+    }
+
+    @Override
+    public void execute()
+    {
+        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/commands/Xorlw.java

@@ -0,0 +1,22 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Memory;
+
+public class Xorlw extends CommandUtils implements Command
+{
+    private final int literal;
+
+    public Xorlw(int input)
+    {
+        literal = input & 0x00FF;
+    }
+    @Override
+    public void execute()
+    {
+        int result = literal ^ Memory.workingRegister;
+
+        checkZeroBit(result);
+
+        Memory.workingRegister = result % 256;
+    }
+}

de/darkress/pic16f84sim/decoder/CommandDecoder.java

@@ -55,8 +55,7 @@ public class CommandDecoder
             case 0x3800:
                 return new Iorlw(input);
             case 0x3A00:
-                //xorlw();
-                break;
+                return new Xorlw(input);
         }
 
         switch(input & 0x3F80)
@@ -101,11 +100,9 @@ public class CommandDecoder
         switch(input & 0x3800)
         {
             case 0x2000:
-                //call();
-                break;
+                return new Call(input);
             case 0x2800:
-                //goto();
-                break;
+                return new Goto(input);
         }
 
         switch(input & 0x3C00)
@@ -113,8 +110,7 @@ public class CommandDecoder
             case 0x3000:
                 return new Movlw(input);
             case 0x3400:
-                //retlw();
-                break;
+                return new Retlw(input);
         }
 
         if ((input | 0x0060) == 0x0060)
@@ -134,8 +130,7 @@ public class CommandDecoder
 
         if (input == 0x0008)
         {
-            //return();
-            //This is the function name. Do not mistake this for a normal return!
+            return new 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()
@@ -91,6 +99,28 @@ public class Memory
         return memory[0x4];
     }
 
+    public static int getPCL()
+    {
+        return memory[0x2];
+    }
+
+    public static void setPCL(int data)
+    {
+        memory[0x2] = data;
+        memory[0x82] = data;
+    }
+
+    public static int getPCLATH()
+    {
+        return memory[0xA] & 0x1F;
+    }
+
+    public static void setPCLATH(int data)
+    {
+        memory[0xA] = data & 0x1F;
+        memory[0x8A] = data & 0x1F;
+    }
+
     public static boolean getZeroBit()
     {
         return (memory[0x03] & 0x04) == 0x04;
@@ -99,6 +129,7 @@ public class Memory
     public static void setZeroBit()
     {
         memory[0x03] |= 0x04;
+        memory[0x83] |= 0x04;
     }
 
     public static void clearZeroBit()
@@ -114,6 +145,7 @@ public class Memory
     public static void setDigitCarryBit()
     {
         memory[0x03] |= 0x02;
+        memory[0x83] |= 0x02;
     }
 
     public static void clearDigitCarryBit()
@@ -129,6 +161,7 @@ public class Memory
     public static void setCarryBit()
     {
         memory[0x03] |= 0x01;
+        memory[0x83] |= 0x01;
     }
 
     public static void clearCarryBit()

de/darkress/pic16f84sim/microcontroller/ProgramCounter.java

@@ -4,15 +4,36 @@ public class ProgramCounter
 
     //This class is not actual part of the µC. It is a storage for the current value of the PC
 {
-    private static int PC = 0;
+    private static int pc = 0;
 
-    public static int getPC()
+    public static int getPc()
     {
-        return PC;
+        return pc;
     }
 
-    public static void setPC(int PC)
+    public static void setPcFrom11BitLiteral(int data)
     {
-        ProgramCounter.PC = PC;
+        int pcl = data & 0x00FF;
+        int pch = Memory.getPCLATH();
+        pch = ((pch & 0xF8) <<8) + (data & 0x700);
+        Memory.setPCL(pcl);
+        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
+    {
+        pc++;
+        Memory.setPCL(pc & 0x00FF);
     }
 }

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()