(libretro) Hook currently broken mips3 x64 drc + some fixes

Author: barbudreadmon

makefile

@@ -39,9 +39,6 @@ INCLUDE_7Z_SUPPORT = 1
 # Include AVI recording support (uses Video For Windows)
 INCLUDE_AVI_RECORDING = 1
 
-# Include Files that require C++11 (Killer Instinct, IDE module and MIPS3 core) - requires C++11 support
-INCLUDE_CPLUSPLUS11_FILES = 1
-
 # Include symbols and other debug information in the executable
 #SYMBOL = 1
 

makefile.burn_rules

@@ -1,8 +1,9 @@
 alldir	= 	burn burn/devices burn/snd burn/drv burn/drv/atari burn/drv/capcom burn/drv/cave burn/drv/coleco burn/drv/cps3 burn/drv/dataeast \
 			burn/drv/galaxian burn/drv/irem burn/drv/konami burn/drv/megadrive burn/drv/midway burn/drv/pce burn/drv/pst90s burn/drv/pre90s burn/drv/neogeo \
 			burn/drv/pgm burn/drv/psikyo burn/drv/sega burn/drv/sg1000 burn/drv/sms burn/drv/msx burn/drv/snes burn/drv/spectrum burn/drv/taito \
-			burn/drv/toaplan cpu cpu/a68k cpu/arm cpu/arm7 cpu/h6280 cpu/hd6309 cpu/i8039 cpu/i8x41 cpu/i8051 cpu/adsp2100 cpu/konami cpu/m68k cpu/m6502 cpu/m6800 \
-			cpu/m6805 cpu/m6809 cpu/nec cpu/pic16c5x cpu/s2650 cpu/tlcs90 cpu/sh2 cpu/tms32010 cpu/tms34010 cpu/upd7725 cpu/upd7810 cpu/v60 cpu/z80 cpu/z180
+			burn/drv/toaplan cpu cpu/a68k cpu/arm cpu/arm7 cpu/h6280 cpu/hd6309 cpu/i8039 cpu/i8x41 cpu/i8051 cpu/adsp2100 cpu/konami cpu/mips3 cpu/m68k \
+			cpu/m6502 cpu/m6800 cpu/m6805 cpu/m6809 cpu/nec cpu/pic16c5x cpu/s2650 cpu/tlcs90 cpu/sh2 cpu/tms32010 cpu/tms34010 cpu/upd7725 cpu/upd7810 \
+			cpu/v60 cpu/z80 cpu/z180
 
 drvsrc	= 	d_arcadecl.cpp d_atarig1.cpp d_badlands.cpp d_batman.cpp d_blstroid.cpp d_eprom.cpp d_gauntlet.cpp d_klax.cpp d_offtwall.cpp d_rampart.cpp \
 			d_relief.cpp d_shuuz.cpp d_skullxbo.cpp d_thunderj.cpp d_toobin.cpp d_vindictr.cpp d_xybots.cpp \
@@ -31,7 +32,7 @@ drvsrc	= 	d_arcadecl.cpp d_atarig1.cpp d_badlands.cpp d_batman.cpp d_blstroid.cp
 			d_rollerg.o d_sbasketb.o d_scotrsht.o d_shaolins.o d_simpsons.o d_spy.o d_surpratk.o d_thunderx.o d_timeplt.o d_tmnt.o d_tp84.o d_trackfld.o \
 			d_tutankhm.o d_twin16.o d_ultraman.o d_vendetta.o d_xexex.o d_xmen.o d_yiear.o \
 			\
-			d_tunit.o d_wunit.o \
+			d_kinst.o d_tunit.o d_wunit.o \
 			\
 			d_neogeo.o \
 			\
@@ -95,10 +96,6 @@ drvsrc	= 	d_arcadecl.cpp d_atarig1.cpp d_badlands.cpp d_batman.cpp d_blstroid.cp
 			\
 			d_spectrum.o
 
