瀏覽代碼

cputlb: Disable __always_inline__ without optimization

This forced inlining can result in missing symbols,
which makes a debugging build harder to follow.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Richard Henderson 6 年之前
父節點
當前提交
c6b716cdc0
共有 2 個文件被更改,包括 13 次插入2 次删除
  1. 2 2
      accel/tcg/cputlb.c
  2. 11 0
      include/qemu/compiler.h

+ 2 - 2
accel/tcg/cputlb.c

@@ -1281,7 +1281,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr,
 typedef uint64_t FullLoadHelper(CPUArchState *env, target_ulong addr,
 typedef uint64_t FullLoadHelper(CPUArchState *env, target_ulong addr,
                                 TCGMemOpIdx oi, uintptr_t retaddr);
                                 TCGMemOpIdx oi, uintptr_t retaddr);
 
 
-static inline uint64_t __attribute__((always_inline))
+static inline uint64_t QEMU_ALWAYS_INLINE
 load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
 load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
             uintptr_t retaddr, MemOp op, bool code_read,
             uintptr_t retaddr, MemOp op, bool code_read,
             FullLoadHelper *full_load)
             FullLoadHelper *full_load)
@@ -1530,7 +1530,7 @@ tcg_target_ulong helper_be_ldsl_mmu(CPUArchState *env, target_ulong addr,
  * Store Helpers
  * Store Helpers
  */
  */
 
 
-static inline void __attribute__((always_inline))
+static inline void QEMU_ALWAYS_INLINE
 store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
 store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
              TCGMemOpIdx oi, uintptr_t retaddr, MemOp op)
              TCGMemOpIdx oi, uintptr_t retaddr, MemOp op)
 {
 {

+ 11 - 0
include/qemu/compiler.h

@@ -170,6 +170,17 @@
 # define QEMU_NONSTRING
 # define QEMU_NONSTRING
 #endif
 #endif
 
 
+/*
+ * Forced inlining may be desired to encourage constant propagation
+ * of function parameters.  However, it can also make debugging harder,
+ * so disable it for a non-optimizing build.
+ */
+#if defined(__OPTIMIZE__)
+#define QEMU_ALWAYS_INLINE  __attribute__((always_inline))
+#else
+#define QEMU_ALWAYS_INLINE
+#endif
+
 /* Implement C11 _Generic via GCC builtins.  Example:
 /* Implement C11 _Generic via GCC builtins.  Example:
  *
  *
  *    QEMU_GENERIC(x, (float, sinf), (long double, sinl), sin) (x)
  *    QEMU_GENERIC(x, (float, sinf), (long double, sinl), sin) (x)