Changeset 771cd22 in mainline for kernel/arch/sparc64/src/mm/tlb.c

Timestamp:

2006-12-16T19:07:02Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7e7c8747

Parents:

1ecdbb0

Message:

Formatting and indentation changes.

File:

• kernel/arch/sparc64/src/mm/tlb.c (modified) (19 diffs)

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

@@ -58 +58 @@
 static void dtlb_pte_copy(pte_t *t, bool ro);
 static void itlb_pte_copy(pte_t *t);
-static void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, const char *str);
-static void do_fast_data_access_mmu_miss_fault(istate_t *istate, tlb_tag_access_reg_t tag, const char *str);
-static void do_fast_data_access_protection_fault(istate_t *istate, tlb_tag_access_reg_t tag, const char *str);
+static void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, const
+        char *str);
+static void do_fast_data_access_mmu_miss_fault(istate_t *istate,
+         tlb_tag_access_reg_t tag, const char *str);
+static void do_fast_data_access_protection_fault(istate_t *istate,
+        tlb_tag_access_reg_t tag, const char *str);
 
 char *context_encoding[] = {
@@ -91 +94 @@
  * @param cacheable True if the mapping is cacheable, false otherwise.
  */
-void dtlb_insert_mapping(uintptr_t page, uintptr_t frame, int pagesize, bool locked, bool cacheable)
+void dtlb_insert_mapping(uintptr_t page, uintptr_t frame, int pagesize, bool
+        locked, bool cacheable)
 {
         tlb_tag_access_reg_t tag;
@@ -125 +129 @@
  *
  * @param t Page Table Entry to be copied.
- * @param ro If true, the entry will be created read-only, regardless of its w field.
+ * @param ro If true, the entry will be created read-only, regardless of its w
+ *      field.
  */
 void dtlb_pte_copy(pte_t *t, bool ro)
@@ -213 +218 @@
         } else {
                 /*
-                 * Forward the page fault to the address space page fault handler.
+                 * Forward the page fault to the address space page fault
+                 * handler.
                  */             
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        do_fast_instruction_access_mmu_miss_fault(istate, __FUNCTION__);
+                        do_fast_instruction_access_mmu_miss_fault(istate,
+                                __FUNCTION__);
                 }
         }
@@ -224 +231 @@
 /** DTLB miss handler.
  *
- * Note that some faults (e.g. kernel faults) were already resolved
- * by the low-level, assembly language part of the fast_data_access_mmu_miss
- * handler.
+ * Note that some faults (e.g. kernel faults) were already resolved by the
+ * low-level, assembly language part of the fast_data_access_mmu_miss handler.
  */
 void fast_data_access_mmu_miss(int n, istate_t *istate)
@@ -240 +246 @@
                 if (!tag.vpn) {
                         /* NULL access in kernel */
-                        do_fast_data_access_mmu_miss_fault(istate, tag, __FUNCTION__);
-                }
-                do_fast_data_access_mmu_miss_fault(istate, tag, "Unexpected kernel page fault.");
+                        do_fast_data_access_mmu_miss_fault(istate, tag,
+                                __FUNCTION__);
+                }
+                do_fast_data_access_mmu_miss_fault(istate, tag, "Unexpected "
+                        "kernel page fault.");
         }
 
@@ -264 +272 @@
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        do_fast_data_access_mmu_miss_fault(istate, tag, __FUNCTION__);
+                        do_fast_data_access_mmu_miss_fault(istate, tag,
+                                __FUNCTION__);
                 }
         }
@@ -283 +292 @@
         if (t && PTE_WRITABLE(t)) {
                 /*
-                 * The mapping was found in the software page hash table and is writable.
-                 * Demap the old mapping and insert an updated mapping into DTLB.
+                 * The mapping was found in the software page hash table and is
+                 * writable. Demap the old mapping and insert an updated mapping
+                 * into DTLB.
                  */
                 t->a = true;
@@ -296 +306 @@
         } else {
                 /*
-                 * Forward the page fault to the address space page fault handler.
+                 * Forward the page fault to the address space page fault
+                 * handler.
                  */             
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                        do_fast_data_access_protection_fault(istate, tag, __FUNCTION__);
+                        do_fast_data_access_protection_fault(istate, tag,
+                                __FUNCTION__);
                 }
         }
