Changeset 7f1c620 in mainline for generic/src/mm/backend_anon.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:

• generic/src/mm/backend_anon.c (modified) (7 diffs)

generic/src/mm/backend_anon.c

@@ -52 +52 @@
 #include <arch.h>
 
-static int anon_page_fault(as_area_t *area, __address addr, pf_access_t access);
-static void anon_frame_free(as_area_t *area, __address page, __address frame);
+static int anon_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access);
+static void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame);
 static void anon_share(as_area_t *area);
 
@@ -72 +72 @@
  * @return AS_PF_FAULT on failure (i.e. page fault) or AS_PF_OK on success (i.e. serviced).
  */
-int anon_page_fault(as_area_t *area, __address addr, pf_access_t access)
+int anon_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
 {
-        __address frame;
+        uintptr_t frame;
 
         if (!as_area_check_access(area, access))
@@ -89 +89 @@
                  */
                 mutex_lock(&area->sh_info->lock);
-                frame = (__address) btree_search(&area->sh_info->pagemap,
+                frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
                         ALIGN_DOWN(addr, PAGE_SIZE) - area->base, &leaf);
                 if (!frame) {
@@ -106 +106 @@
                         }
                         if (allocate) {
-                                frame = (__address) frame_alloc(ONE_FRAME, 0);
+                                frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
                                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
                                 
@@ -133 +133 @@
                  *   the different causes
                  */
-                frame = (__address)frame_alloc(ONE_FRAME, 0);
+                frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
         }
@@ -157 +157 @@
  * @param frame Frame to be released.
  */
-void anon_frame_free(as_area_t *area, __address page, __address frame)
+void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
         frame_free(frame);
@@ -185 +185 @@
                 node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
-                        __address base = node->key[i];
+                        uintptr_t base = node->key[i];
                         count_t count = (count_t) node->value[i];
                         int j;