thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build: Remove old ARM define.

Browse source
This commit is contained in:
Unknown W. Brackets 2021-03-02 21:26:03 -08:00
parent e621aca9ba
commit d9aecffd72
12 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Core/MIPS/ARM/ArmJit.cpp
View file

@ -476,7 +476,7 @@ void ArmJit::UnlinkBlock(u8 *checkedEntry, u32 originalAddress) {
} }
bool ArmJit::ReplaceJalTo(u32 dest) { bool ArmJit::ReplaceJalTo(u32 dest) {
#ifdef ARM #if PPSSPP_ARCH(ARM)
const ReplacementTableEntry *entry = nullptr; const ReplacementTableEntry *entry = nullptr;
u32 funcSize = 0; u32 funcSize = 0;
if (!CanReplaceJalTo(dest, &entry, &funcSize)) { if (!CanReplaceJalTo(dest, &entry, &funcSize)) {

4
Core/MIPS/MIPSInt.cpp
View file

@ -74,11 +74,7 @@ static inline void SkipLikely()
int MIPS_SingleStep() int MIPS_SingleStep()
{ {
#if defined(ARM)
MIPSOpcode op = MIPSOpcode(Memory::ReadUnchecked_U32(mipsr4k.pc));
#else
MIPSOpcode op = Memory::Read_Opcode_JIT(mipsr4k.pc); MIPSOpcode op = Memory::Read_Opcode_JIT(mipsr4k.pc);
#endif
if (mipsr4k.inDelaySlot) { if (mipsr4k.inDelaySlot) {
MIPSInterpret(op); MIPSInterpret(op);
if (mipsr4k.inDelaySlot) { if (mipsr4k.inDelaySlot) {

2
GPU/Common/VertexDecoderCommon.cpp
View file

@ -1383,7 +1383,7 @@ VertexDecoderJitCache::VertexDecoderJitCache()
MOV(32, R(EAX), R(EBX)); MOV(32, R(EAX), R(EBX));
RET(); RET();
} }
#elif defined(ARM) #elif PPSSPP_ARCH(ARM)
BKPT(0); BKPT(0);
BKPT(0); BKPT(0);
#endif #endif

2
GPU/Software/Sampler.cpp
View file

@ -95,7 +95,7 @@ SamplerJitCache::SamplerJitCache()
MOV(32, R(EAX), R(EBX)); MOV(32, R(EAX), R(EBX));
RET(); RET();
} }
#elif defined(ARM) #elif PPSSPP_ARCH(ARM)
BKPT(0); BKPT(0);
BKPT(0); BKPT(0);
#endif #endif

4
android/jni/Android.mk
View file

@ -627,10 +627,6 @@ LOCAL_SRC_FILES := \
$(SRC)/UI/TextureUtil.cpp \ $(SRC)/UI/TextureUtil.cpp \
$(SRC)/UI/ComboKeyMappingScreen.cpp $(SRC)/UI/ComboKeyMappingScreen.cpp
ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM
endif
ifneq ($(SKIPAPP),1) ifneq ($(SKIPAPP),1)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
endif endif

4
android/jni/Locals.mk
View file

@ -38,7 +38,7 @@ ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libavutil.a LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libavutil.a
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv7/include LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv7/include
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -DARM -DARMEABI_V7A LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32
endif endif
ifeq ($(TARGET_ARCH_ABI),armeabi) ifeq ($(TARGET_ARCH_ABI),armeabi)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavformat.a LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavformat.a
@ -48,7 +48,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavutil.a LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavutil.a
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv6/include LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv6/include
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -DARM -DARMEABI -march=armv6 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -march=armv6
endif endif
ifeq ($(TARGET_ARCH_ABI),x86) ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libavformat.a LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libavformat.a

4
ext/glslang-build/Android.mk
View file

@ -62,9 +62,9 @@ LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../libzip $(LOCAL_PATH)/../glslang .. LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../libzip $(LOCAL_PATH)/../glslang ..
ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a) ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A LOCAL_CFLAGS := $(LOCAL_CFLAGS)
else ifeq ($(TARGET_ARCH_ABI),armeabi) else ifeq ($(TARGET_ARCH_ABI),armeabi)
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -march=armv6
else ifeq ($(TARGET_ARCH_ABI),x86) else ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86
else ifeq ($(TARGET_ARCH_ABI),x86_64) else ifeq ($(TARGET_ARCH_ABI),x86_64)

4
ext/miniupnp-build/Android.mk
View file

@ -28,9 +28,9 @@ LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../miniupnp .. LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../miniupnp ..
ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a) ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A LOCAL_CFLAGS := $(LOCAL_CFLAGS)
else ifeq ($(TARGET_ARCH_ABI),armeabi) else ifeq ($(TARGET_ARCH_ABI),armeabi)
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -march=armv6
else ifeq ($(TARGET_ARCH_ABI),x86) else ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86
else ifeq ($(TARGET_ARCH_ABI),x86_64) else ifeq ($(TARGET_ARCH_ABI),x86_64)

3
ext/xxhash.h
View file

@ -71,6 +71,7 @@ XXH64 13.8 GB/s 1.9 GB/s
XXH32 6.8 GB/s 6.0 GB/s XXH32 6.8 GB/s 6.0 GB/s
*/ */
#include "ppsspp_config.h"
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
@ -1366,7 +1367,7 @@ XXH32_endian_align(const xxh_u8* input, size_t len, xxh_u32 seed, XXH_alignment
xxh_u32 v4 = seed - XXH_PRIME32_1; xxh_u32 v4 = seed - XXH_PRIME32_1;
do { do {
#if defined(ARM) && defined(__GNUC__) #if PPSSPP_ARCH(ARM) && defined(__GNUC__)
__builtin_prefetch(input + 0xc0, 0, 0); __builtin_prefetch(input + 0xc0, 0, 0);
#endif #endif
v1 = XXH32_round(v1, XXH_get32bits(input)); input += 4; v1 = XXH32_round(v1, XXH_get32bits(input)); input += 4;

2
libretro/Makefile
View file

@ -105,7 +105,6 @@ else ifneq (,$(findstring arm64,$(platform)))
GL_LIB := -lGL GL_LIB := -lGL
endif endif
CPUFLAGS += -D__arm64__ -DARM64_ASM -D__NEON_OPT CPUFLAGS += -D__arm64__ -DARM64_ASM -D__NEON_OPT
PLATCFLAGS += -DARM64
LDFLAGS += -lrt -ldl LDFLAGS += -lrt -ldl
PLATFORM_EXT := unix PLATFORM_EXT := unix
@ -252,7 +251,6 @@ else ifneq (,$(findstring armv,$(platform)))
CPUFLAGS += -mfloat-abi=hard CPUFLAGS += -mfloat-abi=hard
endif endif
CPUFLAGS += -D__arm__ -DARM_ASM CPUFLAGS += -D__arm__ -DARM_ASM
PLATCFLAGS += -DARM
LDFLAGS += -lrt -ldl LDFLAGS += -lrt -ldl
# emscripten # emscripten

4
libretro/jni/Android.mk
View file

@ -12,14 +12,14 @@ FFMPEGLIBS += libavformat libavcodec libavutil libswresample libswscale
WITH_DYNAREC := 1 WITH_DYNAREC := 1
ifeq ($(TARGET_ARCH),arm64) ifeq ($(TARGET_ARCH),arm64)
COREFLAGS += -DARM64 -D_ARCH_64 COREFLAGS += -D_ARCH_64
HAVE_NEON := 1 HAVE_NEON := 1
FFMPEGLIBDIR := $(FFMPEGDIR)/android/arm64/lib FFMPEGLIBDIR := $(FFMPEGDIR)/android/arm64/lib
FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/arm64/include FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/arm64/include
endif endif
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
COREFLAGS += -DARM -DARMEABI_V7A -D__arm__ -DARM_ASM -D_ARCH_32 -mfpu=neon COREFLAGS += -D__arm__ -DARM_ASM -D_ARCH_32 -mfpu=neon
HAVE_NEON := 1 HAVE_NEON := 1
FFMPEGLIBDIR := $(FFMPEGDIR)/android/armv7/lib FFMPEGLIBDIR := $(FFMPEGDIR)/android/armv7/lib
FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/armv7/include FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/armv7/include

4
ppsspp_config.h
View file

@ -48,10 +48,6 @@
#define PPSSPP_ARCH_ARMV7 1 #define PPSSPP_ARCH_ARMV7 1
#define PPSSPP_ARCH_ARM_NEON 1 #define PPSSPP_ARCH_ARM_NEON 1
#endif #endif
//TODO: Remove this compat define
#ifndef ARM
#define ARM 1
#endif
#endif #endif
#if defined(__aarch64__) || defined(_M_ARM64) #if defined(__aarch64__) || defined(_M_ARM64)