summary refs log tree commit diff stats
path: root/linux-user/ppc
diff options
context:
space:
mode:
authorLaurent Vivier <laurent@vivier.eu>2018-05-29 21:42:00 +0200
committerLaurent Vivier <laurent@vivier.eu>2018-06-04 01:30:44 +0200
commit9850f9f63acb44724138a2b89b07ea4f6b3d2ba0 (patch)
tree7b93dc56fa31b54b2d910a61322aeda972148f8e /linux-user/ppc
parent995d2004b739a2a8ff60f9a0dda8c53bbdcceccf (diff)
downloadfocaccia-qemu-9850f9f63acb44724138a2b89b07ea4f6b3d2ba0.tar.gz
focaccia-qemu-9850f9f63acb44724138a2b89b07ea4f6b3d2ba0.zip
linux-user: move get_sp_from_cpustate() to target_cpu.h
Remove useless includes
Fix HPPA include guard.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20180529194207.31503-9-laurent@vivier.eu>
Diffstat (limited to 'linux-user/ppc')
-rw-r--r--linux-user/ppc/signal.c1
-rw-r--r--linux-user/ppc/target_cpu.h5
-rw-r--r--linux-user/ppc/target_signal.h7
3 files changed, 4 insertions, 9 deletions
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index cacc9afb5a..ef4c518f11 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -18,7 +18,6 @@
  */
 #include "qemu/osdep.h"
 #include "qemu.h"
-#include "target_signal.h"
 #include "signal-common.h"
 #include "linux-user/trace.h"
 
diff --git a/linux-user/ppc/target_cpu.h b/linux-user/ppc/target_cpu.h
index 3aab3d185d..c4641834e7 100644
--- a/linux-user/ppc/target_cpu.h
+++ b/linux-user/ppc/target_cpu.h
@@ -47,5 +47,8 @@ static inline uint32_t get_ppc64_abi(struct image_info *infop)
   return infop->elf_flags & EF_PPC64_ABI;
 }
 
-
+static inline abi_ulong get_sp_from_cpustate(CPUPPCState *state)
+{
+    return state->gpr[1];
+}
 #endif
diff --git a/linux-user/ppc/target_signal.h b/linux-user/ppc/target_signal.h
index e3bf1d2856..6f9e67e321 100644
--- a/linux-user/ppc/target_signal.h
+++ b/linux-user/ppc/target_signal.h
@@ -1,8 +1,6 @@
 #ifndef PPC_TARGET_SIGNAL_H
 #define PPC_TARGET_SIGNAL_H
 
-#include "cpu.h"
-
 /* this struct defines a stack used during syscall handling */
 
 typedef struct target_sigaltstack {
@@ -21,11 +19,6 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
-static inline abi_ulong get_sp_from_cpustate(CPUPPCState *state)
-{
-    return state->gpr[1];
-}
-
 #if !defined(TARGET_PPC64)
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif