Changeset 7f1c620 in mainline for arch/ppc64/src/mm/page.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:

• arch/ppc64/src/mm/page.c (modified) (11 diffs)

arch/ppc64/src/mm/page.c

@@ -66 +66 @@
  *
  */
-static pte_t *find_mapping_and_check(as_t *as, bool lock, __address badvaddr, int access,
+static pte_t *find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr, int access,
                                      istate_t *istate, int *pfrc)
 {
@@ -114 +114 @@
 
 
-static void pht_refill_fail(__address badvaddr, istate_t *istate)
+static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
         char *symbol = "";
@@ -129 +129 @@
 
 
-static void pht_insert(const __address vaddr, const pfn_t pfn)
-{
-        __u32 page = (vaddr >> 12) & 0xffff;
-        __u32 api = (vaddr >> 22) & 0x3f;
-        __u32 vsid;
+static void pht_insert(const uintptr_t vaddr, const pfn_t pfn)
+{
+        uint32_t page = (vaddr >> 12) & 0xffff;
+        uint32_t api = (vaddr >> 22) & 0x3f;
+        uint32_t vsid;
         
         asm volatile (
@@ -142 +142 @@
         
         /* Primary hash (xor) */
-        __u32 h = 0;
-        __u32 hash = vsid ^ page;
-        __u32 base = (hash & 0x3ff) << 3;
-        __u32 i;
+        uint32_t h = 0;
+        uint32_t hash = vsid ^ page;
+        uint32_t base = (hash & 0x3ff) << 3;
+        uint32_t i;
         bool found = false;
         
@@ -159 +159 @@
         if (!found) {
                 /* Secondary hash (not) */
-                __u32 base2 = (~hash & 0x3ff) << 3;
+                uint32_t base2 = (~hash & 0x3ff) << 3;
                 
                 /* Find unused or colliding
@@ -197 +197 @@
 void pht_refill(bool data, istate_t *istate)
 {
-        __address badvaddr;
+        uintptr_t badvaddr;
         pte_t *pte;
         int pfrc;
@@ -253 +253 @@
 void pht_init(void)
 {
-        memsetb((__address) phte, 1 << PHT_BITS, 0);
+        memsetb((uintptr_t) phte, 1 << PHT_BITS, 0);
 }
 
@@ -262 +262 @@
                 page_mapping_operations = &pt_mapping_operations;
                 
-                __address cur;
+                uintptr_t cur;
                 int flags;
                 
@@ -277 +277 @@
                 phte_t *physical_phte = (phte_t *) frame_alloc(PHT_ORDER, FRAME_KA | FRAME_ATOMIC);
                 
-                ASSERT((__address) physical_phte % (1 << PHT_BITS) == 0);
+                ASSERT((uintptr_t) physical_phte % (1 << PHT_BITS) == 0);
                 pht_init();
                 
@@ -283 +283 @@
                         "mtsdr1 %0\n"
                         :
-                        : "r" ((__address) physical_phte)
+                        : "r" ((uintptr_t) physical_phte)
                 );
         }
@@ -289 +289 @@
 
 
-__address hw_map(__address physaddr, size_t size)
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
                 panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
         
-        __address virtaddr = PA2KA(last_frame);
+        uintptr_t virtaddr = PA2KA(last_frame);
         pfn_t i;
         for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)