Changeset 98000fb in mainline for kernel/arch/sparc64/src

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/sparc64/src

Files:

• drivers/fhc.c (modified) (1 diff)
• drivers/pci.c (modified) (2 diffs)
• mm/as.c (modified) (2 diffs)
• mm/tlb.c (modified) (7 diffs)
• mm/tsb.c (modified) (4 diffs)
• smp/smp.c (modified) (1 diff)

kernel/arch/sparc64/src/drivers/fhc.c

@@ -72 +72 @@
                 return NULL;
                 
-        count_t regs = prop->size / sizeof(ofw_central_reg_t);
+        size_t regs = prop->size / sizeof(ofw_central_reg_t);
         if (regs + 1 < UART_IMAP_REG)
                 return NULL;

kernel/arch/sparc64/src/drivers/pci.c

@@ -92 +92 @@
 
         ofw_upa_reg_t *reg = prop->value;
-        count_t regs = prop->size / sizeof(ofw_upa_reg_t);
+        size_t regs = prop->size / sizeof(ofw_upa_reg_t);
 
         if (regs < SABRE_INTERNAL_REG + 1)
@@ -139 +139 @@
 
         ofw_upa_reg_t *reg = prop->value;
-        count_t regs = prop->size / sizeof(ofw_upa_reg_t);
+        size_t regs = prop->size / sizeof(ofw_upa_reg_t);
 
         if (regs < PSYCHO_INTERNAL_REG + 1)

kernel/arch/sparc64/src/mm/as.c

@@ -90 +90 @@
          * size.
          */
-        count_t cnt = ((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
+        size_t cnt = ((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
             sizeof(tsb_entry_t)) >> FRAME_WIDTH;
         frame_free(KA2PA((uintptr_t) as->arch.itsb));
@@ -102 +102 @@
 {
 #ifdef CONFIG_TSB
-        tsb_invalidate(as, 0, (count_t) -1);
+        tsb_invalidate(as, 0, (size_t) -1);
 #endif
         return 0;

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

@@ -55 +55 @@
 #endif
 
-static void dtlb_pte_copy(pte_t *, index_t, bool);
-static void itlb_pte_copy(pte_t *, index_t);
+static void dtlb_pte_copy(pte_t *, size_t, bool);
+static void itlb_pte_copy(pte_t *, size_t);
 static void do_fast_instruction_access_mmu_miss_fault(istate_t *, const char *);
 static void do_fast_data_access_mmu_miss_fault(istate_t *, tlb_tag_access_reg_t,
@@ -131 +131 @@
  *                      of its w field.
  */
-void dtlb_pte_copy(pte_t *t, index_t index, bool ro)
+void dtlb_pte_copy(pte_t *t, size_t index, bool ro)
 {
         tlb_tag_access_reg_t tag;
@@ -168 +168 @@
  * @param index         Zero if lower 8K-subpage, one if higher 8K-subpage.
  */
-void itlb_pte_copy(pte_t *t, index_t index)
+void itlb_pte_copy(pte_t *t, size_t index)
 {
         tlb_tag_access_reg_t tag;
@@ -201 +201 @@
 {
         uintptr_t page_16k = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
-        index_t index = (istate->tpc >> MMU_PAGE_WIDTH) % MMU_PAGES_PER_PAGE;
+        size_t index = (istate->tpc >> MMU_PAGE_WIDTH) % MMU_PAGES_PER_PAGE;
         pte_t *t;
 
@@ -246 +246 @@
         uintptr_t page_8k;
         uintptr_t page_16k;
-        index_t index;
+        size_t index;
         pte_t *t;
 
@@ -310 +310 @@
 {
         uintptr_t page_16k;
-        index_t index;
+        size_t index;
         pte_t *t;
 
@@ -580 +580 @@
  * @param cnt           Number of ITLB and DTLB 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;

kernel/arch/sparc64/src/mm/tsb.c

@@ -51 +51 @@
  * @param as Address space.
  * @param page First page to invalidate in TSB.
- * @param pages Number of pages to invalidate. Value of (count_t) -1 means the
+ * @param pages Number of pages to invalidate. Value of (size_t) -1 means the
  *      whole TSB.
  */
-void tsb_invalidate(as_t *as, uintptr_t page, count_t pages)
+void tsb_invalidate(as_t *as, uintptr_t page, size_t pages)
 {
-        index_t i0, i;
-        count_t cnt;
+        size_t i0;
+        size_t i;
+        size_t cnt;
         
         ASSERT(as->arch.itsb && as->arch.dtsb);
@@ -64 +65 @@
         ASSERT(i0 < ITSB_ENTRY_COUNT && i0 < DTSB_ENTRY_COUNT);
 
-        if (pages == (count_t) -1 || (pages * 2) > ITSB_ENTRY_COUNT)
+        if (pages == (size_t) -1 || (pages * 2) > ITSB_ENTRY_COUNT)
                 cnt = ITSB_ENTRY_COUNT;
         else
@@ -82 +83 @@
  * @param index Zero if lower 8K-subpage, one if higher 8K subpage.
  */
-void itsb_pte_copy(pte_t *t, index_t index)
+void itsb_pte_copy(pte_t *t, size_t index)
 {
         as_t *as;
         tsb_entry_t *tsb;
-        index_t entry;
+        size_t entry;
 
         ASSERT(index <= 1);
@@ -128 +129 @@
  * @param ro    If true, the mapping is copied read-only.
  */
-void dtsb_pte_copy(pte_t *t, index_t index, bool ro)
+void dtsb_pte_copy(pte_t *t, size_t index, bool ro)
 {
         as_t *as;
         tsb_entry_t *tsb;
-        index_t entry;
+        size_t entry;
         
         ASSERT(index <= 1);

kernel/arch/sparc64/src/smp/smp.c

@@ -62 +62 @@
 {
         ofw_tree_node_t *node;
-        count_t cnt = 0;
+        size_t cnt = 0;
         
         if (is_us() || is_us_iii()) {