Merge branch 'master' into v2.1

2013-12-25 00:27:55 +01:00
parent e52119bbdd ca67c89f20
commit 6e02c210c4
1 changed files with 1 additions and 1 deletions
--- a/src/vm_mips.dasc
+++ b/src/vm_mips.dasc
@@ -2120,7 +2120,7 @@ static void build_subroutines(BuildCtx *ctx)
  |2:
  |  addiu RC, MULTRES, -8
  |  jr AT
-  |.  add RA, RA, BASE
+  |.  addu RA, RA, BASE
  |
  |3:  // Rethrow error from the right C frame.
  |  load_got lj_err_throw