Update docs for release candidate.

This commit is contained in:
Mike Pall 2012-10-31 18:14:49 +01:00
parent 1f372e13c2
commit 4b9441c0a9
5 changed files with 9 additions and 41 deletions

View File

@ -233,19 +233,11 @@ the corresponding metamethod (e.g. <tt>"__index"</tt>).
<h2 id="resumable">Fully Resumable VM</h2> <h2 id="resumable">Fully Resumable VM</h2>
<p> <p>
The LuaJIT 2.x VM is fully resumable. This means you can yield from a The LuaJIT VM is fully resumable. This means you can yield from a
coroutine even across contexts, where this would not possible with coroutine even across contexts, where this would not possible with
the standard Lua&nbsp;5.1 VM: e.g. you can yield across <tt>pcall()</tt> the standard Lua&nbsp;5.1 VM: e.g. you can yield across <tt>pcall()</tt>
and <tt>xpcall()</tt>, across iterators and across metamethods. and <tt>xpcall()</tt>, across iterators and across metamethods.
</p> </p>
<p>
Note however that LuaJIT 2.x doesn't use
<a href="http://coco.luajit.org/"><span class="ext">&raquo;</span>&nbsp;Coco</a> anymore. This means the
overhead for creating coroutines is much smaller and no extra
C&nbsp;stacks need to be allocated. OTOH you can no longer yield
across arbitrary C&nbsp;functions. Keep this in mind when
upgrading from LuaJIT 1.x.
</p>
<h2 id="lua52">Extensions from Lua 5.2</h2> <h2 id="lua52">Extensions from Lua 5.2</h2>
<p> <p>

View File

@ -188,8 +188,8 @@ open a terminal window and change to this directory. Now unpack the archive
and change to the newly created directory: and change to the newly created directory:
</p> </p>
<pre class="code"> <pre class="code">
tar zxf LuaJIT-2.0.0-beta11.tar.gz tar zxf LuaJIT-2.0.0.tar.gz
cd LuaJIT-2.0.0-beta11</pre> cd LuaJIT-2.0.0</pre>
<h3>Building LuaJIT</h3> <h3>Building LuaJIT</h3>
<p> <p>
The supplied Makefiles try to auto-detect the settings needed for your The supplied Makefiles try to auto-detect the settings needed for your
@ -236,15 +236,6 @@ make install PREFIX=/home/myself/lj2
<p> <p>
Obviously the prefixes given during build and installation need to be the same. Obviously the prefixes given during build and installation need to be the same.
</p> </p>
<p style="color: #c00000;">
Note: to avoid overwriting a previous version, the beta test releases
only install the LuaJIT executable under the versioned name (i.e.
<tt>luajit-2.0.0-beta11</tt>). You probably want to create a symlink
for convenience, with a command like this:
</p>
<pre class="code" style="color: #c00000;">
sudo ln -sf luajit-2.0.0-beta11&nbsp;/usr/local/bin/luajit
</pre>
<h2 id="windows">Windows Systems</h2> <h2 id="windows">Windows Systems</h2>
<h3>Prerequisites</h3> <h3>Prerequisites</h3>
@ -461,7 +452,7 @@ much slower than the JIT compiler. Please complain to Apple, not me.
Or use Android. :-p Or use Android. :-p
</p> </p>
<pre class="code"> <pre class="code">
IXCODE=/Applications/Xcode45-DP4.app/Contents IXCODE=/Applications/Xcode.app/Contents
ISDK=$IXCODE/Developer/Platforms/iPhoneOS.platform/Developer ISDK=$IXCODE/Developer/Platforms/iPhoneOS.platform/Developer
ISDKVER=iPhoneOS6.0.sdk ISDKVER=iPhoneOS6.0.sdk
ISDKP=$ISDK/usr/bin/ ISDKP=$ISDK/usr/bin/

View File

