Fix jit

Author: shivammathur

ext/opcache/jit/tls/zend_jit_tls_darwin.c

@@ -26,6 +26,12 @@
 
 TSRMLS_CACHE_EXTERN();
 
+struct tlv_descriptor {
+	void *(*thunk)(struct tlv_descriptor *);
+	uintptr_t key;
+	uintptr_t offset;
+};
+
 zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 	size_t *tcb_offset,
 	size_t *module_index,
@@ -37,46 +43,50 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 	}
 
 #if defined(__x86_64__)
-	size_t *ti;
+	const struct tlv_descriptor *desc;
+
 	__asm__ __volatile__(
-		"leaq __tsrm_ls_cache(%%rip),%0"
-		: "=r" (ti));
-	*module_offset = ti[2];
-	*module_index = ti[1] * 8;
+		"leaq ___tsrm_ls_cache@TLVP(%%rip), %0\n\t"
+		"movq (%0), %0\n\t"
+		: "=&r"(desc)
+		:
+		: "memory"
+	);
 
-	return SUCCESS;
-#endif
+	*module_index  = (size_t)(desc->key * sizeof(void *));
+	*module_offset = (size_t)desc->offset;
 
+	return SUCCESS;
+#else
 	return FAILURE;
+#endif
 }
 
-/* Used for testing */
 void *zend_jit_tsrm_ls_cache_address(
 	size_t tcb_offset,
 	size_t module_index,
 	size_t module_offset
 ) {
-
-#if defined(__x86_64__)
+#if defined(__APPLE__) && defined(__x86_64__)
 	if (tcb_offset) {
 		char *addr;
 		__asm__ __volatile__(
-			"movq   %%gs:(%1), %0\n"
-			: "=r" (addr)
-			: "r" (tcb_offset)
+			"movq %%gs:(%1), %0\n\t"
+			: "=r"(addr)
+			: "r"(tcb_offset)
 		);
 		return addr;
 	}
+
 	if (module_index != (size_t)-1 && module_offset != (size_t)-1) {
 		char *base;
 		__asm__ __volatile__(
-			"movq   %%gs:(%1), %0\n"
-			: "=r" (base)
-			: "r" (module_index)
+			"movq %%gs:(%1), %0\n\t"
+			: "=r"(base)
+			: "r"(module_index)
 		);
 		return base + module_offset;
 	}
 #endif
-
 	return NULL;
 }