Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* [RFA] sim-h8300.h new file
@ 2002-07-22  7:28 Andrew Volkov
  2002-07-22  8:09 ` Elena Zannoni
  0 siblings, 1 reply; 8+ messages in thread
From: Andrew Volkov @ 2002-07-22  7:28 UTC (permalink / raw)
  To: gdb-patches

Hi,

This patch prepared to fix ugly difference in sim and gdb

ok to commit?

Andrey

Index: ./include/gdb/sim-h8300.h
===================================================================
RCS file: ./include/gdb/sim-h8300.h
diff -N ./include/gdb/sim-h8300.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./include/gdb/sim-h8300.h	22 Jul 2002 13:30:08 -0000
@@ -0,0 +1,77 @@
+/* This file defines the interface between the sh simulator and gdb.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+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 2 of the License, 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.
+
+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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
 
+#if !defined (SIM_H8300_H)
+#define SIM_H8300_H
+  
+#ifdef __cplusplus
+extern "C" {// }
+#endif
+  
+/* The simulator makes use of the following register information. */ 
+  
+/* Registers common to all the H8 variants. */
+  enum
+  {
+    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,
+
+    H8300_PC_REGNUM,		/* Contains program counter */
+    H8300_CCR_REGNUM,		/* Contains processor status */
+    H8300_NUM_COMMON_REGS,
+
+    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
*/
+  };
+
+  enum
+  {
+    H8300_S_EXR_REGNUM = H8300_NUM_COMMON_REGS,	/* Contains extended

+					           processor status  */
+    H8300_S_MACL_REGNUM,	/* Lower part of MAC register */
+    H8300_S_MACH_REGNUM,	/* High part of MAC register */
+
+    H8300_S_NUM_REGS
+  };
+
+  enum
+  {
+    H8300_SYM_CYCLE_REGNUM = H8300_S_NUM_REGS,
+    H8300_SYM_INST_REGNUM,
+    H8300_SYM_TICK_REGNUM,
+
+    H8300_SYM_NUM_REGS
+  };
+   
+#ifdef __cplusplus
+}
+#endif
+ 
+#endif				/* SIM_H8300_H */


^ permalink raw reply	[flat|nested] 8+ messages in thread
* RE: [RFA] sim-h8300.h new file
@ 2002-07-22 11:12 Andrew Volkov
  0 siblings, 0 replies; 8+ messages in thread
From: Andrew Volkov @ 2002-07-22 11:12 UTC (permalink / raw)
  To: Elena Zannoni; +Cc: gdb-patches

Hi Elena,

Are you have this in view ?

Andrey

Index: sim-h8300.h
===================================================================
RCS file: sim-h8300.h
diff -N sim-h8300.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sim-h8300.h	22 Jul 2002 15:06:51 -0000
@@ -0,0 +1,75 @@
+/* This file defines the interface between the sh simulator and gdb.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+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 2 of the License, 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.
+
+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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
+#if !defined (SIM_H8300_H)
+#define SIM_H8300_H
+
+#ifdef __cplusplus
+extern "C" { //}
+#endif
+  
+/* 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,
+
+    H8300_PC_REGNUM,	/* Contains program counter */
+    H8300_CCR_REGNUM,	/* Contains processor status */
+
+    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
+  };
+
+  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
*/
+  };
+
+  enum
+  {
+    H8300_NUM_COMMON_REGS = 10,
+    H8300_S_NUM_REGS = 13,
+    H8300_SIM_NUM_REGS = 16
+  };
+
+#ifdef __cplusplus
+}
+#endif
+ 
+#endif				/* SIM_H8300_H */


^ permalink raw reply	[flat|nested] 8+ messages in thread
* RE: [RFA] sim-h8300.h new file
@ 2002-07-23  4:13 Andrew Volkov
  2002-07-24  6:14 ` Elena Zannoni
  0 siblings, 1 reply; 8+ messages in thread
From: Andrew Volkov @ 2002-07-23  4:13 UTC (permalink / raw)
  To: gdb-patches

Committed

Andrey

>-----Original Message-----
>From: Andrew Volkov [mailto:Andrew.Volkov@transas.com]
>Sent: Monday, July 22, 2002 7:09 PM
>To: Elena Zannoni
>Cc: gdb-patches@sources.redhat.com
>Subject: RE: [RFA] sim-h8300.h new file
>
>
>Hi Elena,
>
>Are you have this in view ?
>
>Andrey
>
>Index: sim-h8300.h
>===================================================================
>RCS file: sim-h8300.h
>diff -N sim-h8300.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ sim-h8300.h	22 Jul 2002 15:06:51 -0000
>@@ -0,0 +1,75 @@
>+/* This file defines the interface between the sh simulator and gdb.
>+   Copyright (C) 2002 Free Software Foundation, Inc.
>+
>+This file is part of GDB.
>+
>+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 2 of the License, 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.
>+
>+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., 59 Temple Place - Suite 330, Boston, MA 
>02111-1307, USA.
>*/
>+
>+#if !defined (SIM_H8300_H)
>+#define SIM_H8300_H
>+
>+#ifdef __cplusplus
>+extern "C" { //}
>+#endif
>+  
>+/* 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,
>+
>+    H8300_PC_REGNUM,	/* Contains program counter */
>+    H8300_CCR_REGNUM,	/* Contains processor status */
>+
>+    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
>+  };
>+
>+  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
>*/
>+  };
>+
>+  enum
>+  {
>+    H8300_NUM_COMMON_REGS = 10,
>+    H8300_S_NUM_REGS = 13,
>+    H8300_SIM_NUM_REGS = 16
>+  };
>+
>+#ifdef __cplusplus
>+}
>+#endif
>+ 
>+#endif				/* SIM_H8300_H */
>


^ permalink raw reply	[flat|nested] 8+ messages in thread
* RE: [RFA] sim-h8300.h new file
@ 2002-07-29  4:03 Andrew Volkov
  2002-07-29  9:02 ` Elena Zannoni
  0 siblings, 1 reply; 8+ messages in thread
From: Andrew Volkov @ 2002-07-29  4:03 UTC (permalink / raw)
  To: Elena Zannoni; +Cc: gdb-patches

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



^ permalink raw reply	[flat|nested] 8+ messages in thread
* RE: [RFA] sim-h8300.h new file
@ 2002-07-29 10:04 Andrew Volkov
  0 siblings, 0 replies; 8+ messages in thread
From: Andrew Volkov @ 2002-07-29 10:04 UTC (permalink / raw)
  To: Elena Zannoni; +Cc: gdb-patches


>
>Andrew Volkov writes:
> > Now it ok ?
> > 
> > Andrey
>
>
>Ok, but you don't need the first '= 0' bit.

Removed " = 0 " and commited. 

Andrey


^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2002-07-29 16:59 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-07-22  7:28 [RFA] sim-h8300.h new file Andrew Volkov
2002-07-22  8:09 ` Elena Zannoni
2002-07-22 11:12 Andrew Volkov
2002-07-23  4:13 Andrew Volkov
2002-07-24  6:14 ` Elena Zannoni
2002-07-29  4:03 Andrew Volkov
2002-07-29  9:02 ` Elena Zannoni
2002-07-29 10:04 Andrew Volkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox