archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compilation errors caused by rebase

Browse source
This commit is contained in:
S Gopal Rajagopal 2014-10-14 14:23:50 +05:30
parent cd154ad357
commit b95cddb0c7
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
View file

@ -101,10 +101,10 @@ void PPULLVMRecompiler::ReleaseExecutable(u32 address, u32 revision) {
} }
void PPULLVMRecompiler::RequestCompilation(u32 address) { void PPULLVMRecompiler::RequestCompilation(u32 address) {
{ {
std::lock_guard<std::mutex> lock(m_uncompiled_shared_lock); std::lock_guard<std::mutex> lock(m_uncompiled_shared_lock);
m_uncompiled_shared.push_back(address); m_uncompiled_shared.push_back(address);
} }
if (!IsAlive()) { if (!IsAlive()) {
Start(); Start();
@ -4277,12 +4277,12 @@ u8 PPULLVMEmulator::DecodeMemory(const u32 address) {
auto now = std::chrono::high_resolution_clock::now(); auto now = std::chrono::high_resolution_clock::now();
if (std::chrono::duration_cast<std::chrono::milliseconds>(now - m_last_cache_clear_time).count() > 1000) { if (std::chrono::duration_cast<std::chrono::milliseconds>(now - m_last_cache_clear_time).count() > 1000) {
bool clear_all = false; bool clear_all = false;
u32 revision = s_recompiler->GetCurrentRevision(); u32 revision = s_recompiler->GetCurrentRevision();
if (m_recompiler_revision != revision) { if (m_recompiler_revision != revision) {
m_recompiler_revision = revision; m_recompiler_revision = revision;
clear_all = true; clear_all = true;
} }
for (auto iter = m_address_to_executable.begin(); iter != m_address_to_executable.end();) { for (auto iter = m_address_to_executable.begin(); iter != m_address_to_executable.end();) {

8
rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp
View file

@ -33,7 +33,7 @@ struct PPURegState {
u64 GPR[32]; u64 GPR[32];
/// Vector purpose registers /// Vector purpose registers
VPR_reg VPR[32]; u128 VPR[32];
/// Condition register /// Condition register
CRhdr CR; CRhdr CR;
@ -129,7 +129,7 @@ struct PPURegState {
std::string ret; std::string ret;
for (int i = 0; i < 32; i++) { for (int i = 0; i < 32; i++) {
ret += fmt::Format("GPR[%02d] = 0x%016llx FPR[%02d] = %16g VPR[%02d] = 0x%s [%s]\n", i, GPR[i], i, FPR[i]._double, i, VPR[i].ToString(true).c_str(), VPR[i].ToString().c_str()); ret += fmt::Format("GPR[%02d] = 0x%016llx FPR[%02d] = %16g VPR[%02d] = 0x%s [%s]\n", i, GPR[i], i, FPR[i]._double, i, VPR[i].to_hex().c_str(), VPR[i].to_xyzw().c_str());
} }
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
@ -180,8 +180,8 @@ void PPULLVMRecompiler::VerifyInstructionAgainstInterpreter(const char * name, P
if (interp_output_reg_state.ToString() != recomp_output_reg_state.ToString()) { if (interp_output_reg_state.ToString() != recomp_output_reg_state.ToString()) {
msg = std::string("Input register states:\n") + input_reg_state.ToString() + msg = std::string("Input register states:\n") + input_reg_state.ToString() +
std::string("\nOutput register states:\n") + recomp_output_reg_state.ToString() + std::string("\nOutput register states:\n") + recomp_output_reg_state.ToString() +
std::string("\nInterpreter output register states:\n") + interp_output_reg_state.ToString(); std::string("\nInterpreter output register states:\n") + interp_output_reg_state.ToString();
return false; return false;
} }

6
rpcs3/emucore.vcxproj
View file

@ -529,7 +529,7 @@
<SDLCheck>false</SDLCheck> <SDLCheck>false</SDLCheck>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>D:\Projects\LLVM\llvm-3.5.0.src\include;D:\Projects\LLVM\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -543,7 +543,7 @@
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PreprocessorDefinitions>_UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>D:\Projects\LLVM\llvm-3.5.0.src\include;D:\Projects\LLVM\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -608,7 +608,7 @@ msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug
<SDLCheck>false</SDLCheck> <SDLCheck>false</SDLCheck>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>D:\Projects\LLVM\llvm-3.5.0.src\include;D:\Projects\LLVM\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>