Skip to content
Snippets Groups Projects
Commit 0b74de80 authored by Luigi Scarso's avatar Luigi Scarso
Browse files

sinc experimental with trunk

parent 753b0a8e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 218 additions and 274 deletions
source/libs/luajit/ChangeLog
+ 7
− 0
View file @ 0b74de80
2014-03-13 Luigi Scarso <luigi.scarso@gmail.com>
Import LuaJIT-2.0.3/ from
http://luajit.org/download/LuaJIT-2.0.3.tar.gz.
2014-02-06 Peter Breitenlohner <peb@mppmu.mpg.de>
Import LuaJIT-2.0.2/ from
......
source/libs/luajit/LuaJIT-2.0.2-PATCHES/ChangeLog deleted 100644 → 0
+ 0
− 15
View file @ 753b0a8e
2014-02-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-03-OSX-build (new): Backport from upstream git.
Fix OSX build issue by Mike Pall.
2014-02-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-02-unwind (new): Bug fix.
2014-02-05 Peter Breitenlohner <peb@mppmu.mpg.de>
Import LuaJIT-2.0.2.
* patch-01-LuaJITTeX (new): Adapt for use in LuaJITTeX.
source/libs/luajit/LuaJIT-2.0.2-PATCHES/TL-Changes deleted 100644 → 0
+ 0
− 6
View file @ 753b0a8e
Changes applied to the LuaJIT-2.0.2/ tree as obtained from:
://luajit.org/download/LuaJIT-2.0.2.tar.gz
Added:
src/lbitlib.c
source/libs/luajit/LuaJIT-2.0.2-PATCHES/patch-01-LuaJITTeX deleted 100644 → 0
+ 0
− 189
View file @ 753b0a8e
diff -ur LuaJIT-2.0.2.orig/src/Makefile LuaJIT-2.0.2/src/Makefile
--- LuaJIT-2.0.2.orig/src/Makefile 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/Makefile 2014-02-05 10:09:02.000000000 +0100
@@ -100,7 +100,7 @@
# enabled by default. Some other features that *might* break some existing
# code (e.g. __pairs or os.execute() return values) can be enabled here.
# Note: this does not provide full compatibility with Lua 5.2 at this time.
-#XCFLAGS+= -DLUAJIT_ENABLE_LUA52COMPAT
+XCFLAGS+= -DLUAJIT_ENABLE_LUA52COMPAT
#
# Disable the JIT compiler, i.e. turn LuaJIT into a pure interpreter.
#XCFLAGS+= -DLUAJIT_DISABLE_JIT
@@ -441,7 +441,7 @@
LJVM_BOUT= $(LJVM_S)
LJVM_MODE= elfasm
-LJLIB_O= lib_base.o lib_math.o lib_bit.o lib_string.o lib_table.o \
+LJLIB_O= lib_base.o lib_math.o lbitlib.o lib_bit.o lib_string.o lib_table.o \
lib_io.o lib_os.o lib_package.o lib_debug.o lib_jit.o lib_ffi.o
LJLIB_C= $(LJLIB_O:.o=.c)
diff -ur LuaJIT-2.0.2.orig/src/Makefile.dep LuaJIT-2.0.2/src/Makefile.dep
--- LuaJIT-2.0.2.orig/src/Makefile.dep 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/Makefile.dep 2014-02-05 10:09:02.000000000 +0100
@@ -6,6 +6,7 @@
lj_tab.h lj_meta.h lj_state.h lj_ctype.h lj_cconv.h lj_bc.h lj_ff.h \
lj_ffdef.h lj_dispatch.h lj_jit.h lj_ir.h lj_char.h lj_strscan.h \
lj_lib.h lj_libdef.h
+lbitlib.o: lbitlib.c lua.h luaconf.h lauxlib.h lualib.h
lib_bit.o: lib_bit.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h lj_def.h \
lj_arch.h lj_err.h lj_errmsg.h lj_str.h lj_lib.h lj_libdef.h
lib_debug.o: lib_debug.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h \
diff -ur LuaJIT-2.0.2.orig/src/lauxlib.h LuaJIT-2.0.2/src/lauxlib.h
--- LuaJIT-2.0.2.orig/src/lauxlib.h 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/lauxlib.h 2014-02-05 10:09:02.000000000 +0100
@@ -86,6 +86,32 @@
int level);
+
+/*
+** {======================================================
+** File handles for IO library
+** =======================================================
+*/
+
+/*
+** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and
+** initial structure 'luaL_Stream' (it may contain other fields
+** after that initial structure).
+*/
+
+#define LUA_FILEHANDLE "FILE*"
+
+
+typedef struct luaL_Stream {
+ FILE *f; /* stream (NULL for incompletely created streams) */
+ lua_CFunction closef; /* to close stream (NULL for closed streams) */
+} luaL_Stream;
+
+/* }====================================================== */
+
+
+
+
/*
** ===============================================================
** some useful macros
diff -ur LuaJIT-2.0.2.orig/src/lib_init.c LuaJIT-2.0.2/src/lib_init.c
--- LuaJIT-2.0.2.orig/src/lib_init.c 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/lib_init.c 2014-02-05 10:09:02.000000000 +0100
@@ -26,6 +26,7 @@
{ LUA_DBLIBNAME, luaopen_debug },
{ LUA_BITLIBNAME, luaopen_bit },
{ LUA_JITLIBNAME, luaopen_jit },
+ { LUA_BITLIBNAME_32, luaopen_bit32 },
{ NULL, NULL }
};
diff -ur LuaJIT-2.0.2.orig/src/lib_package.c LuaJIT-2.0.2/src/lib_package.c
--- LuaJIT-2.0.2.orig/src/lib_package.c 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/lib_package.c 2014-02-05 10:09:02.000000000 +0100
@@ -357,6 +357,29 @@
return 1; /* library loaded successfully */
}
+#define LUA_POF "luaopen_"
+#define LUA_OFSEP "_"
+#define POF LUA_POF
+
+static const char *mkfuncname (lua_State *L, const char *modname) {
+ const char *funcname;
+ const char *mark = strchr(modname, *LUA_IGMARK);
+ if (mark) modname = mark + 1;
+ funcname = luaL_gsub(L, modname, ".", LUA_OFSEP);
+ funcname = lua_pushfstring(L, POF"%s", funcname);
+ lua_remove(L, -2); /* remove 'gsub' result */
+ return funcname;
+}
+
+
+int loader_C_luatex (lua_State *L, const char *name, const char *filename) {
+ const char *funcname;
+ funcname = mkfuncname(L, name);
+ if (ll_loadfunc(L, filename, funcname,0) != 0)
+ loaderror(L, filename);
+ return 1; /* library loaded successfully */
+}
+
static int lj_cf_package_loader_croot(lua_State *L)
{
const char *filename;
@@ -376,6 +399,21 @@
return 1;
}
+int loader_Call_luatex (lua_State *L, const char *name, const char *filename) {
+ const char *funcname;
+ int stat;
+ if (filename == NULL) return 1; /* root not found */
+ funcname = mkfuncname(L, name);
+ if ((stat = ll_loadfunc(L, filename, funcname,0)) != 0) {
+ if (stat != PACKAGE_ERR_FUNC) loaderror(L, filename); /* real error */
+ lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
+ name, filename);
+ return 1; /* function not found */
+ }
+ return 1; /* library loaded successfully */
+}
+
+
static int lj_cf_package_loader_preload(lua_State *L)
{
const char *name = luaL_checkstring(L, 1);
diff -ur LuaJIT-2.0.2.orig/src/lj_def.h LuaJIT-2.0.2/src/lj_def.h
--- LuaJIT-2.0.2.orig/src/lj_def.h 2014-02-10 23:04:03.326614883 +0100
+++ LuaJIT-2.0.2/src/lj_def.h 2014-02-10 22:02:23.502894000 +0100
@@ -62,7 +62,7 @@
#define LJ_MAX_BCINS (1<<26) /* Max. # of bytecode instructions. */
#define LJ_MAX_SLOTS 250 /* Max. # of slots in a Lua func. */
#define LJ_MAX_LOCVAR 200 /* Max. # of local variables. */
-#define LJ_MAX_UPVAL 60 /* Max. # of upvalues. */
+#define LJ_MAX_UPVAL 249 /* Max. # of upvalues. */
#define LJ_MAX_IDXCHAIN 100 /* __index/__newindex chain limit. */
#define LJ_STACK_EXTRA 5 /* Extra stack space (metamethods). */
diff -ur LuaJIT-2.0.2.orig/src/lua.h LuaJIT-2.0.2/src/lua.h
--- LuaJIT-2.0.2.orig/src/lua.h 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/lua.h 2014-02-05 10:09:02.000000000 +0100
@@ -348,6 +348,16 @@
const char *chunkname, const char *mode);
+#define LUA_OPEQ 0
+#define LUA_OPLT 1
+#define LUA_OPLE 2
+#define LUA_OK 0
+
+/* see http://comments.gmane.org/gmane.comp.programming.swig/18673 */
+# define lua_rawlen lua_objlen
+
+
+
struct lua_Debug {
int event;
const char *name; /* (n) */
diff -ur LuaJIT-2.0.2.orig/src/lualib.h LuaJIT-2.0.2/src/lualib.h
--- LuaJIT-2.0.2.orig/src/lualib.h 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/lualib.h 2014-02-05 10:09:02.301703093 +0100
@@ -22,6 +22,8 @@
#define LUA_JITLIBNAME "jit"
#define LUA_FFILIBNAME "ffi"
+#define LUA_BITLIBNAME_32 "bit32"
+
LUALIB_API int luaopen_base(lua_State *L);
LUALIB_API int luaopen_math(lua_State *L);
LUALIB_API int luaopen_string(lua_State *L);
@@ -34,6 +36,8 @@
LUALIB_API int luaopen_jit(lua_State *L);
LUALIB_API int luaopen_ffi(lua_State *L);
+LUALIB_API int luaopen_bit32(lua_State *L);
+
LUALIB_API void luaL_openlibs(lua_State *L);
#ifndef lua_assert
source/libs/luajit/LuaJIT-2.0.2-PATCHES/patch-02-unwind deleted 100644 → 0
+ 0
− 12
View file @ 753b0a8e
diff -ur -x lbitlib.c LuaJIT-2.0.2.orig/src/lj_err.c LuaJIT-2.0.2/src/lj_err.c
--- LuaJIT-2.0.2.orig/src/lj_err.c 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/lj_err.c 2014-02-06 14:01:09.000000000 +0100
@@ -196,7 +196,7 @@
typedef struct _Unwind_Exception
{
uint64_t exclass;
- void (*excleanup)(int, struct _Unwind_Exception);
+ void (*excleanup)(int, struct _Unwind_Exception *);
uintptr_t p1, p2;
} __attribute__((__aligned__)) _Unwind_Exception;
source/libs/luajit/LuaJIT-2.0.2-PATCHES/patch-03-OSX-build deleted 100644 → 0
+ 0
− 32
View file @ 753b0a8e
diff -ur -x lbitlib.c LuaJIT-2.0.2.orig/src/Makefile LuaJIT-2.0.2/src/Makefile
--- LuaJIT-2.0.2.orig/src/Makefile 2014-02-05 10:09:02.000000000 +0100
+++ LuaJIT-2.0.2/src/Makefile 2014-02-07 09:53:10.000000000 +0100
@@ -287,7 +287,9 @@
endif
TARGET_STRIP+= -x
TARGET_AR+= 2>/dev/null
- TARGET_XCFLAGS+= -fno-stack-protector
+ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
+ TARGET_XCFLAGS+= -fno-stack-protector
+ endif
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
TARGET_DYNXLDOPTS=
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
diff -ur -x lbitlib.c LuaJIT-2.0.2.orig/src/vm_x86.dasc LuaJIT-2.0.2/src/vm_x86.dasc
--- LuaJIT-2.0.2.orig/src/vm_x86.dasc 2013-06-03 21:00:00.000000000 +0200
+++ LuaJIT-2.0.2/src/vm_x86.dasc 2014-02-07 09:53:19.000000000 +0100
@@ -6344,12 +6344,12 @@
#if LJ_64
"\t.byte 0xe\n\t.byte 16\n" /* def_cfa_offset */
"\t.byte 0x86\n\t.byte 0x2\n" /* offset rbp */
- "\t.byte 0xd\n\t.uleb128 0x6\n" /* def_cfa_register rbp */
+ "\t.byte 0xd\n\t.byte 0x6\n" /* def_cfa_register rbp */
"\t.byte 0x83\n\t.byte 0x3\n" /* offset rbx */
#else
"\t.byte 0xe\n\t.byte 8\n" /* def_cfa_offset */
"\t.byte 0x84\n\t.byte 0x2\n" /* offset ebp (4 for MACH-O)*/
- "\t.byte 0xd\n\t.uleb128 0x4\n" /* def_cfa_register ebp */
+ "\t.byte 0xd\n\t.byte 0x4\n" /* def_cfa_register ebp */
"\t.byte 0x83\n\t.byte 0x3\n" /* offset ebx */
#endif
"\t.align " BSZPTR "\n"
source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-001-lib_init.c 0 → 100644
+ 11
− 0
View file @ 0b74de80
diff -u LuaJIT-2.0.3.orig/src/lib_init.c LuaJIT-2.0.3/src/lib_init.c
--- LuaJIT-2.0.3.orig/src/lib_init.c 2014-03-13 12:38:39.407900526 +0100
+++ LuaJIT-2.0.3/src/lib_init.c 2014-03-13 12:59:05.995951378 +0100
@@ -26,6 +26,7 @@
{ LUA_DBLIBNAME, luaopen_debug },
{ LUA_BITLIBNAME, luaopen_bit },
{ LUA_JITLIBNAME, luaopen_jit },
+ { LUA_BITLIBNAME_32, luaopen_bit32 },
{ NULL, NULL }
};
source/libs/luajit/LuaJIT-2.0.2-PATCHES/patch-04-lj_str → source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-002-lj_str.c
+ 3
− 11
View file @ 0b74de80
diff -ur LuaJIT-2.0.2.orig/src/lj_str.c LuaJIT-2.0.2/src/lj_str.c
--- LuaJIT-2.0.2.orig/src/lj_str.c 2014-03-01 10:22:27.067664439 +0100
+++ LuaJIT-2.0.2/src/lj_str.c 2014-03-08 10:22:35.000000000 +0100
diff -u LuaJIT-2.0.3.orig/src/lj_str.c LuaJIT-2.0.3/src/lj_str.c
--- LuaJIT-2.0.3.orig/src/lj_str.c 2014-03-13 12:38:39.403900527 +0100
+++ LuaJIT-2.0.3/src/lj_str.c 2014-03-13 13:19:53.956003116 +0100
@@ -90,6 +90,8 @@
g->strhash = newhash;
}
......@@ -72,11 +72,3 @@ diff -ur LuaJIT-2.0.2.orig/src/lj_str.c LuaJIT-2.0.2/src/lj_str.c
/* Check if the string has already been interned. */
o = gcref(g->strhash[h & g->strmask]);
if (LJ_LIKELY((((uintptr_t)str+len-1) & (LJ_PAGESIZE-1)) <= LJ_PAGESIZE-4)) {
@@ -143,7 +162,6 @@
}
}
/* Nope, create a new string. */
- printf("lj_str_new: create a new string for %s, l=%d\n",str,lenx);
s = lj_mem_newt(L, sizeof(GCstr)+len+1, GCstr);
newwhite(g, s);
s->gct = ~LJ_TSTR;
source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-003-lauxlib.h 0 → 100644
+ 36
− 0
View file @ 0b74de80
diff -u LuaJIT-2.0.3.orig/src/lauxlib.h LuaJIT-2.0.3/src/lauxlib.h
--- LuaJIT-2.0.3.orig/src/lauxlib.h 2014-03-13 12:38:39.411900526 +0100
+++ LuaJIT-2.0.3/src/lauxlib.h 2014-03-13 12:57:59.207948609 +0100
@@ -86,6 +86,32 @@
int level);
+
+/*
+** {======================================================
+** File handles for IO library
+** =======================================================
+*/
+
+/*
+** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and
+** initial structure 'luaL_Stream' (it may contain other fields
+** after that initial structure).
+*/
+
+#define LUA_FILEHANDLE "FILE*"
+
+
+typedef struct luaL_Stream {
+ FILE *f; /* stream (NULL for incompletely created streams) */
+ lua_CFunction closef; /* to close stream (NULL for closed streams) */
+} luaL_Stream;
+
+/* }====================================================== */
+
+
+
+
/*
** ===============================================================
** some useful macros
source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-004-lualib.h 0 → 100644
+ 21
− 0
View file @ 0b74de80
diff -u LuaJIT-2.0.3.orig/src/lualib.h LuaJIT-2.0.3/src/lualib.h
--- LuaJIT-2.0.3.orig/src/lualib.h 2014-03-13 12:38:39.407900526 +0100
+++ LuaJIT-2.0.3/src/lualib.h 2014-03-13 13:07:17.495971755 +0100
@@ -22,6 +22,8 @@
#define LUA_JITLIBNAME "jit"
#define LUA_FFILIBNAME "ffi"
+#define LUA_BITLIBNAME_32 "bit32"
+
LUALIB_API int luaopen_base(lua_State *L);
LUALIB_API int luaopen_math(lua_State *L);
LUALIB_API int luaopen_string(lua_State *L);
@@ -34,6 +36,8 @@
LUALIB_API int luaopen_jit(lua_State *L);
LUALIB_API int luaopen_ffi(lua_State *L);
+LUALIB_API int luaopen_bit32(lua_State *L);
+
LUALIB_API void luaL_openlibs(lua_State *L);
#ifndef lua_assert
source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-005-Makefile 0 → 100644
+ 21
− 0
View file @ 0b74de80
diff -u LuaJIT-2.0.3.orig/src/Makefile LuaJIT-2.0.3/src/Makefile
--- LuaJIT-2.0.3.orig/src/Makefile 2014-03-13 12:38:39.407900526 +0100
+++ LuaJIT-2.0.3/src/Makefile 2014-03-13 12:54:30.583939960 +0100
@@ -100,7 +100,7 @@
# enabled by default. Some other features that *might* break some existing
# code (e.g. __pairs or os.execute() return values) can be enabled here.
# Note: this does not provide full compatibility with Lua 5.2 at this time.
-#XCFLAGS+= -DLUAJIT_ENABLE_LUA52COMPAT
+XCFLAGS+= -DLUAJIT_ENABLE_LUA52COMPAT
#
# Disable the JIT compiler, i.e. turn LuaJIT into a pure interpreter.
#XCFLAGS+= -DLUAJIT_DISABLE_JIT
@@ -450,7 +450,7 @@
LJVM_BOUT= $(LJVM_S)
LJVM_MODE= elfasm
-LJLIB_O= lib_base.o lib_math.o lib_bit.o lib_string.o lib_table.o \
+LJLIB_O= lib_base.o lib_math.o lbitlib.o lib_bit.o lib_string.o lib_table.o \
lib_io.o lib_os.o lib_package.o lib_debug.o lib_jit.o lib_ffi.o
LJLIB_C= $(LJLIB_O:.o=.c)
source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-006-Makefile.dep 0 → 100644
+ 11
− 0
View file @ 0b74de80
diff -u LuaJIT-2.0.3.orig/src/Makefile.dep LuaJIT-2.0.3/src/Makefile.dep
--- LuaJIT-2.0.3.orig/src/Makefile.dep 2014-03-13 12:38:39.407900526 +0100
+++ LuaJIT-2.0.3/src/Makefile.dep 2014-03-13 12:56:47.571945639 +0100
@@ -6,6 +6,7 @@
lj_tab.h lj_meta.h lj_state.h lj_ctype.h lj_cconv.h lj_bc.h lj_ff.h \
lj_ffdef.h lj_dispatch.h lj_jit.h lj_ir.h lj_char.h lj_strscan.h \
lj_lib.h lj_libdef.h
+lbitlib.o: lbitlib.c lua.h luaconf.h lauxlib.h lualib.h
lib_bit.o: lib_bit.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h lj_def.h \
lj_arch.h lj_err.h lj_errmsg.h lj_str.h lj_lib.h lj_libdef.h
lib_debug.o: lib_debug.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h \
source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c 0 → 100644
+ 65
− 0
View file @ 0b74de80
diff -u LuaJIT-2.0.3.orig/src/lib_package.c LuaJIT-2.0.3/src/lib_package.c
--- LuaJIT-2.0.3.orig/src/lib_package.c 2014-03-13 12:38:39.407900526 +0100
+++ LuaJIT-2.0.3/src/lib_package.c 2014-03-13 13:01:11.283956573 +0100
@@ -68,6 +68,9 @@
#elif LJ_TARGET_WINDOWS
#define WIN32_LEAN_AND_MEAN
+#ifndef WINVER
+#define WINVER 0x0500
+#endif
#include <windows.h>
#ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
@@ -354,6 +357,29 @@
return 1; /* library loaded successfully */
}
+#define LUA_POF "luaopen_"
+#define LUA_OFSEP "_"
+#define POF LUA_POF
+
+static const char *mkfuncname (lua_State *L, const char *modname) {
+ const char *funcname;
+ const char *mark = strchr(modname, *LUA_IGMARK);
+ if (mark) modname = mark + 1;
+ funcname = luaL_gsub(L, modname, ".", LUA_OFSEP);
+ funcname = lua_pushfstring(L, POF"%s", funcname);
+ lua_remove(L, -2); /* remove 'gsub' result */
+ return funcname;
+}
+
+
+int loader_C_luatex (lua_State *L, const char *name, const char *filename) {
+ const char *funcname;
+ funcname = mkfuncname(L, name);
+ if (ll_loadfunc(L, filename, funcname,0) != 0)
+ loaderror(L, filename);
+ return 1; /* library loaded successfully */
+}
+
static int lj_cf_package_loader_croot(lua_State *L)
{
const char *filename;
@@ -373,6 +399,21 @@
return 1;
}
+int loader_Call_luatex (lua_State *L, const char *name, const char *filename) {
+ const char *funcname;
+ int stat;
+ if (filename == NULL) return 1; /* root not found */
+ funcname = mkfuncname(L, name);
+ if ((stat = ll_loadfunc(L, filename, funcname,0)) != 0) {
+ if (stat != PACKAGE_ERR_FUNC) loaderror(L, filename); /* real error */
+ lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
+ name, filename);
+ return 1; /* function not found */
+ }
+ return 1; /* library loaded successfully */
+}
+
+
static int lj_cf_package_loader_preload(lua_State *L)
{
const char *name = luaL_checkstring(L, 1);
source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-008-lj_def.h 0 → 100644
+ 12
− 0
View file @ 0b74de80
diff -u LuaJIT-2.0.3.orig/src/lj_def.h LuaJIT-2.0.3/src/lj_def.h
--- LuaJIT-2.0.3.orig/src/lj_def.h 2014-03-13 12:38:39.411900526 +0100
+++ LuaJIT-2.0.3/src/lj_def.h 2014-03-13 13:02:19.419959396 +0100
@@ -62,7 +62,7 @@
#define LJ_MAX_BCINS (1<<26) /* Max. # of bytecode instructions. */
#define LJ_MAX_SLOTS 250 /* Max. # of slots in a Lua func. */
#define LJ_MAX_LOCVAR 200 /* Max. # of local variables. */
-#define LJ_MAX_UPVAL 60 /* Max. # of upvalues. */
+#define LJ_MAX_UPVAL 249 /* Max. # of upvalues. */
#define LJ_MAX_IDXCHAIN 100 /* __index/__newindex chain limit. */
#define LJ_STACK_EXTRA 5 /* Extra stack space (metamethods). */
source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-009-lua.h 0 → 100644
+ 20
− 0
View file @ 0b74de80
diff -u LuaJIT-2.0.3.orig/src/lua.h LuaJIT-2.0.3/src/lua.h
--- LuaJIT-2.0.3.orig/src/lua.h 2014-03-13 12:38:39.407900526 +0100
+++ LuaJIT-2.0.3/src/lua.h 2014-03-13 13:06:16.127969211 +0100
@@ -348,6 +348,16 @@
const char *chunkname, const char *mode);
+#define LUA_OPEQ 0
+#define LUA_OPLT 1
+#define LUA_OPLE 2
+#define LUA_OK 0
+
+/* see http://comments.gmane.org/gmane.comp.programming.swig/18673 */
+# define lua_rawlen lua_objlen
+
+
+
struct lua_Debug {
int event;
const char *name; /* (n) */
source/libs/luajit/LuaJIT-2.0.2/COPYRIGHT → source/libs/luajit/LuaJIT-2.0.3/COPYRIGHT
+ 1
− 1
View file @ 0b74de80
===============================================================================
LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
Copyright (C) 2005-2013 Mike Pall. All rights reserved.
Copyright (C) 2005-2014 Mike Pall. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
source/libs/luajit/LuaJIT-2.0.2/Makefile → source/libs/luajit/LuaJIT-2.0.3/Makefile
+ 6
− 4
View file @ 0b74de80
......@@ -10,12 +10,12 @@
# For MSVC, please follow the instructions given in src/msvcbuild.bat.
# For MinGW and Cygwin, cd to src and run make with the Makefile there.
#
# Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h
# Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
##############################################################################
MAJVER= 2
MINVER= 0
RELVER= 2
RELVER= 3
VERSION= $(MAJVER).$(MINVER).$(RELVER)
ABIVER= 5.1
......@@ -25,11 +25,12 @@ ABIVER= 5.1
# the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
#
export PREFIX= /usr/local
export MULTILIB= lib
##############################################################################
DPREFIX= $(DESTDIR)$(PREFIX)
INSTALL_BIN= $(DPREFIX)/bin
INSTALL_LIB= $(DPREFIX)/lib
INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
INSTALL_SHARE= $(DPREFIX)/share
INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
......@@ -73,7 +74,8 @@ INSTALL_X= install -m 0755
INSTALL_F= install -m 0644
UNINSTALL= $(RM)
LDCONFIG= ldconfig -n
SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|"
SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
-e "s|^multilib=.*|multilib=$(MULTILIB)|"
FILE_T= luajit
FILE_A= libluajit.a
......
source/libs/luajit/LuaJIT-2.0.2/README → source/libs/luajit/LuaJIT-2.0.3/README
+ 2
− 2
View file @ 0b74de80
README for LuaJIT 2.0.2
README for LuaJIT 2.0.3
-----------------------
LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.
Project Homepage: http://luajit.org/
LuaJIT is Copyright (C) 2005-2013 Mike Pall.
LuaJIT is Copyright (C) 2005-2014 Mike Pall.
LuaJIT is free software, released under the MIT license.
See full Copyright Notice in the COPYRIGHT file or in luajit.h.
......
source/libs/luajit/LuaJIT-2.0.2/doc/bluequad-print.css → source/libs/luajit/LuaJIT-2.0.3/doc/bluequad-print.css
+ 1
− 1
View file @ 0b74de80
/* Copyright (C) 2004-2013 Mike Pall.
/* Copyright (C) 2004-2014 Mike Pall.
*
* You are welcome to use the general ideas of this design for your own sites.
* But please do not steal the stylesheet, the layout or the color scheme.
......
source/libs/luajit/LuaJIT-2.0.2/doc/bluequad.css → source/libs/luajit/LuaJIT-2.0.3/doc/bluequad.css
+ 1
− 1
View file @ 0b74de80
/* Copyright (C) 2004-2013 Mike Pall.
/* Copyright (C) 2004-2014 Mike Pall.
*
* You are welcome to use the general ideas of this design for your own sites.
* But please do not steal the stylesheet, the layout or the color scheme.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment