diff options
author | Mike Pall <mike> | 2020-10-12 16:18:02 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2020-10-12 16:18:02 +0200 |
commit | 1d8b747c161db457e032a023ebbff511f5de5ec2 (patch) | |
tree | 7254328c720b104f5d5b4bd8321cfcb18c6fb6ce | |
parent | 675e08cf069725a004284b4e1e67fbf0e8fcb4dd (diff) | |
parent | 050466552bf7eb8b7944aa52c93b45326ae14d7a (diff) | |
download | luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.tar.gz luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.tar.bz2 luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.zip |
Merge branch 'master' into v2.1
-rw-r--r-- | COPYRIGHT | 6 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | doc/contact.html | 4 | ||||
-rw-r--r-- | doc/ext_ffi_api.html | 2 | ||||
-rw-r--r-- | doc/ext_ffi_semantics.html | 4 | ||||
-rw-r--r-- | doc/ext_ffi_tutorial.html | 4 | ||||
-rw-r--r-- | doc/extensions.html | 8 | ||||
-rw-r--r-- | doc/faq.html | 22 | ||||
-rw-r--r-- | doc/install.html | 8 | ||||
-rw-r--r-- | doc/luajit.html | 4 | ||||
-rw-r--r-- | doc/running.html | 2 | ||||
-rw-r--r-- | dynasm/dynasm.lua | 4 | ||||
-rw-r--r-- | etc/luajit.1 | 6 | ||||
-rw-r--r-- | etc/luajit.pc | 2 | ||||
-rw-r--r-- | src/jit/dump.lua | 2 | ||||
-rw-r--r-- | src/lib_base.c | 4 | ||||
-rw-r--r-- | src/lj_alloc.c | 6 | ||||
-rw-r--r-- | src/lua.h | 2 | ||||
-rw-r--r-- | src/luajit.h | 6 |
19 files changed, 49 insertions, 49 deletions
@@ -1,5 +1,5 @@ | |||
1 | =============================================================================== | 1 | =============================================================================== |
2 | LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/ | 2 | LuaJIT -- a Just-In-Time Compiler for Lua. https://luajit.org/ |
3 | 3 | ||
4 | Copyright (C) 2005-2020 Mike Pall. All rights reserved. | 4 | Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | 5 | ||
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | 21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
22 | THE SOFTWARE. | 22 | THE SOFTWARE. |
23 | 23 | ||
24 | [ MIT license: http://www.opensource.org/licenses/mit-license.php ] | 24 | [ MIT license: https://www.opensource.org/licenses/mit-license.php ] |
25 | 25 | ||
26 | =============================================================================== | 26 | =============================================================================== |
27 | [ LuaJIT includes code from Lua 5.1/5.2, which has this license statement: ] | 27 | [ LuaJIT includes code from Lua 5.1/5.2, which has this license statement: ] |
@@ -51,6 +51,6 @@ THE SOFTWARE. | |||
51 | 51 | ||
52 | This is a version (aka dlmalloc) of malloc/free/realloc written by | 52 | This is a version (aka dlmalloc) of malloc/free/realloc written by |
53 | Doug Lea and released to the public domain, as explained at | 53 | Doug Lea and released to the public domain, as explained at |
54 | http://creativecommons.org/licenses/publicdomain | 54 | https://creativecommons.org/licenses/publicdomain |
55 | 55 | ||
56 | =============================================================================== | 56 | =============================================================================== |
@@ -3,7 +3,7 @@ README for LuaJIT 2.1.0-beta3 | |||
3 | 3 | ||
4 | LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. | 4 | LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. |
5 | 5 | ||
6 | Project Homepage: http://luajit.org/ | 6 | Project Homepage: https://luajit.org/ |
7 | 7 | ||
8 | LuaJIT is Copyright (C) 2005-2020 Mike Pall. | 8 | LuaJIT is Copyright (C) 2005-2020 Mike Pall. |
9 | LuaJIT is free software, released under the MIT license. | 9 | LuaJIT is free software, released under the MIT license. |
diff --git a/doc/contact.html b/doc/contact.html index 3173b2a5..c2f34283 100644 --- a/doc/contact.html +++ b/doc/contact.html | |||
@@ -57,11 +57,11 @@ | |||
57 | <p> | 57 | <p> |
58 | If you want to report bugs, propose fixes or suggest enhancements, | 58 | If you want to report bugs, propose fixes or suggest enhancements, |
59 | please use the | 59 | please use the |
60 | <a href="https://github.com/LuaJIT/LuaJIT/issues">GitHub issue tracker</a>. | 60 | <a href="https://github.com/LuaJIT/LuaJIT/issues"><span class="ext">»</span> GitHub issue tracker</a>. |
61 | </p> | 61 | </p> |
62 | <p> | 62 | <p> |
63 | Please send general questions to the | 63 | Please send general questions to the |
64 | <a href="https://luajit.org/list.html">LuaJIT mailing list</a>. | 64 | <a href="https://luajit.org/list.html"><span class="ext">»</span> LuaJIT mailing list</a>. |
65 | </p> | 65 | </p> |
66 | <p> | 66 | <p> |
67 | You can also send any questions you have directly to me: | 67 | You can also send any questions you have directly to me: |
diff --git a/doc/ext_ffi_api.html b/doc/ext_ffi_api.html index 9c815f8b..8b2a605d 100644 --- a/doc/ext_ffi_api.html +++ b/doc/ext_ffi_api.html | |||
@@ -255,7 +255,7 @@ contents of an <tt>__index</tt> table (if any) may be modified | |||
255 | afterwards. The associated metatable automatically applies to all uses | 255 | afterwards. The associated metatable automatically applies to all uses |
256 | of this type, no matter how the objects are created or where they | 256 | of this type, no matter how the objects are created or where they |
257 | originate from. Note that pre-defined operations on types have | 257 | originate from. Note that pre-defined operations on types have |
258 | precedence (e.g. declared field names cannot be overriden). | 258 | precedence (e.g. declared field names cannot be overridden). |
259 | </p> | 259 | </p> |
260 | <p> | 260 | <p> |
261 | All standard Lua metamethods are implemented. These are called directly, | 261 | All standard Lua metamethods are implemented. These are called directly, |
diff --git a/doc/ext_ffi_semantics.html b/doc/ext_ffi_semantics.html index 5415787d..7c4f0d1d 100644 --- a/doc/ext_ffi_semantics.html +++ b/doc/ext_ffi_semantics.html | |||
@@ -672,7 +672,7 @@ through unions is explicitly detected and allowed. | |||
672 | <a href="ext_ffi_api.html#ffi_new">constructor</a>. This is equivalent | 672 | <a href="ext_ffi_api.html#ffi_new">constructor</a>. This is equivalent |
673 | to <tt>ffi.new(ct, ...)</tt>, unless a <tt>__new</tt> metamethod is | 673 | to <tt>ffi.new(ct, ...)</tt>, unless a <tt>__new</tt> metamethod is |
674 | defined. The <tt>__new</tt> metamethod is called with the ctype object | 674 | defined. The <tt>__new</tt> metamethod is called with the ctype object |
675 | plus any other arguments passed to the contructor. Note that you have to | 675 | plus any other arguments passed to the constructor. Note that you have to |
676 | use <tt>ffi.new</tt> inside of it, since calling <tt>ct(...)</tt> would | 676 | use <tt>ffi.new</tt> inside of it, since calling <tt>ct(...)</tt> would |
677 | cause infinite recursion.</li> | 677 | cause infinite recursion.</li> |
678 | 678 | ||
@@ -858,7 +858,7 @@ place of a type, you'd need to use <tt>ffi.typeof("int")</tt> instead. | |||
858 | <p> | 858 | <p> |
859 | The main use for parameterized types are libraries implementing abstract | 859 | The main use for parameterized types are libraries implementing abstract |
860 | data types | 860 | data types |
861 | (<a href="https://www.freelists.org/post/luajit/ffi-type-of-pointer-to,8">example</a>), | 861 | (<a href="https://www.freelists.org/post/luajit/ffi-type-of-pointer-to,8"><span class="ext">»</span> example</a>), |
862 | similar to what can be achieved with C++ template metaprogramming. | 862 | similar to what can be achieved with C++ template metaprogramming. |
863 | Another use case are derived types of anonymous structs, which avoids | 863 | Another use case are derived types of anonymous structs, which avoids |
864 | pollution of the global struct namespace. | 864 | pollution of the global struct namespace. |
diff --git a/doc/ext_ffi_tutorial.html b/doc/ext_ffi_tutorial.html index aab9c234..d06c11f1 100644 --- a/doc/ext_ffi_tutorial.html +++ b/doc/ext_ffi_tutorial.html | |||
@@ -216,7 +216,7 @@ a fascinating best-selling game is left as an exercise for the reader. | |||
216 | <h2 id="zlib">Accessing the zlib Compression Library</h2> | 216 | <h2 id="zlib">Accessing the zlib Compression Library</h2> |
217 | <p> | 217 | <p> |
218 | The following code shows how to access the <a | 218 | The following code shows how to access the <a |
219 | href="https://zlib.net/">zlib</a> compression library from Lua code. | 219 | href="https://zlib.net/"><span class="ext">»</span> zlib</a> compression library from Lua code. |
220 | We'll define two convenience wrapper functions that take a string and | 220 | We'll define two convenience wrapper functions that take a string and |
221 | compress or uncompress it to another string: | 221 | compress or uncompress it to another string: |
222 | </p> | 222 | </p> |
@@ -299,7 +299,7 @@ comes pre-installed. Since <tt>ffi.load()</tt> automatically adds any | |||
299 | missing standard prefixes/suffixes, we can simply load the | 299 | missing standard prefixes/suffixes, we can simply load the |
300 | <tt>"z"</tt> library. On Windows it's named <tt>zlib1.dll</tt> and | 300 | <tt>"z"</tt> library. On Windows it's named <tt>zlib1.dll</tt> and |
301 | you'll have to download it first from the | 301 | you'll have to download it first from the |
302 | <a href="https://zlib.net/">zlib site</a>. The check for | 302 | <a href="https://zlib.net/"><span class="ext">»</span> zlib site</a>. The check for |
303 | <tt>ffi.os</tt> makes sure we pass the right name to | 303 | <tt>ffi.os</tt> makes sure we pass the right name to |
304 | <tt>ffi.load()</tt>. | 304 | <tt>ffi.load()</tt>. |
305 | </p> | 305 | </p> |
diff --git a/doc/extensions.html b/doc/extensions.html index 68193187..5b7bb58f 100644 --- a/doc/extensions.html +++ b/doc/extensions.html | |||
@@ -73,9 +73,9 @@ td.excinterop { | |||
73 | <div id="main"> | 73 | <div id="main"> |
74 | <p> | 74 | <p> |
75 | LuaJIT is fully upwards-compatible with Lua 5.1. It supports all | 75 | LuaJIT is fully upwards-compatible with Lua 5.1. It supports all |
76 | <a href="https://www.lua.org/manual/5.1/manual.html#5">standard Lua | 76 | <a href="https://www.lua.org/manual/5.1/manual.html#5"><span class="ext">»</span> standard Lua |
77 | library functions</a> and the full set of | 77 | library functions</a> and the full set of |
78 | <a href="https://www.lua.org/manual/5.1/manual.html#3">Lua/C API | 78 | <a href="https://www.lua.org/manual/5.1/manual.html#3"><span class="ext">»</span> Lua/C API |
79 | functions</a>. | 79 | functions</a>. |
80 | </p> | 80 | </p> |
81 | <p> | 81 | <p> |
@@ -99,7 +99,7 @@ LuaJIT comes with several built-in extension modules: | |||
99 | <h3 id="bit"><tt>bit.*</tt> — Bitwise operations</h3> | 99 | <h3 id="bit"><tt>bit.*</tt> — Bitwise operations</h3> |
100 | <p> | 100 | <p> |
101 | LuaJIT supports all bitwise operations as defined by | 101 | LuaJIT supports all bitwise operations as defined by |
102 | <a href="https://bitop.luajit.org">Lua BitOp</a>: | 102 | <a href="https://bitop.luajit.org"><span class="ext">»</span> Lua BitOp</a>: |
103 | </p> | 103 | </p> |
104 | <pre class="code"> | 104 | <pre class="code"> |
105 | bit.tobit bit.tohex bit.bnot bit.band bit.bor bit.bxor | 105 | bit.tobit bit.tohex bit.bnot bit.band bit.bor bit.bxor |
@@ -108,7 +108,7 @@ bit.lshift bit.rshift bit.arshift bit.rol bit.ror bit.bswap | |||
108 | <p> | 108 | <p> |
109 | This module is a LuaJIT built-in — you don't need to download or | 109 | This module is a LuaJIT built-in — you don't need to download or |
110 | install Lua BitOp. The Lua BitOp site has full documentation for all | 110 | install Lua BitOp. The Lua BitOp site has full documentation for all |
111 | <a href="https://bitop.luajit.org/api.html">Lua BitOp API functions</a>. | 111 | <a href="https://bitop.luajit.org/api.html"><span class="ext">»</span> Lua BitOp API functions</a>. |
112 | The FFI adds support for | 112 | The FFI adds support for |
113 | <a href="ext_ffi_semantics.html#cdata_arith">64 bit bitwise operations</a>, | 113 | <a href="ext_ffi_semantics.html#cdata_arith">64 bit bitwise operations</a>, |
114 | using the same API functions. | 114 | using the same API functions. |
diff --git a/doc/faq.html b/doc/faq.html index 5c4ce533..acc47bae 100644 --- a/doc/faq.html +++ b/doc/faq.html | |||
@@ -61,16 +61,16 @@ dd { margin-left: 1.5em; } | |||
61 | <dt>Q: Where can I learn more about LuaJIT and Lua?</dt> | 61 | <dt>Q: Where can I learn more about LuaJIT and Lua?</dt> |
62 | <dd> | 62 | <dd> |
63 | <ul style="padding: 0;"> | 63 | <ul style="padding: 0;"> |
64 | <li>The <a href="https://luajit.org/list.html">LuaJIT mailing list</a> focuses on topics | 64 | <li>The <a href="https://luajit.org/list.html"><span class="ext">»</span> LuaJIT mailing list</a> focuses on topics |
65 | related to LuaJIT.</li> | 65 | related to LuaJIT.</li> |
66 | <li>The <a href="http://wiki.luajit.org/"><span class="ext">»</span> LuaJIT wiki</a> gathers community | 66 | <li>The <a href="http://wiki.luajit.org/"><span class="ext">»</span> LuaJIT wiki</a> gathers community |
67 | resources about LuaJIT.</li> | 67 | resources about LuaJIT.</li> |
68 | <li>News about Lua itself can be found at the | 68 | <li>News about Lua itself can be found at the |
69 | <a href="https://www.lua.org/lua-l.html">Lua mailing list</a>. | 69 | <a href="https://www.lua.org/lua-l.html"><span class="ext">»</span> Lua mailing list</a>. |
70 | The mailing list archives are worth checking out for older postings | 70 | The mailing list archives are worth checking out for older postings |
71 | about LuaJIT.</li> | 71 | about LuaJIT.</li> |
72 | <li>The <a href="https://lua.org">main Lua.org site</a> has complete | 72 | <li>The <a href="https://lua.org"><span class="ext">»</span> main Lua.org site</a> has complete |
73 | <a href="https://www.lua.org/docs.html">documentation</a> of the language | 73 | <a href="https://www.lua.org/docs.html"><span class="ext">»</span> documentation</a> of the language |
74 | and links to books and papers about Lua.</li> | 74 | and links to books and papers about Lua.</li> |
75 | <li>The community-managed <a href="http://lua-users.org/wiki/"><span class="ext">»</span> Lua Wiki</a> | 75 | <li>The community-managed <a href="http://lua-users.org/wiki/"><span class="ext">»</span> Lua Wiki</a> |
76 | has information about diverse topics.</li> | 76 | has information about diverse topics.</li> |
@@ -83,11 +83,11 @@ has information about diverse topics.</li> | |||
83 | I'm planning to write more documentation about the internals of LuaJIT. | 83 | I'm planning to write more documentation about the internals of LuaJIT. |
84 | In the meantime, please use the following Google Scholar searches | 84 | In the meantime, please use the following Google Scholar searches |
85 | to find relevant papers:<br> | 85 | to find relevant papers:<br> |
86 | Search for: <a href="https://scholar.google.com/scholar?q=Trace+Compiler">Trace Compiler</a><br> | 86 | Search for: <a href="https://scholar.google.com/scholar?q=Trace+Compiler"><span class="ext">»</span> Trace Compiler</a><br> |
87 | Search for: <a href="https://scholar.google.com/scholar?q=JIT+Compiler">JIT Compiler</a><br> | 87 | Search for: <a href="https://scholar.google.com/scholar?q=JIT+Compiler"><span class="ext">»</span> JIT Compiler</a><br> |
88 | Search for: <a href="https://scholar.google.com/scholar?q=Dynamic+Language+Optimizations">Dynamic Language Optimizations</a><br> | 88 | Search for: <a href="https://scholar.google.com/scholar?q=Dynamic+Language+Optimizations"><span class="ext">»</span> Dynamic Language Optimizations</a><br> |
89 | Search for: <a href="https://scholar.google.com/scholar?q=SSA+Form">SSA Form</a><br> | 89 | Search for: <a href="https://scholar.google.com/scholar?q=SSA+Form"><span class="ext">»</span> SSA Form</a><br> |
90 | Search for: <a href="https://scholar.google.com/scholar?q=Linear+Scan+Register+Allocation">Linear Scan Register Allocation</a><br> | 90 | Search for: <a href="https://scholar.google.com/scholar?q=Linear+Scan+Register+Allocation"><span class="ext">»</span> Linear Scan Register Allocation</a><br> |
91 | Here is a list of the <a href="http://lua-users.org/lists/lua-l/2009-11/msg00089.html"><span class="ext">»</span> innovative features in LuaJIT</a>.<br> | 91 | Here is a list of the <a href="http://lua-users.org/lists/lua-l/2009-11/msg00089.html"><span class="ext">»</span> innovative features in LuaJIT</a>.<br> |
92 | And, you know, reading the source is of course the only way to enlightenment. :-) | 92 | And, you know, reading the source is of course the only way to enlightenment. :-) |
93 | </dd> | 93 | </dd> |
@@ -99,7 +99,7 @@ Q: My vararg functions fail after switching to LuaJIT!</dt> | |||
99 | <dd>LuaJIT is compatible to the Lua 5.1 language standard. It doesn't | 99 | <dd>LuaJIT is compatible to the Lua 5.1 language standard. It doesn't |
100 | support the implicit <tt>arg</tt> parameter for old-style vararg | 100 | support the implicit <tt>arg</tt> parameter for old-style vararg |
101 | functions from Lua 5.0.<br>Please convert your code to the | 101 | functions from Lua 5.0.<br>Please convert your code to the |
102 | <a href="https://www.lua.org/manual/5.1/manual.html#2.5.9">Lua 5.1 | 102 | <a href="https://www.lua.org/manual/5.1/manual.html#2.5.9"><span class="ext">»</span> Lua 5.1 |
103 | vararg syntax</a>.</dd> | 103 | vararg syntax</a>.</dd> |
104 | </dl> | 104 | </dl> |
105 | 105 | ||
@@ -156,7 +156,7 @@ don't report a bug about it. Check the <tt>mode</tt> parameter for the | |||
156 | In general, the only promising approach is to sandbox Lua code at the | 156 | In general, the only promising approach is to sandbox Lua code at the |
157 | process level and not the VM level.<br> | 157 | process level and not the VM level.<br> |
158 | 158 | ||
159 | More reading material at the <a href="http://lua-users.org/wiki/SandBoxes"><span class="ext">»</span> Lua Wiki</a> and <a href="https://en.wikipedia.org/wiki/Sandbox_(computer_security)">Wikipedia</a>. | 159 | More reading material at the <a href="http://lua-users.org/wiki/SandBoxes"><span class="ext">»</span> Lua Wiki</a> and <a href="https://en.wikipedia.org/wiki/Sandbox_(computer_security)"><span class="ext">»</span> Wikipedia</a>. |
160 | </dd> | 160 | </dd> |
161 | </dl> | 161 | </dl> |
162 | 162 | ||
diff --git a/doc/install.html b/doc/install.html index bc96b661..451fdd41 100644 --- a/doc/install.html +++ b/doc/install.html | |||
@@ -245,7 +245,7 @@ Obviously the prefixes given during build and installation need to be the same. | |||
245 | <p> | 245 | <p> |
246 | Either install one of the open source SDKs | 246 | Either install one of the open source SDKs |
247 | (<a href="http://mingw.org/"><span class="ext">»</span> MinGW</a> or | 247 | (<a href="http://mingw.org/"><span class="ext">»</span> MinGW</a> or |
248 | <a href="https://www.cygwin.com/">Cygwin</a>), which come with a modified | 248 | <a href="https://www.cygwin.com/"><span class="ext">»</span> Cygwin</a>), which come with a modified |
249 | GCC plus the required development headers. | 249 | GCC plus the required development headers. |
250 | Or install Microsoft's Visual Studio (MSVC). | 250 | Or install Microsoft's Visual Studio (MSVC). |
251 | </p> | 251 | </p> |
@@ -388,7 +388,7 @@ make CROSS=mips-linux- TARGET_CFLAGS="-mips64r2 -mabi=64" | |||
388 | make CROSS=mipsel-linux- TARGET_CFLAGS="-mips64r2 -mabi=64" | 388 | make CROSS=mipsel-linux- TARGET_CFLAGS="-mips64r2 -mabi=64" |
389 | </pre> | 389 | </pre> |
390 | <p> | 390 | <p> |
391 | You can cross-compile for <b id="android">Android</b> using the <a href="https://developer.android.com/ndk/">Android NDK</a>. | 391 | You can cross-compile for <b id="android">Android</b> using the <a href="https://developer.android.com/ndk/"><span class="ext">»</span> Android NDK</a>. |
392 | Please adapt the environment variables to match the install locations and the | 392 | Please adapt the environment variables to match the install locations and the |
393 | desired target platform. E.g. Android 4.1 corresponds to ABI level 16. | 393 | desired target platform. E.g. Android 4.1 corresponds to ABI level 16. |
394 | </p> | 394 | </p> |
@@ -412,7 +412,7 @@ make HOST_CC="gcc -m32" CROSS=$NDKCROSS \ | |||
412 | TARGET_LD=$NDKCC | 412 | TARGET_LD=$NDKCC |
413 | </pre> | 413 | </pre> |
414 | <p> | 414 | <p> |
415 | You can cross-compile for <b id="ios">iOS 3.0+</b> (iPhone/iPad) using the <a href="https://developer.apple.com/ios/">iOS SDK</a>: | 415 | You can cross-compile for <b id="ios">iOS 3.0+</b> (iPhone/iPad) using the <a href="https://developer.apple.com/ios/"><span class="ext">»</span> iOS SDK</a>: |
416 | </p> | 416 | </p> |
417 | <p style="font-size: 8pt;"> | 417 | <p style="font-size: 8pt;"> |
418 | Note: <b>the JIT compiler is disabled for iOS</b>, because regular iOS Apps | 418 | Note: <b>the JIT compiler is disabled for iOS</b>, because regular iOS Apps |
@@ -547,7 +547,7 @@ Make sure the <tt>jit</tt> library is loaded or the JIT compiler | |||
547 | will not be activated.</li> | 547 | will not be activated.</li> |
548 | <li>The <tt>bit.*</tt> module for bitwise operations | 548 | <li>The <tt>bit.*</tt> module for bitwise operations |
549 | is already built-in. There's no need to statically link | 549 | is already built-in. There's no need to statically link |
550 | <a href="https://bitop.luajit.org/">Lua BitOp</a> to your application.</li> | 550 | <a href="https://bitop.luajit.org/"><span class="ext">»</span> Lua BitOp</a> to your application.</li> |
551 | </ul> | 551 | </ul> |
552 | 552 | ||
553 | <h2 id="distro">Hints for Distribution Maintainers</h2> | 553 | <h2 id="distro">Hints for Distribution Maintainers</h2> |
diff --git a/doc/luajit.html b/doc/luajit.html index 3ce81c3e..ab768053 100644 --- a/doc/luajit.html +++ b/doc/luajit.html | |||
@@ -141,13 +141,13 @@ table.feature small { | |||
141 | <div id="main"> | 141 | <div id="main"> |
142 | <p> | 142 | <p> |
143 | LuaJIT is a <b>Just-In-Time Compiler</b> (JIT) for the | 143 | LuaJIT is a <b>Just-In-Time Compiler</b> (JIT) for the |
144 | <a href="https://www.lua.org/">Lua</a> programming language. | 144 | <a href="https://www.lua.org/"><span class="ext">»</span> Lua</a> programming language. |
145 | Lua is a powerful, dynamic and light-weight programming language. | 145 | Lua is a powerful, dynamic and light-weight programming language. |
146 | It may be embedded or used as a general-purpose, stand-alone language. | 146 | It may be embedded or used as a general-purpose, stand-alone language. |
147 | </p> | 147 | </p> |
148 | <p> | 148 | <p> |
149 | LuaJIT is Copyright © 2005-2020 Mike Pall, released under the | 149 | LuaJIT is Copyright © 2005-2020 Mike Pall, released under the |
150 | <a href="https://www.opensource.org/licenses/mit-license.php">MIT open source license</a>. | 150 | <a href="https://www.opensource.org/licenses/mit-license.php"><span class="ext">»</span> MIT open source license</a>. |
151 | </p> | 151 | </p> |
152 | <p> | 152 | <p> |
153 | </p> | 153 | </p> |
diff --git a/doc/running.html b/doc/running.html index 2cba1534..f34f1f5f 100644 --- a/doc/running.html +++ b/doc/running.html | |||
@@ -89,7 +89,7 @@ The <tt>luajit</tt> stand-alone executable is just a slightly modified | |||
89 | version of the regular <tt>lua</tt> stand-alone executable. | 89 | version of the regular <tt>lua</tt> stand-alone executable. |
90 | It supports the same basic options, too. <tt>luajit -h</tt> | 90 | It supports the same basic options, too. <tt>luajit -h</tt> |
91 | prints a short list of the available options. Please have a look at the | 91 | prints a short list of the available options. Please have a look at the |
92 | <a href="https://www.lua.org/manual/5.1/manual.html#6">Lua manual</a> | 92 | <a href="https://www.lua.org/manual/5.1/manual.html#6"><span class="ext">»</span> Lua manual</a> |
93 | for details. | 93 | for details. |
94 | </p> | 94 | </p> |
95 | <p> | 95 | <p> |
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua index 8e85af24..b34124b7 100644 --- a/dynasm/dynasm.lua +++ b/dynasm/dynasm.lua | |||
@@ -14,7 +14,7 @@ local _info = { | |||
14 | vernum = 10400, | 14 | vernum = 10400, |
15 | release = "2015-10-18", | 15 | release = "2015-10-18", |
16 | author = "Mike Pall", | 16 | author = "Mike Pall", |
17 | url = "http://luajit.org/dynasm.html", | 17 | url = "https://luajit.org/dynasm.html", |
18 | license = "MIT", | 18 | license = "MIT", |
19 | copyright = [[ | 19 | copyright = [[ |
20 | Copyright (C) 2005-2020 Mike Pall. All rights reserved. | 20 | Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
@@ -38,7 +38,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, | |||
38 | TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | 38 | TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
39 | SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 39 | SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
40 | 40 | ||
41 | [ MIT license: http://www.opensource.org/licenses/mit-license.php ] | 41 | [ MIT license: https://www.opensource.org/licenses/mit-license.php ] |
42 | ]], | 42 | ]], |
43 | } | 43 | } |
44 | 44 | ||
diff --git a/etc/luajit.1 b/etc/luajit.1 index 2071c155..82097094 100644 --- a/etc/luajit.1 +++ b/etc/luajit.1 | |||
@@ -6,7 +6,7 @@ luajit \- Just-In-Time Compiler for the Lua Language | |||
6 | .B luajit | 6 | .B luajit |
7 | [\fIoptions\fR]... [\fIscript\fR [\fIargs\fR]...] | 7 | [\fIoptions\fR]... [\fIscript\fR [\fIargs\fR]...] |
8 | .SH "WEB SITE" | 8 | .SH "WEB SITE" |
9 | .IR http://luajit.org | 9 | .IR https://luajit.org |
10 | .SH DESCRIPTION | 10 | .SH DESCRIPTION |
11 | .PP | 11 | .PP |
12 | This is the command-line program to run Lua programs with \fBLuaJIT\fR. | 12 | This is the command-line program to run Lua programs with \fBLuaJIT\fR. |
@@ -80,9 +80,9 @@ Runs some nested loops and shows the resulting traces. | |||
80 | .SH SEE ALSO | 80 | .SH SEE ALSO |
81 | .PP | 81 | .PP |
82 | More details in the provided HTML docs or at: | 82 | More details in the provided HTML docs or at: |
83 | .IR http://luajit.org | 83 | .IR https://luajit.org |
84 | .br | 84 | .br |
85 | More about the Lua language can be found at: | 85 | More about the Lua language can be found at: |
86 | .IR http://lua.org/docs.html | 86 | .IR https://lua.org/docs.html |
87 | .PP | 87 | .PP |
88 | lua(1) | 88 | lua(1) |
diff --git a/etc/luajit.pc b/etc/luajit.pc index a78f1746..39e1e577 100644 --- a/etc/luajit.pc +++ b/etc/luajit.pc | |||
@@ -17,7 +17,7 @@ INSTALL_CMOD=${prefix}/${multilib}/lua/${abiver} | |||
17 | 17 | ||
18 | Name: LuaJIT | 18 | Name: LuaJIT |
19 | Description: Just-in-time compiler for Lua | 19 | Description: Just-in-time compiler for Lua |
20 | URL: http://luajit.org | 20 | URL: https://luajit.org |
21 | Version: ${version} | 21 | Version: ${version} |
22 | Requires: | 22 | Requires: |
23 | Libs: -L${libdir} -l${libname} | 23 | Libs: -L${libdir} -l${libname} |
diff --git a/src/jit/dump.lua b/src/jit/dump.lua index 06d1e258..d3425bda 100644 --- a/src/jit/dump.lua +++ b/src/jit/dump.lua | |||
@@ -614,7 +614,7 @@ local function dump_texit(tr, ex, ngpr, nfpr, ...) | |||
614 | out:write("---- TRACE ", tr, " exit ", ex, "\n") | 614 | out:write("---- TRACE ", tr, " exit ", ex, "\n") |
615 | if dumpmode.X then | 615 | if dumpmode.X then |
616 | local regs = {...} | 616 | local regs = {...} |
617 | if jit.arch == "x64" then | 617 | if jit.arch:sub(-2) == "64" then |
618 | for i=1,ngpr do | 618 | for i=1,ngpr do |
619 | out:write(format(" %016x", regs[i])) | 619 | out:write(format(" %016x", regs[i])) |
620 | if i % 4 == 0 then out:write("\n") end | 620 | if i % 4 == 0 then out:write("\n") end |
diff --git a/src/lib_base.c b/src/lib_base.c index eb604538..c8409042 100644 --- a/src/lib_base.c +++ b/src/lib_base.c | |||
@@ -504,8 +504,8 @@ LJLIB_CF(print) | |||
504 | lua_gettable(L, LUA_GLOBALSINDEX); | 504 | lua_gettable(L, LUA_GLOBALSINDEX); |
505 | tv = L->top-1; | 505 | tv = L->top-1; |
506 | } | 506 | } |
507 | shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring) | 507 | shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring) && |
508 | && !gcrefu(basemt_it(G(L), LJ_TNUMX)); | 508 | !gcrefu(basemt_it(G(L), LJ_TNUMX)); |
509 | for (i = 0; i < nargs; i++) { | 509 | for (i = 0; i < nargs; i++) { |
510 | cTValue *o = &L->base[i]; | 510 | cTValue *o = &L->base[i]; |
511 | const char *str; | 511 | const char *str; |
diff --git a/src/lj_alloc.c b/src/lj_alloc.c index 5de60b82..21fb7af5 100644 --- a/src/lj_alloc.c +++ b/src/lj_alloc.c | |||
@@ -6,7 +6,7 @@ | |||
6 | ** | 6 | ** |
7 | ** This is a version (aka dlmalloc) of malloc/free/realloc written by | 7 | ** This is a version (aka dlmalloc) of malloc/free/realloc written by |
8 | ** Doug Lea and released to the public domain, as explained at | 8 | ** Doug Lea and released to the public domain, as explained at |
9 | ** http://creativecommons.org/licenses/publicdomain. | 9 | ** https://creativecommons.org/licenses/publicdomain. |
10 | ** | 10 | ** |
11 | ** * Version pre-2.8.4 Wed Mar 29 19:46:29 2006 (dl at gee) | 11 | ** * Version pre-2.8.4 Wed Mar 29 19:46:29 2006 (dl at gee) |
12 | ** | 12 | ** |
@@ -16,8 +16,8 @@ | |||
16 | ** If you want to use dlmalloc in another project, you should get | 16 | ** If you want to use dlmalloc in another project, you should get |
17 | ** the original from: ftp://gee.cs.oswego.edu/pub/misc/ | 17 | ** the original from: ftp://gee.cs.oswego.edu/pub/misc/ |
18 | ** For thread-safe derivatives, take a look at: | 18 | ** For thread-safe derivatives, take a look at: |
19 | ** - ptmalloc: http://www.malloc.de/ | 19 | ** - ptmalloc: https://www.malloc.de/ |
20 | ** - nedmalloc: http://www.nedprod.com/programs/portable/nedmalloc/ | 20 | ** - nedmalloc: https://www.nedprod.com/programs/portable/nedmalloc/ |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #define lj_alloc_c | 23 | #define lj_alloc_c |
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $ | 2 | ** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $ |
3 | ** Lua - An Extensible Extension Language | 3 | ** Lua - An Extensible Extension Language |
4 | ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) | 4 | ** Lua.org, PUC-Rio, Brazil (https://www.lua.org) |
5 | ** See Copyright Notice at the end of this file | 5 | ** See Copyright Notice at the end of this file |
6 | */ | 6 | */ |
7 | 7 | ||
diff --git a/src/luajit.h b/src/luajit.h index 600031a1..d569fd40 100644 --- a/src/luajit.h +++ b/src/luajit.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/ | 2 | ** LuaJIT -- a Just-In-Time Compiler for Lua. https://luajit.org/ |
3 | ** | 3 | ** |
4 | ** Copyright (C) 2005-2020 Mike Pall. All rights reserved. | 4 | ** Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | ** | 5 | ** |
@@ -22,7 +22,7 @@ | |||
22 | ** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | 22 | ** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
23 | ** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 23 | ** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
24 | ** | 24 | ** |
25 | ** [ MIT license: http://www.opensource.org/licenses/mit-license.php ] | 25 | ** [ MIT license: https://www.opensource.org/licenses/mit-license.php ] |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #ifndef _LUAJIT_H | 28 | #ifndef _LUAJIT_H |
@@ -34,7 +34,7 @@ | |||
34 | #define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */ | 34 | #define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */ |
35 | #define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_beta3 | 35 | #define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_beta3 |
36 | #define LUAJIT_COPYRIGHT "Copyright (C) 2005-2020 Mike Pall" | 36 | #define LUAJIT_COPYRIGHT "Copyright (C) 2005-2020 Mike Pall" |
37 | #define LUAJIT_URL "http://luajit.org/" | 37 | #define LUAJIT_URL "https://luajit.org/" |
38 | 38 | ||
39 | /* Modes for luaJIT_setmode. */ | 39 | /* Modes for luaJIT_setmode. */ |
40 | #define LUAJIT_MODE_MASK 0x00ff | 40 | #define LUAJIT_MODE_MASK 0x00ff |