diff options
| author | Chris Sienkiewicz <chsienki@microsoft.com> | 2018-04-17 20:19:29 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2018-04-17 20:19:29 -0700 |
| commit | 4d3c58a063346b24655a57bfe04106ac0d08d850 (patch) | |
| tree | 242454a1ccee0b8b0c5c05f172c30e78bf95a12a | |
| parent | 0687d91304cca7fcc4a0163e8c83ecd30c361d3f (diff) | |
| download | coreclr-4d3c58a063346b24655a57bfe04106ac0d08d850.tar.gz coreclr-4d3c58a063346b24655a57bfe04106ac0d08d850.tar.bz2 coreclr-4d3c58a063346b24655a57bfe04106ac0d08d850.zip | |
Ensure thumb bit is set when searching for debugger jit info on ARM (#17617)
* Ensure thumb bit is set when searching for debugger jit info on ARM
* Make GetCodeStartAddress return correct PCODE, rather than fixing it at the callee site
* Fix type in daccess.h
* Use PINSTRToPCODE rather than manually adding the thumb bit
| -rw-r--r-- | src/inc/daccess.h | 2 | ||||
| -rw-r--r-- | src/vm/codeman.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/inc/daccess.h b/src/inc/daccess.h index 50a3b92bc9..01ed65dc76 100644 --- a/src/inc/daccess.h +++ b/src/inc/daccess.h @@ -2414,7 +2414,7 @@ typedef DPTR(RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION; //---------------------------------------------------------------------------- // // A PCODE is a valid PC/IP value -- a pointer to an instruction, possibly including some processor mode bits. -// (On ARM, for example, a PCODE value should should have the low-order THUMB_CODE bit set if the code should +// (On ARM, for example, a PCODE value should have the low-order THUMB_CODE bit set if the code should // be executed in that mode.) // typedef TADDR PCODE; diff --git a/src/vm/codeman.cpp b/src/vm/codeman.cpp index aa3c1fa1ed..94e849fd44 100644 --- a/src/vm/codeman.cpp +++ b/src/vm/codeman.cpp @@ -4166,7 +4166,7 @@ PCODE ExecutionManager::GetCodeStartAddress(PCODE currentPC) EECodeInfo codeInfo(currentPC); if (!codeInfo.IsValid()) return NULL; - return (PCODE)codeInfo.GetStartAddress(); + return PINSTRToPCODE(codeInfo.GetStartAddress()); } //************************************************************************** |