Merge pull request #7103 from xmake-io/bin2obj

Add bin2obj rule, will be faster than bin2c

2 files changed, 152 insertions, 3 deletions

diff --git a/xmake/modules/private/utils/bin2c.lua b/xmake/modules/utils/binary/bin2c.lua
index 0d6f06a1d..34d9c4e02 100644
--- a/xmake/modules/private/utils/bin2c.lua
+++ b/xmake/modules/utils/binary/bin2c.lua
@@ -21,6 +21,7 @@
 -- imports
 import("core.base.bytes")
 import("core.base.option")
+import("core.base.binutils")
 
 local options = {
     {'w', "linewidth",  "kv", nil,   "Set the line width"},
@@ -98,8 +99,8 @@ function _do_bin2c(binarypath, outputpath, opt)
     end
 
     -- do dump
-    if utils.bin2c then
-        utils.bin2c(binarypath, outputpath, opt)
+    if binutils.bin2c then
+        binutils.bin2c(binarypath, outputpath, opt)
     else
         local binarydata = bytes(io.readfile(binarypath, {encoding = "binary"}))
         local outputfile = io.open(outputpath, 'w')
@@ -122,8 +123,9 @@ function main(...)
     local argv = {...}
     local opt  = option.parse(argv, options, "Print c/c++ code files from the given binary file."
                                            , ""
-                                           , "Usage: xmake l private.utils.bin2c [options]")
+                                           , "Usage: xmake l utils.binary.bin2c [options]")
 
     -- do bin2c
     _do_bin2c(opt.binarypath, opt.outputpath, opt)
 end
+
diff --git a/xmake/modules/utils/binary/bin2obj.lua b/xmake/modules/utils/binary/bin2obj.lua
new file mode 100644
index 000000000..10d396551
--- /dev/null
+++ b/xmake/modules/utils/binary/bin2obj.lua
@@ -0,0 +1,147 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, Xmake Open Source Community.
+--
+-- @author      ruki
+-- @file        bin2obj.lua
+--
+
+-- imports
+import("core.base.option")
+import("core.base.binutils")
+
+local options = {
+    {'i', "binarypath",    "kv", nil,   "Set the binary file path."},
+    {'o', "outputpath",    "kv", nil,   "Set the output object file path."},
+    {'f', "format",        "kv", nil,   "Set the object file format (coff, elf, macho)."},
+    {nil, "symbol_prefix", "kv", nil,   "Set the symbol prefix (default: _binary_)."},
+    {'a', "arch",          "kv", nil,   "Set the target architecture."},
+    {'p', "plat",          "kv", nil,   "Set the target platform (macosx, iphoneos, etc.)."},
+    {nil, "target_minver", "kv", nil,   "Set the target minimum version (e.g., 10.0, 18.2)."},
+    {nil, "xcode_sdkver",  "kv", nil,   "Set the Xcode SDK version (e.g., 10.0, 18.2)."},
+    {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
+    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
+
+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()
+
+    -- 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
+    local argv = {...}
+    local opt  = option.parse(argv, options, "Convert binary file to object file for direct linking."
+                                                   , ""
+                                                   , "Usage: xmake l utils.binary.bin2obj [options]")
+
+    -- do bin2obj
+    _do_bin2obj(opt.binarypath, opt.outputpath, opt)
+end
+