diff options
| author | Dave Allison <dallison@google.com> | 2014-07-10 02:05:10 +0000 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-07-10 21:24:47 +0000 |
| commit | 7fb36ded9cd5b1d254b63b3091f35c1e6471b90e (patch) | |
| tree | eb1e3b96efd67cc6b84a6f7e35522f33973ca8db /runtime/fault_handler.h | |
| parent | 93279da4a8475d187a0a2e75d50c88def5b4b8a5 (diff) | |
| download | art-7fb36ded9cd5b1d254b63b3091f35c1e6471b90e.zip art-7fb36ded9cd5b1d254b63b3091f35c1e6471b90e.tar.gz art-7fb36ded9cd5b1d254b63b3091f35c1e6471b90e.tar.bz2 | |
Revert "Revert "Add implicit null and stack checks for x86""
Fixes x86_64 cross compile issue. Removes command line options
and property to set implicit checks - this is hard coded now.
This reverts commit 3d14eb620716e92c21c4d2c2d11a95be53319791.
Change-Id: I5404473b5aaf1a9c68b7181f5952cb174d93a90d
Diffstat (limited to 'runtime/fault_handler.h')
| -rw-r--r-- | runtime/fault_handler.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/fault_handler.h b/runtime/fault_handler.h index 026f5b9..71c9977 100644 --- a/runtime/fault_handler.h +++ b/runtime/fault_handler.h @@ -43,9 +43,10 @@ class FaultManager { void HandleFault(int sig, siginfo_t* info, void* context); void AddHandler(FaultHandler* handler, bool generated_code); void RemoveHandler(FaultHandler* handler); - void GetMethodAndReturnPCAndSP(void* context, mirror::ArtMethod** out_method, + void GetMethodAndReturnPCAndSP(siginfo_t* siginfo, void* context, mirror::ArtMethod** out_method, uintptr_t* out_return_pc, uintptr_t* out_sp); - bool IsInGeneratedCode(void *context, bool check_dex_pc) NO_THREAD_SAFETY_ANALYSIS; + bool IsInGeneratedCode(siginfo_t* siginfo, void *context, bool check_dex_pc) + NO_THREAD_SAFETY_ANALYSIS; private: std::vector<FaultHandler*> generated_code_handlers_; |