Changeset 693f614 in mainline

Timestamp:

2008-09-14T11:18:07Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

b968f39

Parents:

ac02aaa

Message:

Merge changeset 3114 from tracing into trunk. (implementation of istate_from_uspace() for ppc32)

Location:

kernel/arch/ppc32/include

Files:

• asm/regname.h (modified) (1 diff)
• exception.h (modified) (2 diffs)
• regutils.h (added)

kernel/arch/ppc32/include/asm/regname.h

@@ -215 +215 @@
 
 /* MSR bits */
-#define msr_ir  (1 << 4)
-#define msr_dr  (1 << 5)
+#define msr_dr  (1 << 4)
+#define msr_ir  (1 << 5)
 #define msr_pr  (1 << 14)
 #define msr_ee  (1 << 15)

kernel/arch/ppc32/include/exception.h

@@ -37 +37 @@
 
 #include <arch/types.h>
+#include <arch/regutils.h>
 
 typedef struct {
@@ -85 +86 @@
 
 /** Return true if exception happened while in userspace */
-#include <panic.h>
 static inline int istate_from_uspace(istate_t *istate)
 {
-        panic("istate_from_uspace not yet implemented");
-        return 0;
+        /* true if privilege level PR (copied from MSR) == 1 */
+        return (istate->srr1 & MSR_PR) != 0;
 }