diff options
| author | Serge Rogatch <srogatch@accesssoftek.com> | 2016-12-23 21:21:01 +0000 |
|---|---|---|
| committer | Serge Rogatch <srogatch@accesssoftek.com> | 2016-12-23 21:21:01 +0000 |
| commit | 4ee228bf7326231a15746c9d5854abe11ed5e4a8 (patch) | |
| tree | 1008d68f627c29043b457d7fabd2e826f664d1ec | |
| parent | b322d1e6f0e2e771b0a5d2e7754c133307b2884f (diff) | |
| download | bcm5719-llvm-4ee228bf7326231a15746c9d5854abe11ed5e4a8.tar.gz bcm5719-llvm-4ee228bf7326231a15746c9d5854abe11ed5e4a8.zip | |
[XRay][AArch64] An attempt to fix test patching-unpatching.cc by flushing the instruction cache after code modification
Summary: This patch attempts to fix test patching-unpatching.cc . The new code flushes the instruction cache after modifying the program at runtime.
Reviewers: dberris, rengolin
Subscribers: llvm-commits, iid_iunknown, aemerson
Differential Revision: https://reviews.llvm.org/D27996
llvm-svn: 290452
| -rw-r--r-- | compiler-rt/lib/xray/xray_AArch64.cc | 7 | ||||
| -rw-r--r-- | compiler-rt/test/xray/TestCases/Linux/patching-unpatching.cc | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/compiler-rt/lib/xray/xray_AArch64.cc b/compiler-rt/lib/xray/xray_AArch64.cc index 8f24610dab2..5547ef730df 100644 --- a/compiler-rt/lib/xray/xray_AArch64.cc +++ b/compiler-rt/lib/xray/xray_AArch64.cc @@ -19,6 +19,8 @@ #include <atomic> #include <cassert> +extern void __clear_cache(void* start, void* end); + namespace __xray { uint64_t cycleFrequency() XRAY_NEVER_INSTRUMENT { @@ -75,8 +77,8 @@ inline static bool patchSled(const bool Enable, const uint32_t FuncId, // B #32 uint32_t *FirstAddress = reinterpret_cast<uint32_t *>(Sled.Address); + uint32_t *CurAddress = FirstAddress + 1; if (Enable) { - uint32_t *CurAddress = FirstAddress + 1; *CurAddress = uint32_t(PatchOpcodes::PO_LdrW0_12); CurAddress++; *CurAddress = uint32_t(PatchOpcodes::PO_LdrX16_12); @@ -88,6 +90,7 @@ inline static bool patchSled(const bool Enable, const uint32_t FuncId, *reinterpret_cast<void (**)()>(CurAddress) = TracingHook; CurAddress += 2; *CurAddress = uint32_t(PatchOpcodes::PO_LdpX0X30SP_16); + CurAddress++; std::atomic_store_explicit( reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress), uint32_t(PatchOpcodes::PO_StpX0X30SP_m16e), std::memory_order_release); @@ -96,6 +99,8 @@ inline static bool patchSled(const bool Enable, const uint32_t FuncId, reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress), uint32_t(PatchOpcodes::PO_B32), std::memory_order_release); } + __clear_cache(reinterpret_cast<char*>(FirstAddress), + reinterpret_cast<char*>(CurAddress)); return true; } diff --git a/compiler-rt/test/xray/TestCases/Linux/patching-unpatching.cc b/compiler-rt/test/xray/TestCases/Linux/patching-unpatching.cc index e684e427f06..05478a48805 100644 --- a/compiler-rt/test/xray/TestCases/Linux/patching-unpatching.cc +++ b/compiler-rt/test/xray/TestCases/Linux/patching-unpatching.cc @@ -3,7 +3,6 @@ // // RUN: %clangxx_xray -fxray-instrument -std=c++11 %s -o %t // RUN: XRAY_OPTIONS="patch_premain=false" %run %t 2>&1 | FileCheck %s -// REQUIRES: stable-runtime #include "xray/xray_interface.h" |
