From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 7 Nov 2011 16:26:05 +0000 (+0000)
Subject: sim: mn10300: fix typo in if check
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=481d79819e0e47f23f20408a6595333012da6f58;p=deliverable%2Fbinutils-gdb.git

sim: mn10300: fix typo in if check

The code looks like it should be doing a bit check, not logical.

URL: http://sourceware.org/bugzilla/show_bug.cgi?id=9302
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index cc2cbb115d..5374542003 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-07  Mike Frysinger  <vapier@gentoo.org>
+
+	PR sim/9302
+	* dv-mn103iop.c (write_dedicated_control_reg): Convert && to &.
+
 2011-10-19  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate after common/acinclude.m4 update.
diff --git a/sim/mn10300/dv-mn103iop.c b/sim/mn10300/dv-mn103iop.c
index 15a299d0c9..8134377f33 100644
--- a/sim/mn10300/dv-mn103iop.c
+++ b/sim/mn10300/dv-mn103iop.c
@@ -463,7 +463,7 @@ write_dedicated_control_reg (struct hw *me,
       /* select on io_port_reg: */
       if ( io_port_reg == P2SS )
 	{
-	  if ( (buf && 0xfc)  != 0 )
+	  if ( (buf & 0xfc)  != 0 )
 	    {
 	      hw_abort(me, "Cannot write to read-only bits in p2ss.");
 	    }
@@ -474,7 +474,7 @@ write_dedicated_control_reg (struct hw *me,
 	}
       else
 	{
-	  if ( (buf && 0xf0) != 0 )
+	  if ( (buf & 0xf0) != 0 )
 	    {
 	      hw_abort(me, "Cannot write to read-only bits in p4ss.");
 	    }