diff options
| author | Zhicheng Zhu <ZhichengZhu@users.noreply.github.com> | 2016-04-13 11:40:47 -0700 |
|---|---|---|
| committer | Zhicheng Zhu <ZhichengZhu@users.noreply.github.com> | 2016-04-13 11:40:47 -0700 |
| commit | 8ba667ba08a57f420aa3067e8b57e51185802650 (patch) | |
| tree | a01a5911f774e79e876ce5492d068962335e8197 /src/vm/gcinfodecoder.cpp | |
| parent | 517207b9d3f2a53c726a8682c1331cf7bdb0360b (diff) | |
| parent | 6b9efccc55654928225829b853267f1062fa42fa (diff) | |
| download | coreclr-8ba667ba08a57f420aa3067e8b57e51185802650.tar.gz coreclr-8ba667ba08a57f420aa3067e8b57e51185802650.tar.bz2 coreclr-8ba667ba08a57f420aa3067e8b57e51185802650.zip | |
Enable SOS gcInfo command. All it does basically is just enable the gcdecoder
Enable SOS gcInfo command. Basically all it does is just enable the code related to sos gcInfo and make it compiled for linux.
Diffstat (limited to 'src/vm/gcinfodecoder.cpp')
| -rw-r--r-- | src/vm/gcinfodecoder.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/vm/gcinfodecoder.cpp b/src/vm/gcinfodecoder.cpp index 068d234a0c..6ec4596ac9 100644 --- a/src/vm/gcinfodecoder.cpp +++ b/src/vm/gcinfodecoder.cpp @@ -1175,7 +1175,7 @@ void GcSlotDecoder::DecodeSlotTable(BitStreamReader& reader) m_SlotArray[0].Slot.RegisterNumber = regNum; m_SlotArray[0].Flags = flags; - UINT32 loopEnd = min(m_NumRegisters, MAX_PREDECODED_SLOTS); + UINT32 loopEnd = _min(m_NumRegisters, MAX_PREDECODED_SLOTS); for(i++; i < loopEnd; i++) { if(flags) @@ -1209,7 +1209,7 @@ void GcSlotDecoder::DecodeSlotTable(BitStreamReader& reader) m_SlotArray[i].Slot.Stack.Base = spBase; m_SlotArray[i].Flags = flags; - UINT32 loopEnd = min(m_NumRegisters + numStackSlots, MAX_PREDECODED_SLOTS); + UINT32 loopEnd = _min(m_NumRegisters + numStackSlots, MAX_PREDECODED_SLOTS); for(i++; i < loopEnd; i++) { spBase = (GcStackSlotBase) reader.Read(2); @@ -1246,7 +1246,7 @@ void GcSlotDecoder::DecodeSlotTable(BitStreamReader& reader) m_SlotArray[i].Slot.Stack.Base = spBase; m_SlotArray[i].Flags = flags; - UINT32 loopEnd = min(m_NumSlots, MAX_PREDECODED_SLOTS); + UINT32 loopEnd = _min(m_NumSlots, MAX_PREDECODED_SLOTS); for(i++; i < loopEnd; i++) { spBase = (GcStackSlotBase) reader.Read(2); @@ -1545,8 +1545,7 @@ void GcInfoDecoder::ReportRegisterToGC( // AMD64 LOG((LF_GCROOTS, LL_INFO1000, "Reporting " FMT_REG, regNum )); OBJECTREF* pObjRef = GetRegisterSlot( regNum, pRD ); - -#ifdef FEATURE_PAL +#if defined(FEATURE_PAL) && !defined(SOS_TARGET_AMD64) // On PAL, we don't always have the context pointers available due to // a limitation of an unwinding library. In such case, the context // pointers for some nonvolatile registers are NULL. @@ -1566,7 +1565,7 @@ void GcInfoDecoder::ReportRegisterToGC( // AMD64 gcFlags |= GC_CALL_PINNED; } -#endif // FEATURE_PAL +#endif // FEATURE_PAL && !SOS_TARGET_AMD64 #ifdef _DEBUG if(IsScratchRegister(regNum, pRD)) |