Merge branch 'master' into v2.1

2014-12-27 06:11:14 +01:00
parent ecaa4eae88 db7cb5ab0e
commit 7a76d435da
5 changed files with 14 additions and 10 deletions
--- a/src/vm_ppc.dasc
+++ b/src/vm_ppc.dasc
@@ -587,7 +587,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