diff options
Diffstat (limited to 'src/inc/utilcode.h')
-rw-r--r-- | src/inc/utilcode.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/inc/utilcode.h b/src/inc/utilcode.h index c519e8b872..a1a083638b 100644 --- a/src/inc/utilcode.h +++ b/src/inc/utilcode.h @@ -134,6 +134,17 @@ inline TADDR PCODEToPINSTR(PCODE pc) #endif } +// Convert from a PINSTR to the corresponding PCODE. On many architectures this will be the identity function; +// on ARM, this will raise the THUMB bit. +inline PCODE PINSTRToPCODE(TADDR addr) +{ +#ifdef _TARGET_ARM_ + return DataPointerToThumbCode<PCODE,TADDR>(addr); +#else + return dac_cast<PCODE>(addr); +#endif +} + typedef LPCSTR LPCUTF8; typedef LPSTR LPUTF8; @@ -3389,7 +3400,7 @@ public: m_iSize = iBuckets + 7; } - ~CClosedHashBase() + virtual ~CClosedHashBase() { WRAPPER_NO_CONTRACT; Clear(); @@ -5170,6 +5181,11 @@ template<class T> void DeleteExecutable(T *p) INDEBUG(BOOL DbgIsExecutable(LPVOID lpMem, SIZE_T length);) +BOOL NoGuiOnAssert(); +#ifdef _DEBUG +VOID TerminateOnAssert(); +#endif // _DEBUG + class HighCharHelper { public: static inline BOOL IsHighChar(int c) { @@ -5750,4 +5766,6 @@ extern SpinConstants g_SpinConstants; // ====================================================================================== +void* __stdcall GetCLRFunction(LPCSTR FunctionName); + #endif // __UtilCode_h__ |