added Xorlw in CommandDecoder

de/darkress/pic16f84sim/Main.java

@@ -3,21 +3,16 @@ package de.darkress.pic16f84sim;
 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<>();
-        Memory.workingRegister = 0x1A;
-        Memory.setRegister(0x14, 0x1B);
-        program.add(CommandDecoder.decode(0x0094));
-        for(int i = 0; i < program.size(); i++)
-        {
-            program.get(ProgramCounter.getPc()).execute();
-        }
+        Memory.workingRegister = 0xAA;
+        int input1 = 0x3AFF;
+        program.add(CommandDecoder.decode(input1));
+        program.get(0).execute();
+
     }
 }

de/darkress/pic16f84sim/commands/Addlw.java

@@ -1,9 +1,8 @@
 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;
 
@@ -22,6 +21,5 @@ public class Addlw extends LiteralCommandUtils implements Command
         checkDigitCarryBit(literal);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
     }
 }

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

@@ -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 LiteralCommandUtils 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/Clrf.java

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

de/darkress/pic16f84sim/commands/Clrw.java

@@ -1,18 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Clrw extends FileRegisterCommandUtils implements Command
-{
-    @Override
-    public void execute()
-    {
-        final int result = 0;
-
-        checkZeroBit(result);
-
-        Memory.workingRegister = result;
-        ProgramCounter.incPC();
-    }
-}

de/darkress/pic16f84sim/commands/Comf.java

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

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/Decf.java

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

de/darkress/pic16f84sim/commands/Decfsz.java

@@ -1,33 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Decfsz extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Decfsz(int input)
-    {
-        address = input & 0x007F;
-        destinationBit = checkDestinationBit(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = Memory.getRegister(address) + 255; // Allow underflow
-
-        checkZeroBit(result);
-
-        writeToDestination(destinationBit, address, result % 256); // Catch underflow
-
-        if((result % 256) == 0)
-        {
-            Nop nop = new Nop();
-            nop.execute();
-        }
-        ProgramCounter.incPC();
-    }
-}

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

@@ -1,19 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Goto extends LiteralCommandUtils implements Command
-{
-    private final int literal;
-
-    public Goto(int input)
-    {
-        literal = input & 0x07FF;
-    }
-
-    @Override
-    public void execute()
-    {
-        ProgramCounter.setPcFrom11BitLiteral(literal);
-    }
-}

de/darkress/pic16f84sim/commands/Incf.java

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

de/darkress/pic16f84sim/commands/Incfsz.java

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

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/Iorwf.java

@@ -1,27 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Iorwf extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Iorwf(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/Movf.java

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

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/Movwf.java

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

de/darkress/pic16f84sim/commands/Nop.java

@@ -1,14 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Nop extends LiteralCommandUtils implements Command
-{
-
-    @Override
-    public void execute()
-    {
-        // Do nothing, just increment the PC
-        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

@@ -1,13 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-import de.darkress.pic16f84sim.microcontroller.Stack;
-
-public class Return extends LiteralCommandUtils implements Command
-{
-    @Override
-    public void execute()
-    {
-        ProgramCounter.setPcFromStack(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,23 +9,32 @@ public class CommandDecoder
         switch(input & 0x3F00)
         {
             case 0x700:
-                return new Addwf(input);
+                //addwf();
+                break;
             case 0x500:
-                return new Andwf(input);
+                //andwf();
+                break;
             case 0x900:
-                return new Comf(input);
+                //comf();
+                break;
             case 0x300:
-                return new Decf(input);
+                //decf();
+                break;
             case 0xB00:
-                return new Decfsz(input);
+                //decfsz();
+                break;
             case 0xA00:
-                return new Incf(input);
+                //incf();
+                break;
             case 0xF00:
-                return new Incfsz(input);
+                //incfsz();
+                break;
             case 0x400:
-                return new Iorwf(input);
+                //iorwf();
+                break;
             case 0x800:
-                return new Movf(input);
+                //movf();
+                break;
             case 0xD00:
                 //rlf();
                 break;
@@ -52,11 +61,14 @@ public class CommandDecoder
         switch(input & 0x3F80)
         {
             case 0x180:
-                return new Clrf(input);
+                //clrf();
+                break;
             case 0x100:
-                return new Clrw();
+                //clrw();
+                break;
             case 0x80:
-                return new Movwf(input);
+                //movwf();
+                break;
         }
 
         switch(input & 0x3C00)
@@ -88,9 +100,11 @@ public class CommandDecoder
         switch(input & 0x3800)
         {
             case 0x2000:
-                return new Call(input);
+                //call();
+                break;
             case 0x2800:
-                return new Goto(input);
+                //goto();
+                break;
         }
 
         switch(input & 0x3C00)
@@ -98,12 +112,13 @@ public class CommandDecoder
             case 0x3000:
                 return new Movlw(input);
             case 0x3400:
-                return new Retlw(input);
+                //retlw();
+                break;
         }
 
         if ((input | 0x0060) == 0x0060)
         {
-            return new Nop();
+            //nop();
         }
 
         if (input == 0x0064)
@@ -118,7 +133,8 @@ public class CommandDecoder
 
         if (input == 0x0008)
         {
-            return new Return();
+            //return();
+            //This is the function name. Do not mistake this for a normal return!
         }
 
         if (input == 0x0063)

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()
@@ -99,28 +91,6 @@ 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;
@@ -129,7 +99,6 @@ public class Memory
     public static void setZeroBit()
     {
         memory[0x03] |= 0x04;
-        memory[0x83] |= 0x04;
     }
 
     public static void clearZeroBit()
@@ -145,7 +114,6 @@ public class Memory
     public static void setDigitCarryBit()
     {
         memory[0x03] |= 0x02;
-        memory[0x83] |= 0x02;
     }
 
     public static void clearDigitCarryBit()
@@ -161,7 +129,6 @@ public class Memory
     public static void setCarryBit()
     {
         memory[0x03] |= 0x01;
-        memory[0x83] |= 0x01;
     }
 
     public static void clearCarryBit()

de/darkress/pic16f84sim/microcontroller/ProgramCounter.java

@@ -4,36 +4,20 @@ 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 setPcFrom11BitLiteral(int data)
+    public static void setPC(int PC)
     {
-        int pcl = data & 0x00FF;
-        int pch = Memory.getPCLATH();
-        pch = ((pch & 0xF8) <<8) + (data & 0x700);
-        Memory.setPCL(pcl);
-        pc = (pch) + pcl;
+        ProgramCounter.PC = PC;
     }
 
-    public static void setPcFromStack(int stack)
+    public static void incPC()
     {
-        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);
+        PC++;
     }
 }

de/darkress/pic16f84sim/microcontroller/Stack.java

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