aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-05-29 16:03:14 +0200
committerSverker Eriksson <[email protected]>2019-06-19 17:36:36 +0200
commitdc67b706ea7091caae2d55eab45f59f1d125fa1d (patch)
treef1ffb4b0a64c91acd27c777bd76730f6522f87b1 /erts
parent6618ce7b6a621e92db72ea4f01f7d38553c8818c (diff)
downloadotp-dc67b706ea7091caae2d55eab45f59f1d125fa1d.tar.gz
otp-dc67b706ea7091caae2d55eab45f59f1d125fa1d.tar.bz2
otp-dc67b706ea7091caae2d55eab45f59f1d125fa1d.zip
erts: Call __builtin___clear_cache for hipe x86 code
Seems the right thing to do as the compiled code is not necessarily executed by a single CPU thread. Only warning if old gcc and will work as good/bad as it did before.
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/hipe/hipe_x86.h25
1 files changed, 18 insertions, 7 deletions
diff --git a/erts/emulator/hipe/hipe_x86.h b/erts/emulator/hipe/hipe_x86.h
index 8967793171..a1fe75e792 100644
--- a/erts/emulator/hipe/hipe_x86.h
+++ b/erts/emulator/hipe/hipe_x86.h
@@ -22,17 +22,28 @@
#ifndef HIPE_X86_H
#define HIPE_X86_H
-static __inline__ void hipe_flush_icache_word(void *address)
-{
- /* Do nothing. This works as long as compiled code is
- executed by a single CPU thread. */
-}
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
static __inline__ void
hipe_flush_icache_range(void *address, unsigned int nbytes)
{
- /* Do nothing. This works as long as compiled code is
- executed by a single CPU thread. */
+ void* end = (char*)address + nbytes;
+
+#if ERTS_AT_LEAST_GCC_VSN__(4, 3, 0) || __has_builtin(__builtin___clear_cache)
+ __builtin___clear_cache(address, end);
+#elif defined(__clang__)
+ void __clear_cache(void *start, void *end);
+ __clear_cache(address, end);
+#else
+# warning "Don't know how to flush instruction cache"
+#endif
+}
+
+static __inline__ void hipe_flush_icache_word(void *address)
+{
+ hipe_flush_icache_range(address, sizeof(void*));
}
/* for stack descriptor hash lookup */