-ifdef	INCLUDE_CPLUSPLUS11_FILES
-	drvsrc += d_kinst.o
-endif
-
 depobj	= 	burn.o burn_bitmap.o burn_gun.o burn_led.o burn_shift.o burn_memory.o burn_pal.o burn_sound.o burn_sound_c.o cheat.o debug_track.o hiscore.o \
 			load.o tilemap_generic.o tiles_generic.o timer.o vector.o \
 			\
@@ -112,12 +109,15 @@ depobj	= 	burn.o burn_bitmap.o burn_gun.o burn_led.o burn_shift.o burn_memory.o
 			tms5110.o tms5220.o tms36xx.o phoenixsound.o pleiadssound.o pokey.o redbaron.o rf5c68.o saa1099.o samples.o segapcm.o sn76477.o sn76496.o \
 			upd7759.o vlm5030.o wiping.o x1010.o ym2151.o ym2413.o ymdeltat.o ymf278b.o ymz280b.o snk6502_sound.o sp0250.o sp0256.o \
 			\
-			adsp2100.o adsp2100_intf.o arm7_intf.o arm_intf.o h6280_intf.o hd6309_intf.o konami_intf.o m6502_intf.o m6800_intf.o m6805_intf.o m6809_intf.o m68000_intf.o nec_intf.o \
-			pic16c5x_intf.o s2650_intf.o tlcs90_intf.o tms34010.o tms34010_optable.o tms34010_intf.o z80_intf.o z180_intf.o  \
+			adsp2100.o adsp2100_intf.o arm7_intf.o arm_intf.o h6280_intf.o hd6309_intf.o konami_intf.o m6502_intf.o m6800_intf.o m6805_intf.o m6809_intf.o \
+			m68000_intf.o mips3_intf.o nec_intf.o pic16c5x_intf.o s2650_intf.o tlcs90_intf.o tms34010.o tms34010_optable.o tms34010_intf.o z80_intf.o \
+			z180_intf.o  \
 			\
 			arm.o arm7.o h6280.o hd6309.o i8039.o i8x41.o mcs51.o konami.o m6502.o m6800.o m6805.o m6809.o nec.o pic16c5x.o s2650.o sh2.o tms32010.o tlcs90.o \
 			upd7725.o upd7810.o v25.o v60.o z80.o z80daisy.o z180.o \
 			\
+			cop0.o cop1.o mips3.o \
+			\
 			cave.o cave_palette.o cave_sprite.o cave_tile.o \
 			\
 			cps2_crpt.o cps.o cps_config.o cps_draw.o cps_mem.o cps_obj.o cps_pal.o cps_run.o cps_rw.o cps_scr.o cpsr.o cpsrd.o cpst.o ctv.o fcrash_snd.o \
@@ -134,7 +134,7 @@ depobj	= 	burn.o burn_bitmap.o burn_gun.o burn_led.o burn_shift.o burn_memory.o
 			k007121.o k007342_k007420.o k051316.o k051733.o k051960.o k052109.o k053245.o k053247.o k053250.o k053251.o k053936.o k054000.o k054338.o \
 			k055555.o k056832.o konamigx.o konamiic.o timeplt_snd.o \
 			\
-			dcs2k.o midwayic.o midtunit.o midwunit.o \
+			dcs2k.o ide.o midwayic.o midtunit.o midwunit.o \
 			\
 			neo_decrypt.o neo_palette.o neo_run.o neo_sprite.o neo_text.o neo_upd4990a.o neogeo.o \
 			\
@@ -168,12 +168,7 @@ ifdef	BUILD_X86_ASM
 	autobj += burn_sound_a.o
 endif
 
-
-ifdef	INCLUDE_CPLUSPLUS11_FILES
-	alldir += cpu/mips3
-	depobj += ide.o cop0.o cop1.o mips3.o mips3_intf.o
 ifdef	BUILD_X64_EXE
 	alldir += cpu/mips3/x64
 	depobj += mips3_x64.o
-endif
 endif

makefile.libretro

@@ -11,8 +11,8 @@ USE_SPEEDHACKS = 1
 EXTERNAL_ZLIB = 0
 INCLUDE_7Z_SUPPORT = 1
 PTR64 ?= 1
