Changeset 7f1c620 in mainline for generic/src/mm/backend_elf.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_elf.c (modified) (10 diffs)

generic/src/mm/backend_elf.c

@@ -51 +51 @@
 #include <arch.h>
 
-static int elf_page_fault(as_area_t *area, __address addr, pf_access_t access);
-static void elf_frame_free(as_area_t *area, __address page, __address frame);
+static int elf_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access);
+static void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame);
 static void elf_share(as_area_t *area);
 
@@ -71 +71 @@
  * @return AS_PF_FAULT on failure (i.e. page fault) or AS_PF_OK on success (i.e. serviced).
  */
-int elf_page_fault(as_area_t *area, __address addr, pf_access_t access)
+int elf_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
 {
         elf_header_t *elf = area->backend_data.elf;
         elf_segment_header_t *entry = area->backend_data.segment;
         btree_node_t *leaf;
-        __address base, frame;
+        uintptr_t base, frame;
         index_t i;
 
@@ -84 +84 @@
         ASSERT((addr >= entry->p_vaddr) && (addr < entry->p_vaddr + entry->p_memsz));
         i = (addr - entry->p_vaddr) >> PAGE_WIDTH;
-        base = (__address) (((void *) elf) + entry->p_offset);
+        base = (uintptr_t) (((void *) elf) + entry->p_offset);
         ASSERT(ALIGN_UP(base, FRAME_SIZE) == base);
 
@@ -95 +95 @@
                  
                 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) {
@@ -135 +135 @@
                  */
                 if (entry->p_flags & PF_W) {
-                        frame = (__address)frame_alloc(ONE_FRAME, 0);
+                        frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
                         memcpy((void *) PA2KA(frame), (void *) (base + i*FRAME_SIZE), FRAME_SIZE);
                         
@@ -154 +154 @@
                  * and cleared.
                  */
-                frame = (__address)frame_alloc(ONE_FRAME, 0);
+                frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
 
@@ -171 +171 @@
                  */
                 size = entry->p_filesz - (i<<PAGE_WIDTH);
-                frame = (__address)frame_alloc(ONE_FRAME, 0);
+                frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame) + size, FRAME_SIZE - size, 0);
                 memcpy((void *) PA2KA(frame), (void *) (base + i*FRAME_SIZE), size);
@@ -202 +202 @@
  *
  */
-void elf_frame_free(as_area_t *area, __address page, __address frame)
+void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
         elf_header_t *elf = area->backend_data.elf;
         elf_segment_header_t *entry = area->backend_data.segment;
-        __address base;
+        uintptr_t base;
         index_t i;
         
         ASSERT((page >= entry->p_vaddr) && (page < entry->p_vaddr + entry->p_memsz));
         i = (page - entry->p_vaddr) >> PAGE_WIDTH;
-        base = (__address) (((void *) elf) + entry->p_offset);
+        base = (uintptr_t) (((void *) elf) + entry->p_offset);
         ASSERT(ALIGN_UP(base, FRAME_SIZE) == base);
         
@@ -246 +246 @@
         link_t *cur;
         btree_node_t *leaf, *node;
-        __address start_anon = entry->p_vaddr + entry->p_filesz;
+        uintptr_t start_anon = entry->p_vaddr + entry->p_filesz;
 
         /*
@@ -270 +270 @@
                 
                 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;