Merge branch 'main' of github.com:HAW-Rust-SoSe24/gb_emulator

src/cpu.rs

@@ -37,6 +37,8 @@ pub struct CPU {
     last_execution_time: std::time::Instant,
     cycles: u64,
     stop_mode: bool,
+    pub instruction: i32,
+
 }
 
 /// Note, please look at the relevant modules for the actual implementations
@@ -53,6 +55,7 @@ impl CPU {
             last_execution_time: std::time::Instant::now(),
             cycles: 0,
             stop_mode: false,
+            instruction: 0,
         }
     }
 

src/cpu/instructions/jumps_subroutines.rs

@@ -152,7 +152,10 @@ impl CPU {
         }
         /// Enables interrupts and pops PC from the stack, returning to the last pushed instruction
         pub fn reti(&mut self) -> InstructionResult {
-            self.ei();
+            // self.ei(); Der Ei aufruf funktioniert hier nicht, da unser superloop nicht durhclaufen wird und
+            // somit die Cycels nicht aktualisiert werden. D.H. EI aktualsiert das IME flag zu spät. ==> 
+            // direkt IME Flag setzen oder enable ime flag = 1 d.h. nach dieser Instruction
+            self.ime_flag = true;
             self.pop_r16(Register16Bit::PC);
 
             InstructionResult {

src/cpu/instructions/misc.rs

@@ -42,6 +42,7 @@ impl CPU {
     /// deactivates the IME flag, enabling Interrupts
     pub fn di(&mut self) -> InstructionResult {
         self.ime_flag = false;
+        self.enable_ime = 0;
         InstructionResult {
             cycles: 1,
             bytes: 1,

src/cpu/step.rs

@@ -1,6 +1,8 @@
 use core::task;
 use std::{thread::sleep, time::Duration};
 
+use crate::cpu::instructions::ConditionCodes;
+
 use super::{
     instructions::{FlagState, InstParam, InstructionCondition, InstructionResult, Instructions},
     registers::{self, Register16Bit, Register8Bit},
@@ -389,7 +391,10 @@ impl CPU {
                 _ => return Err(format!("Handling of {:?} not implemented", target)),
             },
             Instructions::RET(condition) => match condition {
-                InstParam::ConditionCodes(cond) => self.ret_cc(self.check_condition(cond)),
+                InstParam::ConditionCodes(cond) => match cond{
+                    InstructionCondition::SkipConditionCodes => self.ret(),
+                    _ => self.ret_cc(self.check_condition(cond)),
+                }
                 _ => self.ret(),
             },
             Instructions::RETI => self.reti(),

src/main.rs

@@ -30,7 +30,7 @@ const DOTS_PER_LINE: u32 = 456;
 const TIME_PER_FRAME: f32 = 1.0 / 60.0 * 1000.0;
 
 const DUMP_GAMEBOY_DOCTOR_LOG: bool = true;
-const WINDOWS: bool = false;
+const WINDOWS: bool = true;
 
 #[macroquad::main("GB Emulator")]
 async fn main() {