-INCLUDE_CPLUSPLUS11_FILES = 0
-BUILD_X64_EXE = 0
+# enable x86_64 dynarec, however it's not working properly atm
+USE_X64_DRC = 0
 AUTOGEN_DATS = 0
 HAVE_NEON = 0
 USE_EXPERIMENTAL_FLAGS = 0

makefile.libretro_common

@@ -121,22 +121,6 @@ ifeq ($(NO_NEOGEO), 1)
 	NEOGEO_DIR :=
 endif
 
-ifeq ($(INCLUDE_CPLUSPLUS11_FILES), 1)
-	ifeq (,$(findstring msvc,$(platform)))
-		CXXFLAGS += -std=gnu++11
-	endif
-	ifeq ($(BUILD_X64_EXE), 1)
-		FBA_DEFINES += -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC
-	else
-		MIPS3_X64_DYNAREC_DIR :=
-	endif
-else
-	ifeq (,$(findstring msvc,$(platform)))
-		CXXFLAGS += -std=gnu++98
-	endif
-	MIPS3_X64_DYNAREC_DIR :=
-endif
-
 FBA_BURN_DRIVERS_DIRS := $(CAPCOM_DIR) \
 	$(ATARI_DIR) \
 	$(FBA_BURN_DRIVERS_DIR)/cave \
@@ -185,7 +169,6 @@ FBA_CPU_DIRS := $(FBA_CPU_DIR) \
 	$(FBA_CPU_DIR)/m6809 \
 	$(M68K_DIR) \
 	$(MIPS3_DIR) \
-	$(MIPS3_X64_DYNAREC_DIR) \
 	$(FBA_CPU_DIR)/nec \
 	$(FBA_CPU_DIR)/pic16c5x \
 	$(FBA_CPU_DIR)/s2650 \
@@ -203,31 +186,6 @@ FBA_INTERFACE_DIRS := $(FBA_INTERFACE_DIR)/audio
 
 FBA_SRC_DIRS := $(FBA_BURNER_DIR) $(FBA_BURN_DIRS) $(FBA_CPU_DIRS) $(FBA_BURNER_DIRS) $(FBA_INTERFACE_DIRS)
 
