Set column width

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

de/darkress/pic16f84sim/Main.java

@@ -2,9 +2,11 @@ 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
@@ -13,11 +15,20 @@ class Main
 
         ArrayList<Command> program = new ArrayList<>();
         Memory.workingRegister = 0x01;
-        Memory.setRegister(0x14, 0xA5); //240 << 224
-        program.add(CommandDecoder.decode(0x0E94));
+        Memory.setRegister(0x14, 0xA7); //240 << 224
+        program.add(CommandDecoder.decode(0x1C94));
         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

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

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

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

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

@@ -0,0 +1,29 @@
+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/Xorwf.java

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

@@ -35,8 +35,7 @@ public class CommandDecoder
             case 0xE00:
                 return new Swapf(input);
             case 0x600:
-                //xorwf();
-                break;
+                return new Xorwf(input);
             case 0x3900:
                 return new Andlw(input);
             case 0x3800:
@@ -58,25 +57,19 @@ public class CommandDecoder
         switch(input & 0x3C00)
         {
             case 0x1000:
-                //bcf();
-                break;
+                return new Bcf(input);
             case 0x1400:
-                //bsf();
-                break;
+                return new Bsf(input);
             case 0x1800:
-                //btfsc();
-                break;
+                return new Btfsc(input);
             case 0x1C00:
-                //btfss();
-                break;
+               return new Btfss(input);
         }
 
         switch(input & 0x3E00)
         {
             case 0x3E00:
-                //addlw();
                 return new Addlw(input);
-                //break;
             case 0x3C00:
                 return new Sublw(input);
         }

de/darkress/pic16f84sim/gui/SramTable.java

@@ -0,0 +1,52 @@
+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
+    }
+}