Changeset fc1e4f6 in mainline for arch

Timestamp:

2006-01-31T00:44:08Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef67bab

Parents:

6a3c9a7

Message:

Change page_mapping_find/insert interfaces to take as_t * as first argument
and not asid_t as second argument. This change was necessitated by the
removal of mapping array from as_area_t and the fact that an address
space doesn't have an ASID when it is created.

Location:

arch

Files:

• amd64/src/mm/page.c (modified) (2 diffs)
• ia32/src/drivers/ega.c (modified) (2 diffs)
• ia32/src/mm/page.c (modified) (2 diffs)
• ia32/src/smp/smp.c (modified) (2 diffs)
• mips32/src/mm/tlb.c (modified) (2 diffs)

arch/amd64/src/mm/page.c

@@ -32 +32 @@
 #include <mm/page.h>
 #include <mm/frame.h>
-#include <mm/asid.h>
+#include <mm/as.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>
@@ -58 +58 @@
                  */
                 for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
-                        page_mapping_insert(PA2KA(cur), ASID_KERNEL, cur, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
+                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
                 }
 

arch/ia32/src/drivers/ega.c

@@ -30 +30 @@
 #include <putchar.h>
 #include <mm/page.h>
-#include <mm/asid.h>
+#include <mm/as.h>
 #include <arch/mm/page.h>
 #include <synch/spinlock.h>
@@ -60 +60 @@
         __u8 hi, lo;
 
-        page_mapping_insert(PA2KA(VIDEORAM), ASID_KERNEL, VIDEORAM, PAGE_NOT_CACHEABLE, 0);
+        page_mapping_insert(AS_KERNEL, PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0);
         outb(0x3d4,0xe);
         hi = inb(0x3d5);

arch/ia32/src/mm/page.c

@@ -32 +32 @@
 #include <mm/frame.h>
 #include <mm/page.h>
-#include <mm/asid.h>
+#include <mm/as.h>
 #include <arch/types.h>
 #include <config.h>
@@ -62 +62 @@
                  */
                 for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
-                        page_mapping_insert(PA2KA(cur), ASID_KERNEL, cur, PAGE_CACHEABLE, KA2PA(dba));
+                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_CACHEABLE, KA2PA(dba));
 
                 exc_register(14, "page_fault", page_fault);

arch/ia32/src/smp/smp.c

@@ -45 +45 @@
 #include <mm/page.h>
 #include <mm/heap.h>
-#include <mm/asid.h>
+#include <mm/as.h>
 #include <print.h>
 #include <memstr.h>
@@ -66 +66 @@
 
         if (config.cpu_count > 1) {             
-                page_mapping_insert((__address)l_apic, ASID_KERNEL, (__address)l_apic, 
+                page_mapping_insert(AS_KERNEL, (__address) l_apic, (__address) l_apic, 
                                   PAGE_NOT_CACHEABLE, 0);
-                page_mapping_insert((__address) io_apic, ASID_KERNEL,
-                                  (__address) io_apic,
+                page_mapping_insert(AS_KERNEL, (__address) io_apic, (__address) io_apic,
                                   PAGE_NOT_CACHEABLE, 0);
         }

arch/mips32/src/mm/tlb.c

@@ -340 +340 @@
          * Check if the mapping exists in page tables.
          */     
-        pte = page_mapping_find(badvaddr, AS->asid, 0);
+        pte = page_mapping_find(AS, badvaddr, 0);
         if (pte && pte->lo.v) {
                 /*
@@ -357 +357 @@
                          * The mapping ought to be in place.
                          */
-                        pte = page_mapping_find(badvaddr, AS->asid, 0);
+                        pte = page_mapping_find(AS, badvaddr, 0);
                         ASSERT(pte && pte->lo.v);
                         return pte;