From 1a5d5c96edc13b89d921bad766550ed4905f57a7 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Thu, 22 Jan 2015 00:39:25 +0300 Subject: [PATCH] Compilation fix --- rpcs3/Emu/CPU/CPUThread.cpp | 2 +- rpcs3/Emu/CPU/CPUThread.h | 2 +- rpcs3/Emu/Cell/PPULLVMRecompiler.cpp | 2 +- rpcs3/Emu/Cell/PPULLVMRecompiler.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index df64539f20..a69ec8338a 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -115,7 +115,7 @@ void CPUThread::SetEntry(const u32 pc) entry = pc; } -void CPUThread::NextPc(u8 instr_size) +void CPUThread::NextPc(u32 instr_size) { if(m_is_branch) { diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h index 7261d0f28d..dd79700c65 100644 --- a/rpcs3/Emu/CPU/CPUThread.h +++ b/rpcs3/Emu/CPU/CPUThread.h @@ -132,7 +132,7 @@ public: int ThreadStatus(); - void NextPc(u8 instr_size); + void NextPc(u32 instr_size); void SetBranch(const u32 pc, bool record_branch = false); void SetPc(const u32 pc); void SetEntry(const u32 entry); diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp index c14d0a4131..5678d5f9d9 100644 --- a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp @@ -6030,7 +6030,7 @@ ppu_recompiler_llvm::ExecutionEngine::~ExecutionEngine() { } -u8 ppu_recompiler_llvm::ExecutionEngine::DecodeMemory(const u32 address) { +u32 ppu_recompiler_llvm::ExecutionEngine::DecodeMemory(const u32 address) { ExecuteFunction(&m_ppu, 0); return 0; } diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.h b/rpcs3/Emu/Cell/PPULLVMRecompiler.h index 715e9f08ab..40a9472e1e 100644 --- a/rpcs3/Emu/Cell/PPULLVMRecompiler.h +++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.h @@ -1128,7 +1128,7 @@ namespace ppu_recompiler_llvm { ExecutionEngine & operator = (const ExecutionEngine & other) = delete; ExecutionEngine & operator = (ExecutionEngine && other) = delete; - u8 DecodeMemory(const u32 address) override; + u32 DecodeMemory(const u32 address) override; private: /// PPU processor context