Skip to content

Commit d0b3777

Browse files
committed
Remove throw cpu_flag
1 parent aea0947 commit d0b3777

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp

+1-7
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,8 @@ void sys_ppu_thread_exit(ppu_thread& ppu, u64 val)
174174
// Deallocate TLS
175175
ppu_free_tls(vm::cast(ppu.gpr[13], HERE) - 0x7030);
176176

177-
if (ppu.gpr[3] == val)
178-
{
179-
// Change sys_ppu_thread_exit code to the syscall code (hack)
180-
ppu.gpr[11] = 41;
181-
}
182-
183177
// Call the syscall
184-
return _sys_ppu_thread_exit(ppu, val);
178+
_sys_ppu_thread_exit(ppu, val);
185179
}
186180

187181
error_code sys_ppu_thread_register_atexit(ppu_thread& ppu, vm::ptr<void()> func)

rpcs3/Emu/Cell/lv2/sys_interrupt.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,4 @@ void sys_interrupt_thread_eoi(ppu_thread& ppu)
149149
sys_interrupt.trace("sys_interrupt_thread_eoi()");
150150

151151
ppu.state += cpu_flag::ret;
152-
153-
// Throw if this syscall was not called directly by the SC instruction (hack)
154-
if (ppu.lr == 0 || ppu.gpr[11] != 88)
155-
{
156-
throw cpu_flag::ret;
157-
}
158152
}

rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ void _sys_ppu_thread_exit(ppu_thread& ppu, u64 errorcode)
5555

5656
// Remove suspend state (TODO)
5757
ppu.state -= cpu_flag::suspend;
58-
59-
// Throw if this syscall was not called directly by the SC instruction (hack)
60-
if (ppu.lr == 0 || ppu.gpr[11] != 41)
61-
{
62-
throw cpu_flag::exit;
63-
}
6458
}
6559

6660
void sys_ppu_thread_yield(ppu_thread& ppu)

0 commit comments

Comments
 (0)