Merge branch 'master' into v2.1

2021-09-20 14:39:50 +02:00
parent 27ee3bcd79 68ffbd318b
commit 98b7d9a3b2
4 changed files with 4 additions and 4 deletions
--- a/src/vm_mips.dasc
+++ b/src/vm_mips.dasc
@@ -673,11 +673,11 @@ static void build_subroutines(BuildCtx *ctx)
  |.endif
  |     lw PC, -16+HI(RB)		// Restore PC from [cont|PC].
  |   addu TMP2, RA, RD
-  |    lw TMP1, LFUNC:TMP1->pc
  |.if FFI
  |  bnez AT, >1
  |.endif
  |.  sw TISNIL, -8+HI(TMP2)		// Ensure one valid arg.
+  |    lw TMP1, LFUNC:TMP1->pc
  |  // BASE = base, RA = resultptr, RB = meta base
  |  jr TMP0				// Jump to continuation.
  |.  lw KBASE, PC2PROTO(k)(TMP1)