Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 May 2020 00:17:06 +0000 (UTC)
From:      Brandon Bergren <bdragon@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r361542 - head/sys/powerpc/aim
Message-ID:  <202005270017.04R0H6aY087274@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdragon
Date: Wed May 27 00:17:05 2020
New Revision: 361542
URL: https://svnweb.freebsd.org/changeset/base/361542

Log:
  [PowerPC] Fix invalid asm in trap code
  
  In this context, 0 actually means 0 (i.e. this is a li instruction).
  
  While most assemblers will ignore this, I did have a compile failure at one
  point when using an external toolchain.
  
  In the future, we should use the li syntax to make this clearer.
  
  Sponsored by:	Tag1 Consulting, Inc.

Modified:
  head/sys/powerpc/aim/trap_subr32.S

Modified: head/sys/powerpc/aim/trap_subr32.S
==============================================================================
--- head/sys/powerpc/aim/trap_subr32.S	Tue May 26 23:35:10 2020	(r361541)
+++ head/sys/powerpc/aim/trap_subr32.S	Wed May 27 00:17:05 2020	(r361542)
@@ -426,7 +426,7 @@ instr_sec_hash:
 	bne do_isi			/* if so, go to ISI interrupt */
 	mfspr %r2, SPR_HASH2		/* get the second pointer */
 	ori %r3, %r3, 0x0040		/* change the compare value */
-	addi %r1, %r0, 8		/* load 8 for counter */
+	addi %r1, 0, 8			/* load 8 for counter */
 	addi %r2, %r2, -8		/* pre dec for update on load */
 	b im0				/* try second hash */
 



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