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

EXCEPTION macro removed

Browse source 
fmt::throw_exception<> implemented
::narrow improved
Minor fixes
This commit is contained in:
Nekotekina 2016-08-08 19:01:06 +03:00
parent 46735d6b3d
commit a7e808b35b
198 changed files with 3025 additions and 2956 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,14 +40,14 @@ void ARMv7Thread::cpu_init()
{
if (!stack_size)
{
throw EXCEPTION("Invalid stack size");
fmt::throw_exception("Invalid stack size" HERE);
}
stack_addr = vm::alloc(stack_size, vm::main);
if (!stack_addr)
{
throw EXCEPTION("Out of stack memory");
fmt::throw_exception("Out of stack memory" HERE);
}
}
@ -106,7 +106,7 @@ void ARMv7Thread::cpu_task_main()
}
else
{
throw fmt::exception("Invalid instruction set" HERE);
fmt::throw_exception("Invalid instruction set" HERE);
}
}
}
@ -144,7 +144,7 @@ void ARMv7Thread::fast_call(u32 addr)
if (SP != old_SP && !test(state, cpu_state::ret + cpu_state::exit)) // SP shouldn't change
{
throw fmt::exception("Stack inconsistency (addr=0x%x, SP=0x%x, old=0x%x)", addr, SP, old_SP);
fmt::throw_exception("Stack inconsistency (addr=0x%x, SP=0x%x, old=0x%x)", addr, SP, old_SP);
}
}
catch (cpu_state _s)