Still Not Fixed

Cherrytree56567 · Oct 22, 2023 · 59a75fa · 59a75fa
1 parent 0c8685c
commit 59a75fa
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 12 deletions.
diff --git a/PSEMU/CPU.cpp b/PSEMU/CPU.cpp
@@ -54,7 +54,7 @@ void CPU::fetch() {
 }
 
 void CPU::decode_execute(Instruction instruction) {
-    std::cout << "Instruction " << instruction.instruction << "\n";
+    std::cout << "instruction: " << instruction.instruction << "\n";
     switch (instruction.opcode()) {
         case (0b000000):
             switch (instruction.function()) {
@@ -582,15 +582,23 @@ void CPU::op_bne(Instruction instruction) {
 }
 
 void CPU::op_addi(Instruction instruction) {
-    uint32_t rs = regs[instruction.rs()];
-    uint32_t imm_s = instruction.imm_s();
-    uint32_t addi = rs + imm_s;
+    int32_t i = instruction.imm_s();
+    uint32_t t = instruction.rt();
+    uint32_t s = instruction.rs();
 
-    bool overflow = (((addi ^ rs) & (addi ^ imm_s)) & UINT32_C(0x80000000)) != 0;
-    if (!overflow)
-        set_reg(instruction.rt(), addi);
-    else
+    int32_t sValue = regs[s];
+
+    int32_t v;
+
+    // Manual overflow check
+    if ((i > 0 && sValue > INT_MAX - i) || (i < 0 && sValue < INT_MIN - i)) {
+        // Overflow occurred
         exception(Exception::Overflow);
+    }
+    else {
+        v = sValue + i;
+        set_reg(t, static_cast<uint32_t>(v));
+    }
 }
 
 void CPU::op_lw(Instruction instruction) {

diff --git a/PSEMU/RAM.cpp b/PSEMU/RAM.cpp
@@ -2,7 +2,7 @@
 
 void RAM::newl() {
 	for (int i = 0; i < (2 * 1024 * 1024); i++) {
-		ram[i] = 0xca;
+		ram[i] = 0x0;
 	}
 }
 

diff --git a/PSEMU/x64/Debug/CPU.obj b/PSEMU/x64/Debug/CPU.obj
diff --git a/PSEMU/x64/Debug/PSEMU.ilk b/PSEMU/x64/Debug/PSEMU.ilk
diff --git a/PSEMU/x64/Debug/PSEMU.log b/PSEMU/x64/Debug/PSEMU.log
@@ -2,7 +2,7 @@
 C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.h(114,1): warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
 C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.h(123,1): warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
 C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.h(132,1): warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
-C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.cpp(815,53): warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
-C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.cpp(1091,16): warning C4244: 'initializing': conversion from 'uint64_t' to 'uint32_t', possible loss of data
-C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.cpp(1093,23): warning C4293: '>>': shift count negative or too big, undefined behavior
+C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.cpp(823,53): warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
+C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.cpp(1099,16): warning C4244: 'initializing': conversion from 'uint64_t' to 'uint32_t', possible loss of data
+C:\Users\ronit\Desktop\PSEMU\PSEMU\CPU.cpp(1101,23): warning C4293: '>>': shift count negative or too big, undefined behavior
   PSEMU.vcxproj -> C:\Users\ronit\Desktop\PSEMU\x64\Debug\PSEMU.exe
diff --git a/PSEMU/x64/Debug/PSEMU.obj b/PSEMU/x64/Debug/PSEMU.obj
diff --git a/PSEMU/x64/Debug/PSEMU.tlog/CL.read.1.tlog b/PSEMU/x64/Debug/PSEMU.tlog/CL.read.1.tlog
diff --git a/PSEMU/x64/Debug/PSEMU.tlog/CL.write.1.tlog b/PSEMU/x64/Debug/PSEMU.tlog/CL.write.1.tlog
diff --git a/PSEMU/x64/Debug/PSEMU.tlog/link.read.1.tlog b/PSEMU/x64/Debug/PSEMU.tlog/link.read.1.tlog
diff --git a/PSEMU/x64/Debug/vc143.idb b/PSEMU/x64/Debug/vc143.idb
diff --git a/PSEMU/x64/Debug/vc143.pdb b/PSEMU/x64/Debug/vc143.pdb
diff --git a/x64/Debug/PSEMU.exe b/x64/Debug/PSEMU.exe
diff --git a/x64/Debug/PSEMU.pdb b/x64/Debug/PSEMU.pdb