@@ -317 +329 @@
                 t.value = itlb_tag_read_read(i);
                 
-                printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, ie=%d, soft2=%#x, diag=%#x, pfn=%#x, soft=%#x, l=%d, cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n",
-                        i, t.vpn, t.context, d.v, d.size, d.nfo, d.ie, d.soft2, d.diag, d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
+                printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, "
+                        "ie=%d, soft2=%#x, diag=%#x, pfn=%#x, soft=%#x, l=%d, "
+                        "cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n", i, t.vpn,
+                        t.context, d.v, d.size, d.nfo, d.ie, d.soft2, d.diag,
+                        d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
         }
 
@@ -326 +341 @@
                 t.value = dtlb_tag_read_read(i);
                 
-                printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, ie=%d, soft2=%#x, diag=%#x, pfn=%#x, soft=%#x, l=%d, cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n",
-                        i, t.vpn, t.context, d.v, d.size, d.nfo, d.ie, d.soft2, d.diag, d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
-        }
-
-}
-
-void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, const char *str)
+                printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, "
+                        "ie=%d, soft2=%#x, diag=%#x, pfn=%#x, soft=%#x, l=%d, "
+                        "cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n", i, t.vpn,
+                        t.context, d.v, d.size, d.nfo, d.ie, d.soft2, d.diag,
+                        d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
+        }
+
+}
+
+void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, const char
+        *str)
 {
         fault_if_from_uspace(istate, "%s\n", str);
@@ -339 +358 @@
 }
 
-void do_fast_data_access_mmu_miss_fault(istate_t *istate, tlb_tag_access_reg_t tag, const char *str)
+void do_fast_data_access_mmu_miss_fault(istate_t *istate, tlb_tag_access_reg_t
+        tag, const char *str)
 {
         uintptr_t va;
@@ -345 +365 @@
         va = tag.vpn << PAGE_WIDTH;
 
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va, tag.context);
+        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va,
+                tag.context);
         dump_istate(istate);
         printf("Faulting page: %p, ASID=%d\n", va, tag.context);
@@ -351 +372 @@
 }
 
-void do_fast_data_access_protection_fault(istate_t *istate, tlb_tag_access_reg_t tag, const char *str)
+void do_fast_data_access_protection_fault(istate_t *istate, tlb_tag_access_reg_t
+        tag, const char *str)
 {
         uintptr_t va;
@@ -357 +379 @@
         va = tag.vpn << PAGE_WIDTH;
 
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va, tag.context);
+        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, va,
+                tag.context);
         printf("Faulting page: %p, ASID=%d\n", va, tag.context);
         dump_istate(istate);
@@ -371 +394 @@
         sfar = dtlb_sfar_read();
         
-        printf("DTLB SFSR: asi=%#x, ft=%#x, e=%d, ct=%d, pr=%d, w=%d, ow=%d, fv=%d\n",
-                sfsr.asi, sfsr.ft, sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv);
+        printf("DTLB SFSR: asi=%#x, ft=%#x, e=%d, ct=%d, pr=%d, w=%d, ow=%d, "
+                "fv=%d\n", sfsr.asi, sfsr.ft, sfsr.e, sfsr.ct, sfsr.pr, sfsr.w,
+                sfsr.ow, sfsr.fv);
         printf("DTLB SFAR: address=%p\n", sfar);
         
@@ -407 +431 @@
 }
 
-/** Invalidate all ITLB and DTLB entries that belong to specified ASID (Context).
+/** Invalidate all ITLB and DTLB entries that belong to specified ASID
+ * (Context).
  *
  * @param asid Address Space ID.
@@ -430 +455 @@
 }
 
-/** Invalidate all ITLB and DTLB entries for specified page range in specified address space.
+/** Invalidate all ITLB and DTLB entries for specified page range in specified
+ * address space.
  *
  * @param asid Address Space ID.
@@ -449 +475 @@
         
         for (i = 0; i < cnt; i++) {
-                itlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_PRIMARY, page + i * PAGE_SIZE);
-                dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_PRIMARY, page + i * PAGE_SIZE);
+                itlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_PRIMARY, page + i *
+                        PAGE_SIZE);
+                dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_PRIMARY, page + i *
+                        PAGE_SIZE);
         }