This commit was manufactured by cvs2svn to create branch

'kseitz_interps-20020528-branch'.

Sprout from cagney_regbuf-20020515-branch 2002-06-12 21:19:43 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2002-05-28 20:06:27 UTC Marek Michalkiewicz <marekm@amelek.gda.pl> '2002-05-28  Marek Michalkiewicz  <marekm@amelek.gda.pl>':
    ChangeLog
    Makefile.in
    config-ml.in
    config.guess
    config.sub
    config/ChangeLog
    config/acinclude.m4
    config/mh-apollo68
    config/mh-dgux
    config/mh-dgux386
    configure
    configure.in
    include/ChangeLog
    include/bfdlink.h
    include/dis-asm.h
    include/elf/ChangeLog
    include/elf/common.h
    include/elf/dlx.h
    include/elf/i386.h
    include/elf/ia64.h
    include/gdb/ChangeLog
    include/gdb/sim-d10v.h
    include/opcode/ChangeLog
    include/opcode/dlx.h
    include/opcode/h8300.h
    include/opcode/ia64.h
    include/opcode/mips.h
    include/opcode/sparc.h
Cherrypick from master 2002-06-18 21:15:57 UTC Dave Brolley <brolley@redhat.com> '2002-06-18  Dave Brolley  <brolley@redhat.com>':
    include/elf/frv.h
    include/gdb/sim-arm.h
Delete:
    include/sim-d10v.h

3 files changed, 25 insertions, 57 deletions

diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index 96a4a058a..e0992c95a 100644
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+	* sim-d10v.h: New file.  Moved from include/sim-d10v.h.
+
 2002-05-10  Elena Zannoni  <ezannoni@redhat.com>
 
         * sim-sh.h: New file, for sh gdb<->sim interface.
diff --git a/include/gdb/sim-arm.h b/include/gdb/sim-arm.h
index 1e49781e8..6d80700ad 100644
--- a/include/gdb/sim-arm.h
+++ b/include/gdb/sim-arm.h
@@ -28,7 +28,7 @@
 extern "C" { // }
 #endif
 
-enum sim_arm_regnum
+enum sim_arm_regs
 {
   SIM_ARM_R0_REGNUM,
   SIM_ARM_R1_REGNUM,
diff --git a/include/gdb/sim-d10v.h b/include/gdb/sim-d10v.h
index f153a4194..9d29e0584 100644
--- a/include/gdb/sim-d10v.h
+++ b/include/gdb/sim-d10v.h
@@ -1,6 +1,5 @@
 /* This file defines the interface between the d10v simulator and gdb.
-
-   Copyright 1999, 2002 Free Software Foundation, Inc.
+   Copyright 1999 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -76,61 +75,26 @@ extern unsigned long sim_d10v_translate_addr
 
 /* The simulator makes use of the following register information. */
 
-enum sim_d10v_regs
-{
-  SIM_D10V_R0_REGNUM,
-  SIM_D10V_R1_REGNUM,
-  SIM_D10V_R2_REGNUM,
-  SIM_D10V_R3_REGNUM,
-  SIM_D10V_R4_REGNUM,
-  SIM_D10V_R5_REGNUM,
-  SIM_D10V_R6_REGNUM,
-  SIM_D10V_R7_REGNUM,
-  SIM_D10V_R8_REGNUM,
-  SIM_D10V_R9_REGNUM,
-  SIM_D10V_R10_REGNUM,
-  SIM_D10V_R11_REGNUM,
-  SIM_D10V_R12_REGNUM,
-  SIM_D10V_R13_REGNUM,
-  SIM_D10V_R14_REGNUM,
-  SIM_D10V_R15_REGNUM,
-  SIM_D10V_CR0_REGNUM,
-  SIM_D10V_CR1_REGNUM,
-  SIM_D10V_CR2_REGNUM,
-  SIM_D10V_CR3_REGNUM,
-  SIM_D10V_CR4_REGNUM,
-  SIM_D10V_CR5_REGNUM,
-  SIM_D10V_CR6_REGNUM,
-  SIM_D10V_CR7_REGNUM,
-  SIM_D10V_CR8_REGNUM,
-  SIM_D10V_CR9_REGNUM,
-  SIM_D10V_CR10_REGNUM,
-  SIM_D10V_CR11_REGNUM,
-  SIM_D10V_CR12_REGNUM,
-  SIM_D10V_CR13_REGNUM,
-  SIM_D10V_CR14_REGNUM,
-  SIM_D10V_CR15_REGNUM,
-  SIM_D10V_A0_REGNUM,
-  SIM_D10V_A1_REGNUM,
-  SIM_D10V_SPI_REGNUM,
-  SIM_D10V_SPU_REGNUM,
-  SIM_D10V_IMAP0_REGNUM,
-  SIM_D10V_IMAP1_REGNUM,
-  SIM_D10V_DMAP0_REGNUM,
-  SIM_D10V_DMAP1_REGNUM,
-  SIM_D10V_DMAP2_REGNUM,
-  SIM_D10V_DMAP3_REGNUM,
-  SIM_D10V_TS2_DMAP_REGNUM
-};
-  
 enum
-{
-  SIM_D10V_NR_R_REGS = 16,
-  SIM_D10V_NR_A_REGS = 2,
-  SIM_D10V_NR_IMAP_REGS = 2,
-  SIM_D10V_NR_DMAP_REGS = 4,
-  SIM_D10V_NR_CR_REGS = 16
-};
+  {
+    SIM_D10V_R0_REGNUM = 0,
+    SIM_D10V_CR0_REGNUM = 16,
+    SIM_D10V_A0_REGNUM = 32,
+    SIM_D10V_SPI_REGNUM = 34,
+    SIM_D10V_SPU_REGNUM = 35,
+    SIM_D10V_IMAP0_REGNUM = 36,
+    SIM_D10V_DMAP0_REGNUM = 38,
+    SIM_D10V_TS2_DMAP_REGNUM = 40
+  };
+
+enum
+  {
+    SIM_D10V_NR_R_REGS = 16,
+    SIM_D10V_NR_A_REGS = 2,
+    SIM_D10V_NR_IMAP_REGS = 2,
+    SIM_D10V_NR_DMAP_REGS = 4,
+    SIM_D10V_NR_CR_REGS = 16
+  };
 
 #ifdef __cplusplus
 }