GDB 7.6.50

sim/moxie/interp.c

Index: sim/moxie/interp.c
diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index c16c34ffc0860bb8999f8a8a20458d5a7a9cb665..8504574e6b9605c49d40cb4e42b9467f4b656fbb 100644
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -1,5 +1,5 @@
 /* Simulator for the moxie processor
-   Copyright (C) 2008-2012 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 Free Software Foundation, Inc.
    Contributed by Anthony Green
 
 This file is part of GDB, the GNU debugger.
@@ -290,69 +290,69 @@ sim_resume (sd, step, siggnal)
 		  {
 		    TRACE("beq");
 		    if (cpu.asregs.cc & CC_EQ)
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		case 0x01: /* bne */
 		  {
 		    TRACE("bne");
 		    if (! (cpu.asregs.cc & CC_EQ))
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		case 0x02: /* blt */
 		  {
 		    TRACE("blt");
 		    if (cpu.asregs.cc & CC_LT)
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }		  break;
 		case 0x03: /* bgt */
 		  {
 		    TRACE("bgt");
 		    if (cpu.asregs.cc & CC_GT)
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		case 0x04: /* bltu */
 		  {
 		    TRACE("bltu");
 		    if (cpu.asregs.cc & CC_LTU)
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		case 0x05: /* bgtu */
 		  {
 		    TRACE("bgtu");
 		    if (cpu.asregs.cc & CC_GTU)
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		case 0x06: /* bge */
 		  {
 		    TRACE("bge");
 		    if (cpu.asregs.cc & (CC_GT | CC_EQ))
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		case 0x07: /* ble */
 		  {
 		    TRACE("ble");
 		    if (cpu.asregs.cc & (CC_LT | CC_EQ))
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		case 0x08: /* bgeu */
 		  {
 		    TRACE("bgeu");
 		    if (cpu.asregs.cc & (CC_GTU | CC_EQ))
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		case 0x09: /* bleu */
 		  {
 		    TRACE("bleu");
 		    if (cpu.asregs.cc & (CC_LTU | CC_EQ))
-		      pc += INST2OFFSET(inst) - 2;
+		      pc += INST2OFFSET(inst);
 		  }
 		  break;
 		default:
@@ -1165,7 +1165,6 @@ sim_open (kind, cb, abfd, argv)
      char ** argv;
 {
   SIM_DESC sd = sim_state_alloc (kind, cb);
-  printf ("0x%x 0x%x\n", sd, STATE_MAGIC(sd));
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   if (sim_pre_argv_init (sd, argv[0]) != SIM_RC_OK)