diff options
| author | Renato Golin <renato.golin@linaro.org> | 2016-12-23 21:58:39 +0000 |
|---|---|---|
| committer | Renato Golin <renato.golin@linaro.org> | 2016-12-23 21:58:39 +0000 |
| commit | ece8de7c230346a4c108292ca0c01957a284068e (patch) | |
| tree | c62ab804202efda8d9723374978c4101a7fce9b7 | |
| parent | 4ee228bf7326231a15746c9d5854abe11ed5e4a8 (diff) | |
| download | bcm5719-llvm-ece8de7c230346a4c108292ca0c01957a284068e.tar.gz bcm5719-llvm-ece8de7c230346a4c108292ca0c01957a284068e.zip | |
Revert "[XRay][AArch64] An attempt to fix test patching-unpatching.cc by flushing the instruction cache after code modification"
This reverts commit r290452, not quite there yet. We need to test this
offline.
llvm-svn: 290453
| -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, 2 insertions, 6 deletions
diff --git a/compiler-rt/lib/xray/xray_AArch64.cc b/compiler-rt/lib/xray/xray_AArch64.cc index 5547ef730df..8f24610dab2 100644 --- a/compiler-rt/lib/xray/xray_AArch64.cc +++ b/compiler-rt/lib/xray/xray_AArch64.cc @@ -19,8 +19,6 @@ #include <atomic> #include <cassert> -extern void __clear_cache(void* start, void* end); - namespace __xray { uint64_t cycleFrequency() XRAY_NEVER_INSTRUMENT { @@ -77,8 +75,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); @@ -90,7 +88,6 @@ 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); @@ -99,8 +96,6 @@ 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 05478a48805..e684e427f06 100644 --- a/compiler-rt/test/xray/TestCases/Linux/patching-unpatching.cc +++ b/compiler-rt/test/xray/TestCases/Linux/patching-unpatching.cc @@ -3,6 +3,7 @@ // // 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" |
