execf34s restructuring

ass2/simulator/.qtcreator/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 18.0.0, 2025-12-04T14:58:13. -->
+<!-- Written by QtCreator 18.0.0, 2025-12-06T15:29:50. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -105,16 +105,16 @@
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
--DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
--DCMAKE_BUILD_TYPE:STRING=Debug
--DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
 -DQT_MAINTENANCE_TOOL:FILEPATH=/home/aljaz/Qt/MaintenanceTool
+-DCMAKE_BUILD_TYPE:STRING=Debug
 -DCMAKE_GENERATOR:STRING=Ninja
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake</value>
+-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
+-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</value>
     <value type="int" key="EnableQmlDebugging">0</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/aljaz/Desktop/spo/ass2/simulator/build/Desktop_Qt_6_10_1-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">

ass2/simulator/machine.cpp

@@ -170,15 +170,15 @@ bool Machine::execF2(int opcode, int operand) {
 bool Machine::execSICF3F4(int opcode, int ni, int operand) {
     int x_val = 0;
     int operand2 = fetch();
-    int UA;
+    int UA = 0;
-    int UV;
+    int UV = 0;
-    int temp;
+    int temp = 0;
     bool ready = false;
+    int offset = 0;
+    if (((operand >> 7) & 0x1) == 1) { //preverimo ali je indeksno naslavljanje
+        x_val = getX();
+    }
     if (ni == 0) { // stari SIC (neposredno in enostavno naslavljanje)
-        if (((operand >> 7) & 0x1) == 1) { //preverimo ali je indeksno naslavljanje
-            x_val = getX();
-        }
-
         UA = (((operand & 0x7F) << 8) | operand2) + x_val; //izracun uporabnega naslova: operand brez bita x + drugi del naslova + x_val
 
         if (UA + 2 > MAX_ADDRESS) {
@@ -187,156 +187,214 @@ bool Machine::execSICF3F4(int opcode, int ni, int operand) {
         }
 
         UV = (memory[UA] << 16) | (memory[UA + 1] << 8) | memory[UA + 2]; //izracunamo operand oz. uporabno vrednost
-        switch (opcode) {
+    } else if (((operand >> 4) & 0x1) == 0) { // ce e bit ni prizgan e je F3, sicer F4
-            case Opcode::ADD:
+            bool b = ((operand >> 6) & 0x1) == 1;  //preverimo bit za bazno naslavljanje
-                    setA(getA() + UV);
+            bool p = ((operand >> 5) & 0x1) == 1;
-                    return true;
+            offset  = (((operand & 0x0F) << 8) | operand2);
-            case Opcode::AND:
+            if (offset & 0x800) { // če je bit 11 = 1 (negativno)
-                setA(getA() & UV);
+                offset |= 0xFFFFF000; // nastavi vse višje bite na 1 (sign extend)
-                return true;
+            }
-            case Opcode::COMP:
+            offset += x_val;
-                temp = getA();
+            if (!b && p) { //PC - relativno
-                if (temp < UV) {
+                UA = getPC() + offset;
-                    setSW(0x40);
+            } else if (b && !p) {
-                } else if (temp == UV) {
+                UA = getB() + offset;
-                    setSW(0x0);
+            } else if (!b && !p) { //neposredno
-                } else {
+                UA = (((operand & 0x0F) << 8) | operand2);
-                    setSW(0x80);
+            } else { // b && p je nedovoljeno!
-                }
+                invalidAddressing();
-                return true;
+            }
-                break;
-            case Opcode::DIV:
-                if (UV == 0) {
-                    cerr << "Error: Divison by zero." << endl;
-                    return false;
-                }
-                setA(getA() / UV);
-                return true;
-            case Opcode::J:
-                setPC(UV);
-                return true;
-            case Opcode::JEQ:
-                if (getSW() == 0x00) {
-                    setPC(UV);
-                }
-                return true;
-            case Opcode::JGT:
-                if (getSW() == 0x80) {
-                    setPC(UV);
-                }
-                return true;
-            case Opcode::JLT:
-                if (getSW() == 0x40) {
-                    setPC(UV);
-                }
-                return true;
-            case Opcode::JSUB:
-                setL(getPC());
-                setPC(UV);
-                return true;
-            case Opcode::LDA:
-                setA(UV);
-                return true;
-            case Opcode::LDB:
-                setB(UV);
-                return true;
-            case Opcode::LDCH:
-                setA((getA() & 0xFFFF00) | (UV & 0xFF));
-                return true;
-            case Opcode::LDL:
-                setL(UV);
-                return true;
-            case Opcode::LDS:
-                setS(UV);
-                return true;
-            case Opcode::LDT:
-                setT(UV);
-                return true;
-            case Opcode::LDX:
-                setX(UV);
-                return true;
-            case Opcode::MUL:
-                setA(getA() * UV);
-                return true;
-            case Opcode::OR:
-                setA(getA() | UV);
-                return true;
-            case Opcode::RD:
-                temp = UV & 0xFF;
-                if (devices[temp] != nullptr) {
-                    setA(devices[temp]->read());
-                }
-                return true;
-            case Opcode::RSUB:
-                setPC(getL());
-                return true;
-            case Opcode::STA:
-                temp = getA();
-                memory[UV] = (temp >> 16) & 0xFF;
-                memory[UV + 1] = (temp >> 8) & 0xFF;
-                memory[UV + 2] = temp & 0xFF;
-                return true;
-            case Opcode::STCH:
-                temp = getA();
-                memory[UV] = temp & 0xFF;
-                return true;
-            case Opcode::STL:
-                temp = getL();
-                memory[UV] = (temp >> 16) & 0xFF;
-                memory[UV + 1] = (temp >> 8) & 0xFF;
-                memory[UV + 2] = temp & 0xFF;
-                return true;
-            case Opcode::STSW:
-                temp = getSW();
-                memory[UV] = (temp >> 16) & 0xFF;
-                memory[UV + 1] = (temp >> 8) & 0xFF;
-                memory[UV + 2] = temp & 0xFF;
-                return true;
-            case Opcode::STX:
-                temp = getX();
-                memory[UV] = (temp >> 16) & 0xFF;
-                memory[UV + 1] = (temp >> 8) & 0xFF;
-                memory[UV + 2] = temp & 0xFF;
-                return true;
-            case Opcode::SUB:
-                setA(getA() - UV);
-                return true;
-            case Opcode::TD:
-                temp = UV & 0xFF;
 
-                ready = false;
+            if (UA + 2 > MAX_ADDRESS) {
-                if (devices[temp] != nullptr) {
+                invalidAddressing();
-                    ready = devices[temp]->test();
+                return false;
-                }
+            }
-                if (ready) {
-                    setSW(0X40);
-                } else {
-                    setSW(0x00);
-                }
 
-                return true;
+            if (ni == 2) { //posredno
-            case Opcode::TIX:
+                int UV_temp = (memory[UA] << 16) | (memory[UA + 1] << 8) | memory[UA + 2];
-                temp = getX();
+                UV =  (memory[UV_temp] << 16) | (memory[UV_temp + 1] << 8) | memory[UV_temp + 2];
-                setX(temp + 1);
+            } else if (ni == 1) { //takojšnje
-                if (temp < UV) setSW(0x40);
+                UV = UA;
-                else if (temp == UV) setSW(0x00);
+            } else if (ni == 3) { //enostavno
-                else setSW(0x80);
+                UV = (memory[UA] << 16) | (memory[UA + 1] << 8) | memory[UA + 2]; //izracunamo operand oz. uporabno vrednost
-                return true;
+            }
-            case Opcode::WD:
+    } else {
-                temp = UV & 0xFF;
+        int operand3 = fetch();
-                if (devices[temp] != nullptr) {
+        bool b = ((operand >> 6) & 0x1) == 1;  //preverimo bit za bazno naslavljanje
-                    devices[temp]->write(getA() & 0xFF);
+        bool p = ((operand >> 5) & 0x1) == 1;
-                }
+        offset  = (((operand & 0x0F) << 16) | (operand2 << 8) | operand3);
-                return true;
+        if (offset & 0x80000) { // če je bit 11 = 1 (negativno)
-            default:
+            offset |= 0xFFF00000; // nastavi vse višje bite na 1 (sign extend)
-                notImplemented(opcode);
+        }
-                break;
+        offset += x_val;
+        if (!b && p) { //PC - relativno
+            UA = getPC() + offset;
+        } else if (b && !p) {
+            UA = getB() + offset;
+        } else if (!b && !p) { //neposredno
+            UA = (((operand & 0x0F) << 16) | (operand2 << 8) | operand3);
+        } else { // b && p je nedovoljeno!
+            invalidAddressing();
         }
 
-    } else if (((operand >> 4) & 0x1) == 0) { // ce e bit ni prizgan e je F3, sicer F4
+        if (UA + 2 > MAX_ADDRESS) {
+            invalidAddressing();
+            return false;
+        }
 
-    } else {
+        if (ni == 2) { //posredno
+            int UV_temp = (memory[UA] << 16) | (memory[UA + 1] << 8) | memory[UA + 2];
+            UV =  (memory[UV_temp] << 16) | (memory[UV_temp + 1] << 8) | memory[UV_temp + 2];
+        } else if (ni == 1) { //takojšnje
+            UV = UA;
+        } else if (ni == 3) { //enostavno
+            UV = (memory[UA] << 16) | (memory[UA + 1] << 8) | memory[UA + 2]; //izracunamo operand oz. uporabno vrednost
+        }
+    }
+    switch (opcode) {
+    case Opcode::ADD:
+        setA(getA() + UV);
+        return true;
+    case Opcode::AND:
+        setA(getA() & UV);
+        return true;
+    case Opcode::COMP:
+        temp = getA();
+        if (temp < UV) {
+            setSW(0x40);
+        } else if (temp == UV) {
+            setSW(0x0);
+        } else {
+            setSW(0x80);
+        }
+        return true;
+        break;
+    case Opcode::DIV:
+        if (UV == 0) {
+            cerr << "Error: Divison by zero." << endl;
+            return false;
+        }
+        setA(getA() / UV);
+        return true;
+    case Opcode::J:
+        setPC(UV);
+        return true;
+    case Opcode::JEQ:
+        if (getSW() == 0x00) {
+            setPC(UV);
+        }
+        return true;
+    case Opcode::JGT:
+        if (getSW() == 0x80) {
+            setPC(UV);
+        }
+        return true;
+    case Opcode::JLT:
+        if (getSW() == 0x40) {
+            setPC(UV);
+        }
+        return true;
+    case Opcode::JSUB:
+        setL(getPC());
+        setPC(UV);
+        return true;
+    case Opcode::LDA:
+        setA(UV);
+        return true;
+    case Opcode::LDB:
+        setB(UV);
+        return true;
+    case Opcode::LDCH:
+        setA((getA() & 0xFFFF00) | (UV & 0xFF));
+        return true;
+    case Opcode::LDL:
+        setL(UV);
+        return true;
+    case Opcode::LDS:
+        setS(UV);
+        return true;
+    case Opcode::LDT:
+        setT(UV);
+        return true;
+    case Opcode::LDX:
+        setX(UV);
+        return true;
+    case Opcode::MUL:
+        setA(getA() * UV);
+        return true;
+    case Opcode::OR:
+        setA(getA() | UV);
+        return true;
+    case Opcode::RD:
+        temp = UV & 0xFF;
+        if (devices[temp] != nullptr) {
+            setA(devices[temp]->read());
+        }
+        return true;
+    case Opcode::RSUB:
+        setPC(getL());
+        return true;
+    case Opcode::STA:
+        temp = getA();
+        memory[UV] = (temp >> 16) & 0xFF;
+        memory[UV + 1] = (temp >> 8) & 0xFF;
+        memory[UV + 2] = temp & 0xFF;
+        return true;
+    case Opcode::STCH:
+        temp = getA();
+        memory[UV] = temp & 0xFF;
+        return true;
+    case Opcode::STL:
+        temp = getL();
+        memory[UV] = (temp >> 16) & 0xFF;
+        memory[UV + 1] = (temp >> 8) & 0xFF;
+        memory[UV + 2] = temp & 0xFF;
+        return true;
+    case Opcode::STSW:
+        temp = getSW();
+        memory[UV] = (temp >> 16) & 0xFF;
+        memory[UV + 1] = (temp >> 8) & 0xFF;
+        memory[UV + 2] = temp & 0xFF;
+        return true;
+    case Opcode::STX:
+        temp = getX();
+        memory[UV] = (temp >> 16) & 0xFF;
+        memory[UV + 1] = (temp >> 8) & 0xFF;
+        memory[UV + 2] = temp & 0xFF;
+        return true;
+    case Opcode::SUB:
+        setA(getA() - UV);
+        return true;
+    case Opcode::TD:
+        temp = UV & 0xFF;
 
+        ready = false;
+        if (devices[temp] != nullptr) {
+            ready = devices[temp]->test();
+        }
+        if (ready) {
+            setSW(0X40);
+        } else {
+            setSW(0x00);
+        }
+
+        return true;
+    case Opcode::TIX:
+        temp = getX();
+        setX(temp + 1);
+        if (temp < UV) setSW(0x40);
+        else if (temp == UV) setSW(0x00);
+        else setSW(0x80);
+        return true;
+    case Opcode::WD:
+        temp = UV & 0xFF;
+        if (devices[temp] != nullptr) {
+            devices[temp]->write(getA() & 0xFF);
+        }
+        return true;
+    default:
+        notImplemented(opcode);
+        break;
     }
     return false;
 }