Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Jan 2013 23:12:09 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r245017 - head/sys/sparc64/sparc64
Message-ID:  <201301032312.r03NC9K0004082@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Thu Jan  3 23:12:08 2013
New Revision: 245017
URL: http://svnweb.freebsd.org/changeset/base/245017

Log:
  Revert bogus part of r241740.
  Reported by:	Michael Moll
  
  MFC after:	3 days

Modified:
  head/sys/sparc64/sparc64/interrupt.S

Modified: head/sys/sparc64/sparc64/interrupt.S
==============================================================================
--- head/sys/sparc64/sparc64/interrupt.S	Thu Jan  3 23:09:16 2013	(r245016)
+++ head/sys/sparc64/sparc64/interrupt.S	Thu Jan  3 23:12:08 2013	(r245017)
@@ -83,13 +83,13 @@ ENTRY(intr_vector)
 	 * The 2nd word points to code to execute and the 3rd is an argument
 	 * to pass.  Jump to it.
 	 */
-	brnz,a,pt %g3, 1f
-	 srlx	%g3, 60, %g6
+	brnz,pt %g3, 1f
 	/*
 	 * NB: Zeus CPUs set some undocumented bits in the first data word.
 	 */
-	jmpl	%g4, %g0
 	 and	%g3, IV_MAX - 1, %g3
+	jmpl	%g4, %g0
+	 nop
 	/* NOTREACHED */
 
 	/*
@@ -98,7 +98,8 @@ ENTRY(intr_vector)
 	 * 4 bits of the 1st data word specify a priority, and the 2nd and
 	 * 3rd a function and argument.
 	 */
-1:	brnz,a,pn %g6, 2f
+1:	srlx	%g3, 60, %g6
+	brnz,a,pn %g6, 2f
 	 clr	%g3
 
 	/*



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