RE: [RFA] sim-h8300.h new file

[Andrew Volkov <Andrew.Volkov@transas.com>]

Now it ok ?

Andrey

>
>Andrew Volkov writes:
> > Committed
> > 
> > Andrey
>
>Ahem, this hadn't been approved.  Could you please change the file so
>that it follows the convention used for other sims?  Look at
>sim-arm.h, for instance. You should call the enum values
>SIM_H8300_R0_REGNUM, etc. Don't need to distinguish the reg names
>based on the mode. (you can add comments though)
>
>thanks
>Elena
>

Index: sim-h8300.h
===================================================================
RCS file: /cvs/src/src/include/gdb/sim-h8300.h,v
retrieving revision 1.1
diff -u -r1.1 sim-h8300.h
--- sim-h8300.h	23 Jul 2002 10:30:14 -0000	1.1
+++ sim-h8300.h	29 Jul 2002 10:46:34 -0000
@@ -26,46 +26,49 @@
   
 /* The simulator makes use of the following register information. */ 
   
-/* Registers common to all the H8 variants. */
   enum sim_h8300_regs
   {
-    H8300_R0_REGNUM = 0,
-    H8300_R1_REGNUM,
-    H8300_R2_REGNUM,
-    H8300_R3_REGNUM,
-    H8300_R4_REGNUM,
-    H8300_R5_REGNUM,
-    H8300_R6_REGNUM,
-    H8300_R7_REGNUM,
+    /* Registers common to all the H8 variants. */
+    /* Start here: */
+    SIM_H8300_R0_REGNUM = 0,    
+    SIM_H8300_R1_REGNUM,
+    SIM_H8300_R2_REGNUM,
+    SIM_H8300_R3_REGNUM,
+    SIM_H8300_R4_REGNUM,
+    SIM_H8300_R5_REGNUM,
+    SIM_H8300_R6_REGNUM,
+    SIM_H8300_R7_REGNUM,
 
-    H8300_PC_REGNUM,	/* Contains program counter */
-    H8300_CCR_REGNUM,	/* Contains processor status */
+    SIM_H8300_CCR_REGNUM,  /* Contains processor status */
+    SIM_H8300_PC_REGNUM,   /* Contains program counter */
+    /* End here */
+    
+    SIM_H8300_EXR_REGNUM,  /* Contains extended processor status 
+                              H8S and higher */
+    SIM_H8300_MACL_REGNUM, /* Lower part of MAC register (26xx only)*/
+    SIM_H8300_MACH_REGNUM, /* High part of MAC register (26xx only) */
 
-    H8300_S_EXR_REGNUM,	/* Contains extended processor status */
-    H8300_S_MACL_REGNUM,/* Lower part of MAC register */
-    H8300_S_MACH_REGNUM,/* High part of MAC register */
-
-    H8300_SIM_CYCLE_REGNUM,
-    H8300_SIM_INST_REGNUM,
-    H8300_SIM_TICK_REGNUM
+    SIM_H8300_CYCLE_REGNUM,
+    SIM_H8300_INST_REGNUM,
+    SIM_H8300_TICK_REGNUM
   };
 
   enum
   {
-    ARG_FIRST_REGNUM = H8300_R0_REGNUM,	/* first reg in which an arg

-					   may be passed */
-    ARG_LAST_REGNUM = H8300_R3_REGNUM,	/* last  reg in which an arg 
-					   may be passed */
-    H8300_FP_REGNUM = H8300_R6_REGNUM,	/* Contain address of executing 
-					   stack frame */
-    H8300_SP_REGNUM = H8300_R7_REGNUM	/* Contains address of top of stack
*/
+    SIM_H8300_ARG_FIRST_REGNUM = SIM_H8300_R0_REGNUM, /* first reg in which
an arg 
+                                                         may be passed */

+    SIM_H8300_ARG_LAST_REGNUM = SIM_H8300_R3_REGNUM,  /* last  reg in which
an arg 
+                                                         may be passed */
+    SIM_H8300_FP_REGNUM = SIM_H8300_R6_REGNUM, /* Contain address of
executing 
+                                                  stack frame */
+    SIM_H8300_SP_REGNUM = SIM_H8300_R7_REGNUM  /* Contains address of top
of stack */
   };
 
   enum
   {
-    H8300_NUM_COMMON_REGS = 10,
-    H8300_S_NUM_REGS = 13,
-    H8300_NUM_SIM_REGS = 16
+    SIM_H8300_NUM_COMMON_REGS = 10,
+    SIM_H8300_S_NUM_REGS = 13,
+    SIM_H8300_NUM_REGS = 16
   };
 
 #ifdef __cplusplus