Remove unused TLB routines.

diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index d383107..8320295 100644 (file)
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cpu.h,v 1.136 2021/07/24 08:21:13 visa Exp $  */
+/*     $OpenBSD: cpu.h,v 1.137 2021/10/07 13:08:17 visa Exp $  */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -407,12 +407,10 @@ void      tlb_asid_wrap(struct cpu_info *);
 void   tlb_flush(int);
 void   tlb_flush_addr(vaddr_t);
 void   tlb_init(unsigned int);
-int64_t        tlb_probe(vaddr_t);
 void   tlb_set_page_mask(uint32_t);
 void   tlb_set_pid(u_int);
 void   tlb_set_wired(uint32_t);
 int    tlb_update(vaddr_t, register_t);
-void   tlb_update_indexed(vaddr_t, register_t, register_t, uint);
 
 void   build_trampoline(vaddr_t, vaddr_t);
 void   cpu_switchto_asm(struct proc *, struct proc *);

diff --git a/sys/arch/mips64/mips64/tlbhandler.S b/sys/arch/mips64/mips64/tlbhandler.S
index ae974d2..ceca1a2 100644 (file)
--- a/sys/arch/mips64/mips64/tlbhandler.S
+++ b/sys/arch/mips64/mips64/tlbhandler.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tlbhandler.S,v 1.52 2021/05/05 15:29:19 visa Exp $ */
+/*     $OpenBSD: tlbhandler.S,v 1.53 2021/10/07 13:08:17 visa Exp $ */
 
 /*
  * Copyright (c) 1995-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -490,65 +490,6 @@ LEAF(tlb_update, 0)
        li      v0, 0
 END(tlb_update)
 
-/*
- * int64_t tlb_probe(vaddr_t a0);
- * Probe for a TLB entry covering the given address, and return its index
- * (< 0 if no match)
- */
-LEAF(tlb_probe, 0)
-       mfc0    v1, COP_0_STATUS_REG    # Save the status register.
-       ori     v0, v1, SR_INT_ENAB
-       xori    v0, v0, SR_INT_ENAB
-       mtc0    v0, COP_0_STATUS_REG    # Disable interrupts
-       MTC0_SR_IE_HAZARD
-       dli     v0, (PG_HVPN | PG_ASID_MASK)
-       and     a0, a0, v0
-       dmfc0   ta0, COP_0_TLB_HI       # Save current PID
-       dmtc0   a0, COP_0_TLB_HI        # Init high reg
-       TLB_HAZARD
-       tlbp                            # Probe for the entry.
-       TLB_HAZARD                      # necessary?
-       mfc0    v0, COP_0_TLB_INDEX     # Return index
-       dmtc0   ta0, COP_0_TLB_HI       # restore PID
-       mtc0    v1, COP_0_STATUS_REG    # Restore the status register
-       MTC0_SR_IE_HAZARD
-       j       ra
-       nop
-END(tlb_probe)
-
-/*
- * void tlb_update_indexed(vaddr_t a0, register_t a1, register_t a2, uint a3);
- * Update a TLB entry pair.
- */
-LEAF(tlb_update_indexed, 0)
-       mfc0    v1, COP_0_STATUS_REG    # Save the status register.
-       ori     v0, v1, SR_INT_ENAB
-       xori    v0, v0, SR_INT_ENAB
-       mtc0    v0, COP_0_STATUS_REG    # Disable interrupts
-       MTC0_SR_IE_HAZARD
-       dmfc0   ta0, COP_0_TLB_HI       # Save current PID
-       li      ta1, TLB_PAGE_MASK
-
-       mtc0    a3, COP_0_TLB_INDEX
-       mtc0    ta1, COP_0_TLB_PG_MASK  # init mask
-       dmtc0   a0, COP_0_TLB_HI        # init high reg.
-
-       PTE_CLEAR_SWBITS(a1)
-       dmtc0   a1, COP_0_TLB_LO0       # init low reg0.
-       PTE_CLEAR_SWBITS(a2)
-       dmtc0   a2, COP_0_TLB_LO1       # init low reg1.
-
-       TLB_HAZARD
-       tlbwi                           # update slot
-       TLB_HAZARD
-
-       dmtc0   ta0, COP_0_TLB_HI       # restore PID
-       mtc0    v1, COP_0_STATUS_REG    # Restore the status register
-       MTC0_SR_IE_HAZARD
-       j       ra
-       nop
-END(tlb_update_indexed)
-
 /*---------------------------------------------------------------- tlb_read
  *     Read the TLB entry.
  */