Changeset 98000fb in mainline for kernel/arch/mips32

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/mips32

Files:

• include/arch.h (modified) (1 diff)
• include/debugger.h (modified) (1 diff)
• include/mm/page.h (modified) (4 diffs)
• include/types.h (modified) (2 diffs)
• src/mips32.c (modified) (2 diffs)
• src/mm/frame.c (modified) (4 diffs)
• src/mm/tlb.c (modified) (1 diff)

kernel/arch/mips32/include/arch.h

@@ -43 +43 @@
 #include <typedefs.h>
 
-extern count_t cpu_count;
+extern size_t cpu_count;
 
 typedef struct {

kernel/arch/mips32/include/debugger.h

@@ -54 +54 @@
         unative_t nextinstruction;  /**< Original instruction following break */
         int flags;        /**< Flags regarding breakpoint */
-        count_t counter;
+        size_t counter;
         void (*bkfunc)(void *b, istate_t *istate);
 } bpinfo_t;

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

@@ -113 +113 @@
 /* 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) \
         PAGE_PRESENT
@@ -119 +119 @@
         PAGE_PRESENT
 #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)
 #define SET_PTL3_FLAGS_ARCH(ptl2, 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))
 
 /* Last-level info macros. */
@@ -141 +141 @@
 #include <arch/exception.h>
 
-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];
@@ -154 +154 @@
 }
 
-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/mips32/include/types.h

@@ -47 +47 @@
 
 typedef uint32_t size_t;
-typedef uint32_t count_t;
-typedef uint32_t index_t;
 
 typedef uint32_t uintptr_t;
@@ -63 +61 @@
 #define PRIp "x"        /**< Format for uintptr_t. */
 #define PRIs "u"        /**< Format for size_t. */
-#define PRIc "u"        /**< Format for count_t. */
-#define PRIi "u"        /**< Format for index_t. */
 
 #define PRId8 "d"       /**< Format for int8_t. */

kernel/arch/mips32/src/mips32.c

@@ -77 +77 @@
 uintptr_t supervisor_sp __attribute__ ((section (".text")));
 
-count_t cpu_count = 0;
+size_t cpu_count = 0;
 
 /** Performs mips32-specific initialization before main_bsp() is called. */
@@ -85 +85 @@
         init.cnt = bootinfo->cnt;
         
-        count_t i;
+        size_t i;
         for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
                 init.tasks[i].addr = bootinfo->tasks[i].addr;

kernel/arch/mips32/src/mm/frame.c

@@ -63 +63 @@
 } phys_region_t;
 
-static count_t phys_regions_count = 0;
+static size_t phys_regions_count = 0;
 static phys_region_t phys_regions[MAX_REGIONS];
 
@@ -120 +120 @@
         /* Init tasks */
         bool safe = true;
-        count_t i;
+        size_t i;
         for (i = 0; i < init.cnt; i++)
                 if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
@@ -175 +175 @@
         cp0_entry_hi_write(0);
 
-        count_t i;
+        size_t i;
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
                 cp0_index_write(i);
@@ -252 +252 @@
         printf("---------- ----------\n");
         
-        count_t i;
+        size_t i;
         for (i = 0; i < phys_regions_count; i++) {
                 printf("%#010x %10u\n",

kernel/arch/mips32/src/mm/tlb.c

@@ -561 +561 @@
  * @param cnt           Number of entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, size_t cnt)
 {
         unsigned int i;