This is a list of changes between the released versions of LuaJIT.
-The current stable version is LuaJIT 2.0.3.
+The current stable version is LuaJIT 2.0.4.
Please check the @@ -72,6 +72,56 @@
LuaJIT Change History
+
LuaJIT 2.0.4 — 2015-05-14
+-
+
- Fix stack check in narrowing optimization. +
- Fix Lua/C API typecheck error for special indexes. +
- Fix string to number conversion. +
- Fix lexer error for chunks without tokens. +
- Don't compile IR_RETF after CALLT to ff with-side effects. +
- Fix BC_UCLO/BC_JMP join optimization in Lua parser. +
- Fix corner case in string to number conversion. +
- Gracefully handle lua_error() for a suspended coroutine. +
- Avoid error messages when building with Clang. +
- Fix snapshot #0 handling for traces with a stack check on entry. +
- Fix fused constant loads under high register pressure. +
- Invalidate backpropagation cache after DCE. +
- Fix ABC elimination. +
- Fix debug info for main chunk of stripped bytecode. +
- Fix FOLD rule for string.sub(s, ...) == k. +
- Fix FOLD rule for STRREF of SNEW. +
- Fix frame traversal while searching for error function. +
- Prevent GC estimate miscalculation due to buffer growth. +
- Prevent adding side traces for stack checks. +
- Fix top slot calculation for snapshots with continuations. +
- Fix check for reuse of SCEV results in FORL. +
- Add PS Vita port. +
- Fix compatibility issues with Illumos. +
- Fix DragonFly build (unsupported). +
- OpenBSD/x86: Better executable memory allocation for W^X mode. +
- x86: Fix argument checks for ipairs() iterator. +
- x86: lj_math_random_step() clobbers XMM regs on OSX Clang. +
- x86: Fix code generation for unused result of math.random(). +
- x64: Allow building with LUAJIT_USE_SYSMALLOC and LUAJIT_USE_VALGRIND. +
- x86/x64: Fix argument check for bit shifts. +
- x86/x64: Fix code generation for fused test/arith ops. +
- ARM: Fix write barrier check in BC_USETS. +
- PPC: Fix red zone overflow in machine code generation. +
- PPC: Don't use mcrxr on PPE. +
- Various archs: Fix excess stack growth in interpreter. +
- FFI: Fix FOLD rule for TOBIT + CONV num.u32. +
- FFI: Prevent DSE across ffi.string(). +
- FFI: No meta fallback when indexing pointer to incomplete struct. +
- FFI: Fix initialization of unions of subtypes. +
- FFI: Fix cdata vs. non-cdata arithmetic and comparisons. +
- FFI: Fix __index/__newindex metamethod resolution for ctypes. +
- FFI: Fix compilation of reference field access. +
- FFI: Fix frame traversal for backtraces with FFI callbacks. +
- FFI: Fix recording of indexing a struct pointer ctype object itself. +
- FFI: Allow non-scalar cdata to be compared for equality by address. +
- FFI: Fix pseudo type conversions for type punning. +
LuaJIT 2.0.3 — 2014-03-12
- Add PS4 port. @@ -918,7 +968,7 @@
LuaJIT 1.0.0 — 2005-08-29
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/contact.html b/deps/luajit/doc/contact.html index 0483a829..0ef01a7c 100644 --- a/deps/luajit/doc/contact.html +++ b/deps/luajit/doc/contact.html @@ -4,7 +4,7 @@
Contact
Copyright
All documentation is -Copyright © 2005-2014 Mike Pall. +Copyright © 2005-2015 Mike Pall.
@@ -92,7 +92,7 @@Copyright
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/ext_c_api.html b/deps/luajit/doc/ext_c_api.html index 48503361..65981806 100644 --- a/deps/luajit/doc/ext_c_api.html +++ b/deps/luajit/doc/ext_c_api.html @@ -4,7 +4,7 @@
luaJIT_setmode(L, idx, LUAJIT_MODE_WRAPCFUNC|flag)
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/ext_ffi.html b/deps/luajit/doc/ext_ffi.html
index fa9ca971..77b8e26c 100644
--- a/deps/luajit/doc/ext_ffi.html
+++ b/deps/luajit/doc/ext_ffi.html
@@ -4,7 +4,7 @@
FFI Library
-
+
@@ -320,7 +320,7 @@ Motivating Example: Using C Data Structures
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/ext_ffi_api.html b/deps/luajit/doc/ext_ffi_api.html
index dcffcfa3..8f577e9f 100644
--- a/deps/luajit/doc/ext_ffi_api.html
+++ b/deps/luajit/doc/ext_ffi_api.html
@@ -4,7 +4,7 @@
ffi.* API Functions
-
+
@@ -556,7 +556,7 @@ Extensions to the Lua Parser
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/ext_ffi_semantics.html b/deps/luajit/doc/ext_ffi_semantics.html
index 7e5f7035..c267b555 100644
--- a/deps/luajit/doc/ext_ffi_semantics.html
+++ b/deps/luajit/doc/ext_ffi_semantics.html
@@ -4,7 +4,7 @@
FFI Semantics
-
+
@@ -1235,7 +1235,7 @@ Current Status
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/ext_ffi_tutorial.html b/deps/luajit/doc/ext_ffi_tutorial.html
index 01fb8992..8f99bfb1 100644
--- a/deps/luajit/doc/ext_ffi_tutorial.html
+++ b/deps/luajit/doc/ext_ffi_tutorial.html
@@ -4,7 +4,7 @@
FFI Tutorial
-
+
@@ -564,7 +564,7 @@ To Cache or Not to Cache
individual C functions like this:
-local funca, funcb = ffi.C.funcb, ffi.C.funcb -- Not helpful!
+local funca, funcb = ffi.C.funca, ffi.C.funcb -- Not helpful!
local function foo(x, n)
for i=1,n do funcb(funca(x, i), 1) end
end
@@ -591,7 +591,7 @@ To Cache or Not to Cache
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/ext_jit.html b/deps/luajit/doc/ext_jit.html
index 098be5e0..27351dd6 100644
--- a/deps/luajit/doc/ext_jit.html
+++ b/deps/luajit/doc/ext_jit.html
@@ -4,7 +4,7 @@
jit.* Library
-
+
@@ -151,7 +151,7 @@ jit.os
jit.arch
Contains the target architecture name:
-"x86", "x64" or "ppcspe".
+"x86", "x64", "arm", "ppc", "ppcspe", or "mips".
jit.opt.* — JIT compiler optimization control
@@ -189,7 +189,7 @@ jit.util.* — JIT compiler introspection
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/extensions.html b/deps/luajit/doc/extensions.html
index 20b597f1..e9cd136c 100644
--- a/deps/luajit/doc/extensions.html
+++ b/deps/luajit/doc/extensions.html
@@ -4,7 +4,7 @@
Extensions
-
+
@@ -398,7 +398,7 @@ C++ Exception Interoperability
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/faq.html b/deps/luajit/doc/faq.html
index ffc2ae89..9902f090 100644
--- a/deps/luajit/doc/faq.html
+++ b/deps/luajit/doc/faq.html
@@ -4,7 +4,7 @@
Frequently Asked Questions (FAQ)
-
+
@@ -174,7 +174,7 @@ Frequently Asked Questions (FAQ)
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/install.html b/deps/luajit/doc/install.html
index 2388ff33..7a878b1c 100644
--- a/deps/luajit/doc/install.html
+++ b/deps/luajit/doc/install.html
@@ -4,7 +4,7 @@
Installation
-
+
@@ -127,7 +127,7 @@ Installation
ARMv5+
ARM9E+
GCC 4.2+
-GCC 4.2+
+GCC 4.2+
PSP2 (PS VITA)
GCC 4.2+
@@ -188,8 +188,8 @@ Prerequisites
and change to the newly created directory:
-tar zxf LuaJIT-2.0.3.tar.gz
-cd LuaJIT-2.0.3
+tar zxf LuaJIT-2.0.4.tar.gz
+cd LuaJIT-2.0.4
Building LuaJIT
The supplied Makefiles try to auto-detect the settings needed for your
@@ -458,41 +458,56 @@
Cross-compiling LuaJIT
make HOST_CC="gcc -m32 -arch i386" CROSS=$ISDKP TARGET_FLAGS="$ISDKF" \
TARGET_SYS=iOS
+
+Cross-compiling for consoles
-You can cross-compile for PS3 using the PS3 SDK from
-a Linux host or a Windows host (requires 32 bit MinGW (GCC) on the host,
-too). Due to restrictions on consoles, the JIT compiler is disabled and
-only the fast interpreter is built:
+Building LuaJIT for consoles requires both a supported host compiler
+(x86 or x64) and a cross-compiler (to PPC or ARM) from the official
+console SDK.
-
-make HOST_CC="gcc -m32" CROSS=ppu-lv2-
-
-You can cross-compile for PS4 from a Windows host using
-the PS4 SDK (ORBIS) plus 64 bit MSVC. Due to restrictions on
-consoles, the JIT compiler is disabled and only the fast interpreter
-is built.
+Due to restrictions on consoles, the JIT compiler is disabled and only
+the fast interpreter is built. This is still faster than plain Lua,
+but much slower than the JIT compiler. The FFI is disabled, too, since
+it's not very useful in such an environment.
-Open a "Visual Studio .NET Command Prompt" (64 bit host compiler),
-cd to the directory where you've unpacked the sources and run
-the following commands. This builds a static library libluajit.a,
+The following commands build a static library libluajit.a,
which can be linked against your game, just like the Lua library.
+
+To cross-compile for PS3 from a Linux host (requires
+32 bit GCC, i.e. multilib Linux/x64) or a Windows host (requires
+32 bit MinGW), run this command:
+
+
+make HOST_CC="gcc -m32" CROSS=ppu-lv2-
+
+
+To cross-compile for PS4 from a Windows host,
+open a "Visual Studio .NET Command Prompt" (64 bit host compiler),
+cd to the directory where you've unpacked the sources and
+run the following commands:
+
cd src
ps4build
-You can cross-compile for Xbox 360 using the
-Xbox 360 SDK (MSVC + XEDK). Due to restrictions on consoles, the
-JIT compiler is disabled and only the fast interpreter is built.
+To cross-compile for PS Vita from a Windows host,
+open a "Visual Studio .NET Command Prompt" (32 bit host compiler),
+cd to the directory where you've unpacked the sources and
+run the following commands:
+
+cd src
+psvitabuild
+
-Open a "Visual Studio .NET Command Prompt" (32 bit host compiler),
+To cross-compile for Xbox 360 from a Windows host,
+open a "Visual Studio .NET Command Prompt" (32 bit host compiler),
cd to the directory where you've unpacked the sources and run
-the following commands. This builds a static library luajit20.lib,
-which can be linked against your game, just like the Lua library.
+the following commands:
cd src
@@ -621,7 +636,7 @@ Hints for Distribution Maintainers
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/luajit.html b/deps/luajit/doc/luajit.html
index 43af69c9..45507c12 100644
--- a/deps/luajit/doc/luajit.html
+++ b/deps/luajit/doc/luajit.html
@@ -4,7 +4,7 @@
LuaJIT
-
+
@@ -38,6 +38,9 @@
table.os2 td {
color: #ffa040;
}
+table.os3 td {
+ color: #40ffff;
+}
table.compiler td {
color: #2080ff;
background: #62bf41;
@@ -147,7 +150,7 @@ LuaJIT
It may be embedded or used as a general-purpose, stand-alone language.
-LuaJIT is Copyright © 2005-2014 Mike Pall, released under the
+LuaJIT is Copyright © 2005-2015 Mike Pall, released under the
» MIT open source license.
@@ -158,7 +161,10 @@
Compatibility
Windows Linux BSD OSX POSIX
-Embedded Android iOS PS3 PS4 Xbox 360 Embedded Android iOS
+
+PS3 PS4 PS Vita Xbox 360
GCC CLANG
LLVM MSVC More ...
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/running.html b/deps/luajit/doc/running.html
index c01c52d5..c6e1c296 100644
--- a/deps/luajit/doc/running.html
+++ b/deps/luajit/doc/running.html
@@ -4,7 +4,7 @@
Running LuaJIT
-
+
@@ -186,7 +186,7 @@ -j cmd[=arg[,arg...]]
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.3/jit on POSIX
+this is /usr/local/share/luajit-2.0.4/jit on POSIX
systems.
@@ -296,7 +296,7 @@ -O[level]
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/doc/status.html b/deps/luajit/doc/status.html
index ddcaed33..b4bbec79 100644
--- a/deps/luajit/doc/status.html
+++ b/deps/luajit/doc/status.html
@@ -1,10 +1,10 @@
-Status & Roadmap
+Status
-
+
@@ -17,7 +17,7 @@
LuaJIT
-Status & Roadmap
+Status
-
@@ -102,20 +102,11 @@
Current Status
garbage collector.
-
-Roadmap
-
-Please refer to the
-» LuaJIT Roadmap 2012/2013 and an
-» update on release planning for details.
-
-
-
-Copyright © 2005-2014 Mike Pall
+Copyright © 2005-2015 Mike Pall
·
Contact
diff --git a/deps/luajit/dynasm/dasm_arm.h b/deps/luajit/dynasm/dasm_arm.h
index 435bbf5e..57e0116f 100644
--- a/deps/luajit/dynasm/dasm_arm.h
+++ b/deps/luajit/dynasm/dasm_arm.h
@@ -1,6 +1,6 @@
/*
** DynASM ARM encoding engine.
-** Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
** Released under the MIT license. See dynasm.lua for full copyright notice.
*/
diff --git a/deps/luajit/dynasm/dasm_arm.lua b/deps/luajit/dynasm/dasm_arm.lua
index b3a8827e..90a259c5 100644
--- a/deps/luajit/dynasm/dasm_arm.lua
+++ b/deps/luajit/dynasm/dasm_arm.lua
@@ -1,7 +1,7 @@
------------------------------------------------------------------------------
-- DynASM ARM module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- See dynasm.lua for full copyright notice.
------------------------------------------------------------------------------
@@ -923,19 +923,22 @@ local function parse_template(params, template, nparams, pos)
end
map_op[".template__"] = function(params, template, nparams)
- if not params then return sub(template, 9) end
+ if not params then return template:gsub("%x%x%x%x%x%x%x%x", "") end
-- Limit number of section buffer positions used by a single dasm_put().
-- A single opcode needs a maximum of 3 positions.
if secpos+3 > maxsecpos then wflush() end
local pos = wpos()
- local apos, spos = #actargs, secpos
+ local lpos, apos, spos = #actlist, #actargs, secpos
local ok, err
for t in gmatch(template, "[^|]+") do
ok, err = pcall(parse_template, params, t, nparams, pos)
if ok then return end
secpos = spos
+ actlist[lpos+1] = nil
+ actlist[lpos+2] = nil
+ actlist[lpos+3] = nil
actargs[apos+1] = nil
actargs[apos+2] = nil
actargs[apos+3] = nil
diff --git a/deps/luajit/dynasm/dasm_mips.h b/deps/luajit/dynasm/dasm_mips.h
index 43595889..2f4c2d22 100644
--- a/deps/luajit/dynasm/dasm_mips.h
+++ b/deps/luajit/dynasm/dasm_mips.h
@@ -1,6 +1,6 @@
/*
** DynASM MIPS encoding engine.
-** Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
** Released under the MIT license. See dynasm.lua for full copyright notice.
*/
diff --git a/deps/luajit/dynasm/dasm_mips.lua b/deps/luajit/dynasm/dasm_mips.lua
index 82942cbb..ae0dbd7a 100644
--- a/deps/luajit/dynasm/dasm_mips.lua
+++ b/deps/luajit/dynasm/dasm_mips.lua
@@ -1,7 +1,7 @@
------------------------------------------------------------------------------
-- DynASM MIPS module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- See dynasm.lua for full copyright notice.
------------------------------------------------------------------------------
diff --git a/deps/luajit/dynasm/dasm_ppc.h b/deps/luajit/dynasm/dasm_ppc.h
index 5ccff250..7df49365 100644
--- a/deps/luajit/dynasm/dasm_ppc.h
+++ b/deps/luajit/dynasm/dasm_ppc.h
@@ -1,6 +1,6 @@
/*
** DynASM PPC encoding engine.
-** Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
** Released under the MIT license. See dynasm.lua for full copyright notice.
*/
diff --git a/deps/luajit/dynasm/dasm_ppc.lua b/deps/luajit/dynasm/dasm_ppc.lua
index 61da50ef..91f4ff9a 100644
--- a/deps/luajit/dynasm/dasm_ppc.lua
+++ b/deps/luajit/dynasm/dasm_ppc.lua
@@ -1,7 +1,7 @@
------------------------------------------------------------------------------
-- DynASM PPC module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- See dynasm.lua for full copyright notice.
------------------------------------------------------------------------------
diff --git a/deps/luajit/dynasm/dasm_proto.h b/deps/luajit/dynasm/dasm_proto.h
index e77bb844..a8bc6fd2 100644
--- a/deps/luajit/dynasm/dasm_proto.h
+++ b/deps/luajit/dynasm/dasm_proto.h
@@ -1,6 +1,6 @@
/*
** DynASM encoding engine prototypes.
-** Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
** Released under the MIT license. See dynasm.lua for full copyright notice.
*/
diff --git a/deps/luajit/dynasm/dasm_x64.lua b/deps/luajit/dynasm/dasm_x64.lua
index 91d676d1..b1b62022 100644
--- a/deps/luajit/dynasm/dasm_x64.lua
+++ b/deps/luajit/dynasm/dasm_x64.lua
@@ -1,7 +1,7 @@
------------------------------------------------------------------------------
-- DynASM x64 module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- See dynasm.lua for full copyright notice.
------------------------------------------------------------------------------
-- This module just sets 64 bit mode for the combined x86/x64 module.
diff --git a/deps/luajit/dynasm/dasm_x86.h b/deps/luajit/dynasm/dasm_x86.h
index 97cbbea8..652e8c99 100644
--- a/deps/luajit/dynasm/dasm_x86.h
+++ b/deps/luajit/dynasm/dasm_x86.h
@@ -1,6 +1,6 @@
/*
** DynASM x86 encoding engine.
-** Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
** Released under the MIT license. See dynasm.lua for full copyright notice.
*/
diff --git a/deps/luajit/dynasm/dasm_x86.lua b/deps/luajit/dynasm/dasm_x86.lua
index f3859e3e..7ca061d2 100644
--- a/deps/luajit/dynasm/dasm_x86.lua
+++ b/deps/luajit/dynasm/dasm_x86.lua
@@ -1,7 +1,7 @@
------------------------------------------------------------------------------
-- DynASM x86/x64 module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- See dynasm.lua for full copyright notice.
------------------------------------------------------------------------------
@@ -1081,6 +1081,9 @@ local map_op = {
btr_2 = "mrqdw:0FB3Rm|miqdw:0FBA6mU",
bts_2 = "mrqdw:0FABRm|miqdw:0FBA5mU",
+ shld_3 = "mriqdw:0FA4RmU|mrCqdw:0FA5Rm",
+ shrd_3 = "mriqdw:0FACRmU|mrCqdw:0FADRm",
+
rdtsc_0 = "0F31", -- P1+
cpuid_0 = "0FA2", -- P1+
@@ -1114,6 +1117,9 @@ local map_op = {
fucompp_0 = "DAE9",
fcompp_0 = "DED9",
+ fldenv_1 = "x.:D94m",
+ fnstenv_1 = "x.:D96m",
+ fstenv_1 = "x.:9BD96m",
fldcw_1 = "xw:nD95m",
fstcw_1 = "xw:n9BD97m",
fnstcw_1 = "xw:nD97m",
@@ -1189,6 +1195,8 @@ local map_op = {
cvttps2dq_2 = "rmo:F30F5BrM",
cvttsd2si_2 = "rr/do:F20F2CrM|rr/qo:|rx/dq:|rxq:",
cvttss2si_2 = "rr/do:F30F2CrM|rr/qo:|rxd:|rx/qd:",
+ fxsave_1 = "x.:0FAE0m",
+ fxrstor_1 = "x.:0FAE1m",
ldmxcsr_1 = "xd:0FAE2m",
lfence_0 = "0FAEE8",
maskmovdqu_2 = "rro:660FF7rM",
diff --git a/deps/luajit/dynasm/dynasm.lua b/deps/luajit/dynasm/dynasm.lua
index 0ea8697c..fffda751 100644
--- a/deps/luajit/dynasm/dynasm.lua
+++ b/deps/luajit/dynasm/dynasm.lua
@@ -2,7 +2,7 @@
-- DynASM. A dynamic assembler for code generation engines.
-- Originally designed and implemented for LuaJIT.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- See below for full copyright notice.
------------------------------------------------------------------------------
@@ -17,7 +17,7 @@ local _info = {
url = "http://luajit.org/dynasm.html",
license = "MIT",
copyright = [[
-Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+Copyright (C) 2005-2015 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
diff --git a/deps/luajit/etc/luajit.1 b/deps/luajit/etc/luajit.1
index 723a708c..fd38b0a9 100644
--- a/deps/luajit/etc/luajit.1
+++ b/deps/luajit/etc/luajit.1
@@ -74,7 +74,7 @@ luajit \-jv \-e "for i=1,10 do for j=1,10 do for k=1,100 do end end end"
Runs some nested loops and shows the resulting traces.
.SH COPYRIGHT
.PP
-\fBLuaJIT\fR is Copyright \(co 2005-2014 Mike Pall.
+\fBLuaJIT\fR is Copyright \(co 2005-2015 Mike Pall.
.br
\fBLuaJIT\fR is open source software, released under the MIT license.
.SH SEE ALSO
diff --git a/deps/luajit/etc/luajit.pc b/deps/luajit/etc/luajit.pc
index d3f0cf30..a652b40d 100644
--- a/deps/luajit/etc/luajit.pc
+++ b/deps/luajit/etc/luajit.pc
@@ -1,7 +1,7 @@
# Package information for LuaJIT to be used by pkg-config.
majver=2
minver=0
-relver=3
+relver=4
version=${majver}.${minver}.${relver}
abiver=5.1
diff --git a/deps/luajit/src/Makefile b/deps/luajit/src/Makefile
index 9551781a..1d38fa25 100644
--- a/deps/luajit/src/Makefile
+++ b/deps/luajit/src/Makefile
@@ -7,12 +7,12 @@
# Also works with MinGW and Cygwin on Windows.
# Please check msvcbuild.bat for building with MSVC on Windows.
#
-# Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+# Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
##############################################################################
MAJVER= 2
MINVER= 0
-RELVER= 3
+RELVER= 4
ABIVER= 5.1
NODOTABIVER= 51
@@ -122,8 +122,10 @@ XCFLAGS=
#
# Use the system provided memory allocator (realloc) instead of the
# bundled memory allocator. This is slower, but sometimes helpful for
-# debugging. It's helpful for Valgrind's memcheck tool, too. This option
-# cannot be enabled on x64, since the built-in allocator is mandatory.
+# debugging. This option cannot be enabled on x64, since realloc usually
+# doesn't return addresses in the right address range.
+# OTOH this option is mandatory for Valgrind's memcheck tool on x64 and
+# the only way to get useful results from it for all other architectures.
#XCFLAGS+= -DLUAJIT_USE_SYSMALLOC
#
# This define is required to run LuaJIT under Valgrind. The Valgrind
@@ -288,15 +290,15 @@ ifeq (Windows,$(TARGET_SYS))
TARGET_XSHLDFLAGS= -shared
TARGET_DYNXLDOPTS=
else
+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
ifeq (Darwin,$(TARGET_SYS))
ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
export MACOSX_DEPLOYMENT_TARGET=10.4
endif
TARGET_STRIP+= -x
TARGET_AR+= 2>/dev/null
- 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)
@@ -308,14 +310,10 @@ else
ifeq (iOS,$(TARGET_SYS))
TARGET_STRIP+= -x
TARGET_AR+= 2>/dev/null
- TARGET_XCFLAGS+= -fno-stack-protector
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)
else
- ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs)))
- TARGET_XCFLAGS+= -fno-stack-protector
- endif
ifneq (SunOS,$(TARGET_SYS))
ifneq (PS3,$(TARGET_SYS))
TARGET_XLDFLAGS+= -Wl,-E
diff --git a/deps/luajit/src/Makefile.dep b/deps/luajit/src/Makefile.dep
index 8ca33151..9e14d617 100644
--- a/deps/luajit/src/Makefile.dep
+++ b/deps/luajit/src/Makefile.dep
@@ -90,7 +90,7 @@ lj_ctype.o: lj_ctype.c lj_obj.h lua.h luaconf.h lj_def.h lj_arch.h \
lj_gc.h lj_err.h lj_errmsg.h lj_str.h lj_tab.h lj_ctype.h lj_ccallback.h
lj_debug.o: lj_debug.c lj_obj.h lua.h luaconf.h lj_def.h lj_arch.h \
lj_err.h lj_errmsg.h lj_debug.h lj_str.h lj_tab.h lj_state.h lj_frame.h \
- lj_bc.h lj_jit.h lj_ir.h
+ lj_bc.h lj_vm.h lj_jit.h lj_ir.h
lj_dispatch.o: lj_dispatch.c lj_obj.h lua.h luaconf.h lj_def.h lj_arch.h \
lj_err.h lj_errmsg.h lj_func.h lj_str.h lj_tab.h lj_meta.h lj_debug.h \
lj_state.h lj_frame.h lj_bc.h lj_ff.h lj_ffdef.h lj_jit.h lj_ir.h \
diff --git a/deps/luajit/src/host/buildvm.c b/deps/luajit/src/host/buildvm.c
index 7687ad7a..07122a64 100644
--- a/deps/luajit/src/host/buildvm.c
+++ b/deps/luajit/src/host/buildvm.c
@@ -1,6 +1,6 @@
/*
** LuaJIT VM builder.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** This is a tool to build the hand-tuned assembler code required for
** LuaJIT's bytecode interpreter. It supports a variety of output formats
diff --git a/deps/luajit/src/host/buildvm.h b/deps/luajit/src/host/buildvm.h
index f9dc8c4f..b2621850 100644
--- a/deps/luajit/src/host/buildvm.h
+++ b/deps/luajit/src/host/buildvm.h
@@ -1,6 +1,6 @@
/*
** LuaJIT VM builder.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _BUILDVM_H
diff --git a/deps/luajit/src/host/buildvm_asm.c b/deps/luajit/src/host/buildvm_asm.c
index 9b28b3b3..2c9a2d48 100644
--- a/deps/luajit/src/host/buildvm_asm.c
+++ b/deps/luajit/src/host/buildvm_asm.c
@@ -1,6 +1,6 @@
/*
** LuaJIT VM builder: Assembler source code emitter.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "buildvm.h"
@@ -286,7 +286,7 @@ void emit_asm(BuildCtx *ctx)
fprintf(ctx->fp, "\n");
switch (ctx->mode) {
case BUILD_elfasm:
-#if !LJ_TARGET_PS3
+#if !(LJ_TARGET_PS3 || LJ_TARGET_PSVITA)
fprintf(ctx->fp, "\t.section .note.GNU-stack,\"\"," ELFASM_PX "progbits\n");
#endif
#if LJ_TARGET_PPCSPE
diff --git a/deps/luajit/src/host/buildvm_fold.c b/deps/luajit/src/host/buildvm_fold.c
index 7f5d9f2f..daed7ecc 100644
--- a/deps/luajit/src/host/buildvm_fold.c
+++ b/deps/luajit/src/host/buildvm_fold.c
@@ -1,6 +1,6 @@
/*
** LuaJIT VM builder: IR folding hash table generator.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "buildvm.h"
diff --git a/deps/luajit/src/host/buildvm_lib.c b/deps/luajit/src/host/buildvm_lib.c
index eafdab98..c37301d4 100644
--- a/deps/luajit/src/host/buildvm_lib.c
+++ b/deps/luajit/src/host/buildvm_lib.c
@@ -1,6 +1,6 @@
/*
** LuaJIT VM builder: library definition compiler.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "buildvm.h"
diff --git a/deps/luajit/src/host/buildvm_peobj.c b/deps/luajit/src/host/buildvm_peobj.c
index 138b0423..4279f500 100644
--- a/deps/luajit/src/host/buildvm_peobj.c
+++ b/deps/luajit/src/host/buildvm_peobj.c
@@ -1,6 +1,6 @@
/*
** LuaJIT VM builder: PE object emitter.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Only used for building on Windows, since we cannot assume the presence
** of a suitable assembler. The host and target byte order must match.
diff --git a/deps/luajit/src/host/genminilua.lua b/deps/luajit/src/host/genminilua.lua
index 04c55188..cd0d9466 100644
--- a/deps/luajit/src/host/genminilua.lua
+++ b/deps/luajit/src/host/genminilua.lua
@@ -2,7 +2,7 @@
-- Lua script to generate a customized, minified version of Lua.
-- The resulting 'minilua' is used for the build process of LuaJIT.
----------------------------------------------------------------------------
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- Released under the MIT license. See Copyright Notice in luajit.h
----------------------------------------------------------------------------
diff --git a/deps/luajit/src/jit/bc.lua b/deps/luajit/src/jit/bc.lua
index 9df19c7b..46a40892 100644
--- a/deps/luajit/src/jit/bc.lua
+++ b/deps/luajit/src/jit/bc.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT bytecode listing module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 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 == 20003, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20004, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local bit = require("bit")
diff --git a/deps/luajit/src/jit/bcsave.lua b/deps/luajit/src/jit/bcsave.lua
index f55bda97..0319b3d2 100644
--- a/deps/luajit/src/jit/bcsave.lua
+++ b/deps/luajit/src/jit/bcsave.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT module to save/list bytecode.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 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 == 20003, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20004, "LuaJIT core/library version mismatch")
local bit = require("bit")
-- Symbol name prefix for LuaJIT bytecode.
@@ -69,7 +69,7 @@ local map_arch = {
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)
diff --git a/deps/luajit/src/jit/dis_arm.lua b/deps/luajit/src/jit/dis_arm.lua
index b3d0ebc2..59be715a 100644
--- a/deps/luajit/src/jit/dis_arm.lua
+++ b/deps/luajit/src/jit/dis_arm.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT ARM disassembler module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 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.
diff --git a/deps/luajit/src/jit/dis_mips.lua b/deps/luajit/src/jit/dis_mips.lua
index 47a7a83b..acdd2be1 100644
--- a/deps/luajit/src/jit/dis_mips.lua
+++ b/deps/luajit/src/jit/dis_mips.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT MIPS disassembler module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 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.
diff --git a/deps/luajit/src/jit/dis_mipsel.lua b/deps/luajit/src/jit/dis_mipsel.lua
index d19de319..dd9d26ae 100644
--- a/deps/luajit/src/jit/dis_mipsel.lua
+++ b/deps/luajit/src/jit/dis_mipsel.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT MIPSEL disassembler wrapper module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 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
diff --git a/deps/luajit/src/jit/dis_ppc.lua b/deps/luajit/src/jit/dis_ppc.lua
index cfaf982f..d05c4311 100644
--- a/deps/luajit/src/jit/dis_ppc.lua
+++ b/deps/luajit/src/jit/dis_ppc.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT PPC disassembler module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 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.
diff --git a/deps/luajit/src/jit/dis_x64.lua b/deps/luajit/src/jit/dis_x64.lua
index 4f491695..a80981bd 100644
--- a/deps/luajit/src/jit/dis_x64.lua
+++ b/deps/luajit/src/jit/dis_x64.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT x64 disassembler wrapper module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- Released under the MIT license. See Copyright Notice in luajit.h
----------------------------------------------------------------------------
-- This module just exports the 64 bit functions from the combined
diff --git a/deps/luajit/src/jit/dis_x86.lua b/deps/luajit/src/jit/dis_x86.lua
index 0b865ab6..078d6094 100644
--- a/deps/luajit/src/jit/dis_x86.lua
+++ b/deps/luajit/src/jit/dis_x86.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT x86/x64 disassembler module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 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.
diff --git a/deps/luajit/src/jit/dump.lua b/deps/luajit/src/jit/dump.lua
index 556ce883..d15c528e 100644
--- a/deps/luajit/src/jit/dump.lua
+++ b/deps/luajit/src/jit/dump.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- LuaJIT compiler dump module.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- Released under the MIT license. See Copyright Notice in luajit.h
----------------------------------------------------------------------------
--
@@ -55,7 +55,7 @@
-- Cache some library functions and objects.
local jit = require("jit")
-assert(jit.version_num == 20003, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20004, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc
diff --git a/deps/luajit/src/jit/v.lua b/deps/luajit/src/jit/v.lua
index 197e67c6..32666fd1 100644
--- a/deps/luajit/src/jit/v.lua
+++ b/deps/luajit/src/jit/v.lua
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
-- Verbose mode of the LuaJIT compiler.
--
--- Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
-- Released under the MIT license. See Copyright Notice in luajit.h
----------------------------------------------------------------------------
--
@@ -59,7 +59,7 @@
-- Cache some library functions and objects.
local jit = require("jit")
-assert(jit.version_num == 20003, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20004, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo
diff --git a/deps/luajit/src/lib_aux.c b/deps/luajit/src/lib_aux.c
index 1b01fe07..4a1b70dd 100644
--- a/deps/luajit/src/lib_aux.c
+++ b/deps/luajit/src/lib_aux.c
@@ -1,6 +1,6 @@
/*
** Auxiliary library for the Lua/C API.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major parts taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
@@ -302,7 +302,7 @@ static int panic(lua_State *L)
#ifdef LUAJIT_USE_SYSMALLOC
-#if LJ_64
+#if LJ_64 && !defined(LUAJIT_USE_VALGRIND)
#error "Must use builtin allocator for 64 bit target"
#endif
diff --git a/deps/luajit/src/lib_base.c b/deps/luajit/src/lib_base.c
index 30e88f19..17b9525d 100644
--- a/deps/luajit/src/lib_base.c
+++ b/deps/luajit/src/lib_base.c
@@ -1,6 +1,6 @@
/*
** Base and coroutine library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2011 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lib_bit.c b/deps/luajit/src/lib_bit.c
index 739924b0..583e04b0 100644
--- a/deps/luajit/src/lib_bit.c
+++ b/deps/luajit/src/lib_bit.c
@@ -1,6 +1,6 @@
/*
** Bit manipulation library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lib_bit_c
diff --git a/deps/luajit/src/lib_debug.c b/deps/luajit/src/lib_debug.c
index 97f032f1..e87c35cf 100644
--- a/deps/luajit/src/lib_debug.c
+++ b/deps/luajit/src/lib_debug.c
@@ -1,6 +1,6 @@
/*
** Debug library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lib_ffi.c b/deps/luajit/src/lib_ffi.c
index e789ad6c..f6df39d6 100644
--- a/deps/luajit/src/lib_ffi.c
+++ b/deps/luajit/src/lib_ffi.c
@@ -1,6 +1,6 @@
/*
** FFI library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lib_ffi_c
@@ -136,6 +136,7 @@ static int ffi_index_meta(lua_State *L, CTState *cts, CType *ct, MMS mm)
return 0;
}
}
+ copyTV(L, base, L->top);
tv = L->top-1;
}
return lj_meta_tailcall(L, tv);
diff --git a/deps/luajit/src/lib_init.c b/deps/luajit/src/lib_init.c
index a729d125..85c194af 100644
--- a/deps/luajit/src/lib_init.c
+++ b/deps/luajit/src/lib_init.c
@@ -1,6 +1,6 @@
/*
** Library initialization.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major parts taken verbatim from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lib_io.c b/deps/luajit/src/lib_io.c
index 04f0f739..037aa28e 100644
--- a/deps/luajit/src/lib_io.c
+++ b/deps/luajit/src/lib_io.c
@@ -1,6 +1,6 @@
/*
** I/O library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2011 Lua.org, PUC-Rio. See Copyright Notice in lua.h
@@ -426,7 +426,7 @@ LJLIB_CF(io_popen)
LJLIB_CF(io_tmpfile)
{
IOFileUD *iof = io_file_new(L);
-#if LJ_TARGET_PS3 || LJ_TARGET_PS4
+#if LJ_TARGET_PS3 || LJ_TARGET_PS4 || LJ_TARGET_PSVITA
iof->fp = NULL; errno = ENOSYS;
#else
iof->fp = tmpfile();
diff --git a/deps/luajit/src/lib_jit.c b/deps/luajit/src/lib_jit.c
index 0fadf8b9..96525faf 100644
--- a/deps/luajit/src/lib_jit.c
+++ b/deps/luajit/src/lib_jit.c
@@ -1,6 +1,6 @@
/*
** JIT library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lib_jit_c
diff --git a/deps/luajit/src/lib_math.c b/deps/luajit/src/lib_math.c
index 3aa5c6b0..40f29142 100644
--- a/deps/luajit/src/lib_math.c
+++ b/deps/luajit/src/lib_math.c
@@ -1,6 +1,6 @@
/*
** Math library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include
diff --git a/deps/luajit/src/lib_os.c b/deps/luajit/src/lib_os.c
index f62e8c8b..bb5a141e 100644
--- a/deps/luajit/src/lib_os.c
+++ b/deps/luajit/src/lib_os.c
@@ -1,13 +1,12 @@
/*
** OS library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
*/
#include
-#include
#include
#define lib_os_c
@@ -27,6 +26,10 @@
#include
#endif
+#if !LJ_TARGET_PSVITA
+#include
+#endif
+
/* ------------------------------------------------------------------------ */
#define LJLIB_MODULE_os
@@ -70,7 +73,7 @@ LJLIB_CF(os_rename)
LJLIB_CF(os_tmpname)
{
-#if LJ_TARGET_PS3 || LJ_TARGET_PS4
+#if LJ_TARGET_PS3 || LJ_TARGET_PS4 || LJ_TARGET_PSVITA
lj_err_caller(L, LJ_ERR_OSUNIQF);
return 0;
#else
@@ -254,6 +257,9 @@ LJLIB_CF(os_difftime)
LJLIB_CF(os_setlocale)
{
+#if LJ_TARGET_PSVITA
+ lua_pushliteral(L, "C");
+#else
GCstr *s = lj_lib_optstr(L, 1);
const char *str = s ? strdata(s) : NULL;
int opt = lj_lib_checkopt(L, 2, 6,
@@ -265,6 +271,7 @@ LJLIB_CF(os_setlocale)
else if (opt == 4) opt = LC_MONETARY;
else if (opt == 6) opt = LC_ALL;
lua_pushstring(L, setlocale(opt, str));
+#endif
return 1;
}
diff --git a/deps/luajit/src/lib_package.c b/deps/luajit/src/lib_package.c
index e3410390..ac38c815 100644
--- a/deps/luajit/src/lib_package.c
+++ b/deps/luajit/src/lib_package.c
@@ -1,6 +1,6 @@
/*
** Package library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2012 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lib_string.c b/deps/luajit/src/lib_string.c
index 9ec6d0c3..c6168edb 100644
--- a/deps/luajit/src/lib_string.c
+++ b/deps/luajit/src/lib_string.c
@@ -1,6 +1,6 @@
/*
** String library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lib_table.c b/deps/luajit/src/lib_table.c
index e0e8302f..fbfe8638 100644
--- a/deps/luajit/src/lib_table.c
+++ b/deps/luajit/src/lib_table.c
@@ -1,6 +1,6 @@
/*
** Table library.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lj_alloc.c b/deps/luajit/src/lj_alloc.c
index f856a7a0..7c7ec678 100644
--- a/deps/luajit/src/lj_alloc.c
+++ b/deps/luajit/src/lj_alloc.c
@@ -179,23 +179,29 @@ static LJ_AINLINE int CALL_MUNMAP(void *ptr, size_t size)
#if defined(MAP_32BIT)
+#if defined(__sun__)
+#define MMAP_REGION_START ((uintptr_t)0x1000)
+#else
/* Actually this only gives us max. 1GB in current Linux kernels. */
+#define MMAP_REGION_START ((uintptr_t)0)
+#endif
+
static LJ_AINLINE void *CALL_MMAP(size_t size)
{
int olderr = errno;
- void *ptr = mmap(NULL, size, MMAP_PROT, MAP_32BIT|MMAP_FLAGS, -1, 0);
+ void *ptr = mmap((void *)MMAP_REGION_START, size, MMAP_PROT, MAP_32BIT|MMAP_FLAGS, -1, 0);
errno = olderr;
return ptr;
}
-#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun__)
+#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__)
/* OSX and FreeBSD mmap() use a naive first-fit linear search.
** That's perfect for us. Except that -pagezero_size must be set for OSX,
** otherwise the lower 4GB are blocked. And the 32GB RLIMIT_DATA needs
** to be reduced to 250MB on FreeBSD.
*/
-#if LJ_TARGET_OSX
+#if LJ_TARGET_OSX || defined(__DragonFly__)
#define MMAP_REGION_START ((uintptr_t)0x10000)
#elif LJ_TARGET_PS4
#define MMAP_REGION_START ((uintptr_t)0x4000)
@@ -232,7 +238,7 @@ static LJ_AINLINE void *CALL_MMAP(size_t size)
return p;
}
if (p != CMFAIL) munmap(p, size);
-#ifdef __sun__
+#if defined(__sun__) || defined(__DragonFly__)
alloc_hint += 0x1000000; /* Need near-exhaustive linear scan. */
if (alloc_hint + size < MMAP_REGION_END) continue;
#endif
diff --git a/deps/luajit/src/lj_api.c b/deps/luajit/src/lj_api.c
index bc5290b2..3bedb39f 100644
--- a/deps/luajit/src/lj_api.c
+++ b/deps/luajit/src/lj_api.c
@@ -1,6 +1,6 @@
/*
** Public Lua/C API.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lj_arch.h b/deps/luajit/src/lj_arch.h
index 0196eedc..d3a9d57d 100644
--- a/deps/luajit/src/lj_arch.h
+++ b/deps/luajit/src/lj_arch.h
@@ -1,6 +1,6 @@
/*
** Target architecture selection.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_ARCH_H
@@ -67,7 +67,8 @@
#elif defined(__MACH__) && defined(__APPLE__)
#define LUAJIT_OS LUAJIT_OS_OSX
#elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
- defined(__NetBSD__) || defined(__OpenBSD__)) && !defined(__ORBIS__)
+ defined(__NetBSD__) || defined(__OpenBSD__) || \
+ defined(__DragonFly__)) && !defined(__ORBIS__)
#define LUAJIT_OS LUAJIT_OS_BSD
#elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__)
#define LUAJIT_OS LUAJIT_OS_POSIX
@@ -111,6 +112,11 @@
#define NULL ((void*)0)
#endif
+#ifdef __psp2__
+#define LJ_TARGET_PSVITA 1
+#define LJ_TARGET_CONSOLE 1
+#endif
+
#if _XBOX_VER >= 200
#define LJ_TARGET_XBOX360 1
#define LJ_TARGET_CONSOLE 1
@@ -175,7 +181,9 @@
#define LJ_TARGET_UNIFYROT 2 /* Want only IR_BROR. */
#define LJ_ARCH_NUMMODE LJ_NUMMODE_DUAL
-#if __ARM_ARCH_7__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH_7S__
+#if __ARM_ARCH____ARM_ARCH_8__ || __ARM_ARCH_8A__
+#define LJ_ARCH_VERSION 80
+#elif __ARM_ARCH_7__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH_7S__ || __ARM_ARCH_7VE__
#define LJ_ARCH_VERSION 70
#elif __ARM_ARCH_6T2__
#define LJ_ARCH_VERSION 61
@@ -334,6 +342,9 @@
#if defined(__mips_soft_float)
#error "No support for MIPS CPUs without FPU"
#endif
+#if defined(_LP64)
+#error "No support for MIPS64"
+#endif
#endif
#endif
diff --git a/deps/luajit/src/lj_asm.c b/deps/luajit/src/lj_asm.c
index 264649ae..804b4dc8 100644
--- a/deps/luajit/src/lj_asm.c
+++ b/deps/luajit/src/lj_asm.c
@@ -1,6 +1,6 @@
/*
** IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_asm_c
@@ -353,6 +353,7 @@ static Reg ra_rematk(ASMState *as, IRRef ref)
static int32_t ra_spill(ASMState *as, IRIns *ir)
{
int32_t slot = ir->s;
+ lua_assert(ir >= as->ir + REF_TRUE);
if (!ra_hasspill(slot)) {
if (irt_is64(ir->t)) {
slot = as->evenspill;
@@ -1372,6 +1373,11 @@ static void asm_head_side(ASMState *as)
int pass3 = 0;
IRRef i;
+ if (as->snapno && as->topslot > as->parent->topslot) {
+ /* Force snap #0 alloc to prevent register overwrite in stack check. */
+ as->snapno = 0;
+ asm_snap_alloc(as);
+ }
allow = asm_head_side_base(as, irp, allow);
/* Scan all parent SLOADs and collect register dependencies. */
diff --git a/deps/luajit/src/lj_asm.h b/deps/luajit/src/lj_asm.h
index f5d0159b..85f29763 100644
--- a/deps/luajit/src/lj_asm.h
+++ b/deps/luajit/src/lj_asm.h
@@ -1,6 +1,6 @@
/*
** IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_ASM_H
diff --git a/deps/luajit/src/lj_asm_arm.h b/deps/luajit/src/lj_asm_arm.h
index 72f205d9..9e4cf436 100644
--- a/deps/luajit/src/lj_asm_arm.h
+++ b/deps/luajit/src/lj_asm_arm.h
@@ -1,6 +1,6 @@
/*
** ARM IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* -- Register allocator extensions --------------------------------------- */
diff --git a/deps/luajit/src/lj_asm_mips.h b/deps/luajit/src/lj_asm_mips.h
index e5c67b53..78bd26d5 100644
--- a/deps/luajit/src/lj_asm_mips.h
+++ b/deps/luajit/src/lj_asm_mips.h
@@ -1,6 +1,6 @@
/*
** MIPS IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* -- Register allocator extensions --------------------------------------- */
diff --git a/deps/luajit/src/lj_asm_ppc.h b/deps/luajit/src/lj_asm_ppc.h
index e1a496a7..2c5d74a8 100644
--- a/deps/luajit/src/lj_asm_ppc.h
+++ b/deps/luajit/src/lj_asm_ppc.h
@@ -1,6 +1,6 @@
/*
** PPC IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* -- Register allocator extensions --------------------------------------- */
@@ -49,6 +49,8 @@ static void asm_exitstub_setup(ASMState *as, ExitNo nexits)
{
ExitNo i;
MCode *mxp = as->mctop;
+ if (mxp - (nexits + 3 + MCLIM_REDZONE) < as->mclim)
+ asm_mclimit(as);
/* 1: mflr r0; bl ->vm_exit_handler; li r0, traceno; bl <1; bl <1; ... */
for (i = nexits-1; (int32_t)i >= 0; i--)
*--mxp = PPCI_BL|(((-3-i)&0x00ffffffu)<<2);
diff --git a/deps/luajit/src/lj_asm_x86.h b/deps/luajit/src/lj_asm_x86.h
index fda911e5..0b6b2d4a 100644
--- a/deps/luajit/src/lj_asm_x86.h
+++ b/deps/luajit/src/lj_asm_x86.h
@@ -1,6 +1,6 @@
/*
** x86/x64 IR assembler (SSA IR -> machine code).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* -- Guard handling ------------------------------------------------------ */
@@ -325,6 +325,14 @@ static Reg asm_fuseload(ASMState *as, IRRef ref, RegSet allow)
as->mrm.base = as->mrm.idx = RID_NONE;
return RID_MRM;
}
+ } else if (ir->o == IR_KINT64) {
+ RegSet avail = as->freeset & ~as->modset & RSET_GPR;
+ lua_assert(allow != RSET_EMPTY);
+ if (!(avail & (avail-1))) { /* Fuse if less than two regs available. */
+ as->mrm.ofs = ptr2addr(ir_kint64(ir));
+ as->mrm.base = as->mrm.idx = RID_NONE;
+ return RID_MRM;
+ }
} else if (mayfuse(as, ref)) {
RegSet xallow = (allow & RSET_GPR) ? allow : RSET_GPR;
if (ir->o == IR_SLOAD) {
@@ -361,7 +369,7 @@ static Reg asm_fuseload(ASMState *as, IRRef ref, RegSet allow)
return RID_MRM;
}
}
- if (!(as->freeset & allow) &&
+ if (!(as->freeset & allow) && !irref_isk(ref) &&
(allow == RSET_EMPTY || ra_hasspill(ir->s) || iscrossref(as, ref)))
goto fusespill;
return ra_allocref(as, ref, allow);
@@ -571,7 +579,7 @@ static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci)
lua_assert(!irt_ispri(ir->t));
ra_destreg(as, ir, RID_RET);
}
- } else if (LJ_32 && irt_isfp(ir->t)) {
+ } else if (LJ_32 && irt_isfp(ir->t) && !(ci->flags & CCI_CASTU64)) {
emit_x87op(as, XI_FPOP); /* Pop unused result from x87 st0. */
}
}
@@ -1828,8 +1836,12 @@ static void asm_intarith(ASMState *as, IRIns *ir, x86Arith xa)
Reg dest, right;
int32_t k = 0;
if (as->flagmcp == as->mcp) { /* Drop test r,r instruction. */
- as->flagmcp = NULL;
- as->mcp += (LJ_64 && *as->mcp < XI_TESTb) ? 3 : 2;
+ MCode *p = as->mcp + ((LJ_64 && *as->mcp < XI_TESTb) ? 3 : 2);
+ if ((p[1] & 15) < 14) {
+ if ((p[1] & 15) >= 12) p[1] -= 4; /* L <->S, NL <-> NS */
+ as->flagmcp = NULL;
+ as->mcp = p;
+ } /* else: cannot transform LE/NLE to cc without use of OF. */
}
right = IR(rref)->r;
if (ra_hasreg(right)) {
diff --git a/deps/luajit/src/lj_bc.c b/deps/luajit/src/lj_bc.c
index d5d3d78d..a8f444c2 100644
--- a/deps/luajit/src/lj_bc.c
+++ b/deps/luajit/src/lj_bc.c
@@ -1,6 +1,6 @@
/*
** Bytecode instruction modes.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_bc_c
diff --git a/deps/luajit/src/lj_bc.h b/deps/luajit/src/lj_bc.h
index 1a4ade31..7436fabf 100644
--- a/deps/luajit/src/lj_bc.h
+++ b/deps/luajit/src/lj_bc.h
@@ -1,6 +1,6 @@
/*
** Bytecode instruction format.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_BC_H
diff --git a/deps/luajit/src/lj_bcdump.h b/deps/luajit/src/lj_bcdump.h
index 77a789e9..812d0e15 100644
--- a/deps/luajit/src/lj_bcdump.h
+++ b/deps/luajit/src/lj_bcdump.h
@@ -1,6 +1,6 @@
/*
** Bytecode dump definitions.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_BCDUMP_H
diff --git a/deps/luajit/src/lj_bcread.c b/deps/luajit/src/lj_bcread.c
index c0baece4..25859d2f 100644
--- a/deps/luajit/src/lj_bcread.c
+++ b/deps/luajit/src/lj_bcread.c
@@ -1,6 +1,6 @@
/*
** Bytecode reader.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_bcread_c
diff --git a/deps/luajit/src/lj_bcwrite.c b/deps/luajit/src/lj_bcwrite.c
index dcdaa10a..ff97450b 100644
--- a/deps/luajit/src/lj_bcwrite.c
+++ b/deps/luajit/src/lj_bcwrite.c
@@ -1,6 +1,6 @@
/*
** Bytecode writer.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_bcwrite_c
diff --git a/deps/luajit/src/lj_carith.c b/deps/luajit/src/lj_carith.c
index 9f94091d..2a358a9b 100644
--- a/deps/luajit/src/lj_carith.c
+++ b/deps/luajit/src/lj_carith.c
@@ -1,6 +1,6 @@
/*
** C data arithmetic.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "lj_obj.h"
@@ -62,7 +62,7 @@ static int carith_checkarg(lua_State *L, CTState *cts, CDArith *ca)
TValue *o2 = i == 0 ? o+1 : o-1;
CType *ct = ctype_raw(cts, cdataV(o2)->ctypeid);
ca->ct[i] = NULL;
- ca->p[i] = NULL;
+ ca->p[i] = (uint8_t *)strVdata(o);
ok = 0;
if (ctype_isenum(ct->info)) {
CTSize ofs;
@@ -79,7 +79,7 @@ static int carith_checkarg(lua_State *L, CTState *cts, CDArith *ca)
}
} else {
ca->ct[i] = NULL;
- ca->p[i] = NULL;
+ ca->p[i] = (void *)(intptr_t)1; /* To make it unequal. */
ok = 0;
}
}
@@ -234,7 +234,9 @@ static int lj_carith_meta(lua_State *L, CTState *cts, CDArith *ca, MMS mm)
const char *repr[2];
int i, isenum = -1, isstr = -1;
if (mm == MM_eq) { /* Equality checks never raise an error. */
- setboolV(L->top-1, 0);
+ int eq = ca->p[0] == ca->p[1];
+ setboolV(L->top-1, eq);
+ setboolV(&G(L)->tmptv2, eq); /* Remember for trace recorder. */
return 1;
}
for (i = 0; i < 2; i++) {
diff --git a/deps/luajit/src/lj_carith.h b/deps/luajit/src/lj_carith.h
index 8b28556d..8c4bdbbe 100644
--- a/deps/luajit/src/lj_carith.h
+++ b/deps/luajit/src/lj_carith.h
@@ -1,6 +1,6 @@
/*
** C data arithmetic.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CARITH_H
diff --git a/deps/luajit/src/lj_ccall.c b/deps/luajit/src/lj_ccall.c
index 70c9ba5e..998417c1 100644
--- a/deps/luajit/src/lj_ccall.c
+++ b/deps/luajit/src/lj_ccall.c
@@ -1,6 +1,6 @@
/*
** FFI C call handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "lj_obj.h"
diff --git a/deps/luajit/src/lj_ccall.h b/deps/luajit/src/lj_ccall.h
index c3ea9e6f..f5530109 100644
--- a/deps/luajit/src/lj_ccall.h
+++ b/deps/luajit/src/lj_ccall.h
@@ -1,6 +1,6 @@
/*
** FFI C call handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CCALL_H
diff --git a/deps/luajit/src/lj_ccallback.c b/deps/luajit/src/lj_ccallback.c
index d872d671..b210641f 100644
--- a/deps/luajit/src/lj_ccallback.c
+++ b/deps/luajit/src/lj_ccallback.c
@@ -1,6 +1,6 @@
/*
** FFI C callback handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "lj_obj.h"
diff --git a/deps/luajit/src/lj_ccallback.h b/deps/luajit/src/lj_ccallback.h
index 45b5ff02..83dbe048 100644
--- a/deps/luajit/src/lj_ccallback.h
+++ b/deps/luajit/src/lj_ccallback.h
@@ -1,6 +1,6 @@
/*
** FFI C callback handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CCALLBACK_H
diff --git a/deps/luajit/src/lj_cconv.c b/deps/luajit/src/lj_cconv.c
index de4938e4..8a270766 100644
--- a/deps/luajit/src/lj_cconv.c
+++ b/deps/luajit/src/lj_cconv.c
@@ -1,6 +1,6 @@
/*
** C type conversions.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "lj_obj.h"
@@ -702,6 +702,7 @@ static void cconv_substruct_init(CTState *cts, CType *d, uint8_t *dp,
} else if (ctype_isxattrib(df->info, CTA_SUBTYPE)) {
cconv_substruct_init(cts, ctype_rawchild(cts, df),
dp+df->size, o, len, ip);
+ if ((d->info & CTF_UNION)) break;
} /* Ignore all other entries in the chain. */
}
}
diff --git a/deps/luajit/src/lj_cconv.h b/deps/luajit/src/lj_cconv.h
index 17e0f050..2bd50ff4 100644
--- a/deps/luajit/src/lj_cconv.h
+++ b/deps/luajit/src/lj_cconv.h
@@ -1,6 +1,6 @@
/*
** C type conversions.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CCONV_H
diff --git a/deps/luajit/src/lj_cdata.c b/deps/luajit/src/lj_cdata.c
index 590ddf10..39fc13a9 100644
--- a/deps/luajit/src/lj_cdata.c
+++ b/deps/luajit/src/lj_cdata.c
@@ -1,6 +1,6 @@
/*
** C data management.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "lj_obj.h"
@@ -127,16 +127,16 @@ CType *lj_cdata_index(CTState *cts, GCcdata *cd, cTValue *key, uint8_t **pp,
integer_key:
if (ctype_ispointer(ct->info)) {
CTSize sz = lj_ctype_size(cts, ctype_cid(ct->info)); /* Element size. */
- if (sz != CTSIZE_INVALID) {
- if (ctype_isptr(ct->info)) {
- p = (uint8_t *)cdata_getptr(p, ct->size);
- } else if ((ct->info & (CTF_VECTOR|CTF_COMPLEX))) {
- if ((ct->info & CTF_COMPLEX)) idx &= 1;
- *qual |= CTF_CONST; /* Valarray elements are constant. */
- }
- *pp = p + idx*(int32_t)sz;
- return ct;
+ if (sz == CTSIZE_INVALID)
+ lj_err_caller(cts->L, LJ_ERR_FFI_INVSIZE);
+ if (ctype_isptr(ct->info)) {
+ p = (uint8_t *)cdata_getptr(p, ct->size);
+ } else if ((ct->info & (CTF_VECTOR|CTF_COMPLEX))) {
+ if ((ct->info & CTF_COMPLEX)) idx &= 1;
+ *qual |= CTF_CONST; /* Valarray elements are constant. */
}
+ *pp = p + idx*(int32_t)sz;
+ return ct;
}
} else if (tviscdata(key)) { /* Integer cdata key. */
GCcdata *cdk = cdataV(key);
diff --git a/deps/luajit/src/lj_cdata.h b/deps/luajit/src/lj_cdata.h
index 6c8e7a1a..3a1275e6 100644
--- a/deps/luajit/src/lj_cdata.h
+++ b/deps/luajit/src/lj_cdata.h
@@ -1,6 +1,6 @@
/*
** C data management.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CDATA_H
diff --git a/deps/luajit/src/lj_clib.c b/deps/luajit/src/lj_clib.c
index ccb99e55..d3526090 100644
--- a/deps/luajit/src/lj_clib.c
+++ b/deps/luajit/src/lj_clib.c
@@ -1,6 +1,6 @@
/*
** FFI C library loader.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "lj_obj.h"
diff --git a/deps/luajit/src/lj_clib.h b/deps/luajit/src/lj_clib.h
index 47373288..e5dc98e1 100644
--- a/deps/luajit/src/lj_clib.h
+++ b/deps/luajit/src/lj_clib.h
@@ -1,6 +1,6 @@
/*
** FFI C library loader.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CLIB_H
diff --git a/deps/luajit/src/lj_cparse.c b/deps/luajit/src/lj_cparse.c
index 6ffe16a2..b9df88d7 100644
--- a/deps/luajit/src/lj_cparse.c
+++ b/deps/luajit/src/lj_cparse.c
@@ -1,6 +1,6 @@
/*
** C declaration parser.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "lj_obj.h"
diff --git a/deps/luajit/src/lj_cparse.h b/deps/luajit/src/lj_cparse.h
index 586f4945..441580de 100644
--- a/deps/luajit/src/lj_cparse.h
+++ b/deps/luajit/src/lj_cparse.h
@@ -1,6 +1,6 @@
/*
** C declaration parser.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CPARSE_H
diff --git a/deps/luajit/src/lj_crecord.c b/deps/luajit/src/lj_crecord.c
index da9013f0..a46665e9 100644
--- a/deps/luajit/src/lj_crecord.c
+++ b/deps/luajit/src/lj_crecord.c
@@ -1,6 +1,6 @@
/*
** Trace recorder for C data operations.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_ffrecord_c
@@ -794,7 +794,7 @@ void LJ_FASTCALL recff_cdata_index(jit_State *J, RecordFFData *rd)
}
} else if (tref_isstr(idx)) {
GCstr *name = strV(&rd->argv[1]);
- if (cd->ctypeid == CTID_CTYPEID)
+ if (cd && cd->ctypeid == CTID_CTYPEID)
ct = ctype_raw(cts, crec_constructor(J, cd, ptr));
if (ctype_isstruct(ct->info)) {
CTSize fofs;
@@ -835,6 +835,7 @@ void LJ_FASTCALL recff_cdata_index(jit_State *J, RecordFFData *rd)
CType *cct = ctype_rawchild(cts, ct);
if (ctype_isstruct(cct->info)) {
ct = cct;
+ cd = NULL;
if (tref_isstr(idx)) goto again;
}
}
@@ -847,8 +848,11 @@ void LJ_FASTCALL recff_cdata_index(jit_State *J, RecordFFData *rd)
/* Resolve reference for field. */
ct = ctype_get(cts, sid);
- if (ctype_isref(ct->info))
+ if (ctype_isref(ct->info)) {
ptr = emitir(IRT(IR_XLOAD, IRT_PTR), ptr, 0);
+ sid = ctype_cid(ct->info);
+ ct = ctype_get(cts, sid);
+ }
while (ctype_isattrib(ct->info))
ct = ctype_child(cts, ct); /* Skip attributes. */
@@ -1317,7 +1321,8 @@ static TRef crec_arith_ptr(jit_State *J, TRef *sp, CType **s, MMS mm)
}
/* Record ctype arithmetic metamethods. */
-static void crec_arith_meta(jit_State *J, CTState *cts, RecordFFData *rd)
+static TRef crec_arith_meta(jit_State *J, TRef *sp, CType **s, CTState *cts,
+ RecordFFData *rd)
{
cTValue *tv = NULL;
if (J->base[0]) {
@@ -1338,13 +1343,20 @@ static void crec_arith_meta(jit_State *J, CTState *cts, RecordFFData *rd)
if (tvisfunc(tv)) {
J->base[-1] = lj_ir_kfunc(J, funcV(tv)) | TREF_FRAME;
rd->nres = -1; /* Pending tailcall. */
- return;
+ return 0;
} /* NYI: non-function metamethods. */
- } else if ((MMS)rd->data == MM_eq) {
- J->base[0] = TREF_FALSE;
- return;
+ } else if ((MMS)rd->data == MM_eq) { /* Fallback cdata pointer comparison. */
+ if (sp[0] && sp[1] && ctype_isnum(s[0]->info) == ctype_isnum(s[1]->info)) {
+ /* Assume true comparison. Fixup and emit pending guard later. */
+ lj_ir_set(J, IRTG(IR_EQ, IRT_PTR), sp[0], sp[1]);
+ J->postproc = LJ_POST_FIXGUARD;
+ return TREF_TRUE;
+ } else {
+ return TREF_FALSE;
+ }
}
lj_trace_err(J, LJ_TRERR_BADTYPE);
+ return 0;
}
void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
@@ -1357,7 +1369,7 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
TRef tr = J->base[i];
CType *ct = ctype_get(cts, CTID_DOUBLE);
if (!tr) {
- goto trymeta;
+ lj_trace_err(J, LJ_TRERR_BADTYPE);
} else if (tref_iscdata(tr)) {
CTypeID id = argv2cdata(J, tr, &rd->argv[i])->ctypeid;
IRType t;
@@ -1387,11 +1399,12 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
}
if (ctype_isenum(ct->info)) ct = ctype_child(cts, ct);
if (ctype_isnum(ct->info)) {
- if (t == IRT_CDATA) goto trymeta;
- if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J);
- tr = emitir(IRT(IR_XLOAD, t), tr, 0);
- } else if (!(ctype_isptr(ct->info) || ctype_isrefarray(ct->info))) {
- goto trymeta;
+ if (t == IRT_CDATA) {
+ tr = 0;
+ } else {
+ if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J);
+ tr = emitir(IRT(IR_XLOAD, t), tr, 0);
+ }
}
} else if (tref_isnil(tr)) {
tr = lj_ir_kptr(J, NULL);
@@ -1411,10 +1424,17 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
emitir(IRTG(IR_EQ, IRT_STR), tr, lj_ir_kstr(J, str));
ct = ctype_child(cts, cct);
tr = lj_ir_kint(J, (int32_t)ofs);
- } /* else: interpreter will throw. */
- } /* else: interpreter will throw. */
+ } else { /* Interpreter will throw or return false. */
+ ct = ctype_get(cts, CTID_P_VOID);
+ }
+ } else if (ctype_isptr(ct->info)) {
+ tr = emitir(IRT(IR_ADD, IRT_PTR), tr, lj_ir_kintp(J, sizeof(GCstr)));
+ } else {
+ ct = ctype_get(cts, CTID_P_VOID);
+ }
} else if (!tref_isnum(tr)) {
- goto trymeta;
+ tr = 0;
+ ct = ctype_get(cts, CTID_P_VOID);
}
ok:
s[i] = ct;
@@ -1422,22 +1442,20 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
}
{
TRef tr;
- if ((tr = crec_arith_int64(J, sp, s, (MMS)rd->data)) ||
- (tr = crec_arith_ptr(J, sp, s, (MMS)rd->data))) {
- J->base[0] = tr;
- /* Fixup cdata comparisons, too. Avoids some cdata escapes. */
- if (J->postproc == LJ_POST_FIXGUARD && frame_iscont(J->L->base-1) &&
- !irt_isguard(J->guardemit)) {
- const BCIns *pc = frame_contpc(J->L->base-1) - 1;
- if (bc_op(*pc) <= BC_ISNEP) {
- setframe_pc(&J2G(J)->tmptv, pc);
- J2G(J)->tmptv.u32.lo = ((tref_istrue(tr) ^ bc_op(*pc)) & 1);
- J->postproc = LJ_POST_FIXCOMP;
- }
+ if (!(tr = crec_arith_int64(J, sp, s, (MMS)rd->data)) &&
+ !(tr = crec_arith_ptr(J, sp, s, (MMS)rd->data)) &&
+ !(tr = crec_arith_meta(J, sp, s, cts, rd)))
+ return;
+ J->base[0] = tr;
+ /* Fixup cdata comparisons, too. Avoids some cdata escapes. */
+ if (J->postproc == LJ_POST_FIXGUARD && frame_iscont(J->L->base-1) &&
+ !irt_isguard(J->guardemit)) {
+ const BCIns *pc = frame_contpc(J->L->base-1) - 1;
+ if (bc_op(*pc) <= BC_ISNEP) {
+ setframe_pc(&J2G(J)->tmptv, pc);
+ J2G(J)->tmptv.u32.lo = ((tref_istrue(tr) ^ bc_op(*pc)) & 1);
+ J->postproc = LJ_POST_FIXCOMP;
}
- } else {
- trymeta:
- crec_arith_meta(J, cts, rd);
}
}
}
diff --git a/deps/luajit/src/lj_crecord.h b/deps/luajit/src/lj_crecord.h
index fb77ca60..a4628cac 100644
--- a/deps/luajit/src/lj_crecord.h
+++ b/deps/luajit/src/lj_crecord.h
@@ -1,6 +1,6 @@
/*
** Trace recorder for C data operations.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CRECORD_H
diff --git a/deps/luajit/src/lj_ctype.c b/deps/luajit/src/lj_ctype.c
index e9fe0943..ac301749 100644
--- a/deps/luajit/src/lj_ctype.c
+++ b/deps/luajit/src/lj_ctype.c
@@ -1,6 +1,6 @@
/*
** C type management.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include "lj_obj.h"
diff --git a/deps/luajit/src/lj_ctype.h b/deps/luajit/src/lj_ctype.h
index ff8ee069..3df26f09 100644
--- a/deps/luajit/src/lj_ctype.h
+++ b/deps/luajit/src/lj_ctype.h
@@ -1,6 +1,6 @@
/*
** C type management.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_CTYPE_H
diff --git a/deps/luajit/src/lj_debug.c b/deps/luajit/src/lj_debug.c
index 4653a4ec..bd2fa1f5 100644
--- a/deps/luajit/src/lj_debug.c
+++ b/deps/luajit/src/lj_debug.c
@@ -1,6 +1,6 @@
/*
** Debugging and introspection.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_debug_c
@@ -14,6 +14,7 @@
#include "lj_state.h"
#include "lj_frame.h"
#include "lj_bc.h"
+#include "lj_vm.h"
#if LJ_HASJIT
#include "lj_jit.h"
#endif
@@ -86,7 +87,8 @@ static BCPos debug_framepc(lua_State *L, GCfunc *fn, cTValue *nextframe)
if (frame_islua(f)) {
f = frame_prevl(f);
} else {
- if (frame_isc(f))
+ if (frame_isc(f) || (LJ_HASFFI && frame_iscont(f) &&
+ (f-1)->u32.lo == LJ_CONT_FFI_CALLBACK))
cf = cframe_raw(cframe_prev(cf));
f = frame_prevd(f);
}
@@ -463,7 +465,7 @@ int lj_debug_getinfo(lua_State *L, const char *what, lj_Debug *ar, int ext)
lj_debug_shortname(ar->short_src, name);
ar->linedefined = (int)firstline;
ar->lastlinedefined = (int)(firstline + pt->numline);
- ar->what = firstline ? "Lua" : "main";
+ ar->what = (firstline || !pt->numline) ? "Lua" : "main";
} else {
ar->source = "=[C]";
ar->short_src[0] = '[';
diff --git a/deps/luajit/src/lj_debug.h b/deps/luajit/src/lj_debug.h
index bec6b4f3..fa8988c3 100644
--- a/deps/luajit/src/lj_debug.h
+++ b/deps/luajit/src/lj_debug.h
@@ -1,6 +1,6 @@
/*
** Debugging and introspection.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_DEBUG_H
diff --git a/deps/luajit/src/lj_def.h b/deps/luajit/src/lj_def.h
index 3c43be78..e666c9e3 100644
--- a/deps/luajit/src/lj_def.h
+++ b/deps/luajit/src/lj_def.h
@@ -1,6 +1,6 @@
/*
** LuaJIT common internal definitions.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_DEF_H
@@ -111,7 +111,7 @@ typedef uintptr_t BloomFilter;
#define bloomset(b, x) ((b) |= bloombit((x)))
#define bloomtest(b, x) ((b) & bloombit((x)))
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__psp2__)
#define LJ_NORET __attribute__((noreturn))
#define LJ_ALIGN(n) __attribute__((aligned(n)))
@@ -119,7 +119,7 @@ typedef uintptr_t BloomFilter;
#define LJ_AINLINE inline __attribute__((always_inline))
#define LJ_NOINLINE __attribute__((noinline))
-#if defined(__ELF__) || defined(__MACH__)
+#if defined(__ELF__) || defined(__MACH__) || defined(__psp2__)
#if !((defined(__sun__) && defined(__svr4__)) || defined(__CELLOS_LV2__))
#define LJ_NOAPI extern __attribute__((visibility("hidden")))
#endif
@@ -150,6 +150,9 @@ static LJ_AINLINE uint32_t lj_fls(uint32_t x)
#if defined(__arm__)
static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
{
+#if defined(__psp2__)
+ return __builtin_rev(x);
+#else
uint32_t r;
#if __ARM_ARCH_6__ || __ARM_ARCH_6J__ || __ARM_ARCH_6T2__ || __ARM_ARCH_6Z__ ||\
__ARM_ARCH_6ZK__ || __ARM_ARCH_7__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__
@@ -163,6 +166,7 @@ static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
#endif
return ((r & 0xff00ffffu) >> 8) ^ lj_ror(x, 8);
#endif
+#endif
}
static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
diff --git a/deps/luajit/src/lj_dispatch.c b/deps/luajit/src/lj_dispatch.c
index 58d6c3e2..37256576 100644
--- a/deps/luajit/src/lj_dispatch.c
+++ b/deps/luajit/src/lj_dispatch.c
@@ -1,6 +1,6 @@
/*
** Instruction dispatch handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_dispatch_c
diff --git a/deps/luajit/src/lj_dispatch.h b/deps/luajit/src/lj_dispatch.h
index 5960e64a..778affc8 100644
--- a/deps/luajit/src/lj_dispatch.h
+++ b/deps/luajit/src/lj_dispatch.h
@@ -1,6 +1,6 @@
/*
** Instruction dispatch handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_DISPATCH_H
diff --git a/deps/luajit/src/lj_emit_arm.h b/deps/luajit/src/lj_emit_arm.h
index 3bac3679..8c5e5379 100644
--- a/deps/luajit/src/lj_emit_arm.h
+++ b/deps/luajit/src/lj_emit_arm.h
@@ -1,6 +1,6 @@
/*
** ARM instruction emitter.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* -- Constant encoding --------------------------------------------------- */
diff --git a/deps/luajit/src/lj_emit_mips.h b/deps/luajit/src/lj_emit_mips.h
index dc9197ad..0fc07d91 100644
--- a/deps/luajit/src/lj_emit_mips.h
+++ b/deps/luajit/src/lj_emit_mips.h
@@ -1,6 +1,6 @@
/*
** MIPS instruction emitter.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* -- Emit basic instructions --------------------------------------------- */
diff --git a/deps/luajit/src/lj_emit_ppc.h b/deps/luajit/src/lj_emit_ppc.h
index 3a2ae389..14edf00f 100644
--- a/deps/luajit/src/lj_emit_ppc.h
+++ b/deps/luajit/src/lj_emit_ppc.h
@@ -1,6 +1,6 @@
/*
** PPC instruction emitter.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* -- Emit basic instructions --------------------------------------------- */
diff --git a/deps/luajit/src/lj_emit_x86.h b/deps/luajit/src/lj_emit_x86.h
index 8cfb654f..3a2f6510 100644
--- a/deps/luajit/src/lj_emit_x86.h
+++ b/deps/luajit/src/lj_emit_x86.h
@@ -1,6 +1,6 @@
/*
** x86/x64 instruction emitter.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* -- Emit basic instructions --------------------------------------------- */
diff --git a/deps/luajit/src/lj_err.c b/deps/luajit/src/lj_err.c
index db182673..081bfde4 100644
--- a/deps/luajit/src/lj_err.c
+++ b/deps/luajit/src/lj_err.c
@@ -1,6 +1,6 @@
/*
** Error handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_err_c
@@ -378,7 +378,7 @@ typedef struct UndocumentedDispatcherContext {
ULONG64 EstablisherFrame;
ULONG64 TargetIp;
PCONTEXT ContextRecord;
- PEXCEPTION_ROUTINE LanguageHandler;
+ void (*LanguageHandler)(void);
PVOID HandlerData;
PUNWIND_HISTORY_TABLE HistoryTable;
ULONG ScopeIndex;
@@ -499,8 +499,7 @@ static ptrdiff_t finderrfunc(lua_State *L)
{
cTValue *frame = L->base-1, *bot = tvref(L->stack);
void *cf = L->cframe;
- while (frame > bot) {
- lua_assert(cf != NULL);
+ while (frame > bot && cf) {
while (cframe_nres(cframe_raw(cf)) < 0) { /* cframe without frame? */
if (frame >= restorestack(L, -cframe_nres(cf)))
break;
@@ -518,12 +517,14 @@ static ptrdiff_t finderrfunc(lua_State *L)
case FRAME_C:
cf = cframe_prev(cf);
/* fallthrough */
+ case FRAME_VARG:
+ frame = frame_prevd(frame);
+ break;
case FRAME_CONT:
#if LJ_HASFFI
if ((frame-1)->u32.lo == LJ_CONT_FFI_CALLBACK)
cf = cframe_prev(cf);
#endif
- case FRAME_VARG:
frame = frame_prevd(frame);
break;
case FRAME_CP:
@@ -725,9 +726,23 @@ LJ_NOINLINE void lj_err_arg(lua_State *L, int narg, ErrMsg em)
/* Typecheck error for arguments. */
LJ_NOINLINE void lj_err_argtype(lua_State *L, int narg, const char *xname)
{
- TValue *o = narg < 0 ? L->top + narg : L->base + narg-1;
- const char *tname = o < L->top ? lj_typename(o) : lj_obj_typename[0];
- const char *msg = lj_str_pushf(L, err2msg(LJ_ERR_BADTYPE), xname, tname);
+ const char *tname, *msg;
+ if (narg <= LUA_REGISTRYINDEX) {
+ if (narg >= LUA_GLOBALSINDEX) {
+ tname = lj_obj_itypename[~LJ_TTAB];
+ } else {
+ GCfunc *fn = curr_func(L);
+ int idx = LUA_GLOBALSINDEX - narg;
+ if (idx <= fn->c.nupvalues)
+ tname = lj_typename(&fn->c.upvalue[idx-1]);
+ else
+ tname = lj_obj_typename[0];
+ }
+ } else {
+ TValue *o = narg < 0 ? L->top + narg : L->base + narg-1;
+ tname = o < L->top ? lj_typename(o) : lj_obj_typename[0];
+ }
+ msg = lj_str_pushf(L, err2msg(LJ_ERR_BADTYPE), xname, tname);
err_argmsg(L, narg, msg);
}
diff --git a/deps/luajit/src/lj_err.h b/deps/luajit/src/lj_err.h
index 7ea512a3..03a56f03 100644
--- a/deps/luajit/src/lj_err.h
+++ b/deps/luajit/src/lj_err.h
@@ -1,6 +1,6 @@
/*
** Error handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_ERR_H
diff --git a/deps/luajit/src/lj_errmsg.h b/deps/luajit/src/lj_errmsg.h
index 137831eb..1c948760 100644
--- a/deps/luajit/src/lj_errmsg.h
+++ b/deps/luajit/src/lj_errmsg.h
@@ -1,6 +1,6 @@
/*
** VM error messages.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* This file may be included multiple times with different ERRDEF macros. */
diff --git a/deps/luajit/src/lj_ff.h b/deps/luajit/src/lj_ff.h
index d91a7395..73dad969 100644
--- a/deps/luajit/src/lj_ff.h
+++ b/deps/luajit/src/lj_ff.h
@@ -1,6 +1,6 @@
/*
** Fast function IDs.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_FF_H
diff --git a/deps/luajit/src/lj_ffrecord.c b/deps/luajit/src/lj_ffrecord.c
index 794bbd43..69f71ab2 100644
--- a/deps/luajit/src/lj_ffrecord.c
+++ b/deps/luajit/src/lj_ffrecord.c
@@ -1,6 +1,6 @@
/*
** Fast function call recorder.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_ffrecord_c
diff --git a/deps/luajit/src/lj_ffrecord.h b/deps/luajit/src/lj_ffrecord.h
index b3bc6627..f858ca29 100644
--- a/deps/luajit/src/lj_ffrecord.h
+++ b/deps/luajit/src/lj_ffrecord.h
@@ -1,6 +1,6 @@
/*
** Fast function call recorder.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_FFRECORD_H
diff --git a/deps/luajit/src/lj_frame.h b/deps/luajit/src/lj_frame.h
index fb533b0e..cd57be22 100644
--- a/deps/luajit/src/lj_frame.h
+++ b/deps/luajit/src/lj_frame.h
@@ -1,6 +1,6 @@
/*
** Stack frames.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_FRAME_H
diff --git a/deps/luajit/src/lj_func.c b/deps/luajit/src/lj_func.c
index 9a59b0f0..eb8a9dbb 100644
--- a/deps/luajit/src/lj_func.c
+++ b/deps/luajit/src/lj_func.c
@@ -1,6 +1,6 @@
/*
** Function handling (prototypes, functions and upvalues).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lj_func.h b/deps/luajit/src/lj_func.h
index 88732e83..a6e534e7 100644
--- a/deps/luajit/src/lj_func.h
+++ b/deps/luajit/src/lj_func.h
@@ -1,6 +1,6 @@
/*
** Function handling (prototypes, functions and upvalues).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_FUNC_H
diff --git a/deps/luajit/src/lj_gc.c b/deps/luajit/src/lj_gc.c
index c2bc397d..b498abaa 100644
--- a/deps/luajit/src/lj_gc.c
+++ b/deps/luajit/src/lj_gc.c
@@ -1,6 +1,6 @@
/*
** Garbage collector.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
@@ -631,6 +631,8 @@ static size_t gc_onestep(lua_State *L)
case GCSsweep: {
MSize old = g->gc.total;
setmref(g->gc.sweep, gc_sweep(g, mref(g->gc.sweep, GCRef), GCSWEEPMAX));
+ lua_assert(old >= g->gc.total);
+ g->gc.estimate -= old - g->gc.total;
if (gcref(*mref(g->gc.sweep, GCRef)) == NULL) {
gc_shrink(g, L);
if (gcref(g->gc.mmudata)) { /* Need any finalizations? */
@@ -643,8 +645,6 @@ static size_t gc_onestep(lua_State *L)
g->gc.debt = 0;
}
}
- lua_assert(old >= g->gc.total);
- g->gc.estimate -= old - g->gc.total;
return GCSWEEPMAX*GCSWEEPCOST;
}
case GCSfinalize:
diff --git a/deps/luajit/src/lj_gc.h b/deps/luajit/src/lj_gc.h
index c85d0756..ba061bc5 100644
--- a/deps/luajit/src/lj_gc.h
+++ b/deps/luajit/src/lj_gc.h
@@ -1,6 +1,6 @@
/*
** Garbage collector.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_GC_H
diff --git a/deps/luajit/src/lj_gdbjit.c b/deps/luajit/src/lj_gdbjit.c
index 5e7fca1c..d3f3e611 100644
--- a/deps/luajit/src/lj_gdbjit.c
+++ b/deps/luajit/src/lj_gdbjit.c
@@ -1,6 +1,6 @@
/*
** Client for the GDB JIT API.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_gdbjit_c
@@ -356,6 +356,8 @@ static const ELFheader elfhdr_template = {
.eosabi = 2,
#elif defined(__OpenBSD__)
.eosabi = 12,
+#elif defined(__DragonFly__)
+ .eosabi = 0,
#elif (defined(__sun__) && defined(__svr4__))
.eosabi = 6,
#else
diff --git a/deps/luajit/src/lj_gdbjit.h b/deps/luajit/src/lj_gdbjit.h
index 9ae504fc..49c58630 100644
--- a/deps/luajit/src/lj_gdbjit.h
+++ b/deps/luajit/src/lj_gdbjit.h
@@ -1,6 +1,6 @@
/*
** Client for the GDB JIT API.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_GDBJIT_H
diff --git a/deps/luajit/src/lj_ir.c b/deps/luajit/src/lj_ir.c
index b2170a10..439f3fc3 100644
--- a/deps/luajit/src/lj_ir.c
+++ b/deps/luajit/src/lj_ir.c
@@ -1,6 +1,6 @@
/*
** SSA IR (Intermediate Representation) emitter.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_ir_c
diff --git a/deps/luajit/src/lj_ir.h b/deps/luajit/src/lj_ir.h
index 80763d88..8126482e 100644
--- a/deps/luajit/src/lj_ir.h
+++ b/deps/luajit/src/lj_ir.h
@@ -1,6 +1,6 @@
/*
** SSA IR (Intermediate Representation) format.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_IR_H
diff --git a/deps/luajit/src/lj_ircall.h b/deps/luajit/src/lj_ircall.h
index af30ba8f..893dac2f 100644
--- a/deps/luajit/src/lj_ircall.h
+++ b/deps/luajit/src/lj_ircall.h
@@ -1,6 +1,6 @@
/*
** IR CALL* instruction definitions.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_IRCALL_H
@@ -86,6 +86,12 @@ typedef struct CCallInfo {
#define IRCALLCOND_FFI32(x) NULL
#endif
+#if LJ_TARGET_X86
+#define CCI_RANDFPR 0 /* Clang on OSX/x86 is overzealous. */
+#else
+#define CCI_RANDFPR CCI_NOFPRCLOBBER
+#endif
+
#if LJ_SOFTFP
#define ARG1_FP 2 /* Treat as 2 32 bit arguments. */
#else
@@ -112,7 +118,7 @@ typedef struct CCallInfo {
_(ANY, lj_gc_step_jit, 2, FS, NIL, CCI_L) \
_(ANY, lj_gc_barrieruv, 2, FS, NIL, 0) \
_(ANY, lj_mem_newgco, 2, FS, P32, CCI_L) \
- _(ANY, lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_NOFPRCLOBBER) \
+ _(ANY, lj_math_random_step, 1, FS, NUM, CCI_CASTU64|CCI_RANDFPR)\
_(ANY, lj_vm_modi, 2, FN, INT, 0) \
_(ANY, sinh, ARG1_FP, N, NUM, 0) \
_(ANY, cosh, ARG1_FP, N, NUM, 0) \
diff --git a/deps/luajit/src/lj_iropt.h b/deps/luajit/src/lj_iropt.h
index e45ae2b7..4e424e70 100644
--- a/deps/luajit/src/lj_iropt.h
+++ b/deps/luajit/src/lj_iropt.h
@@ -1,6 +1,6 @@
/*
** Common header for IR emitter and optimizations.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_IROPT_H
diff --git a/deps/luajit/src/lj_jit.h b/deps/luajit/src/lj_jit.h
index b69e4f4e..eb765477 100644
--- a/deps/luajit/src/lj_jit.h
+++ b/deps/luajit/src/lj_jit.h
@@ -1,6 +1,6 @@
/*
** Common definitions for the JIT compiler.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_JIT_H
@@ -279,6 +279,7 @@ typedef struct BPropEntry {
/* Scalar evolution analysis cache. */
typedef struct ScEvEntry {
+ MRef pc; /* Bytecode PC of FORI. */
IRRef1 idx; /* Index reference. */
IRRef1 start; /* Constant start reference. */
IRRef1 stop; /* Constant stop reference. */
diff --git a/deps/luajit/src/lj_lex.c b/deps/luajit/src/lj_lex.c
index 4fa39313..e1dc3cdf 100644
--- a/deps/luajit/src/lj_lex.c
+++ b/deps/luajit/src/lj_lex.c
@@ -1,6 +1,6 @@
/*
** Lexical analyzer.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
@@ -378,6 +378,7 @@ int lj_lex_setup(lua_State *L, LexState *ls)
ls->vtop = 0;
ls->bcstack = NULL;
ls->sizebcstack = 0;
+ ls->token = 0;
ls->lookahead = TK_eof; /* No look-ahead token. */
ls->linenumber = 1;
ls->lastline = 1;
diff --git a/deps/luajit/src/lj_lex.h b/deps/luajit/src/lj_lex.h
index a7ff29a0..fe017686 100644
--- a/deps/luajit/src/lj_lex.h
+++ b/deps/luajit/src/lj_lex.h
@@ -1,6 +1,6 @@
/*
** Lexical analyzer.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_LEX_H
diff --git a/deps/luajit/src/lj_lib.c b/deps/luajit/src/lj_lib.c
index 76c8a064..856685ee 100644
--- a/deps/luajit/src/lj_lib.c
+++ b/deps/luajit/src/lj_lib.c
@@ -1,6 +1,6 @@
/*
** Library function support.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_lib_c
diff --git a/deps/luajit/src/lj_lib.h b/deps/luajit/src/lj_lib.h
index daacb921..9320f34f 100644
--- a/deps/luajit/src/lj_lib.h
+++ b/deps/luajit/src/lj_lib.h
@@ -1,6 +1,6 @@
/*
** Library function support.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_LIB_H
diff --git a/deps/luajit/src/lj_load.c b/deps/luajit/src/lj_load.c
index edfdc903..ff7b8511 100644
--- a/deps/luajit/src/lj_load.c
+++ b/deps/luajit/src/lj_load.c
@@ -1,6 +1,6 @@
/*
** Load and dump code.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include
diff --git a/deps/luajit/src/lj_mcode.c b/deps/luajit/src/lj_mcode.c
index 5a732960..d95ebeb1 100644
--- a/deps/luajit/src/lj_mcode.c
+++ b/deps/luajit/src/lj_mcode.c
@@ -1,6 +1,6 @@
/*
** Machine code management.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_mcode_c
@@ -145,7 +145,7 @@ static void mcode_free(jit_State *J, void *p, size_t sz)
/* -- MCode area protection ----------------------------------------------- */
-/* Define this ONLY if the page protection twiddling becomes a bottleneck. */
+/* Define this ONLY if page protection twiddling becomes a bottleneck. */
#ifdef LUAJIT_UNPROTECT_MCODE
/* It's generally considered to be a potential security risk to have
@@ -252,7 +252,20 @@ static void *mcode_alloc(jit_State *J, size_t sz)
#else
/* All memory addresses are reachable by relative jumps. */
-#define mcode_alloc(J, sz) mcode_alloc_at((J), 0, (sz), MCPROT_GEN)
+static void *mcode_alloc(jit_State *J, size_t sz)
+{
+#ifdef __OpenBSD__
+ /* Allow better executable memory allocation for OpenBSD W^X mode. */
+ void *p = mcode_alloc_at(J, 0, sz, MCPROT_RUN);
+ if (p && mcode_setprot(p, sz, MCPROT_GEN)) {
+ mcode_free(J, p, sz);
+ return NULL;
+ }
+ return p;
+#else
+ return mcode_alloc_at(J, 0, sz, MCPROT_GEN);
+#endif
+}
#endif
diff --git a/deps/luajit/src/lj_mcode.h b/deps/luajit/src/lj_mcode.h
index 89344fc7..ee604523 100644
--- a/deps/luajit/src/lj_mcode.h
+++ b/deps/luajit/src/lj_mcode.h
@@ -1,6 +1,6 @@
/*
** Machine code management.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_MCODE_H
diff --git a/deps/luajit/src/lj_meta.c b/deps/luajit/src/lj_meta.c
index 0a526671..faaaf702 100644
--- a/deps/luajit/src/lj_meta.c
+++ b/deps/luajit/src/lj_meta.c
@@ -1,6 +1,6 @@
/*
** Metamethod handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lj_meta.h b/deps/luajit/src/lj_meta.h
index 8d7c2cd4..2c1ad0dd 100644
--- a/deps/luajit/src/lj_meta.h
+++ b/deps/luajit/src/lj_meta.h
@@ -1,6 +1,6 @@
/*
** Metamethod handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_META_H
diff --git a/deps/luajit/src/lj_obj.c b/deps/luajit/src/lj_obj.c
index c7f3bc12..7fab714e 100644
--- a/deps/luajit/src/lj_obj.c
+++ b/deps/luajit/src/lj_obj.c
@@ -1,6 +1,6 @@
/*
** Miscellaneous object handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_obj_c
diff --git a/deps/luajit/src/lj_obj.h b/deps/luajit/src/lj_obj.h
index cc999aa4..6e8381cb 100644
--- a/deps/luajit/src/lj_obj.h
+++ b/deps/luajit/src/lj_obj.h
@@ -1,6 +1,6 @@
/*
** LuaJIT VM tags, values and objects.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lj_opt_dce.c b/deps/luajit/src/lj_opt_dce.c
index be801894..7f1faafe 100644
--- a/deps/luajit/src/lj_opt_dce.c
+++ b/deps/luajit/src/lj_opt_dce.c
@@ -1,6 +1,6 @@
/*
** DCE: Dead Code Elimination. Pre-LOOP only -- ASM already performs DCE.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_opt_dce_c
@@ -69,6 +69,7 @@ void lj_opt_dce(jit_State *J)
if ((J->flags & JIT_F_OPT_DCE)) {
dce_marksnap(J);
dce_propagate(J);
+ memset(J->bpropcache, 0, sizeof(J->bpropcache)); /* Invalidate cache. */
}
}
diff --git a/deps/luajit/src/lj_opt_fold.c b/deps/luajit/src/lj_opt_fold.c
index 8a5b41cc..d00fdd56 100644
--- a/deps/luajit/src/lj_opt_fold.c
+++ b/deps/luajit/src/lj_opt_fold.c
@@ -2,7 +2,7 @@
** FOLD: Constant Folding, Algebraic Simplifications and Reassociation.
** ABCelim: Array Bounds Check Elimination.
** CSE: Common-Subexpression Elimination.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_opt_fold_c
@@ -505,13 +505,14 @@ LJFOLDF(kfold_strref_snew)
} else {
/* Reassociate: strref(snew(strref(str, a), len), b) ==> strref(str, a+b) */
IRIns *ir = IR(fleft->op1);
- IRRef1 str = ir->op1; /* IRIns * is not valid across emitir. */
- lua_assert(ir->o == IR_STRREF);
- PHIBARRIER(ir);
- fins->op2 = emitir(IRTI(IR_ADD), ir->op2, fins->op2); /* Clobbers fins! */
- fins->op1 = str;
- fins->ot = IRT(IR_STRREF, IRT_P32);
- return RETRYFOLD;
+ if (ir->o == IR_STRREF) {
+ IRRef1 str = ir->op1; /* IRIns * is not valid across emitir. */
+ PHIBARRIER(ir);
+ fins->op2 = emitir(IRTI(IR_ADD), ir->op2, fins->op2); /* Clobbers fins! */
+ fins->op1 = str;
+ fins->ot = IRT(IR_STRREF, IRT_P32);
+ return RETRYFOLD;
+ }
}
return NEXTFOLD;
}
@@ -1005,11 +1006,16 @@ LJFOLDF(simplify_conv_flt_num)
LJFOLD(TOBIT CONV KNUM)
LJFOLDF(simplify_tobit_conv)
{
- if ((fleft->op2 & IRCONV_SRCMASK) == IRT_INT ||
- (fleft->op2 & IRCONV_SRCMASK) == IRT_U32) {
- /* Fold even across PHI to avoid expensive num->int conversions in loop. */
+ /* Fold even across PHI to avoid expensive num->int conversions in loop. */
+ if ((fleft->op2 & IRCONV_SRCMASK) == IRT_INT) {
lua_assert(irt_isnum(fleft->t));
return fleft->op1;
+ } else if ((fleft->op2 & IRCONV_SRCMASK) == IRT_U32) {
+ lua_assert(irt_isnum(fleft->t));
+ fins->o = IR_CONV;
+ fins->op1 = fleft->op1;
+ fins->op2 = (IRT_INT<<5)|IRT_U32;
+ return RETRYFOLD;
}
return NEXTFOLD;
}
@@ -1825,7 +1831,8 @@ LJFOLDF(merge_eqne_snew_kgc)
if (len <= FOLD_SNEW_MAX_LEN) {
IROp op = (IROp)fins->o;
IRRef strref = fleft->op1;
- lua_assert(IR(strref)->o == IR_STRREF);
+ if (IR(strref)->o != IR_STRREF)
+ return NEXTFOLD;
if (op == IR_EQ) {
emitir(IRTGI(IR_EQ), fleft->op2, lj_ir_kint(J, len));
/* Caveat: fins/fleft/fright is no longer valid after emitir. */
diff --git a/deps/luajit/src/lj_opt_loop.c b/deps/luajit/src/lj_opt_loop.c
index fa001151..b7d1923e 100644
--- a/deps/luajit/src/lj_opt_loop.c
+++ b/deps/luajit/src/lj_opt_loop.c
@@ -1,6 +1,6 @@
/*
** LOOP: Loop Optimizations.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_opt_loop_c
diff --git a/deps/luajit/src/lj_opt_mem.c b/deps/luajit/src/lj_opt_mem.c
index c8cdc3e5..a4d96fc0 100644
--- a/deps/luajit/src/lj_opt_mem.c
+++ b/deps/luajit/src/lj_opt_mem.c
@@ -3,7 +3,7 @@
** AA: Alias Analysis using high-level semantic disambiguation.
** FWD: Load Forwarding (L2L) + Store Forwarding (S2L).
** DSE: Dead-Store Elimination.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_opt_mem_c
@@ -740,21 +740,19 @@ TRef LJ_FASTCALL lj_opt_fwd_xload(jit_State *J)
case ALIAS_MUST:
/* Emit conversion if the loaded type doesn't match the forwarded type. */
if (!irt_sametype(fins->t, IR(store->op2)->t)) {
- IRType st = irt_type(fins->t);
- if (st == IRT_I8 || st == IRT_I16) { /* Trunc + sign-extend. */
- st |= IRCONV_SEXT;
- } else if (st == IRT_U8 || st == IRT_U16) { /* Trunc + zero-extend. */
- } else if (st == IRT_INT) {
- st = irt_type(IR(store->op2)->t); /* Needs dummy CONV.int.*. */
- } else { /* I64/U64 are boxed, U32 is hidden behind a CONV.num.u32. */
- goto store_fwd;
+ IRType dt = irt_type(fins->t), st = irt_type(IR(store->op2)->t);
+ if (dt == IRT_I8 || dt == IRT_I16) { /* Trunc + sign-extend. */
+ st = dt | IRCONV_SEXT;
+ dt = IRT_INT;
+ } else if (dt == IRT_U8 || dt == IRT_U16) { /* Trunc + zero-extend. */
+ st = dt;
+ dt = IRT_INT;
}
- fins->ot = IRTI(IR_CONV);
+ fins->ot = IRT(IR_CONV, dt);
fins->op1 = store->op2;
- fins->op2 = (IRT_INT<<5)|st;
+ fins->op2 = (dt<<5)|st;
return RETRYFOLD;
}
- store_fwd:
return store->op2; /* Store forwarding. */
}
ref = store->prev;
@@ -795,6 +793,7 @@ TRef LJ_FASTCALL lj_opt_dse_xstore(jit_State *J)
IRRef ref = *refp;
if (J->chain[IR_CALLXS] > lim) lim = J->chain[IR_CALLXS];
if (J->chain[IR_XBAR] > lim) lim = J->chain[IR_XBAR];
+ if (J->chain[IR_XSNEW] > lim) lim = J->chain[IR_XSNEW];
while (ref > lim) { /* Search for redundant or conflicting stores. */
IRIns *store = IR(ref);
switch (aa_xref(J, xr, fins, store)) {
diff --git a/deps/luajit/src/lj_opt_narrow.c b/deps/luajit/src/lj_opt_narrow.c
index 2cecf65d..58b3763d 100644
--- a/deps/luajit/src/lj_opt_narrow.c
+++ b/deps/luajit/src/lj_opt_narrow.c
@@ -1,7 +1,7 @@
/*
** NARROW: Narrowing of numbers to integers (double to int32_t).
** STRIPOV: Stripping of overflow checks.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_opt_narrow_c
@@ -247,10 +247,16 @@ static void narrow_stripov_backprop(NarrowConv *nc, IRRef ref, int depth)
if (bp) {
ref = bp->val;
} else if (++depth < NARROW_MAX_BACKPROP && nc->sp < nc->maxsp) {
+ NarrowIns *savesp = nc->sp;
narrow_stripov_backprop(nc, ir->op1, depth);
- narrow_stripov_backprop(nc, ir->op2, depth);
- *nc->sp++ = NARROWINS(IRT(ir->o - IR_ADDOV + IR_ADD, IRT_INT), ref);
- return;
+ if (nc->sp < nc->maxsp) {
+ narrow_stripov_backprop(nc, ir->op2, depth);
+ if (nc->sp < nc->maxsp) {
+ *nc->sp++ = NARROWINS(IRT(ir->o - IR_ADDOV + IR_ADD, IRT_INT), ref);
+ return;
+ }
+ }
+ nc->sp = savesp; /* Path too deep, need to backtrack. */
}
}
*nc->sp++ = NARROWINS(NARROW_REF, ref);
@@ -263,6 +269,8 @@ static int narrow_conv_backprop(NarrowConv *nc, IRRef ref, int depth)
IRIns *ir = IR(ref);
IRRef cref;
+ if (nc->sp >= nc->maxsp) return 10; /* Path too deep. */
+
/* Check the easy cases first. */
if (ir->o == IR_CONV && (ir->op2 & IRCONV_SRCMASK) == IRT_INT) {
if ((nc->mode & IRCONV_CONVMASK) <= IRCONV_ANY)
diff --git a/deps/luajit/src/lj_opt_sink.c b/deps/luajit/src/lj_opt_sink.c
index 3a333461..a98e9dfe 100644
--- a/deps/luajit/src/lj_opt_sink.c
+++ b/deps/luajit/src/lj_opt_sink.c
@@ -1,6 +1,6 @@
/*
** SINK: Allocation Sinking and Store Sinking.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_opt_sink_c
diff --git a/deps/luajit/src/lj_opt_split.c b/deps/luajit/src/lj_opt_split.c
index 99d10584..1cee5093 100644
--- a/deps/luajit/src/lj_opt_split.c
+++ b/deps/luajit/src/lj_opt_split.c
@@ -1,6 +1,6 @@
/*
** SPLIT: Split 64 bit IR instructions into 32 bit IR instructions.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_opt_split_c
diff --git a/deps/luajit/src/lj_parse.c b/deps/luajit/src/lj_parse.c
index e8aafba2..abfac3c0 100644
--- a/deps/luajit/src/lj_parse.c
+++ b/deps/luajit/src/lj_parse.c
@@ -1,6 +1,6 @@
/*
** Lua parser (source code -> bytecode).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
@@ -685,10 +685,12 @@ static BCPos bcemit_jmp(FuncState *fs)
BCPos j = fs->pc - 1;
BCIns *ip = &fs->bcbase[j].ins;
fs->jpc = NO_JMP;
- if ((int32_t)j >= (int32_t)fs->lasttarget && bc_op(*ip) == BC_UCLO)
+ if ((int32_t)j >= (int32_t)fs->lasttarget && bc_op(*ip) == BC_UCLO) {
setbc_j(ip, NO_JMP);
- else
+ fs->lasttarget = j+1;
+ } else {
j = bcemit_AJ(fs, BC_JMP, fs->freereg, NO_JMP);
+ }
jmp_append(fs, &j, jpc);
return j;
}
diff --git a/deps/luajit/src/lj_parse.h b/deps/luajit/src/lj_parse.h
index 532657a0..dc4fd405 100644
--- a/deps/luajit/src/lj_parse.h
+++ b/deps/luajit/src/lj_parse.h
@@ -1,6 +1,6 @@
/*
** Lua parser (source code -> bytecode).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_PARSE_H
diff --git a/deps/luajit/src/lj_record.c b/deps/luajit/src/lj_record.c
index c6848fc0..843108c8 100644
--- a/deps/luajit/src/lj_record.c
+++ b/deps/luajit/src/lj_record.c
@@ -1,6 +1,6 @@
/*
** Trace recorder (bytecode -> SSA IR).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_record_c
@@ -421,6 +421,7 @@ static void rec_for_loop(jit_State *J, const BCIns *fori, ScEvEntry *scev,
J->base[ra+FORL_IDX] = idx = emitir(IRT(IR_ADD, t), idx, step);
J->base[ra+FORL_EXT] = idx;
scev->idx = tref_ref(idx);
+ setmref(scev->pc, fori);
J->maxslot = ra+FORL_EXT+1;
}
@@ -436,7 +437,7 @@ static LoopEvent rec_for(jit_State *J, const BCIns *fori, int isforl)
IRType t;
if (isforl) { /* Handle FORL/JFORL opcodes. */
TRef idx = tr[FORL_IDX];
- if (tref_ref(idx) == J->scev.idx) {
+ if (mref(J->scev.pc, const BCIns) == fori && tref_ref(idx) == J->scev.idx) {
t = J->scev.t.irt;
stop = J->scev.stop;
idx = emitir(IRT(IR_ADD, t), idx, J->scev.step);
@@ -744,6 +745,8 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults)
} else if (J->parent == 0 && !bc_isret(bc_op(J->cur.startins))) {
/* Return to lower frame would leave the loop in a root trace. */
lj_trace_err(J, LJ_TRERR_LLEAVE);
+ } else if (J->needsnap) { /* Tailcalled to ff with side-effects. */
+ lj_trace_err(J, LJ_TRERR_NYIRETL); /* No way to insert snapshot here. */
} else { /* Return to lower frame. Guard for the target we return to. */
TRef trpt = lj_ir_kgc(J, obj2gco(pt), IRT_PROTO);
TRef trpc = lj_ir_kptr(J, (void *)frame_pc(frame));
@@ -1059,7 +1062,7 @@ static void rec_idx_abc(jit_State *J, TRef asizeref, TRef ikey, uint32_t asize)
lua_assert(irt_isint(J->scev.t) && ir->o == IR_SLOAD);
stop = numberVint(&(J->L->base - J->baseslot)[ir->op1 + FORL_STOP]);
/* Runtime value for stop of loop is within bounds? */
- if ((int64_t)stop + ofs < (int64_t)asize) {
+ if ((uint64_t)stop + ofs < (uint64_t)asize) {
/* Emit invariant bounds check for stop. */
emitir(IRTG(IR_ABC, IRT_P32), asizeref, ofs == 0 ? J->scev.stop :
emitir(IRTI(IR_ADD), J->scev.stop, ofsref));
@@ -2153,6 +2156,7 @@ void lj_record_setup(jit_State *J)
memset(J->chain, 0, sizeof(J->chain));
memset(J->bpropcache, 0, sizeof(J->bpropcache));
J->scev.idx = REF_NIL;
+ setmref(J->scev.pc, NULL);
J->baseslot = 1; /* Invoking function is at base[-1]. */
J->base = J->slot + J->baseslot;
diff --git a/deps/luajit/src/lj_record.h b/deps/luajit/src/lj_record.h
index 940e105f..c9f4882a 100644
--- a/deps/luajit/src/lj_record.h
+++ b/deps/luajit/src/lj_record.h
@@ -1,6 +1,6 @@
/*
** Trace recorder (bytecode -> SSA IR).
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_RECORD_H
diff --git a/deps/luajit/src/lj_snap.c b/deps/luajit/src/lj_snap.c
index 1c978c26..5c870baf 100644
--- a/deps/luajit/src/lj_snap.c
+++ b/deps/luajit/src/lj_snap.c
@@ -1,6 +1,6 @@
/*
** Snapshot handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_snap_c
@@ -104,8 +104,6 @@ static BCReg snapshot_framelinks(jit_State *J, SnapEntry *map)
if (frame_islua(frame)) {
map[f++] = SNAP_MKPC(frame_pc(frame));
frame = frame_prevl(frame);
- if (frame + funcproto(frame_func(frame))->framesize > ftop)
- ftop = frame + funcproto(frame_func(frame))->framesize;
} else if (frame_iscont(frame)) {
map[f++] = SNAP_MKFTSZ(frame_ftsz(frame));
map[f++] = SNAP_MKPC(frame_contpc(frame));
@@ -114,7 +112,10 @@ static BCReg snapshot_framelinks(jit_State *J, SnapEntry *map)
lua_assert(!frame_isc(frame));
map[f++] = SNAP_MKFTSZ(frame_ftsz(frame));
frame = frame_prevd(frame);
+ continue;
}
+ if (frame + funcproto(frame_func(frame))->framesize > ftop)
+ ftop = frame + funcproto(frame_func(frame))->framesize;
}
lua_assert(f == (MSize)(1 + J->framedepth));
return (BCReg)(ftop - lim);
diff --git a/deps/luajit/src/lj_snap.h b/deps/luajit/src/lj_snap.h
index 1b2d74da..9a125be7 100644
--- a/deps/luajit/src/lj_snap.h
+++ b/deps/luajit/src/lj_snap.h
@@ -1,6 +1,6 @@
/*
** Snapshot handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_SNAP_H
diff --git a/deps/luajit/src/lj_state.c b/deps/luajit/src/lj_state.c
index f972fdce..e654afae 100644
--- a/deps/luajit/src/lj_state.c
+++ b/deps/luajit/src/lj_state.c
@@ -1,6 +1,6 @@
/*
** State and stack handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
@@ -175,7 +175,7 @@ static void close_state(lua_State *L)
g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0);
}
-#if LJ_64
+#if LJ_64 && !(defined(LUAJIT_USE_VALGRIND) && defined(LUAJIT_USE_SYSMALLOC))
lua_State *lj_state_newstate(lua_Alloc f, void *ud)
#else
LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)
diff --git a/deps/luajit/src/lj_state.h b/deps/luajit/src/lj_state.h
index 74249d9b..687889a2 100644
--- a/deps/luajit/src/lj_state.h
+++ b/deps/luajit/src/lj_state.h
@@ -1,6 +1,6 @@
/*
** State and stack handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_STATE_H
diff --git a/deps/luajit/src/lj_str.c b/deps/luajit/src/lj_str.c
index aead8b53..ca60bccb 100644
--- a/deps/luajit/src/lj_str.c
+++ b/deps/luajit/src/lj_str.c
@@ -1,6 +1,6 @@
/*
** String handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lj_str.h b/deps/luajit/src/lj_str.h
index 1602c980..99697051 100644
--- a/deps/luajit/src/lj_str.h
+++ b/deps/luajit/src/lj_str.h
@@ -1,6 +1,6 @@
/*
** String handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_STR_H
diff --git a/deps/luajit/src/lj_strscan.c b/deps/luajit/src/lj_strscan.c
index a21c414a..568f647d 100644
--- a/deps/luajit/src/lj_strscan.c
+++ b/deps/luajit/src/lj_strscan.c
@@ -1,6 +1,6 @@
/*
** String scanning.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include
@@ -199,7 +199,7 @@ static StrScanFmt strscan_dec(const uint8_t *p, TValue *o,
*xip++ = d + ((*p != '.' ? *p : *++p) & 15); p++;
}
/* Scan and realign trailing digit. */
- if (i) *xip++ = 10 * ((*p != '.' ? *p : *++p) & 15), ex10--, p++;
+ if (i) *xip++ = 10 * ((*p != '.' ? *p : *++p) & 15), ex10--, dig++, p++;
/* Summarize rounding-effect of excess digits. */
if (dig > STRSCAN_MAXDIG) {
@@ -289,14 +289,15 @@ static StrScanFmt strscan_dec(const uint8_t *p, TValue *o,
/* Scale down until no more than 17 or 18 integer part digits remain. */
while (idig > 9) {
- uint32_t i, cy = 0;
+ uint32_t i = hi, cy = 0;
ex2 += 6;
- for (i = hi; i != lo; i = DNEXT(i)) {
+ do {
cy += xi[i];
xi[i] = (cy >> 6);
cy = 100 * (cy & 0x3f);
if (xi[i] == 0 && i == hi) hi = DNEXT(hi), idig--;
- }
+ i = DNEXT(i);
+ } while (i != lo);
while (cy) {
if (hi == lo) { xi[DPREV(lo)] |= 1; break; }
xi[lo] = (cy >> 6); lo = DNEXT(lo);
diff --git a/deps/luajit/src/lj_strscan.h b/deps/luajit/src/lj_strscan.h
index 15abd6af..77606893 100644
--- a/deps/luajit/src/lj_strscan.h
+++ b/deps/luajit/src/lj_strscan.h
@@ -1,6 +1,6 @@
/*
** String scanning.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_STRSCAN_H
diff --git a/deps/luajit/src/lj_tab.c b/deps/luajit/src/lj_tab.c
index fc7d0f1c..a8062db7 100644
--- a/deps/luajit/src/lj_tab.c
+++ b/deps/luajit/src/lj_tab.c
@@ -1,6 +1,6 @@
/*
** Table handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
diff --git a/deps/luajit/src/lj_tab.h b/deps/luajit/src/lj_tab.h
index 44b1bbbd..f0d228eb 100644
--- a/deps/luajit/src/lj_tab.h
+++ b/deps/luajit/src/lj_tab.h
@@ -1,6 +1,6 @@
/*
** Table handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_TAB_H
diff --git a/deps/luajit/src/lj_target.h b/deps/luajit/src/lj_target.h
index 820a97a4..1a242325 100644
--- a/deps/luajit/src/lj_target.h
+++ b/deps/luajit/src/lj_target.h
@@ -1,6 +1,6 @@
/*
** Definitions for target CPU.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_TARGET_H
diff --git a/deps/luajit/src/lj_target_arm.h b/deps/luajit/src/lj_target_arm.h
index 63a0c925..6d4d0aed 100644
--- a/deps/luajit/src/lj_target_arm.h
+++ b/deps/luajit/src/lj_target_arm.h
@@ -1,6 +1,6 @@
/*
** Definitions for ARM CPUs.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_TARGET_ARM_H
diff --git a/deps/luajit/src/lj_target_mips.h b/deps/luajit/src/lj_target_mips.h
index e0fc152d..0ab140bf 100644
--- a/deps/luajit/src/lj_target_mips.h
+++ b/deps/luajit/src/lj_target_mips.h
@@ -1,6 +1,6 @@
/*
** Definitions for MIPS CPUs.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_TARGET_MIPS_H
diff --git a/deps/luajit/src/lj_target_ppc.h b/deps/luajit/src/lj_target_ppc.h
index 475e0465..2caeeb04 100644
--- a/deps/luajit/src/lj_target_ppc.h
+++ b/deps/luajit/src/lj_target_ppc.h
@@ -1,6 +1,6 @@
/*
** Definitions for PPC CPUs.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_TARGET_PPC_H
diff --git a/deps/luajit/src/lj_target_x86.h b/deps/luajit/src/lj_target_x86.h
index 41f401b0..d12a1b87 100644
--- a/deps/luajit/src/lj_target_x86.h
+++ b/deps/luajit/src/lj_target_x86.h
@@ -1,6 +1,6 @@
/*
** Definitions for x86 and x64 CPUs.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_TARGET_X86_H
diff --git a/deps/luajit/src/lj_trace.c b/deps/luajit/src/lj_trace.c
index 9e5e400f..e51ec546 100644
--- a/deps/luajit/src/lj_trace.c
+++ b/deps/luajit/src/lj_trace.c
@@ -1,6 +1,6 @@
/*
** Trace management.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_trace_c
@@ -607,6 +607,7 @@ static TValue *trace_state(lua_State *L, lua_CFunction dummy, void *ud)
}
lj_opt_split(J);
lj_opt_sink(J);
+ if (!J->loopref) J->cur.snap[J->cur.nsnap-1].count = SNAPCOUNT_DONE;
J->state = LJ_TRACE_ASM;
break;
diff --git a/deps/luajit/src/lj_trace.h b/deps/luajit/src/lj_trace.h
index f3109081..4fbe5cf2 100644
--- a/deps/luajit/src/lj_trace.h
+++ b/deps/luajit/src/lj_trace.h
@@ -1,6 +1,6 @@
/*
** Trace management.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_TRACE_H
diff --git a/deps/luajit/src/lj_traceerr.h b/deps/luajit/src/lj_traceerr.h
index 521560a1..9bef117a 100644
--- a/deps/luajit/src/lj_traceerr.h
+++ b/deps/luajit/src/lj_traceerr.h
@@ -1,6 +1,6 @@
/*
** Trace compiler error messages.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/* This file may be included multiple times with different TREDEF macros. */
diff --git a/deps/luajit/src/lj_udata.c b/deps/luajit/src/lj_udata.c
index 6cd357ec..d401a3d8 100644
--- a/deps/luajit/src/lj_udata.c
+++ b/deps/luajit/src/lj_udata.c
@@ -1,6 +1,6 @@
/*
** Userdata handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_udata_c
diff --git a/deps/luajit/src/lj_udata.h b/deps/luajit/src/lj_udata.h
index e03d9a3a..676e970f 100644
--- a/deps/luajit/src/lj_udata.h
+++ b/deps/luajit/src/lj_udata.h
@@ -1,6 +1,6 @@
/*
** Userdata handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_UDATA_H
diff --git a/deps/luajit/src/lj_vm.h b/deps/luajit/src/lj_vm.h
index 4a8f03f0..036cabc5 100644
--- a/deps/luajit/src/lj_vm.h
+++ b/deps/luajit/src/lj_vm.h
@@ -1,6 +1,6 @@
/*
** Assembler VM interface definitions.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_VM_H
diff --git a/deps/luajit/src/lj_vmevent.c b/deps/luajit/src/lj_vmevent.c
index e14ad5b6..81fe47d4 100644
--- a/deps/luajit/src/lj_vmevent.c
+++ b/deps/luajit/src/lj_vmevent.c
@@ -1,6 +1,6 @@
/*
** VM event handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#include
diff --git a/deps/luajit/src/lj_vmevent.h b/deps/luajit/src/lj_vmevent.h
index 51bae015..231e00ec 100644
--- a/deps/luajit/src/lj_vmevent.h
+++ b/deps/luajit/src/lj_vmevent.h
@@ -1,6 +1,6 @@
/*
** VM event handling.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LJ_VMEVENT_H
diff --git a/deps/luajit/src/lj_vmmath.c b/deps/luajit/src/lj_vmmath.c
index 63886aa7..31c6029f 100644
--- a/deps/luajit/src/lj_vmmath.c
+++ b/deps/luajit/src/lj_vmmath.c
@@ -1,6 +1,6 @@
/*
** Math helper functions for assembler VM.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#define lj_vmmath_c
diff --git a/deps/luajit/src/ljamalg.c b/deps/luajit/src/ljamalg.c
index 52a86153..9b237b7e 100644
--- a/deps/luajit/src/ljamalg.c
+++ b/deps/luajit/src/ljamalg.c
@@ -1,6 +1,6 @@
/*
** LuaJIT core and libraries amalgamation.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
/*
diff --git a/deps/luajit/src/luaconf.h b/deps/luajit/src/luaconf.h
index affb7da8..84fa6418 100644
--- a/deps/luajit/src/luaconf.h
+++ b/deps/luajit/src/luaconf.h
@@ -1,6 +1,6 @@
/*
** Configuration header.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef luaconf_h
@@ -37,7 +37,7 @@
#endif
#define LUA_LROOT "/usr/local"
#define LUA_LUADIR "/lua/5.1/"
-#define LUA_LJDIR "/luajit-2.0.3/"
+#define LUA_LJDIR "/luajit-2.0.4/"
#ifdef LUA_ROOT
#define LUA_JROOT LUA_ROOT
diff --git a/deps/luajit/src/luajit.c b/deps/luajit/src/luajit.c
index 4cccf04e..85d713fb 100644
--- a/deps/luajit/src/luajit.c
+++ b/deps/luajit/src/luajit.c
@@ -1,6 +1,6 @@
/*
** LuaJIT frontend. Runs commands, scripts, read-eval-print (REPL) etc.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
**
** Major portions taken verbatim or adapted from the Lua interpreter.
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
@@ -301,17 +301,17 @@ static int loadjitmodule(lua_State *L)
lua_concat(L, 2);
if (lua_pcall(L, 1, 1, 0)) {
const char *msg = lua_tostring(L, -1);
- if (msg && !strncmp(msg, "module ", 7)) {
- err:
- l_message(progname,
- "unknown luaJIT command or jit.* modules not installed");
- return 1;
- } else {
- return report(L, 1);
- }
+ if (msg && !strncmp(msg, "module ", 7))
+ goto nomodule;
+ return report(L, 1);
}
lua_getfield(L, -1, "start");
- if (lua_isnil(L, -1)) goto err;
+ if (lua_isnil(L, -1)) {
+ nomodule:
+ l_message(progname,
+ "unknown luaJIT command or jit.* modules not installed");
+ return 1;
+ }
lua_remove(L, -2); /* Drop module table. */
return 0;
}
diff --git a/deps/luajit/src/luajit.h b/deps/luajit/src/luajit.h
index be721cf4..9ced18eb 100644
--- a/deps/luajit/src/luajit.h
+++ b/deps/luajit/src/luajit.h
@@ -1,7 +1,7 @@
/*
** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
**
-** Copyright (C) 2005-2014 Mike Pall. All rights reserved.
+** Copyright (C) 2005-2015 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
@@ -30,10 +30,10 @@
#include "lua.h"
-#define LUAJIT_VERSION "LuaJIT 2.0.3"
-#define LUAJIT_VERSION_NUM 20003 /* Version 2.0.3 = 02.00.03. */
-#define LUAJIT_VERSION_SYM luaJIT_version_2_0_3
-#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2014 Mike Pall"
+#define LUAJIT_VERSION "LuaJIT 2.0.4"
+#define LUAJIT_VERSION_NUM 20004 /* Version 2.0.4 = 02.00.04. */
+#define LUAJIT_VERSION_SYM luaJIT_version_2_0_4
+#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2015 Mike Pall"
#define LUAJIT_URL "http://luajit.org/"
/* Modes for luaJIT_setmode. */
diff --git a/deps/luajit/src/lualib.h b/deps/luajit/src/lualib.h
index 1c1e3179..96530e79 100644
--- a/deps/luajit/src/lualib.h
+++ b/deps/luajit/src/lualib.h
@@ -1,6 +1,6 @@
/*
** Standard library header.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
*/
#ifndef _LUALIB_H
diff --git a/deps/luajit/src/msvcbuild.bat b/deps/luajit/src/msvcbuild.bat
index 9160e0f8..4b501855 100644
--- a/deps/luajit/src/msvcbuild.bat
+++ b/deps/luajit/src/msvcbuild.bat
@@ -1,5 +1,5 @@
@rem Script to build LuaJIT with MSVC.
-@rem Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+@rem Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
@rem
@rem Either open a "Visual Studio .NET Command Prompt"
@rem (Note that the Express Edition does not contain an x64 compiler)
diff --git a/deps/luajit/src/psvitabuild.bat b/deps/luajit/src/psvitabuild.bat
new file mode 100644
index 00000000..3991dc65
--- /dev/null
+++ b/deps/luajit/src/psvitabuild.bat
@@ -0,0 +1,93 @@
+@rem Script to build LuaJIT with the PS Vita SDK.
+@rem Donated to the public domain.
+@rem
+@rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
+@rem Then cd to this directory and run this script.
+
+@if not defined INCLUDE goto :FAIL
+@if not defined SCE_PSP2_SDK_DIR goto :FAIL
+
+@setlocal
+@rem ---- Host compiler ----
+@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+@set LJLINK=link /nologo
+@set LJMT=mt /nologo
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
+
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+ %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+@rem Check for 32 bit host compiler.
+@minilua
+@if errorlevel 8 goto :FAIL
+
+@set DASMFLAGS=-D FPU -D HFABI
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc
+@if errorlevel 1 goto :BAD
+
+%LJCOMPILE% /I "." /I %DASMDIR% -DLUAJIT_TARGET=LUAJIT_ARCH_ARM -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLJ_TARGET_PSVITA=1 host\buildvm*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+ %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@rem ---- Cross compiler ----
+@set LJCOMPILE="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2snc" -c -w -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC
+@set LJLIB="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2ld32" -r --output=
+@set INCLUDE=""
+
+"%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2as" -o lj_vm.o lj_vm.s
+
+@if "%1" neq "debug" goto :NODEBUG
+@shift
+@set LJCOMPILE=%LJCOMPILE% -g -O0
+@set TARGETLIB=libluajitD.a
+goto :BUILD
+:NODEBUG
+@set LJCOMPILE=%LJCOMPILE% -O2
+@set TARGETLIB=libluajit.a
+:BUILD
+del %TARGETLIB%
+
+%LJCOMPILE% ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLIB%%TARGETLIB% ljamalg.o lj_vm.o
+@if errorlevel 1 goto :BAD
+
+@del *.o *.obj *.manifest minilua.exe buildvm.exe
+@echo.
+@echo === Successfully built LuaJIT for PS Vita ===
+
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo To run this script you must open a "Visual Studio .NET Command Prompt"
+@echo (32 bit host compiler). The PS Vita SDK must be installed, too.
+:END
diff --git a/deps/luajit/src/vm_arm.dasc b/deps/luajit/src/vm_arm.dasc
index 82cba909..457efa63 100644
--- a/deps/luajit/src/vm_arm.dasc
+++ b/deps/luajit/src/vm_arm.dasc
@@ -1,6 +1,6 @@
|// Low-level VM code for ARM CPUs.
|// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
|
|.arch arm
|.section code_op, code_sub
@@ -335,7 +335,7 @@ static void build_subroutines(BuildCtx *ctx)
| // - The GC shrinks the stack in between.
| // - A return back from a lua_call() with (high) nresults adjustment.
| str BASE, L->top // Save current top held in BASE (yes).
- | mov CARG2, KBASE
+ | lsr CARG2, KBASE, #3
| mov CARG1, L
| bl extern lj_state_growstack // (lua_State *L, int n)
| ldr BASE, L->top // Need the (realloced) L->top in BASE.
@@ -389,7 +389,7 @@ static void build_subroutines(BuildCtx *ctx)
| str BASE, L->base
| add PC, PC, #4 // Must point after first instruction.
| str RC, L->top
- | lsr CARG3, RA, #3
+ | lsr CARG2, RA, #3
|2:
| // L->base = new base, L->top = top
| str PC, SAVE_PC
@@ -539,9 +539,8 @@ static void build_subroutines(BuildCtx *ctx)
|1:
| beq ->cont_ffi_callback // cont = 1: return from FFI callback.
| // cont = 0: tailcall from C function.
- | ldr CARG3, [BASE, FRAME_FUNC]
- | sub CARG4, CARG4, #16
- | sub RC, CARG4, BASE
+ | sub CARG4, CARG4, #16
+ | sub RC, CARG4, BASE
| b ->vm_call_tail
|.endif
|
@@ -3241,10 +3240,10 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| mvn RC, RC
| ldr UPVAL:CARG2, [LFUNC:CARG2, RA]
| ldr STR:CARG3, [KBASE, RC, lsl #2]
- | mvn CARG4, #~LJ_TSTR
| ldrb RB, UPVAL:CARG2->marked
- | ldr CARG2, UPVAL:CARG2->v
| ldrb RC, UPVAL:CARG2->closed
+ | ldr CARG2, UPVAL:CARG2->v
+ | mvn CARG4, #~LJ_TSTR
| tst RB, #LJ_GC_BLACK // isblack(uv)
| ldrb RB, STR:CARG3->marked
| strd CARG34, [CARG2]
diff --git a/deps/luajit/src/vm_mips.dasc b/deps/luajit/src/vm_mips.dasc
index 0ec13e60..ac8346bb 100644
--- a/deps/luajit/src/vm_mips.dasc
+++ b/deps/luajit/src/vm_mips.dasc
@@ -1,6 +1,6 @@
|// Low-level VM code for MIPS CPUs.
|// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
|
|.arch mips
|.section code_op, code_sub
@@ -398,7 +398,7 @@ static void build_subroutines(BuildCtx *ctx)
| // - A return back from a lua_call() with (high) nresults adjustment.
| load_got lj_state_growstack
| move MULTRES, RD
- | move CARG2, TMP2
+ | srl CARG2, TMP2, 3
| call_intern lj_state_growstack // (lua_State *L, int n)
|. move CARG1, L
| lw TMP2, SAVE_NRES
diff --git a/deps/luajit/src/vm_ppc.dasc b/deps/luajit/src/vm_ppc.dasc
index da75f556..ad8a023e 100644
--- a/deps/luajit/src/vm_ppc.dasc
+++ b/deps/luajit/src/vm_ppc.dasc
@@ -1,6 +1,6 @@
|// Low-level VM code for PowerPC CPUs.
|// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
|
|.arch ppc
|.section code_op, code_sub
@@ -75,6 +75,29 @@
|.endif
|.endmacro
|
+|.macro clrso, reg
+|.if PPE
+| li reg, 0
+| mtxer reg
+|.else
+| mcrxr cr0
+|.endif
+|.endmacro
+|
+|.macro checkov, reg, noov
+|.if PPE
+| mfxer reg
+| add reg, reg, reg
+| cmpwi reg, 0
+| li reg, 0
+| mtxer reg
+| bgey noov
+|.else
+| mcrxr cr0
+| bley noov
+|.endif
+|.endmacro
+|
|//-----------------------------------------------------------------------
|
|// Fixed register assignments for the interpreter.
@@ -563,7 +586,7 @@ static void build_subroutines(BuildCtx *ctx)
| // - A return back from a lua_call() with (high) nresults adjustment.
| stp BASE, L->top // Save current top held in BASE (yes).
| mr SAVE0, RD
- | mr CARG2, TMP2
+ | srwi CARG2, TMP2, 3
| mr CARG1, L
| bl extern lj_state_growstack // (lua_State *L, int n)
| lwz TMP2, SAVE_NRES
@@ -2587,7 +2610,7 @@ static void build_subroutines(BuildCtx *ctx)
| stw CARG2, DISPATCH_GL(vmstate)(DISPATCH)
| savex_ 0,1,2,3
| stw CARG1, 0(sp) // Store extended stack chain.
- | mcrxr cr0 // Clear SO flag.
+ | clrso TMP1
| savex_ 4,5,6,7
| addi CARG2, sp, 16+32*8+32*4 // Recompute original value of sp.
| savex_ 8,9,10,11
@@ -2706,7 +2729,7 @@ static void build_subroutines(BuildCtx *ctx)
| cmpwi CARG2, 0
| li CARG1, 0
| beqlr
- | mcrxr cr0 // Clear SO for -2147483648 % -1 and return 0.
+ | clrso TMP0 // Clear SO for -2147483648 % -1 and return 0.
| blr
|
|//-----------------------------------------------------------------------
@@ -3309,7 +3332,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
|4:
|.if not GPR64
| // Potential overflow.
- | mcrxr cr0; bley <1 // Ignore unrelated overflow.
+ | checkov TMP1, <1 // Ignore unrelated overflow.
|.endif
| lus TMP1, 0x41e0 // 2^31.
| li TMP0, 0
@@ -3494,7 +3517,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
|2:
| ins_next2
|4: // Overflow.
- | mcrxr cr0; bley <1 // Ignore unrelated overflow.
+ | checkov TMP0, <1 // Ignore unrelated overflow.
| ins_arithfallback b
|5: // FP variant.
||if (vk == 1) {
@@ -4692,7 +4715,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| b <1
if (vk) {
|6: // Potential overflow.
- | mcrxr cr0; bley <4 // Ignore unrelated overflow.
+ | checkov TMP0, <4 // Ignore unrelated overflow.
| b <2
}
|.endif
@@ -4832,7 +4855,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| // Traces on PPC don't store the trace number, so use 0.
| stw ZERO, DISPATCH_GL(vmstate)(DISPATCH)
| lwzx TRACE:TMP2, TMP1, RD
- | mcrxr cr0 // Clear SO flag.
+ | clrso TMP1
| lp TMP2, TRACE:TMP2->mcode
| stw BASE, DISPATCH_GL(jit_base)(DISPATCH)
| mtctr TMP2
diff --git a/deps/luajit/src/vm_ppcspe.dasc b/deps/luajit/src/vm_ppcspe.dasc
index adcec244..53ea2d96 100644
--- a/deps/luajit/src/vm_ppcspe.dasc
+++ b/deps/luajit/src/vm_ppcspe.dasc
@@ -1,6 +1,6 @@
|// Low-level VM code for PowerPC/e500 CPUs.
|// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
|
|.arch ppc
|.section code_op, code_sub
diff --git a/deps/luajit/src/vm_x86.dasc b/deps/luajit/src/vm_x86.dasc
index 8a9b536d..6cdb8cbd 100644
--- a/deps/luajit/src/vm_x86.dasc
+++ b/deps/luajit/src/vm_x86.dasc
@@ -1,6 +1,6 @@
|// Low-level VM code for x86 CPUs.
|// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
|
|.if P64
|.arch x64
@@ -1617,7 +1617,7 @@ static void build_subroutines(BuildCtx *ctx)
| mov RD, 1+3
| jmp ->fff_res
|
- |.ffunc_1 ipairs_aux
+ |.ffunc_2 ipairs_aux
| cmp dword [BASE+4], LJ_TTAB; jne ->fff_fallback
| cmp dword [BASE+12], LJ_TISNUM
|.if DUALNUM
@@ -2198,7 +2198,7 @@ static void build_subroutines(BuildCtx *ctx)
|.endif
|
|.ffunc_nnr math_fmod
- |1: ; fprem; fnstsw ax; sahf; jp <1
+ |1: ; fprem; fnstsw ax; and ax, 0x400; jnz <1
| fpop1
| jmp ->fff_resn
|
@@ -2564,8 +2564,8 @@ static void build_subroutines(BuildCtx *ctx)
|
|.define TOBIT_BIAS, 0x59c00000 // 2^52 + 2^51 (float, not double!).
|
- |.macro .ffunc_bit, name, kind
- | .ffunc_1 name
+ |.macro .ffunc_bit, name, kind, fdef
+ | fdef name
|.if kind == 2
|.if SSE
| sseconst_tobit xmm1, RBa
@@ -2608,6 +2608,10 @@ static void build_subroutines(BuildCtx *ctx)
|2:
|.endmacro
|
+ |.macro .ffunc_bit, name, kind
+ | .ffunc_bit name, kind, .ffunc_1
+ |.endmacro
+ |
|.ffunc_bit bit_tobit, 0
|.if DUALNUM or SSE
|.if not SSE
@@ -2681,7 +2685,7 @@ static void build_subroutines(BuildCtx *ctx)
|
|.macro .ffunc_bit_sh, name, ins
|.if DUALNUM
- | .ffunc_bit name, 1
+ | .ffunc_bit name, 1, .ffunc_2
| // Note: no inline conversion from number for 2nd argument!
| cmp dword [BASE+12], LJ_TISNUM; jne ->fff_fallback
| mov RA, dword [BASE+8]
@@ -5320,8 +5324,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| jnz <4
| movzx RA, PC_RA
| not RAa
- | lea RA, [BASE+RA*8]
- | mov LFUNC:KBASE, [RA-8] // Need to prepare KBASE.
+ | mov LFUNC:KBASE, [BASE+RA*8-8] // Need to prepare KBASE.
| mov KBASE, LFUNC:KBASE->pc
| mov KBASE, [KBASE+PC2PROTO(k)]
| jmp <4
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/ext_ffi.html b/deps/luajit/doc/ext_ffi.html index fa9ca971..77b8e26c 100644 --- a/deps/luajit/doc/ext_ffi.html +++ b/deps/luajit/doc/ext_ffi.html @@ -4,7 +4,7 @@
Motivating Example: Using C Data Structures
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/ext_ffi_api.html b/deps/luajit/doc/ext_ffi_api.html index dcffcfa3..8f577e9f 100644 --- a/deps/luajit/doc/ext_ffi_api.html +++ b/deps/luajit/doc/ext_ffi_api.html @@ -4,7 +4,7 @@
Extensions to the Lua Parser
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/ext_ffi_semantics.html b/deps/luajit/doc/ext_ffi_semantics.html index 7e5f7035..c267b555 100644 --- a/deps/luajit/doc/ext_ffi_semantics.html +++ b/deps/luajit/doc/ext_ffi_semantics.html @@ -4,7 +4,7 @@
Current Status
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/ext_ffi_tutorial.html b/deps/luajit/doc/ext_ffi_tutorial.html index 01fb8992..8f99bfb1 100644 --- a/deps/luajit/doc/ext_ffi_tutorial.html +++ b/deps/luajit/doc/ext_ffi_tutorial.html @@ -4,7 +4,7 @@
To Cache or Not to Cache
individual C functions like this:-local funca, funcb = ffi.C.funcb, ffi.C.funcb -- Not helpful! +local funca, funcb = ffi.C.funca, ffi.C.funcb -- Not helpful! local function foo(x, n) for i=1,n do funcb(funca(x, i), 1) end end @@ -591,7 +591,7 @@To Cache or Not to Cache
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/ext_jit.html b/deps/luajit/doc/ext_jit.html index 098be5e0..27351dd6 100644 --- a/deps/luajit/doc/ext_jit.html +++ b/deps/luajit/doc/ext_jit.html @@ -4,7 +4,7 @@
jit.os
jit.arch
Contains the target architecture name: -"x86", "x64" or "ppcspe". +"x86", "x64", "arm", "ppc", "ppcspe", or "mips".
jit.opt.* — JIT compiler optimization control
@@ -189,7 +189,7 @@jit.util.* — JIT compiler introspection
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/extensions.html b/deps/luajit/doc/extensions.html index 20b597f1..e9cd136c 100644 --- a/deps/luajit/doc/extensions.html +++ b/deps/luajit/doc/extensions.html @@ -4,7 +4,7 @@
C++ Exception Interoperability
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/faq.html b/deps/luajit/doc/faq.html index ffc2ae89..9902f090 100644 --- a/deps/luajit/doc/faq.html +++ b/deps/luajit/doc/faq.html @@ -4,7 +4,7 @@
Frequently Asked Questions (FAQ)
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/install.html b/deps/luajit/doc/install.html index 2388ff33..7a878b1c 100644 --- a/deps/luajit/doc/install.html +++ b/deps/luajit/doc/install.html @@ -4,7 +4,7 @@
Installation
ARM9E+
PSP2 (PS VITA)
Prerequisites
and change to the newly created directory:-tar zxf LuaJIT-2.0.3.tar.gz -cd LuaJIT-2.0.3+tar zxf LuaJIT-2.0.4.tar.gz +cd LuaJIT-2.0.4
Building LuaJIT
The supplied Makefiles try to auto-detect the settings needed for your @@ -458,41 +458,56 @@
Cross-compiling LuaJIT
make HOST_CC="gcc -m32 -arch i386" CROSS=$ISDKP TARGET_FLAGS="$ISDKF" \ TARGET_SYS=iOS + +Cross-compiling for consoles
-You can cross-compile for PS3 using the PS3 SDK from -a Linux host or a Windows host (requires 32 bit MinGW (GCC) on the host, -too). Due to restrictions on consoles, the JIT compiler is disabled and -only the fast interpreter is built: +Building LuaJIT for consoles requires both a supported host compiler +(x86 or x64) and a cross-compiler (to PPC or ARM) from the official +console SDK.
--make HOST_CC="gcc -m32" CROSS=ppu-lv2- -
-You can cross-compile for PS4 from a Windows host using -the PS4 SDK (ORBIS) plus 64 bit MSVC. Due to restrictions on -consoles, the JIT compiler is disabled and only the fast interpreter -is built. +Due to restrictions on consoles, the JIT compiler is disabled and only +the fast interpreter is built. This is still faster than plain Lua, +but much slower than the JIT compiler. The FFI is disabled, too, since +it's not very useful in such an environment.
-Open a "Visual Studio .NET Command Prompt" (64 bit host compiler), -cd to the directory where you've unpacked the sources and run -the following commands. This builds a static library libluajit.a, +The following commands build a static library libluajit.a, which can be linked against your game, just like the Lua library.
++To cross-compile for PS3 from a Linux host (requires +32 bit GCC, i.e. multilib Linux/x64) or a Windows host (requires +32 bit MinGW), run this command: +
++make HOST_CC="gcc -m32" CROSS=ppu-lv2- ++
+To cross-compile for PS4 from a Windows host, +open a "Visual Studio .NET Command Prompt" (64 bit host compiler), +cd to the directory where you've unpacked the sources and +run the following commands: +
cd src ps4build
-You can cross-compile for Xbox 360 using the -Xbox 360 SDK (MSVC + XEDK). Due to restrictions on consoles, the -JIT compiler is disabled and only the fast interpreter is built. +To cross-compile for PS Vita from a Windows host, +open a "Visual Studio .NET Command Prompt" (32 bit host compiler), +cd to the directory where you've unpacked the sources and +run the following commands:
++cd src +psvitabuild +
-Open a "Visual Studio .NET Command Prompt" (32 bit host compiler), +To cross-compile for Xbox 360 from a Windows host, +open a "Visual Studio .NET Command Prompt" (32 bit host compiler), cd to the directory where you've unpacked the sources and run -the following commands. This builds a static library luajit20.lib, -which can be linked against your game, just like the Lua library. +the following commands:
cd src @@ -621,7 +636,7 @@Hints for Distribution Maintainers
-Copyright © 2005-2014 Mike Pall +Copyright © 2005-2015 Mike Pall · Contact diff --git a/deps/luajit/doc/luajit.html b/deps/luajit/doc/luajit.html index 43af69c9..45507c12 100644 --- a/deps/luajit/doc/luajit.html +++ b/deps/luajit/doc/luajit.html @@ -4,7 +4,7 @@
LuaJIT
It may be embedded or used as a general-purpose, stand-alone language.-LuaJIT is Copyright © 2005-2014 Mike Pall, released under the +LuaJIT is Copyright © 2005-2015 Mike Pall, released under the » MIT open source license.
@@ -158,7 +161,10 @@
Compatibility
| Embedded | Android | iOS | PS3 | PS4 | Xbox 360 |
| Embedded | Android | iOS |
| PS3 | PS4 | PS Vita | Xbox 360 |
| GCC | CLANG LLVM | MSVC |