From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30165 invoked by alias); 2 Dec 2003 13:18:02 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 30152 invoked from network); 2 Dec 2003 13:17:59 -0000 Received: from unknown (HELO sohm.kpit.com) (203.129.230.82) by sources.redhat.com with SMTP; 2 Dec 2003 13:17:59 -0000 Content-Class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Subject: RE: H8300 Patch - Fix GDB crash problem when object file of different H8 cpu is loaded X-MimeOLE: Produced By Microsoft Exchange V6.0.6249.0 Date: Tue, 02 Dec 2003 13:18:00 -0000 Message-ID: <69595093233BB547BB70CF5E492B63F202FBCD71@sohm.kpit.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: From: "Dhananjay R. Deshpande" To: "Andrew Cagney" Cc: "Andrew Cagney" , "Michael Snyder" , X-SW-Source: 2003-12/txt/msg00046.txt.bz2 Hi Andrew, > so that the "current_gdbarch" is passed explicitly as a=20 > parameter making=20 > the call: > is_h8300smode (current_gdbarch) Done. I also made these functions static and for remote-e7000, used TARGET_ARCHIT= ECTURE->mach for NUM_REALREGS. Based on your email, I have applied for cvs account and put your email addr= ess for approval. Please find updated patch below. Regards, Dhananjay gdb/Changelog - 2003-12-02 Dhananjay Deshpande * config/h8300/tm-h8300.h (h8300hmode): Remove. (h8300hmode): Likewise. (h8300smode): Likewise. (h8300sxmode): Likewise. (h8300_normal_mode): Likewise. (GDB_TARGET_IS_H8300): Likewise. (NUM_REALREGS): Use TARGET_ARCHITECTURE->mach instead of global. * h8300-tdep.c (is_h8300hmode): New function. (is_h8300smode): New function. (is_h8300sxmode): New function. (is_h8300_normal_mode): New function. (BINWORD): Use new functions. (h8300_examine_prologue): Likewise. (h8300_print_register): Likewise. (h8300_print_registers_info): Likewise. (h8300_register_type): Likewise. (h8300_gdbarch_init): Remove use of globals like h8300hmode. * remote-e7000.c (e7000_open): Remove use of GDB_TARGET_IS_H8300. (e7000_fetch_registers): Use TARGET_ARCHITECTURE->mach instead of g= lobal. (e7000_wait): Use TARGET_ARCHITECTURE->mach instead of global. sim/Changelog 2003-12-02 Dhananjay Deshpande * h8300/compile.c (set_h8300h): Initialize globals to zero. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D diff -upr --strip-trailing-cr gdb+dejagnu-20031114.orig/gdb/config/h8300/tm= -h8300.h gdb+dejagnu-20031114/gdb/config/h8300/tm-h8300.h --- gdb+dejagnu-20031114.orig/gdb/config/h8300/tm-h8300.h 2003-10-17 18:13:= 06.000000000 +0530 +++ gdb+dejagnu-20031114/gdb/config/h8300/tm-h8300.h 2003-12-02 17:18:58.00= 0000000 +0530 @@ -20,20 +20,13 @@ Boston, MA 02111-1307, USA. */ /* Contributed by Steve Chamberlain sac@cygnus.com */ =20 -/* NOTE: ezannoni 2000-07-18: these variables are part of sim, defined - in sim/h8300/compile.c. They really should not be used this - way. Because of this we cannot get rid of the macro - GDB_TARGET_IS_H8300 in remote-e7000.c */ -extern int h8300hmode; -extern int h8300smode; -extern int h8300_normal_mode; /* 1 - Normal Mode , 0 - Advanced mode */ -extern int h8300sxmode; -#define GDB_TARGET_IS_H8300 - /* Needed for remote.c */ #define DEPRECATED_REMOTE_BREAKPOINT { 0x57, 0x30} /* trapa #3 */ /* Needed for remote-hms.c */ #define CCR_REGNUM 8 /* Needed for remote-e7000.c */ -#define NUM_REALREGS (h8300smode?11:10) +#define NUM_REALREGS ((TARGET_ARCHITECTURE->mach =3D=3D bfd_mach_h8300s ||= \ + TARGET_ARCHITECTURE->mach =3D=3D bfd_mach_h8300sn || \ + TARGET_ARCHITECTURE->mach =3D=3D bfd_mach_h8300sx || \ + TARGET_ARCHITECTURE->mach =3D=3D bfd_mach_h8300sxn) ? 11 : 10) =20 diff -upr --strip-trailing-cr gdb+dejagnu-20031114.orig/gdb/h8300-tdep.c gd= b+dejagnu-20031114/gdb/h8300-tdep.c --- gdb+dejagnu-20031114.orig/gdb/h8300-tdep.c 2003-10-17 18:13:04.00000000= 0 +0530 +++ gdb+dejagnu-20031114/gdb/h8300-tdep.c 2003-12-02 17:28:07.000000000 +05= 30 @@ -49,7 +49,14 @@ enum h8300h_reg_size =3D 4, h8300_max_reg_size =3D 4, }; -#define BINWORD (h8300hmode && !h8300_normal_mode ? h8300h_reg_size : h830= 0_reg_size) + +static int is_h8300hmode (struct gdbarch *gdbarch); +static int is_h8300smode (struct gdbarch *gdbarch); +static int is_h8300sxmode (struct gdbarch *gdbarch); +static int is_h8300_normal_mode (struct gdbarch *gdbarch); + +#define BINWORD (is_h8300hmode (current_gdbarch) && \ + !is_h8300_normal_mode (current_gdbarch) ? h8300h_reg_size : h8300_reg_= size) =20 enum gdb_regnum { @@ -350,7 +357,8 @@ h8300_examine_prologue (CORE_ADDR ip, CO } =20 /* If the PC isn't valid, quit now. */ - if (ip =3D=3D 0 || ip & (h8300hmode && !h8300_normal_mode ? ~0xffffff : = ~0xffff)) + if (ip =3D=3D 0 || ip & (is_h8300hmode (current_gdbarch) && + !is_h8300_normal_mode (current_gdbarch) ? ~0xffffff : ~0xffff)) return 0; =20 next_ip =3D h8300_next_prologue_insn (ip, limit, &insn_word); @@ -947,7 +955,8 @@ h8300_print_register (struct gdbarch *gd rval =3D get_frame_register_signed (frame, regno); =20 fprintf_filtered (file, "%-14s ", name); - if (regno =3D=3D E_PSEUDO_CCR_REGNUM || (regno =3D=3D E_PSEUDO_EXR_REGNU= M && h8300smode)) + if (regno =3D=3D E_PSEUDO_CCR_REGNUM || + (regno =3D=3D E_PSEUDO_EXR_REGNUM && is_h8300smode (current_gdbarch= ))) { fprintf_filtered (file, "0x%02x ", (unsigned char)rval); print_longest (file, 'u', 1, rval); @@ -996,7 +1005,7 @@ h8300_print_register (struct gdbarch *gd if ((Z | (N ^ V)) =3D=3D 1) fprintf_filtered (file, "<=3D "); } - else if (regno =3D=3D E_PSEUDO_EXR_REGNUM && h8300smode) + else if (regno =3D=3D E_PSEUDO_EXR_REGNUM && is_h8300smode (current_gdba= rch)) { /* EXR register */ unsigned char l =3D rval & 0xff; @@ -1019,10 +1028,10 @@ h8300_print_registers_info (struct gdbar h8300_print_register (gdbarch, file, frame, regno); h8300_print_register (gdbarch, file, frame, E_PSEUDO_CCR_REGNUM); h8300_print_register (gdbarch, file, frame, E_PC_REGNUM); - if (h8300smode) + if (is_h8300smode (current_gdbarch)) { h8300_print_register (gdbarch, file, frame, E_PSEUDO_EXR_REGNUM); - if (h8300sxmode) + if (is_h8300sxmode (current_gdbarch)) { h8300_print_register (gdbarch, file, frame, E_SBR_REGNUM); h8300_print_register (gdbarch, file, frame, E_VBR_REGNUM); @@ -1044,7 +1053,7 @@ h8300_print_registers_info (struct gdbar { if (regno =3D=3D E_CCR_REGNUM) h8300_print_register (gdbarch, file, frame, E_PSEUDO_CCR_REGNUM); - else if (regno =3D=3D E_PSEUDO_EXR_REGNUM && h8300smode) + else if (regno =3D=3D E_PSEUDO_EXR_REGNUM && is_h8300smode (current_= gdbarch)) h8300_print_register (gdbarch, file, frame, E_PSEUDO_EXR_REGNUM); else h8300_print_register (gdbarch, file, frame, regno); @@ -1078,7 +1087,7 @@ h8300_register_type (struct gdbarch *gdb return builtin_type_uint8; else if (regno =3D=3D E_PSEUDO_EXR_REGNUM) return builtin_type_uint8; - else if (h8300hmode) + else if (is_h8300hmode (current_gdbarch)) return builtin_type_int32; else return builtin_type_int16; @@ -1192,9 +1201,6 @@ h8300_gdbarch_init (struct gdbarch_info=20 switch (info.bfd_arch_info->mach) { case bfd_mach_h8300: - h8300sxmode =3D 0; - h8300smode =3D 0; - h8300hmode =3D 0; set_gdbarch_num_regs (gdbarch, 13); set_gdbarch_num_pseudo_regs (gdbarch, 1); set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300_dbg_reg_to_regnum); @@ -1210,9 +1216,6 @@ h8300_gdbarch_init (struct gdbarch_info=20 break; case bfd_mach_h8300h: case bfd_mach_h8300hn: - h8300sxmode =3D 0; - h8300smode =3D 0; - h8300hmode =3D 1; set_gdbarch_num_regs (gdbarch, 13); set_gdbarch_num_pseudo_regs (gdbarch, 1); set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300_dbg_reg_to_regnum); @@ -1222,13 +1225,11 @@ h8300_gdbarch_init (struct gdbarch_info=20 set_gdbarch_register_name (gdbarch, h8300_register_name); if(info.bfd_arch_info->mach !=3D bfd_mach_h8300hn) { - h8300_normal_mode =3D 0; set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 4 * TARGET_CHAR_BIT); } else { - h8300_normal_mode =3D 1; set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 2 * TARGET_CHAR_BIT); } @@ -1238,9 +1239,6 @@ h8300_gdbarch_init (struct gdbarch_info=20 break; case bfd_mach_h8300s: case bfd_mach_h8300sn: - h8300sxmode =3D 0; - h8300smode =3D 1; - h8300hmode =3D 1; set_gdbarch_num_regs (gdbarch, 16); set_gdbarch_num_pseudo_regs (gdbarch, 2); set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); @@ -1250,13 +1248,11 @@ h8300_gdbarch_init (struct gdbarch_info=20 set_gdbarch_register_name (gdbarch, h8300s_register_name); if(info.bfd_arch_info->mach !=3D bfd_mach_h8300sn) { - h8300_normal_mode =3D 0; set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 4 * TARGET_CHAR_BIT); } else { - h8300_normal_mode =3D 1; set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 2 * TARGET_CHAR_BIT); } @@ -1266,9 +1262,6 @@ h8300_gdbarch_init (struct gdbarch_info=20 break; case bfd_mach_h8300sx: case bfd_mach_h8300sxn: - h8300sxmode =3D 1; - h8300smode =3D 1; - h8300hmode =3D 1; set_gdbarch_num_regs (gdbarch, 18); set_gdbarch_num_pseudo_regs (gdbarch, 2); set_gdbarch_ecoff_reg_to_regnum (gdbarch, h8300s_dbg_reg_to_regnum); @@ -1278,13 +1271,11 @@ h8300_gdbarch_init (struct gdbarch_info=20 set_gdbarch_register_name (gdbarch, h8300sx_register_name); if(info.bfd_arch_info->mach !=3D bfd_mach_h8300sxn) { - h8300_normal_mode =3D 0; set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 4 * TARGET_CHAR_BIT); } else { - h8300_normal_mode =3D 1; set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 2 * TARGET_CHAR_BIT); } @@ -1370,3 +1361,39 @@ _initialize_h8300_tdep (void) { register_gdbarch_init (bfd_arch_h8300, h8300_gdbarch_init); } + +static int +is_h8300hmode (struct gdbarch *gdbarch) +{ + return gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sx + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sxn + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300s + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sn + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300h + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300hn; +} + +static int +is_h8300smode (struct gdbarch *gdbarch) +{ + return gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sx + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sxn + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300s + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sn; +} + +static int +is_h8300sxmode (struct gdbarch *gdbarch) +{ + return gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sx + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sxn; +} + +static int +is_h8300_normal_mode (struct gdbarch *gdbarch) +{ + return gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sxn + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300sn + || gdbarch_bfd_arch_info (gdbarch)->mach =3D=3D bfd_mach_h8300hn; +} + diff -upr --strip-trailing-cr gdb+dejagnu-20031114.orig/gdb/remote-e7000.c = gdb+dejagnu-20031114/gdb/remote-e7000.c --- gdb+dejagnu-20031114.orig/gdb/remote-e7000.c 2003-10-10 12:43:10.000000= 000 +0530 +++ gdb+dejagnu-20031114/gdb/remote-e7000.c 2003-12-01 16:18:05.000000000 += 0530 @@ -657,10 +657,6 @@ e7000_open (char *args, int from_tty) } serial_raw (e7000_desc); =20 -#ifdef GDB_TARGET_IS_H8300 - h8300hmode =3D 1; -#endif - /* Start the remote connection; if error (0), discard this target. In particular, if the user quits, be sure to discard it (we'd be in an inconsistent state otherwise). */ @@ -909,15 +905,18 @@ e7000_fetch_registers (void) wanted =3D want_sh3; } } -#ifdef GDB_TARGET_IS_H8300 if (TARGET_ARCHITECTURE->arch =3D=3D bfd_arch_h8300) { - if (h8300smode) - wanted =3D want_h8300s; - else - wanted =3D want_h8300h; + wanted =3D want_h8300h; + switch (TARGET_ARCHITECTURE->mach) + { + case bfd_mach_h8300s: + case bfd_mach_h8300sn: + case bfd_mach_h8300sx: + case bfd_mach_h8300sxn: + wanted =3D want_h8300s; + } } -#endif =20 fetch_regs_from_dump (gch, wanted); =20 @@ -2046,15 +2045,18 @@ e7000_wait (ptid_t ptid, struct target_w wanted_nopc =3D want_nopc_sh3; } } -#ifdef GDB_TARGET_IS_H8300 if (TARGET_ARCHITECTURE->arch =3D=3D bfd_arch_h8300) { - if (h8300smode) - wanted_nopc =3D want_nopc_h8300s; - else - wanted_nopc =3D want_nopc_h8300h; + wanted_nopc =3D want_nopc_h8300h; + switch (TARGET_ARCHITECTURE->mach) + { + case bfd_mach_h8300s: + case bfd_mach_h8300sn: + case bfd_mach_h8300sx: + case bfd_mach_h8300sxn: + wanted_nopc =3D want_nopc_h8300s; + } } -#endif fetch_regs_from_dump (gch, wanted_nopc); =20 /* And supply the extra ones the simulator uses */ diff -upr --strip-trailing-cr gdb+dejagnu-20031114.orig/sim/h8300/compile.c= gdb+dejagnu-20031114/sim/h8300/compile.c --- gdb+dejagnu-20031114.orig/sim/h8300/compile.c 2003-10-17 18:15:56.00000= 0000 +0530 +++ gdb+dejagnu-20031114/sim/h8300/compile.c 2003-11-27 15:20:43.000000000 = +0530 @@ -4930,6 +4930,8 @@ set_h8300h (unsigned long machine) This function being replaced by a sim_open:ARGV configuration option. */ =20 + h8300hmode =3D h8300smode =3D h8300sxmode =3D h8300_normal_mode =3D 0; + if (machine =3D=3D bfd_mach_h8300sx || machine =3D=3D bfd_mach_h8300sxn) h8300sxmode =3D 1; =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > -----Original Message----- > From: Andrew Cagney [mailto:cagney@gnu.org] > Sent: Monday, December 01, 2003 10:56 PM > To: Dhananjay R. Deshpande > Cc: Andrew Cagney; Michael Snyder; gdb-patches@sources.redhat.com > Subject: Re: H8300 Patch - Fix GDB crash problem when object file of > different H8 cpu is loaded >=20 >=20 > Basicly ok (and thanks), can you just change these functions: >=20 > > +int > > +is_h8300smode (void) > > +{ > > + return gdbarch_bfd_arch_info (current_gdbarch)->mach =3D=3D=20 > bfd_mach_h8300sx > > + || gdbarch_bfd_arch_info (current_gdbarch)->mach =3D=3D=20 > bfd_mach_h8300sxn > > + || gdbarch_bfd_arch_info (current_gdbarch)->mach =3D=3D=20 > bfd_mach_h8300s > > + || gdbarch_bfd_arch_info (current_gdbarch)->mach =3D=3D=20 > bfd_mach_h8300sn; > > +} > > + >=20 > so that the "current_gdbarch" is passed explicitly as a=20 > parameter making=20 > the call: > is_h8300smode (current_gdbarch) > That will save someone the effort of having to add the=20 > parameter later.=20 > It still leaves the task of replacing current_gdbarch with=20 > something=20 > more local at the call site, but lets leave that as a later pass. >=20 > With that change it's ok to commit. >=20 > Can you also please, as a separate patch (don't forget=20 > changelog and to=20 > post it), add yourself to the write after approval list. >=20 > Andrew >=20 >=20 >=20