From 14c7c63e3463dc75e2431d03bd84da19524555f2 Mon Sep 17 00:00:00 2001 From: elisha464 Date: Tue, 21 Jan 2014 22:23:28 +0200 Subject: [PATCH 1/3] small fix --- rpcs3/Emu/Memory/Memory.cpp | 8 ++++++++ rpcs3/Emu/Memory/MemoryBlock.h | 1 + 2 files changed, 9 insertions(+) diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp index 3069864685..df8178826e 100644 --- a/rpcs3/Emu/Memory/Memory.cpp +++ b/rpcs3/Emu/Memory/Memory.cpp @@ -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) { return addr >= GetStartAddr() && addr < GetStartAddr() + GetSize() - GetResevedAmount(); diff --git a/rpcs3/Emu/Memory/MemoryBlock.h b/rpcs3/Emu/Memory/MemoryBlock.h index 76c4891e05..8fe58bdcfd 100644 --- a/rpcs3/Emu/Memory/MemoryBlock.h +++ b/rpcs3/Emu/Memory/MemoryBlock.h @@ -231,6 +231,7 @@ class VirtualMemoryBlock : public MemoryBlock public: VirtualMemoryBlock(); + virtual MemoryBlock* SetRange(const u64 start, const u32 size); virtual bool IsInMyRange(const u64 addr); virtual bool IsInMyRange(const u64 addr, const u32 size); virtual bool IsMyAddress(const u64 addr); From f260d1c60236a60a8042de4ecd65128ce6dae370 Mon Sep 17 00:00:00 2001 From: elisha464 Date: Wed, 22 Jan 2014 20:04:11 +0200 Subject: [PATCH 2/3] fix cellGcmMapMainMemory --- rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index 998df1d900..eb12d007a1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -74,7 +74,7 @@ int cellGcmInit(u32 context_addr, u32 cmdSize, u32 ioSize, u32 ioAddress) InitOffsetTable(); 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); 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 if(io = Memory.RSXIOMem.Map(ea, size, 0)) { + // convert to offset + io = io - Memory.RSXIOMem.GetStartAddr(); + //fill the offset table for(u32 i=0; i<(size >> 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); } + + offset = io; } else { From ec942f26572800949a7456e8b2c0a2db1ff00a46 Mon Sep 17 00:00:00 2001 From: elisha464 Date: Wed, 22 Jan 2014 21:53:11 +0200 Subject: [PATCH 3/3] fixed getId and create thread (the id was written using write32 instead of write64) --- rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp b/rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp index 0c80602a76..092d5102a2 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp @@ -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); - Memory.Write32(thread_id_addr, new_thread.GetId()); + Memory.Write64(thread_id_addr, new_thread.GetId()); new_thread.SetEntry(entry); new_thread.SetArg(0, arg); 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); - Memory.Write32(id_addr, GetCurrentPPUThread().GetId()); + Memory.Write64(id_addr, GetCurrentPPUThread().GetId()); return CELL_OK; }