diff options
| author | 2014-07-10 01:55:25 +0000 | |
|---|---|---|
| committer | 2014-07-09 14:42:04 +0000 | |
| commit | 672f8367f74e5db7d26714cd6fa1a13fa2a6c59f (patch) | |
| tree | 4becd76b50de9b80dd1fb411a1891bacbe4c77c3 /runtime/fault_handler.h | |
| parent | 4770a2e6d56398a6b4398fcce14fea43394e0d1b (diff) | |
| parent | 3d14eb620716e92c21c4d2c2d11a95be53319791 (diff) | |
Merge "Revert "Add implicit null and stack checks for x86""
Diffstat (limited to 'runtime/fault_handler.h')
| -rw-r--r-- | runtime/fault_handler.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/fault_handler.h b/runtime/fault_handler.h index 71c99771cd..026f5b9c4a 100644 --- a/runtime/fault_handler.h +++ b/runtime/fault_handler.h @@ -43,10 +43,9 @@ class FaultManager { void HandleFault(int sig, siginfo_t* info, void* context); void AddHandler(FaultHandler* handler, bool generated_code); void RemoveHandler(FaultHandler* handler); - void GetMethodAndReturnPCAndSP(siginfo_t* siginfo, void* context, mirror::ArtMethod** out_method, + void GetMethodAndReturnPCAndSP(void* context, mirror::ArtMethod** out_method, uintptr_t* out_return_pc, uintptr_t* out_sp); - bool IsInGeneratedCode(siginfo_t* siginfo, void *context, bool check_dex_pc) - NO_THREAD_SAFETY_ANALYSIS; + bool IsInGeneratedCode(void *context, bool check_dex_pc) NO_THREAD_SAFETY_ANALYSIS; private: std::vector<FaultHandler*> generated_code_handlers_; |