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_ppc.dasc
+++ b/src/vm_ppc.dasc
@@ -859,11 +859,11 @@ static void build_subroutines(BuildCtx *ctx)
  |.endif
  |     lwz PC, -16(RB)			// Restore PC from [cont|PC].
  |   subi TMP2, RD, 8
-  |    lwz TMP1, LFUNC:TMP1->pc
  |   stwx TISNIL, RA, TMP2		// Ensure one valid arg.
  |.if FFI
  |  ble >1
  |.endif
+  |    lwz TMP1, LFUNC:TMP1->pc
  |    lwz KBASE, PC2PROTO(k)(TMP1)
  |  // BASE = base, RA = resultptr, RB = meta base
  |  mtctr TMP0