Skip to content

Commit 3c15839

Browse files
agentzhagentzh
committed
Merge branch 'v2.1' into v2.1-agentzh
2 parents 8e5d87a + 75d046d commit 3c15839

194 files changed

Lines changed: 1303 additions & 447 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
===============================================================================
22
LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
33

4-
Copyright (C) 2005-2015 Mike Pall. All rights reserved.
4+
Copyright (C) 2005-2016 Mike Pall. All rights reserved.
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
# For MSVC, please follow the instructions given in src/msvcbuild.bat.
1111
# For MinGW and Cygwin, cd to src and run make with the Makefile there.
1212
#
13-
# Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
13+
# Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
1414
##############################################################################
1515

1616
MAJVER= 2
1717
MINVER= 1
1818
RELVER= 0
19-
PREREL= -beta1
19+
PREREL= -beta2
2020
VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
2121
ABIVER= 5.1
2222

‎README‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
README for LuaJIT 2.1.0-beta1
1+
README for LuaJIT 2.1.0-beta2
22
-----------------------------
33

44
LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.
55

66
Project Homepage: http://luajit.org/
77

8-
LuaJIT is Copyright (C) 2005-2015 Mike Pall.
8+
LuaJIT is Copyright (C) 2005-2016 Mike Pall.
99
LuaJIT is free software, released under the MIT license.
1010
See full Copyright Notice in the COPYRIGHT file or in luajit.h.
1111

