fix

PSEMU/CPU.cpp

@@ -8,29 +8,31 @@ void CPU::tick() {
   fetch();
 }
 
-void CPU::fetch() {    
+void CPU::fetch() {
+    current_pc = pc;
+
+    if (current_pc % 4 != 0) {
+        // PC is not correctly aligned!
+        exception(Exception::LoadAddressError);
+        return;
+    }
+
     Instruction instr;
     instr.instruction = bus->load32(pc);
-    
+
     delay_slot = brancha;
     brancha = false;
-
-    current_pc = pc;
+
+    decode_execute(instr);
+
+    // Increment next PC to point to the next instruction.
     pc = next_pc;
-    next_pc += 4;
+    next_pc = next_pc + 4;
 
     set_reg(std::get<0>(load), std::get<1>(load));
 
     load = std::make_tuple(0, 0);
-
-    if (current_pc % 4 != 0) {
-        // PC is not correctly aligned!
-        exception(Exception::LoadAddressError);
-        return;
-    }
 
-    decode_execute(instr);
-    just_started = false;
     for (int i = 0; i < 32; i++) {
         regs[i] = out_regs[i];
     }
@@ -181,7 +183,7 @@ void CPU::decode_execute(Instruction instruction) {
                     break;
 
                 default:
-                    std::cout << "[CPU] ERROR: Unhandled Function Instruction \n" << pc;
+                    std::cout << "[CPU] ERROR: Unhandled Function Instruction \n" << instruction.function();
                     exit(0);
                     break;
             }

PSEMU/x64/Debug/PSEMU.log

@@ -1,5 +1,3 @@
   CPU.cpp
-C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.cpp(758,55): warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
-  PSEMU.cpp
-  Generating Code...
+C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.cpp(757,55): warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
   PSEMU.vcxproj -> C:\Users\ronit\Desktop\PSEMU\x64\Debug\PSEMU.exe