Changeset 49a39c2 in mainline for arch/amd64/src/pm.c

Timestamp:

2006-02-06T21:14:29Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8a1da55

Parents:

7febdde5

Message:

Preliminary work on AMD userspace.

File:

• arch/amd64/src/pm.c (modified) (4 diffs)

arch/amd64/src/pm.c

@@ -1 +1 @@
 /*
  * Copyright (C) 2001-2004 Jakub Jermar
+ * Copyright (C) 2005-2006 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -168 +169 @@
                 d->type = AR_INTERRUPT; /* masking interrupt */
 
-                if (i == VECTOR_SYSCALL) {
-                        /*
-                         * The syscall interrupt gate must be calleable from userland.
-                         */
-                        d->dpl |= PL_USER;
-                }
-                
                 idt_setoffset(d, ((__address) interrupt_handlers) + i*interrupt_handler_size);
-                exc_register(i, "undef", null_interrupt);
+                exc_register(i, "undef", (iroutine)null_interrupt);
         }
         exc_register(13, "gp_fault", gp_fault);
@@ -183 +177 @@
 }
 
-
-/* Clean IOPL(12,13) and NT(14) flags in EFLAGS register */
-static void clean_IOPL_NT_flags(void)
-{
-        asm
-        (
-                "pushfq;"
-                "pop %%rax;"
-                "and $~(0x7000),%%rax;"
-                "pushq %%rax;"
-                "popfq;"
-                :
-                :
-                :"%rax"
-        );
-}
-
-/* Clean AM(18) flag in CR0 register */
-static void clean_AM_flag(void)
-{
-        asm
-        (
-                "mov %%cr0,%%rax;"
-                "and $~(0x40000),%%rax;"
-                "mov %%rax,%%cr0;"
-                :
-                :
-                :"%rax"
-        );
-}
-
+/** Initialize segmentation - code/data/idt tables
+ *
+ */
 void pm_init(void)
 {
@@ -255 +221 @@
          */
         __asm__("ltr %0" : : "r" ((__u16) gdtselector(TSS_DES)));
-        
-        clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels */
-        clean_AM_flag();          /* Disable alignment check */
-}
+}