ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libretro: Update

This commit is contained in:
retro-wertz 2018-06-04 23:55:08 +08:00
parent b0982ac8e1
commit 1f20ba81ad
5 changed files with 202 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/libretro/Makefile
View File

@ -1,6 +1,13 @@
TILED_RENDERING=0 TILED_RENDERING=0
STATIC_LINKING=0 STATIC_LINKING=0
SPACE :=
SPACE := $(SPACE) $(SPACE)
BACKSLASH :=
BACKSLASH := \$(BACKSLASH)
filter_out1 = $(filter-out $(firstword $1),$1)
filter_out2 = $(call filter_out1,$(call filter_out1,$1))
ifeq ($(platform),) ifeq ($(platform),)
platform = unix platform = unix
ifeq ($(shell uname -a),) ifeq ($(shell uname -a),)
@ -109,6 +116,97 @@ else ifeq ($(platform), vita)
USE_THREADED_RENDERER=1 USE_THREADED_RENDERER=1
USE_MOTION_SENSOR=1 USE_MOTION_SENSOR=1
HAVE_NEON=1 HAVE_NEON=1
# Windows MSVC 2017 all architectures
else ifneq (,$(findstring windows_msvc2017,$(platform)))
PlatformSuffix = $(subst windows_msvc2017_,,$(platform))
ifneq (,$(findstring desktop,$(PlatformSuffix)))
WinPartition = desktop
MSVC2017CompileFlags = -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -FS
LDFLAGS += -MANIFEST -LTCG:incremental -NXCOMPAT -DYNAMICBASE -DEBUG -OPT:REF -INCREMENTAL:NO -SUBSYSTEM:WINDOWS -MANIFESTUAC:"level='asInvoker' uiAccess='false'" -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1
LIBS := kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
else ifneq (,$(findstring uwp,$(PlatformSuffix)))
WinPartition = uwp
MSVC2017CompileFlags = -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_WINDLL -D_UNICODE -DUNICODE -D__WRL_NO_DEFAULT_LIB__ -EHsc -FS
LDFLAGS += -APPCONTAINER -NXCOMPAT -DYNAMICBASE -MANIFEST:NO -LTCG -OPT:REF -SUBSYSTEM:CONSOLE -MANIFESTUAC:NO -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1 -DEBUG:FULL -WINMD:NO
LIBS := WindowsApp.lib
endif
CFLAGS += $(MSVC2017CompileFlags)
CXXFLAGS += $(MSVC2017CompileFlags)
TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix))
CC = cl.exe
CXX = cl.exe
LD = link.exe
reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
ProgramFiles86w := $(shell cmd /c "echo %PROGRAMFILES(x86)%")
ProgramFiles86 := $(shell cygpath "$(ProgramFiles86w)")
WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
WindowsSdkDir := $(WindowsSdkDir)
WindowsSDKVersion ?= $(firstword $(foreach folder,$(subst $(subst \,/,$(WindowsSdkDir)Include/),,$(wildcard $(call fix_path,$(WindowsSdkDir)Include\*))),$(if $(wildcard $(call fix_path,$(WindowsSdkDir)Include/$(folder)/um/Windows.h)),$(folder),)))$(BACKSLASH)
WindowsSDKVersion := $(WindowsSDKVersion)
VsInstallBuildTools = $(ProgramFiles86)/Microsoft Visual Studio/2017/BuildTools
VsInstallEnterprise = $(ProgramFiles86)/Microsoft Visual Studio/2017/Enterprise
VsInstallProfessional = $(ProgramFiles86)/Microsoft Visual Studio/2017/Professional
VsInstallCommunity = $(ProgramFiles86)/Microsoft Visual Studio/2017/Community
VsInstallRoot ?= $(shell if [ -d "$(VsInstallBuildTools)" ]; then echo "$(VsInstallBuildTools)"; fi)
ifeq ($(VsInstallRoot), )
VsInstallRoot = $(shell if [ -d "$(VsInstallEnterprise)" ]; then echo "$(VsInstallEnterprise)"; fi)
endif
ifeq ($(VsInstallRoot), )
VsInstallRoot = $(shell if [ -d "$(VsInstallProfessional)" ]; then echo "$(VsInstallProfessional)"; fi)
endif
ifeq ($(VsInstallRoot), )
VsInstallRoot = $(shell if [ -d "$(VsInstallCommunity)" ]; then echo "$(VsInstallCommunity)"; fi)
endif
VsInstallRoot := $(VsInstallRoot)
VcCompilerToolsVer := $(shell cat "$(VsInstallRoot)/VC/Auxiliary/Build/Microsoft.VCToolsVersion.default.txt" | grep -o '[0-9\.]*')
VcCompilerToolsDir := $(VsInstallRoot)/VC/Tools/MSVC/$(VcCompilerToolsVer)
WindowsSDKSharedIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\shared")
WindowsSDKUCRTIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\ucrt")
WindowsSDKUMIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\um")
WindowsSDKUCRTLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\$(WindowsSDKVersion)\ucrt\$(TargetArchMoniker)")
WindowsSDKUMLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\$(WindowsSDKVersion)\um\$(TargetArchMoniker)")
# For some reason the HostX86 compiler doesn't like compiling for x64
# ("no such file" opening a shared library), and vice-versa.
# Work around it for now by using the strictly x86 compiler for x86, and x64 for x64.
# NOTE: What about ARM?
ifneq (,$(findstring x64,$(TargetArchMoniker)))
VCCompilerToolsBinDir := $(VcCompilerToolsDir)\bin\HostX64
else
VCCompilerToolsBinDir := $(VcCompilerToolsDir)\bin\HostX86
endif
PATH := $(shell IFS=$$'\n'; cygpath "$(VCCompilerToolsBinDir)/$(TargetArchMoniker)"):$(PATH)
PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VsInstallRoot)/Common7/IDE")
INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include")
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)")
ifneq (,$(findstring uwp,$(PlatformSuffix)))
LIB := $(shell IFS=$$'\n'; cygpath -w "$(LIB)/store")
endif
export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)
export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir)
TARGET := $(TARGET_NAME)_libretro.dll
PSS_STYLE :=2
LDFLAGS += -DLL
else else
TARGET := $(TARGET_NAME)_libretro.dll TARGET := $(TARGET_NAME)_libretro.dll
LDFLAGS += -Wl,-no-undefined -Wl,--version-script=link.T LDFLAGS += -Wl,-no-undefined -Wl,--version-script=link.T
@ -134,20 +232,50 @@ ifeq ($(DEBUG), 1)
CFLAGS += -g CFLAGS += -g
CXXFLAGS += -g CXXFLAGS += -g
else else
CFLAGS += -O3 -DNDEBUG CFLAGS += -O2 -DNDEBUG
CXXFLAGS += -O3 -DNDEBUG CXXFLAGS += -O2 -DNDEBUG
endif endif
CFLAGS += $(fpic) $(VBA_DEFINES) CFLAGS += $(fpic) $(VBA_DEFINES)
CXXFLAGS += $(fpic) $(VBA_DEFINES) CXXFLAGS += $(fpic) $(VBA_DEFINES)
LIBS := OBJOUT = -o
LINKOUT = -o
ifneq (,$(findstring msvc,$(platform)))
OBJOUT = -Fo
LINKOUT = -out:
ifeq ($(STATIC_LINKING),1)
LD ?= lib.exe
STATIC_LINKING=0
ifeq ($(DEBUG), 1)
CFLAGS += -MTd
CXXFLAGS += -MTd
else
CFLAGS += -MT
CXXFLAGS += -MT
endif
else
LD = link.exe
ifeq ($(DEBUG), 1)
CFLAGS += -MDd
CXXFLAGS += -MDd
else
CFLAGS += -MD
CXXFLAGS += -MD
endif
endif
else
LD = $(CXX)
endif
%.o: %.cpp %.o: %.cpp
$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCFLAGS) $(CXX) -c $(OBJOUT)$@ $< $(CXXFLAGS) $(INCFLAGS)
%.o: %.c %.o: %.c
$(CC) -c -o $@ $< $(CFLAGS) $(INCFLAGS) $(CC) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCFLAGS)
ifeq ($(platform), theos_ios) ifeq ($(platform), theos_ios)
COMMON_FLAGS := -DIOS $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error COMMON_FLAGS := -DIOS $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error
@ -162,7 +290,7 @@ $(TARGET): $(OBJS)
ifeq ($(STATIC_LINKING), 1) ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJS) $(AR) rcs $@ $(OBJS)
else else
$(CXX) -o $@ $(SHARED) $(OBJS) $(LDFLAGS) $(LIBS) $(LD) $(LINKOUT)$@ $(SHARED) $(OBJS) $(LDFLAGS) $(LIBS)
endif endif
clean: clean:

