From 5bc8a491a7768da0019b7b17da637e681f2ace90 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 30 Oct 2021 23:24:34 +0100 Subject: Begin work on supporting `wasm64`; Correct `wasm32` compilation behaviour --- src/build_settings.cpp | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'src/build_settings.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 69e1ec5f0..a906f6712 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -29,6 +29,7 @@ enum TargetArchKind { TargetArch_386, TargetArch_arm64, TargetArch_wasm32, + TargetArch_wasm64, TargetArch_COUNT, }; @@ -59,6 +60,7 @@ String target_arch_names[TargetArch_COUNT] = { str_lit("386"), str_lit("arm64"), str_lit("wasm32"), + str_lit("wasm64"), }; String target_endian_names[TargetEndian_COUNT] = { @@ -72,6 +74,7 @@ TargetEndianKind target_endians[TargetArch_COUNT] = { TargetEndian_Little, TargetEndian_Little, TargetEndian_Little, + TargetEndian_Little, }; #ifndef ODIN_VERSION_RAW @@ -335,6 +338,16 @@ gb_global TargetMetrics target_freestanding_wasm32 = { str_lit(""), }; +gb_global TargetMetrics target_freestanding_wasm64 = { + TargetOs_freestanding, + TargetArch_wasm64, + 8, + 16, + str_lit("wasm64-freestanding-js"), + str_lit(""), +}; + + struct NamedTargetMetrics { @@ -353,6 +366,7 @@ gb_global NamedTargetMetrics named_targets[] = { { str_lit("freebsd_386"), &target_freebsd_386 }, { str_lit("freebsd_amd64"), &target_freebsd_amd64 }, { str_lit("freestanding_wasm32"), &target_freestanding_wasm32 }, + { str_lit("freestanding_wasm64"), &target_freestanding_wasm64 }, }; NamedTargetMetrics *selected_target_metrics; @@ -458,11 +472,21 @@ bool find_library_collection_path(String name, String *path) { } bool is_arch_wasm(void) { - return build_context.metrics.arch == TargetArch_wasm32; + switch (build_context.metrics.arch) { + case TargetArch_wasm32: + case TargetArch_wasm64: + return true; + } + return false; } bool allow_check_foreign_filepath(void) { - return build_context.metrics.arch != TargetArch_wasm32; + switch (build_context.metrics.arch) { + case TargetArch_wasm32: + case TargetArch_wasm64: + return false; + } + return true; } @@ -870,7 +894,7 @@ void init_build_context(TargetMetrics *cross_target) { break; } - } else if (bc->metrics.arch == TargetArch_wasm32) { + } else if (is_arch_wasm()) { bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined "); } else { gb_printf_err("Compiler Error: Unsupported architecture\n");; -- cgit v1.2.3 From 8ef6f9dd7bbb1611dd7166c4e14034e53df4a8b6 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 31 Oct 2021 00:11:38 +0100 Subject: Compile `wasm64`; Add `lb_run_remove_unused_function_pass` --- core/runtime/default_temporary_allocator.odin | 25 ++++++-------- core/runtime/internal.odin | 5 +++ src/build_settings.cpp | 6 +++- src/check_decl.cpp | 8 +++++ src/entity.cpp | 3 +- src/llvm_backend.cpp | 16 ++++++--- src/llvm_backend.hpp | 21 ++++++++++++ src/llvm_backend_opt.cpp | 49 +++++++++++++++++++++++++++ src/llvm_backend_proc.cpp | 13 +++++-- src/main.cpp | 19 ++++------- 10 files changed, 128 insertions(+), 37 deletions(-) (limited to 'src/build_settings.cpp') diff --git a/core/runtime/default_temporary_allocator.odin b/core/runtime/default_temporary_allocator.odin index b3602469d..afe3ee922 100644 --- a/core/runtime/default_temporary_allocator.odin +++ b/core/runtime/default_temporary_allocator.odin @@ -1,23 +1,12 @@ package runtime -@(private) -byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> []byte { - return transmute([]u8)Raw_Slice{data=data, len=max(len, 0)} -} - - DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE: int : #config(DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, 1<<22) -Default_Temp_Allocator :: struct { - data: []byte, - curr_offset: int, - prev_allocation: rawptr, - backup_allocator: Allocator, - leaked_allocations: [dynamic][]byte, -} - when ODIN_OS == "freestanding" { + Default_Temp_Allocator :: struct { + } + default_temp_allocator_init :: proc(s: ^Default_Temp_Allocator, size: int, backup_allocator := context.allocator) { } @@ -30,6 +19,14 @@ when ODIN_OS == "freestanding" { return nil, nil } } else { + Default_Temp_Allocator :: struct { + data: []byte, + curr_offset: int, + prev_allocation: rawptr, + backup_allocator: Allocator, + leaked_allocations: [dynamic][]byte, + } + default_temp_allocator_init :: proc(s: ^Default_Temp_Allocator, size: int, backup_allocator := context.allocator) { s.data = make_aligned([]byte, size, 2*align_of(rawptr), backup_allocator) s.curr_offset = 0 diff --git a/core/runtime/internal.odin b/core/runtime/internal.odin index 4347f28c0..0a6d07467 100644 --- a/core/runtime/internal.odin +++ b/core/runtime/internal.odin @@ -2,6 +2,11 @@ package runtime import "core:intrinsics" +@(private) +byte_slice :: #force_inline proc "contextless" (data: rawptr, len: int) -> []byte #no_bounds_check { + return ([^]byte)(data)[:max(len, 0)] +} + bswap_16 :: proc "contextless" (x: u16) -> u16 { return x>>8 | x<<8 } diff --git a/src/build_settings.cpp b/src/build_settings.cpp index a906f6712..e34330ea8 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -895,7 +895,11 @@ void init_build_context(TargetMetrics *cross_target) { } } else if (is_arch_wasm()) { - bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined "); + if (bc->metrics.arch == TargetArch_wasm32) { + bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined "); + } else { + bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined -mwasm64 "); + } } else { gb_printf_err("Compiler Error: Unsupported architecture\n");; gb_exit(1); diff --git a/src/check_decl.cpp b/src/check_decl.cpp index 0591eca4d..c2d23e70c 100644 --- a/src/check_decl.cpp +++ b/src/check_decl.cpp @@ -899,6 +899,10 @@ void check_proc_decl(CheckerContext *ctx, Entity *e, DeclInfo *d) { mutex_unlock(&ctx->info->foreign_mutex); } } + + if (e->Procedure.link_name.len > 0 ) { + e->flags |= EntityFlag_CustomLinkName; + } } void check_global_variable_decl(CheckerContext *ctx, Entity *&e, Ast *type_expr, Ast *init_expr) { @@ -990,6 +994,10 @@ void check_global_variable_decl(CheckerContext *ctx, Entity *&e, Ast *type_expr, string_map_set(fp, key, e); } } + + if (e->Variable.link_name.len > 0) { + e->flags |= EntityFlag_CustomLinkName; + } if (init_expr == nullptr) { if (type_expr == nullptr) { diff --git a/src/entity.cpp b/src/entity.cpp index 86fefcf89..d95c74f22 100644 --- a/src/entity.cpp +++ b/src/entity.cpp @@ -74,9 +74,10 @@ enum EntityFlag : u64 { EntityFlag_Test = 1ull<<30, EntityFlag_Init = 1ull<<31, + + EntityFlag_CustomLinkName = 1ull<<40, EntityFlag_Overridden = 1ull<<63, - }; enum EntityState : u32 { diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 7a70ee478..892f615df 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -1064,14 +1064,10 @@ struct lbLLVMModulePassWorkerData { }; WORKER_TASK_PROC(lb_llvm_module_pass_worker_proc) { - GB_ASSERT(MULTITHREAD_OBJECT_GENERATION); - auto wd = cast(lbLLVMModulePassWorkerData *)data; - LLVMPassManagerRef module_pass_manager = LLVMCreatePassManager(); lb_populate_module_pass_manager(wd->target_machine, module_pass_manager, build_context.optimization_level); LLVMRunPassManager(module_pass_manager, wd->m->mod); - return 0; } @@ -1661,6 +1657,8 @@ void lb_generate_code(lbGenerator *gen) { for_array(i, gen->modules.entries) { lbModule *m = gen->modules.entries[i].value; + + lb_run_remove_unused_function_pass(m->mod); auto wd = gb_alloc_item(permanent_allocator(), lbLLVMModulePassWorkerData); wd->m = m; @@ -1738,8 +1736,16 @@ void lb_generate_code(lbGenerator *gen) { } TIME_SECTION("LLVM Object Generation"); + + isize non_empty_module_count = 0; + for_array(j, gen->modules.entries) { + lbModule *m = gen->modules.entries[j].value; + if (!lb_is_module_empty(m)) { + non_empty_module_count += 1; + } + } - if (do_threading) { + if (do_threading && non_empty_module_count > 1) { for_array(j, gen->modules.entries) { lbModule *m = gen->modules.entries[j].value; if (lb_is_module_empty(m)) { diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp index 9aa9920f2..5fc5dfebf 100644 --- a/src/llvm_backend.hpp +++ b/src/llvm_backend.hpp @@ -585,3 +585,24 @@ enum : LLVMAttributeIndex { LLVMAttributeIndex_FunctionIndex = ~0u, LLVMAttributeIndex_FirstArgIndex = 1, }; + + +char const *llvm_linkage_strings[] = { + "external linkage", + "available externally linkage", + "link once any linkage", + "link once odr linkage", + "link once odr auto hide linkage", + "weak any linkage", + "weak odr linkage", + "appending linkage", + "internal linkage", + "private linkage", + "dllimport linkage", + "dllexport linkage", + "external weak linkage", + "ghost linkage", + "common linkage", + "linker private linkage", + "linker private weak linkage" +}; \ No newline at end of file diff --git a/src/llvm_backend_opt.cpp b/src/llvm_backend_opt.cpp index d5ea90aea..25e290d70 100644 --- a/src/llvm_backend_opt.cpp +++ b/src/llvm_backend_opt.cpp @@ -355,3 +355,52 @@ void lb_run_function_pass_manager(LLVMPassManagerRef fpm, lbProcedure *p) { // are not removed lb_run_remove_dead_instruction_pass(p); } + + +void lb_run_remove_unused_function_pass(LLVMModuleRef mod) { + isize removal_count = 0; + isize pass_count = 0; + isize const max_pass_count = 10; + // Custom remove dead function pass + for (; pass_count < max_pass_count; pass_count++) { + bool was_dead_function = false; + for (LLVMValueRef func = LLVMGetFirstFunction(mod); + func != nullptr; + /**/ + ) { + LLVMValueRef curr_func = func; + func = LLVMGetNextFunction(func); + + LLVMUseRef first_use = LLVMGetFirstUse(curr_func); + if (first_use != nullptr) { + continue; + } + String name = {}; + name.text = cast(u8 *)LLVMGetValueName2(curr_func, cast(size_t *)&name.len); + + if (LLVMIsDeclaration(curr_func)) { + // Ignore for the time being + continue; + } + + + LLVMLinkage linkage = LLVMGetLinkage(curr_func); + + switch (linkage) { + case LLVMExternalLinkage: + case LLVMDLLImportLinkage: + case LLVMDLLExportLinkage: + default: + continue; + case LLVMInternalLinkage: + break; + } + LLVMDeleteFunction(curr_func); + was_dead_function = true; + removal_count += 1; + } + if (!was_dead_function) { + break; + } + } +} diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp index 15689da36..29f7b6655 100644 --- a/src/llvm_backend_proc.cpp +++ b/src/llvm_backend_proc.cpp @@ -195,13 +195,19 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool ignore_body) // then it is very likely it is required by LLVM and thus cannot have internal linkage if (entity->pkg != nullptr && entity->pkg->kind == Package_Runtime && p->body != nullptr) { GB_ASSERT(entity->kind == Entity_Procedure); - if (entity->Procedure.link_name != "") { - LLVMSetLinkage(p->value, LLVMExternalLinkage); + String link_name = entity->Procedure.link_name; + if (entity->flags & EntityFlag_CustomLinkName && + link_name != "") { + if (string_starts_with(link_name, str_lit("__"))) { + LLVMSetLinkage(p->value, LLVMExternalLinkage); + } else { + LLVMSetLinkage(p->value, LLVMInternalLinkage); + } } } } } - + if (p->is_foreign) { if (is_arch_wasm()) { char const *import_name = alloc_cstring(permanent_allocator(), p->name); @@ -217,6 +223,7 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool ignore_body) LLVMAddTargetDependentFunctionAttr(p->value, "wasm-import-module", module_name); } } + // NOTE(bill): offset==0 is the return value isize offset = 1; diff --git a/src/main.cpp b/src/main.cpp index fad749e34..7338ad45d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -135,19 +135,12 @@ i32 linker_stage(lbGenerator *gen) { if (is_arch_wasm()) { timings_start_section(timings, str_lit("wasm-ld")); - - if (build_context.metrics.arch == TargetArch_wasm32) { - result = system_exec_command_line_app("wasm-ld", - "\"%.*s\\bin\\wasm-ld\" \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", - LIT(build_context.ODIN_ROOT), - LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); - } else { - GB_ASSERT(build_context.metrics.arch == TargetArch_wasm64); - result = system_exec_command_line_app("wasm-ld", - "\"%.*s\\bin\\wasm-ld\" \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", - LIT(build_context.ODIN_ROOT), - LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); - } + + GB_ASSERT(build_context.metrics.arch == TargetArch_wasm64); + result = system_exec_command_line_app("wasm-ld", + "\"%.*s\\bin\\wasm-ld\" \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", + LIT(build_context.ODIN_ROOT), + LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); return result; } -- cgit v1.2.3 From 841a96691bcbe62add30530777b26c38bc0a3fff Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 31 Oct 2021 00:37:37 +0100 Subject: Attempt to get wasm64 compiling with the correct features enabled --- src/build_settings.cpp | 13 +++++-------- src/main.cpp | 1 - 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/build_settings.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index e34330ea8..4c7faa1b2 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -893,15 +893,12 @@ void init_build_context(TargetMetrics *cross_target) { bc->link_flags = str_lit("-arch arm64 "); break; } - - } else if (is_arch_wasm()) { - if (bc->metrics.arch == TargetArch_wasm32) { - bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined "); - } else { - bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined -mwasm64 "); - } + } else if (bc->metrics.arch == TargetArch_wasm32) { + bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined --features=wasm-feature-atomics "); + } else if (bc->metrics.arch == TargetArch_wasm64) { + bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined -mwasm64 --features=wasm-feature-memory64,wasm-feature-atomics --verbose "); } else { - gb_printf_err("Compiler Error: Unsupported architecture\n");; + gb_printf_err("Compiler Error: Unsupported architecture\n"); gb_exit(1); } diff --git a/src/main.cpp b/src/main.cpp index 7338ad45d..173c70a4d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -136,7 +136,6 @@ i32 linker_stage(lbGenerator *gen) { if (is_arch_wasm()) { timings_start_section(timings, str_lit("wasm-ld")); - GB_ASSERT(build_context.metrics.arch == TargetArch_wasm64); result = system_exec_command_line_app("wasm-ld", "\"%.*s\\bin\\wasm-ld\" \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", LIT(build_context.ODIN_ROOT), -- cgit v1.2.3 From 9a5216921ca44fe25e66c81928f812f13f2d59e0 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 31 Oct 2021 01:08:17 +0000 Subject: Add `wasi_wasm32` --- core/os/os_js_wasm32.odin | 62 +++++++++---------- core/runtime/default_allocators_general.odin | 1 + core/runtime/internal.odin | 89 ++++++++++++++++++++++++++++ core/runtime/internal_linux.odin | 88 --------------------------- core/runtime/internal_windows.odin | 88 --------------------------- core/runtime/os_specific_any.odin | 3 +- src/build_settings.cpp | 31 ++++++++-- src/llvm_backend.cpp | 10 ++++ src/string.cpp | 7 ++- 9 files changed, 163 insertions(+), 216 deletions(-) (limited to 'src/build_settings.cpp') diff --git a/core/os/os_js_wasm32.odin b/core/os/os_js_wasm32.odin index b70bdda1a..d2269cf90 100644 --- a/core/os/os_js_wasm32.odin +++ b/core/os/os_js_wasm32.odin @@ -1,70 +1,70 @@ package os -Handle :: distinct i32; -Errno :: distinct i32; +Handle :: distinct i32 +Errno :: distinct i32 -ERROR_NONE :: Errno(0); +ERROR_NONE :: Errno(0) -O_RDONLY :: 0x00000; -O_WRONLY :: 0x00001; -O_RDWR :: 0x00002; -O_CREATE :: 0x00040; -O_EXCL :: 0x00080; -O_NOCTTY :: 0x00100; -O_TRUNC :: 0x00200; -O_NONBLOCK :: 0x00800; -O_APPEND :: 0x00400; -O_SYNC :: 0x01000; -O_ASYNC :: 0x02000; -O_CLOEXEC :: 0x80000; +O_RDONLY :: 0x00000 +O_WRONLY :: 0x00001 +O_RDWR :: 0x00002 +O_CREATE :: 0x00040 +O_EXCL :: 0x00080 +O_NOCTTY :: 0x00100 +O_TRUNC :: 0x00200 +O_NONBLOCK :: 0x00800 +O_APPEND :: 0x00400 +O_SYNC :: 0x01000 +O_ASYNC :: 0x02000 +O_CLOEXEC :: 0x80000 -stdout: Handle; -stderr: Handle; -stdin: Handle; +stdout: Handle +stderr: Handle +stdin: Handle write :: proc(fd: Handle, data: []byte) -> (int, Errno) { - return 0, 0; + return 0, 0 } read :: proc(fd: Handle, data: []byte) -> (int, Errno) { - return 0, 0; + return 0, 0 } open :: proc(path: string, mode: int = O_RDONLY, perm: int = 0) -> (Handle, Errno) { - return 0, 0; + return 0, 0 } close :: proc(fd: Handle) -> Errno { - return 0; + return 0 } seek :: proc(fd: Handle, offset: i64, whence: int) -> (i64, Errno) { - return 0, 0; + return 0, 0 } current_thread_id :: proc "contextless" () -> int { - return 0; + return 0 } file_size :: proc(fd: Handle) -> (i64, Errno) { - return 0, 0; + return 0, 0 } heap_alloc :: proc(size: int) -> rawptr { - return nil; + return nil } heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr { if new_size == 0 { - heap_free(ptr); - return nil; + heap_free(ptr) + return nil } if ptr == nil { - return heap_alloc(new_size); + return heap_alloc(new_size) } - return nil; + return nil } heap_free :: proc(ptr: rawptr) { if ptr == nil { - return; + return } } diff --git a/core/runtime/default_allocators_general.odin b/core/runtime/default_allocators_general.odin index f25f8f178..6bcfb68ae 100644 --- a/core/runtime/default_allocators_general.odin +++ b/core/runtime/default_allocators_general.odin @@ -1,5 +1,6 @@ //+build !windows //+build !freestanding +//+build !wasi package runtime when ODIN_DEFAULT_TO_NIL_ALLOCATOR { diff --git a/core/runtime/internal.odin b/core/runtime/internal.odin index 0a6d07467..d681e581b 100644 --- a/core/runtime/internal.odin +++ b/core/runtime/internal.odin @@ -838,3 +838,92 @@ fixunsdfdi :: #force_no_inline proc "c" (a: f64) -> i128 { x := i64(a) return i128(x) } + + + + +@(link_name="__umodti3") +umodti3 :: proc "c" (a, b: u128) -> u128 { + r: u128 = --- + _ = udivmod128(a, b, &r) + return r +} + + +@(link_name="__udivmodti4") +udivmodti4 :: proc "c" (a, b: u128, rem: ^u128) -> u128 { + return udivmod128(a, b, rem) +} + +@(link_name="__udivti3") +udivti3 :: proc "c" (a, b: u128) -> u128 { + return udivmodti4(a, b, nil) +} + + +@(link_name="__modti3") +modti3 :: proc "c" (a, b: i128) -> i128 { + s_a := a >> (128 - 1) + s_b := b >> (128 - 1) + an := (a ~ s_a) - s_a + bn := (b ~ s_b) - s_b + + r: u128 = --- + _ = udivmod128(transmute(u128)an, transmute(u128)bn, &r) + return (transmute(i128)r ~ s_a) - s_a +} + + +@(link_name="__divmodti4") +divmodti4 :: proc "c" (a, b: i128, rem: ^i128) -> i128 { + u := udivmod128(transmute(u128)a, transmute(u128)b, cast(^u128)rem) + return transmute(i128)u +} + +@(link_name="__divti3") +divti3 :: proc "c" (a, b: i128) -> i128 { + u := udivmodti4(transmute(u128)a, transmute(u128)b, nil) + return transmute(i128)u +} + + +@(link_name="__fixdfti") +fixdfti :: proc(a: u64) -> i128 { + significandBits :: 52 + typeWidth :: (size_of(u64)*8) + exponentBits :: (typeWidth - significandBits - 1) + maxExponent :: ((1 << exponentBits) - 1) + exponentBias :: (maxExponent >> 1) + + implicitBit :: (u64(1) << significandBits) + significandMask :: (implicitBit - 1) + signBit :: (u64(1) << (significandBits + exponentBits)) + absMask :: (signBit - 1) + exponentMask :: (absMask ~ significandMask) + + // Break a into sign, exponent, significand + aRep := a + aAbs := aRep & absMask + sign := i128(-1 if aRep & signBit != 0 else 1) + exponent := u64((aAbs >> significandBits) - exponentBias) + significand := u64((aAbs & significandMask) | implicitBit) + + // If exponent is negative, the result is zero. + if exponent < 0 { + return 0 + } + + // If the value is too large for the integer type, saturate. + if exponent >= size_of(i128) * 8 { + return max(i128) if sign == 1 else min(i128) + } + + // If 0 <= exponent < significandBits, right shift to get the result. + // Otherwise, shift left. + if exponent < significandBits { + return sign * i128(significand >> (significandBits - exponent)) + } else { + return sign * (i128(significand) << (exponent - significandBits)) + } + +} diff --git a/core/runtime/internal_linux.odin b/core/runtime/internal_linux.odin index 359293de3..7ccdf5f69 100644 --- a/core/runtime/internal_linux.odin +++ b/core/runtime/internal_linux.odin @@ -1,89 +1 @@ package runtime - -import "core:intrinsics" - -@(link_name="__umodti3") -umodti3 :: proc "c" (a, b: u128) -> u128 { - r: u128 = --- - _ = udivmod128(a, b, &r) - return r -} - - -@(link_name="__udivmodti4") -udivmodti4 :: proc "c" (a, b: u128, rem: ^u128) -> u128 { - return udivmod128(a, b, rem) -} - -@(link_name="__udivti3") -udivti3 :: proc "c" (a, b: u128) -> u128 { - return udivmodti4(a, b, nil) -} - - -@(link_name="__modti3") -modti3 :: proc "c" (a, b: i128) -> i128 { - s_a := a >> (128 - 1) - s_b := b >> (128 - 1) - an := (a ~ s_a) - s_a - bn := (b ~ s_b) - s_b - - r: u128 = --- - _ = udivmod128(transmute(u128)an, transmute(u128)bn, &r) - return (transmute(i128)r ~ s_a) - s_a -} - - -@(link_name="__divmodti4") -divmodti4 :: proc "c" (a, b: i128, rem: ^i128) -> i128 { - u := udivmod128(transmute(u128)a, transmute(u128)b, cast(^u128)rem) - return transmute(i128)u -} - -@(link_name="__divti3") -divti3 :: proc "c" (a, b: i128) -> i128 { - u := udivmodti4(transmute(u128)a, transmute(u128)b, nil) - return transmute(i128)u -} - - -@(link_name="__fixdfti") -fixdfti :: proc(a: u64) -> i128 { - significandBits :: 52 - typeWidth :: (size_of(u64)*8) - exponentBits :: (typeWidth - significandBits - 1) - maxExponent :: ((1 << exponentBits) - 1) - exponentBias :: (maxExponent >> 1) - - implicitBit :: (u64(1) << significandBits) - significandMask :: (implicitBit - 1) - signBit :: (u64(1) << (significandBits + exponentBits)) - absMask :: (signBit - 1) - exponentMask :: (absMask ~ significandMask) - - // Break a into sign, exponent, significand - aRep := a - aAbs := aRep & absMask - sign := i128(-1 if aRep & signBit != 0 else 1) - exponent := u64((aAbs >> significandBits) - exponentBias) - significand := u64((aAbs & significandMask) | implicitBit) - - // If exponent is negative, the result is zero. - if exponent < 0 { - return 0 - } - - // If the value is too large for the integer type, saturate. - if exponent >= size_of(i128) * 8 { - return max(i128) if sign == 1 else min(i128) - } - - // If 0 <= exponent < significandBits, right shift to get the result. - // Otherwise, shift left. - if exponent < significandBits { - return sign * i128(significand >> (significandBits - exponent)) - } else { - return sign * (i128(significand) << (exponent - significandBits)) - } - -} diff --git a/core/runtime/internal_windows.odin b/core/runtime/internal_windows.odin index 4b932cd5f..7ccdf5f69 100644 --- a/core/runtime/internal_windows.odin +++ b/core/runtime/internal_windows.odin @@ -1,89 +1 @@ package runtime - -import "core:intrinsics" - -@(link_name="__umodti3") -umodti3 :: proc "c" (a, b: u128) -> u128 { - r: u128 = --- - _ = udivmod128(a, b, &r) - return r -} - - -@(link_name="__udivmodti4") -udivmodti4 :: proc "c" (a, b: u128, rem: ^u128) -> u128 { - return udivmod128(a, b, rem) -} - -@(link_name="__udivti3") -udivti3 :: proc "c" (a, b: u128) -> u128 { - return udivmodti4(a, b, nil) -} - - -@(link_name="__modti3") -modti3 :: proc "c" (a, b: i128) -> i128 { - s_a := a >> (128 - 1) - s_b := b >> (128 - 1) - an := (a ~ s_a) - s_a - bn := (b ~ s_b) - s_b - - r: u128 = --- - _ = udivmod128(transmute(u128)an, transmute(u128)bn, &r) - return (transmute(i128)r ~ s_a) - s_a -} - - -@(link_name="__divmodti4") -divmodti4 :: proc "c" (a, b: i128, rem: ^i128) -> i128 { - u := udivmod128(transmute(u128)a, transmute(u128)b, cast(^u128)rem) - return transmute(i128)u -} - -@(link_name="__divti3") -divti3 :: proc "c" (a, b: i128) -> i128 { - u := udivmodti4(transmute(u128)a, transmute(u128)b, nil) - return transmute(i128)u -} - - -@(link_name="__fixdfti") -fixdfti :: proc(a: u64) -> i128 { - significandBits :: 52 - typeWidth :: (size_of(u64)*8) - exponentBits :: (typeWidth - significandBits - 1) - maxExponent :: ((1 << exponentBits) - 1) - exponentBias :: (maxExponent >> 1) - - implicitBit :: (u64(1) << significandBits) - significandMask :: (implicitBit - 1) - signBit :: (u64(1) << (significandBits + exponentBits)) - absMask :: (signBit - 1) - exponentMask :: (absMask ~ significandMask) - - // Break a into sign, exponent, significand - aRep := a - aAbs := aRep & absMask - sign := i128(-1 if aRep & signBit != 0 else 1) - exponent := (aAbs >> significandBits) - exponentBias - significand := (aAbs & significandMask) | implicitBit - - // If exponent is negative, the result is zero. - if exponent < 0 { - return 0 - } - - // If the value is too large for the integer type, saturate. - if exponent >= size_of(i128) * 8 { - return max(i128) if sign == 1 else min(i128) - } - - // If 0 <= exponent < significandBits, right shift to get the result. - // Otherwise, shift left. - if exponent < significandBits { - return sign * i128(significand >> (significandBits - exponent)) - } else { - return sign * (i128(significand) << (exponent - significandBits)) - } - -} diff --git a/core/runtime/os_specific_any.odin b/core/runtime/os_specific_any.odin index 397340798..d8608afdb 100644 --- a/core/runtime/os_specific_any.odin +++ b/core/runtime/os_specific_any.odin @@ -1,5 +1,4 @@ -//+build !freestanding -//+build !windows +//+build !freestanding !wasi !windows package runtime import "core:os" diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 4c7faa1b2..d817c87f1 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -16,6 +16,8 @@ enum TargetOsKind { TargetOs_linux, TargetOs_essence, TargetOs_freebsd, + + TargetOs_wasi, TargetOs_freestanding, @@ -50,6 +52,8 @@ String target_os_names[TargetOs_COUNT] = { str_lit("linux"), str_lit("essence"), str_lit("freebsd"), + + str_lit("wasi"), str_lit("freestanding"), }; @@ -347,6 +351,16 @@ gb_global TargetMetrics target_freestanding_wasm64 = { str_lit(""), }; +gb_global TargetMetrics target_wasi_wasm32 = { + TargetOs_wasi, + TargetArch_wasm32, + 4, + 8, + str_lit("wasm32-wasi-js"), + str_lit(""), +}; + + @@ -367,6 +381,7 @@ gb_global NamedTargetMetrics named_targets[] = { { str_lit("freebsd_amd64"), &target_freebsd_amd64 }, { str_lit("freestanding_wasm32"), &target_freestanding_wasm32 }, { str_lit("freestanding_wasm64"), &target_freestanding_wasm64 }, + { str_lit("wasi_wasm32"), &target_wasi_wasm32 }, }; NamedTargetMetrics *selected_target_metrics; @@ -893,10 +908,18 @@ void init_build_context(TargetMetrics *cross_target) { bc->link_flags = str_lit("-arch arm64 "); break; } - } else if (bc->metrics.arch == TargetArch_wasm32) { - bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined --features=wasm-feature-atomics "); - } else if (bc->metrics.arch == TargetArch_wasm64) { - bc->link_flags = str_lit("--no-entry --export-table --export-all --allow-undefined -mwasm64 --features=wasm-feature-memory64,wasm-feature-atomics --verbose "); + } else if (is_arch_wasm()) { + gbString link_flags = gb_string_make(heap_allocator(), "--export-all "); + link_flags = gb_string_appendc(link_flags, "--export-table "); + link_flags = gb_string_appendc(link_flags, "--allow-undefined "); + if (bc->metrics.arch == TargetArch_wasm64) { + link_flags = gb_string_appendc(link_flags, "-mwas64 "); + } + if (bc->metrics.os == TargetOs_freestanding) { + link_flags = gb_string_appendc(link_flags, "--no-entry "); + } + + bc->link_flags = make_string_c(link_flags); } else { gb_printf_err("Compiler Error: Unsupported architecture\n"); gb_exit(1); diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 892f615df..27914efb2 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -784,6 +784,8 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) params->Tuple.variables[2] = alloc_entity_param(nullptr, make_token_ident("lpReserved"), t_rawptr, false, true); } else if (build_context.metrics.os == TargetOs_windows && build_context.metrics.arch == TargetArch_386) { name = str_lit("mainCRTStartup"); + } else if (build_context.metrics.os == TargetOs_wasi) { + name = str_lit("_start"); } else { has_args = true; slice_init(¶ms->Tuple.variables, permanent_allocator(), 2); @@ -885,6 +887,14 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) } lb_end_procedure_body(p); + + + if (build_context.metrics.os == TargetOs_wasi) { + LLVMSetLinkage(p->value, LLVMDLLExportLinkage); + } else { + LLVMSetLinkage(p->value, LLVMExternalLinkage); + } + if (!m->debug_builder && LLVMVerifyFunction(p->value, LLVMReturnStatusAction)) { gb_printf_err("LLVM CODE GEN FAILED FOR PROCEDURE: %s\n", "main"); diff --git a/src/string.cpp b/src/string.cpp index ca53fb2fc..800378689 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -21,13 +21,14 @@ struct String { }; // NOTE(bill): used for printf style arguments #define LIT(x) ((int)(x).len), (x).text -#define STR_LIT(c_str) {cast(u8 *)c_str, gb_size_of(c_str)-1} #if defined(GB_COMPILER_MSVC) && _MSC_VER < 1700 - #define str_lit(c_str) make_string(cast(u8 *)c_str, gb_size_of(c_str)-1) + #define STR_LIT(c_str) make_string(cast(u8 *)c_str, gb_size_of(c_str)-1) #else - #define str_lit(c_str) String{cast(u8 *)c_str, gb_size_of(c_str)-1} + #define STR_LIT(c_str) String{cast(u8 *)c_str, gb_size_of(c_str)-1} #endif +#define str_lit(c_str) STR_LIT(c_str) + // NOTE(bill): String16 is only used for Windows due to its file directories struct String16 { wchar_t *text; -- cgit v1.2.3 From 2a5b8f53fe7cb7a4261b765020f9342005046b63 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 31 Oct 2021 12:47:50 +0000 Subject: Add `memmove` and `memset` support for `wasm` --- core/runtime/procs.odin | 41 ++++++++++++++++++++++++++++++++++------- src/build_settings.cpp | 5 +++-- src/llvm_backend.cpp | 12 +++++++++--- src/llvm_backend_opt.cpp | 5 +++++ 4 files changed, 51 insertions(+), 12 deletions(-) (limited to 'src/build_settings.cpp') diff --git a/core/runtime/procs.odin b/core/runtime/procs.odin index d97a3fadf..09ad25379 100644 --- a/core/runtime/procs.odin +++ b/core/runtime/procs.odin @@ -1,12 +1,39 @@ package runtime -memset :: proc "c" (ptr: rawptr, val: i32, len: int) -> rawptr { - if ptr != nil && len != 0 { - b := byte(val) - p := ([^]byte)(ptr) - for i in 0.. rawptr { + if ptr != nil && len != 0 { + b := byte(val) + p := ([^]byte)(ptr) + for i in 0.. rawptr { + if dst != src { + d, s := ([^]byte)(dst), ([^]byte)(src) + d_end, s_end := d[len:], s[len:] + for i := len-1; i >= 0; i -= 1 { + d[i] = s[i] + } + } + return dst + + } +} else { + memset :: proc "c" (ptr: rawptr, val: i32, len: int) -> rawptr { + if ptr != nil && len != 0 { + b := byte(val) + p := ([^]byte)(ptr) + for i in 0..metrics.arch == TargetArch_wasm64) { link_flags = gb_string_appendc(link_flags, "-mwas64 "); diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 27914efb2..d21ff8e5a 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -771,6 +771,8 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) Type *results = alloc_type_tuple(); Type *t_ptr_cstring = alloc_type_pointer(t_cstring); + + bool call_cleanup = true; bool has_args = false; bool is_dll_main = false; @@ -782,10 +784,12 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) params->Tuple.variables[0] = alloc_entity_param(nullptr, make_token_ident("hinstDLL"), t_rawptr, false, true); params->Tuple.variables[1] = alloc_entity_param(nullptr, make_token_ident("fdwReason"), t_u32, false, true); params->Tuple.variables[2] = alloc_entity_param(nullptr, make_token_ident("lpReserved"), t_rawptr, false, true); + call_cleanup = false; } else if (build_context.metrics.os == TargetOs_windows && build_context.metrics.arch == TargetArch_386) { name = str_lit("mainCRTStartup"); } else if (build_context.metrics.os == TargetOs_wasi) { name = str_lit("_start"); + call_cleanup = false; } else { has_args = true; slice_init(¶ms->Tuple.variables, permanent_allocator(), 2); @@ -876,8 +880,10 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) } - lbValue cleanup_runtime_value = lb_find_runtime_value(m, str_lit("_cleanup_runtime")); - lb_emit_call(p, cleanup_runtime_value, {}, ProcInlining_none, false); + if (call_cleanup) { + lbValue cleanup_runtime_value = lb_find_runtime_value(m, str_lit("_cleanup_runtime")); + lb_emit_call(p, cleanup_runtime_value, {}, ProcInlining_none, false); + } if (is_dll_main) { @@ -890,7 +896,7 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) if (build_context.metrics.os == TargetOs_wasi) { - LLVMSetLinkage(p->value, LLVMDLLExportLinkage); + LLVMSetLinkage(p->value, LLVMDLLExportLinkage); } else { LLVMSetLinkage(p->value, LLVMExternalLinkage); } diff --git a/src/llvm_backend_opt.cpp b/src/llvm_backend_opt.cpp index 25e290d70..8ddd3360d 100644 --- a/src/llvm_backend_opt.cpp +++ b/src/llvm_backend_opt.cpp @@ -383,6 +383,11 @@ void lb_run_remove_unused_function_pass(LLVMModuleRef mod) { continue; } + if (name == "memset" || + name == "memmove" || + name == "memcpy") { + continue; + } LLVMLinkage linkage = LLVMGetLinkage(curr_func); -- cgit v1.2.3 From 235dae552a1ce3fe745c334f354038c0d5f45f48 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 31 Oct 2021 15:35:09 +0000 Subject: Ignore `-use-separate-modules` when targeting wasm32/wasm64 --- src/build_settings.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/build_settings.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index b33fabfda..dd30d1306 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -921,6 +921,9 @@ void init_build_context(TargetMetrics *cross_target) { } bc->link_flags = make_string_c(link_flags); + + // Disallow on wasm + build_context.use_separate_modules = false; } else { gb_printf_err("Compiler Error: Unsupported architecture\n"); gb_exit(1); -- cgit v1.2.3 From bfa33bf5d37b8ee5494f65dcb1d5b224a574f532 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 31 Oct 2021 15:48:56 +0000 Subject: Disable `wasm64` --- src/build_settings.cpp | 2 +- src/llvm_backend.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/build_settings.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index dd30d1306..3bd6622c7 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -380,7 +380,7 @@ gb_global NamedTargetMetrics named_targets[] = { { str_lit("freebsd_386"), &target_freebsd_386 }, { str_lit("freebsd_amd64"), &target_freebsd_amd64 }, { str_lit("freestanding_wasm32"), &target_freestanding_wasm32 }, - { str_lit("freestanding_wasm64"), &target_freestanding_wasm64 }, + // { str_lit("freestanding_wasm64"), &target_freestanding_wasm64 }, { str_lit("wasi_wasm32"), &target_wasi_wasm32 }, }; diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index d21ff8e5a..ef764372b 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -787,7 +787,7 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) call_cleanup = false; } else if (build_context.metrics.os == TargetOs_windows && build_context.metrics.arch == TargetArch_386) { name = str_lit("mainCRTStartup"); - } else if (build_context.metrics.os == TargetOs_wasi) { + } else if (is_arch_wasm()) { name = str_lit("_start"); call_cleanup = false; } else { @@ -894,8 +894,8 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) lb_end_procedure_body(p); - - if (build_context.metrics.os == TargetOs_wasi) { + + if (is_arch_wasm()) { LLVMSetLinkage(p->value, LLVMDLLExportLinkage); } else { LLVMSetLinkage(p->value, LLVMExternalLinkage); -- cgit v1.2.3