fix(simulator): restore host serial port bridge in WASM simulator (#7284)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Raphael Coeffic
2026-05-07 10:09:00 +10:00
committed by GitHub
co-authored by Claude Opus 4.6
parent fc61006fe4
commit a2aeab9234
4 changed files with 253 additions and 21 deletions
@@ -68,11 +68,61 @@ static void host_simuLcdNotify(wasm_exec_env_t exec_env)
iface->notifyLcdReady();
}
// WAMR native callbacks: aux serial bridge (firmware -> host). These run on
// the WAMR worker thread; the WasmSimulatorInterface methods they call emit
// Qt signals, which Qt::AutoConnection automatically queues to the GUI
// thread where HostSerialConnector lives.
static void host_simuAuxSerialStart(wasm_exec_env_t exec_env, uint32_t port_nr,
uint32_t baudrate, uint32_t encoding)
{
auto * inst = wasm_runtime_get_module_inst(exec_env);
auto * iface = static_cast<WasmSimulatorInterface *>(
wasm_runtime_get_custom_data(inst));
if (iface)
iface->onAuxSerialStart((uint8_t)port_nr, baudrate, (uint8_t)encoding);
}
static void host_simuAuxSerialStop(wasm_exec_env_t exec_env, uint32_t port_nr)
{
auto * inst = wasm_runtime_get_module_inst(exec_env);
auto * iface = static_cast<WasmSimulatorInterface *>(
wasm_runtime_get_custom_data(inst));
if (iface)
iface->onAuxSerialStop((uint8_t)port_nr);
}
static void host_simuAuxSerialSetBaudrate(wasm_exec_env_t exec_env,
uint32_t port_nr, uint32_t baudrate)
{
auto * inst = wasm_runtime_get_module_inst(exec_env);
auto * iface = static_cast<WasmSimulatorInterface *>(
wasm_runtime_get_custom_data(inst));
if (iface)
iface->onAuxSerialSetBaudrate((uint8_t)port_nr, baudrate);
}
static void host_simuAuxSerialSendBuffer(wasm_exec_env_t exec_env,
uint32_t port_nr, uint8_t * data,
uint32_t len)
{
auto * inst = wasm_runtime_get_module_inst(exec_env);
auto * iface = static_cast<WasmSimulatorInterface *>(
wasm_runtime_get_custom_data(inst));
if (iface && data && len > 0)
iface->onAuxSerialSendBuffer((uint8_t)port_nr, data, len);
}
static NativeSymbol s_nativeSymbols[] = {
{"simuGetAnalog", (void *)host_simuGetAnalog, "(i)i", nullptr},
{"simuQueueAudio", (void *)host_simuQueueAudio, "(*~)", nullptr},
{"simuTrace", (void *)host_simuTrace, "($)", nullptr},
{"simuLcdNotify", (void *)host_simuLcdNotify, "()", nullptr},
{"simuAuxSerialStart", (void *)host_simuAuxSerialStart, "(iii)", nullptr},
{"simuAuxSerialStop", (void *)host_simuAuxSerialStop, "(i)", nullptr},
{"simuAuxSerialSetBaudrate", (void *)host_simuAuxSerialSetBaudrate,
"(ii)", nullptr},
{"simuAuxSerialSendBuffer", (void *)host_simuAuxSerialSendBuffer,
"(i*~)", nullptr},
};
WasmSimulatorInterface::WasmSimulatorInterface(const QString & wasmPath,
@@ -338,6 +388,10 @@ bool WasmSimulatorInterface::resolveExports()
m_fnGetCustomSwitchIndex =
wasm_runtime_lookup_function(m_moduleInst, "simuGetCustomSwitchIndex");
// Aux serial: host -> firmware data injection
m_fnAuxSerialReceive =
wasm_runtime_lookup_function(m_moduleInst, "simuAuxSerialReceive");
m_fnMalloc = wasm_runtime_lookup_function(m_moduleInst, "malloc");
m_fnFree = wasm_runtime_lookup_function(m_moduleInst, "free");
@@ -857,8 +911,56 @@ void WasmSimulatorInterface::queueAudio(const uint8_t * buf, uint32_t len)
void WasmSimulatorInterface::receiveAuxSerialData(const quint8 port_num,
const QByteArray & data)
{
Q_UNUSED(port_num);
Q_UNUSED(data);
if (!m_fnAuxSerialReceive || !m_execEnv || !m_fnMalloc || !m_fnFree ||
data.isEmpty())
return;
QMutexLocker lckr(&m_mutex);
uint32_t len = data.size();
uint32_t allocArgv[1] = {len};
if (!wasm_runtime_call_wasm(m_execEnv, m_fnMalloc, 1, allocArgv) ||
!allocArgv[0])
return;
uint32_t wasmBuf = allocArgv[0];
void * nativePtr = wasm_runtime_addr_app_to_native(m_moduleInst, wasmBuf);
if (nativePtr)
memcpy(nativePtr, data.constData(), len);
uint32_t argv[3] = {(uint32_t)port_num, wasmBuf, len};
wasm_runtime_call_wasm(m_execEnv, m_fnAuxSerialReceive, 3, argv);
uint32_t freeArgv[1] = {wasmBuf};
wasm_runtime_call_wasm(m_execEnv, m_fnFree, 1, freeArgv);
}
void WasmSimulatorInterface::onAuxSerialStart(uint8_t port_nr,
uint32_t baudrate,
uint8_t encoding)
{
emit auxSerialSetEncoding(port_nr, encoding);
if (baudrate != 0)
emit auxSerialSetBaudrate(port_nr, baudrate);
emit auxSerialStart(port_nr);
}
void WasmSimulatorInterface::onAuxSerialStop(uint8_t port_nr)
{
emit auxSerialStop(port_nr);
}
void WasmSimulatorInterface::onAuxSerialSetBaudrate(uint8_t port_nr,
uint32_t baudrate)
{
emit auxSerialSetBaudrate(port_nr, baudrate);
}
void WasmSimulatorInterface::onAuxSerialSendBuffer(uint8_t port_nr,
const uint8_t * data,
uint32_t len)
{
emit auxSerialSendData(port_nr,
QByteArray((const char *)data, (int)len));
}
void WasmSimulatorInterface::run()
@@ -84,6 +84,15 @@ class WasmSimulatorInterface : public SimulatorInterface
// Called by WASM import simuLcdNotify (from WAMR thread)
void notifyLcdReady();
// Called by WASM aux serial imports (from WAMR thread). These re-emit
// the matching SimulatorInterface signals so that HostSerialConnector
// (wired up in SimulatorMainWindow) drives the real host serial port.
void onAuxSerialStart(uint8_t port_nr, uint32_t baudrate, uint8_t encoding);
void onAuxSerialStop(uint8_t port_nr);
void onAuxSerialSetBaudrate(uint8_t port_nr, uint32_t baudrate);
void onAuxSerialSendBuffer(uint8_t port_nr, const uint8_t * data,
uint32_t len);
protected slots:
void run();
void onLcdNotify();
@@ -196,6 +205,9 @@ class WasmSimulatorInterface : public SimulatorInterface
static constexpr int MAX_FS_LEDS = 8;
uint32_t m_lastFSLedColors[MAX_FS_LEDS] = {};
// Aux serial: host -> firmware data injection
wasm_function_inst_t m_fnAuxSerialReceive = nullptr;
wasm_function_inst_t m_fnMalloc = nullptr;
wasm_function_inst_t m_fnFree = nullptr;
};