DynASM/ARM64: Fixed incorrect ADRP instruction encoding (-4 => +4)

dstogov · dstogov · commit d52fdd5056d5 · 2021-05-19T18:21:01.000+03:00
diff --git a/ext/opcache/jit/dynasm/dasm_arm64.h b/ext/opcache/jit/dynasm/dasm_arm64.h
@@ -484,7 +484,7 @@ int dasm_encode(Dst_DECL, void *buffer)
 	case DASM_REL_A: {
 	  ptrdiff_t na;
 	  if ((ins & 0x3000) == 0x3000) {  /* ADRP */
-	    na = ((((ptrdiff_t)(*b++) << 32) | (unsigned int)n) & ~0xfff) - (((ptrdiff_t)cp + 4) & ~0xfff);
+	    na = ((((ptrdiff_t)(*b++) << 32) | (unsigned int)n) & ~0xfff) - (((ptrdiff_t)cp - 4) & ~0xfff);;
 	  } else {
 	    na = (((ptrdiff_t)(*b++) << 32) | (unsigned int)n) - (ptrdiff_t)cp + 4;
 	  }

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ int dasm_encode(Dst_DECL, void *buffer)`
`484`	`484`	`case DASM_REL_A: {`
`485`	`485`	`ptrdiff_t na;`
`486`	`486`	`if ((ins & 0x3000) == 0x3000) { /* ADRP */`
`487`		`- na = ((((ptrdiff_t)(*b++) << 32) \| (unsigned int)n) & ~0xfff) - (((ptrdiff_t)cp + 4) & ~0xfff);`
	`487`	`+ na = ((((ptrdiff_t)(*b++) << 32) \| (unsigned int)n) & ~0xfff) - (((ptrdiff_t)cp - 4) & ~0xfff);;`
`488`	`488`	`} else {`
`489`	`489`	`na = (((ptrdiff_t)(*b++) << 32) \| (unsigned int)n) - (ptrdiff_t)cp + 4;`
`490`	`490`	`}`