Revert last commit, build problems.

1 files changed, 8 insertions, 45 deletions

diff --git a/sim/m32r/m32r.c b/sim/m32r/m32r.c
index fc8586c80b..3e5e4aaf7a 100644
--- a/sim/m32r/m32r.c
+++ b/sim/m32r/m32r.c
@@ -39,7 +39,6 @@ m32r_decode_gdb_ctrl_regnum (int gdb_regnum)
       case BPC_REGNUM : return H_CR_BPC;
       case BBPSW_REGNUM : return H_CR_BBPSW;
       case BBPC_REGNUM : return H_CR_BBPC;
-      case EVB_REGNUM : return H_CR_CR5;
     }
   abort ();
 }
@@ -63,33 +62,26 @@ m32rbf_fetch_register (SIM_CPU *current_cpu, int rn, unsigned char *buf, int len
       case BPC_REGNUM :
       case BBPSW_REGNUM :
       case BBPC_REGNUM :
-      case EVB_REGNUM :
 	SETTWI (buf, a_m32r_h_cr_get (current_cpu,
 				      m32r_decode_gdb_ctrl_regnum (rn)));
 	break;
       case PC_REGNUM :
 	if (mach == MACH_M32R)
 	  SETTWI (buf, m32rbf_h_pc_get (current_cpu));
-	else if (mach == MACH_M32RX)
-	  SETTWI (buf, m32rxf_h_pc_get (current_cpu));
 	else
-	  SETTWI (buf, m32r2f_h_pc_get (current_cpu));
+	  SETTWI (buf, m32rxf_h_pc_get (current_cpu));
 	break;
       case ACCL_REGNUM :
 	if (mach == MACH_M32R)
 	  SETTWI (buf, GETLODI (m32rbf_h_accum_get (current_cpu)));
-	else if (mach == MACH_M32RX)
-	  SETTWI (buf, GETLODI (m32rxf_h_accum_get (current_cpu)));
 	else
-	  SETTWI (buf, GETLODI (m32r2f_h_accum_get (current_cpu)));
+	  SETTWI (buf, GETLODI (m32rxf_h_accum_get (current_cpu)));
 	break;
       case ACCH_REGNUM :
 	if (mach == MACH_M32R)
 	  SETTWI (buf, GETHIDI (m32rbf_h_accum_get (current_cpu)));
-	else if (mach == MACH_M32RX)
-	  SETTWI (buf, GETHIDI (m32rxf_h_accum_get (current_cpu)));
 	else
-	  SETTWI (buf, GETHIDI (m32r2f_h_accum_get (current_cpu)));
+	  SETTWI (buf, GETHIDI (m32rxf_h_accum_get (current_cpu)));
 	break;
       default :
 	return 0;
@@ -117,7 +109,6 @@ m32rbf_store_register (SIM_CPU *current_cpu, int rn, unsigned char *buf, int len
       case BPC_REGNUM :
       case BBPSW_REGNUM :
       case BBPC_REGNUM :
-      case EVB_REGNUM :
 	a_m32r_h_cr_set (current_cpu,
 			 m32r_decode_gdb_ctrl_regnum (rn),
 			 GETTWI (buf));
@@ -125,27 +116,21 @@ m32rbf_store_register (SIM_CPU *current_cpu, int rn, unsigned char *buf, int len
       case PC_REGNUM :
 	if (mach == MACH_M32R)
 	  m32rbf_h_pc_set (current_cpu, GETTWI (buf));
-	else if (mach == MACH_M32RX)
-	  m32rxf_h_pc_set (current_cpu, GETTWI (buf));
 	else
-	  m32r2f_h_pc_set (current_cpu, GETTWI (buf));
+	  m32rxf_h_pc_set (current_cpu, GETTWI (buf));
 	break;
       case ACCL_REGNUM :
 	{
 	  DI val;
 	  if (mach == MACH_M32R)
 	    val = m32rbf_h_accum_get (current_cpu);
-	  else if (mach == MACH_M32RX)
-	    val = m32rxf_h_accum_get (current_cpu);
 	  else
-	    val = m32r2f_h_accum_get (current_cpu);
+	    val = m32rxf_h_accum_get (current_cpu);
 	  SETLODI (val, GETTWI (buf));
 	  if (mach == MACH_M32R)
 	    m32rbf_h_accum_set (current_cpu, val);
-	  else if (mach == MACH_M32RX)
-	    m32rxf_h_accum_set (current_cpu, val);
 	  else
-	    m32r2f_h_accum_set (current_cpu, val);
+	    m32rxf_h_accum_set (current_cpu, val);
 	  break;
 	}
       case ACCH_REGNUM :
@@ -153,17 +138,13 @@ m32rbf_store_register (SIM_CPU *current_cpu, int rn, unsigned char *buf, int len
 	  DI val;
 	  if (mach == MACH_M32R)
 	    val = m32rbf_h_accum_get (current_cpu);
-	  else if (mach == MACH_M32RX)
-	    val = m32rxf_h_accum_get (current_cpu);
 	  else
-	    val = m32r2f_h_accum_get (current_cpu);
+	    val = m32rxf_h_accum_get (current_cpu);
 	  SETHIDI (val, GETTWI (buf));
 	  if (mach == MACH_M32R)
 	    m32rbf_h_accum_set (current_cpu, val);
-	  else if (mach == MACH_M32RX)
-	    m32rxf_h_accum_set (current_cpu, val);
 	  else
-	    m32r2f_h_accum_set (current_cpu, val);
+	    m32rxf_h_accum_set (current_cpu, val);
 	  break;
 	}
       default :
@@ -188,10 +169,6 @@ a_m32r_h_gr_get (SIM_CPU *current_cpu, UINT regno)
     case MACH_M32RX : 
       return m32rxf_h_gr_get (current_cpu, regno);
 #endif
-#ifdef HAVE_CPU_M32R2F
-    case MACH_M32R2 : 
-      return m32r2f_h_gr_get (current_cpu, regno);
-#endif
     default :
       abort ();
     }
@@ -212,11 +189,6 @@ a_m32r_h_gr_set (SIM_CPU *current_cpu, UINT regno, SI newval)
       m32rxf_h_gr_set (current_cpu, regno, newval);
       break;
 #endif
-#ifdef HAVE_CPU_M32RXF
-    case MACH_M32R2 : 
-      m32r2f_h_gr_set (current_cpu, regno, newval);
-      break;
-#endif
     default :
       abort ();
     }
@@ -235,10 +207,6 @@ a_m32r_h_cr_get (SIM_CPU *current_cpu, UINT regno)
     case MACH_M32RX : 
       return m32rxf_h_cr_get (current_cpu, regno);
 #endif
-#ifdef HAVE_CPU_M32R2F
-    case MACH_M32R2 : 
-      return m32r2f_h_cr_get (current_cpu, regno);
-#endif
     default :
       abort ();
     }
@@ -259,11 +227,6 @@ a_m32r_h_cr_set (SIM_CPU *current_cpu, UINT regno, USI newval)
       m32rxf_h_cr_set (current_cpu, regno, newval);
       break;
 #endif
-#ifdef HAVE_CPU_M32RXF
-    case MACH_M32R2 : 
-      m32r2f_h_cr_set (current_cpu, regno, newval);
-      break;
-#endif
     default :
       abort ();
     }