From 5d3dbf0cb2ea7e2e448c3d3b8577241b7c3a6f60 Mon Sep 17 00:00:00 2001
From: Per Fogelstrom <pefo@cvs.openbsd.org>
Date: Mon, 27 Sep 2004 19:13:26 +0000
Subject: reorder slightly to avoid asm warnings

---
 sys/arch/mips64/mips64/tlbhandler.S | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/mips64/mips64/tlbhandler.S b/sys/arch/mips64/mips64/tlbhandler.S
index 097892ce6e8..3e390d7d4b1 100644
--- a/sys/arch/mips64/mips64/tlbhandler.S
+++ b/sys/arch/mips64/mips64/tlbhandler.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tlbhandler.S,v 1.7 2004/09/10 10:39:45 miod Exp $ */
+/*	$OpenBSD: tlbhandler.S,v 1.8 2004/09/27 19:13:25 pefo Exp $ */
 
 /*
  * Copyright (c) 1995-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -42,9 +42,6 @@
 
 	.set	mips3
 
-/* XXX pipeline drainer fix for older RM7000 cpus. */
-#define	ITLBNOPFIX	nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;
-
 	.set	noreorder	/* Default reorder mode */
 
 /*---------------------------------------------------------------- tlb_miss
@@ -216,9 +213,9 @@ NLEAF(k_tlb_inv, 0)
 	PTR_SRL	k0, k0, PGSHIFT
 	sltu	k1, k0, k1
 	beq	k1, zero, sys_stk_chk		# No. check for valid stack
-	PTR_L	k1, Sysmap
-
 	PTR_SLL	k0, k0, 2			# compute offset from index
+
+	PTR_L	k1, Sysmap
 	tlbp					# Probe the invalid entry
 	PTR_ADDU k1, k1, k0
 	and	k0, k0, 4			# check even/odd page
@@ -294,8 +291,8 @@ NLEAF(k_tlb_miss, 0)
 	PTR_SRL	k0, k0, PGSHIFT
 	sltu	k1, k0, k1
 	beq	k1, zero, sys_stk_chk		# No. check for valid stack
-	PTR_L	k1, Sysmap
 	PTR_SRL	k0, k0, 1
+	PTR_L	k1, Sysmap
 	PTR_SLL	k0, k0, 3			# compute offset from index
 	PTR_ADDU k1, k1, k0
 	lw	k0, 0(k1)			# get PTE entry
-- 
cgit v1.2.3