Better CPU registers usage

Author: dstogov

ext/opcache/jit/zend_jit_x86.dasc

@@ -14823,21 +14823,21 @@ static int zend_jit_fe_fetch(dasm_State **Dst, const zend_op *opline, uint32_t o
 
 	|	// array = EX_VAR(opline->op1.var);
 	|	// fe_ht = Z_ARRVAL_P(array);
-	|	GET_ZVAL_PTR FCARG2a, op1_addr
+	|	GET_ZVAL_PTR FCARG1a, op1_addr
 	|	// pos = Z_FE_POS_P(array);
-	|	mov FCARG1d, dword [FP + opline->op1.var + offsetof(zval, u2.fe_pos)]
+	|	mov eax, dword [FP + opline->op1.var + offsetof(zval, u2.fe_pos)]
 	|	// p = fe_ht->arData + pos;
 	|.if X64
 		||	ZEND_ASSERT(sizeof(Bucket) == 32);
-		|	mov eax, FCARG1d
-		|	shl r0, 5
+		|	mov FCARG2d, eax
+		|	shl FCARG2a, 5
 	|.else
-		|	imul r0, FCARG1a, sizeof(Bucket)
+		|	imul FCARG2a, r0, sizeof(Bucket)
 	|.endif
-	|	add r0, aword [FCARG2a + offsetof(zend_array, arData)]
+	|	add FCARG2a, aword [FCARG1a + offsetof(zend_array, arData)]
 	|1:
 	|	// if (UNEXPECTED(pos >= fe_ht->nNumUsed)) {
-	|	cmp dword [FCARG2a + offsetof(zend_array, nNumUsed)], FCARG1d
+	|	cmp dword [FCARG1a + offsetof(zend_array, nNumUsed)], eax
 	|	// ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
 	|   // ZEND_VM_CONTINUE();
 	if (exit_addr) {
@@ -14850,16 +14850,16 @@ static int zend_jit_fe_fetch(dasm_State **Dst, const zend_op *opline, uint32_t o
 		|	jbe =>target_label
 	}
 	|	// pos++;
-	|	add FCARG1d, 1
+	|	add eax, 1
 	|	// value_type = Z_TYPE_INFO_P(value);
 	|	// if (EXPECTED(value_type != IS_UNDEF)) {
 	if (!exit_addr || exit_opcode == ZEND_JMP) {
-		|	IF_NOT_Z_TYPE r0, IS_UNDEF, >3
+		|	IF_NOT_Z_TYPE FCARG2a, IS_UNDEF, >3
 	} else {
-		|	IF_NOT_Z_TYPE r0, IS_UNDEF, &exit_addr
+		|	IF_NOT_Z_TYPE FCARG2a, IS_UNDEF, &exit_addr
 	}
 	|	// p++;
-	|	add r0, sizeof(Bucket)
+	|	add FCARG2a, sizeof(Bucket)
 	|	jmp <1
 	|3:
 
@@ -14868,29 +14868,28 @@ static int zend_jit_fe_fetch(dasm_State **Dst, const zend_op *opline, uint32_t o
 		zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op2.var);
 		uint32_t val_info;
 
-		|	mov FCARG2a, r0
 		|	// Z_FE_POS_P(array) = pos + 1;
-		|	mov dword [FP + opline->op1.var + offsetof(zval, u2.fe_pos)], FCARG1d
+		|	mov dword [FP + opline->op1.var + offsetof(zval, u2.fe_pos)], eax
 
 		if (RETURN_VALUE_USED(opline)) {
 			zend_jit_addr res_addr = RES_ADDR();
 
 			if ((op1_info & MAY_BE_ARRAY_KEY_LONG)
 			 && (op1_info & MAY_BE_ARRAY_KEY_STRING)) {
 				|	// if (!p->key) {
-				|	cmp aword [r0 + offsetof(Bucket, key)], 0
+				|	cmp aword [FCARG2a + offsetof(Bucket, key)], 0
 				|	jz >2
 			}
 			if (op1_info & MAY_BE_ARRAY_KEY_STRING) {
 				|	// ZVAL_STR_COPY(EX_VAR(opline->result.var), p->key);
-				|	mov FCARG1a, aword [r0 + offsetof(Bucket, key)]
-				|	SET_ZVAL_PTR res_addr, FCARG1a
-				|	test dword [FCARG1a + offsetof(zend_refcounted, gc.u.type_info)], IS_STR_INTERNED
+				|	mov r0, aword [FCARG2a + offsetof(Bucket, key)]
+				|	SET_ZVAL_PTR res_addr, r0
+				|	test dword [r0 + offsetof(zend_refcounted, gc.u.type_info)], IS_STR_INTERNED
 				|	jz >1
 				|	SET_ZVAL_TYPE_INFO res_addr, IS_STRING
 				|	jmp >3
 				|1:
-				|	GC_ADDREF FCARG1a
+				|	GC_ADDREF r0
 				|	SET_ZVAL_TYPE_INFO res_addr, IS_STRING_EX
 
 				if (op1_info & MAY_BE_ARRAY_KEY_LONG) {
@@ -14900,8 +14899,8 @@ static int zend_jit_fe_fetch(dasm_State **Dst, const zend_op *opline, uint32_t o
 			}
 			if (op1_info & MAY_BE_ARRAY_KEY_LONG) {
 				|	// ZVAL_LONG(EX_VAR(opline->result.var), p->h);
-				|	mov FCARG1a, aword [r0 + offsetof(Bucket, h)]
-				|	SET_ZVAL_LVAL res_addr, FCARG1a
+				|	mov r0, aword [FCARG2a + offsetof(Bucket, h)]
+				|	SET_ZVAL_LVAL res_addr, r0
 				|	SET_ZVAL_TYPE_INFO res_addr, IS_LONG
 			}
 			|3: