Merge branch 'master' into v2.1

2024-08-19 16:22:55 +02:00
parent ae4735f621 bcc6cbb188
commit fddc9650d8
3 changed files with 5 additions and 5 deletions
--- a/src/lj_asm_mips.h
+++ b/src/lj_asm_mips.h
@@ -456,7 +456,7 @@ static void asm_retf(ASMState *as, IRIns *ir)
  emit_addptr(as, base, -8*delta);
  asm_guard(as, MIPSI_BNE, RID_TMP,
 	    ra_allock(as, igcptr(pc), rset_exclude(RSET_GPR, base)));
-  emit_tsi(as, MIPSI_AL, RID_TMP, base, -8);
+  emit_tsi(as, MIPSI_AL, RID_TMP, base, (LJ_BE || LJ_FR2) ? -8 : -4);
 }

 /* -- Buffer operations --------------------------------------------------- */