1 files changed, 15 insertions, 82 deletions
diff --git a/xmake/modules/utils/binary/bin2obj.lua b/xmake/modules/utils/binary/bin2obj.lua
index 10d396551..95e705ca6 100644
--- a/xmake/modules/utils/binary/bin2obj.lua
+++ b/xmake/modules/utils/binary/bin2obj.lua
@@ -34,105 +34,38 @@ 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
+function _do_bin2obj(binarypath, outputpath, opt)
+    -- init source directory and options
     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
+    binarypath = path.absolute(binarypath)
+    outputpath = path.absolute(outputpath)
+    assert(os.isfile(binarypath), "%s not found!", binarypath)
 
-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
-    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)")
+    -- validate 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
-    cprint("${bright}%s generated!", outputpath)
-end
-
-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)
+    print("converting binary file %s to %s object file %s ..", binarypath, format or "coff", outputpath)
 
-    -- do dump
-    if binutils.bin2macho then
-        binutils.bin2macho(binarypath, outputpath, opt)
-    else
-        raise("bin2obj: binutils.bin2macho not available (C implementation not compiled)")
-    end
+    -- do conversion
+    binutils.bin2obj(binarypath, outputpath, opt)
 
     -- 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()
-
-    -- validate format
-    if format ~= "coff" and format ~= "elf" and format ~= "macho" then
-        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
-end
-
 function main(...)
 
     -- parse arguments