diff options
| author | Steve MacLean, Qualcomm Datacenter Technologies, Inc <sdmaclea@qti.qualcomm.com> | 2017-02-18 01:28:17 +0000 |
|---|---|---|
| committer | Steve MacLean, Qualcomm Datacenter Technologies, Inc <sdmaclea@qti.qualcomm.com> | 2017-02-18 01:28:17 +0000 |
| commit | 1e08eb2be580d27c7d0cffdecc8bfd93e70e407e (patch) | |
| tree | e7d4e8d0f092d79033e83e416ea1d5eeca8a132e /src/unwinder | |
| parent | 380cda50c89fa4534b9b8f144d1ecec0bb5d584b (diff) | |
| download | coreclr-1e08eb2be580d27c7d0cffdecc8bfd93e70e407e.tar.gz coreclr-1e08eb2be580d27c7d0cffdecc8bfd93e70e407e.tar.bz2 coreclr-1e08eb2be580d27c7d0cffdecc8bfd93e70e407e.zip | |
[ARM64] Use PT_KNONVOLATILE... for cross
In order to enable cross compilation support, ARM64
needs to use PT_KNONVOLATILE_CONTEXT_POINTERS
Diffstat (limited to 'src/unwinder')
| -rw-r--r-- | src/unwinder/arm64/unwinder_arm64.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/unwinder/arm64/unwinder_arm64.cpp b/src/unwinder/arm64/unwinder_arm64.cpp index 36f7de1aad..1edb94a746 100644 --- a/src/unwinder/arm64/unwinder_arm64.cpp +++ b/src/unwinder/arm64/unwinder_arm64.cpp @@ -109,35 +109,35 @@ typedef struct _ARM64_VFP_STATE typedef struct _ARM64_UNWIND_PARAMS { - PKNONVOLATILE_CONTEXT_POINTERS ContextPointers; + PT_KNONVOLATILE_CONTEXT_POINTERS ContextPointers; } ARM64_UNWIND_PARAMS, *PARM64_UNWIND_PARAMS; #define UNWIND_PARAMS_SET_TRAP_FRAME(Params, Address, Size) -#define UPDATE_CONTEXT_POINTERS(Params, RegisterNumber, Address) \ -do { \ - if (ARGUMENT_PRESENT(Params)) { \ - PKNONVOLATILE_CONTEXT_POINTERS ContextPointers = (Params)->ContextPointers; \ - if (ARGUMENT_PRESENT(ContextPointers)) { \ - if (RegisterNumber >= 19 && RegisterNumber <= 30) { \ - (&ContextPointers->X19)[RegisterNumber - 19] = (PDWORD64)Address; \ - } \ - } \ - } \ +#define UPDATE_CONTEXT_POINTERS(Params, RegisterNumber, Address) \ +do { \ + if (ARGUMENT_PRESENT(Params)) { \ + PT_KNONVOLATILE_CONTEXT_POINTERS ContextPointers = (Params)->ContextPointers; \ + if (ARGUMENT_PRESENT(ContextPointers)) { \ + if (RegisterNumber >= 19 && RegisterNumber <= 30) { \ + (&ContextPointers->X19)[RegisterNumber - 19] = (PDWORD64)Address; \ + } \ + } \ + } \ } while (0) -#define UPDATE_FP_CONTEXT_POINTERS(Params, RegisterNumber, Address) \ -do { \ - if (ARGUMENT_PRESENT(Params)) { \ - PKNONVOLATILE_CONTEXT_POINTERS ContextPointers = (Params)->ContextPointers; \ - if (ARGUMENT_PRESENT(ContextPointers) && \ - (RegisterNumber >= 8) && \ - (RegisterNumber <= 15)) { \ - \ - (&ContextPointers->D8)[RegisterNumber - 8] = (PDWORD64)Address; \ - } \ - } \ +#define UPDATE_FP_CONTEXT_POINTERS(Params, RegisterNumber, Address) \ +do { \ + if (ARGUMENT_PRESENT(Params)) { \ + PT_KNONVOLATILE_CONTEXT_POINTERS ContextPointers = (Params)->ContextPointers; \ + if (ARGUMENT_PRESENT(ContextPointers) && \ + (RegisterNumber >= 8) && \ + (RegisterNumber <= 15)) { \ + \ + (&ContextPointers->D8)[RegisterNumber - 8] = (PDWORD64)Address; \ + } \ + } \ } while (0) #define VALIDATE_STACK_ADDRESS_EX(Params, Context, Address, DataSize, Alignment, OutStatus) @@ -1621,7 +1621,7 @@ RtlVirtualUnwind( IN OUT PCONTEXT ContextRecord, OUT PVOID *HandlerData, OUT PULONG64 EstablisherFrame, - IN OUT PKNONVOLATILE_CONTEXT_POINTERS ContextPointers OPTIONAL + IN OUT PT_KNONVOLATILE_CONTEXT_POINTERS ContextPointers OPTIONAL ) { PEXCEPTION_ROUTINE handlerRoutine; |