diff options
author | Sergey Ignatov <sergign60@mail.ru> | 2017-02-06 16:04:03 +0300 |
---|---|---|
committer | Sergey Ignatov <sergign60@mail.ru> | 2017-02-06 16:04:03 +0300 |
commit | d9847aff807f50e3fbd9393742ee7f9a24a21ded (patch) | |
tree | bbafdf81fb3153f50ddcc800842fac8cf53c1606 /src/Native/Runtime | |
parent | 5f49bf4ddc1c515205b400f2491bf33aff9a0106 (diff) |
Deleted unneeded fields pCurrentContextPointers&volatileCurrContextPointers
Diffstat (limited to 'src/Native/Runtime')
-rw-r--r-- | src/Native/Runtime/arm/AsmOffsetsCpu.h | 8 | ||||
-rw-r--r-- | src/Native/Runtime/coreclr/gcinfodecoder.cpp | 8 | ||||
-rw-r--r-- | src/Native/Runtime/regdisplay.h | 35 |
3 files changed, 9 insertions, 42 deletions
diff --git a/src/Native/Runtime/arm/AsmOffsetsCpu.h b/src/Native/Runtime/arm/AsmOffsetsCpu.h index 52f5bb575..1c1d1978c 100644 --- a/src/Native/Runtime/arm/AsmOffsetsCpu.h +++ b/src/Native/Runtime/arm/AsmOffsetsCpu.h @@ -8,7 +8,7 @@ // // NOTE: the offsets MUST be in hex notation WITHOUT the 0x prefix -PLAT_ASM_SIZEOF(148, ExInfo) +PLAT_ASM_SIZEOF(130, ExInfo) PLAT_ASM_OFFSET(0, ExInfo, m_pPrevExInfo) PLAT_ASM_OFFSET(4, ExInfo, m_pExContext) PLAT_ASM_OFFSET(8, ExInfo, m_exception) @@ -16,7 +16,7 @@ PLAT_ASM_OFFSET(0c, ExInfo, m_kind) PLAT_ASM_OFFSET(0d, ExInfo, m_passNumber) PLAT_ASM_OFFSET(10, ExInfo, m_idxCurClause) PLAT_ASM_OFFSET(18, ExInfo, m_frameIter) -PLAT_ASM_OFFSET(140, ExInfo, m_notifyDebuggerSP) +PLAT_ASM_OFFSET(128, ExInfo, m_notifyDebuggerSP) PLAT_ASM_OFFSET(4, PInvokeTransitionFrame, m_RIP) PLAT_ASM_OFFSET(8, PInvokeTransitionFrame, m_FramePointer) @@ -24,7 +24,7 @@ PLAT_ASM_OFFSET(0c, PInvokeTransitionFrame, m_pThread) PLAT_ASM_OFFSET(10, PInvokeTransitionFrame, m_dwFlags) PLAT_ASM_OFFSET(14, PInvokeTransitionFrame, m_PreservedRegs) -PLAT_ASM_SIZEOF(128, StackFrameIterator) +PLAT_ASM_SIZEOF(110, StackFrameIterator) PLAT_ASM_OFFSET(08, StackFrameIterator, m_FramePointer) PLAT_ASM_OFFSET(0c, StackFrameIterator, m_ControlPC) PLAT_ASM_OFFSET(10, StackFrameIterator, m_RegDisplay) @@ -44,7 +44,7 @@ PLAT_ASM_OFFSET(20, PAL_LIMITED_CONTEXT, R11) PLAT_ASM_OFFSET(28, PAL_LIMITED_CONTEXT, SP) PLAT_ASM_OFFSET(2c, PAL_LIMITED_CONTEXT, LR) -PLAT_ASM_SIZEOF(a0, REGDISPLAY) +PLAT_ASM_SIZEOF(88, REGDISPLAY) PLAT_ASM_OFFSET(38, REGDISPLAY, SP) PLAT_ASM_OFFSET(10, REGDISPLAY, pR4) diff --git a/src/Native/Runtime/coreclr/gcinfodecoder.cpp b/src/Native/Runtime/coreclr/gcinfodecoder.cpp index c9eddc224..f152befe9 100644 --- a/src/Native/Runtime/coreclr/gcinfodecoder.cpp +++ b/src/Native/Runtime/coreclr/gcinfodecoder.cpp @@ -1484,19 +1484,19 @@ OBJECTREF* GcInfoDecoder::GetRegisterSlot( if(regNum <= 3) { - ppReg = &pRD->volatileCurrContextPointers.R0; + ppReg = &pRD->pR0; return (OBJECTREF*)*(ppReg + regNum); } else if(regNum == 12) { - return (OBJECTREF*) pRD->volatileCurrContextPointers.R12; + return (OBJECTREF*) pRD->pR12; } else if(regNum == 14) { - return (OBJECTREF*) pRD->pCurrentContextPointers->Lr; + return (OBJECTREF*) pRD->pLR; } - ppReg = &pRD->pCurrentContextPointers->R4; + ppReg = &pRD->pR4; return (OBJECTREF*)*(ppReg + regNum-4); diff --git a/src/Native/Runtime/regdisplay.h b/src/Native/Runtime/regdisplay.h index d68b84ad3..24c6c5a75 100644 --- a/src/Native/Runtime/regdisplay.h +++ b/src/Native/Runtime/regdisplay.h @@ -49,37 +49,7 @@ struct REGDISPLAY #elif defined(_TARGET_ARM_) -typedef struct _ArmVolatileContextPointer -{ - PTR_UIntNative R0; - PTR_UIntNative R1; - PTR_UIntNative R2; - PTR_UIntNative R3; - PTR_UIntNative R12; -} ArmVolatileContextPointer; - -typedef struct _ArmNonVolatileContextPointer { - PTR_UIntNative R4; - PTR_UIntNative R5; - PTR_UIntNative R6; - PTR_UIntNative R7; - PTR_UIntNative R8; - PTR_UIntNative R9; - PTR_UIntNative R10; - PTR_UIntNative R11; - PTR_UIntNative Lr; - - PTR_UInt64 D8; - PTR_UInt64 D9; - PTR_UInt64 D10; - PTR_UInt64 D11; - PTR_UInt64 D12; - PTR_UInt64 D13; - PTR_UInt64 D14; - PTR_UInt64 D15; -} ArmNonVolatileContextPointer; - -struct REGDISPLAY +struct REGDISPLAY { PTR_UIntNative pR0; PTR_UIntNative pR1; @@ -105,9 +75,6 @@ struct REGDISPLAY // for EH, but not adjusted, so we only need // their values, not their addresses - ArmNonVolatileContextPointer *pCurrentContextPointers; - ArmVolatileContextPointer volatileCurrContextPointers; - inline PCODE GetIP() { return IP; } inline PTR_PCODE GetAddrOfIP() { return pIP; } inline UIntNative GetSP() { return SP; } |