Enable Cyclone, Part 1

This commit is contained in:
meepingsnesroms
2018-12-08 00:27:59 -08:00
parent 33e1eb6744
commit 602ba5e9ae
6 changed files with 52 additions and 64836 deletions

View File

@@ -19,6 +19,10 @@ else ifeq ($(platform),mingw_x86)
include $(BUILD_DIR)/Makefile.mingw_x86
else ifeq ($(platform),mingw_x86_64)
include $(BUILD_DIR)/Makefile.mingw_x86_64
else ifeq ($(platform),ps3_ppc)
include $(BUILD_DIR)/Makefile.ps3_ppc
else ifeq ($(platform),vita_arm)
include $(BUILD_DIR)/Makefile.vita_arm
else ifeq ($(platform),wii_ppc)
include $(BUILD_DIR)/Makefile.wii_ppc
else ifeq ($(platform),windows_x86)
@@ -139,6 +143,7 @@ ifeq ($(platform),ios-arm64)
CC = cc -arch arm64 -isysroot $(IOSSDK)
else
CC = cc -arch armv7 -isysroot $(IOSSDK)
EMU_OPTIMIZE_FOR_ARM = 1
endif
LD = armv7-apple-darwin11-ld
@@ -168,10 +173,10 @@ else ifeq ($(platform), qnx)
TARGET := $(TARGET_NAME)_libretro_qnx.$(EXT)
fpic := -fPIC
SHARED := -shared -Wl,--version-script=$(BUILD_DIR)/link.T
CC = qcc -Vgcc_ntoarmv7le
AR = qcc -Vgcc_ntoarmv7le
CFLAGS += -D__BLACKBERRY_QNX__
EMU_OPTIMIZE_FOR_ARM = 1
# PS3
else ifeq ($(platform), ps3)
@@ -180,8 +185,8 @@ else ifeq ($(platform), ps3)
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# PS3 (SNC)
else ifeq ($(platform), sncps3)
@@ -190,8 +195,8 @@ else ifeq ($(platform), sncps3)
CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Lightweight PS3 Homebrew SDK
else ifeq ($(platform), psl1ght)
@@ -200,8 +205,8 @@ else ifeq ($(platform), psl1ght)
CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
CFLAGS += -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# PSP
else ifeq ($(platform), psp1)
@@ -210,8 +215,8 @@ else ifeq ($(platform), psp1)
CC = psp-gcc$(EXE_EXT)
AR = psp-ar$(EXE_EXT)
CFLAGS += -DPSP -G0
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# DOS
else ifeq ($(platform), dos)
@@ -219,9 +224,9 @@ else ifeq ($(platform), dos)
TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
CC = i686-pc-msdosdjgpp-gcc
AR = i686-pc-msdosdjgpp-ar
STATIC_LINKING=1
STATIC_LINKING_LINK=1
CFLAGS += -march=i386
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Vita
else ifeq ($(platform), vita)
@@ -230,8 +235,9 @@ else ifeq ($(platform), vita)
CC = arm-vita-eabi-gcc$(EXE_EXT)
AR = arm-vita-eabi-ar$(EXE_EXT)
CFLAGS += -DVITA
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
EMU_OPTIMIZE_FOR_ARM = 1
# CTR (3DS)
else ifeq ($(platform), ctr)
@@ -244,8 +250,9 @@ else ifeq ($(platform), ctr)
CFLAGS += -Wall -mword-relocations
CFLAGS += -fomit-frame-pointer -ffast-math
CFLAGS += -D_3DS
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
EMU_OPTIMIZE_FOR_ARM = 1
# Raspberry Pi 2
else ifeq ($(platform), rpi2)
@@ -256,6 +263,7 @@ else ifeq ($(platform), rpi2)
CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -funsafe-math-optimizations
CFLAGS += -fomit-frame-pointer -ffast-math
HAVE_NEON = 1
EMU_OPTIMIZE_FOR_ARM = 1
# Raspberry Pi 3
else ifeq ($(platform), rpi3)
@@ -268,7 +276,7 @@ else ifeq ($(platform), rpi3)
HAVE_NEON = 1
# Classic Platforms ####################
# Platform affix = classic_<ISA>_<µARCH>
# Platform affix = classic_<ISA>_<uARCH>
# Help at https://modmyclassic.com/comp
# (armv7 a7, hard point, neon based) ###
# NESC, SNESC, C64 mini
@@ -298,6 +306,7 @@ else ifeq ($(platform), classic_armv7_a7)
LDFLAGS += -static-libgcc -static-libstdc++
endif
endif
EMU_OPTIMIZE_FOR_ARM = 1
# Xbox 360
else ifeq ($(platform), xenon)
@@ -306,8 +315,8 @@ else ifeq ($(platform), xenon)
CC = xenon-gcc$(EXE_EXT)
AR = xenon-ar$(EXE_EXT)
CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Nintendo Game Cube
else ifeq ($(platform), ngc)
@@ -317,8 +326,8 @@ else ifeq ($(platform), ngc)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Nintendo Wii
else ifeq ($(platform), wii)
@@ -328,8 +337,8 @@ else ifeq ($(platform), wii)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Nintendo WiiU
else ifeq ($(platform), wiiu)
@@ -339,8 +348,8 @@ else ifeq ($(platform), wiiu)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -DEMU_BIG_ENDIAN
CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# ARM
else ifneq (,$(findstring armv,$(platform)))
@@ -374,7 +383,7 @@ else ifneq (,$(findstring armv,$(platform)))
# Emscripten
else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_emscripten.bc
STATIC_LINKING=1
STATIC_LINKING = 1
# GCW0
else ifeq ($(platform), gcw0)
@@ -395,8 +404,8 @@ else ifeq ($(platform), switch)
EXT=a
TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
include $(LIBTRANSISTOR_HOME)/libtransistor.mk
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Nintendo Switch (libnx)
else ifeq ($(platform), libnx)
@@ -412,7 +421,7 @@ else ifeq ($(platform), libnx)
CXXFLAGS := $(ASFLAGS) $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
CFLAGS += -std=gnu11
STATIC_LINKING = 1
STATIC_LINKING_LINK=1
STATIC_LINKING_LINK = 1
# Windows MSVC 2003 Xbox 1
else ifeq ($(platform), xbox1_msvc2003)
@@ -428,8 +437,8 @@ else ifeq ($(platform), xbox1_msvc2003)
PSS_STYLE :=2
CFLAGS += -D_XBOX -D_XBOX1
CXXFLAGS += -D_XBOX -D_XBOX1
STATIC_LINKING=1
STATIC_LINKING_LINK=1
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Windows
else
@@ -440,7 +449,7 @@ else
CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
endif
ifeq ($(STATIC_LINKING),1)
ifeq ($(STATIC_LINKING), 1)
SHARED=
fpic=
endif
@@ -453,11 +462,11 @@ endif
include $(BUILD_DIR)/Makefile.common
OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.s=.o)
OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.S=.o)
DEFINES = $(COREDEFINES)
ifeq ($(STATIC_LINKING),1)
ifeq ($(STATIC_LINKING), 1)
DEFINES += -DSTATIC_LINKING
endif
@@ -506,7 +515,7 @@ $(TARGET): $(OBJECTS)
@echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **"
ifeq ($(platform), emscripten)
$(CC) $(CFLAGS) $(OBJOUT)$@ $^
else ifeq ($(STATIC_LINKING_LINK),1)
else ifeq ($(STATIC_LINKING_LINK), 1)
ifneq (,$(findstring msvc,$(platform)))
$(LD) $(LINKOUT)$@ $(OBJECTS)
else

