improve bin2obj

3 files changed, 53 insertions, 112 deletions

diff --git a/xmake/core/base/binutils.lua b/xmake/core/base/binutils.lua
index 8047046b2..995f0d0a7 100644
--- a/xmake/core/base/binutils.lua
+++ b/xmake/core/base/binutils.lua
@@ -39,23 +39,46 @@ function binutils.bin2c(binaryfile, outputfile, opt)
     end
 end
 
--- generate COFF object file from the binary file
-function binutils.bin2coff(binaryfile, outputfile, opt)
+-- generate object file from the binary file
+-- @param binaryfile  the binary file path
+-- @param outputfile  the output object file path
+-- @param opt         the options
+--                      - format: the object file format (coff, elf, macho), required
+--                      - symbol_prefix: the symbol prefix (default: _binary_)
+--                      - arch: the target architecture (default: x86_64)
+--                      - plat: the target platform (default: macosx, only for macho)
+--                      - basename: the base name for symbols
+--                      - target_minver: the target minimum version (only for macho)
+--                      - xcode_sdkver: the Xcode SDK version (only for macho)
+--                      - zeroend: append null terminator (default: false)
+function binutils.bin2obj(binaryfile, outputfile, opt)
     opt = opt or {}
-    return binutils._bin2coff(binaryfile, outputfile, opt.symbol_prefix or "_binary_", opt.arch or "x86_64", opt.basename, opt.zeroend or false)
-end
+    local format = opt.format
+    if not format then
+        return nil, "bin2obj: format is required (coff, elf, or macho)"
+    end
+    format = format:lower()
 
--- generate Mach-O object file from the binary file
-function binutils.bin2macho(binaryfile, outputfile, opt)
-    opt = opt or {}
-    return binutils._bin2macho(binaryfile, outputfile, opt.symbol_prefix or "_binary_", opt.plat or "macosx", opt.arch or "x86_64", opt.basename, opt.target_minver, opt.xcode_sdkver, opt.zeroend or false)
+    if format == "coff" then
+        if not binutils._bin2coff then
+            return nil, "bin2obj: binutils._bin2coff not available (C implementation not compiled)"
+        end
+        return binutils._bin2coff(binaryfile, outputfile, opt.symbol_prefix or "_binary_", opt.arch or "x86_64", opt.basename, opt.zeroend or false)
+    elseif format == "macho" then
+        if not binutils._bin2macho then
+            return nil, "bin2obj: binutils._bin2macho not available (C implementation not compiled)"
+        end
+        return binutils._bin2macho(binaryfile, outputfile, opt.symbol_prefix or "_binary_", opt.plat or "macosx", opt.arch or "x86_64", opt.basename, opt.target_minver, opt.xcode_sdkver, opt.zeroend or false)
+    elseif format == "elf" then
+        if not binutils._bin2elf then
+            return nil, "bin2obj: binutils._bin2elf not available (C implementation not compiled)"
+        end
+        return binutils._bin2elf(binaryfile, outputfile, opt.symbol_prefix or "_binary_", opt.arch or "x86_64", opt.basename, opt.zeroend or false)
+    else
+        return nil, string.format("bin2obj: unsupported format '%s' (supported: coff, elf, macho)", format)
+    end
 end
 
--- generate ELF object file from the binary file
-function binutils.bin2elf(binaryfile, outputfile, opt)
-    opt = opt or {}
-    return binutils._bin2elf(binaryfile, outputfile, opt.symbol_prefix or "_binary_", opt.arch or "x86_64", opt.basename, opt.zeroend or false)
-end
 
 -- read symbols from object file (auto-detect format: COFF, ELF, or Mach-O)
 function binutils.readsyms(binaryfile)
diff --git a/xmake/core/sandbox/modules/import/core/base/binutils.lua b/xmake/core/sandbox/modules/import/core/base/binutils.lua
index 9e371d777..b9a502f8d 100644
--- a/xmake/core/sandbox/modules/import/core/base/binutils.lua
+++ b/xmake/core/sandbox/modules/import/core/base/binutils.lua
@@ -33,29 +33,14 @@ function sandbox_core_base_binutils.bin2c(binaryfile, outputfile, opt)
     end
 end
 
--- generate COFF object file from the binary file
-function sandbox_core_base_binutils.bin2coff(binaryfile, outputfile, opt)
-    local ok, errors = binutils.bin2coff(binaryfile, outputfile, opt)
+-- generate object file from the binary file
+function sandbox_core_base_binutils.bin2obj(binaryfile, outputfile, opt)
+    local ok, errors = binutils.bin2obj(binaryfile, outputfile, opt)
     if not ok then
-        raise("bin2coff: %s", errors or "unknown errors")
+        raise("bin2obj: %s", errors or "unknown errors")
     end
 end
 
--- generate Mach-O object file from the binary file
-function sandbox_core_base_binutils.bin2macho(binaryfile, outputfile, opt)
-    local ok, errors = binutils.bin2macho(binaryfile, outputfile, opt)
-    if not ok then
-        raise("bin2macho: %s", errors or "unknown errors")
-    end
-end
-
--- generate ELF object file from the binary file
-function sandbox_core_base_binutils.bin2elf(binaryfile, outputfile, opt)
-    local ok, errors = binutils.bin2elf(binaryfile, outputfile, opt)
-    if not ok then
-        raise("bin2elf: %s", errors or "unknown errors")
-    end
-end
 
 -- read symbols from object file (auto-detect format: ELF, COFF, Mach-O)
 function sandbox_core_base_binutils.readsyms(binaryfile)
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(...)