Changeset 850235d in mainline for kernel/arch/amd64

Timestamp:

2013-03-10T14:56:21Z (13 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/amd64

Files:

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

kernel/arch/amd64/Makefile.inc

@@ -33 +33 @@
 
 FPU_NO_CFLAGS = -mno-sse -mno-sse2
-
-#
-# FIXME:
-#
-# The -fno-optimize-sibling-calls should be removed as soon as a bug
-# in GCC concerning the "large" memory model and tail call optimization
-# is fixed.
-#
-# When GCC generates a code for tail call, instead of generating ..
-#
-#   jmp *fnc
-#
-# it generates an assembly code with an illegal immediate prefix:
-#
-#   jmp *$fnc
-#
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48385 for reference.
-#
-
-CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer -fno-optimize-sibling-calls
+CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)
@@ -95 +76 @@
         arch/$(KARCH)/src/proc/thread.c \
         arch/$(KARCH)/src/userspace.c \
-        arch/$(KARCH)/src/syscall.c \
-        arch/$(KARCH)/src/debugger.c
+        arch/$(KARCH)/src/syscall.c
 
 ifeq ($(CONFIG_SMP),y)

kernel/arch/amd64/include/arch/istate.h

@@ -66 +66 @@
 } 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->rip & UINT64_C(0x8000000000000000));
+        return (istate->cs & RPL_USER) == RPL_USER;
 }
 

kernel/arch/amd64/src/amd64.c

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

kernel/arch/amd64/src/fpu_context.c

@@ -57 +57 @@
 {
         /* TODO: Zero all SSE, MMX etc. registers */
+        /* Default value of SCR register is 0x1f80,
+         * it masks all FPU exceptions*/
         asm volatile (
                 "fninit\n"

kernel/arch/amd64/src/mm/page.c

@@ -92 +92 @@
                 access = PF_ACCESS_READ;
         
-        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);
-                panic_memtrap(istate, access, page, NULL);
-        }
+        as_page_fault(page, access, istate);
 }