Merge pull request #376 from dumganhar/re-update-luajit

Updates luajit to 2.1.0-beta2 for luacompile binary, luacompile supports to generate 64bit luajit bytecode

Author: Bin Zhang

bin/strings.json

@@ -105,10 +105,11 @@
         "LUACOMPILE_ARG_ENCRYPT" : "Whether or not to encrypt.",
         "LUACOMPILE_ARG_ENCRYPT_KEY" : "The key for encrypt.",
         "LUACOMPILE_ARG_ENCRYPT_SIGN" : "The sign for encrypt.",
-        "LUACOMPILE_ARG_DISABLE_COMPILE" : "Not compile the lua files to bytecode.",
+        "LUACOMPILE_ARG_DISABLE_COMPILE" : "Don't compile the lua files to bytecode.",
+        "LUACOMPILE_ARG_BYTECODE_64BIT": "Generate 64bit luajit bytecode",
         "LUACOMPILE_DEBUG_COMPILE_FILE_FMT" : "Compiling lua (%s) to bytecode...",
         "LUACOMPILE_INFO_PROCESS_FILE" : "Processing lua script files",
-        "LUACOMPILE_WARNING_TIP_MSG" : "By using luacompile, you could precompile the Lua script files to the bytecode files and encrypt the Lua script files or the bytecode files by XXTEA.\nThe mechanism of generating the bytecode files is based on the LuaJIT v2.0.3, so the generated bytecode files cann't be used on the 64-bit iOS devices.",
+        "LUACOMPILE_WARNING_TIP_MSG" : "By using luacompile, you could precompile the Lua script files to the bytecode files and encrypt the Lua script files or the bytecode files by XXTEA.",
         "LUACOMPILE_INFO_FINISHED" : "Compilation finished.",
         "LUACOMPILE_ERROR_TOOL_NOT_FOUND" : "Can't find right luajit for current system.",
         "LUACOMPILE_ERROR_SRCDIR_NAME_NOT_FOUND" : "Can't find src directory in file path.",
@@ -434,9 +435,10 @@
         "LUACOMPILE_ARG_ENCRYPT_KEY" : "指定 XXTEA 加密功能的 key 字段。",
         "LUACOMPILE_ARG_ENCRYPT_SIGN" : "指定 XXTEA 加密功能的 sign 字段。",
         "LUACOMPILE_ARG_DISABLE_COMPILE" : "关闭编译为字节码的功能。",
+        "LUACOMPILE_ARG_BYTECODE_64BIT": "生成64位Luajit格式的字节码",
         "LUACOMPILE_DEBUG_COMPILE_FILE_FMT" : "正在将 %s 编译为字节码...",
         "LUACOMPILE_INFO_PROCESS_FILE" : "正在处理 lua 文件。",
-        "LUACOMPILE_WARNING_TIP_MSG" : "通过 luacompile 命令对 lua 文件进行 XXTEA 加密以及编译为字节码的处理。\n编译为字节码的功能基于 LuaJIT v2.0.3，所以目前编译成字节码的文件不适用于 iOS 64位设备。",
+        "LUACOMPILE_WARNING_TIP_MSG" : "通过 luacompile 命令对 lua 文件进行 XXTEA 加密以及编译为字节码的处理。",
         "LUACOMPILE_INFO_FINISHED" : "编译完成。",
         "LUACOMPILE_ERROR_TOOL_NOT_FOUND" : "无法找到适用于当前系统的 luajit。",
         "LUACOMPILE_ERROR_SRCDIR_NAME_NOT_FOUND" : "在文件路径中找不到源目录。",
@@ -761,9 +763,10 @@
         "LUACOMPILE_ARG_ENCRYPT_KEY" : "指定 XXTEA 加密功能的 key 字段。",
         "LUACOMPILE_ARG_ENCRYPT_SIGN" : "指定 XXTEA 加密功能的 sign 字段。",
         "LUACOMPILE_ARG_DISABLE_COMPILE" : "關閉編譯為位元組碼的功能。",
