implemented decfsz Instruction

de/darkress/pic16f84sim/Main.java

@@ -2,11 +2,9 @@ package de.darkress.pic16f84sim;
 
 import de.darkress.pic16f84sim.commands.Command;
 import de.darkress.pic16f84sim.decoder.CommandDecoder;
-import de.darkress.pic16f84sim.gui.SramTable;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
-import javax.swing.*;
 import java.util.ArrayList;
 
 class Main
@@ -14,21 +12,16 @@ class Main
     public static void main(String[] args) {
 
         ArrayList<Command> program = new ArrayList<>();
-        Memory.workingRegister = 0x01;
-        Memory.setRegister(0x14, 0xA7); //240 << 224
-        program.add(CommandDecoder.decode(0x1C94));
+        int input1 = 0x27FF;
+        program.add(CommandDecoder.decode(0x3011)); //Write 0x11 to W
+        Memory.setRegister(0x14, 0x01);
+        program.add(CommandDecoder.decode(0x0B94));
+        program.add(CommandDecoder.decode(0x0B94));
+        program.add(CommandDecoder.decode(0x0B94));
+        program.add(CommandDecoder.decode(0x3F05));
         for(int i = 0; i < program.size(); i++)
         {
             program.get(ProgramCounter.getPc()).execute();
         }
-
-        SramTable table = new SramTable();
-        JFrame frame = new JFrame("Table Example");
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        frame.add(table.getTable());
-        frame.pack();
-        frame.setVisible(true);
-        //table.setValueAt("test", 15, 7);
-
     }
 }

de/darkress/pic16f84sim/commands/Bcf.java

@@ -1,26 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-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();
-    }
-}

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,26 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-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();
-    }
-}

de/darkress/pic16f84sim/commands/Btfsc.java

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

de/darkress/pic16f84sim/commands/Btfss.java

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

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

@@ -26,7 +26,7 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
         if((result % 256) == 0)
         {
             Nop nop = new Nop();
-            nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
+            nop.execute();
         }
         ProgramCounter.incPC();
     }

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(); // TODO: What happens if an interrupt gets triggered during the nop execution?
-        }
-        ProgramCounter.incPC();
-    }
-}

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

@@ -1,35 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-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();
-    }
-}

de/darkress/pic16f84sim/commands/Rrf.java

@@ -1,35 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-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();
-    }
-}

de/darkress/pic16f84sim/commands/Subwf.java

@@ -1,49 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-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();
-    }
-}

de/darkress/pic16f84sim/commands/Swapf.java

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

de/darkress/pic16f84sim/commands/Xorwf.java

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

de/darkress/pic16f84sim/decoder/CommandDecoder.java

@@ -19,23 +19,32 @@ public class CommandDecoder
             case 0xB00:
                 return new Decfsz(input);
             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 +56,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);
         }

de/darkress/pic16f84sim/gui/SramTable.java

@@ -1,52 +0,0 @@
-package de.darkress.pic16f84sim.gui;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.geom.Dimension2D;
-
-public class SramTable
-{
-    private final int rows = 32;
-    private final int columns = 8;
-    private Object[][] data = new Object[rows][columns];
-
-    public JTable getTable()
-    {
-        return table;
-    }
-
-    private JTable table = new JTable(data, createColumns());
-
-    public SramTable()
-    {
-        int count = 0;
-        for (int i = 0; i < rows; i++) {
-            for (int j = 0; j < columns; j++) {
-                data[i][j] = Integer.toHexString(count).toUpperCase();
-                table.getColumnModel().getColumn(j).setPreferredWidth(30);
-                count++;
-            }
-        }
-    }
-
-    private Object[] createColumns(){
-        Object[] columnNames = new Object[columns];
-        for (int j = 0; j < columns; j++) {
-            columnNames[j] = j;
-        }
-        return columnNames;
-    }
-
-
-
-    public void table() {
-        // Create a scroll pane and add the table to it
-        JScrollPane scrollPane = new JScrollPane(table);
-
-        // Create a panel and add the scroll pane to it
-        JPanel panel = new JPanel();
-        panel.add(scrollPane);
-
-        // Create a frame and add the panel to it
-    }
-}

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 1;
-        }
-        else return 0;
+        return (memory[0x03] & 0x01) == 0x01;
     }
 
     public static void setCarryBit()