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

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2014-07-11 16:50:50 +04:00
parent 2203cb1dcf
commit c16daed87d
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -365,7 +365,7 @@ void MemoryBase::Write8(u64 addr, const u8 data)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
} }
} }
@ -378,7 +378,7 @@ void MemoryBase::Write16(u64 addr, const u16 data)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
} }
} }
@ -398,7 +398,7 @@ void MemoryBase::Write32(u64 addr, const u32 data)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
} }
} }
@ -411,7 +411,7 @@ void MemoryBase::Write64(u64 addr, const u64 data)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
} }
} }
@ -424,7 +424,7 @@ void MemoryBase::Write128(u64 addr, const u128 data)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
} }
} }
@ -472,7 +472,7 @@ u8 MemoryBase::Read8(u64 addr)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -486,7 +486,7 @@ u16 MemoryBase::Read16(u64 addr)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -509,7 +509,7 @@ u32 MemoryBase::Read32(u64 addr)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -523,7 +523,7 @@ u64 MemoryBase::Read64(u64 addr)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -537,7 +537,7 @@ u128 MemoryBase::Read128(u64 addr)
} }
else else
{ {
LOG_ERROR(MEMORY, __FUNCTION__ "(): invalid address (0x%llx)", addr); LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", __FUNCTION__, addr);
Emu.Pause(); Emu.Pause();
return u128::From128(0, 0); return u128::From128(0, 0);
} }