Skip to content

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

C++

EE kernel: SetVSyncFlag writes once and reports GS CSR

Samir Nuri8df8669f89c9
diff --git a/runtime/src/hw.cpp b/runtime/src/hw.cpp
index 72062cc..6a4d746 100644
--- a/runtime/src/hw.cpp
+++ b/runtime/src/hw.cpp
@@ -159,6 +159,7 @@ bool dmac_set_mask(unsigned channel, bool enabled) {
}
std::uint64_t gs_imr() { return gs::read_privileged(0x12001010u); }
+std::uint64_t gs_csr() { return gs::read_privileged(0x12001000u); }
void gs_set_imr(std::uint64_t value) { gs::write_privileged(0x12001010u, value); }
void gs_set_crt(std::uint32_t interlace, std::uint32_t mode, std::uint32_t field) {
diff --git a/runtime/src/hw.hpp b/runtime/src/hw.hpp
index bac955d..8f215da 100644
--- a/runtime/src/hw.hpp
+++ b/runtime/src/hw.hpp
@@ -45,6 +45,7 @@ void dmac_ack(unsigned channel);
void dmac_raise(unsigned channel);
bool dmac_set_mask(unsigned channel, bool enabled);
std::uint64_t gs_imr();
+std::uint64_t gs_csr();
void gs_set_imr(std::uint64_t value);
void gs_set_crt(std::uint32_t interlace, std::uint32_t mode, std::uint32_t field);
diff --git a/runtime/src/kernel.cpp b/runtime/src/kernel.cpp
index 4337278..a8a6b4d 100644
--- a/runtime/src/kernel.cpp
+++ b/runtime/src/kernel.cpp
@@ -431,10 +431,10 @@ void service(Cpu &c) {
}
void on_vblank_start() {
- if (g_vsync_flag) {
- st32(g_vsync_flag, 1);
- if (g_vsync_data) st64(g_vsync_data, frame_count());
- }
+ if (!g_vsync_flag) return;
+ st32(g_vsync_flag, 1);
+ if (g_vsync_data) st64(g_vsync_data, hw::gs_csr());
+ g_vsync_flag = g_vsync_data = 0;
}
void wake_idle() { g_reschedule = true; }