diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h index b13675b55f..b62d78f61d 100644 --- a/rpcs3/Emu/Memory/vm_ptr.h +++ b/rpcs3/Emu/Memory/vm_ptr.h @@ -448,11 +448,6 @@ namespace vm return (bptr&)addr; } - operator ptr() const - { - return ptr::make(addr()); - } - using bptrb::operator=; }; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp index eff78cff85..e698e65be9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp @@ -340,9 +340,9 @@ int cellSaveDataListSave2(u32 version, vm::ptr setList, vm: return CELL_SAVEDATA_ERROR_CBRESULT; } - setSaveDataList(saveEntries, listSet->fixedList, listSet->fixedListNum); + setSaveDataList(saveEntries, vm::ptr::make(listSet->fixedList.addr()), listSet->fixedListNum); if (listSet->newData) - addNewSaveDataEntry(saveEntries, listSet->newData); + addNewSaveDataEntry(saveEntries, vm::ptr::make(listSet->newData.addr())); if (saveEntries.size() == 0) { cellSysutil->Warning("cellSaveDataListSave2: No save entries found!"); // TODO: Find a better way to handle this error return CELL_SAVEDATA_RET_OK; @@ -425,9 +425,9 @@ int cellSaveDataListLoad2(u32 version, vm::ptr setList, vm: return CELL_SAVEDATA_ERROR_CBRESULT; } - setSaveDataList(saveEntries, listSet->fixedList, listSet->fixedListNum); + setSaveDataList(saveEntries, vm::ptr::make(listSet->fixedList.addr()), listSet->fixedListNum); if (listSet->newData) - addNewSaveDataEntry(saveEntries, listSet->newData); + addNewSaveDataEntry(saveEntries, vm::ptr::make(listSet->newData.addr())); if (saveEntries.size() == 0) { cellSysutil->Warning("cellSaveDataListLoad2: No save entries found!"); // TODO: Find a better way to handle this error return CELL_SAVEDATA_RET_OK;