From fb4012fbd180d167447370b568750fcdab61bfd1 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Tue, 9 Jul 2024 13:30:04 +0200
Subject: [PATCH] moves likely annotation

---
 src/iss/arch/riscv_hart_common.h | 8 ++++++++
 src/iss/arch/riscv_hart_m_p.h    | 8 --------
 src/iss/arch/riscv_hart_msu_vp.h | 8 --------
 src/iss/arch/riscv_hart_mu_p.h   | 8 --------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/iss/arch/riscv_hart_common.h b/src/iss/arch/riscv_hart_common.h
index 829fbb1..f3b1596 100644
--- a/src/iss/arch/riscv_hart_common.h
+++ b/src/iss/arch/riscv_hart_common.h
@@ -44,6 +44,14 @@
 #include <unordered_map>
 #include <util/logging.h>
 
+#if defined(__GNUC__)
+#define likely(x) ::__builtin_expect(!!(x), 1)
+#define unlikely(x) ::__builtin_expect(!!(x), 0)
+#else
+#define likely(x) x
+#define unlikely(x) x
+#endif
+
 namespace iss {
 namespace arch {
 
diff --git a/src/iss/arch/riscv_hart_m_p.h b/src/iss/arch/riscv_hart_m_p.h
index ca6e73e..b032c46 100644
--- a/src/iss/arch/riscv_hart_m_p.h
+++ b/src/iss/arch/riscv_hart_m_p.h
@@ -58,14 +58,6 @@
 
 #include <iss/semihosting/semihosting.h>
 
-#if defined(__GNUC__)
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-#else
-#define likely(x) x
-#define unlikely(x) x
-#endif
-
 namespace iss {
 namespace arch {
 
diff --git a/src/iss/arch/riscv_hart_msu_vp.h b/src/iss/arch/riscv_hart_msu_vp.h
index c9f4318..12da37e 100644
--- a/src/iss/arch/riscv_hart_msu_vp.h
+++ b/src/iss/arch/riscv_hart_msu_vp.h
@@ -57,14 +57,6 @@
 
 #include <iss/semihosting/semihosting.h>
 
-#if defined(__GNUC__)
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-#else
-#define likely(x) x
-#define unlikely(x) x
-#endif
-
 namespace iss {
 namespace arch {
 
diff --git a/src/iss/arch/riscv_hart_mu_p.h b/src/iss/arch/riscv_hart_mu_p.h
index cba22b6..e6a10a9 100644
--- a/src/iss/arch/riscv_hart_mu_p.h
+++ b/src/iss/arch/riscv_hart_mu_p.h
@@ -57,14 +57,6 @@
 
 #include <iss/semihosting/semihosting.h>
 
-#if defined(__GNUC__)
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-#else
-#define likely(x) x
-#define unlikely(x) x
-#endif
-
 namespace iss {
 namespace arch {