Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit a734248

Browse files
lucenticusMike McLaughlin
authored andcommitted
[SOS][ARM/Linux] Enable clru SOS command (#6477)
* Enable clru SOS command on ARM/Linux * Set thumb bit on ARM/Linux
1 parent dcd9aae commit a734248

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/ToolBox/SOS/Strike/disasmARM.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ void ARMMachine::IsReturnAddress(TADDR retAddr, TADDR* whereCalled) const
250250
}
251251
}
252252

253-
#ifndef FEATURE_PAL
254253

255254
// Return 0 for non-managed call. Otherwise return MD address.
256255
static TADDR MDForCall (TADDR callee)
@@ -272,8 +271,14 @@ static TADDR MDForCall (TADDR callee)
272271
// Determine if a value is MT/MD/Obj
273272
static void HandleValue(TADDR value)
274273
{
274+
#ifndef FEATURE_PAL
275275
// remove the thumb bit (if set)
276276
value = value & ~1;
277+
#else
278+
// set the thumb bit (if not set)
279+
value = value | 1;
280+
#endif //!FEATURE_PAL
281+
277282
// A MethodTable?
278283
if (IsMethodTable(value))
279284
{
@@ -336,8 +341,6 @@ static void HandleValue(TADDR value)
336341
}
337342
}
338343

339-
#endif // !FEATURE_PAL
340-
341344
/**********************************************************************\
342345
* Routine Description: *
343346
* *
@@ -355,7 +358,6 @@ void ARMMachine::Unassembly (
355358
BOOL bSuppressLines,
356359
BOOL bDisplayOffsets) const
357360
{
358-
#ifndef FEATURE_PAL
359361
ULONG_PTR PC = PCBegin;
360362
char line[1024];
361363
char *ptr;
@@ -383,6 +385,7 @@ void ARMMachine::Unassembly (
383385
}
384386
}
385387

388+
#ifndef FEATURE_PAL
386389
//
387390
// Print out any GC information corresponding to the current instruction offset.
388391
//
@@ -397,7 +400,7 @@ void ARMMachine::Unassembly (
397400
SwitchToFiber(pGCEncodingInfo->pvGCTableFiber);
398401
}
399402
}
400-
403+
#endif //!FEATURE_PAL
401404
//
402405
// Print out any EH info corresponding to the current offset
403406
//
@@ -529,7 +532,6 @@ void ARMMachine::Unassembly (
529532

530533
ExtOut ("\n");
531534
}
532-
#endif // !FEATURE_PAL
533535
}
534536

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

0 commit comments

Comments
 (0)