Merge branch 'PHP-8.0'

dstogov · dstogov · commit e2227ddb052a · 2020-11-25T03:50:55.000+03:00
* PHP-8.0:
  Use diferent temporary register (%r0 may keep a method address)
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -14196,10 +14196,10 @@ static int zend_jit_load_this(dasm_State **Dst, uint32_t var)
 {
 	zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, var);
 
-	|	mov r0, aword EX->This.value.ptr
-	|	SET_ZVAL_PTR var_addr, r0
+	|	mov FCARG1a, aword EX->This.value.ptr
+	|	SET_ZVAL_PTR var_addr, FCARG1a
 	|	SET_ZVAL_TYPE_INFO var_addr, IS_OBJECT_EX
-	|	GC_ADDREF r0
+	|	GC_ADDREF FCARG1a
 
 	return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -14196,10 +14196,10 @@ static int zend_jit_load_this(dasm_State **Dst, uint32_t var)`
`14196`	`14196`	`{`
`14197`	`14197`	`zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, var);`
`14198`	`14198`
`14199`		`- \| mov r0, aword EX->This.value.ptr`
`14200`		`- \| SET_ZVAL_PTR var_addr, r0`
	`14199`	`+ \| mov FCARG1a, aword EX->This.value.ptr`
	`14200`	`+ \| SET_ZVAL_PTR var_addr, FCARG1a`
`14201`	`14201`	`\| SET_ZVAL_TYPE_INFO var_addr, IS_OBJECT_EX`
`14202`		`- \| GC_ADDREF r0`
	`14202`	`+ \| GC_ADDREF FCARG1a`
`14203`	`14203`
`14204`	`14204`	`return 1;`
`14205`	`14205`	`}`