‎doc/bluequad-print.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2004-2015 Mike Pall.
1+
/* Copyright (C) 2004-2016 Mike Pall.
22
*
33
* You are welcome to use the general ideas of this design for your own sites.
44
* But please do not steal the stylesheet, the layout or the color scheme.

‎doc/bluequad.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 2004-2015 Mike Pall.
1+
/* Copyright (C) 2004-2016 Mike Pall.
22
*
33
* You are welcome to use the general ideas of this design for your own sites.
44
* But please do not steal the stylesheet, the layout or the color scheme.

‎doc/changes.html‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>LuaJIT Change History</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
66
<meta name="Author" content="Mike Pall">
7-
<meta name="Copyright" content="Copyright (C) 2005-2015, Mike Pall">
7+
<meta name="Copyright" content="Copyright (C) 2005-2016, Mike Pall">
88
<meta name="Language" content="en">
99
<link rel="stylesheet" type="text/css" href="bluequad.css" media="screen">
1010
<link rel="stylesheet" type="text/css" href="bluequad-print.css" media="print">
@@ -74,6 +74,19 @@ <h1>LuaJIT Change History</h1>
7474
</p>
7575

7676
<div class="major" style="background: #d0d0ff;">
77+
<h2 id="LuaJIT-2.1.0-beta2">LuaJIT 2.1.0-beta2 &mdash; 2016-03-03</h2>
78+
<ul>
79+
<li>Enable trace stitching.</li>
80+
<li>Use internal implementation for converting FP numbers to strings.</li>
81+
<li>Parse Unicode escape <tt>'\u{XX...}'</tt> in string literals.</li>
82+
<li>Add MIPS soft-float support.</li>
83+
<li>Switch MIPS port to dual-number mode.</li>
84+
<li>x86/x64: Add support for AES-NI, AVX and AVX2 to DynASM.</li>
85+
<li>FFI: Add <tt>ssize_t</tt> declaration.</li>
86+
<li>FFI: Parse <tt>#line NN</tt> and <tt>#NN</tt>.</li>
87+
<li>Various minor fixes.</li>
88+
</ul>
89+
7790
<h2 id="LuaJIT-2.1.0-beta1">LuaJIT 2.1.0-beta1 &mdash; 2015-08-25</h2>
7891
<p>
7992
This is a brief summary of the major changes in LuaJIT 2.1 compared to 2.0.
@@ -86,12 +99,11 @@ <h2 id="LuaJIT-2.1.0-beta1">LuaJIT 2.1.0-beta1 &mdash; 2015-08-25</h2>
8699
<li>Add <tt>LJ_GC64</tt> mode: 64 bit GC object references (really: 47 bit). Interpreter-only for now.</li>
87100
<li>Add <tt>LJ_FR2</tt> mode: Two-slot frame info. Required by <tt>LJ_GC64</tt> mode.</li>
88101
<li>Add <tt>table.new()</tt> and <tt>table.clear()</tt>.</li>
89-
<li>Parse Unicode escape <tt>'\u{XX...}'</tt> in string literals.</li>
90102
<li>Parse binary number literals (<tt>0bxxx</tt>).</li>
91103
</ul></li>
92104
<li>Improvements to the JIT compiler:
93105
<ul>
94-
<li>Add trace stitching.</li>
106+
<li>Add trace stitching (disabled for now).</li>
95107
<li>Compile various builtins: <tt>string.char()</tt>, <tt>string.reverse()</tt>, <tt>string.lower()</tt>, <tt>string.upper()</tt>, <tt>string.rep()</tt>, <tt>string.format()</tt>, <tt>table.concat()</tt>, <tt>bit.tohex()</tt>, <tt>getfenv(0)</tt>, <tt>debug.getmetatable()</tt>.</li>
96108
<li>Compile <tt>string.find()</tt> for fixed string searches (no patterns).</li>
97109
<li>Compile <tt>BC_TSETM</tt>, e.g. <tt>{1,2,3,f()}</tt>.</li>
@@ -113,7 +125,6 @@ <h2 id="LuaJIT-2.1.0-beta1">LuaJIT 2.1.0-beta1 &mdash; 2015-08-25</h2>
113125
<li>x64: Add separate port of the interpreter to <tt>LJ_GC64</tt> mode.</li>
114126
<li>x86/x64: Drop internal x87 math functions. Use libm functions.</li>
115127
<li>x86: Remove x87 support from interpreter. SSE2 is mandatory now.</li>
116-
<li>x86/x64: Add support for AES-NI, AVX and AVX2 to DynASM.</li>
117128
<li>PPC/e500: Drop support for this architecture.</li>
118129
</ul></li>
119130
<li>FFI library:
@@ -124,7 +135,6 @@ <h2 id="LuaJIT-2.1.0-beta1">LuaJIT 2.1.0-beta1 &mdash; 2015-08-25</h2>
124135
<li>FFI: Compile lightuserdata to <tt>void *</tt> conversion.</li>
125136
<li>FFI: Compile <tt>ffi.gc(cdata, nil)</tt>, too.</li>
126137
<li>FFI: Add <tt>ffi.typeinfo()</tt>.</li>
127-
<li>FFI: Add <tt>ssize_t</tt> declaration.</li>
128138
</ul></li>
129139
</ul>
130140
</div>
@@ -797,7 +807,7 @@ <h2 id="LuaJIT-2.0.0-beta1">LuaJIT 2.0.0-beta1 &mdash; 2009-10-31</h2>
797807
</div>
798808
<div id="foot">
799809
<hr class="hide">
800-
Copyright &copy; 2005-2015 Mike Pall
810+
Copyright &copy; 2005-2016 Mike Pall
801811
<span class="noprint">
802812
&middot;
803813
<a href="contact.html">Contact</a>

‎doc/contact.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>Contact</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
66
<meta name="Author" content="Mike Pall">
7-
<meta name="Copyright" content="Copyright (C) 2005-2015, Mike Pall">
7+
<meta name="Copyright" content="Copyright (C) 2005-2016, Mike Pall">
88
<meta name="Language" content="en">
99
<link rel="stylesheet" type="text/css" href="bluequad.css" media="screen">
1010
<link rel="stylesheet" type="text/css" href="bluequad-print.css" media="print">
@@ -86,15 +86,15 @@ <h1>Contact</h1>
8686
<h2>Copyright</h2>
8787
<p>
8888
All documentation is
89-
Copyright &copy; 2005-2015 Mike Pall.
89+
Copyright &copy; 2005-2016 Mike Pall.
9090
</p>
9191

9292

9393
<br class="flush">
9494
</div>
9595
<div id="foot">
9696
<hr class="hide">
97-
Copyright &copy; 2005-2015 Mike Pall
97+
Copyright &copy; 2005-2016 Mike Pall
9898
<span class="noprint">
9999
&middot;
100100
<a href="contact.html">Contact</a>

‎doc/ext_c_api.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>Lua/C API Extensions</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
66
<meta name="Author" content="Mike Pall">
7-
<meta name="Copyright" content="Copyright (C) 2005-2015, Mike Pall">
7+
<meta name="Copyright" content="Copyright (C) 2005-2016, Mike Pall">
88
<meta name="Language" content="en">
99
<link rel="stylesheet" type="text/css" href="bluequad.css" media="screen">
1010
<link rel="stylesheet" type="text/css" href="bluequad-print.css" media="print">
@@ -179,7 +179,7 @@ <h3 id="mode_wrapcfunc"><tt>luaJIT_setmode(L, idx, LUAJIT_MODE_WRAPCFUNC|flag)</
179179
</div>
180180
<div id="foot">
181181
<hr class="hide">
182-
Copyright &copy; 2005-2015 Mike Pall
182+
Copyright &copy; 2005-2016 Mike Pall
183183
<span class="noprint">
184184
&middot;
185185
<a href="contact.html">Contact</a>

‎doc/ext_ffi.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>FFI Library</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
66
<meta name="Author" content="Mike Pall">
7-
<meta name="Copyright" content="Copyright (C) 2005-2015, Mike Pall">
7+
<meta name="Copyright" content="Copyright (C) 2005-2016, Mike Pall">
88
<meta name="Language" content="en">
99
<link rel="stylesheet" type="text/css" href="bluequad.css" media="screen">
1010
<link rel="stylesheet" type="text/css" href="bluequad-print.css" media="print">
@@ -322,7 +322,7 @@ <h2 id="cdata">Motivating Example: Using C Data Structures</h2>
322322
</div>
323323
<div id="foot">
324324
<hr class="hide">
325-
Copyright &copy; 2005-2015 Mike Pall
325+
Copyright &copy; 2005-2016 Mike Pall
326326
<span class="noprint">
327327
&middot;
328328
<a href="contact.html">Contact</a>

‎doc/ext_ffi_api.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>ffi.* API Functions</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
66
<meta name="Author" content="Mike Pall">
7-
<meta name="Copyright" content="Copyright (C) 2005-2015, Mike Pall">
7+
<meta name="Copyright" content="Copyright (C) 2005-2016, Mike Pall">
88
<meta name="Language" content="en">
99
<link rel="stylesheet" type="text/css" href="bluequad.css" media="screen">
1010
<link rel="stylesheet" type="text/css" href="bluequad-print.css" media="print">
@@ -560,7 +560,7 @@ <h2 id="literals">Extensions to the Lua Parser</h2>
560560
</div>
561561
<div id="foot">
562562
<hr class="hide">
563-
Copyright &copy; 2005-2015 Mike Pall
563+
Copyright &copy; 2005-2016 Mike Pall
564564
<span class="noprint">
565565
&middot;
566566
<a href="contact.html">Contact</a>

0 commit comments

Comments
 (0)