+        "LUACOMPILE_ARG_BYTECODE_64BIT": "生成64位Luajit格式的字節碼",
         "LUACOMPILE_DEBUG_COMPILE_FILE_FMT" : "正在將 %s 編譯為位元組碼...",
         "LUACOMPILE_INFO_PROCESS_FILE" : "正在處理 lua 檔案。",
-        "LUACOMPILE_WARNING_TIP_MSG" : "通過 luacompile 命令對 lua 檔案進行 XXTEA 加密以及編譯為位元組碼的處理。\n編譯為位元組碼的功能基於 LuaJIT v2.0.3，所以目前編譯成位元組碼的檔案不適用於 iOS 64位設備。",
+        "LUACOMPILE_WARNING_TIP_MSG" : "通過 luacompile 命令對 lua 檔案進行 XXTEA 加密以及編譯為位元組碼的處理。",
         "LUACOMPILE_INFO_FINISHED" : "編譯完成。",
         "LUACOMPILE_ERROR_TOOL_NOT_FOUND" : "無法找到適用於當前系統的 luajit。",
         "LUACOMPILE_ERROR_SRCDIR_NAME_NOT_FOUND" : "在檔案路徑中找不到原始目錄。",

plugins/plugin_luacompile/__init__.py

@@ -124,6 +124,8 @@ def init(self, options, workingdir):
         self._isEncrypt = options.encrypt
         self._encryptkey = options.encryptkey
         self._encryptsign = options.encryptsign
+        self._bytecode_64bit = options.bytecode_64bit
+
         self._luajit_exe_path = self.get_luajit_path()
         self._disable_compile = options.disable_compile
 
@@ -179,13 +181,16 @@ def get_output_file_path(self, luafile):
 
     def get_luajit_path(self):
         ret = None
+
+        bit_prefix = "64bit" if self._bytecode_64bit else "32bit"
         if cocos.os_is_win32():
-            ret = os.path.join(self._workingdir, "bin", "luajit.exe")
+            ret = os.path.join(self._workingdir, "bin", bit_prefix, "luajit-win32.exe")
         elif cocos.os_is_mac():
-            ret = os.path.join(self._workingdir, "bin", "lua", "luajit-mac")
+            ret = os.path.join(self._workingdir, "bin", bit_prefix, "luajit-mac")
         elif cocos.os_is_linux():
-            ret = os.path.join(self._workingdir, "bin", "lua", "luajit-linux")
+            ret = os.path.join(self._workingdir, "bin", bit_prefix, "luajit-linux")
 
+        print("luajit bin path: " + ret)
         return ret
 
     def compile_lua(self, lua_file, output_file):
@@ -299,6 +304,9 @@ def parse_args(self, argv):
         parser.add_argument("--disable-compile",
                           action="store_true", dest="disable_compile", default=False,
                           help=MultiLanguage.get_string('LUACOMPILE_ARG_DISABLE_COMPILE'))
+        parser.add_argument("--bytecode-64bit",
+                          action="store_true", dest="bytecode_64bit", default=False,
+                          help=MultiLanguage.get_string('LUACOMPILE_ARG_BYTECODE_64BIT'))
 
         options = parser.parse_args(argv)
 

plugins/plugin_luacompile/bin/lua/jit/bc.lua renamed to plugins/plugin_luacompile/bin/32bit/jit/bc.lua

@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
 -- LuaJIT bytecode listing module.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 --
@@ -41,7 +41,7 @@
 
 -- Cache some library functions and objects.
 local jit = require("jit")
