Changeset dc0b964 in mainline for kernel/arch/amd64/include/mm

Timestamp:

2010-11-24T14:23:14Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

85369b1, b89e1d3

Parents:

8b3bff5

Message:

• do not hardwire PRI??? formatting macros in the sources, use autotool to detect the correct values
• use autotool to detect correct values for integer literal macros (UINT32_C, etc.)
• start using portable UINT??_C style macros for integer constants

Location:

kernel/arch/amd64/include/mm

Files:

• as.h (modified) (1 diff)
• page.h (modified) (3 diffs)

kernel/arch/amd64/include/mm/as.h

@@ -36 +36 @@
 #define KERN_amd64_AS_H_
 
-#define ADDRESS_SPACE_HOLE_START        0x0000800000000000ULL
-#define ADDRESS_SPACE_HOLE_END          0xffff7fffffffffffULL
+#define ADDRESS_SPACE_HOLE_START  UINT64_C(0x0000800000000000)
+#define ADDRESS_SPACE_HOLE_END    UINT64_C(0xffff7fffffffffff)
 
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH 0xffff800000000000ULL
-#define KERNEL_ADDRESS_SPACE_END_ARCH   0xffffffffffffffffULL
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT64_C(0xffff800000000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT64_C(0xffffffffffffffff)
 
-#define USER_ADDRESS_SPACE_START_ARCH   0x0000000000000000ULL
-#define USER_ADDRESS_SPACE_END_ARCH     0x00007fffffffffffULL
+#define USER_ADDRESS_SPACE_START_ARCH  UINT64_C(0x0000000000000000)
+#define USER_ADDRESS_SPACE_END_ARCH    UINT64_C(0x00007fffffffffff)
 
 #define USTACK_ADDRESS_ARCH  (USER_ADDRESS_SPACE_END_ARCH - (PAGE_SIZE - 1))

kernel/arch/amd64/include/mm/page.h

@@ -55 +55 @@
 #ifndef __ASM__
 
-#define KA2PA(x)  (((uintptr_t) (x)) - 0xffff800000000000)
-#define PA2KA(x)  (((uintptr_t) (x)) + 0xffff800000000000)
+#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
+#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
 
 #else /* __ASM__ */
@@ -78 +78 @@
 
 /* Macros calculating indices into page tables in each level. */
-#define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 39) & 0x1ff)
-#define PTL1_INDEX_ARCH(vaddr)  (((vaddr) >> 30) & 0x1ff)
-#define PTL2_INDEX_ARCH(vaddr)  (((vaddr) >> 21) & 0x1ff)
-#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x1ff)
+#define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 39) & 0x1ffU)
+#define PTL1_INDEX_ARCH(vaddr)  (((vaddr) >> 30) & 0x1ffU)
+#define PTL2_INDEX_ARCH(vaddr)  (((vaddr) >> 21) & 0x1ffU)
+#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x1ffU)
 
 /* Get PTE address accessors for each level. */
@@ -205 +205 @@
         pte_t *p = &pt[i];
         
-        p->addr_12_31 = (a >> 12) & 0xfffff;
+        p->addr_12_31 = (a >> 12) & UINT32_C(0xfffff);
         p->addr_32_51 = a >> 32;
 }