diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-11-12 02:12:23 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-11-12 02:12:23 +0300 |
| commit | e0416c0125d05331e444a8fa1db35eb32d82baa9 (patch) | |
| tree | 52ad9b7dfa5e491fb02afb66ffa2c5f07a0305bf /src/Native/Runtime/amd64 | |
| parent | f2445930d6efbaebb10eeecc4c0a565c9fac90e3 (diff) | |
Define CORERT for ProjectN builds
CoreRT is component of ProjectN (aka .NET Native for UWP), but our current defines do not reflect it because of CORERT is not defined in ProjectN builds. This creates confusion for folks outside the core runtime team, and conflicts with our documentation. For example, https://github.com/dotnet/corert/blob/master/Documentation/intro-to-corert.md says "CoreRT is the .NET Core runtime that is optimized for AOT scenarios, which .NET Native targets". It does not say "CoreRT is the .NET Core runtime optimized for AOT scenarios that uses RyuJIT backend" or anything like that.
- Before this change:
PROJECTN: defined in closed source ProjectN builds
CORERT: defined in open source CoreRT builds
CORECLR: defined in CoreCLR builds
- After this change:
PROJECTN: defined in closed source ProjectN builds (same)
CORERT: defined in both open source CoreRT builds and closed source ProjectN builds (different)
CORECLR: defined in CoreCLR builds (same)
[tfs-changeset: 1680901]
Diffstat (limited to 'src/Native/Runtime/amd64')
| -rw-r--r-- | src/Native/Runtime/amd64/ExceptionHandling.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Native/Runtime/amd64/ExceptionHandling.asm b/src/Native/Runtime/amd64/ExceptionHandling.asm index b2fb7e036..566dad71f 100644 --- a/src/Native/Runtime/amd64/ExceptionHandling.asm +++ b/src/Native/Runtime/amd64/ExceptionHandling.asm @@ -424,11 +424,11 @@ endif movdqa xmm14,[r8 + OFFSETOF__REGDISPLAY__Xmm + 8*10h] movdqa xmm15,[r8 + OFFSETOF__REGDISPLAY__Xmm + 9*10h] -ifdef CORERT ;; @TODO Reconcile +ifdef PROJECTN ;; @TODO Reconcile + mov rcx, [rsp + rsp_offsetof_arguments + 0h] ;; rcx <- exception object +else mov rcx, [r8 + OFFSETOF__REGDISPLAY__SP] ;; rcx <- establisher frame mov rdx, [rsp + rsp_offsetof_arguments + 0h] ;; rdx <- exception object -else - mov rcx, [rsp + rsp_offsetof_arguments + 0h] ;; rcx <- exception object endif call qword ptr [rsp + rsp_offsetof_arguments + 8h] ;; call handler funclet @@ -666,11 +666,11 @@ NESTED_ENTRY RhpCallFilterFunclet, _TEXT mov rbp, [rax] mov rax, rdx ;; rax <- handler funclet address -ifdef CORERT ;; @TODO Reconcile +ifdef PROJECTN ;; @TODO Reconcile + ;; RCX still contains the exception object +else mov rdx, rcx ;; rdx <- exception object mov rcx, [r8 + OFFSETOF__REGDISPLAY__SP] ;; rcx <- establisher frame -else - ;; RCX still contains the exception object endif call rax |