Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix building unittest for ARM64 Android.

Browse source
This commit is contained in:
Unknown W. Brackets 2015-06-26 22:27:12 -07:00
parent feddd202ee
commit 62988b2aa7
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/jni/Android.mk
View file

@ -430,13 +430,19 @@ ifeq ($(UNITTEST),1)
$(SRC)/ext/armips/Util/StringFormat.cpp \
$(SRC)/ext/armips/Util/Util.cpp
ifeq ($(findstring arm64-v8a,$(TARGET_ARCH_ABI)),arm64-v8a)
TESTARMEMITTER_FILE = $(SRC)/UnitTest/TestArm64Emitter.cpp
else
TESTARMEMITTER_FILE = $(SRC)/UnitTest/TestArmEmitter.cpp
endif
LOCAL_MODULE := ppsspp_unittest
LOCAL_SRC_FILES := \
$(LIBARMIPS_FILES) \
$(EXEC_AND_LIB_FILES) \
$(SRC)/Core/MIPS/MIPSAsm.cpp \
$(SRC)/UnitTest/JitHarness.cpp \
$(SRC)/UnitTest/TestArmEmitter.cpp \
$(TESTARMEMITTER_FILE) \
$(SRC)/UnitTest/UnitTest.cpp
include $(BUILD_EXECUTABLE)

4
unittest/JitHarness.cpp
View file

@ -176,8 +176,10 @@ bool TestJit() {
// Disassemble
JitBlockCache *cache = MIPSComp::jit->GetBlockCache();
JitBlock *block = cache->GetBlock(0); // Should only be one block.
#ifdef ARM
#if defined(ARM)
std::vector<std::string> lines = DisassembleArm2(block->normalEntry, block->codeSize);
#elif defined(ARM64)
std::vector<std::string> lines = DisassembleArm64(block->normalEntry, block->codeSize);
#else
std::vector<std::string> lines = DisassembleX86(block->normalEntry, block->codeSize);
#endif