Commit 8f9db0ae authored by Florian Mayer's avatar Florian Mayer
Browse files

[hwasan] Show sp in register dump. 

Reviewed By: hctim, eugenis

Differential Revision: https://reviews.llvm.org/D104787
parent f3b55a8a

compiler-rt/lib/hwasan/hwasan_report.cpp

+4 −2
Original line number Diff line number Diff line
@@ -672,8 +672,10 @@ void ReportRegisters(uptr *frame, uptr pc) { 
       frame[20], frame[21], frame[22], frame[23]);

  Printf("    x24 %016llx  x25 %016llx  x26 %016llx  x27 %016llx\n",

       frame[24], frame[25], frame[26], frame[27]);

  Printf("    x28 %016llx  x29 %016llx  x30 %016llx\n",

       frame[28], frame[29], frame[30]);

  // hwasan_check* reduces the stack pointer by 256, then __hwasan_tag_mismatch

  // passes it to this function.

  Printf("    x28 %016llx  x29 %016llx  x30 %016llx   sp %016llx\n", frame[28],

         frame[29], frame[30], reinterpret_cast<u8 *>(frame) + 256);

}



}  // namespace __hwasan

compiler-rt/test/hwasan/TestCases/register-dump-read.c

+11 −9
Original line number Diff line number Diff line 
// RUN: %clang_hwasan -ffixed-x10 -ffixed-x23 -ffixed-x27 -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x23 -ffixed-x27 -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x23 -ffixed-x27 -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x23 -ffixed-x27 -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x11 -ffixed-x23 -ffixed-x27 -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x11 -ffixed-x23 -ffixed-x27 -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x11 -ffixed-x23 -ffixed-x27 -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x11 -ffixed-x23 -ffixed-x27 -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// REQUIRES: aarch64-target-arch



// RUN: %clang_hwasan -ffixed-x10 -ffixed-x23 -ffixed-x27 -O2 %s -o %t && not %env_hwasan_opts=fast_unwind_on_fatal=true %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x23 -ffixed-x27 -O2 %s -o %t && not %env_hwasan_opts=fast_unwind_on_fatal=false %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x11 -ffixed-x23 -ffixed-x27 -O2 %s -o %t && not %env_hwasan_opts=fast_unwind_on_fatal=true %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK

// RUN: %clang_hwasan -ffixed-x10 -ffixed-x11 -ffixed-x23 -ffixed-x27 -O2 %s -o %t && not %env_hwasan_opts=fast_unwind_on_fatal=false %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK



#include <stdlib.h>

#include <stdio.h>
@@ -16,7 +16,8 @@ int main() { 
  char * volatile x = (char*) malloc(10);

  asm volatile("mov x10, #0x2222\n"

               "mov x23, #0x3333\n"

               "mov x27, #0x4444\n");

               "mov x27, #0x4444\n"

               "mov x11, sp\n");

  return x[16];



  // CHECK: ERROR: HWAddressSanitizer:
@@ -32,12 +33,13 @@ int main() { 
  // CHECK-NEXT: x4{{[ ]+[0-9a-f]{16}[ ]}}x5{{[ ]+[0-9a-f]{16}[ ]}}x6{{[ ]+[0-9a-f]{16}[ ]}}x7{{[ ]+[0-9a-f]{16}$}}

  // CHECK-NEXT: x8{{[ ]+[0-9a-f]{16}[ ]}}x9{{[ ]+[0-9a-f]{16}[ ]}}

  // CHECK-SAME: x10 0000000000002222

  // CHECK-SAME: x11{{[ ]+[0-9a-f]{16}$}}

  // CHECK-SAME: x11[[STACK:[ ]+[0-9a-f]{16}$]]

  // CHECK-NEXT: x12{{[ ]+[0-9a-f]{16}[ ]}}x13{{[ ]+[0-9a-f]{16}[ ]}}x14{{[ ]+[0-9a-f]{16}[ ]}}x15{{[ ]+[0-9a-f]{16}$}}

  // CHECK-NEXT: x16{{[ ]+[0-9a-f]{16}[ ]}}x17{{[ ]+[0-9a-f]{16}[ ]}}x18{{[ ]+[0-9a-f]{16}[ ]}}x19{{[ ]+[0-9a-f]{16}$}}

  // CHECK-NEXT: x20{{[ ]+[0-9a-f]{16}[ ]}}x21{{[ ]+[0-9a-f]{16}[ ]}}x22{{[ ]+[0-9a-f]{16}[ ]}}

  // CHECK-SAME: x23 0000000000003333{{$}}

  // CHECK-NEXT: x24{{[ ]+[0-9a-f]{16}[ ]}}x25{{[ ]+[0-9a-f]{16}[ ]}}x26{{[ ]+[0-9a-f]{16}[ ]}}

  // CHECK-SAME: x27 0000000000004444

  // CHECK-NEXT: x28{{[ ]+[0-9a-f]{16}[ ]}}x29{{[ ]+[0-9a-f]{16}[ ]}}x30{{[ ]+[0-9a-f]{16}$}}

  // CHECK-NEXT: x28{{[ ]+[0-9a-f]{16}[ ]}}x29{{[ ]+[0-9a-f]{16}[ ]}}x30{{[ ]+[0-9a-f]{16}[ ]}}

  // CHECK-SAME: sp{{.*}}[[STACK]]

}