Skip to content

Commit

Permalink
[SOS][ARM/Linux] Enable clru SOS command (dotnet/coreclr#6477)
Browse files Browse the repository at this point in the history
* Enable clru SOS command on ARM/Linux

* Set thumb bit on ARM/Linux


Commit migrated from dotnet/coreclr@a734248
  • Loading branch information
lucenticus authored and mikem8361 committed Jul 27, 2016
1 parent 8e50f24 commit 7ff8dff
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/coreclr/src/ToolBox/SOS/Strike/disasmARM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ void ARMMachine::IsReturnAddress(TADDR retAddr, TADDR* whereCalled) const
}
}

#ifndef FEATURE_PAL

// Return 0 for non-managed call. Otherwise return MD address.
static TADDR MDForCall (TADDR callee)
Expand All @@ -272,8 +271,14 @@ static TADDR MDForCall (TADDR callee)
// Determine if a value is MT/MD/Obj
static void HandleValue(TADDR value)
{
#ifndef FEATURE_PAL
// remove the thumb bit (if set)
value = value & ~1;
#else
// set the thumb bit (if not set)
value = value | 1;
#endif //!FEATURE_PAL

// A MethodTable?
if (IsMethodTable(value))
{
Expand Down Expand Up @@ -336,8 +341,6 @@ static void HandleValue(TADDR value)
}
}

#endif // !FEATURE_PAL

/**********************************************************************\
* Routine Description: *
* *
Expand All @@ -355,7 +358,6 @@ void ARMMachine::Unassembly (
BOOL bSuppressLines,
BOOL bDisplayOffsets) const
{
#ifndef FEATURE_PAL
ULONG_PTR PC = PCBegin;
char line[1024];
char *ptr;
Expand Down Expand Up @@ -383,6 +385,7 @@ void ARMMachine::Unassembly (
}
}

#ifndef FEATURE_PAL
//
// Print out any GC information corresponding to the current instruction offset.
//
Expand All @@ -397,7 +400,7 @@ void ARMMachine::Unassembly (
SwitchToFiber(pGCEncodingInfo->pvGCTableFiber);
}
}

#endif //!FEATURE_PAL
//
// Print out any EH info corresponding to the current offset
//
Expand Down Expand Up @@ -529,7 +532,6 @@ void ARMMachine::Unassembly (

ExtOut ("\n");
}
#endif // !FEATURE_PAL
}

#if 0 // @ARMTODO: Figure out how to extract this information under CoreARM
Expand Down

0 comments on commit 7ff8dff

Please sign in to comment.