Changeset f5935ed in mainline for genarch

Timestamp:

2006-02-06T15:09:58Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

021d471

Parents:

c7ec94a4

Message:

Use hash_table_get_instance instead of list_get_instance.
Rename page_operations to page_mapping_operations.
Rename page_pt_operations to pt_mapping_operations.
Rename page_ht_operations to ht_mapping_operations.

Location:

genarch

Files:

• include/mm/page_ht.h (modified) (1 diff)
• include/mm/page_pt.h (modified) (1 diff)
• src/mm/page_ht.c (modified) (4 diffs)
• src/mm/page_pt.c (modified) (1 diff)

genarch/include/mm/page_ht.h

@@ -58 +58 @@
 };
 
-extern page_operations_t page_ht_operations;
+extern page_mapping_operations_t ht_mapping_operations;
 extern spinlock_t page_ht_lock;
-
 extern hash_table_t page_ht;
 extern hash_table_operations_t ht_operations;

genarch/include/mm/page_pt.h

@@ -85 +85 @@
 #define SET_FRAME_FLAGS(ptl3, i, x)     SET_FRAME_FLAGS_ARCH(ptl3, i, x)
 
-extern page_operations_t page_pt_operations;
+extern page_mapping_operations_t pt_mapping_operations;
 
 extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags);

genarch/src/mm/page_ht.c

@@ -68 +68 @@
 };
 
-page_operations_t page_ht_operations = {
+/** Page mapping operations for page hash table architectures. */
+page_mapping_operations_t ht_mapping_operations = {
         .mapping_insert = ht_mapping_insert,
         .mapping_find = ht_mapping_find
@@ -120 +121 @@
          * Convert item to PTE.
          */
-        t = list_get_instance(item, pte_t, link);
+        t = hash_table_get_instance(item, pte_t, link);
 
         if (keys == PAGE_HT_KEYS) {
@@ -142 +143 @@
          * Convert item to PTE.
          */
-        t = list_get_instance(item, pte_t, link);
+        t = hash_table_get_instance(item, pte_t, link);
 
         free(t);
@@ -200 +201 @@
         hlp = hash_table_find(&page_ht, key);
         if (hlp)
-                t = list_get_instance(hlp, pte_t, link);
+                t = hash_table_get_instance(hlp, pte_t, link);
 
         spinlock_unlock(&page_ht_lock);

genarch/src/mm/page_pt.c

@@ -41 +41 @@
 static pte_t *pt_mapping_find(as_t *as, __address page);
 
-page_operations_t page_pt_operations = {
+page_mapping_operations_t pt_mapping_operations = {
         .mapping_insert = pt_mapping_insert,
         .mapping_find = pt_mapping_find