code cleanup with parameter passing types

diff --git a/.gitignore b/.gitignore
index 766a5e9ca07f4ae1977be2a7b2cc5bbc3d079503..59c997ccab422f43c1ef3643bd9f35d10cc74d4e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ tmp/
 .vimspector.json
 .vscode/
 dist/
-**/node_modules/
\ No newline at end of file
+**/node_modules/
+onyx-lsp.ini

diff --git a/compiler/include/astnodes.h b/compiler/include/astnodes.h
index fdf8c45c65ef8755d22a722f1b0f71dba8b05cd4..21dc6ea50ce58f460a8aa6f57d2f6e03b1a6119f 100644 (file)
--- a/compiler/include/astnodes.h
+++ b/compiler/include/astnodes.h
@@ -526,7 +526,7 @@ typedef enum ForLoopType {
 typedef enum ParamPassType {
     Param_Pass_Invalid,
     Param_Pass_By_Value,
-    Param_Pass_By_VarArg,
+    Param_Pass_By_Multiple_Values,
     Param_Pass_By_Implicit_Pointer,
 } ParamPassType;
 
@@ -1887,7 +1887,10 @@ static inline CallingConvention type_function_get_cc(Type* type) {
 }
 
 static inline ParamPassType type_get_param_pass(Type* type) {
-    if (type_is_structlike_strict(type) && !type_structlike_is_simple(type)) return Param_Pass_By_Implicit_Pointer;
+    if (type_is_structlike_strict(type)) {
+        if (type_structlike_is_simple(type)) return Param_Pass_By_Multiple_Values;
+        else                                 return Param_Pass_By_Implicit_Pointer;
+    }
     return Param_Pass_By_Value;
 }
 

diff --git a/compiler/src/types.c b/compiler/src/types.c
index 6498d1886a43e5dbff455fb2811fa933b2cd0f21..3e96ff176c90c31e4de4876545f375c6e173871c 100644 (file)
--- a/compiler/src/types.c
+++ b/compiler/src/types.c
@@ -901,18 +901,6 @@ Type* type_make_varargs(bh_allocator alloc, Type* of) {
 }
 
 void build_linear_types_with_offset(Type* type, bh_arr(TypeWithOffset)* pdest, u32 offset) {
-    // nocheckin :StructAsm
-    /*
-    if (type_is_structlike_strict(type)) {
-        u32 mem_count = type_structlike_mem_count(type);
-        StructMember smem = { 0 };
-        fori (i, 0, mem_count) {
-            type_lookup_member_by_idx(type, i, &smem);
-            build_linear_types_with_offset(smem.type, pdest, offset + smem.offset);
-        }
-
-    } else */
-
     if (type->kind == Type_Kind_Compound) {
         u32 elem_offset = 0;
         fori (i, 0, type->Compound.count) {

diff --git a/compiler/src/wasm_emit.c b/compiler/src/wasm_emit.c
index 9b38094cb73845c353ac9e47fafe1402d27beb12..6ffd642d4dab5a92df84785809d2bb10bd07d502 100644 (file)
--- a/compiler/src/wasm_emit.c
+++ b/compiler/src/wasm_emit.c
@@ -27,45 +27,20 @@
 #define WASM_TYPE_VOID    0x00
 
 static b32 onyx_type_is_stored_in_memory(Type *type) {
-    if (type->kind == Type_Kind_Struct || type->kind == Type_Kind_DynArray) {
-        return 1;
-    }
-
-    return 0;
+    return type->kind == Type_Kind_Struct
+        || type->kind == Type_Kind_DynArray;
 }
 
 static WasmType onyx_type_to_wasm_type(Type* type) {
-    if (onyx_type_is_stored_in_memory(type)) {
-        return WASM_TYPE_PTR;
-    }
-
-    if (type->kind == Type_Kind_Slice) {
-        return WASM_TYPE_VOID;
-    }
-
-    if (type->kind == Type_Kind_Compound) {
-        return WASM_TYPE_VOID;
-    }
-
-    if (type->kind == Type_Kind_Enum) {
-        return onyx_type_to_wasm_type(type->Enum.backing);
-    }
-
-    if (type->kind == Type_Kind_Distinct) {
-        return onyx_type_to_wasm_type(type->Distinct.base_type);
-    }
+    if (onyx_type_is_stored_in_memory(type)) return WASM_TYPE_PTR;
 
-    if (type->kind == Type_Kind_Pointer) {
-        return WASM_TYPE_PTR;
-    }
-
-    if (type->kind == Type_Kind_Array) {
-        return WASM_TYPE_PTR;
-    }
-
-    if (type->kind == Type_Kind_Function) {
-        return WASM_TYPE_FUNC;
-    }
+    if (type->kind == Type_Kind_Slice)    return WASM_TYPE_VOID;
+    if (type->kind == Type_Kind_Compound) return WASM_TYPE_VOID;
+    if (type->kind == Type_Kind_Enum)     return onyx_type_to_wasm_type(type->Enum.backing);
+    if (type->kind == Type_Kind_Distinct) return onyx_type_to_wasm_type(type->Distinct.base_type);
+    if (type->kind == Type_Kind_Pointer)  return WASM_TYPE_PTR;
+    if (type->kind == Type_Kind_Array)    return WASM_TYPE_PTR;
+    if (type->kind == Type_Kind_Function) return WASM_TYPE_FUNC;
 
     if (type->kind == Type_Kind_Basic) {
         TypeBasic* basic = &type->Basic;
@@ -88,14 +63,10 @@ static WasmType onyx_type_to_wasm_type(Type* type) {
 }
 
 static b32 onyx_type_is_multiple_wasm_values(Type *type) {
-    if (type->kind == Type_Kind_Slice || type->kind == Type_Kind_VarArgs) {
-        return 1;
-    }
-
     // Dynamic arrays and slices are represented as a single pointer to
     // data for the structure.
-
-    return 0;
+    return type->kind == Type_Kind_Slice
+        || type->kind == Type_Kind_VarArgs;
 }
 
 static i32 generate_type_idx(OnyxWasmModule* mod, Type* ft);
@@ -3315,15 +3286,15 @@ EMIT_FUNC(expression, AstTyped* expr) {
             u64 localidx = bh_imap_get(&mod->local_map, (u64) param);
 
             switch (type_get_param_pass(param->type)) {
-                case Param_Pass_By_Value: {
-                    if (type_is_structlike_strict(expr->type)) {
-                        u32 mem_count = type_structlike_mem_count(expr->type);
-                        fori (idx, 0, mem_count) WIL(NULL, WI_LOCAL_GET, localidx + idx);
+                case Param_Pass_By_Multiple_Values: {
+                    u32 mem_count = type_structlike_mem_count(expr->type);
+                    fori (idx, 0, mem_count) WIL(NULL, WI_LOCAL_GET, localidx + idx);
+                    break;
+                }
 
-                    } else {
-                        assert(localidx & LOCAL_IS_WASM);
-                        WIL(NULL, WI_LOCAL_GET, localidx);
-                    }
+                case Param_Pass_By_Value: {
+                    assert(localidx & LOCAL_IS_WASM);
+                    WIL(NULL, WI_LOCAL_GET, localidx);
                     break;
                 }
 
@@ -3472,26 +3443,24 @@ EMIT_FUNC(expression, AstTyped* expr) {
         case Ast_Kind_Field_Access: {
             AstFieldAccess* field = (AstFieldAccess* ) expr;
 
-            if (field->expr->kind == Ast_Kind_Param) {
-                if (type_get_param_pass(field->expr->type) == Param_Pass_By_Value && !type_is_pointer(field->expr->type)) {
-                    u64 localidx = bh_imap_get(&mod->local_map, (u64) field->expr) + field->idx;
-                    assert(localidx & LOCAL_IS_WASM);
-                    WIL(NULL, WI_LOCAL_GET, localidx);
-                    break;
-                }
+            if (field->expr->kind == Ast_Kind_Param && type_get_param_pass(field->expr->type) == Param_Pass_By_Multiple_Values) {
+                u64 localidx = bh_imap_get(&mod->local_map, (u64) field->expr) + field->idx;
+                assert(localidx & LOCAL_IS_WASM);
+                WIL(NULL, WI_LOCAL_GET, localidx);
             }
 
-
-            if (is_lval((AstNode *) field->expr) || type_is_pointer(field->expr->type)) {
+            else if (is_lval((AstNode *) field->expr) || type_is_pointer(field->expr->type)) {
                 u64 offset = 0;
                 emit_field_access_location(mod, &code, field, &offset);
                 emit_load_instruction(mod, &code, field->type, offset);
+            }
 
-            } else if (onyx_type_is_stored_in_memory(field->expr->type)) {
+            else if (onyx_type_is_stored_in_memory(field->expr->type)) {
                 emit_expression(mod, &code, field->expr);
                 emit_load_instruction(mod, &code, field->type, field->offset);
+            }
 
-            } else {
+            else {
                 emit_expression(mod, &code, field->expr);
 
                 i32 idx = type_get_idx_of_linear_member_with_offset(field->expr->type, field->offset);
@@ -3994,24 +3963,22 @@ static i32 generate_type_idx(OnyxWasmModule* mod, Type* ft) {
     i32 params_left = param_count;
 
     while (params_left-- > 0) {
-        if (type_get_param_pass(*param_type) == Param_Pass_By_Implicit_Pointer) {
-            *(t++) = (char) onyx_type_to_wasm_type(&basic_types[Basic_Kind_Rawptr]);
+        switch (type_get_param_pass(*param_type)) {
+            case Param_Pass_By_Value:            *(t++) = (char) onyx_type_to_wasm_type(*param_type); break;
+            case Param_Pass_By_Implicit_Pointer: *(t++) = (char) onyx_type_to_wasm_type(&basic_types[Basic_Kind_Rawptr]); break;
 
-        }
+            case Param_Pass_By_Multiple_Values: {
+                u32 mem_count = type_structlike_mem_count(*param_type);
+                StructMember smem;
 
-        else if (onyx_type_is_multiple_wasm_values(*param_type)) {
-            u32 mem_count = type_structlike_mem_count(*param_type);
-            StructMember smem;
+                fori (i, 0, mem_count) {
+                    type_lookup_member_by_idx(*param_type, i, &smem);
+                    *(t++) = (char) onyx_type_to_wasm_type(smem.type);
+                }
 
-            fori (i, 0, mem_count) {
-                type_lookup_member_by_idx(*param_type, i, &smem);
-                *(t++) = (char) onyx_type_to_wasm_type(smem.type);
+                param_count += mem_count - 1;
+                break;
             }
-
-            param_count += mem_count - 1;
-
-        } else {
-            *(t++) = (char) onyx_type_to_wasm_type(*param_type);
         }
 
         param_type++;
@@ -4119,22 +4086,17 @@ static void emit_function(OnyxWasmModule* mod, AstFunction* fd) {
         u64 localidx = 0;
         bh_arr_each(AstParam, param, fd->params) {
             switch (type_get_param_pass(param->local->type)) {
-                case Param_Pass_By_Value: {
-                    if (type_is_structlike_strict(param->local->type)) {
-                        debug_introduce_symbol(mod, param->local->token, DSL_REGISTER, localidx | LOCAL_IS_WASM, param->local->type);
-                        bh_imap_put(&mod->local_map, (u64) param->local, localidx | LOCAL_IS_WASM);
-                        localidx += type_structlike_mem_count(param->local->type);
-
-                        break;
-                    }
-                    // fallthrough
-                }
+                case Param_Pass_By_Multiple_Values: 
+                    debug_introduce_symbol(mod, param->local->token, DSL_REGISTER, localidx | LOCAL_IS_WASM, param->local->type);
+                    bh_imap_put(&mod->local_map, (u64) param->local, localidx | LOCAL_IS_WASM);
+                    localidx += type_structlike_mem_count(param->local->type);
+                    break;
 
-                case Param_Pass_By_Implicit_Pointer: {
+                case Param_Pass_By_Value:
+                case Param_Pass_By_Implicit_Pointer:
                     debug_introduce_symbol(mod, param->local->token, DSL_REGISTER, localidx | LOCAL_IS_WASM, param->local->type);
                     bh_imap_put(&mod->local_map, (u64) param->local, localidx++ | LOCAL_IS_WASM);
                     break;
-                }
 
                 default: assert(0);
             }