diff options
| author | Morgan Brown <morganbr@users.noreply.github.com> | 2017-12-05 09:45:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 09:45:38 +0300 |
| commit | 3d25db5b1c010346bbc480a20646c80ea413492f (patch) | |
| tree | e49e79d7ef6cd6861dd54d6db5262dfce216e695 /src/Native/Runtime/EHHelpers.cpp | |
| parent | c900f3d03df888df2271cc7e207cdc645ae94aa2 (diff) | |
Build runtime and libraries for WebAssembly (#4876)
* Fix issues building the runtime, corelib and type loader for WebAssembly
* Fix test infrastructure to allow running with the wasm flavor
Diffstat (limited to 'src/Native/Runtime/EHHelpers.cpp')
| -rw-r--r-- | src/Native/Runtime/EHHelpers.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Native/Runtime/EHHelpers.cpp b/src/Native/Runtime/EHHelpers.cpp index f3d364b1a..c068c170f 100644 --- a/src/Native/Runtime/EHHelpers.cpp +++ b/src/Native/Runtime/EHHelpers.cpp @@ -207,6 +207,8 @@ COOP_PINVOKE_HELPER(void, RhpCopyContextFromExInfo, pContext->Sp = pPalContext->SP; pContext->Lr = pPalContext->LR; pContext->Pc = pPalContext->IP; +#elif defined(_WASM_) + // No registers, no work to do yet #else #error Not Implemented for this architecture -- RhpCopyContextFromExInfo #endif @@ -301,7 +303,7 @@ EXTERN_C Int32 RhpPInvokeExceptionGuard() } #endif -#if defined(_AMD64_) || defined(_ARM_) || defined(_X86_) || defined(_ARM64_) +#if defined(_AMD64_) || defined(_ARM_) || defined(_X86_) || defined(_ARM64_) || defined(_WASM_) EXTERN_C REDHAWK_API void __fastcall RhpThrowHwEx(); #else COOP_PINVOKE_HELPER(void, RhpThrowHwEx, ()) @@ -413,7 +415,8 @@ static UIntNative UnwindWriteBarrierToCaller( #elif defined(_ARM_) || defined(_ARM64_) UIntNative adjustedFaultingIP = pContext->GetLr(); #else -#error "Unknown Architecture" + UIntNative adjustedFaultingIP = 0; // initializing to make the compiler happy + PORTABILITY_ASSERT("UnwindWriteBarrierToCaller"); #endif return adjustedFaultingIP; } |