Changeset b07769b6 in mainline for arch/ia32/src

Timestamp:

2005-08-19T13:12:32Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f4a61ef

Parents:

6a4177a

Message:

Switch over to per vm_t page tables. (breaks ia32 userspace)

Define dummy memcopy() for amd64 and ppc to satisfy compiler.

Get rid of problematic #include <arch/mm/page.h> in mm/page.h.

Indentation fixes and small changes here and there.

Location:

arch/ia32/src

Files:

• drivers/ega.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• pm.c (modified) (4 diffs)
• proc/scheduler.c (modified) (1 diff)

arch/ia32/src/drivers/ega.c

@@ -30 +30 @@
 #include <putchar.h>
 #include <mm/page.h>
+#include <arch/mm/page.h>
 #include <synch/spinlock.h>
 #include <arch/types.h>

arch/ia32/src/mm/page.c

@@ -37 +37 @@
 #include <synch/spinlock.h>
 #include <debug.h>
-
-/*
- * Note.
- * This is the preliminary code for controlling paging mechanism on ia32. It is
- * needed by other parts of the kernel for its ability to map virtual addresses
- * to physical. SMP code relies on this feature. Other than that, this code is
- * by no means meant to implement virtual memory in terms of swapping pages in
- * and out.
- */
 
 __address bootstrap_dba; 

arch/ia32/src/pm.c

@@ -35 +35 @@
 #include <arch/context.h>
 #include <panic.h>
+#include <arch/mm/page.h>
 
 /*
@@ -132 +133 @@
 static void clean_IOPL_NT_flags(void)
 {
-  asm
+        asm
         (
-    "pushfl;"
+                "pushfl;"
                 "pop %%eax;"
                 "and $0xffff8fff,%%eax;"
@@ -148 +149 @@
 static void clean_AM_flag(void)
 {
-  asm
+        asm
         (
-    "mov %%cr0,%%eax;"
+                "mov %%cr0,%%eax;"
                 "and $0xFFFBFFFF,%%eax;"
                 "mov %%eax,%%cr0;"
@@ -158 +159 @@
         );
 }
-
-
-
-
 
 void pm_init(void)

arch/ia32/src/proc/scheduler.c

@@ -35 +35 @@
 {
         CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-8];
-        CPU->arch.tss->ss0 = selector(KDATA_DES);       
+        CPU->arch.tss->ss0 = selector(KDATA_DES);
 }