PS2 games in the browser: static recompilation to WebAssembly with a native runtime
C++
vif: stall on the interrupt bit until FBRST.STC
Samir Nuriec5454774cd2
diff --git a/runtime/src/dmac.cpp b/runtime/src/dmac.cppindex b602539..d24a624 100644--- a/runtime/src/dmac.cpp+++ b/runtime/src/dmac.cpp@@ -1,5 +1,7 @@#include "dmac.hpp"+#include "kernel.hpp"+#include "gs/gif.hpp"#include "hw.hpp"#include "ps2/memory.hpp"@@ -7,6 +9,7 @@#include "vif.hpp"#include <cstdio>+#include <cstdlib>#include <cstring>#include <vector>@@ -16,6 +19,7 @@ namespace {struct Channel {std::uint32_t chcr = 0, madr = 0, qwc = 0, tadr = 0, asr[2] = {}, sadr = 0;+ bool paused = false, pause_end = false;};Channel g_ch[10];@@ -55,8 +59,17 @@ void deliver(int ch, std::uint32_t address, std::uint32_t qwc) {}}+bool vif_stalled(int ch) { return (ch == 0 || ch == 1) && vif::stalled(ch); }++void pause(int ch, bool end) {+ g_ch[ch].paused = true;+ g_ch[ch].pause_end = end;+}+void finish(int ch) {Channel &c = g_ch[ch];+ static const bool trace = std::getenv("PS2_TRACE_DMA") != nullptr;+ if (trace && ch <= 2) std::fprintf(stderr, "[dma] ch%d done chcr 0x%08X tadr 0x%08X madr 0x%08X\n", ch, c.chcr, c.tadr, c.madr);c.chcr &= ~0x100u;hw::dmac_raise(static_cast<unsigned>(ch));}@@ -74,6 +87,10 @@ void run_normal(int ch) {}c.madr += c.qwc * 16;c.qwc = 0;+ if (vif_stalled(ch)) {+ pause(ch, true);+ return;+ }finish(ch);}@@ -83,6 +100,10 @@ void run_chain(int ch) {deliver(ch, c.madr, c.qwc);c.madr += c.qwc * 16;c.qwc = 0;+ if (vif_stalled(ch)) {+ pause(ch, false);+ return;+ }}const bool tte = c.chcr & 0x40u, tie = c.chcr & 0x80u;for (int guard = 0; guard < 1'000'000; ++guard) {@@ -131,6 +152,10 @@ void run_chain(int ch) {if (ch == 2 && g_starts[2] <= 2) std::fprintf(stderr, "[dma] gif tag id %u qwc %u addr 0x%08X data 0x%08X\n", id, qwc, addr_full, data);deliver(ch, data, qwc);c.madr = data + qwc * 16;+ if (vif_stalled(ch)) {+ pause(ch, end || (tie && irq));+ return;+ }if (end || (tie && irq)) break;}c.qwc = 0;@@ -139,9 +164,11 @@ void run_chain(int ch) {void start(int ch) {Channel &c = g_ch[ch];+ c.paused = false;++g_starts[ch];- if (ch == 2 && g_starts[ch] <= 3)- std::fprintf(stderr, "[dma] gif chcr 0x%08X madr 0x%08X qwc %u tadr 0x%08X\n", c.chcr, c.madr, c.qwc, c.tadr);+ static const bool trace = std::getenv("PS2_TRACE_DMA") != nullptr;+ if (trace) std::fprintf(stderr, "[dma] ch%d chcr 0x%08X madr 0x%08X qwc %u tadr 0x%08X thread %d%s\n", ch, c.chcr, c.madr, c.qwc, c.tadr,+ kernel::current_thread(), kernel::in_handler() ? " (handler)" : "");if (ch == 5 || ch == 6 || ch == 7) {finish(ch);return;@@ -153,6 +180,18 @@ void start(int ch) {}+void resume(int ch) {+ Channel &c = g_ch[ch];+ if (!c.paused) return;+ c.paused = false;+ if (c.pause_end || ((c.chcr >> 2) & 3u) != 1) {+ c.qwc = 0;+ finish(ch);+ return;+ }+ run_chain(ch);+}+void reset() {for (Channel &c : g_ch) c = Channel{};g_ctrl = g_pcr = g_sqwc = g_rbsr = g_rbor = g_stadr = g_enable = 0;@@ -210,6 +249,7 @@ void write(std::uint32_t a, std::uint32_t v) {case 0x00: {const bool was = c.chcr & 0x100u;c.chcr = v;+ if (!(v & 0x100u)) c.paused = false;if (!was && (v & 0x100u)) start(ch);break;}diff --git a/runtime/src/dmac.hpp b/runtime/src/dmac.hppindex c3e3643..5955403 100644--- a/runtime/src/dmac.hpp+++ b/runtime/src/dmac.hpp@@ -9,5 +9,6 @@ void stats();bool owns(std::uint32_t a);std::uint32_t read(std::uint32_t a);void write(std::uint32_t a, std::uint32_t v);+void resume(int ch);}diff --git a/runtime/src/vif.cpp b/runtime/src/vif.cppindex ee22c7f..0d162d5 100644--- a/runtime/src/vif.cpp+++ b/runtime/src/vif.cpp@@ -1,5 +1,6 @@#include "vif.hpp"+#include "dmac.hpp"#include "gs/gif.hpp"#include "hw.hpp"#include "vu_micro.hpp"@@ -16,7 +17,7 @@ struct Unit {std::uint32_t stat = 0, err = 0, mark = 0, cycle = 0, mode = 0, num = 0, mask = 0, code = 0;std::uint32_t itops = 0, base = 0, ofst = 0, tops = 0, itop = 0, top = 0;std::uint32_t row[4] = {}, col[4] = {};- bool dbf = false;+ bool dbf = false, stalled = false;std::vector<std::uint32_t> pending;};@@ -180,12 +181,27 @@ void execute(int unit, std::uint32_t cmd, const std::uint32_t *data) {else std::fprintf(stderr, "[vif%d] unknown command 0x%08X\n", unit, cmd);break;}- if (cmd & 0x80000000u) {- u.stat |= 0x800u;+ if ((cmd & 0x80000000u) && !(u.err & 1u)) {+ u.stat |= 0xC00u;+ u.stalled = true;hw::intc_raise(4u + static_cast<unsigned>(unit));}}+void process(int unit) {+ Unit &u = g_units[unit];+ std::size_t pos = 0;+ while (pos < u.pending.size() && !u.stalled) {+ const std::uint32_t cmd = u.pending[pos];+ const std::size_t start = pos + 1;+ const std::uint32_t need = data_words(unit, cmd);+ if (start + need > u.pending.size()) break;+ execute(unit, cmd, u.pending.data() + start);+ pos = start + need;+ }+ u.pending.erase(u.pending.begin(), u.pending.begin() + static_cast<std::ptrdiff_t>(pos));+}+}void reset() {@@ -206,18 +222,11 @@ void transfer(int unit, const std::uint8_t *data, std::uint32_t qwc) {const std::size_t old = u.pending.size();u.pending.resize(old + static_cast<std::size_t>(qwc) * 4);std::memcpy(u.pending.data() + old, data, static_cast<std::size_t>(qwc) * 16);- std::size_t pos = 0;- while (pos < u.pending.size()) {- const std::uint32_t cmd = u.pending[pos];- const std::size_t start = pos + 1;- const std::uint32_t need = data_words(unit, cmd);- if (start + need > u.pending.size()) break;- execute(unit, cmd, u.pending.data() + start);- pos = start + need;- }- u.pending.erase(u.pending.begin(), u.pending.begin() + static_cast<std::ptrdiff_t>(pos));+ process(unit);}+bool stalled(int unit) { return g_units[unit].stalled; }+std::uint32_t read(int unit, std::uint32_t reg) {const Unit &u = g_units[unit];switch (reg) {@@ -249,7 +258,14 @@ void write(int unit, std::uint32_t reg, std::uint32_t value) {if (value & 1u) {u = Unit{};}- if (value & 8u) u.stat &= ~0xF00u;+ if (value & 8u) {+ u.stat &= ~0x3F00u;+ if (u.stalled) {+ u.stalled = false;+ process(unit);+ if (!u.stalled) dmac::resume(unit);+ }+ }break;case 0x20: u.err = value; break;case 0x30: u.mark = value; break;diff --git a/runtime/src/vif.hpp b/runtime/src/vif.hppindex 7cbf258..5b744c9 100644--- a/runtime/src/vif.hpp+++ b/runtime/src/vif.hpp@@ -7,6 +7,7 @@ namespace ps2::vif {void reset();void stats();void transfer(int unit, const std::uint8_t *data, std::uint32_t qwc);+bool stalled(int unit);std::uint32_t read(int unit, std::uint32_t reg);void write(int unit, std::uint32_t reg, std::uint32_t value);