* arch.c: Regenerate.

	* arch.h: Regenerate.
	* cpu.c: Regenerate.
	* cpu.h: Regenerate.
	* cpu2.c: Regenerate.
	* cpu2.h: Regenerate.
	* cpuall.h: Regenerate.
	* cpux.c: Regenerate.
	* cpux.h: Regenerate.
	* decode.c: Regenerate.
	* decode.h: Regenerate.
	* decode2.c: Regenerate.
	* decode2.h: Regenerate.
	* decodex.c: Regenerate.
	* decodex.h: Regenerate.
	* model.c: Regenerate.
	* model2.c: Regenerate.
	* modelx.c: Regenerate.
	* sem-switch.c: Regenerate.
	* sem.c: Regenerate.
	* sem2-switch.c: Regenerate.
	* semx-switch.c: Regenerate.

1 files changed, 21 insertions, 20 deletions

diff --git a/sim/m32r/cpux.h b/sim/m32r/cpux.h
index 70dc20d..784536e 100644
--- a/sim/m32r/cpux.h
+++ b/sim/m32r/cpux.h
@@ -2,22 +2,23 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 */
 
@@ -949,24 +950,24 @@ struct parexec {
       USI h_memory_SI_src2_idx;
     } sfmt_st;
     struct { /* e.g. st $src1,@($slo16,$src2) */
-      SI h_memory_SI_add__DFLT_src2_slo16;
-      USI h_memory_SI_add__DFLT_src2_slo16_idx;
+      SI h_memory_SI_add__SI_src2_slo16;
+      USI h_memory_SI_add__SI_src2_slo16_idx;
     } sfmt_st_d;
     struct { /* e.g. stb $src1,@$src2 */
       QI h_memory_QI_src2;
       USI h_memory_QI_src2_idx;
     } sfmt_stb;
     struct { /* e.g. stb $src1,@($slo16,$src2) */
-      QI h_memory_QI_add__DFLT_src2_slo16;
-      USI h_memory_QI_add__DFLT_src2_slo16_idx;
+      QI h_memory_QI_add__SI_src2_slo16;
+      USI h_memory_QI_add__SI_src2_slo16_idx;
     } sfmt_stb_d;
     struct { /* e.g. sth $src1,@$src2 */
       HI h_memory_HI_src2;
       USI h_memory_HI_src2_idx;
     } sfmt_sth;
     struct { /* e.g. sth $src1,@($slo16,$src2) */
-      HI h_memory_HI_add__DFLT_src2_slo16;
-      USI h_memory_HI_add__DFLT_src2_slo16_idx;
+      HI h_memory_HI_add__SI_src2_slo16;
+      USI h_memory_HI_add__SI_src2_slo16_idx;
     } sfmt_sth_d;
     struct { /* e.g. st $src1,@+$src2 */
       SI h_memory_SI_new_src2;
@@ -989,7 +990,7 @@ struct parexec {
       USI h_cr_USI_14;
       USI h_cr_USI_6;
       UQI h_psw_UQI;
-      SI pc;
+      USI pc;
     } sfmt_trap;
     struct { /* e.g. unlock $src1,@$src2 */
       BI h_lock_BI;
@@ -1024,8 +1025,8 @@ struct parexec {
       USI h_cr_USI_0;
     } sfmt_setpsw;
     struct { /* e.g. bset $uimm3,@($slo16,$sr) */
-      QI h_memory_QI_add__DFLT_sr_slo16;
-      USI h_memory_QI_add__DFLT_sr_slo16_idx;
+      QI h_memory_QI_add__SI_sr_slo16;
+      USI h_memory_QI_add__SI_sr_slo16_idx;
     } sfmt_bset;
     struct { /* e.g. btst $uimm3,$sr */
       BI condbit;