ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'greg/gcc-warning-iop-fixes'

This commit is contained in:
Gregory Hainaut 2016-11-08 21:53:43 +01:00
parent f3e1ba5251 6c3a4c6927
commit 5b3dfc3f9e
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcsx2/IopBios.cpp
View File

@ -411,21 +411,18 @@ namespace ioman {
if (IOManFile *file = getfd<IOManFile>(fd))
{
char *buf;
try {
buf = new char[count];
v0 = file->read(buf, count);
std::unique_ptr<char[]> buf(new char[count]);
v0 = file->read(buf.get(), count);
for (s32 i = 0; i < (s32)v0; i++)
iopMemWrite8(data + i, buf[i]);
}
catch (const std::bad_alloc &) {
v0 = -IOP_ENOMEM;
}
catch (...) {
delete[] buf;
throw;
}
for (s32 i = 0; i < (s32)v0; i++)
iopMemWrite8(data + i, buf[i]);
delete[] buf;
pc = ra;
return 1;
}
@ -449,19 +446,18 @@ namespace ioman {
}
else if (IOManFile *file = getfd<IOManFile>(fd))
{
char *buf = NULL;
try {
buf = new char[count];
std::unique_ptr<char[]> buf(new char[count]);
for (u32 i = 0; i < count; i++)
buf[i] = iopMemRead8(data + i);
v0 = file->write(buf, count);
} catch (const std::bad_alloc &) {
v0 = -IOP_ENOMEM;
} catch (...) {
delete[] buf;
throw;
v0 = file->write(buf.get(), count);
}
delete[] buf;
catch (const std::bad_alloc &) {
v0 = -IOP_ENOMEM;
}
pc = ra;
return 1;
}
@ -618,7 +614,7 @@ namespace sifcmd {
}
}
const u32 irxImportTableAddr(u32 entrypc)
u32 irxImportTableAddr(u32 entrypc)
{
u32 i;

2
pcsx2/IopBios.h
View File

@ -63,7 +63,7 @@ typedef void (*irxDEBUG)();
namespace R3000A
{
const u32 irxImportTableAddr(u32 entrypc);
u32 irxImportTableAddr(u32 entrypc);
const char* irxImportFuncname(const std::string &libname, u16 index);
irxHLE irxImportHLE(const std::string &libnam, u16 index);
irxDEBUG irxImportDebug(const std::string & libname, u16 index);