ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

F|_|C|< the speed, we need some checks

This commit is contained in:
Nekotekina 2014-07-11 16:22:56 +04:00
parent 2fe52451e1
commit 2203cb1dcf
1 changed files with 101 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
rpcs3/Emu/Memory/Memory.cpp
View File

@ -359,34 +359,74 @@ bool MemoryBlockLE::Write128(const u64 addr, const u128 value)
//MemoryBase //MemoryBase
void MemoryBase::Write8(u64 addr, const u8 data) void MemoryBase::Write8(u64 addr, const u8 data)
{ {
*(u8*)((u64)GetBaseAddr() + (u32)addr) = data; if ((u32)addr == addr)
{
*(u8*)((u64)GetBaseAddr() + addr) = data;
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
}
} }
void MemoryBase::Write16(u64 addr, const u16 data) void MemoryBase::Write16(u64 addr, const u16 data)
{ {
*(u16*)((u64)GetBaseAddr() + (u32)addr) = re16(data); if ((u32)addr == addr)
{
*(u16*)((u64)GetBaseAddr() + addr) = re16(data);
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
}
} }
void MemoryBase::Write32(u64 addr, const u32 data) void MemoryBase::Write32(u64 addr, const u32 data)
{ {
if (addr < RAW_SPU_BASE_ADDR || (addr % RAW_SPU_OFFSET) < RAW_SPU_PROB_OFFSET || addr >= 0x100000000 || !RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]) if ((u32)addr == addr)
{ {
*(u32*)((u64)GetBaseAddr() + (u32)addr) = re32(data); if (addr < RAW_SPU_BASE_ADDR || (addr % RAW_SPU_OFFSET) < RAW_SPU_PROB_OFFSET || !RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET])
{
*(u32*)((u64)GetBaseAddr() + addr) = re32(data);
} }
else else
{ {
RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]->Write32(addr, data); RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]->Write32(addr, data);
} }
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
}
} }
void MemoryBase::Write64(u64 addr, const u64 data) void MemoryBase::Write64(u64 addr, const u64 data)
{ {
*(u64*)((u64)GetBaseAddr() + (u32)addr) = re64(data); if ((u32)addr == addr)
{
*(u64*)((u64)GetBaseAddr() + addr) = re64(data);
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
}
} }
void MemoryBase::Write128(u64 addr, const u128 data) void MemoryBase::Write128(u64 addr, const u128 data)
{ {
*(u128*)((u64)GetBaseAddr() + (u32)addr) = re128(data); if ((u32)addr == addr)
{
*(u128*)((u64)GetBaseAddr() + addr) = re128(data);
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
}
} }
bool MemoryBase::Write8NN(u64 addr, const u8 data) bool MemoryBase::Write8NN(u64 addr, const u8 data)
@ -426,19 +466,39 @@ bool MemoryBase::Write128NN(u64 addr, const u128 data)
u8 MemoryBase::Read8(u64 addr) u8 MemoryBase::Read8(u64 addr)
{ {
return *(u8*)((u64)GetBaseAddr() + (u32)addr); if ((u32)addr == addr)
{
return *(u8*)((u64)GetBaseAddr() + addr);
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
return 0;
}
} }
u16 MemoryBase::Read16(u64 addr) u16 MemoryBase::Read16(u64 addr)
{ {
return re16(*(u16*)((u64)GetBaseAddr() + (u32)addr)); if ((u32)addr == addr)
{
return re16(*(u16*)((u64)GetBaseAddr() + addr));
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
return 0;
}
} }
u32 MemoryBase::Read32(u64 addr) u32 MemoryBase::Read32(u64 addr)
{ {
if (addr < RAW_SPU_BASE_ADDR || (addr % RAW_SPU_OFFSET) < RAW_SPU_PROB_OFFSET || addr >= 0x100000000 || !RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]) if ((u32)addr == addr)
{ {
return re32(*(u32*)((u64)GetBaseAddr() + (u32)addr)); if (addr < RAW_SPU_BASE_ADDR || (addr % RAW_SPU_OFFSET) < RAW_SPU_PROB_OFFSET || !RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET])
{
return re32(*(u32*)((u64)GetBaseAddr() + addr));
} }
else else
{ {
@ -446,16 +506,41 @@ u32 MemoryBase::Read32(u64 addr)
RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]->Read32(addr, &res); RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]->Read32(addr, &res);
return res; return res;
} }
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
return 0;
}
} }
u64 MemoryBase::Read64(u64 addr) u64 MemoryBase::Read64(u64 addr)
{ {
return re64(*(u64*)((u64)GetBaseAddr() + (u32)addr)); if ((u32)addr == addr)
{
return re64(*(u64*)((u64)GetBaseAddr() + addr));
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
return 0;
}
} }
u128 MemoryBase::Read128(u64 addr) u128 MemoryBase::Read128(u64 addr)
{ {
return re128(*(u128*)((u64)GetBaseAddr() + (u32)addr)); if ((u32)addr == addr)
{
return re128(*(u128*)((u64)GetBaseAddr() + addr));
}
else
{
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr);
Emu.Pause();
return u128::From128(0, 0);
}
} }
template<> __forceinline u64 MemoryBase::ReverseData<1>(u64 val) { return val; } template<> __forceinline u64 MemoryBase::ReverseData<1>(u64 val) { return val; }