fix assertions

yamt · Jul 23, 2023 · 33832bd · 33832bd
1 parent 197e574
commit 33832bd
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/lib/cell.c b/lib/cell.c
@@ -179,22 +179,16 @@ frame_locals_cellidx(struct exec_context *ctx, uint32_t localidx,
 void
 val_to_cells(const struct val *val, struct cell *cells, uint32_t ncells)
 {
-#if defined(TOYWASM_ENABLE_WASM_SIMD)
-        assert(ncells == 1 || ncells == 2 || ncells == 4 || ncells == 8);
-#else
+        assert(ncells <= ARRAYCOUNT(val->u.cells));
         assert(ncells == 1 || ncells == 2 || ncells == 4);
-#endif
         cells_copy(cells, val->u.cells, ncells);
 }
 
 void
 val_from_cells(struct val *val, const struct cell *cells, uint32_t ncells)
 {
-#if defined(TOYWASM_ENABLE_WASM_SIMD)
-        assert(ncells == 1 || ncells == 2 || ncells == 4 || ncells == 8);
-#else
+        assert(ncells <= ARRAYCOUNT(val->u.cells));
         assert(ncells == 1 || ncells == 2 || ncells == 4);
-#endif
         cells_copy(val->u.cells, cells, ncells);
 }