diff --git a/Makefile b/Makefile index d74c581a..dff3dfbf 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ MAJVER= 2 MINVER= 0 RELVER= 0 -PREREL= -beta6 +PREREL= -beta7 VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) ABIVER= 5.1 NODOTABIVER= 51 diff --git a/README b/README index e6ace6b5..4a47bf5d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for LuaJIT 2.0.0-beta6 +README for LuaJIT 2.0.0-beta7 ----------------------------- LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. diff --git a/doc/changes.html b/doc/changes.html index cb6feedc..1985c332 100644 --- a/doc/changes.html +++ b/doc/changes.html @@ -59,7 +59,7 @@ div.major { max-width: 600px; padding: 1em; margin: 1em 0 1em 0; }

This is a list of changes between the released versions of LuaJIT.
-The current development version is LuaJIT 2.0.0-beta6.
+The current development version is LuaJIT 2.0.0-beta7.
The current stable version is LuaJIT 1.1.7.

diff --git a/doc/ext_ffi.html b/doc/ext_ffi.html index 6546678e..9b59a3f6 100644 --- a/doc/ext_ffi.html +++ b/doc/ext_ffi.html @@ -84,10 +84,10 @@ code a C compiler would generate. Calls to C functions can be inlined in JIT-compiled code, unlike calls to functions bound via the classic Lua/C API.

-

+

This page gives a short introduction to the usage of the FFI library. Please use the FFI sub-topics in the navigation bar to learn more. -

+

Motivating Example: Calling External C Functions

diff --git a/doc/install.html b/doc/install.html index 7341fd07..868a0c41 100644 --- a/doc/install.html +++ b/doc/install.html @@ -171,8 +171,8 @@ open a terminal window and change to this directory. Now unpack the archive and change to the newly created directory: 

-tar zxf LuaJIT-2.0.0-beta6.tar.gz
-cd LuaJIT-2.0.0-beta6
+tar zxf LuaJIT-2.0.0-beta7.tar.gz +cd LuaJIT-2.0.0-beta7

Building LuaJIT

The supplied Makefiles try to auto-detect the settings needed for your @@ -222,11 +222,11 @@ Obviously the prefixes given during build and installation need to be the same.

Note: to avoid overwriting a previous version, the beta test releases only install the LuaJIT executable under the versioned name (i.e. -luajit-2.0.0-beta6). You probably want to create a symlink +luajit-2.0.0-beta7). You probably want to create a symlink for convenience, with a command like this: 

-sudo ln -sf luajit-2.0.0-beta6 /usr/local/bin/luajit
+sudo ln -sf luajit-2.0.0-beta7 /usr/local/bin/luajit

Windows Systems

diff --git a/doc/running.html b/doc/running.html index 76a393ba..bcc811c4 100644 --- a/doc/running.html +++ b/doc/running.html @@ -85,11 +85,11 @@ interactive mode, too.

Note: the beta test releases only install under the versioned name on POSIX systems (to avoid overwriting a previous version). You either need -to type luajit-2.0.0-beta6 to start it or create a symlink +to type luajit-2.0.0-beta7 to start it or create a symlink with a command like this: 

-sudo ln -sf luajit-2.0.0-beta6 /usr/local/bin/luajit
+sudo ln -sf luajit-2.0.0-beta7 /usr/local/bin/luajit

Unlike previous versions optimization is turned on by default in @@ -135,7 +135,7 @@ itself. For a description of their options and output format, please read the comment block at the start of their source. They can be found in the lib directory of the source distribution or installed under the jit directory. By default -this is /usr/local/share/luajit-2.0.0-beta6/jit on POSIX +this is /usr/local/share/luajit-2.0.0-beta7/jit on POSIX systems.

diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua index 19bc94b8..119ed2ee 100644 --- a/dynasm/dasm_arm.lua +++ b/dynasm/dasm_arm.lua @@ -9,9 +9,9 @@ local _info = { arch = "arm", description = "DynASM ARM module", - version = "1.2.2", - vernum = 10202, - release = "2011-03-23", + version = "1.3.0", + vernum = 10300, + release = "2011-05-05", author = "Mike Pall", license = "MIT", } diff --git a/dynasm/dasm_ppc.lua b/dynasm/dasm_ppc.lua index 01376f76..bb6de01e 100644 --- a/dynasm/dasm_ppc.lua +++ b/dynasm/dasm_ppc.lua @@ -9,9 +9,9 @@ local _info = { arch = "ppc", description = "DynASM PPC module", - version = "1.2.2", - vernum = 10202, - release = "2011-01-09", + version = "1.3.0", + vernum = 10300, + release = "2011-05-05", author = "Mike Pall", license = "MIT", } diff --git a/dynasm/dasm_proto.h b/dynasm/dasm_proto.h index 7fac22ab..dc9ed510 100644 --- a/dynasm/dasm_proto.h +++ b/dynasm/dasm_proto.h @@ -10,8 +10,8 @@ #include #include -#define DASM_IDENT "DynASM 1.2.2" -#define DASM_VERSION 10202 /* 1.2.2 */ +#define DASM_IDENT "DynASM 1.3.0" +#define DASM_VERSION 10300 /* 1.3.0 */ #ifndef Dst_DECL #define Dst_DECL dasm_State **Dst diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua index 4ade52f0..5571f93e 100644 --- a/dynasm/dasm_x86.lua +++ b/dynasm/dasm_x86.lua @@ -11,9 +11,9 @@ local x64 = x64 local _info = { arch = x64 and "x64" or "x86", description = "DynASM x86/x64 module", - version = "1.2.2", - vernum = 10202, - release = "2011-01-09", + version = "1.3.0", + vernum = 10300, + release = "2011-05-05", author = "Mike Pall", license = "MIT", } diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua index da94744e..8ff98513 100644 --- a/dynasm/dynasm.lua +++ b/dynasm/dynasm.lua @@ -10,9 +10,9 @@ local _info = { name = "DynASM", description = "A dynamic assembler for code generation engines", - version = "1.2.2", - vernum = 10202, - release = "2011-01-09", + version = "1.3.0", + vernum = 10300, + release = "2011-05-05", author = "Mike Pall", url = "http://luajit.org/dynasm.html", license = "MIT", diff --git a/etc/luajit.pc b/etc/luajit.pc index 6ead2678..02487136 100644 --- a/etc/luajit.pc +++ b/etc/luajit.pc @@ -2,7 +2,7 @@ majver=2 minver=0 relver=0 -version=${majver}.${minver}.${relver}-beta6 +version=${majver}.${minver}.${relver}-beta7 abiver=5.1 prefix=/usr/local diff --git a/src/buildvm_arm.h b/src/buildvm_arm.h index a5f16897..9e0b2a55 100644 --- a/src/buildvm_arm.h +++ b/src/buildvm_arm.h @@ -1,11 +1,11 @@ /* ** This file has been pre-processed with DynASM. ** http://luajit.org/dynasm.html -** DynASM version 1.2.2, DynASM arm version 1.2.2 +** DynASM version 1.3.0, DynASM arm version 1.3.0 ** DO NOT EDIT! The original file is in "buildvm_arm.dasc". */ -#if DASM_VERSION != 10202 +#if DASM_VERSION != 10300 #error "Version mismatch between DynASM and included encoding engine" #endif diff --git a/src/buildvm_ppcspe.h b/src/buildvm_ppcspe.h index 003b199d..30497fc7 100644 --- a/src/buildvm_ppcspe.h +++ b/src/buildvm_ppcspe.h @@ -1,11 +1,11 @@ /* ** This file has been pre-processed with DynASM. ** http://luajit.org/dynasm.html -** DynASM version 1.2.2, DynASM ppc version 1.2.2 +** DynASM version 1.3.0, DynASM ppc version 1.3.0 ** DO NOT EDIT! The original file is in "buildvm_ppc.dasc". */ -#if DASM_VERSION != 10202 +#if DASM_VERSION != 10300 #error "Version mismatch between DynASM and included encoding engine" #endif diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index fb6f57f9..fe439c75 100644 --- a/src/buildvm_x64.h +++ b/src/buildvm_x64.h @@ -1,11 +1,11 @@ /* ** This file has been pre-processed with DynASM. ** http://luajit.org/dynasm.html -** DynASM version 1.2.2, DynASM x64 version 1.2.2 +** DynASM version 1.3.0, DynASM x64 version 1.3.0 ** DO NOT EDIT! The original file is in "buildvm_x86.dasc". */ -#if DASM_VERSION != 10202 +#if DASM_VERSION != 10300 #error "Version mismatch between DynASM and included encoding engine" #endif diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h index 4b3f5237..f6fa13dc 100644 --- a/src/buildvm_x64win.h +++ b/src/buildvm_x64win.h @@ -1,11 +1,11 @@ /* ** This file has been pre-processed with DynASM. ** http://luajit.org/dynasm.html -** DynASM version 1.2.2, DynASM x64 version 1.2.2 +** DynASM version 1.3.0, DynASM x64 version 1.3.0 ** DO NOT EDIT! The original file is in "buildvm_x86.dasc". */ -#if DASM_VERSION != 10202 +#if DASM_VERSION != 10300 #error "Version mismatch between DynASM and included encoding engine" #endif diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h index 8ada18ac..42a0b75b 100644 --- a/src/buildvm_x86.h +++ b/src/buildvm_x86.h @@ -1,11 +1,11 @@ /* ** This file has been pre-processed with DynASM. ** http://luajit.org/dynasm.html -** DynASM version 1.2.2, DynASM x86 version 1.2.2 +** DynASM version 1.3.0, DynASM x86 version 1.3.0 ** DO NOT EDIT! The original file is in "buildvm_x86.dasc". */ -#if DASM_VERSION != 10202 +#if DASM_VERSION != 10300 #error "Version mismatch between DynASM and included encoding engine" #endif diff --git a/src/luaconf.h b/src/luaconf.h index 75c88581..ceab5ed6 100644 --- a/src/luaconf.h +++ b/src/luaconf.h @@ -26,12 +26,12 @@ #define LUA_LDIR LUA_ROOT "share/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #ifdef LUA_XROOT -#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta6/" +#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta7/" #define LUA_XPATH \ ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua" #define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;" #else -#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta6/" +#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta7/" #define LUA_XPATH #define LUA_XCPATH #endif diff --git a/src/luajit.h b/src/luajit.h index f38d58a1..4ea529ec 100644 --- a/src/luajit.h +++ b/src/luajit.h @@ -30,9 +30,9 @@ #include "lua.h" -#define LUAJIT_VERSION "LuaJIT 2.0.0-beta6" +#define LUAJIT_VERSION "LuaJIT 2.0.0-beta7" #define LUAJIT_VERSION_NUM 20000 /* Version 2.0.0 = 02.00.00. */ -#define LUAJIT_VERSION_SYM luaJIT_version_2_0_0_beta6 +#define LUAJIT_VERSION_SYM luaJIT_version_2_0_0_beta7 #define LUAJIT_COPYRIGHT "Copyright (C) 2005-2011 Mike Pall" #define LUAJIT_URL "http://luajit.org/"