Skip to content

Commit

Permalink
Fixup for Emu.Pause()
Browse files Browse the repository at this point in the history
Remove some reduntant calls.
Don't pause on unknown sys_fs_fcntl operation.
  • Loading branch information
Nekotekina committed Mar 8, 2020
1 parent 6268a2d commit 9dca288
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 7 deletions.
2 changes: 0 additions & 2 deletions rpcs3/Emu/CPU/CPUThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,6 @@ void cpu_thread::operator()()
if (!g_cpu_array_sema.try_inc(sizeof(g_cpu_array_bits) * 8))
{
sys_log.fatal("Too many threads.");
Emu.Pause();
return;
}

Expand Down Expand Up @@ -389,7 +388,6 @@ void cpu_thread::operator()()
}
catch (const std::exception& e)
{
Emu.Pause();
sys_log.fatal("%s thrown: %s", typeid(e).name(), e.what());
sys_log.notice("\n%s", dump());
break;
Expand Down
2 changes: 0 additions & 2 deletions rpcs3/Emu/Cell/SPURecompiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,6 @@ void spu_recompiler_base::dispatch(spu_thread& spu, void*, u8* rip)
if (!func)
{
spu_log.fatal("[0x%05x] Compilation failed.", spu.pc);
Emu.Pause();
return;
}

Expand Down Expand Up @@ -1181,7 +1180,6 @@ void spu_recompiler_base::old_interpreter(spu_thread& spu, void* ls, u8* rip) tr
}
catch (const std::exception& e)
{
Emu.Pause();
spu_log.fatal("%s thrown: %s", typeid(e).name(), e.what());
spu_log.notice("\n%s", spu.dump());
}
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/lv2/sys_fs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
}
}

sys_fs.fatal("sys_fs_fcntl(): Unknown operation 0x%08x (fd=%d, arg=*0x%x, size=0x%x)", op, fd, _arg, _size);
sys_fs.error("sys_fs_fcntl(): Unknown operation 0x%08x (fd=%d, arg=*0x%x, size=0x%x)", op, fd, _arg, _size);
return CELL_OK;
}

Expand Down
1 change: 0 additions & 1 deletion rpcs3/Emu/RSX/Capture/rsx_replay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ namespace rsx
catch (const std::exception& e)
{
rsx_log.fatal("%s thrown: %s", typeid(e).name(), e.what());
Emu.Pause();
}
}
}
1 change: 0 additions & 1 deletion rpcs3/Emu/RSX/RSXThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,6 @@ namespace rsx
catch (const std::exception& e)
{
rsx_log.fatal("%s thrown: %s", typeid(e).name(), e.what());
Emu.Pause();
}

on_exit();
Expand Down

0 comments on commit 9dca288

Please sign in to comment.