[asan] Print SHADOW_SCALE and SHADOW_GRANULARITY as decimal values.

[dsanders]

Summary

During the review of http://reviews.llvm.org/D9199 where I had originally
changed the debug_mapping.cc test to accept hexadecimal values, we realized
that SHADOW_SCALE and SHADOW_GRANULARITY ought to be printed as decimal values.
This patch makes that change.

This patch also adds a '0x' prefix to the SHADOW_OFFSET to make it clear that
it is hexadecimal while the other two are decimal.

[timurrrr]

I'd like Kostya to comment first.

lib/asan/asan_rtl.cc

350–352

please cast to int

test/asan/TestCases/debug_mapping.cc

15

I wonder if the interface function's first parameter type should be changed to int*.

17–18

ditto

[dsanders]

Good point. Timur has asked me to cast to int and is wondering whether the prototype should be changed so I'll wait to see what Kostya says before updating the patch to either cast to int or use '%zd'.

From: [e-mail] [mailto:[e-mail]] On Behalf Of mats petersson
Sent: 23 April 2015 15:41
To: [e-mail]
Cc: Daniel Sanders; [e-mail]; [e-mail]; [e-mail]; Sagar Thakur
Subject: Re: [PATCH] [asan] Print SHADOW_SCALE and SHADOW_GRANULARITY as decimal values.

[samsonov]

I think this patch is definitely a positive change.

test/asan/TestCases/debug_mapping.cc

15

I agree that int* would make more sense, but rather not change it now (it's declared in a public header after all). size_t also works, after all.

[timurrrr]

OK, let's keep the current interface but cast scale/granularity to int when printing.

[dsanders]

Fix the printf type mismatches by casting to int as discussed.
Add an '0x' prefix to SHADOW_OFFSET to prevent ambiguity with the decimal numbers nearby.

[timurrrr]

LGTM

[samsonov]

LGTM

lib/asan/asan_rtl.cc

static void PrintAddressSpaceLayout() {
   }
   Printf("\n");
   Printf("redzone=%zu\n", (uptr)flags()->redzone);
   Printf("max_redzone=%zu\n", (uptr)flags()->max_redzone);
   Printf("quarantine_size_mb=%zuM\n", (uptr)flags()->quarantine_size_mb);
   Printf("malloc_context_size=%zu\n",
          (uptr)common_flags()->malloc_context_size);
 
-  Printf("SHADOW_SCALE: %zx\n", (uptr)SHADOW_SCALE);
-  Printf("SHADOW_GRANULARITY: %zx\n", (uptr)SHADOW_GRANULARITY);
-  Printf("SHADOW_OFFSET: %zx\n", (uptr)SHADOW_OFFSET);
+  Printf("SHADOW_SCALE: %d\n", (int)SHADOW_SCALE);
+  Printf("SHADOW_GRANULARITY: %d\n", (int)SHADOW_GRANULARITY);
+  Printf("SHADOW_OFFSET: 0x%zx\n", (uptr)SHADOW_OFFSET);
   CHECK(SHADOW_SCALE >= 3 && SHADOW_SCALE <= 7);
   if (kMidMemBeg)
     CHECK(kMidShadowBeg > kLowShadowEnd &&
           kMidMemBeg > kMidShadowEnd &&
           kHighShadowBeg > kMidMemEnd);
 }
 
 static void AsanInitInternal() {

test/asan/TestCases/debug_mapping.cc

 // Checks that the debugging API returns correct shadow scale and offset.
 // RUN: %clangxx_asan -O %s -o %t
 // RUN: env ASAN_OPTIONS=verbosity=1 %run %t 2>&1 | FileCheck %s
 
 #include <sanitizer/asan_interface.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 // printed because of verbosity=1
 // CHECK: SHADOW_SCALE: [[SCALE:[0-9]+]]
-// CHECK: SHADOW_OFFSET: [[OFFSET:[0-9a-f]+]]
+// CHECK: SHADOW_OFFSET: [[OFFSET:0x[0-9a-f]+]]
 
 int main() {
   size_t scale, offset;
   __asan_get_shadow_mapping(&scale, &offset);
 
-  fprintf(stderr, "scale: %lx\n", scale);
-  fprintf(stderr, "offset: %lx\n", offset);
+  fprintf(stderr, "scale: %d\n", (int)scale);
+  fprintf(stderr, "offset: 0x%lx\n", offset);
 
   // CHECK: scale: [[SCALE]]
   // CHECK: offset: [[OFFSET]]
 
   return 0;
 }