1
src/libretro/UtilRetro.cpp
View File

@ -150,6 +150,7 @@ uint8_t *utilLoad(const char *file, bool (*accept)(const char *), uint8_t *data,
char *buf = NULL; char *buf = NULL;
fp = fopen(file,"rb"); fp = fopen(file,"rb");
if(!fp) return NULL;
fseek(fp, 0, SEEK_END); //go to end fseek(fp, 0, SEEK_END); //go to end
size = ftell(fp); // get position at end (length) size = ftell(fp); // get position at end (length)
rewind(fp); rewind(fp);

71
src/libretro/jni/Android.mk
View File

@ -1,67 +1,20 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) CORE_DIR := $(LOCAL_PATH)/../..
LIBRETRO_DIR := $(CORE_DIR)/libretro
include $(LIBRETRO_DIR)/Makefile.common
COREFLAGS := -DHAVE_STDINT_H -DLSB_FIRST -D__LIBRETRO__ -DFINAL_VERSION -DC_CORE -DNO_LINK -DFRONTEND_SUPPORTS_RGB565 -DTILED_RENDERING $(INCFLAGS)
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown") ifneq ($(GIT_VERSION)," unknown")
LOCAL_CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif endif
ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS)
LOCAL_CFLAGS += -DANDROID_ARM LOCAL_MODULE := retro
LOCAL_ARM_MODE := arm LOCAL_SRC_FILES := $(SOURCES_CXX)
endif LOCAL_CXXFLAGS := $(COREFLAGS)
LOCAL_LDFLAGS := -Wl,-version-script=$(LIBRETRO_DIR)/link.T
ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += -DANDROID_X86
endif
ifeq ($(TARGET_ARCH),mips)
LOCAL_CFLAGS += -DANDROID_MIPS
endif
VBADIR = ../../
LOCAL_MODULE := libretro
LOCAL_SRC_FILES = $(VBADIR)/gba/agbprint.cpp \
$(VBADIR)/gba/armdis.cpp \
$(VBADIR)/gba/bios.cpp \
$(VBADIR)/gba/Cheats.cpp \
$(VBADIR)/gba/CheatSearch.cpp \
$(VBADIR)/gba/EEprom.cpp \
$(VBADIR)/gba/elf.cpp \
$(VBADIR)/gba/ereader.cpp \
$(VBADIR)/gba/Flash.cpp \
$(VBADIR)/gba/GBA-arm.cpp \
$(VBADIR)/gba/GBA.cpp \
$(VBADIR)/gba/gbafilter.cpp \
$(VBADIR)/gba/GBAGfx.cpp \
$(VBADIR)/gba/GBALink.cpp \
$(VBADIR)/gba/GBASockClient.cpp \
$(VBADIR)/gba/GBA-thumb.cpp \
$(VBADIR)/gba/Globals.cpp \
$(VBADIR)/gba/Mode0.cpp \
$(VBADIR)/gba/Mode1.cpp \
$(VBADIR)/gba/Mode2.cpp \
$(VBADIR)/gba/Mode3.cpp \
$(VBADIR)/gba/Mode4.cpp \
$(VBADIR)/gba/Mode5.cpp \
$(VBADIR)/gba/remote.cpp \
$(VBADIR)/gba/RTC.cpp \
$(VBADIR)/gba/Sound.cpp \
$(VBADIR)/gba/Sram.cpp \
$(VBADIR)/apu/Blip_Buffer.cpp \
$(VBADIR)/apu/Effects_Buffer.cpp \
$(VBADIR)/apu/Gb_Apu.cpp \
$(VBADIR)/apu/Gb_Apu_State.cpp \
$(VBADIR)/apu/Gb_Oscs.cpp \
$(VBADIR)/apu/Multi_Buffer.cpp \
$(VBADIR)/libretro/libretro.cpp \
$(VBADIR)/libretro/UtilRetro.cpp \
$(VBADIR)/libretro/SoundRetro.cpp \
$(VBADIR)/libretro/scrc32.cpp
LOCAL_CFLAGS = -O3 -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DLSB_FIRST -D__LIBRETRO__ -DFINAL_VERSION -DC_CORE -DUSE_GBA_ONLY -DNO_LINK -DFRONTEND_SUPPORTS_RGB565 -DTILED_RENDERING
LOCAL_C_INCLUDES = $(VBADIR)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
src/libretro/jni/Application.mk
View File

