Changeset 98000fb in mainline for kernel/arch/amd64

Timestamp:

2009-06-03T19:34:45Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

Location:

kernel/arch/amd64

Files:

• include/cpu.h (modified) (1 diff)
• include/mm/page.h (modified) (4 diffs)
• include/proc/task.h (modified) (1 diff)
• include/types.h (modified) (2 diffs)
• src/ddi/ddi.c (modified) (3 diffs)
• src/interrupt.c (modified) (1 diff)

kernel/arch/amd64/include/cpu.h

@@ -65 +65 @@
         tss_t *tss;
         
-        count_t iomapver_copy;  /** Copy of TASK's I/O Permission bitmap generation count. */
+        size_t iomapver_copy;  /** Copy of TASK's I/O Permission bitmap generation count. */
 } cpu_arch_t;
 

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

@@ -113 +113 @@
         (write_cr3((uintptr_t) (ptl0)))
 #define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) \
-        set_pt_addr((pte_t *) (ptl0), (index_t) (i), a)
+        set_pt_addr((pte_t *) (ptl0), (size_t) (i), a)
 #define SET_PTL2_ADDRESS_ARCH(ptl1, i, a) \
-        set_pt_addr((pte_t *) (ptl1), (index_t) (i), a)
+        set_pt_addr((pte_t *) (ptl1), (size_t) (i), a)
 #define SET_PTL3_ADDRESS_ARCH(ptl2, i, a) \
-        set_pt_addr((pte_t *) (ptl2), (index_t) (i), a)
+        set_pt_addr((pte_t *) (ptl2), (size_t) (i), a)
 #define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) \
-        set_pt_addr((pte_t *) (ptl3), (index_t) (i), a)
+        set_pt_addr((pte_t *) (ptl3), (size_t) (i), a)
 
 /* Get PTE flags accessors for each level. */
 #define GET_PTL1_FLAGS_ARCH(ptl0, i) \
-        get_pt_flags((pte_t *) (ptl0), (index_t) (i))
+        get_pt_flags((pte_t *) (ptl0), (size_t) (i))
 #define GET_PTL2_FLAGS_ARCH(ptl1, i) \
-        get_pt_flags((pte_t *) (ptl1), (index_t) (i))
+        get_pt_flags((pte_t *) (ptl1), (size_t) (i))
 #define GET_PTL3_FLAGS_ARCH(ptl2, i) \
-        get_pt_flags((pte_t *) (ptl2), (index_t) (i))
+        get_pt_flags((pte_t *) (ptl2), (size_t) (i))
 #define GET_FRAME_FLAGS_ARCH(ptl3, i) \
-        get_pt_flags((pte_t *) (ptl3), (index_t) (i))
+        get_pt_flags((pte_t *) (ptl3), (size_t) (i))
 
 /* Set PTE flags accessors for each level. */
 #define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
-        set_pt_flags((pte_t *) (ptl0), (index_t) (i), (x))
+        set_pt_flags((pte_t *) (ptl0), (size_t) (i), (x))
 #define SET_PTL2_FLAGS_ARCH(ptl1, i, x) \
-        set_pt_flags((pte_t *) (ptl1), (index_t) (i), (x))
+        set_pt_flags((pte_t *) (ptl1), (size_t) (i), (x))
 #define SET_PTL3_FLAGS_ARCH(ptl2, i, x) \
-        set_pt_flags((pte_t *) (ptl2), (index_t) (i), (x))
+        set_pt_flags((pte_t *) (ptl2), (size_t) (i), (x))
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
-        set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
+        set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
 /* Macros for querying the last-level PTE entries. */
@@ -177 +177 @@
 #define PFERR_CODE_ID           (1 << 4)
 
-static inline int get_pt_flags(pte_t *pt, index_t i)
+static inline int get_pt_flags(pte_t *pt, size_t i)
 {
         pte_t *p = &pt[i];
@@ -190 +190 @@
 }
 
-static inline void set_pt_addr(pte_t *pt, index_t i, uintptr_t a)
+static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a)
 {
         pte_t *p = &pt[i];
@@ -198 +198 @@
 }
 
-static inline void set_pt_flags(pte_t *pt, index_t i, int flags)
+static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
         pte_t *p = &pt[i];

kernel/arch/amd64/include/proc/task.h

@@ -41 +41 @@
 typedef struct {
         /** I/O Permission bitmap Generation counter. */
-        count_t iomapver;
+        size_t iomapver;
         /** I/O Permission bitmap. */
         bitmap_t iomap;

kernel/arch/amd64/include/types.h

@@ -47 +47 @@
 
 typedef uint64_t size_t;
-typedef uint64_t count_t;
-typedef uint64_t index_t;
 
 typedef uint64_t uintptr_t;
@@ -61 +59 @@
 } fncptr_t;
 
-/**< Formats for uintptr_t, size_t, count_t and index_t */
+/**< Formats for uintptr_t, size_t */
 #define PRIp "llx"
 #define PRIs "llu"
-#define PRIc "llu"
-#define PRIi "llu"
 
 /**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */

kernel/arch/amd64/src/ddi/ddi.c

@@ -57 +57 @@
 int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
-        count_t bits;
+        size_t bits;
         
         bits = ioaddr + size;
@@ -99 +99 @@
          * Enable the range and we are done.
          */
-        bitmap_clear_range(&task->arch.iomap, (index_t) ioaddr, (count_t) size);
+        bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, (size_t) size);
         
         /*
@@ -118 +118 @@
 void io_perm_bitmap_install(void)
 {
-        count_t bits;
+        size_t bits;
         ptr_16_64_t cpugdtr;
         descriptor_t *gdt_p;
         tss_descriptor_t *tss_desc;
-        count_t ver;
+        size_t ver;
         
         /* First, copy the I/O Permission Bitmap. */

kernel/arch/amd64/src/interrupt.c

@@ -102 +102 @@
 {
         if (TASK) {
-                count_t ver;
+                size_t ver;
 
                 spinlock_lock(&TASK->lock);