archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stack overflow constrained

Browse source
This commit is contained in:
Nekotekina 2017-02-25 19:29:31 +03:00
parent c0589cab05
commit af53ce6f76
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -264,6 +264,7 @@ std::string ppu_thread::dump() const
ret += fmt::format("VSCR = [SAT=%u | NJ=%u]\n", sat, nj); ret += fmt::format("VSCR = [SAT=%u | NJ=%u]\n", sat, nj);
ret += fmt::format("FPSCR = [FL=%u | FG=%u | FE=%u | FU=%u]\n", fpscr.fl, fpscr.fg, fpscr.fe, fpscr.fu); ret += fmt::format("FPSCR = [FL=%u | FG=%u | FE=%u | FU=%u]\n", fpscr.fl, fpscr.fg, fpscr.fe, fpscr.fu);
// TODO: support foreign stack
ret += "\nCall stack:\n=========\n"; ret += "\nCall stack:\n=========\n";
ret += fmt::format("0x%08x (0x0) called\n", cia); ret += fmt::format("0x%08x (0x0) called\n", cia);
const u32 stack_max = ::align(stack_addr + stack_size, 0x200) - 0x200; const u32 stack_max = ::align(stack_addr + stack_size, 0x200) - 0x200;
@ -604,7 +605,7 @@ u32 ppu_thread::stack_push(u32 size, u32 align_v)
context.gpr[1] -= align(size + 4, 8); // room minimal possible size context.gpr[1] -= align(size + 4, 8); // room minimal possible size
context.gpr[1] &= ~(align_v - 1); // fix stack alignment context.gpr[1] &= ~(align_v - 1); // fix stack alignment
if (context.gpr[1] < context.stack_addr) if (old_pos >= context.stack_addr && old_pos < context.stack_addr + context.stack_size && context.gpr[1] < context.stack_addr)
{ {
fmt::throw_exception("Stack overflow (size=0x%x, align=0x%x, SP=0x%llx, stack=*0x%x)" HERE, size, align_v, old_pos, context.stack_addr); fmt::throw_exception("Stack overflow (size=0x%x, align=0x%x, SP=0x%llx, stack=*0x%x)" HERE, size, align_v, old_pos, context.stack_addr);
} }

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

@ -170,7 +170,7 @@ u32 ARMv7Thread::stack_push(u32 size, u32 align_v)
context.SP -= align(size + 4, 4); // room minimal possible size context.SP -= align(size + 4, 4); // room minimal possible size
context.SP &= ~(align_v - 1); // fix stack alignment context.SP &= ~(align_v - 1); // fix stack alignment
if (context.SP < context.stack_addr) if (old_pos >= context.stack_addr && old_pos < context.stack_addr + context.stack_size && context.SP < context.stack_addr)
{ {
fmt::throw_exception("Stack overflow (size=0x%x, align=0x%x, SP=0x%x, stack=*0x%x)" HERE, size, align_v, context.SP, context.stack_addr); fmt::throw_exception("Stack overflow (size=0x%x, align=0x%x, SP=0x%x, stack=*0x%x)" HERE, size, align_v, context.SP, context.stack_addr);
} }