core: move struct thread_ctx_regs to thread.h
Moves definition of struct thread_ctx_regs from thread_private.h to
<kernel/thread.h>.
Acked-by: Pipat Methavanitpong <pipat.methavanitpong@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/core/arch/arm/include/kernel/thread.h b/core/arch/arm/include/kernel/thread.h
index 3e4c0e7..1dd6037 100644
--- a/core/arch/arm/include/kernel/thread.h
+++ b/core/arch/arm/include/kernel/thread.h
@@ -194,6 +194,40 @@
} __aligned(16);
#endif /*ARM64*/
+#ifdef ARM32
+struct thread_ctx_regs {
+ uint32_t r0;
+ uint32_t r1;
+ uint32_t r2;
+ uint32_t r3;
+ uint32_t r4;
+ uint32_t r5;
+ uint32_t r6;
+ uint32_t r7;
+ uint32_t r8;
+ uint32_t r9;
+ uint32_t r10;
+ uint32_t r11;
+ uint32_t r12;
+ uint32_t usr_sp;
+ uint32_t usr_lr;
+ uint32_t svc_spsr;
+ uint32_t svc_sp;
+ uint32_t svc_lr;
+ uint32_t pc;
+ uint32_t cpsr;
+};
+#endif /*ARM32*/
+
+#ifdef ARM64
+struct thread_ctx_regs {
+ uint64_t sp;
+ uint64_t pc;
+ uint64_t cpsr;
+ uint64_t x[31];
+};
+#endif /*ARM64*/
+
struct thread_specific_data {
TAILQ_HEAD(, tee_ta_session) sess_stack;
struct tee_ta_ctx *ctx;
diff --git a/core/arch/arm/kernel/thread_private.h b/core/arch/arm/kernel/thread_private.h
index 1e5d664..cd3f1b6 100644
--- a/core/arch/arm/kernel/thread_private.h
+++ b/core/arch/arm/kernel/thread_private.h
@@ -21,40 +21,6 @@
THREAD_STATE_ACTIVE,
};
-#ifdef ARM32
-struct thread_ctx_regs {
- uint32_t r0;
- uint32_t r1;
- uint32_t r2;
- uint32_t r3;
- uint32_t r4;
- uint32_t r5;
- uint32_t r6;
- uint32_t r7;
- uint32_t r8;
- uint32_t r9;
- uint32_t r10;
- uint32_t r11;
- uint32_t r12;
- uint32_t usr_sp;
- uint32_t usr_lr;
- uint32_t svc_spsr;
- uint32_t svc_sp;
- uint32_t svc_lr;
- uint32_t pc;
- uint32_t cpsr;
-};
-#endif /*ARM32*/
-
-#ifdef ARM64
-struct thread_ctx_regs {
- uint64_t sp;
- uint64_t pc;
- uint64_t cpsr;
- uint64_t x[31];
-};
-#endif /*ARM64*/
-
#ifdef ARM64
struct thread_user_mode_rec {
uint64_t ctx_regs_ptr;
