Merge pull request #17816 from unknownbrackets/riscv-android

Build: Fix link issue for rv64 disasm
hrydgard · Jul 30, 2023 · 50ac61f · 50ac61f
2 parents b03398a + c24dca1
commit 50ac61f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Core/MIPS/RiscV/RiscVAsm.cpp b/Core/MIPS/RiscV/RiscVAsm.cpp
@@ -232,10 +232,12 @@ void RiscVJit::GenerateFixedCode(const JitOptions &jo) {
 
 	// Leave this at the end, add more stuff above.
 	if (enableDisasm) {
+#if PPSSPP_ARCH(RISCV64)
 		std::vector<std::string> lines = DisassembleRV64(start, GetCodePtr() - start);
 		for (auto s : lines) {
 			INFO_LOG(JIT, "%s", s.c_str());
 		}
+#endif
 	}
 
 	// Let's spare the pre-generated code from unprotect-reprotect.

diff --git a/Core/MIPS/RiscV/RiscVJit.cpp b/Core/MIPS/RiscV/RiscVJit.cpp
@@ -652,9 +652,11 @@ void RiscVBlockCacheDebugInterface::GetBlockCodeRange(int blockNum, int *startOf
 JitBlockDebugInfo RiscVBlockCacheDebugInterface::GetBlockDebugInfo(int blockNum) const {
 	JitBlockDebugInfo debugInfo = irBlocks_.GetBlockDebugInfo(blockNum);
 
+#if PPSSPP_ARCH(RISCV64)
 	int blockOffset, codeSize;
 	GetBlockCodeRange(blockNum, &blockOffset, &codeSize);
 	debugInfo.targetDisasm = DisassembleRV64(jit_.GetBasePtr() + blockOffset, codeSize);
+#endif
 	return debugInfo;
 }