-ifeq ($(EXTERNAL_ZLIB), 1)
-	FBA_DEFINES += -DEXTERNAL_ZLIB
-	LDFLAGS += -lz
-else
-	FBA_SRC_DIRS += $(FBA_LIB_DIR)/zlib
-endif
-
-ifeq ($(INCLUDE_7Z_SUPPORT), 1)
-	FBA_DEFINES += -DINCLUDE_7Z_SUPPORT
-	FBA_SRC_DIRS += $(FBA_LIB_DIR)/lib7z
-	BURN_BLACKLIST += $(FBA_LIB_DIR)/lib7z/LzFindMt.c \
-		$(FBA_LIB_DIR)/lib7z/LzmaEnc.c \
-		$(FBA_LIB_DIR)/lib7z/MtCoder.c \
-		$(FBA_LIB_DIR)/lib7z/Lzma2Enc.c \
-		$(FBA_LIB_DIR)/lib7z/Bcj2Enc.c \
-		$(FBA_LIB_DIR)/lib7z/Threads.c \
-		$(FBA_LIB_DIR)/lib7z/Lzma86Enc.c \
-		$(FBA_LIB_DIR)/lib7z/LzmaLib.c \
-		$(FBA_LIB_DIR)/lib7z/XzEnc.c
-else
-	BURN_BLACKLIST += $(FBA_BURNER_DIR)/un7z.cpp
-endif
-
-SOURCES_C += $(filter-out $(BURN_BLACKLIST),$(foreach dir,$(FBA_SRC_DIRS),$(wildcard $(dir)/*.c)))
-
 ifneq ($(STATIC_LINKING), 1)
 	SOURCES_C += $(LIBRETRO_COMM_DIR)/file/file_path.c \
 		$(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
@@ -292,6 +250,18 @@ INCLUDE_DIRS := $(FBA_BURNER_DIR)/win32 \
 
 ARM_FLAGS =
 
+ifeq ($(USE_X64_DRC), 1)
+	FBA_DEFINES  += -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC
+	FBA_SRC_DIRS += $(MIPS3_X64_DYNAREC_DIR)
+	ifeq (,$(findstring msvc,$(platform)))
+		CXXFLAGS += -std=gnu++11
+	endif
+else
+	ifeq (,$(findstring msvc,$(platform)))
+		CXXFLAGS += -std=gnu++98
+	endif
+endif
+
 ifeq ($(USE_CYCLONE), 1)
 	FBA_DEFINES		+= -DUSE_CYCLONE
 	INCLUDE_DIRS	+= $(FBA_CPU_DIR)/cyclone
@@ -309,7 +279,6 @@ ifeq ($(USE_CYCLONE), 1)
 	CXXFLAGS		+= -fno-optimize-sibling-calls -funsafe-math-optimizations -fsingle-precision-constant
 else
 	BURN_BLACKLIST	+= $(FBA_CPU_DIR)/c68000_intf.cpp
-	SOURCES_S		:= 
 endif
 
 NEON_FLAGS=
@@ -326,6 +295,30 @@ ifeq ($(HAVE_NEON), 1)
 	SOURCES_S		+= $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler_neon.S
 endif
 
+ifeq ($(EXTERNAL_ZLIB), 1)
+	FBA_DEFINES += -DEXTERNAL_ZLIB
+	LDFLAGS += -lz
+else
+	FBA_SRC_DIRS += $(FBA_LIB_DIR)/zlib
+endif
+
+ifeq ($(INCLUDE_7Z_SUPPORT), 1)
+	FBA_DEFINES += -DINCLUDE_7Z_SUPPORT
+	FBA_SRC_DIRS += $(FBA_LIB_DIR)/lib7z
+	BURN_BLACKLIST += $(FBA_LIB_DIR)/lib7z/LzFindMt.c \
+		$(FBA_LIB_DIR)/lib7z/LzmaEnc.c \
+		$(FBA_LIB_DIR)/lib7z/MtCoder.c \
+		$(FBA_LIB_DIR)/lib7z/Lzma2Enc.c \
+		$(FBA_LIB_DIR)/lib7z/Bcj2Enc.c \
+		$(FBA_LIB_DIR)/lib7z/Threads.c \
+		$(FBA_LIB_DIR)/lib7z/Lzma86Enc.c \
+		$(FBA_LIB_DIR)/lib7z/LzmaLib.c \
+		$(FBA_LIB_DIR)/lib7z/XzEnc.c
+else
+	BURN_BLACKLIST += $(FBA_BURNER_DIR)/un7z.cpp
+endif
+
+SOURCES_C   += $(filter-out $(BURN_BLACKLIST),$(foreach dir,$(FBA_SRC_DIRS),$(wildcard $(dir)/*.c)))
 SOURCES_CXX += $(filter-out $(BURN_BLACKLIST),$(foreach dir,$(FBA_SRC_DIRS),$(wildcard $(dir)/*.cpp)))
 SOURCES_CXX += $(LIBRETRO_DIR)/libretro.cpp \
 	$(LIBRETRO_DIR)/cd_emu.cpp \

makefile.mamemingw

@@ -240,10 +240,7 @@ ifdef BUILD_X86_ASM
 endif
 
 ifdef BUILD_X64_EXE
-	DEF := $(DEF) -DBUILD_X64_EXE
-ifdef INCLUDE_CPLUSPLUS11_FILES
-	DEF := $(DEF) -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC
-endif
+	DEF := $(DEF) -DBUILD_X64_EXE -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC
 endif
 
 ifdef USE_SEGOE

makefile.mingw

@@ -351,10 +351,7 @@ ifdef BUILD_X86_ASM
 endif
 
 ifdef BUILD_X64_EXE
-	DEF := $(DEF) -DBUILD_X64_EXE
-ifdef INCLUDE_CPLUSPLUS11_FILES
-	DEF := $(DEF) -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC
-endif
+	DEF := $(DEF) -DBUILD_X64_EXE -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC
 endif
 
 ifdef USE_SEGOE