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

de/darkress/pic16f84sim/Main.java

@@ -13,10 +13,11 @@ class Main
 
         ArrayList<Command> program = new ArrayList<>();
         int input1 = 0x27FF;
-        program.add(CommandDecoder.decode(0x3011)); //Write 0x11 to W
+        program.add(CommandDecoder.decode(0x3011));
-        Memory.setRegister(0x14, 0x14);
+        program.add(CommandDecoder.decode(0x2003));
-        program.add(CommandDecoder.decode(0x0594));
+        program.add(CommandDecoder.decode(0x3022));
-        for(int i = 0; i < 2; i++)
+        program.add(CommandDecoder.decode(0x0008));
+        while(true)
         {
             program.get(ProgramCounter.getPc()).execute();
         }

de/darkress/pic16f84sim/commands/Addlw.java

@@ -3,7 +3,7 @@ package de.darkress.pic16f84sim.commands;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
-public class Addlw extends LiteralCommandUtils implements Command
+public class Addlw extends CommandUtils implements Command
 {
     private final int literal;
 

de/darkress/pic16f84sim/commands/Addwf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Addwf extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Addwf(int input)
-    {
-        address = input & 0x007F;
-        destinationBit = checkDestinationBit(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = Memory.getRegister(address) + Memory.workingRegister;
-
-        checkZeroBit(result);
-        checkCarryBit(result);
-        checkDigitCarryBit(address);
-
-        writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
-    }
-}

de/darkress/pic16f84sim/commands/Andlw.java

@@ -2,7 +2,7 @@ package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.Memory;
 
-public class Andlw extends LiteralCommandUtils implements Command
+public class Andlw extends CommandUtils implements Command
 {
     private final int literal;
 

de/darkress/pic16f84sim/commands/Andwf.java

@@ -1,27 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Andwf extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Andwf(int input)
-    {
-        address = input & 0x007F;
-        destinationBit = checkDestinationBit(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = Memory.getRegister(address) & Memory.workingRegister;
-
-        checkZeroBit(result);
-
-        writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
-    }
-}

de/darkress/pic16f84sim/commands/Call.java

@@ -3,7 +3,7 @@ package de.darkress.pic16f84sim.commands;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
 
-public class Call extends LiteralCommandUtils implements Command
+public class Call extends CommandUtils implements Command
 {
     private final int literal;
 

de/darkress/pic16f84sim/commands/CommandUtils.java

@@ -2,7 +2,7 @@ package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.Memory;
 
-public class LiteralCommandUtils
+public class CommandUtils
 {
     protected void checkZeroBit(int result)
     {

de/darkress/pic16f84sim/commands/FileRegisterCommandUtils.java

@@ -1,51 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Memory;
-
-public class FileRegisterCommandUtils
-{
-    protected void checkZeroBit(int result)
-    {
-        if((result % 256) == 0){
-            Memory.setZeroBit();
-        } else{
-            Memory.clearZeroBit();
-        }
-    }
-
-    protected void checkCarryBit(int result)
-    {
-        if(result > 255){
-            Memory.setCarryBit();
-        } else{
-            Memory.clearCarryBit();
-        }
-    }
-
-    protected void checkDigitCarryBit(int address)
-    {
-        int literal = Memory.getRegister(address);
-        if(((Memory.workingRegister & 0x0F) + (literal & 0x0F)) > 15){
-            Memory.setDigitCarryBit();
-        } else{
-            Memory.clearDigitCarryBit();
-        }
-    }
-
-    protected void writeToDestination(boolean destinationBit, int fileAddress, int result)
-    {
-        if(destinationBit)
-        {
-            //Store in FileRegister
-            Memory.setRegister(fileAddress, result);
-        } else {
-            //Store in WRegister
-            Memory.workingRegister = result;
-        }
-    }
-
-    protected boolean checkDestinationBit(int input)
-    {
-        return (input & 0x0080) == 0x0080;
-    }
-}

de/darkress/pic16f84sim/commands/Goto.java

@@ -2,7 +2,7 @@ package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
-public class Goto extends LiteralCommandUtils implements Command
+public class Goto extends CommandUtils implements Command
 {
     private final int literal;
 

de/darkress/pic16f84sim/commands/Iorlw.java

@@ -2,7 +2,7 @@ package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.Memory;
 
-public class Iorlw extends LiteralCommandUtils implements Command
+public class Iorlw extends CommandUtils implements Command
 {
     private final int literal;
 

de/darkress/pic16f84sim/commands/Movlw.java

@@ -1,9 +1,8 @@
 package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
-public class Movlw extends LiteralCommandUtils implements Command
+public class Movlw extends CommandUtils implements Command
 {
     private final int literal;
 
@@ -16,6 +15,5 @@ public class Movlw extends LiteralCommandUtils implements Command
     public void execute()
     {
         Memory.workingRegister = literal;
-        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Retlw.java

@@ -1,22 +0,0 @@
-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 LiteralCommandUtils 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

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

de/darkress/pic16f84sim/commands/Sublw.java

@@ -2,7 +2,7 @@ package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.Memory;
 
-public class Sublw extends LiteralCommandUtils implements Command
+public class Sublw extends CommandUtils implements Command
 {
     private final int literal;
 

de/darkress/pic16f84sim/commands/Xorlw.java

@@ -2,7 +2,7 @@ package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.Memory;
 
-public class Xorlw extends LiteralCommandUtils implements Command
+public class Xorlw extends CommandUtils implements Command
 {
     private final int literal;
 

de/darkress/pic16f84sim/decoder/CommandDecoder.java

@@ -9,9 +9,11 @@ public class CommandDecoder
         switch(input & 0x3F00)
         {
             case 0x700:
-                return new Addwf(input);
+                //addwf();
+                break;
             case 0x500:
-                return new Andwf(input);
+                //andwf();
+                break;
             case 0x900:
                 //comf();
                 break;
@@ -108,7 +110,8 @@ public class CommandDecoder
             case 0x3000:
                 return new Movlw(input);
             case 0x3400:
-                return new Retlw(input);
+                //retlw();
+                break;
         }
 
         if ((input | 0x0060) == 0x0060)

de/darkress/pic16f84sim/microcontroller/Memory.java

@@ -59,10 +59,6 @@ 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)
@@ -79,10 +75,6 @@ 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

@@ -20,20 +20,19 @@ 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
     {
-        pc++;
+        int pcl = Memory.getPCL();
-        Memory.setPCL(pc & 0x00FF);
+        int pclath = Memory.getPCLATH();
+        if(pcl == 0xFF)
+        {
+            pclath++;
+            pcl = 0;
+        } else {
+            pcl++;
+        }
+        Memory.setPCL(pcl);
+        Memory.setPCLATH(pclath);
+        pc = (pclath <<8) + pcl;
     }
 }