RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 20:22:30 +01:00
Code Issues Releases Wiki Activity

Merge pull request #53 from elisha464/master

Browse Source 
minor fixes
This commit is contained in:
DHrpcs3 2014-01-22 12:49:03 -08:00
commit 4b356998f2
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,6 +541,14 @@ VirtualMemoryBlock::VirtualMemoryBlock() : MemoryBlock()
{ {
} }
MemoryBlock* VirtualMemoryBlock::SetRange(const u64 start, const u32 size)
{
range_start = start;
range_size = size;
return this;
}
bool VirtualMemoryBlock::IsInMyRange(const u64 addr) bool VirtualMemoryBlock::IsInMyRange(const u64 addr)
{ {
return addr >= GetStartAddr() && addr < GetStartAddr() + GetSize() - GetResevedAmount(); return addr >= GetStartAddr() && addr < GetStartAddr() + GetSize() - GetResevedAmount();

1
rpcs3/Emu/Memory/MemoryBlock.h
View File

@ -231,6 +231,7 @@ class VirtualMemoryBlock : public MemoryBlock
public: public:
VirtualMemoryBlock(); VirtualMemoryBlock();
virtual MemoryBlock* SetRange(const u64 start, const u32 size);
virtual bool IsInMyRange(const u64 addr); virtual bool IsInMyRange(const u64 addr);
virtual bool IsInMyRange(const u64 addr, const u32 size); virtual bool IsInMyRange(const u64 addr, const u32 size);
virtual bool IsMyAddress(const u64 addr); virtual bool IsMyAddress(const u64 addr);

7
rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
View File

@ -74,7 +74,7 @@ int cellGcmInit(u32 context_addr, u32 cmdSize, u32 ioSize, u32 ioAddress)
InitOffsetTable(); InitOffsetTable();
Memory.RSXCMDMem.Alloc(cmdSize); Memory.RSXCMDMem.Alloc(cmdSize);
Memory.MemoryBlocks.push_back(Memory.RSXIOMem.SetRange(0xE0000000, 0x10000000/*256MB*/));//TODO: implement allocateAdressSpace in memoryBase Memory.MemoryBlocks.push_back(Memory.RSXIOMem.SetRange(0x50000000, 0x10000000/*256MB*/));//TODO: implement allocateAdressSpace in memoryBase
cellGcmMapEaIoAddress(ioAddress, 0, ioSize); cellGcmMapEaIoAddress(ioAddress, 0, ioSize);
u32 ctx_begin = ioAddress/* + 0x1000*/; u32 ctx_begin = ioAddress/* + 0x1000*/;
@ -702,12 +702,17 @@ int32_t cellGcmMapMainMemory(u64 ea, u32 size, mem32_t offset)
//check if the mapping was successfull //check if the mapping was successfull
if(io = Memory.RSXIOMem.Map(ea, size, 0)) if(io = Memory.RSXIOMem.Map(ea, size, 0))
{ {
// convert to offset
io = io - Memory.RSXIOMem.GetStartAddr();
//fill the offset table //fill the offset table
for(u32 i=0; i<(size >> 20); i++) for(u32 i=0; i<(size >> 20); i++)
{ {
Memory.Write16(offsetTable.io + ((ea >> 20) + i)*sizeof(u16), (io >> 20) + i); Memory.Write16(offsetTable.io + ((ea >> 20) + i)*sizeof(u16), (io >> 20) + i);
Memory.Write16(offsetTable.ea + ((io >> 20) + i)*sizeof(u16), (ea >> 20) + i); Memory.Write16(offsetTable.ea + ((io >> 20) + i)*sizeof(u16), (ea >> 20) + i);
} }
offset = io;
} }
else else
{ {

4
rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp
View File

@ -141,7 +141,7 @@ int sys_ppu_thread_create(u32 thread_id_addr, u32 entry, u32 arg, int prio, u32
CPUThread& new_thread = Emu.GetCPU().AddThread(CPU_THREAD_PPU); CPUThread& new_thread = Emu.GetCPU().AddThread(CPU_THREAD_PPU);
Memory.Write32(thread_id_addr, new_thread.GetId()); Memory.Write64(thread_id_addr, new_thread.GetId());
new_thread.SetEntry(entry); new_thread.SetEntry(entry);
new_thread.SetArg(0, arg); new_thread.SetArg(0, arg);
new_thread.SetPrio(prio); new_thread.SetPrio(prio);
@ -175,6 +175,6 @@ int sys_ppu_thread_get_id(const u32 id_addr)
{ {
sysPrxForUser.Log("sys_ppu_thread_get_id(id_addr=0x%x)", id_addr); sysPrxForUser.Log("sys_ppu_thread_get_id(id_addr=0x%x)", id_addr);
Memory.Write32(id_addr, GetCurrentPPUThread().GetId()); Memory.Write64(id_addr, GetCurrentPPUThread().GetId());
return CELL_OK; return CELL_OK;
} }