Merge pull request #1617 from davidgfnet/x64imp

Cleanup and unify x64 asm implementation

Author: davidgfnet

CMakeLists.txt

@@ -92,11 +92,6 @@ if(${FEAT_SHREC} EQUAL ${DYNAREC_JIT})
 	)
   elseif(${HOST_CPU} EQUAL ${CPU_X64})
 
-	### FIXME: asm with cmake ninja+VC
-    if(${BUILD_COMPILER} EQUAL ${COMPILER_VC})
-	  list(APPEND core_SRCS ${d_core}/rec-x64/msvc.asm)
-	endif()
-
     list(APPEND core_SRCS ${d_core}/rec-x64/rec_x64.cpp ${d_core}/rec-x64/x64_regalloc.h)
 
   elseif(${HOST_CPU} EQUAL ${CPU_A64})

core/hw/sh4/dyna/driver.cpp

@@ -38,6 +38,7 @@ uintptr_t cc_rx_offset;
 u32 LastAddr;
 u32 LastAddr_min;
 u32* emit_ptr=0;
+MainloopFnPtr_t mainloop_function;
 
 void* emit_GetCCPtr() { return emit_ptr==0?(void*)&CodeCache[LastAddr]:(void*)emit_ptr; }
 void emit_SetBaseAddr() { LastAddr_min = LastAddr; }
@@ -88,7 +89,7 @@ void recSh4_Run()
 		printf("Warning: SMC check mode is %d\n", settings.dynarec.SmcCheckLevel);
 
 	verify(rcb_noffs(&next_pc)==-184);
-	ngen_mainloop(sh4_dyna_rcb);
+	mainloop_function(sh4_dyna_rcb);
 
 #if !defined(TARGET_BOUNDED_EXECUTION)
 	sh4_int_bCpuRun=false;
@@ -417,10 +418,6 @@ void recSh4_Reset(bool Manual)
 	Sh4_int_Reset(Manual);
 }
 
-#if HOST_OS == OS_DARWIN
-#include <sys/mman.h>
-#endif
-
 void recSh4_Init()
 {
 	printf("recSh4 Init\n");
@@ -453,7 +450,7 @@ void recSh4_Init()
 	verify(CodeCache != NULL);
 
 	memset(CodeCache, 0xFF, CODE_SIZE);
-	ngen_init();
+	mainloop_function = ngen_init();
 	bm_Reset();
 }
 

core/hw/sh4/dyna/ngen.h

@@ -95,7 +95,8 @@ u32 DYNACALL rdv_DoInterrupts_pc(u32 pc);
 
 //Stuff to be implemented per dynarec core
 
-void ngen_init();
+typedef void (*MainloopFnPtr_t) (void*);
+MainloopFnPtr_t ngen_init();
 
 //Called to compile a block
 void ngen_Compile(RuntimeBlockInfo* block, SmcCheckEnum smc_checks, bool reset, bool staging,bool optimise);
@@ -105,8 +106,6 @@ void ngen_ResetBlocks();
 //Value to be returned when the block manager failed to find a block,
 //should call rdv_FailedToFindBlock and then jump to the return value
 extern void (*ngen_FailedToFindBlock)();
-//the dynarec mainloop
-void ngen_mainloop(void* cntx);
 
 void ngen_GetFeatures(ngen_features* dst);
 

core/rec-ARM/rec_arm.cpp

@@ -2274,7 +2274,10 @@ void ngen_ResetBlocks()
 	add
 	str
 */
-void ngen_init()
+
+extern "C" void ngen_mainloop(void*);
+
+MainloopFnPtr_t ngen_init()
 {
 	printf("Initializing the ARM32 dynarec\n");
     verify(FPCB_OFFSET == -0x2100000 || FPCB_OFFSET == -0x4100000);
@@ -2372,6 +2375,7 @@ void ngen_init()
 	//ccmap[shop_fseteq]=CC_EQ;
 	//ccmap[shop_fsetgt]=CC_GT;
 
+	return &ngen_mainloop;
 }
 
 

core/rec-ARM64/rec_arm64.cpp

@@ -122,7 +122,7 @@ __asm__
 		"br x0								\n"
 );
 
-void ngen_mainloop(void* v_cntx)
+void rec_mainloop(void* v_cntx)
 {
 	Sh4RCB* ctx = (Sh4RCB*)((u8*)v_cntx - sizeof(Sh4RCB));
 
@@ -202,10 +202,11 @@ void ngen_mainloop(void* v_cntx)
 	);
 }
 
-void ngen_init()
+MainloopFnPtr_t ngen_init()
 {
 	printf("Initializing the ARM64 dynarec\n");
 	ngen_FailedToFindBlock = &ngen_FailedToFindBlock_;
+	return &rec_mainloop;
 }
 
 void ngen_ResetBlocks()

core/rec-cpp/rec_cpp.cpp

@@ -36,7 +36,7 @@ struct DynaRBI : RuntimeBlockInfo
 int cycle_counter;
 extern int mips_counter;
 
-void ngen_mainloop(void* v_cntx)
+void rec_mainloop(void* v_cntx)
 {
 	Sh4RCB* ctx = (Sh4RCB*)((u8*)v_cntx - sizeof(Sh4RCB));
 
@@ -59,8 +59,9 @@ void ngen_mainloop(void* v_cntx)
 	}
 }
 
-void ngen_init()
+MainloopFnPtr_t ngen_init()
 {
+	return &rec_mainloop;
 }
 
 void ngen_GetFeatures(ngen_features* dst)