Changeset fc1e4f6 in mainline for genarch/src

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:

genarch/src

Files:

• acpi/acpi.c (modified) (2 diffs)
• mm/page_ht.c (modified) (7 diffs)
• mm/page_pt.c (modified) (4 diffs)

genarch/src/acpi/acpi.c

@@ -30 +30 @@
 #include <genarch/acpi/madt.h>
 #include <arch/bios/bios.h>
-#include <mm/asid.h>
+#include <mm/as.h>
 #include <mm/page.h>
 #include <print.h>
@@ -80 +80 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
-        page_mapping_insert((__address) sdt, ASID_KERNEL, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
+        page_mapping_insert(AS_KERNEL, (__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
         map_structure((__address) sdt, sdt->length);
 }

genarch/src/mm/page_ht.c

@@ -31 +31 @@
 #include <mm/frame.h>
 #include <mm/heap.h>
+#include <mm/as.h>
 #include <arch/mm/asid.h>
 #include <arch/types.h>
@@ -53 +54 @@
 pte_t *page_ht = NULL;
 
-static void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
-static pte_t *ht_mapping_find(__address page, asid_t asid, __address root);
+static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root);
+static pte_t *ht_mapping_find(as_t *as, __address page, __address root);
 
 page_operations_t page_ht_operations = {
@@ -68 +69 @@
  * chain.
  *
+ * @param as Address space to which page belongs. Must be locked prior the call.
  * @param page Virtual address of the page to be mapped.
- * @param asid Address space to which page belongs.
  * @param frame Physical address of memory frame to which the mapping is done.
  * @param flags Flags to be used for mapping.
  * @param root Ignored.
  */
-void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
+void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
 {
         pte_t *t, *u;
@@ -81 +82 @@
         ipl = interrupts_disable();
         spinlock_lock(&page_ht_lock);
-        
-        t = HT_HASH(page, asid);
+
+        t = HT_HASH(page, as->asid);
         if (!HT_SLOT_EMPTY(t)) {
         
@@ -92 +93 @@
                 do {
                         u = t;
-                        if (HT_COMPARE(page, asid, t)) {
+                        if (HT_COMPARE(page, as->asid, t)) {
                                 /*
                                  * Nothing to do,
@@ -110 +111 @@
         }
         
-        HT_SET_RECORD(t, page, asid, frame, flags);
+        HT_SET_RECORD(t, page, as->asid, frame, flags);
         HT_SET_NEXT(t, NULL);
         
@@ -123 +124 @@
  * Interrupts must be disabled.
  *
+ * @param as Address space to wich page belongs. Must be locked prior the call.
  * @param page Virtual page.
- * @param asid Address space to wich page belongs.
  * @param root Ignored.
  *
  * @return NULL if there is no such mapping; requested mapping otherwise.
  */
-pte_t *ht_mapping_find(__address page, asid_t asid, __address root)
+pte_t *ht_mapping_find(as_t *as, __address page, __address root)
 {
         pte_t *t;
         
         spinlock_lock(&page_ht_lock);
-        t = HT_HASH(page, asid);
+        t = HT_HASH(page, as->asid);
         if (!HT_SLOT_EMPTY(t)) {
-                while (!HT_COMPARE(page, asid, t) && HT_GET_NEXT(t))
+                while (!HT_COMPARE(page, as->asid, t) && HT_GET_NEXT(t))
                         t = HT_GET_NEXT(t);
-                t = HT_COMPARE(page, asid, t) ? t : NULL;
+                t = HT_COMPARE(page, as->asid, t) ? t : NULL;
         } else {
                 t = NULL;

genarch/src/mm/page_pt.c

@@ -31 +31 @@
 #include <mm/frame.h>
 #include <arch/mm/page.h>
-#include <arch/mm/asid.h>
+#include <arch/mm/as.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -37 +37 @@
 #include <memstr.h>
 
-static void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
-static pte_t *pt_mapping_find(__address page, asid_t asid, __address root);
+static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root);
+static pte_t *pt_mapping_find(as_t *as, __address page, __address root);
 
 page_operations_t page_pt_operations = {
@@ -50 +50 @@
  * using 'flags'.
  *
+ * @param as Ignored.
  * @param page Virtual address of the page to be mapped.
- * @param asid Ignored.
  * @param frame Physical address of memory frame to which the mapping is done.
  * @param flags Flags to be used for mapping.
  * @param root Explicit PTL0 address.
  */
-void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
+void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;
@@ -98 +98 @@
  * Find mapping for virtual page.
  *
+ * @param as Ignored.
  * @param page Virtual page.
- * @param asid Ignored.
  * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *pt_mapping_find(__address page, asid_t asid, __address root)
+pte_t *pt_mapping_find(as_t *as, __address page, __address root)
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;