From 50057b0696d1e89346e1a50ddbc8c237c73cca0c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 24 Nov 2021 16:56:42 +0000 Subject: Add basic support for `foreign import "foo.asm"` on Windows with `nasm.exe` --- src/main.cpp | 66 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 12 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 99a55b2b6..ec20cdc80 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -175,6 +175,9 @@ i32 linker_stage(lbGenerator *gen) { } timings_start_section(timings, section_name); + gbString nasm_str = gb_string_make(heap_allocator(), ""); + defer (gb_string_free(nasm_str)); + gbString lib_str = gb_string_make(heap_allocator(), ""); defer (gb_string_free(lib_str)); char lib_str_buf[1024] = {0}; @@ -212,26 +215,47 @@ i32 linker_stage(lbGenerator *gen) { add_path(find_result.windows_sdk_ucrt_library_path); add_path(find_result.vs_library_path); } + + + StringSet libs = {}; + string_set_init(&libs, heap_allocator(), 64); + defer (string_set_destroy(&libs)); + + StringSet asm_files = {}; + string_set_init(&asm_files, heap_allocator(), 64); + defer (string_set_destroy(&asm_files)); for_array(j, gen->modules.entries) { lbModule *m = gen->modules.entries[j].value; for_array(i, m->foreign_library_paths) { String lib = m->foreign_library_paths[i]; - GB_ASSERT(lib.len < gb_count_of(lib_str_buf)-1); - gb_snprintf(lib_str_buf, gb_size_of(lib_str_buf), - " \"%.*s\"", LIT(lib)); - lib_str = gb_string_appendc(lib_str, lib_str_buf); + if (string_ends_with(lib, str_lit(".asm"))) { + string_set_add(&asm_files, lib); + } else { + string_set_add(&libs, lib); + } } } for_array(i, gen->default_module.foreign_library_paths) { String lib = gen->default_module.foreign_library_paths[i]; - GB_ASSERT(lib.len < gb_count_of(lib_str_buf)-1); - gb_snprintf(lib_str_buf, gb_size_of(lib_str_buf), - " \"%.*s\"", LIT(lib)); - lib_str = gb_string_appendc(lib_str, lib_str_buf); + if (string_ends_with(lib, str_lit(".asm"))) { + string_set_add(&asm_files, lib); + } else { + string_set_add(&libs, lib); + } + } + + for_array(i, libs.entries) { + String lib = libs.entries[i].value; + lib_str = gb_string_append_fmt(lib_str, " \"%.*s\"", LIT(lib)); + } + + + for_array(i, asm_files.entries) { + String lib = asm_files.entries[i].value; + nasm_str = gb_string_append_fmt(nasm_str, " \"%.*s\"", LIT(lib)); } - if (build_context.build_mode == BuildMode_DynamicLibrary) { @@ -254,6 +278,24 @@ i32 linker_stage(lbGenerator *gen) { if (build_context.ODIN_DEBUG) { link_settings = gb_string_append_fmt(link_settings, " /DEBUG"); } + + if (asm_files.entries.count > 0) { + String obj_file = str_lit("__odin__nasm.obj"); + + result = system_exec_command_line_app("nasm", + "\"%.*s\\bin\\nasm\\nasm.exe\" %s " + "-f win64 " + "-o %.*s " + "", + LIT(build_context.ODIN_ROOT), nasm_str, + LIT(obj_file) + ); + + if (result) { + return result; + } + array_add(&gen->output_object_paths, obj_file); + } gbString object_files = gb_string_make(heap_allocator(), ""); defer (gb_string_free(object_files)); @@ -325,10 +367,10 @@ i32 linker_stage(lbGenerator *gen) { LIT(build_context.extra_linker_flags), lib_str ); - - if (result) { + + if (result) { return result; - } + } } #else timings_start_section(timings, str_lit("ld-link")); -- cgit v1.2.3 From 994ee5a559819d982083dd88eaaa5fd8e3bbee3d Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 24 Nov 2021 17:57:31 +0000 Subject: Allow for multiple .asm files --- src/main.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index ec20cdc80..16b776173 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -175,9 +175,6 @@ i32 linker_stage(lbGenerator *gen) { } timings_start_section(timings, section_name); - gbString nasm_str = gb_string_make(heap_allocator(), ""); - defer (gb_string_free(nasm_str)); - gbString lib_str = gb_string_make(heap_allocator(), ""); defer (gb_string_free(lib_str)); char lib_str_buf[1024] = {0}; @@ -252,12 +249,6 @@ i32 linker_stage(lbGenerator *gen) { } - for_array(i, asm_files.entries) { - String lib = asm_files.entries[i].value; - nasm_str = gb_string_append_fmt(nasm_str, " \"%.*s\"", LIT(lib)); - } - - if (build_context.build_mode == BuildMode_DynamicLibrary) { output_ext = "dll"; link_settings = gb_string_append_fmt(link_settings, " /DLL"); @@ -279,15 +270,16 @@ i32 linker_stage(lbGenerator *gen) { link_settings = gb_string_append_fmt(link_settings, " /DEBUG"); } - if (asm_files.entries.count > 0) { - String obj_file = str_lit("__odin__nasm.obj"); - + for_array(i, asm_files.entries) { + String asm_file = asm_files.entries[i].value; + String obj_file = concatenate_strings(permanent_allocator(), asm_file, str_lit(".obj")); + result = system_exec_command_line_app("nasm", - "\"%.*s\\bin\\nasm\\nasm.exe\" %s " + "\"%.*s\\bin\\nasm\\nasm.exe\" \"%.*s\" " "-f win64 " - "-o %.*s " + "-o \"%.*s\" " "", - LIT(build_context.ODIN_ROOT), nasm_str, + LIT(build_context.ODIN_ROOT), LIT(asm_file), LIT(obj_file) ); -- cgit v1.2.3 From c34a33169670568526fb0f34c252ca5bf641d8ec Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 24 Nov 2021 22:20:18 +0000 Subject: Add `-extra-assembler-flags` --- src/build_settings.cpp | 1 + src/main.cpp | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 4fa07c808..1012fc1c0 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -196,6 +196,7 @@ struct BuildContext { bool has_resource; String link_flags; String extra_linker_flags; + String extra_assembler_flags; String microarch; BuildModeKind build_mode; bool generate_docs; diff --git a/src/main.cpp b/src/main.cpp index 16b776173..d35a01f10 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -177,7 +177,6 @@ i32 linker_stage(lbGenerator *gen) { gbString lib_str = gb_string_make(heap_allocator(), ""); defer (gb_string_free(lib_str)); - char lib_str_buf[1024] = {0}; char const *output_ext = "exe"; gbString link_settings = gb_string_make_reserve(heap_allocator(), 256); @@ -278,9 +277,11 @@ i32 linker_stage(lbGenerator *gen) { "\"%.*s\\bin\\nasm\\nasm.exe\" \"%.*s\" " "-f win64 " "-o \"%.*s\" " + "%.*s " "", LIT(build_context.ODIN_ROOT), LIT(asm_file), - LIT(obj_file) + LIT(obj_file), + LIT(build_context.extra_assembler_flags) ); if (result) { @@ -651,6 +652,7 @@ enum BuildFlagKind { BuildFlag_UseLLVMApi, BuildFlag_IgnoreUnknownAttributes, BuildFlag_ExtraLinkerFlags, + BuildFlag_ExtraAssemblerFlags, BuildFlag_Microarch, BuildFlag_TestName, @@ -802,7 +804,8 @@ bool parse_build_flags(Array args) { add_flag(&build_flags, BuildFlag_VetExtra, str_lit("vet-extra"), BuildFlagParam_None, Command__does_check); add_flag(&build_flags, BuildFlag_UseLLVMApi, str_lit("llvm-api"), BuildFlagParam_None, Command__does_build); add_flag(&build_flags, BuildFlag_IgnoreUnknownAttributes, str_lit("ignore-unknown-attributes"), BuildFlagParam_None, Command__does_check); - add_flag(&build_flags, BuildFlag_ExtraLinkerFlags, str_lit("extra-linker-flags"), BuildFlagParam_String, Command__does_build); + add_flag(&build_flags, BuildFlag_ExtraLinkerFlags, str_lit("extra-linker-flags"), BuildFlagParam_String, Command__does_build); + add_flag(&build_flags, BuildFlag_ExtraAssemblerFlags, str_lit("extra-assembler-flags"), BuildFlagParam_String, Command__does_build); add_flag(&build_flags, BuildFlag_Microarch, str_lit("microarch"), BuildFlagParam_String, Command__does_build); add_flag(&build_flags, BuildFlag_TestName, str_lit("test-name"), BuildFlagParam_String, Command_test); @@ -1348,11 +1351,14 @@ bool parse_build_flags(Array args) { case BuildFlag_IgnoreUnknownAttributes: build_context.ignore_unknown_attributes = true; break; - case BuildFlag_ExtraLinkerFlags: { + case BuildFlag_ExtraLinkerFlags: GB_ASSERT(value.kind == ExactValue_String); build_context.extra_linker_flags = value.value_string; break; - } + case BuildFlag_ExtraAssemblerFlags: + GB_ASSERT(value.kind == ExactValue_String); + build_context.extra_assembler_flags = value.value_string; + break; case BuildFlag_Microarch: { GB_ASSERT(value.kind == ExactValue_String); build_context.microarch = value.value_string; @@ -2065,6 +2071,11 @@ void print_show_help(String const arg0, String const &command) { print_usage_line(1, "-extra-linker-flags:"); print_usage_line(2, "Adds extra linker specific flags in a string"); print_usage_line(0, ""); + + print_usage_line(1, "-extra-assembler-flags:"); + print_usage_line(2, "Adds extra assembler specific flags in a string"); + print_usage_line(0, ""); + print_usage_line(1, "-microarch:"); print_usage_line(2, "Specifies the specific micro-architecture for the build in a string"); -- cgit v1.2.3 From ffd7ca57f14efe63469b45cc0757d847c17c5556 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 26 Nov 2021 14:40:39 +0000 Subject: Move nasm.exe to windows/nasm.exe, etc --- bin/nasm/LICENSE | 29 ----------------------------- bin/nasm/nasm.exe | Bin 1388544 -> 0 bytes bin/nasm/ndisasm.exe | Bin 952832 -> 0 bytes bin/nasm/windows/LICENSE | 29 +++++++++++++++++++++++++++++ bin/nasm/windows/nasm.exe | Bin 0 -> 1388544 bytes bin/nasm/windows/ndisasm.exe | Bin 0 -> 952832 bytes src/main.cpp | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 bin/nasm/LICENSE delete mode 100644 bin/nasm/nasm.exe delete mode 100644 bin/nasm/ndisasm.exe create mode 100644 bin/nasm/windows/LICENSE create mode 100644 bin/nasm/windows/nasm.exe create mode 100644 bin/nasm/windows/ndisasm.exe (limited to 'src/main.cpp') diff --git a/bin/nasm/LICENSE b/bin/nasm/LICENSE deleted file mode 100644 index 331e2600a..000000000 --- a/bin/nasm/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -NASM is now licensed under the 2-clause BSD license, also known as the -simplified BSD license. - - Copyright 1996-2010 the NASM Authors - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following - conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/bin/nasm/nasm.exe b/bin/nasm/nasm.exe deleted file mode 100644 index a2e61291a..000000000 Binary files a/bin/nasm/nasm.exe and /dev/null differ diff --git a/bin/nasm/ndisasm.exe b/bin/nasm/ndisasm.exe deleted file mode 100644 index c4a5b9587..000000000 Binary files a/bin/nasm/ndisasm.exe and /dev/null differ diff --git a/bin/nasm/windows/LICENSE b/bin/nasm/windows/LICENSE new file mode 100644 index 000000000..331e2600a --- /dev/null +++ b/bin/nasm/windows/LICENSE @@ -0,0 +1,29 @@ +NASM is now licensed under the 2-clause BSD license, also known as the +simplified BSD license. + + Copyright 1996-2010 the NASM Authors - All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following + conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/bin/nasm/windows/nasm.exe b/bin/nasm/windows/nasm.exe new file mode 100644 index 000000000..a2e61291a Binary files /dev/null and b/bin/nasm/windows/nasm.exe differ diff --git a/bin/nasm/windows/ndisasm.exe b/bin/nasm/windows/ndisasm.exe new file mode 100644 index 000000000..c4a5b9587 Binary files /dev/null and b/bin/nasm/windows/ndisasm.exe differ diff --git a/src/main.cpp b/src/main.cpp index d35a01f10..1abe0f42d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -274,7 +274,7 @@ i32 linker_stage(lbGenerator *gen) { String obj_file = concatenate_strings(permanent_allocator(), asm_file, str_lit(".obj")); result = system_exec_command_line_app("nasm", - "\"%.*s\\bin\\nasm\\nasm.exe\" \"%.*s\" " + "\"%.*s\\bin\\nasm\\windows\\nasm.exe\" \"%.*s\" " "-f win64 " "-o \"%.*s\" " "%.*s " -- cgit v1.2.3 From 27106dd9aec67ebf9e3c53572513051e8bc973c6 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 26 Nov 2021 22:25:07 +0000 Subject: Allow `.asm`, `.s`, and `.S` as valid assembly file extensions --- src/build_settings.cpp | 12 ++++++++++++ src/checker.cpp | 3 +-- src/main.cpp | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 1012fc1c0..29abd441c 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -822,6 +822,18 @@ bool show_error_line(void) { return build_context.show_error_line; } +bool has_asm_extension(String const &path) { + String ext = path_extension(path); + if (ext == ".asm") { + return true; + } else if (ext == ".s") { + return true; + } else if (ext == ".S") { + return true; + } + return false; +} + void init_build_context(TargetMetrics *cross_target) { BuildContext *bc = &build_context; diff --git a/src/checker.cpp b/src/checker.cpp index 3301e2bf4..e32adedde 100644 --- a/src/checker.cpp +++ b/src/checker.cpp @@ -4121,8 +4121,7 @@ void check_add_foreign_import_decl(CheckerContext *ctx, Ast *decl) { add_entity_use(ctx, nullptr, e); } - String ext = path_extension(fullpath); - if (ext == ".asm") { + if (has_asm_extension(fullpath)) { if (build_context.metrics.arch != TargetArch_amd64 || build_context.metrics.os != TargetOs_windows) { error(decl, "Assembly files are not yet supported on this platform: %.*s_%.*s", diff --git a/src/main.cpp b/src/main.cpp index 1abe0f42d..7b4bc92ee 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -225,7 +225,7 @@ i32 linker_stage(lbGenerator *gen) { lbModule *m = gen->modules.entries[j].value; for_array(i, m->foreign_library_paths) { String lib = m->foreign_library_paths[i]; - if (string_ends_with(lib, str_lit(".asm"))) { + if (has_asm_extension(lib)) { string_set_add(&asm_files, lib); } else { string_set_add(&libs, lib); @@ -235,7 +235,7 @@ i32 linker_stage(lbGenerator *gen) { for_array(i, gen->default_module.foreign_library_paths) { String lib = gen->default_module.foreign_library_paths[i]; - if (string_ends_with(lib, str_lit(".asm"))) { + if (has_asm_extension(lib)) { string_set_add(&asm_files, lib); } else { string_set_add(&libs, lib); -- cgit v1.2.3