@ -176,7 +176,7 @@ LuaJIT is Copyright &copy; 2005-2012 Mike Pall, released under the
<td class="speed">3x<br>-&nbsp;&nbsp;100x</td> <td class="speed">3x<br>-&nbsp;&nbsp;100x</td>
<td class="kb">115&nbsp;<small>KB</small><br>VM</td> <td class="kb">115&nbsp;<small>KB</small><br>VM</td>
<td class="kb">90&nbsp;<small>KB</small><br>JIT</td> <td class="kb">90&nbsp;<small>KB</small><br>JIT</td>
<td class="kloc">73&nbsp;<small>KLOC</small><br>C</td> <td class="kloc">63&nbsp;<small>KLOC</small><br>C</td>
<td class="kloc">24&nbsp;<small>KLOC</small><br>ASM</td> <td class="kloc">24&nbsp;<small>KLOC</small><br>ASM</td>
<td class="kloc">11&nbsp;<small>KLOC</small><br>Lua</td> <td class="kloc">11&nbsp;<small>KLOC</small><br>Lua</td>
</tr> </tr>

View File

@ -86,15 +86,6 @@ POSIX systems or <tt>luajit.exe</tt> on Windows. It can be used to run simple
Lua statements or whole Lua applications from the command line. It has an Lua statements or whole Lua applications from the command line. It has an
interactive mode, too. interactive mode, too.
</p> </p>
<p class="indent" style="color: #c00000;">
Note: the beta test releases only install under the versioned name on
POSIX systems (to avoid overwriting a previous version). You either need
to type <tt>luajit-2.0.0-beta11</tt> to start it or create a symlink
with a command like this:
</p>
<pre class="code" style="color: #c00000;">
sudo ln -sf luajit-2.0.0-beta11&nbsp;/usr/local/bin/luajit
</pre>
<h2 id="options">Command Line Options</h2> <h2 id="options">Command Line Options</h2>
<p> <p>
@ -195,7 +186,7 @@ itself. For a description of their options and output format, please
read the comment block at the start of their source. read the comment block at the start of their source.
They can be found in the <tt>lib</tt> directory of the source They can be found in the <tt>lib</tt> directory of the source
distribution or installed under the <tt>jit</tt> directory. By default distribution or installed under the <tt>jit</tt> directory. By default
this is <tt>/usr/local/share/luajit-2.0.0-beta11/jit</tt> on POSIX this is <tt>/usr/local/share/luajit-2.0.0/jit</tt> on POSIX
systems. systems.
</p> </p>
@ -217,10 +208,6 @@ optimizations and higher numbers enable more optimizations. Omitting
the level (i.e. just <tt>-O</tt>) sets the default optimization level, the level (i.e. just <tt>-O</tt>) sets the default optimization level,
which is <tt>-O3</tt> in the current version. which is <tt>-O3</tt> in the current version.
</p> </p>
<p style="font-size: 8pt;">
Note: Unlike previous versions, <b>optimization is turned on by default</b> in
LuaJIT 2.0!<br>It's no longer necessary to use <tt>luajit&nbsp;-O</tt>.
</p>
<p> <p>
The second form adds or removes individual optimization flags. The second form adds or removes individual optimization flags.
The third form sets a parameter for the VM or the JIT compiler The third form sets a parameter for the VM or the JIT compiler

View File

@ -62,11 +62,9 @@ ul li { padding-bottom: 0.3em; }
</div> </div>
<div id="main"> <div id="main">
<p> <p>
<span style="color: #c00000;">LuaJIT&nbsp;2.0</span> is the currently active <span style="color: #0000c0;">LuaJIT&nbsp;2.0</span> is the current
<span style="color: #c00000;">development branch</span> in beta test. <span style="color: #0000c0;">stable branch</span>. This branch is in
It has <a href="http://luajit.org/performance.html"><span class="ext">&raquo;</span>&nbsp;much better performance</a> than feature-freeze &mdash; new features will only be added to LuaJIT&nbsp;2.1.
LuaJIT&nbsp;1.x and runs on many more platforms and architectures.
The branch has already been frozen as it's nearing a stable release.
</p> </p>
<h2>Current Status</h2> <h2>Current Status</h2>