[msan] Fix wrong endianness when printing shadow.

llvm-svn: 210335
This commit is contained in:
Evgeniy Stepanov 2014-06-06 14:06:14 +00:00
parent 58cb2edd69
commit ee98fb197b
3 changed files with 25 additions and 1 deletions

View File

@ -440,7 +440,11 @@ void __msan_dump_shadow(const void *x, uptr size) {
unsigned char *s = (unsigned char*)MEM_TO_SHADOW(x);
for (uptr i = 0; i < size; i++) {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
Printf("%x%x ", s[i] & 0xf, s[i] >> 4);
#else
Printf("%x%x ", s[i] >> 4, s[i] & 0xf);
#endif
}
Printf("\n");
}

View File

@ -221,7 +221,11 @@ void DescribeMemoryRange(const void *x, uptr size) {
} else {
unsigned char v = *(unsigned char *)s;
if (v) last_quad_poisoned = true;
Printf("%02x", v);
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
Printf("%x%x", v & 0xf, v >> 4);
#else
Printf("%x%x", v >> 4, v & 0xf);
#endif
}
// Group end.
if (pos % 4 == 3 && with_origins) {

View File

@ -0,0 +1,16 @@
// RUN: %clangxx_msan -m64 -O0 -g %s -o %t && %run %t >%t.out 2>&1
// RUN: FileCheck %s < %t.out
#include <stdint.h>
#include <sanitizer/msan_interface.h>
int main(void) {
unsigned long long x = 0; // For 8-byte alignment.
uint32_t x_s = 0x12345678U;
__msan_partial_poison(&x, &x_s, sizeof(x_s));
__msan_print_shadow(&x, sizeof(x_s));
return 0;
}
// CHECK: Shadow map of [{{.*}}), 4 bytes:
// CHECK: 0x{{.*}}: 87654321 ........ ........ ........