@ -1 +1,3 @@
APP_ABI := all APP_ABI := all
APP_STL := gnustl_static
NDK_TOOLCHAIN_VERSION := 4.9

53
src/libretro/libretro.cpp
View File

@ -39,7 +39,6 @@ retro_audio_sample_batch_t audio_batch_cb;
static retro_environment_t environ_cb; static retro_environment_t environ_cb;
bool enableRtc; bool enableRtc;
extern uint64_t joy;
static bool can_dupe; static bool can_dupe;
unsigned device_type = 0; unsigned device_type = 0;
int emulating = 0; int emulating = 0;
@ -48,6 +47,8 @@ static int controller_layout[2] = { 0, 0 };
uint8_t libretro_save_buf[0x20000 + 0x2000]; /* Workaround for broken-by-design GBA save semantics. */ uint8_t libretro_save_buf[0x20000 + 0x2000]; /* Workaround for broken-by-design GBA save semantics. */
static unsigned libretro_save_size = sizeof(libretro_save_buf); static unsigned libretro_save_size = sizeof(libretro_save_buf);
static char biosfile[1024] = {0};
static bool usebios = false;
int RGB_LOW_BITS_MASK = 0; int RGB_LOW_BITS_MASK = 0;
@ -188,14 +189,15 @@ void retro_set_environment(retro_environment_t cb)
environ_cb = cb; environ_cb = cb;
struct retro_variable variables[] = { struct retro_variable variables[] = {
{ "vbam_layer_1", "Show layer 1; Yes|No" }, { "vbam_usebios", "Use BIOS file (Restart); disabled|enabled" },
{ "vbam_layer_2", "Show layer 2; Yes|No" }, { "vbam_layer_1", "Show layer 1; enabled|disabled" },
{ "vbam_layer_3", "Show layer 3; Yes|No" }, { "vbam_layer_2", "Show layer 2; enabled|disabled" },
{ "vbam_layer_4", "Show layer 4; Yes|No" }, { "vbam_layer_3", "Show layer 3; enabled|disabled" },
{ "vbam_layer_5", "Show sprite layer; Yes|No" }, { "vbam_layer_4", "Show layer 4; enabled|disabled" },
{ "vbam_layer_6", "Show window layer 1; Yes|No" }, { "vbam_layer_5", "Show sprite layer; enabled|disabled" },
{ "vbam_layer_7", "Show window layer 2; Yes|No" }, { "vbam_layer_6", "Show window layer 1; enabled|disabled" },
{ "vbam_layer_8", "Show sprite window layer; Yes|No" }, { "vbam_layer_7", "Show window layer 2; enabled|disabled" },
{ "vbam_layer_8", "Show sprite window layer; enabled|disabled" },
{ NULL, NULL }, { NULL, NULL },
}; };
@ -217,7 +219,11 @@ void retro_get_system_info(struct retro_system_info *info)
{ {
info->need_fullpath = false; info->need_fullpath = false;
info->valid_extensions = "gba"; info->valid_extensions = "gba";
info->library_version = "git" GIT_VERSION; #ifdef GIT_VERSION
info->library_version = "2.0.2" GIT_VERSION;
#else
info->library_version = "2.0.2-GIT";
#endif
info->library_name = "VBA-M"; info->library_name = "VBA-M";
info->block_extract = false; info->block_extract = false;
} }
@ -235,6 +241,12 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
void retro_init(void) void retro_init(void)
{ {
#ifdef _WIN32
char slash = '\\';
#else
char slash = '/';
#endif
struct retro_log_callback log; struct retro_log_callback log;
memset(libretro_save_buf, 0xff, sizeof(libretro_save_buf)); memset(libretro_save_buf, 0xff, sizeof(libretro_save_buf));
adjust_save_ram(); adjust_save_ram();
@ -244,6 +256,10 @@ void retro_init(void)
else else
log_cb = NULL; log_cb = NULL;
const char* dir = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
snprintf(biosfile, sizeof(biosfile), "%s%c%s", dir, slash, "gba_bios.bin");
#ifdef FRONTEND_SUPPORTS_RGB565 #ifdef FRONTEND_SUPPORTS_RGB565
enum retro_pixel_format rgb565 = RETRO_PIXEL_FORMAT_RGB565; enum retro_pixel_format rgb565 = RETRO_PIXEL_FORMAT_RGB565;
if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565) && log_cb) if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565) && log_cb)
@ -458,7 +474,11 @@ static void gba_init(void)
soundInit(); soundInit();
soundSetSampleRate(32000); soundSetSampleRate(32000);
if (usebios && biosfile[0])
CPUInit(biosfile, true);
else
CPUInit(0, false); CPUInit(0, false);
CPUReset(); CPUReset();
soundReset(); soundReset();
@ -536,7 +556,7 @@ static void update_variables(void)
{ {
key[strlen("vbam_layer_")]='1'+i; key[strlen("vbam_layer_")]='1'+i;
var.value=NULL; var.value=NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && var.value[0]=='N') if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && var.value[0]=='d')
{ {
disabled_layers|=0x100<<i; disabled_layers|=0x100<<i;
} }
@ -544,6 +564,15 @@ static void update_variables(void)
layerSettings = 0xFF00 ^ disabled_layers; layerSettings = 0xFF00 ^ disabled_layers;
layerEnable = DISPCNT & layerSettings; layerEnable = DISPCNT & layerSettings;
CPUUpdateRenderBuffers(false); CPUUpdateRenderBuffers(false);
var.key = "vbam_usebios";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
bool newval = (strcmp(var.value, "enabled") == 0);
usebios = newval;
}
} }
#ifdef FINAL_VERSION #ifdef FINAL_VERSION
@ -841,7 +870,7 @@ uint32_t systemReadJoypad(int which)
bool systemReadJoypads() { return true; } bool systemReadJoypads() { return true; }
void systemUpdateMotionSensor() {} void systemUpdateMotionSensor() {}
uint8_t systemGetSensorDarkness() {} uint8_t systemGetSensorDarkness() { return 0; }
void systemCartridgeRumble(bool) void systemCartridgeRumble(bool)
{ {