Merge branch 'master' into v2.1

2013-02-28 17:53:45 +01:00
parent 9ec869b362 78c97bc5a1
commit b65196b7fd
2 changed files with 2 additions and 0 deletions
--- a/src/lj_asm_mips.h
+++ b/src/lj_asm_mips.h
@@ -71,6 +71,7 @@ static void asm_sparejump_setup(ASMState *as)
    memset(mxp+2, 0, MIPS_SPAREJUMP*8);
    mxp += MIPS_SPAREJUMP*2;
    lua_assert(mxp < as->mctop);
+    lj_mcode_sync(as->mcbot, mxp);
    lj_mcode_commitbot(as->J, mxp);
    as->mcbot = mxp;
    as->mclim = as->mcbot + MCLIM_REDZONE;