Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Apr 2010 06:41:46 +0000 (UTC)
From:      Juli Mallett <jmallett@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r206080 - user/jmallett/octeon/sys/mips/mips
Message-ID:  <201004020641.o326fktv076827@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jmallett
Date: Fri Apr  2 06:41:45 2010
New Revision: 206080
URL: http://svn.freebsd.org/changeset/base/206080

Log:
  Fix a SEGSHIFT use for N64.

Modified:
  user/jmallett/octeon/sys/mips/mips/exception.S

Modified: user/jmallett/octeon/sys/mips/mips/exception.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/exception.S	Fri Apr  2 06:24:16 2010	(r206079)
+++ user/jmallett/octeon/sys/mips/mips/exception.S	Fri Apr  2 06:41:45 2010	(r206080)
@@ -126,7 +126,11 @@ VECTOR_END(MipsTLBMiss)
 	.set noat
 MipsDoTLBMiss:
 	bltz		k0, 1f				#02: k0<0 -> 1f (kernel fault)
-	srl		k0, k0, SEGSHIFT - 2		#03: k0=seg offset (almost)
+#if defined(__mips_n64)
+	PTR_SRL		k0, k0, SEGSHIFT - 3		#03: k0=seg offset (almost)
+#else
+	PTR_SRL		k0, k0, SEGSHIFT - 2		#03: k0=seg offset (almost)
+#endif
 
 	GET_CPU_PCPU(k1)
 	PTR_L		k1, PC_SEGBASE(k1)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004020641.o326fktv076827>