add libc.dataptr

5 files changed, 75 insertions, 8 deletions

diff --git a/core/src/xmake/engine.c b/core/src/xmake/engine.c
index 63196680d..5d90decec 100644
--- a/core/src/xmake/engine.c
+++ b/core/src/xmake/engine.c
@@ -226,6 +226,7 @@ tb_int_t xm_libc_malloc(lua_State* lua);
 tb_int_t xm_libc_free(lua_State* lua);
 tb_int_t xm_libc_memcpy(lua_State* lua);
 tb_int_t xm_libc_memset(lua_State* lua);
+tb_int_t xm_libc_dataptr(lua_State* lua);
 
 #ifdef XM_CONFIG_API_HAVE_CURSES
 // register curses
@@ -425,6 +426,7 @@ static luaL_Reg const g_libc_functions[] =
 ,   { "free",           xm_libc_free        }
 ,   { "memcpy",         xm_libc_memcpy      }
 ,   { "memset",         xm_libc_memset      }
+,   { "dataptr",        xm_libc_dataptr     }
 ,   { tb_null,          tb_null             }
 };
 
diff --git a/core/src/xmake/libc/dataptr.c b/core/src/xmake/libc/dataptr.c
new file mode 100644
index 000000000..4f983e5e7
--- /dev/null
+++ b/core/src/xmake/libc/dataptr.c
@@ -0,0 +1,55 @@
+/*!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, TBOOX Open Source Group.
+ *
+ * @author      ruki
+ * @file        dataptr.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME    "dataptr"
+#define TB_TRACE_MODULE_DEBUG   (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * implementation
+ */
+tb_int_t xm_libc_dataptr(lua_State* lua)
+{
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    if (xm_lua_ispointer(lua, 1))
+    {
+        tb_pointer_t data = (tb_pointer_t)xm_lua_topointer(lua, 1);
+        xm_lua_pushpointer(lua, data);
+        return 1;
+    }
+    else if (lua_isstring(lua, 1))
+    {
+        tb_char_t const* cstr = luaL_checkstring(lua, 1);
+        xm_lua_pushpointer(lua, (tb_pointer_t)cstr);
+        return 1;
+    }
+    xm_libc_return_error(lua, "dataptr(invalid data)!");
+}
+
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index 84b6a03c5..6acb60686 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -119,7 +119,8 @@ xmake_C_FILES 			+= \
 						libc/malloc \
 						libc/free \
 						libc/memset \
-						libc/memcpy
+						libc/memcpy \
+						libc/dataptr
 
 iswin =
 ifeq ($(PLAT),windows)
diff --git a/xmake/core/base/bytes.lua b/xmake/core/base/bytes.lua
index ba44d3403..a4a963762 100644
--- a/xmake/core/base/bytes.lua
+++ b/xmake/core/base/bytes.lua
@@ -60,10 +60,10 @@ function _instance.new(...)
             local ptr = arg2
             local manage = arg3
             if manage then
-                instance._CDATA   = ffi.gc(ffi.cast("unsigned char*", ptr), ffi.C.free)
+                instance._CDATA   = ffi.gc(libc.dataptr(ptr), ffi.C.free)
                 instance._MANAGED = true
             else
-                instance._CDATA   = ffi.cast("unsigned char*", ptr)
+                instance._CDATA   = libc.dataptr(ptr)
                 instance._MANAGED = false
             end
         else
@@ -91,7 +91,7 @@ function _instance.new(...)
         -- bytes(str): mounts a buffer from the given string
         local str = arg1
         instance._SIZE     = #str
-        instance._CDATA    = ffi.cast("unsigned char*", str)
+        instance._CDATA    = libc.dataptr(str)
         instance._REF      = str -- keep ref for GC
         instance._MANAGED  = false
         instance._READONLY = true
diff --git a/xmake/core/base/libc.lua b/xmake/core/base/libc.lua
index cedabef1b..5a32e1180 100644
--- a/xmake/core/base/libc.lua
+++ b/xmake/core/base/libc.lua
@@ -22,10 +22,11 @@
 local libc = libc or {}
 
 -- save original interfaces
-libc._malloc = libc._malloc or libc.malloc
-libc._free   = libc._free or libc.free
-libc._memcpy = libc._memcpy or libc.memcpy
-libc._memset = libc._memset or libc.memset
+libc._malloc  = libc._malloc or libc.malloc
+libc._free    = libc._free or libc.free
+libc._memcpy  = libc._memcpy or libc.memcpy
+libc._memset  = libc._memset or libc.memset
+libc._dataptr = libc._dataptr or libc.dataptr
 
 -- load modules
 local ffi = xmake._LUAJIT and require("ffi")
@@ -79,5 +80,13 @@ function libc.memset(data, ch, size)
     end
 end
 
+function libc.dataptr(data)
+    if ffi then
+        return ffi.cast("unsigned char*", data)
+    else
+        return libc._dataptr(data)
+    end
+end
+
 -- return module: libc
 return libc