misc bugfixes

Author: brendanfh

compiler/cli/main.c

@@ -938,9 +938,6 @@ int main(int argc, char *argv[]) {
             case ONYX_EVENT_ALL_TYPES_CHECKED:
                 break;
 
-            case ONYX_EVENT_PHASE_START:
-                break;
-
             case ONYX_EVENT_SYMBOL_DEFINED:
                 // bh_printf("DEFINED SYMBOL AT %s:%d,%d\n",
                 //     onyx_event_field_str(ctx, i, "filename"),

compiler/include/astnodes.h

@@ -2429,6 +2429,7 @@ void compiler_events_clear(Context *context);
 CompilerEvent *compiler_event_add(Context *context, u32 event_type);
 void compiler_event_add_field_str(Context *context, CompilerEvent *event, char *field, char *value);
 void compiler_event_add_field_int(Context *context, CompilerEvent *event, char *field, i32 value);
+void compiler_event_log(Context *context, char *fmt, ...);
 
 
 // NOTE: Useful inlined functions

compiler/src/extensions.c

@@ -263,11 +263,10 @@ b32 compiler_extension_negotiate_capabilities(Context *context, CompilerExtensio
     }
 
     {
-        CompilerEvent *e = compiler_event_add(context, 1);
-        compiler_event_add_field_str(context, e, "message",
-            bh_aprintf(context->scratch_alloc, "Extension '%s' spawned with protocol version %d.",
-                ext->name, extension_protocol_version
-            )
+        compiler_event_log(
+            context,
+            "Extension '%s' spawned with protocol version %d.",
+            ext->name, extension_protocol_version
         );
     }
 

compiler/src/library_main.c

@@ -548,7 +548,7 @@ onyx_pump_t onyx_pump(onyx_context_t *ctx) {
                 } else if (context->cycle_almost_detected == 3) {
                     send_stalled_hooks(context);
                 } else if (context->cycle_almost_detected == 2) {
-                    compiler_event_add(context, 4);
+                    compiler_event_add(context, ONYX_EVENT_ALL_TYPES_CHECKED);
                 }
 
                 context->cycle_almost_detected += 1;

compiler/src/utils.c

@@ -6,6 +6,7 @@
 #include "astnodes.h"
 #include "errors.h"
 #include "doc.h"
+#include "onyx.h"
 
 //
 // Program info and packages
@@ -1815,3 +1816,15 @@ void compiler_event_add_field_int(Context *context, CompilerEvent *event, char *
     event->first_field = new_field;
 }
 
+void compiler_event_log(Context *context, char *fmt, ...) {
+    va_list va;
+    va_start(va, fmt);
+
+    char buf[1024] = {0};
+    bh_snprintf_va(buf, 1023, (const char *) fmt, va);
+
+    CompilerEvent *e = compiler_event_add(context, ONYX_EVENT_LOG);
+    compiler_event_add_field_str(context, e, "message", buf);
+
+    va_end(va);
+}

compiler/src/wasm_emit.c

@@ -5355,23 +5355,24 @@ void onyx_wasm_module_link(Context *context, OnyxWasmModule *module, OnyxWasmLin
     }
 
 
-    // if (context->options->print_function_mappings) {
-    //     bh_arr_each(AstFunction *, pfunc, module->all_procedures) {
-    //         AstFunction *func = *pfunc;
-
-    //         u64 func_idx = (u64) bh_imap_get(&module->index_map, (u64) func);
-
-    //         if (!func->is_foreign) {
-    //             func_idx += module->next_foreign_func_idx;
-    //         }
-
-    //         bh_printf("%d -> %s:%d:%d\n",
-    //             func_idx,
-    //             func->token->pos.filename,
-    //             func->token->pos.line,
-    //             func->token->pos.column);
-    //     }
-    // }
+    if (0) {
+        bh_arr_each(AstFunction *, pfunc, module->all_procedures) {
+            AstFunction *func = *pfunc;
+
+            u64 func_idx = (u64) bh_imap_get(&module->index_map, (u64) func);
+
+            if (!func->is_foreign) {
+                func_idx += module->next_foreign_func_idx;
+            }
+
+            compiler_event_log(context,
+                "%d -> %s:%d:%d\n",
+                func_idx,
+                func->token->pos.filename,
+                func->token->pos.line,
+                func->token->pos.column);
+        }
+    }
 }
 
 void onyx_wasm_module_free(OnyxWasmModule* module) {

core/net/net.onyx

@@ -138,7 +138,7 @@ make_ipv4_address :: (out: &SocketAddress, addr: str, port: u16) {
 make_unix_address :: (out: &SocketAddress, path: str) {
     *out = .{ Unix = .{} };
 
-    out_path := cast([&] u8) out + alignof out.tag_enum;
+    out_path := cast([&] u8) out + alignof typeof *out;
     offset   := 0;
     while offset < math.min(path.count, UNIX_SOCKET_PATH_LEN - 1) {
         defer offset += 1;