|
|
|
@ -12,7 +12,6 @@ |
|
|
|
#include <functional>
|
|
|
|
#include <memory>
|
|
|
|
#include <mutex>
|
|
|
|
#include <lock_guard>
|
|
|
|
#include <shared_mutex>
|
|
|
|
#include <optional>
|
|
|
|
#include <bit>
|
|
|
|
@ -122,10 +121,10 @@ void SigHandler::SigAction(int sig, siginfo_t* info, void* raw_context) { |
|
|
|
CTX_DECLARE(raw_context); |
|
|
|
#if defined(ARCHITECTURE_x86_64)
|
|
|
|
{ |
|
|
|
std::lock_guard<std::mutex> guard(sig_handler->code_block_infos_mutex); |
|
|
|
std::shared_lock<std::shared_mutex> guard(sig_handler->code_block_infos_mutex); |
|
|
|
const auto iter = sig_handler->FindCodeBlockInfo(CTX_RIP); |
|
|
|
if (iter != sig_handler->code_block_infos.end()) { |
|
|
|
FakeCall fc = iter->cb(CTX_RIP); |
|
|
|
FakeCall fc = iter->second.cb(CTX_RIP); |
|
|
|
CTX_RSP -= sizeof(u64); |
|
|
|
*std::bit_cast<u64*>(CTX_RSP) = fc.ret_rip; |
|
|
|
CTX_RIP = fc.call_rip; |
|
|
|
@ -135,10 +134,10 @@ void SigHandler::SigAction(int sig, siginfo_t* info, void* raw_context) { |
|
|
|
fmt::print(stderr, "Unhandled {} at rip {:#018x}\n", sig == SIGSEGV ? "SIGSEGV" : "SIGBUS", CTX_RIP); |
|
|
|
#elif defined(ARCHITECTURE_arm64)
|
|
|
|
{ |
|
|
|
std::lock_guard<std::mutex> guard(sig_handler->code_block_infos_mutex); |
|
|
|
std::shared_lock<std::shared_mutex> guard(sig_handler->code_block_infos_mutex); |
|
|
|
const auto iter = sig_handler->FindCodeBlockInfo(CTX_PC); |
|
|
|
if (iter != sig_handler->code_block_infos.end()) { |
|
|
|
FakeCall fc = iter->cb(CTX_PC); |
|
|
|
FakeCall fc = iter->second.cb(CTX_PC); |
|
|
|
CTX_PC = fc.call_pc; |
|
|
|
return; |
|
|
|
} |
|
|
|
|