1
- //
1
+ //
2
2
// Copyright (c) .NET Foundation and Contributors
3
3
// Portions Copyright (c) Microsoft Corporation. All rights reserved.
4
4
// See LICENSE file in the project root for full license information.
@@ -138,7 +138,11 @@ void CLR_RT_GarbageCollector::ValidateBlockNotInFreeList(CLR_RT_DblLinkedList &l
138
138
if (ptr <= dst && dst < ptrEnd)
139
139
{
140
140
#ifdef _WIN64
141
- CLR_Debug::Printf (" Pointer into free list!! %I64X %I64X %I64X\r\n " , dst, ptr, ptrEnd);
141
+ CLR_Debug::Printf (
142
+ " Pointer into free list!! 0x%016" PRIxPTR " 0x%016" PRIxPTR " 0x%016" PRIxPTR " \r\n " ,
143
+ (uintptr_t )dst,
144
+ (uintptr_t )ptr,
145
+ (uintptr_t )ptrEnd);
142
146
#else
143
147
CLR_Debug::Printf (" Pointer into free list!! %08x %08x %08x\r\n " , dst, ptr, ptrEnd);
144
148
#endif
@@ -225,7 +229,7 @@ bool CLR_RT_GarbageCollector::TestPointers_PopulateOld_Worker(void **ref)
225
229
if (s_mapOldToRecord.find (ref) != s_mapOldToRecord.end ())
226
230
{
227
231
#ifdef _WIN64
228
- CLR_Debug::Printf (" Duplicate base OLD: %I64X \r\n " , ref);
232
+ CLR_Debug::Printf (" Duplicate base OLD: 0x%016 " PRIxPTR " \r\n " , ( uintptr_t ) ref);
229
233
#else
230
234
CLR_Debug::Printf (" Duplicate base OLD: %08x\r\n " , ref);
231
235
#endif
@@ -238,7 +242,7 @@ bool CLR_RT_GarbageCollector::TestPointers_PopulateOld_Worker(void **ref)
238
242
if (IsBlockInFreeList (g_CLR_RT_ExecutionEngine.m_heap , (CLR_RT_HeapBlock_Node *)dst, false ))
239
243
{
240
244
#ifdef _WIN64
241
- CLR_Debug::Printf (" Some data points into a free list: %I64X \r\n " , dst);
245
+ CLR_Debug::Printf (" Some data points into a free list: 0x%016 " PRIxPTR " \r\n " , ( uintptr_t ) dst);
242
246
#else
243
247
CLR_Debug::Printf (" Some data points into a free list: %08x\r\n " , dst);
244
248
#endif
@@ -302,7 +306,7 @@ void CLR_RT_GarbageCollector::TestPointers_Remap()
302
306
if (s_mapNewToRecord.find (ref) != s_mapNewToRecord.end ())
303
307
{
304
308
#ifdef _WIN64
305
- CLR_Debug::Printf (" Duplicate base NEW: %I64X \r\n " , ref);
309
+ CLR_Debug::Printf (" Duplicate base NEW: 0x%016 " PRIxPTR " \r\n " , ( uintptr_t ) ref);
306
310
#else
307
311
CLR_Debug::Printf (" Duplicate base NEW: %08x\r\n " , ref);
308
312
#endif
@@ -334,7 +338,10 @@ bool CLR_RT_GarbageCollector::TestPointers_PopulateNew_Worker(void **ref)
334
338
if (ptr->newPtr != dst)
335
339
{
336
340
#ifdef _WIN64
337
- CLR_Debug::Printf (" Bad pointer: %I64X %I64X\r\n " , ptr->newPtr , dst);
341
+ CLR_Debug::Printf (
342
+ " Bad pointer: 0x%016" PRIxPTR " 0x%016" PRIxPTR " \r\n " ,
343
+ (uintptr_t )ptr->newPtr ,
344
+ (uintptr_t )dst);
338
345
#else
339
346
CLR_Debug::Printf (" Bad pointer: %08x %08x\r\n " , ptr->newPtr , dst);
340
347
#endif
@@ -343,7 +350,10 @@ bool CLR_RT_GarbageCollector::TestPointers_PopulateNew_Worker(void **ref)
343
350
else if (ptr->data != *dst)
344
351
{
345
352
#ifdef _WIN64
346
- CLR_Debug::Printf (" Bad data: %I64X %I64X\r\n " , ptr->data , *dst);
353
+ CLR_Debug::Printf (
354
+ " Bad data: 0x%016" PRIxPTR " 0x%016" PRIxPTR " \r\n " ,
355
+ (uintptr_t )ptr->data ,
356
+ (uintptr_t )*dst);
347
357
#else
348
358
CLR_Debug::Printf (" Bad data: %08x %08x\r\n " , ptr->data , *dst);
349
359
#endif
@@ -354,7 +364,7 @@ bool CLR_RT_GarbageCollector::TestPointers_PopulateNew_Worker(void **ref)
354
364
if (IsBlockInFreeList (g_CLR_RT_ExecutionEngine.m_heap , (CLR_RT_HeapBlock_Node *)dst, false ))
355
365
{
356
366
#ifdef _WIN64
357
- CLR_Debug::Printf (" Some data points into a free list: %I64X \r\n " , dst);
367
+ CLR_Debug::Printf (" Some data points into a free list: 0x%016 " PRIxPTR " \r\n " , ( uintptr_t ) dst);
358
368
#else
359
369
CLR_Debug::Printf (" Some data points into a free list: %08x\r\n " , dst);
360
370
#endif
@@ -367,7 +377,7 @@ bool CLR_RT_GarbageCollector::TestPointers_PopulateNew_Worker(void **ref)
367
377
else
368
378
{
369
379
#ifdef _WIN64
370
- CLR_Debug::Printf (" Bad base: 0x%0I64X \r\n " , ref);
380
+ CLR_Debug::Printf (" Bad base: 0x%016 " PRIxPTR " \r\n " , ( uintptr_t ) ref);
371
381
#else
372
382
CLR_Debug::Printf (" Bad base: 0x%08x\r\n " , ref);
373
383
#endif
0 commit comments