RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor changes

Browse source 
Fix psv loader
This commit is contained in:
Nekotekina 2017-01-24 15:29:58 +03:00
parent 8c4ba3257c
commit ead67d8e67
5 changed files with 192 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Cell/Modules/cellSaveData.cpp
View file

@ -12,6 +12,10 @@
logs::channel cellSaveData("cellSaveData", logs::level::notice);
SaveDialogBase::~SaveDialogBase()
{
}
// cellSaveData aliases (only for cellSaveData.cpp)
using PSetList = vm::ptr<CellSaveDataSetList>;
using PSetBuf = vm::ptr<CellSaveDataSetBuf>;

2
rpcs3/Emu/Cell/Modules/cellSaveData.h
View file

@ -292,7 +292,7 @@ struct SaveDataEntry
class SaveDialogBase
{
public:
virtual ~SaveDialogBase() = default;
virtual ~SaveDialogBase();
virtual s32 ShowSaveDataList(std::vector<SaveDataEntry>& save_entries, s32 focused, vm::ptr<CellSaveDataListSet> listSet) = 0;
};

1
rpcs3/Emu/Io/KeyboardHandler.h
View file

@ -266,6 +266,7 @@ protected:
public:
virtual void Init(const u32 max_connect) = 0;
virtual ~KeyboardHandlerBase() = default;
void Key(const u32 code, bool pressed)

2
rpcs3/Emu/PSP2/ARMv7Module.cpp
View file

@ -375,7 +375,7 @@ void arm_load_exec(const arm_exec_object& elf)
{
if (prog.p_type == 0x1 /* LOAD */ && prog.p_memsz)
{
if (!vm::falloc(prog.p_vaddr, prog.p_memsz, vm::main))
if (!vm::falloc(prog.p_vaddr & ~0xfff, prog.p_memsz + (prog.p_vaddr & 0xfff), vm::main))
{
fmt::throw_exception("vm::falloc() failed (addr=0x%x, size=0x%x)", prog.p_vaddr, prog.p_memsz);
}