PS2 games in the browser: static recompilation to WebAssembly with a native runtime
C++
TOP and ITOP are kept per unit
reikop32dd7da6beb5
diff --git a/recomp/vurecomp.cpp b/recomp/vurecomp.cppindex 998ecbd..6e461cf 100644--- a/recomp/vurecomp.cpp+++ b/recomp/vurecomp.cpp@@ -384,8 +384,8 @@ Lower lower(std::uint32_t w, std::uint32_t pc) {case 0x64:if (ft) l.writes = static_cast<int>(ft);if (ft) for (int i = 0; i < 4; ++i) if (lane(dest, i)) c += std::format("r.vf[{}].w[{}] = r.p; ", ft, i); break;- case 0x68: c = std::format("set_vi(r, {}, vu::top()); ", it); break;- case 0x69: c = std::format("set_vi(r, {}, vu::itop()); ", it); break;+ case 0x68: c = std::format("set_vi(r, {}, vu::top(1)); ", it); break;+ case 0x69: c = std::format("set_vi(r, {}, vu::itop(1)); ", it); break;case 0x6C: c = std::format("vu::kick(1, r.vi[{}]); ", is); break;case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x78: case 0x79: case 0x7A: case 0x7C: case 0x7D: case 0x7E:c = std::format("efu(r, {}u, {}u, {}u); ", index, fs, fsf);diff --git a/runtime/include/ps2/vu_ops.hpp b/runtime/include/ps2/vu_ops.hppindex da92434..1da281e 100644--- a/runtime/include/ps2/vu_ops.hpp+++ b/runtime/include/ps2/vu_ops.hpp@@ -15,8 +15,8 @@namespace ps2::vu {void kick(int unit, std::uint32_t address);-std::uint32_t top();-std::uint32_t itop();+std::uint32_t top(int unit);+std::uint32_t itop(int unit);void interpret(int unit, std::uint32_t pc);using ProgramFn = void (*)(Vu0Regs &r, std::uint8_t *mem);diff --git a/runtime/src/system.cpp b/runtime/src/system.cppindex 47d89be..c1929dc 100644--- a/runtime/src/system.cpp+++ b/runtime/src/system.cpp@@ -268,7 +268,7 @@ std::uint32_t video_options() { return g_video_options.load(std::memory_order_renamespace {constexpr char kStateMagic[8] = {'P', 'S', '2', 'S', 'T', 'A', 'T', 'E'};-constexpr std::uint32_t kStateVersion = 4;+constexpr std::uint32_t kStateVersion = 5;std::function<void()> event_action(int id, std::uint64_t at) {if (id == hw::kEventVblank) return vblank;@@ -293,7 +293,7 @@ void machine_state(state::Stream &s) {std::uint32_t version = kStateVersion;s.pod(version);if (std::memcmp(magic, kStateMagic, sizeof magic) != 0) throw std::runtime_error("not a state file");- if (version != kStateVersion && !(s.loading() && (version == 2 || version == 3))) throw std::runtime_error("state file from another version");+ if (version != kStateVersion && !(s.loading() && version >= 2 && version < kStateVersion)) throw std::runtime_error("state file from another version");s.set_version(version);s.tag("ee");s.pod(g_cpu);diff --git a/runtime/src/vif.cpp b/runtime/src/vif.cppindex 00cfdd7..49ec09c 100644--- a/runtime/src/vif.cpp+++ b/runtime/src/vif.cpp@@ -62,10 +62,10 @@ void run_vu(int unit, std::uint32_t address) {u.dbf = !u.dbf;u.tops = u.base + (u.dbf ? u.ofst : 0);if (shadow(unit)) return;- vu::set_tops(u.top, u.itop);+ vu::set_tops(1, u.top, u.itop);} else {u.itop = u.itops;- vu::set_tops(0, u.itop);+ vu::set_tops(0, 0, u.itop);}vu::run(unit, address);}diff --git a/runtime/src/vu_jit_web.cpp b/runtime/src/vu_jit_web.cppindex 7c5684e..b808cb2 100644--- a/runtime/src/vu_jit_web.cpp+++ b/runtime/src/vu_jit_web.cpp@@ -93,8 +93,8 @@ EMSCRIPTEN_KEEPALIVE void ps2jit_kick(std::uint32_t address) {}vu::kick(1, address);}-EMSCRIPTEN_KEEPALIVE std::uint32_t ps2jit_top() { return vu::top(); }-EMSCRIPTEN_KEEPALIVE std::uint32_t ps2jit_itop() { return vu::itop(); }+EMSCRIPTEN_KEEPALIVE std::uint32_t ps2jit_top() { return vu::top(1); }+EMSCRIPTEN_KEEPALIVE std::uint32_t ps2jit_itop() { return vu::itop(1); }EMSCRIPTEN_KEEPALIVE void ps2jit_interpret(Vu0Regs *r, std::uint32_t pc) {vu::jit::g_state.fl.flush_q(*r);if (vu::jit::g_dry) {diff --git a/runtime/src/vu_micro.cpp b/runtime/src/vu_micro.cppindex 967f158..71ceebb 100644--- a/runtime/src/vu_micro.cpp+++ b/runtime/src/vu_micro.cpp@@ -27,6 +27,7 @@ namespace ps2::vu {namespace {struct Unit {+ int n;Vu0Regs *regs;std::uint8_t *code;std::uint8_t *data;@@ -45,7 +46,10 @@ struct Unit {Vu0Regs g_vu1;std::uint32_t g_generation[2] = {1, 1};-std::uint32_t g_top = 0, g_itop = 0;+// Per unit: with the VU thread of the window and web builds, VIF0 starts VU0+// programs (setting TOP to 0) while a VU1 program runs, and one shared value+// let VU1 read VU0's TOP mid-program (MGS2 then drew from the wrong buffer)+std::uint32_t g_top[2] = {}, g_itop[2] = {};struct QDelay {std::uint32_t generation = 0, value = 0;@@ -79,8 +83,8 @@ std::uint64_t g_reported = 0;bool g_reference_dry = false;Unit unit_of(int n) {- if (n == 0) return Unit{&g_cpu.vu0, g_vu0_code, g_vu0_mem, 4095u, 256u, g_cpu.vu0.tpc};- return Unit{&g_vu1, g_vu1_code, g_vu1_mem, 16383u, 1024u, g_vu1.tpc};+ if (n == 0) return Unit{0, &g_cpu.vu0, g_vu0_code, g_vu0_mem, 4095u, 256u, g_cpu.vu0.tpc};+ return Unit{1, &g_vu1, g_vu1_code, g_vu1_mem, 16383u, 1024u, g_vu1.tpc};}struct UpperOut {@@ -595,8 +599,8 @@ void lower(Unit &u, std::uint32_t w, std::uint32_t pc, std::uint32_t &npc, boolcase 0x42: r.r = r.vf[fs].w[fsf] & 0x7FFFFFu; break;case 0x43: r.r = (r.r ^ r.vf[fs].w[fsf]) & 0x7FFFFFu; break;case 0x64: if (ft) for (int i = 0; i < 4; ++i) if (dest & (8u >> i)) r.vf[ft].w[i] = r.p; break;- case 0x68: store_vi(r, it, g_top); break;- case 0x69: store_vi(r, it, g_itop); break;+ case 0x68: store_vi(r, it, g_top[u.n]); break;+ case 0x69: store_vi(r, it, g_itop[u.n]); break;case 0x6C: xgkick(u, r.vi[is]); break;case 0x70: case 0x71: case 0x72: case 0x73: {const float x = u2f(r.vf[fs].w[0]), y = u2f(r.vf[fs].w[1]), z = u2f(r.vf[fs].w[2]);@@ -701,16 +705,17 @@ void reset() {}std::memset(&g_vu1, 0, sizeof g_vu1);g_vu1.vf[0].w[3] = fp::kOne;- g_top = g_itop = 0;+ std::memset(g_top, 0, sizeof g_top);+ std::memset(g_itop, 0, sizeof g_itop);}Vu0Regs ®s(int unit) { return unit ? g_vu1 : g_cpu.vu0; }std::uint32_t tpc(int unit) { return regs(unit).tpc; }-void set_tops(std::uint32_t top, std::uint32_t itop) {- g_top = top;- g_itop = itop;+void set_tops(int unit, std::uint32_t top, std::uint32_t itop) {+ g_top[unit] = top;+ g_itop[unit] = itop;}void run_fast(int n, std::uint32_t address);@@ -785,8 +790,8 @@ void kick(int unit, std::uint32_t address) {xgkick(u, address);}-std::uint32_t top() { return g_top; }-std::uint32_t itop() { return g_itop; }+std::uint32_t top(int unit) { return g_top[unit]; }+std::uint32_t itop(int unit) { return g_itop[unit]; }ProgramFn lookup(std::uint32_t address);@@ -1146,8 +1151,16 @@ namespace ps2::vu {void state(ps2::state::Stream &s) {s.tag("vu");s.pod(g_vu1);- s.pod(g_top);- s.pod(g_itop);+ if (s.version() >= 5) {+ s.pod(g_top);+ s.pod(g_itop);+ } else {+ // One value for both units before+ s.pod(g_top[1]);+ s.pod(g_itop[1]);+ g_top[0] = g_top[1];+ g_itop[0] = g_itop[1];+ }s.bytes(g_vu0_code, sizeof g_vu0_code);s.bytes(g_vu0_mem, sizeof g_vu0_mem);s.bytes(g_vu1_code, sizeof g_vu1_code);diff --git a/runtime/src/vu_micro.hpp b/runtime/src/vu_micro.hppindex 2b853a1..3143074 100644--- a/runtime/src/vu_micro.hpp+++ b/runtime/src/vu_micro.hpp@@ -15,7 +15,7 @@ void state(ps2::state::Stream &s);void reset();void run(int unit, std::uint32_t address);std::uint32_t tpc(int unit);-void set_tops(std::uint32_t top, std::uint32_t itop);+void set_tops(int unit, std::uint32_t top, std::uint32_t itop);void code_changed(int unit);Vu0Regs ®s(int unit);std::uint64_t interpreted_calls();