svn commit: r310146 - head/sys/powerpc/powerpc

[Justin Hibbits]

Author: jhibbits
Date: Fri Dec 16 04:38:53 2016
New Revision: 310146
URL: https://svnweb.freebsd.org/changeset/base/310146

Log:
  Use the right bitwise OR operation for clearing single-step at trap time.
  
  DBCR0_IDM || DBCRO_IC yields 1, which in this register is DBCR0_FT, not what we
  want.
  Reported by:	Mark Millard
  MFC after:	2 weeks

Modified:
  head/sys/powerpc/powerpc/trap.c

Modified: head/sys/powerpc/powerpc/trap.c
==============================================================================
--- head/sys/powerpc/powerpc/trap.c	Fri Dec 16 02:09:48 2016	(r310145)
+++ head/sys/powerpc/powerpc/trap.c	Fri Dec 16 04:38:53 2016	(r310146)
@@ -280,7 +280,7 @@ trap(struct trapframe *frame)
 		case EXC_DEBUG:	/* Single stepping */
 			mtspr(SPR_DBSR, mfspr(SPR_DBSR));
 			frame->srr1 &= ~PSL_DE;
-			frame->cpu.booke.dbcr0 &= ~(DBCR0_IDM || DBCR0_IC);
+			frame->cpu.booke.dbcr0 &= ~(DBCR0_IDM | DBCR0_IC);
 			sig = SIGTRAP;
 			ucode = TRAP_TRACE;
 			break;