From 393b9d39c669c1100d14d897048a6040ab7bfcf5 Mon Sep 17 00:00:00 2001
From: Meruemon <aaronmoser@t-online.de>
Date: Thu, 28 Apr 2022 09:50:55 +0200
Subject: [PATCH] implemented alu

---
 bin/Model/Microcontroller/ALU.class | Bin 3350 -> 3353 bytes
 bin/Model/Microcontroller/PIC.class | Bin 12991 -> 12994 bytes
 bin/View/GUIRamTable.class          | Bin 6028 -> 6028 bytes
 bin/View/GUITestFileTable.class     | Bin 6505 -> 6535 bytes
 src/Model/Microcontroller/ALU.java  |   2 +-
 src/Model/Microcontroller/PIC.java  |   8 ++++----
 src/View/GUIRamTable.java           |   2 +-
 src/View/GUITestFileTable.java      |  24 ++++++++++++++----------
 8 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/bin/Model/Microcontroller/ALU.class b/bin/Model/Microcontroller/ALU.class
index bee62dfaf125ec2909191024aff7974b94578310..f28782d8b3fcda83122abd1a0359202571c66630 100644
GIT binary patch
delta 26
hcmbOxHB)MX5hE{8a$-)hV@gV9NoIcDW*f#^+yHZ#2=o8|

delta 23
ecmbO!HBD-R5hE98a$-($SYl3T>SlY!TigIy&j-Q)

diff --git a/bin/Model/Microcontroller/PIC.class b/bin/Model/Microcontroller/PIC.class
index 50a09be2f1550e3951a898cd30ee26a4f9afff23..9b667304703c53b060a59ee3ac899153a077f534 100644
GIT binary patch
delta 26
hcmdm=dMI^6DLXGua$-)hV@gV9NoIcD=6ZGqZ2*s~3G@H}

