Changeset 7f1c620 in mainline for genarch/src/mm/page_ht.c

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• genarch/src/mm/page_ht.c (modified) (8 diffs)

genarch/src/mm/page_ht.c

@@ -53 +53 @@
 #include <align.h>
 
-static index_t hash(__native key[]);
-static bool compare(__native key[], count_t keys, link_t *item);
+static index_t hash(unative_t key[]);
+static bool compare(unative_t key[], count_t keys, link_t *item);
 static void remove_callback(link_t *item);
 
-static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags);
-static void ht_mapping_remove(as_t *as, __address page);
-static pte_t *ht_mapping_find(as_t *as, __address page);
+static void ht_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags);
+static void ht_mapping_remove(as_t *as, uintptr_t page);
+static pte_t *ht_mapping_find(as_t *as, uintptr_t page);
 
 /**
@@ -94 +94 @@
  * @return Index into page hash table.
  */
-index_t hash(__native key[])
+index_t hash(unative_t key[])
 {
         as_t *as = (as_t *) key[KEY_AS];
-        __address page = (__address) key[KEY_PAGE];
+        uintptr_t page = (uintptr_t) key[KEY_PAGE];
         index_t index;
         
@@ -112 +112 @@
          * hash index.
          */
-        index |= ((__native) as) & (PAGE_HT_ENTRIES-1);
+        index |= ((unative_t) as) & (PAGE_HT_ENTRIES-1);
         
         return index;
@@ -125 +125 @@
  * @return true on match, false otherwise.
  */
-bool compare(__native key[], count_t keys, link_t *item)
+bool compare(unative_t key[], count_t keys, link_t *item)
 {
         pte_t *t;
@@ -138 +138 @@
 
         if (keys == PAGE_HT_KEYS) {
-                return (key[KEY_AS] == (__address) t->as) && (key[KEY_PAGE] == t->page);
+                return (key[KEY_AS] == (uintptr_t) t->as) && (key[KEY_PAGE] == t->page);
         } else {
-                return (key[KEY_AS] == (__address) t->as);
+                return (key[KEY_AS] == (uintptr_t) t->as);
         }
 }
@@ -174 +174 @@
  * @param flags Flags to be used for mapping.
  */
-void ht_mapping_insert(as_t *as, __address page, __address frame, int flags)
+void ht_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags)
 {
         pte_t *t;
-        __native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
+        unative_t key[2] = { (uintptr_t) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
         
         if (!hash_table_find(&page_ht, key)) {
@@ -209 +209 @@
  * @param page Virtual address of the page to be demapped.
  */
-void ht_mapping_remove(as_t *as, __address page)
-{
-        __native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
+void ht_mapping_remove(as_t *as, uintptr_t page)
+{
+        unative_t key[2] = { (uintptr_t) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
         
         /*
@@ -232 +232 @@
  * @return NULL if there is no such mapping; requested mapping otherwise.
  */
-pte_t *ht_mapping_find(as_t *as, __address page)
+pte_t *ht_mapping_find(as_t *as, uintptr_t page)
 {
         link_t *hlp;
         pte_t *t = NULL;
-        __native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
+        unative_t key[2] = { (uintptr_t) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
         
         hlp = hash_table_find(&page_ht, key);