-assert(jit.version_num == 20001, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
 local jutil = require("jit.util")
 local vmdef = require("jit.vmdef")
 local bit = require("bit")
@@ -179,13 +179,12 @@ local function bcliston(outfile)
 end
 
 -- Public module functions.
-module(...)
-
-line = bcline
-dump = bcdump
-targets = bctargets
-
-on = bcliston
-off = bclistoff
-start = bcliston -- For -j command line option.
+return {
+  line = bcline,
+  dump = bcdump,
+  targets = bctargets,
+  on = bcliston,
+  off = bclistoff,
+  start = bcliston -- For -j command line option.
+}
 

plugins/plugin_luacompile/bin/lua/jit/bcsave.lua renamed to plugins/plugin_luacompile/bin/32bit/jit/bcsave.lua

@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
 -- LuaJIT module to save/list bytecode.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 --
@@ -11,7 +11,7 @@
 ------------------------------------------------------------------------------
 
 local jit = require("jit")
-assert(jit.version_num == 20001, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
 local bit = require("bit")
 
 -- Symbol name prefix for LuaJIT bytecode.
@@ -63,13 +63,13 @@ local map_type = {
 }
 
 local map_arch = {
-  x86 = true, x64 = true, arm = true, ppc = true, ppcspe = true,
+  x86 = true, x64 = true, arm = true, arm64 = true, ppc = true,
   mips = true, mipsel = true,
 }
 
 local map_os = {
   linux = true, windows = true, osx = true, freebsd = true, netbsd = true,
-  openbsd = true, solaris = true,
+  openbsd = true, dragonfly = true, solaris = true,
 }
 
 local function checkarg(str, map, err)
@@ -200,9 +200,9 @@ typedef struct {
 ]]
   local symname = LJBC_PREFIX..ctx.modname
   local is64, isbe = false, false
-  if ctx.arch == "x64" then
+  if ctx.arch == "x64" or ctx.arch == "arm64" then
     is64 = true
-  elseif ctx.arch == "ppc" or ctx.arch == "ppcspe" or ctx.arch == "mips" then
+  elseif ctx.arch == "ppc" or ctx.arch == "mips" then
     isbe = true
   end
 
@@ -237,7 +237,7 @@ typedef struct {
   hdr.eendian = isbe and 2 or 1
   hdr.eversion = 1
   hdr.type = f16(1)
-  hdr.machine = f16(({ x86=3, x64=62, arm=40, ppc=20, ppcspe=20, mips=8, mipsel=8 })[ctx.arch])
+  hdr.machine = f16(({ x86=3, x64=62, arm=40, arm64=183, ppc=20, mips=8, mipsel=8 })[ctx.arch])
   if ctx.arch == "mips" or ctx.arch == "mipsel" then
     hdr.flags = 0x50001006
   end
@@ -477,13 +477,13 @@ typedef struct {
 } mach_obj_64;
 typedef struct {
   mach_fat_header fat;
-  mach_fat_arch fat_arch[4];
+  mach_fat_arch fat_arch[2];
   struct {
     mach_header hdr;
     mach_segment_command seg;
     mach_section sec;
     mach_symtab_command sym;
-  } arch[4];
+  } arch[2];
   mach_nlist sym_entry;
   uint8_t space[4096];
 } mach_fat_obj;
@@ -494,6 +494,8 @@ typedef struct {
     is64, align, mobj = true, 8, "mach_obj_64"
   elseif ctx.arch == "arm" then
     isfat, mobj = true, "mach_fat_obj"
+  elseif ctx.arch == "arm64" then
+    is64, align, isfat, mobj = true, 8, true, "mach_fat_obj"
   else
     check(ctx.arch == "x86", "unsupported architecture for OSX")
   end
@@ -503,8 +505,8 @@ typedef struct {
   -- Create Mach-O object and fill in header.
   local o = ffi.new(mobj)
   local mach_size = aligned(ffi.offsetof(o, "space")+#symname+2, align)
-  local cputype = ({ x86={7}, x64={0x01000007}, arm={7,12,12,12} })[ctx.arch]
-  local cpusubtype = ({ x86={3}, x64={3}, arm={3,6,9,11} })[ctx.arch]
+  local cputype = ({ x86={7}, x64={0x01000007}, arm={7,12}, arm64={0x01000007,0x0100000c} })[ctx.arch]
+  local cpusubtype = ({ x86={3}, x64={3}, arm={3,9}, arm64={3,0} })[ctx.arch]
   if isfat then
     o.fat.magic = be32(0xcafebabe)
     o.fat.nfat_arch = be32(#cpusubtype)
@@ -653,7 +655,7 @@ end
 ------------------------------------------------------------------------------
 
 -- Public module functions.
-module(...)
-
-start = docmd -- Process -b command line option.
+return {
+  start = docmd -- Process -b command line option.
+}
 

plugins/plugin_luacompile/bin/lua/jit/dis_arm.lua renamed to plugins/plugin_luacompile/bin/32bit/jit/dis_arm.lua

@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
 -- LuaJIT ARM disassembler module.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 -- This is a helper module used by the LuaJIT machine code dumper module.
@@ -658,7 +658,7 @@ local function disass_block(ctx, ofs, len)
 end
 
 -- Extended API: create a disassembler context. Then call ctx:disass(ofs, len).
-local function create_(code, addr, out)
+local function create(code, addr, out)
   local ctx = {}
   ctx.code = code
   ctx.addr = addr or 0
@@ -670,20 +670,20 @@ local function create_(code, addr, out)
 end
 
 -- Simple API: disassemble code (a string) at address and output via out.
-local function disass_(code, addr, out)
-  create_(code, addr, out):disass()
+local function disass(code, addr, out)
+  create(code, addr, out):disass()
 end
 
 -- Return register name for RID.
-local function regname_(r)
+local function regname(r)
   if r < 16 then return map_gpr[r] end
   return "d"..(r-16)
 end
 
 -- Public module functions.
-module(...)
-
-create = create_
-disass = disass_
-regname = regname_
+return {
+  create = create,
+  disass = disass,
+  regname = regname
+}
 

plugins/plugin_luacompile/bin/lua/jit/dis_mips.lua renamed to plugins/plugin_luacompile/bin/32bit/jit/dis_mips.lua

@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
 -- LuaJIT MIPS disassembler module.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
 -- Released under the MIT/X license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 -- This is a helper module used by the LuaJIT machine code dumper module.
@@ -384,7 +384,7 @@ local function disass_block(ctx, ofs, len)
 end
 
 -- Extended API: create a disassembler context. Then call ctx:disass(ofs, len).
-local function create_(code, addr, out)
+local function create(code, addr, out)
   local ctx = {}
   ctx.code = code
   ctx.addr = addr or 0
@@ -396,33 +396,33 @@ local function create_(code, addr, out)
   return ctx
 end
 
-local function create_el_(code, addr, out)
-  local ctx = create_(code, addr, out)
+local function create_el(code, addr, out)
+  local ctx = create(code, addr, out)
   ctx.get = get_le
   return ctx
 end
 
 -- Simple API: disassemble code (a string) at address and output via out.
-local function disass_(code, addr, out)
-  create_(code, addr, out):disass()
+local function disass(code, addr, out)
+  create(code, addr, out):disass()
 end
 
-local function disass_el_(code, addr, out)
-  create_el_(code, addr, out):disass()
+local function disass_el(code, addr, out)
+  create_el(code, addr, out):disass()
 end
 
 -- Return register name for RID.
-local function regname_(r)
+local function regname(r)
   if r < 32 then return map_gpr[r] end
   return "f"..(r-32)
 end
 
 -- Public module functions.
-module(...)
-
-create = create_
-create_el = create_el_
-disass = disass_
-disass_el = disass_el_
-regname = regname_
+return {
+  create = create,
+  create_el = create_el,
+  disass = disass,
+  disass_el = disass_el,
+  regname = regname
+}
 

plugins/plugin_luacompile/bin/lua/jit/dis_mipsel.lua renamed to plugins/plugin_luacompile/bin/32bit/jit/dis_mipsel.lua

@@ -1,20 +1,17 @@
 ----------------------------------------------------------------------------
 -- LuaJIT MIPSEL disassembler wrapper module.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 -- This module just exports the little-endian functions from the
 -- MIPS disassembler module. All the interesting stuff is there.
 ------------------------------------------------------------------------------
 
-local require = require
-
-module(...)
-
-local dis_mips = require(_PACKAGE.."dis_mips")
-
-create = dis_mips.create_el
-disass = dis_mips.disass_el
-regname = dis_mips.regname
+local dis_mips = require((string.match(..., ".*%.") or "").."dis_mips")
+return {
+  create = dis_mips.create_el,
+  disass = dis_mips.disass_el,
+  regname = dis_mips.regname
+}