Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Ensure thumb bit is set when searching for debugger jit info on ARM (#…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
chsienki authored and jkotas committed Apr 18, 2018
1 parent 0687d91 commit 4d3c58a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/inc/daccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/vm/codeman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

//**************************************************************************
Expand Down

0 comments on commit 4d3c58a

Please sign in to comment.