View File

@@ -13,7 +13,7 @@ LDFLAGS +=
OBJOUT = -o
LINKOUT = -o
OBJS = $(SOURCES_C:.c=$(OBJEXT)) $(SOURCES_CXX:.cpp=$(OBJEXT))
OBJS = $(SOURCES_C:.c=$(OBJEXT)) $(SOURCES_CXX:.cpp=$(OBJEXT)) $(SOURCES_ASM:.S=$(OBJEXT))
ifneq (,$(findstring msvc,$(platform)))
OBJOUT = -Fo
@@ -30,7 +30,7 @@ endif
$(CC) -c $(OBJOUT)$@ $< $(INCFLAGS) $(CFLAGS)
%$(OBJEXT): %.S
$(CC_AS) -c $(OBJOUT)$@ $< $(CFLAGS)
$(CC) -c $(OBJOUT)$@ $< $(INCFLAGS) $(CFLAGS)
all: $(TARGET)

View File

@@ -46,6 +46,7 @@ PLATCFLAGS = -ftree-vectorize -mfloat-abi=hard -ffast-math -fsingle-precisio
PLATCXXFLAGS = -ftree-vectorize -mfloat-abi=hard -ffast-math -fsingle-precision-constant -funroll-loops -fno-short-enums
PLATLDFLAGS = -shared -lm -mthumb -mcpu=cortex-a9 -mfloat-abi=hard
PLATLDXFLAGS = -shared -lm -mthumb -mcpu=cortex-a9 -mfloat-abi=hard
EMU_OPTIMIZE_FOR_ARM = 1
################
# libretro setup

View File

@@ -51,7 +51,7 @@ android{
QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp
DEFINES += EMU_MULTITHREADED
# CONFIG += optimize_for_arm # for now, later this will check if building for ARM, should probably also only be enabled on ARMv5/6/7
# CONFIG += optimize_for_arm # for now, later this will check if building for ARMv4<->7
}
# ios{
@@ -83,8 +83,9 @@ CONFIG += c++11
INCLUDEPATH += $$PWD/qt-common/include
# only use with ARMv4<->7, ARMv8 is its own architecture
optimize_for_arm{
SOURCES += ../../src/m68k/cyclone/Cyclone.s
SOURCES += ../../src/m68k/cyclone/Cyclone.S
DEFINES += EMU_OPTIMIZE_FOR_ARM
}else{
SOURCES += ../../src/m68k/musashi/m68kcpu.c \

File diff suppressed because it is too large Load Diff

View File

@@ -12,9 +12,10 @@ EMU_SOURCES_C := $(EMU_PATH)/emulator.c \
$(EMU_PATH)/audio/blip_buf.c \
$(EMU_PATH)/debug/sandbox.c
ifeq ($(EMU_OPTIMIZE_FOR_ARM), true)
#only use with ARMv4<->7, ARMv8 is its own architecture
ifeq ($(EMU_OPTIMIZE_FOR_ARM), 1)
EMU_DEFINES += -DEMU_OPTIMIZE_FOR_ARM
EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/Cyclone.s
EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/Cyclone.S
else
EMU_SOURCES_C += $(EMU_PATH)/m68k/musashi/m68kops.c \
$(EMU_PATH)/m68k/musashi/m68kopnz.c \