Changeset 6dbe7f68 in mainline

Timestamp:

2014-08-25T22:02:52Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

df7f5cea

Parents:

9222f9b

Message:

Only one ppc32 istate_t definition to rule them all.

Location:

kernel

Files:

• arch/ppc32/include/arch/exception.h (deleted)
• arch/ppc32/include/arch/interrupt.h (modified) (1 diff)
• arch/ppc32/include/arch/istate.h (modified) (3 diffs)
• arch/ppc32/src/interrupt.c (modified) (1 diff)
• generic/include/interrupt.h (modified) (1 diff)

kernel/arch/ppc32/include/arch/interrupt.h

@@ -36 +36 @@
 #define KERN_ppc32_INTERRUPT_H_
 
-#include <arch/exception.h>
+#include <arch/istate.h>
 
 #define IVT_ITEMS  16

kernel/arch/ppc32/include/arch/istate.h

@@ -40 +40 @@
 #ifdef KERNEL
 
+#include <typedefs.h>
 #include <arch/msr.h>
 
 #else /* KERNEL */
 
+#include <sys/types.h>
 #include <libarch/msr.h>
 
@@ -81 +83 @@
         uint32_t cr;
         uint32_t pc;
-        uint32_t msr;
+        uint32_t srr1;
         uint32_t lr;
         uint32_t ctr;
@@ -98 +100 @@
 /** Return true if exception happened while in userspace
  *
+ * The contexts of MSR register was stored in SRR1.
+ *
  */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return (istate->msr & MSR_PR) != 0;
+        return (istate->srr1 & MSR_PR) != 0;
 }
 
-NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+NO_TRACE static inline sysarg_t istate_get_pc(istate_t *istate)
 {
         return istate->pc;
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+NO_TRACE static inline sysarg_t istate_get_fp(istate_t *istate)
 {
         return istate->sp;
 }
+
 
 #endif

kernel/arch/ppc32/src/interrupt.c

@@ -36 +36 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
+#include <arch/istate.h>
 #include <typedefs.h>
 #include <arch.h>

kernel/generic/include/interrupt.h

@@ -45 +45 @@
 #include <ddi/irq.h>
 #include <stacktrace.h>
+#include <arch/istate.h>
 
 typedef void (* iroutine_t)(unsigned int, istate_t *);