Changeset 850235d in mainline for kernel/arch/ia32

Timestamp:

2013-03-10T14:56:21Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

kernel/arch/ia32

Files:

• Makefile.inc (modified) (1 diff)
• include/arch/debugger.h (deleted)
• include/arch/istate.h (modified) (1 diff)
• src/debugger.c (deleted)
• src/fpu_context.c (modified) (3 diffs)
• src/ia32.c (modified) (2 diffs)

kernel/arch/ia32/Makefile.inc

@@ -105 +105 @@
         arch/$(KARCH)/src/boot/memmap.c \
         arch/$(KARCH)/src/fpu_context.c \
-        arch/$(KARCH)/src/debugger.c \
         arch/$(KARCH)/src/syscall.c

kernel/arch/ia32/include/arch/istate.h

@@ -68 +68 @@
 } istate_t;
 
+#define RPL_USER        3
+
 /** Return true if exception happened while in userspace */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return !(istate->eip & UINT32_C(0x80000000));
+        return (istate->cs & RPL_USER) == RPL_USER;
 }
 

kernel/arch/ia32/src/fpu_context.c

@@ -37 +37 @@
 #include <arch.h>
 #include <cpu.h>
+
+
+/** x87 FPU scr values (P3+ MMX2) */
+enum {
+        X87_FLUSH_ZERO_FLAG = (1 << 15),
+        X87_ROUND_CONTROL_MASK = (0x3 << 13),
+        x87_ROUND_TO_NEAREST_EVEN = (0x0 << 13),
+        X87_ROUND_DOWN_TO_NEG_INF = (0x1 << 13),
+        X87_ROUND_UP_TO_POS_INF = (0x2 << 13),
+        X87_ROUND_TO_ZERO = (0x3 << 13),
+        X87_PRECISION_MASK = (1 << 12),
+        X87_UNDERFLOW_MASK = (1 << 11),
+        X87_OVERFLOW_MASK = (1 << 10),
+        X87_ZERO_DIV_MASK = (1 << 9),
+        X87_DENORMAL_OP_MASK = (1 << 8),
+        X87_INVALID_OP_MASK = (1 << 7),
+        X87_DENOM_ZERO_FLAG = (1 << 6),
+        X87_PRECISION_EXC_FLAG = (1 << 5),
+        X87_UNDERFLOW_EXC_FLAG = (1 << 4),
+        X87_OVERFLOW_EXC_FLAG = (1 << 3),
+        X87_ZERO_DIV_EXC_FLAG = (1 << 2),
+        X87_DENORMAL_EXC_FLAG = (1 << 1),
+        X87_INVALID_OP_EXC_FLAG = (1 << 0),
+
+        X87_ALL_MASK = X87_PRECISION_MASK | X87_UNDERFLOW_MASK | X87_OVERFLOW_MASK | X87_ZERO_DIV_MASK | X87_DENORMAL_OP_MASK | X87_INVALID_OP_MASK,
+};
+
 
 typedef void (*fpu_context_function)(fpu_context_t *fctx);
@@ -98 +125 @@
 }
 
+/** Initialize x87 FPU. Mask all exceptions. */
 void fpu_init()
 {
@@ -111 +139 @@
                 "ldmxcsr %[help0]\n"
                 : [help0] "+m" (help0), [help1] "+r" (help1)
-                : [magic] "i" (0x1f80)
+                : [magic] "i" (X87_ALL_MASK)
         );
 }

kernel/arch/ia32/src/ia32.c

@@ -45 +45 @@
 #include <arch/bios/bios.h>
 #include <arch/boot/boot.h>
-#include <arch/debugger.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
@@ -118 +117 @@
 #endif
                 
-                /* Enable debugger */
-                debugger_init();
                 /* Merge all memory zones to 1 big zone */
                 zone_merge_all();