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

Some bugs fixed

Browse source
This commit is contained in:
Nekotekina 2014-01-21 03:34:16 +04:00
parent dc2fd8c39e
commit 5f9bc13898
3 changed files with 55 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/FS/vfsDevice.cpp
View file

@ -93,8 +93,7 @@ wxString vfsDevice::ErasePath(const wxString& path, u32 start_dir_count, u32 end
wxString vfsDevice::GetRoot(const wxString& path) wxString vfsDevice::GetRoot(const wxString& path)
{ {
return wxFileName(path, wxPATH_UNIX).GetPath(); //return wxFileName(path, wxPATH_UNIX).GetPath();
/*
if(path.IsEmpty()) return wxEmptyString; if(path.IsEmpty()) return wxEmptyString;
u32 first_dir = path.Len() - 1; u32 first_dir = path.Len() - 1;
@ -119,7 +118,6 @@ wxString vfsDevice::GetRoot(const wxString& path)
} }
return path(0, first_dir + 1); return path(0, first_dir + 1);
*/
} }
wxString vfsDevice::GetRootPs3(const wxString& path) wxString vfsDevice::GetRootPs3(const wxString& path)

8
rpcs3/Emu/GS/RSXThread.cpp
View file

@ -1452,9 +1452,11 @@ void RSXThread::Task()
{ {
wxCriticalSectionLocker lock(m_cs_main); wxCriticalSectionLocker lock(m_cs_main);
u32 put, get; //u32 put, get;
se_t<u32>::func(put, std::atomic_load((volatile std::atomic<u32>*)((u8*)m_ctrl + offsetof(CellGcmControl, put)))); //se_t<u32>::func(put, std::atomic_load((volatile std::atomic<u32>*)((u8*)m_ctrl + offsetof(CellGcmControl, put))));
se_t<u32>::func(get, std::atomic_load((volatile std::atomic<u32>*)((u8*)m_ctrl + offsetof(CellGcmControl, get)))); //se_t<u32>::func(get, std::atomic_load((volatile std::atomic<u32>*)((u8*)m_ctrl + offsetof(CellGcmControl, get))));
const u32 put = re(m_ctrl->put);
const u32 get = re(m_ctrl->get);
if(put == get || !Emu.IsRunning()) if(put == get || !Emu.IsRunning())
{ {

87
rpcs3/Emu/Memory/Memory.cpp
View file

@ -99,24 +99,28 @@ __forceinline const u8 MemoryBlock::FastRead8(const u64 addr) const
__forceinline const u16 MemoryBlock::FastRead16(const u64 addr) const __forceinline const u16 MemoryBlock::FastRead16(const u64 addr) const
{ {
return ((u16)FastRead8(addr) << 8) | (u16)FastRead8(addr + 1); volatile const u16 data = *(u16*)GetMem(addr);
return re(data);
} }
__forceinline const u32 MemoryBlock::FastRead32(const u64 addr) const __forceinline const u32 MemoryBlock::FastRead32(const u64 addr) const
{ {
return ((u32)FastRead16(addr) << 16) | (u32)FastRead16(addr + 2); volatile const u32 data = *(u32*)GetMem(addr);
return re(data);
} }
__forceinline const u64 MemoryBlock::FastRead64(const u64 addr) const __forceinline const u64 MemoryBlock::FastRead64(const u64 addr) const
{ {
return ((u64)FastRead32(addr) << 32) | (u64)FastRead32(addr + 4); volatile const u64 data = *(u64*)GetMem(addr);
return re(data);
} }
__forceinline const u128 MemoryBlock::FastRead128(const u64 addr) __forceinline const u128 MemoryBlock::FastRead128(const u64 addr)
{ {
volatile const u128 data = *(u128*)GetMem(addr);
u128 ret; u128 ret;
ret.lo = FastRead64(addr); ret.lo = re(data.hi);
ret.hi = FastRead64(addr + 8); ret.hi = re(data.lo);
return ret; return ret;
} }
@ -128,8 +132,8 @@ bool MemoryBlock::Read8(const u64 addr, u8* value)
return false; return false;
} }
*value = std::atomic_load((volatile std::atomic<u8>*)GetMem(FixAddr(addr))); //*value = std::atomic_load((volatile std::atomic<u8>*)GetMem(FixAddr(addr)));
*value = FastRead8(FixAddr(addr));
return true; return true;
} }
@ -141,8 +145,8 @@ bool MemoryBlock::Read16(const u64 addr, u16* value)
return false; return false;
} }
se_t<u16>::func(*value, std::atomic_load((volatile std::atomic<u16>*)GetMem(FixAddr(addr)))); //se_t<u16>::func(*value, std::atomic_load((volatile std::atomic<u16>*)GetMem(FixAddr(addr))));
*value = FastRead16(FixAddr(addr));
return true; return true;
} }
@ -154,7 +158,8 @@ bool MemoryBlock::Read32(const u64 addr, u32* value)
return false; return false;
} }
se_t<u32>::func(*value, std::atomic_load((volatile std::atomic<u32>*)GetMem(FixAddr(addr)))); //se_t<u32>::func(*value, std::atomic_load((volatile std::atomic<u32>*)GetMem(FixAddr(addr))));
*value = FastRead32(FixAddr(addr));
return true; return true;
} }
@ -166,7 +171,8 @@ bool MemoryBlock::Read64(const u64 addr, u64* value)
return false; return false;
} }
se_t<u64>::func(*value, std::atomic_load((volatile std::atomic<u64>*)GetMem(FixAddr(addr)))); //se_t<u64>::func(*value, std::atomic_load((volatile std::atomic<u64>*)GetMem(FixAddr(addr))));
*value = FastRead64(FixAddr(addr));
return true; return true;
} }
@ -178,9 +184,10 @@ bool MemoryBlock::Read128(const u64 addr, u128* value)
return false; return false;
} }
u64 f_addr = FixAddr(addr); //u64 f_addr = FixAddr(addr);
se_t<u64>::func(value->lo, std::atomic_load((volatile std::atomic<u64>*)GetMem(f_addr))); //se_t<u64>::func(value->lo, std::atomic_load((volatile std::atomic<u64>*)GetMem(f_addr)));
se_t<u64>::func(value->hi, std::atomic_load((volatile std::atomic<u64>*)GetMem(f_addr + 8))); //se_t<u64>::func(value->hi, std::atomic_load((volatile std::atomic<u64>*)GetMem(f_addr + 8)));
*value = FastRead128(FixAddr(addr));
return true; return true;
} }
@ -191,33 +198,33 @@ __forceinline void MemoryBlock::FastWrite8(const u64 addr, const u8 value)
__forceinline void MemoryBlock::FastWrite16(const u64 addr, const u16 value) __forceinline void MemoryBlock::FastWrite16(const u64 addr, const u16 value)
{ {
FastWrite8(addr, (u8)(value >> 8)); *(u16*)GetMem(addr) = re(value);
FastWrite8(addr+1, (u8)value);
} }
__forceinline void MemoryBlock::FastWrite32(const u64 addr, const u32 value) __forceinline void MemoryBlock::FastWrite32(const u64 addr, const u32 value)
{ {
FastWrite16(addr, (u16)(value >> 16)); *(u32*)GetMem(addr) = re(value);
FastWrite16(addr+2, (u16)value);
} }
__forceinline void MemoryBlock::FastWrite64(const u64 addr, const u64 value) __forceinline void MemoryBlock::FastWrite64(const u64 addr, const u64 value)
{ {
FastWrite32(addr, (u32)(value >> 32)); *(u64*)GetMem(addr) = re(value);
FastWrite32(addr+4, (u32)value);
} }
__forceinline void MemoryBlock::FastWrite128(const u64 addr, const u128 value) __forceinline void MemoryBlock::FastWrite128(const u64 addr, const u128 value)
{ {
FastWrite64(addr, value.lo); u128 res;
FastWrite64(addr+8, value.hi); res.lo = re(value.hi);
res.hi = re(value.lo);
*(u128*)GetMem(addr) = res;
} }
bool MemoryBlock::Write8(const u64 addr, const u8 value) bool MemoryBlock::Write8(const u64 addr, const u8 value)
{ {
if(!IsMyAddress(addr) || IsLocked(addr)) return false; if(!IsMyAddress(addr) || IsLocked(addr)) return false;
std::atomic_store((std::atomic<u8>*)GetMem(FixAddr(addr)), value); //std::atomic_store((std::atomic<u8>*)GetMem(FixAddr(addr)), value);
FastWrite8(FixAddr(addr), value);
return true; return true;
} }
@ -225,9 +232,10 @@ bool MemoryBlock::Write16(const u64 addr, const u16 value)
{ {
if(!IsMyAddress(addr) || IsLocked(addr)) return false; if(!IsMyAddress(addr) || IsLocked(addr)) return false;
u16 re_value; //u16 re_value;
se_t<u16>::func(re_value, value); //se_t<u16>::func(re_value, value);
std::atomic_store((std::atomic<u16>*)GetMem(FixAddr(addr)), re_value); //std::atomic_store((std::atomic<u16>*)GetMem(FixAddr(addr)), re_value);
FastWrite16(FixAddr(addr), value);
return true; return true;
} }
@ -235,9 +243,10 @@ bool MemoryBlock::Write32(const u64 addr, const u32 value)
{ {
if(!IsMyAddress(addr) || IsLocked(addr)) return false; if(!IsMyAddress(addr) || IsLocked(addr)) return false;
u32 re_value; //u32 re_value;
se_t<u32>::func(re_value, value); //se_t<u32>::func(re_value, value);
std::atomic_store((std::atomic<u32>*)GetMem(FixAddr(addr)), re_value); //std::atomic_store((std::atomic<u32>*)GetMem(FixAddr(addr)), re_value);
FastWrite32(FixAddr(addr), value);
return true; return true;
} }
@ -245,9 +254,10 @@ bool MemoryBlock::Write64(const u64 addr, const u64 value)
{ {
if(!IsMyAddress(addr) || IsLocked(addr)) return false; if(!IsMyAddress(addr) || IsLocked(addr)) return false;
u64 re_value; //u64 re_value;
se_t<u64>::func(re_value, value); //se_t<u64>::func(re_value, value);
std::atomic_store((std::atomic<u64>*)GetMem(FixAddr(addr)), re_value); //std::atomic_store((std::atomic<u64>*)GetMem(FixAddr(addr)), re_value);
FastWrite64(FixAddr(addr), value);
return true; return true;
} }
@ -255,12 +265,13 @@ bool MemoryBlock::Write128(const u64 addr, const u128 value)
{ {
if(!IsMyAddress(addr) || IsLocked(addr)) return false; if(!IsMyAddress(addr) || IsLocked(addr)) return false;
u64 f_addr = FixAddr(addr); //u64 f_addr = FixAddr(addr);
u64 re_value; //u64 re_value;
se_t<u64>::func(re_value, value.lo); //se_t<u64>::func(re_value, value.lo);
std::atomic_store((std::atomic<u64>*)GetMem(f_addr), re_value); //std::atomic_store((std::atomic<u64>*)GetMem(f_addr), re_value);
se_t<u64>::func(re_value, value.hi); //se_t<u64>::func(re_value, value.hi);
std::atomic_store((std::atomic<u64>*)GetMem(f_addr + 8), re_value); //std::atomic_store((std::atomic<u64>*)GetMem(f_addr + 8), re_value);
FastWrite128(FixAddr(addr), value);
return true; return true;
} }