Merge branch 'v2.1' into v2.1-agentzh

openresty · Apr 9, 2015 · dcebbc4 · dcebbc4
2 parents b88b7a3 + 8002871
commit dcebbc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/doc/status.html b/doc/status.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-<title>Status &amp; Roadmap</title>
+<title>Status</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <meta name="Author" content="Mike Pall">
 <meta name="Copyright" content="Copyright (C) 2005-2015, Mike Pall">
@@ -17,7 +17,7 @@
 <a href="http://luajit.org"><span>Lua<span id="logo">JIT</span></span></a>
 </div>
 <div id="head">
-<h1>Status &amp; Roadmap</h1>
+<h1>Status</h1>
 </div>
 <div id="nav">
 <ul><li>
@@ -104,15 +104,6 @@ <h2>Current Status</h2>
 garbage collector.
 </li>
 </ul>
-
-<h2>Roadmap</h2>
-<p>
-Please refer to the
-<a href="http://www.freelists.org/post/luajit/LuaJIT-Roadmap-20122013"><span class="ext">&raquo;</span>&nbsp;LuaJIT Roadmap 2012/2013</a> and an
-<a href="http://www.freelists.org/post/luajit/LuaJIT-Roadmap-20122013-UPDATE"><span class="ext">&raquo;</span>&nbsp;update on release planning</a> for details.
-</p>
-<p>
-</p>
 <br class="flush">
 </div>
 <div id="foot">

diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc
@@ -4289,13 +4289,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |  lwz TAB:CARG2, 4(RB)
     |.if DUALNUM
     |  add RC, BASE, RC
-    |    lbz TMP3, TAB:RB->marked
+    |    lbz TMP3, TAB:CARG2->marked
     |  lwz TMP0, TAB:CARG2->asize
     |  lwz CARG3, 4(RC)
     |   lwz TMP1, TAB:CARG2->array
     |.else
     |  lfdx f0, BASE, RC
-    |    lbz TMP3, TAB:RB->marked
+    |    lbz TMP3, TAB:CARG2->marked
     |  lwz TMP0, TAB:CARG2->asize
     |  toint CARG3, f0
     |   lwz TMP1, TAB:CARG2->array