Removed unnecessary ptr_code field in translated_code_t

It can be deduced from ptr_exit instead

Author: ergo720

lib86cpu/core/emitter/x64/jit.cpp

@@ -643,7 +643,6 @@ lc86_jit::gen_code_block()
 	// This code block is complete, so protect and flush the instruction cache now
 	m_mem.flush_instr_cache(block);
 
-	tc->ptr_code = reinterpret_cast<entry_t>(main_offset);
 	tc->ptr_exit = reinterpret_cast<entry_t>(exit_offset);
 
 	// we are done with code generation for this block, so we null the tc pointer to prevent accidental usage
@@ -725,7 +724,7 @@ lc86_jit::gen_aux_funcs()
 void
 lc86_jit::gen_exit_func()
 {
-	// this should be emitted before main(), so that we can calculate the tc ptr from tc->ptr_code by simply subtracting an offset
+	// this should be emitted before main(), so that we can calculate the tc ptr from tc->ptr_exit by simply dereferencing it
 
 	size_t exit_off_start = m_a.offset();
 	MOV(RAX, m_cpu->tc);

lib86cpu/core/emitter/x64/linux/ipt.cpp

@@ -502,12 +502,11 @@ ipt_run_guarded_code(cpu_ctx_t *cpu_ctx, translated_code_t *tc)
 {
 	int ret = sigsetjmp(env, 1);
 	if (ret == SIG_SAVE_CTX) {
-		return tc->ptr_code(cpu_ctx);
+		return GET_PTR_CODE(tc->ptr_exit)(cpu_ctx);
 	}
 	else if (ret == SIG_GUEST_PF) {
 		return ipt_raise_exception(cpu_ctx);
 	}
 
 	LIB86CPU_ABORT();
 }
-

lib86cpu/core/emitter/x64/windows/ipt.cpp

@@ -482,7 +482,7 @@ translated_code_t *
 ipt_run_guarded_code(cpu_ctx_t *cpu_ctx, translated_code_t *tc)
 {
 	__try {
-		return tc->ptr_code(cpu_ctx);
+		return GET_PTR_CODE(tc->ptr_exit)(cpu_ctx);
 	}
 	__except (ipt_exception_filter(cpu_ctx->cpu, GetExceptionInformation())) {
 		if (raise_page_fault) {

lib86cpu/core/translate.cpp

@@ -982,7 +982,6 @@ translated_code_t::translated_code_t() noexcept
 	pc = 0,
 	virt_pc = 0;
 	guest_flags = 0;
-	ptr_code = nullptr;
 	ptr_exit = nullptr;
 	flags = 0;
 	size = 0;
@@ -1194,7 +1193,7 @@ tc_link_jmp(cpu_t *cpu, translated_code_t *ptr_tc)
 	elem->virt_pc = ptr_tc->virt_pc;
 	elem->cs_base = ptr_tc->cs_base;
 	elem->guest_flags = ptr_tc->guest_flags;
-	elem->ptr_code = ptr_tc->ptr_code;
+	elem->ptr_code = GET_PTR_CODE(ptr_tc->ptr_exit);
 	cpu->jmp_page_map[ptr_tc->virt_pc >> PAGE_SHIFT].insert(ptr_tc->virt_pc);
 }
 
@@ -1595,7 +1594,7 @@ tc_run_code(cpu_ctx_t *cpu_ctx, translated_code_t *tc)
 #ifdef XBOX_CPU
 		return ipt_run_guarded_code(cpu_ctx, tc);
 #else
-		return tc->ptr_code(cpu_ctx);
+		return GET_PTR_CODE(tc->ptr_exit)(cpu_ctx);
 #endif
 	}
 	catch (host_exp_t type) {

lib86cpu/lib86cpu_priv.hpp

@@ -52,6 +52,8 @@
 #define P6(n) P4(n), P4(n ^ 1), P4(n ^ 1), P4(n)
 #define GEN_TABLE P6(0), P6(1), P6(1), P6(0)
 
+#define GET_PTR_CODE(ptr_exit) ((entry_t)((uint8_t *)(ptr_exit) + 16))
+
 inline bool g_is_avx_supported = false;
 
  // memory region type
@@ -132,7 +134,6 @@ struct translated_code_t {
 	addr_t pc;
 	addr_t virt_pc;
 	uint32_t guest_flags;
-	entry_t ptr_code;
 	entry_t ptr_exit;
 	uint32_t flags;
 	uint64_t size;