web49_error more

Author: ShawSumma

src/api/wasi.c

@@ -27,8 +27,7 @@ static web49_interp_data_t web49_api_wasi_fd_seek(void *wasi_untyped, web49_inte
             whence = SEEK_SET;
             break;
         default:
-            fprintf(stderr, "bad wasi whence: %" PRIu32 "\n", interp.locals[2].i32_u);
-            __builtin_trap();
+            web49_error("bad wasi whence: %" PRIu32 "\n", interp.locals[2].i32_u);
     }
     if (interp.locals[0].i32_u <= 2 && whence == SEEK_SET) {
         WEB49_INTERP_WRITE(int64_t, interp, interp.locals[3].i32_u, interp.locals[1].i64_s);
@@ -180,8 +179,7 @@ static web49_interp_data_t web49_api_wasi_path_open(void *wasi_untyped, web49_in
             dirfd = open("./", O_RDONLY);
             break;
         default:
-            fprintf(stderr, "unknown dirfd: %i\n", wdirfd);
-            __builtin_trap();
+            web49_error("unknown dirfd: %i\n", wdirfd);
     }
 #if defined(__WIN32__)
     int hostfd = open(host_path, flags, 0644);

src/config.h

@@ -9,5 +9,6 @@
 #define WEB49_PRINT_INSTR 0
 #define WEB49_PRINT_INSTR_DEPTH 0
 #define WEB49_CHECK_BOUNDS 0
+#define WEB49_DEBUG_DIE 1
 
 #endif

src/interp/interp.c

@@ -5,7 +5,7 @@
 #if WEB49_USE_SWTICH
 #define OPCODE(n) (n)
 #else
-#define OPCODE(n) ({size_t x = (n); if (ptrs[x] == NULL) {__builtin_trap();} ptrs[x]; })
+#define OPCODE(n) ({size_t x = (n); if (ptrs[x] == NULL) {web49_die();} ptrs[x]; })
 #endif
 
 web49_env_t *web49_env_new(void *state, web49_env_func_t func) {
@@ -375,10 +375,7 @@ uint32_t web49_interp_read_instr(web49_read_block_state_t *state, web49_instr_t
         args[i] = n;
         uint32_t end = state->depth;
         if (begin + 1 != end) {
-            fprintf(stderr, "error: the below instruction (%s ...) did not yield exactly 1 value (debug: %" PRIu32 "+1 != %" PRIu32 ")\n", web49_opcode_to_name(cur.args[i].opcode), begin, end);
-            web49_debug_print_instr(stderr, cur.args[i]);
-            __builtin_trap();
-            // state->depth = begin + 1;
+            web49_error("error: the instruction (%s ...) did not yield exactly 1 value (debug: %" PRIu32 "+1 != %" PRIu32 ")\n", web49_opcode_to_name(cur.args[i].opcode), begin, end);
         }
     }
     // puts(web49_opcode_to_name(cur.opcode));
@@ -388,12 +385,10 @@ uint32_t web49_interp_read_instr(web49_read_block_state_t *state, web49_instr_t
     }
     uint32_t outer_end = state->depth;
     if (outer_begin + cur.nargs != outer_end) {
-        fprintf(stderr, "error: stack should have been at %zu, but was at %zu\n", (size_t)(outer_begin + cur.nargs), (size_t)outer_end);
-        web49_debug_print_instr(stderr, cur);
-        __builtin_trap();
+        web49_error("error: stack should have been at %zu, but was at %zu\n", (size_t)(outer_begin + cur.nargs), (size_t)outer_end);
     }
     if (state->depth < cur.nargs) {
-        __builtin_trap();
+        web49_error("error: bad number of arguments");
     }
     state->depth -= cur.nargs;
     if (cur.opcode == WEB49_OPCODE_NOP || cur.opcode == WEB49_OPCODE_UNREACHABLE) {
@@ -516,8 +511,7 @@ uint32_t web49_interp_read_instr(web49_read_block_state_t *state, web49_instr_t
             build->code[build->ncode++].data.v128 = WEB49_INTERP_V128(cur.immediate.u128);
             break;
         default:
-            fprintf(stderr, "bad immediate: %zu\n", (size_t)cur.immediate.id);
-            __builtin_trap();
+            web49_error("bad immediate: %zu\n", (size_t)cur.immediate.id);
     }
     return ret;
 }
@@ -579,8 +573,7 @@ static void web49_interp_block_run_comp(web49_interp_block_t *block, void **ptrs
             } else if (block->nreturns == 1) {
                 instrs[0].opcode = OPCODE(WEB49_OPCODE_FFI_CALL1);
             } else {
-                fprintf(stderr, "error: import returns too many things\n");
-                __builtin_trap();
+                web49_error("error: import returns too many things\n");
             }
             web49_env_t *env = NULL;
             for (size_t nimport = 0; nimport < interp.num_env; nimport++) {
@@ -593,8 +586,7 @@ static void web49_interp_block_run_comp(web49_interp_block_t *block, void **ptrs
                 }
             }
             if (env == NULL) {
-                fprintf(stderr, "not implemented: %s.%s\n", block->module_str, block->field_str);
-                __builtin_trap();
+                web49_error("not implemented: %s.%s\n", block->module_str, block->field_str);
             }
             instrs[1].func = env;
             web49_free(block->module_str);

src/interp/interp.h

@@ -187,7 +187,7 @@ uint32_t web49_interp_read_instr(web49_read_block_state_t *state, web49_instr_t
 void web49_free_interp(web49_interp_t interp);
 
 #if WEB49_CHECK_BOUNDS
-#define WEB49_INTERP_BOUNDS(low, add) ({ fprintf(stderr, "memmory access 0x%zx of size 0x%zx out of bounds\n", (size_t) (low), (size_t) (add)); __builtin_trap(); })
+#define WEB49_INTERP_BOUNDS(low, add) ({ web49_error(stderr, "memmory access 0x%zx of size 0x%zx out of bounds\n", (size_t) (low), (size_t) (add)); })
 #else
 #define WEB49_INTERP_BOUNDS(low, add) (__builtin_unreachable())
 #endif

src/interp/interp0.inc

@@ -1,24 +1,21 @@
 NAME(WEB49_OPCODE_MEMORY_INIT) {
-    fprintf(stderr, "memory init?\n");
-    __builtin_trap();
+    web49_error("memory init?\n");
     NEXT();
 }
 NAME(WEB49_OPCODE_DATA_DROP) {
+    web49_error("data drop? \n");
     NEXT();
 }
 NAME(WEB49_OPCODE_TABLE_INIT) {
-    fprintf(stderr, "table init? \n");
-    __builtin_trap();
+    web49_error("table init? \n");
     NEXT();
 }
 NAME(WEB49_OPCODE_ELEM_DROP) {
-    fprintf(stderr, "elem drop?\n");
-    __builtin_trap();
+    web49_error("elem drop?\n");
     NEXT();
 }
 NAME(WEB49_OPCODE_TABLE_COPY) {
-    fprintf(stderr, "table copy?\n");
-    __builtin_trap();
+    web49_error("table copy?\n");
     NEXT();
 }
 NAME(WEB49_OPCODE_FFI_CALL1) {
@@ -223,7 +220,7 @@ NAME(WEB49_OPCODE_CALL) {
     } else if (fblock->nlocals <= 1024) {
         head[-1].opcode = OPCODE(WEB49_OPCODE_CALL_DONE1024);
     } else {
-        fprintf(stderr, "too many locals: %zu\n", (size_t)fblock->nlocals);
+        web49_error("too many locals: %zu\n", (size_t)fblock->nlocals);
         __builtin_trap();
     }
     head[0].opcodes = fblock->code;

src/lib.h

@@ -39,8 +39,16 @@ extern size_t web49_total_alloc;
 #define web49_realloc(ptr, size) (realloc(ptr, size))
 #define web49_free(ptr) (free((void *)ptr))
 
+#define web49_unreachable() __builtin_unreachable()
+
+#if WEB49_DEBUG_DIE
+#define web49_die() __builtin_trap()
+#else
+#define web49_die() exit(1)
+#endif
+
 #define web49_error(...)          \
     fprintf(stderr, __VA_ARGS__); \
-    __builtin_trap()
+    web49_die()
 
 #endif

src/opt/tree.c

@@ -214,7 +214,6 @@ static void web49_opt_untree_emit_counting(web49_opcode_t op, uint32_t num, size
 static void web49_opt_untree(web49_module_t *mod, uint32_t func_nreturns, web49_block_list_t **pblocks, web49_instr_t cur, size_t *len, web49_instr_t **out, size_t *alloc) {
     size_t nargs = cur.nargs;
     cur.nargs = 0;
-    printf("*pblocks = %p\n", *pblocks);
     if (cur.opcode == WEB49_OPCODE_IF) {
         web49_block_list_t list = (web49_block_list_t){
             .ret = false,
@@ -358,14 +357,13 @@ static void web49_opt_untree(web49_module_t *mod, uint32_t func_nreturns, web49_
                         c += 1;
                     }
                 }
-                fprintf(stderr, "could not find (func %zu)\n", (size_t)cur.immediate.varuint32);
-                __builtin_trap();
+                web49_error("could not find (func %zu)\n", (size_t)cur.immediate.varuint32);
             } else {
                 web49_section_function_t func = web49_module_get_section(*mod, WEB49_SECTION_ID_FUNCTION).function_section;
                 ent = type.entries[func.entries[cur.immediate.varuint32 - thresh]];
             }
         } else {
-            __builtin_trap();
+            web49_error("internal error: trying to handle an unhandled case");
         }
     found_call_ent:;
         if (cur.opcode == WEB49_OPCODE_CALL) {
@@ -424,7 +422,6 @@ static void web49_opt_tree_code(web49_module_t *mod, web49_section_code_entry_t
     };
     blocks += 1;
     for (size_t i = 0; i < entry->num_instrs; i++) {
-        web49_debug_print_instr(stdout, entry->instrs[i]);
         web49_opt_untree(mod, type.num_returns, &blocks, entry->instrs[i], &len, head, alloc);
     }
     web49_instr_t bump = (*head)[--len];

src/read_bin.c

@@ -602,8 +602,7 @@ web49_instr_immediate_t web49_readbin_instr_immediate(web49_io_input_t *in, web4
         }
         return ret;
     }
-    fprintf(stderr, "unknown internal immediate id %zu\n", (size_t)id);
-    __builtin_trap();
+    web49_error("unknown internal immediate id %zu\n", (size_t)id);
 }
 
 web49_instr_t web49_readbin_init_expr(web49_io_input_t *in) {

src/read_wat.c

@@ -3,8 +3,6 @@
 #include "./ast.h"
 #include "./tables.h"
 
-#define exit(n) __builtin_trap()
-
 web49_instr_t web49_readwat_instr_buf(web49_readwat_state_t *out, web49_opcode_t opcode, size_t nargs, web49_readwat_expr_t *args, bool is_in_parens);
 
 static void web49_readwat_table_set(web49_readwat_table_t *restrict table, const char *key, uint64_t value) {

src/tables.c

@@ -2196,7 +2196,7 @@ web49_opcode_t web49_bytes_to_opcode(uint8_t *bytes) {
         case 0xFF:
             web49_error("unknown opcode: staring with byte 0xFF\n");
     }
-    __builtin_trap();
+    web49_unreachable();
 }
 
 void web49_opcode_to_bytes(web49_opcode_t opcode, size_t *len, uint8_t *buf) {