delta 23
ecmX?<x<7S8DLWTua$-($SYl3T>gFbP2W<dyPYA*Q

diff --git a/bin/View/GUIRamTable.class b/bin/View/GUIRamTable.class
index 351374df0b40a3e1dc2991f749dfede62487e904..bd7aa49f495d40dce758639bf3a8c857823c11ec 100644
GIT binary patch
delta 81
zcmeCt@6q4zl+n_FgTauIfyuy-gTWX?8*wn0f@ot726GT?!ogq(qD?s%tU<IH2ZJq$
WHs37A6v4@;H+dqT-sYv;&$$8hQ4JUX

delta 81
zcmeCt@6q4zl+n_hgTauIfyuy(gTWX?n{qIif@l*C26GT?%)wv@qK!BhtU<IP2ZJq$
WHrOo36v4@8GkGGP-sYv;&$$8keGMi6

diff --git a/bin/View/GUITestFileTable.class b/bin/View/GUITestFileTable.class
index 1598f0d5cd91464e670d398a878a8fc2c00c377e..4dfbb8861a03a96864281d96a4a1cbed053c2e24 100644
GIT binary patch
delta 267
zcmaE9)NZ_ChnUDI24)5(1_p*=tt|{n+ZY<8moQ{aJ}6e0F2}$Q6h6kl&2XGSfZ+s#
z8pBBjdxldC;S8r4iWtr@qyc5cAX*vH88U!8pdpNW3_=Wy3|D|`RtCo3K!uEq{0xae
zAsL_$4!guAFA$G*gV=W!Xx}xUeb<5Z-2mEm6KLNppfPuG*e8Hy-(*{fP{9Wb5)6+R
tlo%c}s4_fd&}Votd9g&b=sTd3-ZLmLd<2SqV$fjt!l29WeX_Bn832n~Ir0Di

delta 249
zcmZoSerdE}hZyH>24)5(1_p+V$!Ek0Q=}N!fb3%otPIB)q!~^ym@u4V@L@Q`kj`+1
zAq^-a22l&-X8?IXU5tDTLJW)ySAc9*2FBk&2}VYKhD4x{3{VJexHQuehE%OB3`)|h
z8IvE1i%mWz?(YP#>@rZ}6`*BTftFnZT6P_1#!VcS37}avIa(rA@D76n!#xHihWiYv
o3=bLf8J<i&C{Zo?3TW(W1_g$<K+$&$8Vny8bQwNR4wN(l0I*auivR!s

diff --git a/src/Model/Microcontroller/ALU.java b/src/Model/Microcontroller/ALU.java
index 9947e55..d28e135 100644
--- a/src/Model/Microcontroller/ALU.java
+++ b/src/Model/Microcontroller/ALU.java
@@ -29,7 +29,7 @@ public class ALU {
      * @param bSubtractionBit
      * @return
      */
-    public int calcValue(int iValue1, int iWRegister, boolean bSubtractionBit) {
+    public int calcAddition(int iValue1, int iWRegister, boolean bSubtractionBit) {
         //Array with booleans which represent the value of value 1 that will be used for calculation
         boolean[] abValue1 = new boolean[8];
         abValue1[0] = ((iValue1 & 0b1) == 0b1);
diff --git a/src/Model/Microcontroller/PIC.java b/src/Model/Microcontroller/PIC.java
index b3523f7..78a6ced 100755
--- a/src/Model/Microcontroller/PIC.java
+++ b/src/Model/Microcontroller/PIC.java
@@ -127,7 +127,7 @@ public class PIC {
      */
     public void ADDLW(int eightK) {
         int wRegValue = get_WRegister();
-        int result = ArithmeticLogicUnit.calcValue(eightK, wRegValue, false);
+        int result = ArithmeticLogicUnit.calcAddition(eightK, wRegValue, false);
         result &= 255;
         setWRegister(result);
 
@@ -197,7 +197,7 @@ public class PIC {
         int regFileAddrValue = Ram.get_Value_Of_Bank_RP0_Bit_Of_Element_At_Adress(Ram.get_RP0Bit(), registerFileAddress);
 
         //Calculate result.
-        int result = ArithmeticLogicUnit.calcValue(regFileAddrValue, wRegValue, false);
+        int result = ArithmeticLogicUnit.calcAddition(regFileAddrValue, wRegValue, false);
 
         Ram.set_Carryflag(ArithmeticLogicUnit.getCarryFlag());
         Ram.set_Digitcarryflag(ArithmeticLogicUnit.getDigitCarryFlag());
@@ -1177,7 +1177,7 @@ public class PIC {
     public void SUBLW(int eightK) {
         int wRegValue = get_WRegister();
 
-        int result = ArithmeticLogicUnit.calcValue(eightK, wRegValue, true);
+        int result = ArithmeticLogicUnit.calcAddition(eightK, wRegValue, true);
         result &= 255;
 
         Ram.set_Carryflag(ArithmeticLogicUnit.getCarryFlag());
@@ -1210,7 +1210,7 @@ public class PIC {
         //Get value at fileaddress.
         int regFileAddrValue = Ram.get_Value_Of_Bank_RP0_Bit_Of_Element_At_Adress(Ram.get_RP0Bit(), registerFileAddress);
 
-        int result = ArithmeticLogicUnit.calcValue(regFileAddrValue, wRegValue, true);
+        int result = ArithmeticLogicUnit.calcAddition(regFileAddrValue, wRegValue, true);
         result &= 255;
 
         Ram.set_Carryflag(ArithmeticLogicUnit.getCarryFlag());
diff --git a/src/View/GUIRamTable.java b/src/View/GUIRamTable.java
index 2b17617..dd12f8e 100644
--- a/src/View/GUIRamTable.java
+++ b/src/View/GUIRamTable.java
@@ -33,7 +33,7 @@ public class GUIRamTable extends JScrollPane {
 
     JLabel oRam = new JLabel("RAM");
 
-    String[][] assData = {{"0x", "07", "06", "05", "04", "03", "02", "01", "00"}, {"00", "", "", "", "", "", "", "", ""},
+    String[][] assData = {{"0x", "00", "01", "02", "03", "04", "05", "06", "07"}, {"00", "", "", "", "", "", "", "", ""},
                           {"08", "", "", "", "", "", "", "", ""}, {"10", "", "", "", "", "", "", "", ""},
                           {"18", "", "", "", "", "", "", "", ""}, {"20", "", "", "", "", "", "", "", ""},
                           {"28", "", "", "", "", "", "", "", ""}, {"30", "", "", "", "", "", "", "", ""},
diff --git a/src/View/GUITestFileTable.java b/src/View/GUITestFileTable.java
index 95e6f5c..d55e548 100644
--- a/src/View/GUITestFileTable.java
+++ b/src/View/GUITestFileTable.java
@@ -195,11 +195,13 @@ public class GUITestFileTable extends JScrollPane {
      * @param iLineToMark
      */
     public void markLine(int iLineToMark) {
-        if (iLineToMark > -1) {
-            oLineInformation.get(iLineToMark * 2).setForeground(getThemeColor()[3]);
-            oLineInformation.get(iLineToMark * 2).setBorder(BorderFactory.createLineBorder(getThemeColor()[3]));
-            oLineInformation.get(iLineToMark * 2 + 1).setForeground(getThemeColor()[3]);
-            oLineInformation.get(iLineToMark * 2 + 1).setBorder(BorderFactory.createLineBorder(getThemeColor()[3]));
+        if (oLineInformation.size() > iLineToMark) {
+            if (iLineToMark > -1) {
+                oLineInformation.get(iLineToMark * 2).setForeground(getThemeColor()[3]);
+                oLineInformation.get(iLineToMark * 2).setBorder(BorderFactory.createLineBorder(getThemeColor()[3]));
+                oLineInformation.get(iLineToMark * 2 + 1).setForeground(getThemeColor()[3]);
+                oLineInformation.get(iLineToMark * 2 + 1).setBorder(BorderFactory.createLineBorder(getThemeColor()[3]));
+            }
         }
     }
 
@@ -208,11 +210,13 @@ public class GUITestFileTable extends JScrollPane {
      * @param iLineToUnmark
      */
     public void unmarkLine(int iLineToUnmark) {
-        if (iLineToUnmark > -1) {
-            oLineInformation.get(iLineToUnmark * 2).setForeground(getThemeColor()[0]);
-            oLineInformation.get(iLineToUnmark * 2).setBorder(BorderFactory.createLineBorder(getThemeColor()[2]));
-            oLineInformation.get(iLineToUnmark * 2 + 1).setForeground(getThemeColor()[0]);
-            oLineInformation.get(iLineToUnmark * 2 + 1).setBorder(BorderFactory.createLineBorder(getThemeColor()[2]));
+        if (oLineInformation.size() > iLineToUnmark) {
+            if (iLineToUnmark > -1) {
+                oLineInformation.get(iLineToUnmark * 2).setForeground(getThemeColor()[0]);
+                oLineInformation.get(iLineToUnmark * 2).setBorder(BorderFactory.createLineBorder(getThemeColor()[2]));
+                oLineInformation.get(iLineToUnmark * 2 + 1).setForeground(getThemeColor()[0]);
+                oLineInformation.get(iLineToUnmark * 2 + 1).setBorder(BorderFactory.createLineBorder(getThemeColor()[2]));
+            }
         }
     }