aboutsummaryrefslogtreecommitdiff
path: root/linux-user/cris
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/cris
parent995d2004b739a2a8ff60f9a0dda8c53bbdcceccf (diff)
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/cris')
-rw-r--r--linux-user/cris/signal.c1
-rw-r--r--linux-user/cris/target_cpu.h4
-rw-r--r--linux-user/cris/target_signal.h7
3 files changed, 4 insertions, 8 deletions
diff --git a/linux-user/cris/signal.c b/linux-user/cris/signal.c
index 322d9db1a7..0b405247cf 100644
--- a/linux-user/cris/signal.c
+++ b/linux-user/cris/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/cris/target_cpu.h b/linux-user/cris/target_cpu.h
index c43aac62f9..2309343979 100644
--- a/linux-user/cris/target_cpu.h
+++ b/linux-user/cris/target_cpu.h
@@ -33,4 +33,8 @@ static inline void cpu_set_tls(CPUCRISState *env, target_ulong newtls)
env->pregs[PR_PID] = (env->pregs[PR_PID] & 0xff) | newtls;
}
+static inline abi_ulong get_sp_from_cpustate(CPUCRISState *state)
+{
+ return state->regs[14];
+}
#endif
diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h
index 74ff2f3382..bf404a85fd 100644
--- a/linux-user/cris/target_signal.h
+++ b/linux-user/cris/target_signal.h
@@ -1,8 +1,6 @@
#ifndef CRIS_TARGET_SIGNAL_H
#define CRIS_TARGET_SIGNAL_H
-#include "cpu.h"
-
/* this struct defines a stack used during syscall handling */
typedef struct target_sigaltstack {
@@ -21,10 +19,5 @@ typedef struct target_sigaltstack {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_SIGSTKSZ 8192
-static inline abi_ulong get_sp_from_cpustate(CPUCRISState *state)
-{
- return state->regs[14];
-}
-
#define TARGET_ARCH_HAS_SETUP_FRAME
#endif /* CRIS_TARGET_SIGNAL_H */