diff options
| -rw-r--r-- | src/inc/daccess.h | 4 | ||||
| -rw-r--r-- | src/vm/codeman.cpp | 7 | ||||
| -rw-r--r-- | src/zap/zapcode.cpp | 24 |
3 files changed, 35 insertions, 0 deletions
diff --git a/src/inc/daccess.h b/src/inc/daccess.h index 8ca9587a4c..7d82e86cb9 100644 --- a/src/inc/daccess.h +++ b/src/inc/daccess.h @@ -2393,6 +2393,10 @@ typedef DPTR(IMAGE_TLS_DIRECTORY) PTR_IMAGE_TLS_DIRECTORY; #include <xclrdata.h> #endif +#if defined(_TARGET_X86_) && defined(FEATURE_PAL) +typedef DPTR(struct _UNWIND_INFO) PTR_UNWIND_INFO; +#endif + #ifdef _WIN64 typedef DPTR(T_RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION; typedef DPTR(struct _UNWIND_INFO) PTR_UNWIND_INFO; diff --git a/src/vm/codeman.cpp b/src/vm/codeman.cpp index ad4c5196b1..c2632f7f8a 100644 --- a/src/vm/codeman.cpp +++ b/src/vm/codeman.cpp @@ -985,6 +985,13 @@ PTR_VOID GetUnwindDataBlob(TADDR moduleBase, PTR_RUNTIME_FUNCTION pRuntimeFuncti return pUnwindInfo; +#elif defined(_TARGET_X86_) && defined(FEATURE_PAL) + PTR_UNWIND_INFO pUnwindInfo(dac_cast<PTR_UNWIND_INFO>(moduleBase + RUNTIME_FUNCTION__GetUnwindInfoAddress(pRuntimeFunction))); + + *pSize = ALIGN_UP(sizeof(UNWIND_INFO), sizeof(DWORD)); + + return pUnwindInfo; + #elif defined(_TARGET_ARM_) // if this function uses packed unwind data then at least one of the two least significant bits diff --git a/src/zap/zapcode.cpp b/src/zap/zapcode.cpp index e54e884bc2..ead385d5e0 100644 --- a/src/zap/zapcode.cpp +++ b/src/zap/zapcode.cpp @@ -1202,6 +1202,30 @@ void ZapUnwindData::Save(ZapWriter * pZapWriter) #endif //REDHAWK } +#elif defined(_TARGET_X86_) && defined(FEATURE_PAL) + +UINT ZapUnwindData::GetAlignment() +{ + return sizeof(BYTE); +} + +DWORD ZapUnwindData::GetSize() +{ + DWORD dwSize = ZapBlob::GetSize(); + + return dwSize; +} + +void ZapUnwindData::Save(ZapWriter * pZapWriter) +{ + ZapImage * pImage = ZapImage::GetImage(pZapWriter); + + PVOID pData = GetData(); + DWORD dwSize = GetBlobSize(); + + pZapWriter->Write(pData, dwSize); +} + #elif defined(_TARGET_ARM_) || defined(_TARGET_ARM64_) UINT ZapUnwindData::GetAlignment() |