Skip to content

PS2 games in the browser: static recompilation to WebAssembly with a native runtime

C++

Show latched INTC bits only to reads made with interrupts enabled

Samir Nuriea6380a8d945
diff --git a/runtime/src/hw.cpp b/runtime/src/hw.cpp
index 2ccaa1f..e56369b 100644
--- a/runtime/src/hw.cpp
+++ b/runtime/src/hw.cpp
@@ -187,7 +187,7 @@ void dmac_raise(unsigned channel) {
}
std::uint32_t read32(std::uint32_t a) {
- if (a == kIntcStat) return g_intc_stat | g_intc_latched;
+ if (a == kIntcStat) return g_intc_stat | (kernel::interruptible() ? g_intc_latched : 0u);
if (a == kIntcMask) return g_intc_mask;
if (a == kDmacStat) return g_dmac_stat;
if (a >= 0x12000000u && a < 0x12002000u) return static_cast<std::uint32_t>(gs::read_privileged(a & ~7u) >> ((a & 4u) * 8));
diff --git a/runtime/src/kernel.cpp b/runtime/src/kernel.cpp
index ae59b87..367effb 100644
--- a/runtime/src/kernel.cpp
+++ b/runtime/src/kernel.cpp
@@ -412,6 +412,7 @@ bool must_unwind() {
}
bool in_handler() { return g_in_handler; }
+bool interruptible() { return interrupts_enabled() && !g_in_handler; }
int current_thread() { return g_current; }
void service(Cpu &c) {
diff --git a/runtime/src/kernel.hpp b/runtime/src/kernel.hpp
index 001f238..cb66f2b 100644
--- a/runtime/src/kernel.hpp
+++ b/runtime/src/kernel.hpp
@@ -20,6 +20,7 @@ void handle_syscall(Cpu &c, std::uint32_t pc);
void service(Cpu &c);
bool must_unwind();
bool in_handler();
+bool interruptible();
int current_thread();
void on_vblank_start();
void on_hblank();