| 54,8 → 54,8 |
|---|
| #include <arch/mm/tsb.h> |
| #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, |
| const char *); |
| 130,7 → 130,7 |
|---|
| * @param ro If true, the entry will be created read-only, regardless |
| * 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; |
| tlb_data_t data; |
| 167,7 → 167,7 |
|---|
| * @param t Page Table Entry to be copied. |
| * @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; |
| tlb_data_t data; |
| 200,7 → 200,7 |
|---|
| void fast_instruction_access_mmu_miss(unative_t unused, istate_t *istate) |
| { |
| 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; |
| |
| page_table_lock(AS, true); |
| 245,7 → 245,7 |
|---|
| { |
| uintptr_t page_8k; |
| uintptr_t page_16k; |
| index_t index; |
| size_t index; |
| pte_t *t; |
| |
| page_8k = (uint64_t) tag.vpn << MMU_PAGE_WIDTH; |
| 309,7 → 309,7 |
|---|
| void fast_data_access_protection(tlb_tag_access_reg_t tag, istate_t *istate) |
| { |
| uintptr_t page_16k; |
| index_t index; |
| size_t index; |
| pte_t *t; |
| |
| page_16k = ALIGN_DOWN((uint64_t) tag.vpn << MMU_PAGE_WIDTH, PAGE_SIZE); |
| 497,38 → 497,7 |
|---|
| dtlb_sfsr_write(0); |
| } |
| |
| #if defined (US3) |
| /** Invalidates given TLB entry if and only if it is non-locked or global. |
| * |
| * @param tlb TLB number (one of TLB_DSMALL, TLB_DBIG_0, TLB_DBIG_1, |
| * TLB_ISMALL, TLB_IBIG). |
| * @param entry Entry index within the given TLB. |
| */ |
| static void tlb_invalidate_entry(int tlb, index_t entry) |
| { |
| tlb_data_t d; |
| tlb_tag_read_reg_t t; |
| |
| if (tlb == TLB_DSMALL || tlb == TLB_DBIG_0 || tlb == TLB_DBIG_1) { |
| d.value = dtlb_data_access_read(tlb, entry); |
| if (!d.l || d.g) { |
| t.value = dtlb_tag_read_read(tlb, entry); |
| d.v = false; |
| dtlb_tag_access_write(t.value); |
| dtlb_data_access_write(tlb, entry, d.value); |
| } |
| } else if (tlb == TLB_ISMALL || tlb == TLB_IBIG) { |
| d.value = itlb_data_access_read(tlb, entry); |
| if (!d.l || d.g) { |
| t.value = itlb_tag_read_read(tlb, entry); |
| d.v = false; |
| itlb_tag_access_write(t.value); |
| itlb_data_access_write(tlb, entry, d.value); |
| } |
| } |
| } |
| #endif |
| |
| #if defined (US) |
| /** Invalidate all unlocked ITLB and DTLB entries. */ |
| void tlb_invalidate_all(void) |
| { |
| 543,7 → 512,6 |
|---|
| * be safe to invalidate them as late as now. |
| */ |
| |
| #if defined (US) |
| tlb_data_t d; |
| tlb_tag_read_reg_t t; |
| |
| 567,22 → 535,19 |
|---|
| } |
| } |
| |
| } |
| |
| #elif defined (US3) |
| |
| for (i = 0; i < tlb_ismall_size(); i++) |
| tlb_invalidate_entry(TLB_ISMALL, i); |
| for (i = 0; i < tlb_ibig_size(); i++) |
| tlb_invalidate_entry(TLB_IBIG, i); |
| for (i = 0; i < tlb_dsmall_size(); i++) |
| tlb_invalidate_entry(TLB_DSMALL, i); |
| for (i = 0; i < tlb_dbig_size(); i++) |
| tlb_invalidate_entry(TLB_DBIG_0, i); |
| for (i = 0; i < tlb_dbig_size(); i++) |
| tlb_invalidate_entry(TLB_DBIG_1, i); |
| /** Invalidate all unlocked ITLB and DTLB entries. */ |
| void tlb_invalidate_all(void) |
| { |
| itlb_demap(TLB_DEMAP_ALL, 0, 0); |
| dtlb_demap(TLB_DEMAP_ALL, 0, 0); |
| } |
| |
| #endif |
| |
| } |
| |
| /** Invalidate all ITLB and DTLB entries that belong to specified ASID |
| * (Context). |
| * |
| 614,7 → 579,7 |
|---|
| * @param page First page which to sweep out from ITLB and DTLB. |
| * @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; |
| tlb_context_reg_t pc_save, ctx; |