From 102507b96dab0403592c07c8760644f08ed66dff Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 9 Dec 2025 22:32:28 +0800 Subject: improve bin2obj --- xmake/modules/utils/binary/bin2obj.lua | 93 +++++----------------------------- 1 file changed, 13 insertions(+), 80 deletions(-) (limited to 'xmake/modules/utils/binary/bin2obj.lua') diff --git a/xmake/modules/utils/binary/bin2obj.lua b/xmake/modules/utils/binary/bin2obj.lua index 10d396551..7870e2544 100644 --- a/xmake/modules/utils/binary/bin2obj.lua +++ b/xmake/modules/utils/binary/bin2obj.lua @@ -34,86 +34,19 @@ local options = { {nil, "zeroend", "k", nil, "Append a null terminator ('\\0') at the end of data."} } -function _do_bin2obj_coff(binarypath, outputpath, opt) - -- get filename from binary path (with extension, dots replaced with underscores) - local filename = path.filename(binarypath) - -- replace dots with underscores for symbol name (e.g., data.bin -> data_bin) - local basename = filename:gsub("%.", "_") - - -- prepare opt - opt = opt or {} - opt.basename = basename - - -- trace - print("converting binary file %s to COFF object file %s ..", binarypath, outputpath) - - -- do dump - if binutils.bin2coff then - binutils.bin2coff(binarypath, outputpath, opt) - else - raise("bin2obj: binutils.bin2coff not available (C implementation not compiled)") - end - - -- trace - cprint("${bright}%s generated!", outputpath) -end - -function _do_bin2obj_elf(binarypath, outputpath, opt) - -- get filename from binary path (with extension, dots replaced with underscores) - local filename = path.filename(binarypath) - -- replace dots with underscores for symbol name (e.g., data.bin -> data_bin) - local basename = filename:gsub("%.", "_") - - -- prepare opt +function _do_bin2obj(binarypath, outputpath, opt) + -- init source directory and options opt = opt or {} - opt.basename = basename - - -- trace - print("converting binary file %s to ELF object file %s ..", binarypath, outputpath) - - -- do dump - if binutils.bin2elf then - binutils.bin2elf(binarypath, outputpath, opt) - else - raise("bin2obj: binutils.bin2elf not available (C implementation not compiled)") - end - - -- trace - cprint("${bright}%s generated!", outputpath) -end + binarypath = path.absolute(binarypath) + outputpath = path.absolute(outputpath) + assert(os.isfile(binarypath), "%s not found!", binarypath) -function _do_bin2obj_macho(binarypath, outputpath, opt) -- get filename from binary path (with extension, dots replaced with underscores) local filename = path.filename(binarypath) -- replace dots with underscores for symbol name (e.g., data.bin -> data_bin) local basename = filename:gsub("%.", "_") - - -- prepare opt - opt = opt or {} opt.basename = basename - -- trace - print("converting binary file %s to Mach-O object file %s ..", binarypath, outputpath) - - -- do dump - if binutils.bin2macho then - binutils.bin2macho(binarypath, outputpath, opt) - else - raise("bin2obj: binutils.bin2macho not available (C implementation not compiled)") - end - - -- trace - cprint("${bright}%s generated!", outputpath) -end - -function _do_bin2obj(binarypath, outputpath, opt) - - -- init source directory and options - opt = opt or {} - binarypath = path.absolute(binarypath) - outputpath = path.absolute(outputpath) - assert(os.isfile(binarypath), "%s not found!", binarypath) - -- get format (default: coff) local format = opt.format or "coff" format = format:lower() @@ -123,14 +56,14 @@ function _do_bin2obj(binarypath, outputpath, opt) raise("bin2obj: unsupported format '%s' (supported: coff, elf, macho)", format) end - -- do conversion based on format - if format == "coff" then - _do_bin2obj_coff(binarypath, outputpath, opt) - elseif format == "elf" then - _do_bin2obj_elf(binarypath, outputpath, opt) - elseif format == "macho" then - _do_bin2obj_macho(binarypath, outputpath, opt) - end + -- trace + print("converting binary file %s to %s object file %s ..", binarypath, format, outputpath) + + -- do conversion + binutils.bin2obj(binarypath, outputpath, opt) + + -- trace + cprint("${bright}%s generated!", outputpath) end function main(...) -- cgit v1.3.1 From 5931e48282914758fd7c4eeaf9ca05a16521692b Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 9 Dec 2025 22:34:36 +0800 Subject: fix compile error --- core/src/xmake/binutils/elf/prefix.h | 2 +- xmake/core/base/binutils.lua | 13 ++++++++++++- xmake/modules/utils/binary/bin2obj.lua | 14 +++++++------- 3 files changed, 20 insertions(+), 9 deletions(-) (limited to 'xmake/modules/utils/binary/bin2obj.lua') diff --git a/core/src/xmake/binutils/elf/prefix.h b/core/src/xmake/binutils/elf/prefix.h index d79fe3e11..bd3cc9129 100644 --- a/core/src/xmake/binutils/elf/prefix.h +++ b/core/src/xmake/binutils/elf/prefix.h @@ -278,7 +278,7 @@ static __tb_inline__ tb_bool_t xm_binutils_elf_is_64bit(tb_char_t const *arch) { * @param offset the string offset * @return the string (static buffer, valid until next call) */ -static __tb_inline__ tb_bool_t xm_binutils_elf_read_string(tb_stream_ref_t istream, tb_uint32_t strtab_offset, tb_uint32_t offset, tb_char_t *name, tb_size_t name_size) { +static __tb_inline__ tb_bool_t xm_binutils_elf_read_string(tb_stream_ref_t istream, tb_uint64_t strtab_offset, tb_uint32_t offset, tb_char_t *name, tb_size_t name_size) { tb_assert_and_check_return_val(istream && name && name_size > 0, tb_false); tb_hize_t saved_pos = tb_stream_offset(istream); diff --git a/xmake/core/base/binutils.lua b/xmake/core/base/binutils.lua index 995f0d0a7..77b17dc92 100644 --- a/xmake/core/base/binutils.lua +++ b/xmake/core/base/binutils.lua @@ -21,6 +21,9 @@ -- define module local binutils = binutils or {} +-- load modules +local os = require("base/os") + -- save original interfaces binutils._bin2c = binutils._bin2c or binutils.bin2c binutils._bin2coff = binutils._bin2coff or binutils.bin2coff @@ -55,7 +58,15 @@ function binutils.bin2obj(binaryfile, outputfile, opt) opt = opt or {} local format = opt.format if not format then - return nil, "bin2obj: format is required (coff, elf, or macho)" + -- auto-detect format based on host platform + local host = os.host() + if host == "windows" or host == "mingw" or host == "msys" or host == "cygwin" then + format = "coff" + elseif host == "macosx" or host == "iphoneos" or host == "watchos" or host == "appletvos" then + format = "macho" + else + format = "elf" + end end format = format:lower() diff --git a/xmake/modules/utils/binary/bin2obj.lua b/xmake/modules/utils/binary/bin2obj.lua index 7870e2544..95e705ca6 100644 --- a/xmake/modules/utils/binary/bin2obj.lua +++ b/xmake/modules/utils/binary/bin2obj.lua @@ -47,17 +47,17 @@ function _do_bin2obj(binarypath, outputpath, opt) local basename = filename:gsub("%.", "_") opt.basename = basename - -- get format (default: coff) - local format = opt.format or "coff" - format = format:lower() - -- validate format - if format ~= "coff" and format ~= "elf" and format ~= "macho" then - raise("bin2obj: unsupported format '%s' (supported: coff, elf, macho)", format) + local format = opt.format + if format then + format = format:lower() + if format ~= "coff" and format ~= "elf" and format ~= "macho" then + raise("bin2obj: unsupported format '%s' (supported: coff, elf, macho)", format) + end end -- trace - print("converting binary file %s to %s object file %s ..", binarypath, format, outputpath) + print("converting binary file %s to %s object file %s ..", binarypath, format or "coff", outputpath) -- do conversion binutils.bin2obj(binarypath, outputpath, opt) -- cgit v1.3.1