From 481d79819e0e47f23f20408a6595333012da6f58 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 7 Nov 2011 16:26:05 +0000 Subject: [PATCH] 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 --- sim/mn10300/ChangeLog | 5 +++++ sim/mn10300/dv-mn103iop.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index cc2cbb115da..5374542003e 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,8 @@ +2011-11-07 Mike Frysinger + + PR sim/9302 + * dv-mn103iop.c (write_dedicated_control_reg): Convert && to &. + 2011-10-19 Mike Frysinger * configure: Regenerate after common/acinclude.m4 update. diff --git a/sim/mn10300/dv-mn103iop.c b/sim/mn10300/dv-mn103iop.c index 15a299d0c98..8134377f33a 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."); } -- 2.30.2