Use memcmp() for consistency

Author: arnaud-lb

ext/opcache/jit/tls/zend_jit_tls_x86.c

@@ -117,23 +117,23 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 	/* Check if the general dynamic code was relaxed by the linker */
 
 	// addl any,%ebx
-	if (code[0] != 0x81 || code[1] != 0xc3) {
+	if (memcmp(&code[0], "\x81\xc3", 2) != 0) {
 		uint64_t bytes;
 		memcpy(&bytes, &code[0], 8);
 		zend_accel_error(ACCEL_LOG_DEBUG, "addl insn does not match: 0x%16" PRIx64 "\n", bytes);
 		goto code_changed;
 	}
 
 	// leal any(,%ebx,1),%eax
-	if (code[6] != 0x8d || code[7] != 0x04 || code[8] != 0x1d) {
+	if (memcmp(&code[6], "\x8d\x04\x1d", 3) != 0) {
 		uint64_t bytes;
 		memcpy(&bytes, &code[6], 8);
 		zend_accel_error(ACCEL_LOG_DEBUG, "leal insn does not match: 0x%16" PRIx64 "\n", bytes);
 		goto code_changed;
 	}
 
 	// call any
-	if (code[13] != 0xe8) {
+	if (memcmp(&code[13], "\xe8", 1) != 0) {
 		uint64_t bytes;
 		memcpy(&bytes, &code[13], 8);
 		zend_accel_error(ACCEL_LOG_DEBUG, "call insn does not match: 0x%16" PRIx64 "\n", bytes);
@@ -189,7 +189,7 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 	}
 
 	// subl $any,%eax
-	if (code[12] != 0x81 || code[13] != 0xe8) {
+	if (memcmp(&code[12], "\x81\xe8", 2) != 0) {
 		uint64_t bytes;
 		memcpy(&bytes, &code[6], 8);
 		zend_accel_error(ACCEL_LOG_DEBUG, "subl insn does not match: 0x%16" PRIx64 "\n", bytes);

ext/opcache/jit/tls/zend_jit_tls_x86_64.c

@@ -113,15 +113,15 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 	/* Check if the general dynamic code was relaxed by the linker */
 
 	// data16 leaq any(%rip),%rdi
-	if (code[0] != 0x66 || code[1] != 0x48 || code[2] != 0x8d || code[3] != 0x3d) {
+	if (memcmp(&code[0], "\x66\x48\x8d\x3d", 4) != 0) {
 		uint64_t bytes;
 		memcpy(&bytes, &code[0], 8);
 		zend_accel_error(ACCEL_LOG_DEBUG, "leaq insn does not match: 0x%016" PRIx64 "\n", bytes);
 		goto code_changed;
 	}
 
 	// data16 data16 rex.W call any
-	if (code[8] != 0x66 || code[9] != 0x66 || code[10] != 0x48 || code[11] != 0xe8) {
+	if (memcmp(&code[8], "\x66\x66\x48\xe8", 4) != 0) {
 		uint64_t bytes;
 		memcpy(&bytes, &code[8], 8);
 		zend_accel_error(ACCEL_LOG_DEBUG, "call insn does not match: 0x%016" PRIx64 "\n", bytes);
@@ -172,7 +172,7 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 	}
 
 	// leaq any(%rax),$rax
-	if (code[9] != 0x48 || code[10] != 0x8d || code[11] != 0x80) {
+	if (memcmp(&code[9], "\x48\x8d\x80", 3) != 0) {
 		uint64_t bytes;
 		memcpy(&bytes, &code[10], 8);
 		zend_accel_error(ACCEL_LOG_DEBUG, "leaq insn does not match: 0x%016" PRIx64 "\n", bytes);