evan/xteink-web-emulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wasm): boot real firmware past allocator and signature crashes

Browse Source 
Drop EMULATE_FUNCTION_POINTER_CASTS (it broke the wasm32 TCG ffi_call_js
path with BigInt errors) and fix the underlying function-pointer signature
mismatches instead: object_class_cmp GCompareFunc, esp_sha hash-callback
wrappers, and an xts_aes NULL guard in the ESP32-C3 cache. Backport the
upstream Emscripten anonymous-RAM allocator fix. Firmware now boots and
initializes the X3 panel; a post-init boot stall remains.
This commit is contained in:
Evan Reichard
2026-07-20 08:03:59 -04:00
parent 0683c1b1c1
commit 9eceacea17
5 changed files with 178 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qemu/patches/0002-qemu-wasm.patch
+156
View File
@@ -450,6 +450,139 @@ index 9ec8bd9244..754990968c 100644
default:
return 0;
}
diff --git a/hw/misc/esp32c3_cache.c b/hw/misc/esp32c3_cache.c
index 1879b5c2df..e3f09cc51b 100644
--- a/hw/misc/esp32c3_cache.c
+++ b/hw/misc/esp32c3_cache.c
@@ -58,7 +58,6 @@ static inline uint32_t esp32c3_read_mmu_value(ESP32C3CacheState *s, hwaddr reg_a
static inline void esp32c3_write_mmu_value(ESP32C3CacheState *s, hwaddr reg_addr, uint32_t value)
{
- ESP32C3XtsAesClass *xts_aes_class = ESP32C3_XTS_AES_GET_CLASS(s->xts_aes);
/* Make the assumption that the address is aligned on sizeof(uint32_t) */
const uint32_t index = reg_addr / sizeof(uint32_t);
/* Reserved bits shall always be 0 */
@@ -82,8 +81,12 @@ static inline void esp32c3_write_mmu_value(ESP32C3CacheState *s, hwaddr reg_addr
if (s->flash_blk != NULL) {
blk_pread(s->flash_blk, physical_address, ESP32C3_PAGE_SIZE, cache_data, 0);
}
- if (xts_aes_class->is_flash_enc_enabled(s->xts_aes)) {
- xts_aes_class->decrypt(s->xts_aes, physical_address, cache_data, ESP32C3_PAGE_SIZE);
+ // XTS-AES Flash Decryption - Only wired when built with CONFIG_GCRYPT; absent here means flash is treated as unencrypted, matching hardware with flash encryption disabled. Encrypted-flash firmware needs the gcrypt build.
+ if (s->xts_aes != NULL) {
+ ESP32C3XtsAesClass *xts_aes_class = ESP32C3_XTS_AES_GET_CLASS(s->xts_aes);
+ if (xts_aes_class->is_flash_enc_enabled(s->xts_aes)) {
+ xts_aes_class->decrypt(s->xts_aes, physical_address, cache_data, ESP32C3_PAGE_SIZE);
+ }
}
}
s->mmu[index].val = e.val;
@@ -225,12 +228,6 @@ static void esp32c3_cache_realize(DeviceState *dev, Error **errp)
/* Initialize the registers */
esp32c3_cache_reset_hold(OBJECT(dev), RESET_TYPE_COLD);
- ESP32C3CacheState *s = ESP32C3_CACHE(dev);
-
- /* Make sure XTS_AES was set or issue an error */
- if (s->xts_aes == NULL) {
- error_report("[CACHE] XTS_AES controller must be set!");
- }
}
static void esp32c3_cache_init(Object *obj)
diff --git a/hw/misc/esp_sha.c b/hw/misc/esp_sha.c
index c9fa2e610a..cc186595eb 100644
--- a/hw/misc/esp_sha.c
+++ b/hw/misc/esp_sha.c
@@ -22,46 +22,71 @@
#define SHA_WARNING 0
#define SHA_DEBUG 0
+static void esp_sha1_init(void *context) { sha1_init(context); }
+static void esp_sha224_init(void *context) { sha224_init(context); }
+static void esp_sha256_init(void *context) { sha256_init(context); }
+static void esp_sha384_init(void *context) { sha384_init(context); }
+static void esp_sha512_init(void *context) { sha512_init(context); }
+static void esp_sha512_224_init(void *context) { sha512_224_init(context); }
+static void esp_sha512_256_init(void *context) { sha512_256_init(context); }
+static void esp_sha512_t_init(void *context) { sha512_t_init(context); }
+static void esp_sha1_compress(void *context, const uint8_t *message)
+{
+ sha1_compress(context, message);
+}
+static void esp_sha224_compress(void *context, const uint8_t *message)
+{
+ sha224_compress(context, (uint8_t *)message);
+}
+static void esp_sha256_compress(void *context, const uint8_t *message)
+{
+ sha256_compress(context, (uint8_t *)message);
+}
+static void esp_sha512_compress(void *context, const uint8_t *message)
+{
+ sha512_compress(context, (uint8_t *)message);
+}
+
static ESPHashAlg esp_sha_algs[] = {
[ESP_SHA_1_MODE] = {
- .init = (hash_init) sha1_init,
- .compress = (hash_compress) sha1_compress,
+ .init = esp_sha1_init,
+ .compress = esp_sha1_compress,
.len = sizeof(struct sha1_state)
},
[ESP_SHA_224_MODE] = {
- .init = (hash_init) sha224_init,
- .compress = (hash_compress) sha224_compress,
+ .init = esp_sha224_init,
+ .compress = esp_sha224_compress,
.len = SHA224_HASH_SIZE
},
[ESP_SHA_256_MODE] = {
- .init = (hash_init) sha256_init,
- .compress = (hash_compress) sha256_compress,
+ .init = esp_sha256_init,
+ .compress = esp_sha256_compress,
.len = sizeof(struct sha256_state)
},
[ESP_SHA_384_MODE] = {
- .init = (hash_init) sha384_init,
- .compress = (hash_compress) sha512_compress,
+ .init = esp_sha384_init,
+ .compress = esp_sha512_compress,
.len = SHA384_HASH_SIZE
},
[ESP_SHA_512_MODE] = {
- .init = (hash_init) sha512_init,
- .compress = (hash_compress) sha512_compress,
+ .init = esp_sha512_init,
+ .compress = esp_sha512_compress,
.len = sizeof(struct sha512_state)
},
[ESP_SHA_512_224_MODE] = {
- .init = (hash_init) sha512_224_init,
- .compress = (hash_compress) sha512_compress,
+ .init = esp_sha512_224_init,
+ .compress = esp_sha512_compress,
.len = sizeof(struct sha512_state)
},
[ESP_SHA_512_256_MODE] = {
- .init = (hash_init) sha512_256_init,
- .compress = (hash_compress) sha512_compress,
+ .init = esp_sha512_256_init,
+ .compress = esp_sha512_compress,
.len = sizeof(struct sha512_state)
},
[ESP_SHA_512_t_MODE] = {
- .init = (hash_init) sha512_t_init,
- .init_message = (hash_init_message) sha512_t_init_message,
- .compress = (hash_compress) sha512_compress,
+ .init = esp_sha512_t_init,
+ .init_message = sha512_t_init_message,
+ .compress = esp_sha512_compress,
.len = sizeof(struct sha512_state)
},
};
diff --git a/hw/riscv/esp32c3.c b/hw/riscv/esp32c3.c
index 2f1ccbfbb0..febc96bfe3 100644
--- a/hw/riscv/esp32c3.c
@@ -922,6 +1055,29 @@ index 43f9a43f3f..595fa47866 100644
} else {
if (setgroups(1, &user_gid) < 0) {
error_report("Failed to setgroups(1, [%d])",
diff --git a/qom/object.c b/qom/object.c
index 9edc06d391..c3d657e6cb 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1197,7 +1197,8 @@ GSList *object_class_get_list(const char *implements_type,
return list;
}
-static gint object_class_cmp(gconstpointer a, gconstpointer b)
+static gint object_class_cmp(gconstpointer a, gconstpointer b,
+ gpointer user_data)
{
return strcasecmp(object_class_get_name((ObjectClass *)a),
object_class_get_name((ObjectClass *)b));
@@ -1207,7 +1208,7 @@ GSList *object_class_get_list_sorted(const char *implements_type,
bool include_abstract)
{
return g_slist_sort(object_class_get_list(implements_type, include_abstract),
- object_class_cmp);
+ (GCompareFunc)object_class_cmp);
}
Object *object_ref(void *objptr)
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index a8066aab03..bd3ae90008 100644
--- a/scripts/meson-buildoptions.sh