diff options
| author | neonloop | 2023-07-24 22:07:02 +0000 |
|---|---|---|
| committer | neonloop | 2023-07-24 22:07:02 +0000 |
| commit | 694af47e2b3dc8c24dac704f293f4bcf9ab67858 (patch) | |
| tree | 381e226413736125f116696671bbc58d61cc2981 /patches/dosbox-pure | |
| parent | ecb3c7bf765a84413ac0a53ffca7c8bf470c821f (diff) | |
| download | picoarch-694af47e2b3dc8c24dac704f293f4bcf9ab67858.tar.gz picoarch-694af47e2b3dc8c24dac704f293f4bcf9ab67858.tar.bz2 picoarch-694af47e2b3dc8c24dac704f293f4bcf9ab67858.zip | |
Changes funkey-s platform to unix-armv7-hardfloat-neon
More generic platform is supported by more cores, fewer patches needed
to get cores to build. Adding new cores is easier.
unix-armv7-cortexa7-hardfloat-neon causes warnings, maybe SDK bug?
Generic platform may not be as optimized, but speed difference can be
fixed with patches if discovered.
Diffstat (limited to 'patches/dosbox-pure')
| -rw-r--r-- | patches/dosbox-pure/0001-add-auto-cycle-limit.patch | 17 | ||||
| -rw-r--r-- | patches/dosbox-pure/0002-avoid-armv7-buggy-assembly.patch | 13 | ||||
| -rw-r--r-- | patches/dosbox-pure/1000-funkey-s-support.patch | 30 |
3 files changed, 29 insertions, 31 deletions
diff --git a/patches/dosbox-pure/0001-add-auto-cycle-limit.patch b/patches/dosbox-pure/0001-add-auto-cycle-limit.patch index f524ee6..44a7711 100644 --- a/patches/dosbox-pure/0001-add-auto-cycle-limit.patch +++ b/patches/dosbox-pure/0001-add-auto-cycle-limit.patch @@ -1,5 +1,20 @@ +diff --git a/Makefile b/Makefile +index 3e7941c..8c54b71 100644 +--- a/Makefile ++++ b/Makefile +@@ -181,6 +181,10 @@ else + endif + endif + ++ifneq (,$(CYCLE_LIMIT)) ++ COMMONFLAGS += -DCYCLE_LIMIT=$(CYCLE_LIMIT) ++endif ++ + ifeq ($(BUILD),DEBUG) + BUILDDIR := debug + CFLAGS := -DDEBUG -D_DEBUG -g -O0 diff --git a/dosbox_pure_libretro.cpp b/dosbox_pure_libretro.cpp -index af4c66f..bd59842 100644 +index 4f4ca7e..40ddef3 100644 --- a/dosbox_pure_libretro.cpp +++ b/dosbox_pure_libretro.cpp @@ -544,15 +544,30 @@ void DBP_SetRealModeCycles() diff --git a/patches/dosbox-pure/0002-avoid-armv7-buggy-assembly.patch b/patches/dosbox-pure/0002-avoid-armv7-buggy-assembly.patch new file mode 100644 index 0000000..3ec7acb --- /dev/null +++ b/patches/dosbox-pure/0002-avoid-armv7-buggy-assembly.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 3e7941c..104d457 100644 +--- a/Makefile ++++ b/Makefile +@@ -200,6 +200,8 @@ else + BUILDDIR := release + ifeq ($(platform),vita) + CFLAGS := -DNDEBUG -O3 -fno-ident -fno-partial-inlining ++ else ifneq (,$(findstring armv7,$(platform))) ++ CFLAGS := -DNDEBUG -Ofast -fno-ident + else + CFLAGS := -DNDEBUG -O2 -fno-ident + endif diff --git a/patches/dosbox-pure/1000-funkey-s-support.patch b/patches/dosbox-pure/1000-funkey-s-support.patch deleted file mode 100644 index 59f7888..0000000 --- a/patches/dosbox-pure/1000-funkey-s-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Makefile b/Makefile -index f0acd51..7b42e9b 100644 ---- a/Makefile -+++ b/Makefile -@@ -104,6 +104,16 @@ else ifeq ($(platform),ctr) - COMMONFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math -fpermissive - COMMONFLAGS += -I$(DEVKITPRO)/libctru/include - STATIC_LINKING = 1 -+else ifeq ($(platform),classic_armv7_a7) -+ OUTNAME := dosbox_pure_libretro.so -+ CXX := $(CROSS_COMPILE)g++ -+ LDFLAGS := -Wl,--gc-sections -fno-ident -+ COMMONFLAGS += -pthread -DCYCLE_LIMIT=8200 -+ CPUFLAGS += -marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -march=armv7ve -+ STRIPCMD := $(CROSS_COMPILE)strip --strip-all -+ ifeq ($(DEBUG), 1) -+ BUILD = DEBUG -+ endif - else ifeq ($(platform),ngc) - OUTNAME := dosbox_pure_libretro_ngc.a - CXX := $(DEVKITPPC)/bin/powerpc-eabi-g++ -@@ -200,6 +210,8 @@ else - BUILDDIR := release - ifeq ($(platform),vita) - CFLAGS := -DNDEBUG -O3 -fno-ident -fno-partial-inlining -+ else ifeq ($(platform),classic_armv7_a7) -+ CFLAGS := -DNDEBUG -Ofast -fno-ident - else - CFLAGS := -DNDEBUG -O2 -fno-ident - endif |