implemented Andwf instruction

de/darkress/pic16f84sim/Main.java

@@ -2,28 +2,23 @@ package de.darkress.pic16f84sim;
 
 import de.darkress.pic16f84sim.commands.Command;
 import de.darkress.pic16f84sim.decoder.CommandDecoder;
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-import de.darkress.pic16f84sim.parser.Parser;
 
-import java.util.concurrent.TimeUnit;
+import java.util.ArrayList;
 
 class Main
 {
-    public static void main(String[] args) throws InterruptedException {
+    public static void main(String[] args) {
 
-        Command[] program = Parser.parser("de/darkress/pic16f84sim/TPicSim101.LST");
+        ArrayList<Command> program = new ArrayList<>();
-        /*for(int i = 0; i < instructions.size(); i++)
+        int input1 = 0x27FF;
+        program.add(CommandDecoder.decode(0x3011)); //Write 0x11 to W
+        Memory.setRegister(0x14, 0x14);
+        program.add(CommandDecoder.decode(0x0594));
+        for(int i = 0; i < 2; i++)
         {
-            program.add(CommandDecoder.decode(instructions.get(i)));
+            program.get(ProgramCounter.getPc()).execute();
-        }*/
-
-        while(ProgramCounter.getPc() < 1024)
-        {
-            program[ProgramCounter.getPc()].execute();
-            System.out.println(Memory.workingRegister + " " + Cycles.getCycles());
-            System.out.println(Memory.getPCLATH() + " " + Memory.getPCL() + "\n");
         }
     }
 }

de/darkress/pic16f84sim/commands/Addlw.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -24,6 +23,5 @@ public class Addlw extends LiteralCommandUtils implements Command
 
         Memory.workingRegister = result % 256;
         ProgramCounter.incPC();
-        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Addwf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -26,6 +25,5 @@ public class Addwf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
-        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Andlw.java

@@ -1,8 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Andlw extends LiteralCommandUtils implements Command
 {
@@ -20,7 +18,5 @@ public class Andlw extends LiteralCommandUtils implements Command
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Andwf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -24,6 +23,5 @@ public class Andwf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
-        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Bcf.java

@@ -1,28 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Bcf extends BitOrientedCommandUtils implements Command
-{
-    private final int address;
-    private int bitPlacement;
-
-    public Bcf(int input)
-    {
-        address = input & 0x007F;
-        bitPlacement = checkBitPlacement(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = Memory.getRegister(address);
-        result &= ~(1 << bitPlacement); //Mask n-th bit with 0
-
-        Memory.setRegister(address, result);
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/BitOrientedCommandUtils.java

@@ -1,11 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Memory;
-
-public class BitOrientedCommandUtils
-{
-    protected int checkBitPlacement(int input)
-    {
-        return ((input & 0x0380) >>7);
-    }
-}

de/darkress/pic16f84sim/commands/Bsf.java

@@ -1,28 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Bsf extends BitOrientedCommandUtils implements Command
-{
-    private final int address;
-    private int bitPlacement;
-
-    public Bsf(int input)
-    {
-        address = input & 0x007F;
-        bitPlacement = checkBitPlacement(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = Memory.getRegister(address);
-        result |= (1 << bitPlacement);
-
-        Memory.setRegister(address, result);
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Btfsc.java

@@ -1,32 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Btfsc extends BitOrientedCommandUtils implements Command
-{
-    private final int address;
-    private int bitPlacement;
-
-    public Btfsc(int input)
-    {
-        address = input & 0x007F;
-        bitPlacement = checkBitPlacement(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = Memory.getRegister(address);
-
-        if((result & (1 << bitPlacement)) == 0) //Test if bit is clear
-        {
-            ProgramCounter.incPC();
-            Cycles.addToCycles(1);
-        }
-
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Btfss.java

@@ -1,32 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Btfss extends BitOrientedCommandUtils implements Command
-{
-    private final int address;
-    private int bitPlacement;
-
-    public Btfss(int input)
-    {
-        address = input & 0x007F;
-        bitPlacement = checkBitPlacement(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = Memory.getRegister(address);
-
-        if((result & (1 << bitPlacement)) > 0) //Test if bit is set
-        {
-            ProgramCounter.incPC();
-            Cycles.addToCycles(1);
-        }
-
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Call.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
 
@@ -18,6 +17,5 @@ public class Call extends LiteralCommandUtils implements Command
     {
         Stack.push(ProgramCounter.getPc() + 1);
         ProgramCounter.setPcFrom11BitLiteral(literal);
-        Cycles.addToCycles(2);
     }
 }

de/darkress/pic16f84sim/commands/Clrf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Clrw.java

@@ -1,20 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Comf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Decf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Decfsz.java

@@ -1,35 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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)
-        {
-            ProgramCounter.incPC();
-            Cycles.addToCycles(1);
-        }
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Goto.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Goto extends LiteralCommandUtils implements Command
@@ -16,6 +15,5 @@ public class Goto extends LiteralCommandUtils implements Command
     public void execute()
     {
         ProgramCounter.setPcFrom11BitLiteral(literal);
-        Cycles.addToCycles(2);
     }
 }

de/darkress/pic16f84sim/commands/Incf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Incfsz.java

@@ -1,35 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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)
-        {
-            ProgramCounter.incPC();
-            Cycles.addToCycles(1);
-        }
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Iorlw.java

@@ -1,8 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Iorlw extends LiteralCommandUtils implements Command
 {
@@ -20,7 +18,5 @@ public class Iorlw extends LiteralCommandUtils implements Command
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Iorwf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Movf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Movlw.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,6 +17,5 @@ public class Movlw extends LiteralCommandUtils implements Command
     {
         Memory.workingRegister = literal;
         ProgramCounter.incPC();
-        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Movwf.java

@@ -1,27 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Nop.java

@@ -1,16 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Retlw.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
@@ -19,6 +18,5 @@ public class Retlw extends LiteralCommandUtils implements Command
     {
         Memory.workingRegister = literal;
         ProgramCounter.setPcFromStack(Stack.pop());
-        Cycles.addToCycles(2);
     }
 }

de/darkress/pic16f84sim/commands/Return.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
 
@@ -10,6 +9,5 @@ public class Return extends LiteralCommandUtils implements Command
     public void execute()
     {
         ProgramCounter.setPcFromStack(Stack.pop());
-        Cycles.addToCycles(2);
     }
 }

de/darkress/pic16f84sim/commands/Rlf.java

@@ -1,37 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Rlf extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Rlf(int input)
-    {
-        address = input & 0x007F;
-        destinationBit = checkDestinationBit(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int register = Memory.getRegister(address);
-        int newCarry = register >>7;
-        int oldCarry = Memory.getCarryBit();
-        register = ((register <<1) + oldCarry) & 0xFF;
-
-        if(newCarry == 1)
-        {
-            Memory.setCarryBit();
-        } else if(newCarry == 0){
-            Memory.clearCarryBit();
-        }
-
-        writeToDestination(destinationBit, address, register);
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Rrf.java

@@ -1,37 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Rrf extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Rrf(int input)
-    {
-        address = input & 0x007F;
-        destinationBit = checkDestinationBit(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int register = Memory.getRegister(address);
-        int newCarry = register & 0x01;
-        int oldCarry = Memory.getCarryBit();
-        register = (oldCarry << 7) + (register >>1);
-
-        if(newCarry == 1)
-        {
-            Memory.setCarryBit();
-        } else if(newCarry == 0){
-            Memory.clearCarryBit();
-        }
-
-        writeToDestination(destinationBit, address, register);
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Sublw.java

@@ -1,8 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Sublw extends LiteralCommandUtils implements Command
 {
@@ -43,7 +41,5 @@ public class Sublw extends LiteralCommandUtils implements Command
         checkDigitCarryBit(literal);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Subwf.java

@@ -1,51 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Subwf extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Subwf(int input)
-    {
-        address = input & 0x007F;
-        destinationBit = checkDestinationBit(input);
-    }
-
-    @Override
-    protected void checkCarryBit(int result)
-    {
-        if(result <= 255){
-            Memory.clearCarryBit();
-        } else{
-            Memory.setCarryBit();
-        }
-    }
-
-    @Override
-    protected void checkDigitCarryBit(int literal)
-    {
-        if(((literal & 0x0F) - (Memory.workingRegister & 0x0F)) < 0){
-            Memory.clearDigitCarryBit();
-        } else{
-            Memory.setDigitCarryBit();
-        }
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = Memory.getRegister(address) - Memory.workingRegister + 256;
-
-        checkZeroBit(result);
-        checkCarryBit(result);
-        checkDigitCarryBit(Memory.getRegister(address));
-
-        writeToDestination(destinationBit, address, result % 256);
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Swapf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Swapf extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Swapf(int input)
-    {
-        address = input & 0x007F;
-        destinationBit = checkDestinationBit(input);
-    }
-
-    @Override
-    public void execute()
-    {
-        int result = (Memory.getRegister(address) <<4) & 0xF0;
-        int tmp = Memory.getRegister(address) >>4;
-        result += tmp;
-
-        writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/commands/Xorlw.java

@@ -1,8 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Xorlw extends LiteralCommandUtils implements Command
 {
@@ -20,7 +18,5 @@ public class Xorlw extends LiteralCommandUtils implements Command
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
-        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Xorwf.java

@@ -1,29 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-
-public class Xorwf extends FileRegisterCommandUtils implements Command
-{
-    private final int address;
-    private final boolean destinationBit;
-
-    public Xorwf(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();
-        Cycles.addToCycles(1);
-    }
-}

de/darkress/pic16f84sim/decoder/CommandDecoder.java

@@ -13,29 +13,41 @@ public class CommandDecoder
             case 0x500:
                 return new Andwf(input);
             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:
-                return new Rlf(input);
+                //rlf();
+                break;
             case 0xC00:
-                return new Rrf(input);
+                //rrf();
+                break;
             case 0x200:
-                return new Subwf(input);
+                //subwf();
+                break;
             case 0xE00:
-                return new Swapf(input);
+                //swapf();
+                break;
             case 0x600:
-                return new Xorwf(input);
+                //xorwf();
+                break;
             case 0x3900:
                 return new Andlw(input);
             case 0x3800:
@@ -47,29 +59,38 @@ 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)
         {
             case 0x1000:
-                return new Bcf(input);
+                //bcf();
+                break;
             case 0x1400:
-                return new Bsf(input);
+                //bsf();
+                break;
             case 0x1800:
-                return new Btfsc(input);
+                //btfsc();
+                break;
             case 0x1C00:
-               return new Btfss(input);
+                //btfss();
+                break;
         }
 
         switch(input & 0x3E00)
         {
             case 0x3E00:
+                //addlw();
                 return new Addlw(input);
+                //break;
             case 0x3C00:
                 return new Sublw(input);
         }
@@ -92,7 +113,7 @@ public class CommandDecoder
 
         if ((input | 0x0060) == 0x0060)
         {
-            return new Nop();
+            //nop();
         }
 
         if (input == 0x0064)

de/darkress/pic16f84sim/microcontroller/Cycles.java

@@ -1,14 +0,0 @@
-package de.darkress.pic16f84sim.microcontroller;
-
-public class Cycles {
-    private static int cycles = 0;
-
-    public static void addToCycles(int increase)
-    {
-        cycles += increase;
-    }
-
-    public static int getCycles() {
-        return cycles;
-    }
-}

de/darkress/pic16f84sim/microcontroller/Memory.java

@@ -153,13 +153,9 @@ public class Memory
         memory[0x03] &= 0xFD;
     }
 
-    public static int getCarryBit()
+    public static boolean getCarryBit()
     {
-        if((memory[0x03] & 0x01) == 0x01)
+        return (memory[0x03] & 0x01) == 0x01;
-        {
-            return 1;
-        }
-        else return 0;
     }
 
     public static void setCarryBit()

de/darkress/pic16f84sim/parser/Parser.java

@@ -1,8 +1,5 @@
 package de.darkress.pic16f84sim.parser;
 
-import de.darkress.pic16f84sim.commands.Command;
-import de.darkress.pic16f84sim.decoder.CommandDecoder;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -11,9 +8,9 @@ import java.util.Scanner;
 
 public class Parser
 {
-    public static Command[] parser(String filePath)
+    public static List<Integer> parser(String filePath)
     {
-        ArrayList<String> instructions = new ArrayList<>();
+        ArrayList<Integer> program = new ArrayList<>();
         try {
             File file = new File(filePath);
             Scanner scanner = new Scanner(file);
@@ -22,10 +19,8 @@ public class Parser
                 if(!data.startsWith(" "))
                 {
                     String commandAndParametersString = "0x" + data.split(" ")[1];
-                    String instructionAddress = "0x" + data.split(" ")[0];
+                    int commandAndParameters = Integer.decode(commandAndParametersString);
-                    //int commandAndParameters = Integer.decode(commandAndParametersString);
+                    program.add(commandAndParameters);
-                    //program.add(commandAndParameters);
-                    instructions.add(instructionAddress + ", " + commandAndParametersString);
                 }
             }
             scanner.close();
@@ -33,16 +28,6 @@ public class Parser
             System.out.println("An error occurred.");
             e.printStackTrace();
         }
-
-        Command[] program = new Command[1024];
-
-        for(int i = 0; i < instructions.size(); i++)
-        {
-            int instructionAddress = Integer.decode(instructions.get(i).split(", ")[0]);
-            int instruction = Integer.decode(instructions.get(i).split(", ")[1]);
-            program[instructionAddress] = CommandDecoder.decode(instruction);
-        }
-
         return program;
     }
 }