* [patch/rfa] Use inferior_created observer to cleanup HPUXHPPA code
@ 2004-06-10 6:02 Randolph Chung
2004-06-14 18:40 ` Randolph Chung
0 siblings, 1 reply; 4+ messages in thread
From: Randolph Chung @ 2004-06-10 6:02 UTC (permalink / raw)
To: gdb-patches
Cleans up some HPUXHPPA code in symfile.c; ok to apply?
randolph
2004-06-09 Randolph Chung <tausq@debian.org>
* Makefile.in (hppa-hpux-tdep.o): Update dependency.
* hppa-hpux-tdep.c (hp_cxx_exception_support_initialized): Make
static.
(hppa_hpux_inferior_created): New function.
(hppa_hpux_init_abi): Register observer.
* symfile.c (hp_cxx_exception_support_initialized)
(RESET_HP_UX_GLOBALS): Remove HPUXHPPA specific hacks.
(symbol_file_add_main_1, symbol_file_clear): Likewise.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.585
diff -u -p -r1.585 Makefile.in
--- Makefile.in 7 Jun 2004 02:08:06 -0000 1.585
+++ Makefile.in 10 Jun 2004 05:30:40 -0000
@@ -1836,7 +1836,7 @@ hppah-nat.o: hppah-nat.c $(defs_h) $(inf
hppa-hpux-tdep.o: hppa-hpux-tdep.c $(defs_h) $(arch_utils_h) $(gdbcore_h) \
$(osabi_h) $(gdb_string_h) $(frame_h) $(frame_unwind_h) \
$(trad_frame_h) $(symtab_h) $(objfiles_h) $(inferior_h) $(infcall_h) \
- $(hppa_tdep_h)
+ $(observer_h) $(hppa_tdep_h)
hppa-tdep.o: hppa-tdep.c $(defs_h) $(frame_h) $(bfd_h) $(inferior_h) \
$(regcache_h) $(completer_h) $(osabi_h) $(gdb_assert_h) \
$(arch_utils_h) $(symtab_h) $(dis_asm_h) $(trad_frame_h) \
Index: hppa-hpux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/hppa-hpux-tdep.c,v
retrieving revision 1.20
diff -u -p -r1.20 hppa-hpux-tdep.c
--- hppa-hpux-tdep.c 7 Jun 2004 02:17:29 -0000 1.20
+++ hppa-hpux-tdep.c 10 Jun 2004 05:30:40 -0000
@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
#include "objfiles.h"
#include "inferior.h"
#include "infcall.h"
+#include "observer.h"
#include "hppa-tdep.h"
#include <dl.h>
@@ -533,7 +534,7 @@ __eh_notification;
/* Is exception-handling support available with this executable? */
static int hp_cxx_exception_support = 0;
/* Has the initialize function been run? */
-int hp_cxx_exception_support_initialized = 0;
+static int hp_cxx_exception_support_initialized = 0;
/* Address of __eh_notify_hook */
static CORE_ADDR eh_notify_hook_addr = 0;
/* Address of __d_eh_notify_callback */
@@ -1203,6 +1204,15 @@ hppa_hpux_sigtramp_unwind_sniffer (struc
return NULL;
}
+static void
+hppa_hpux_inferior_created (struct target_ops *objfile, int from_tty)
+{
+ /* Some HP-UX related globals to clear when a new "main"
+ symbol file is loaded. HP-specific. */
+ deprecated_hp_som_som_object_present = 0;
+ hp_cxx_exception_support_initialized = 0;
+}
+
static void
hppa_hpux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
@@ -1219,7 +1375,9 @@ hppa_hpux_init_abi (struct gdbarch_info
hppa_hpux_in_solib_return_trampoline);
set_gdbarch_skip_trampoline_code (gdbarch, hppa_hpux_skip_trampoline_code);
frame_unwind_append_sniffer (gdbarch, hppa_hpux_sigtramp_unwind_sniffer);
+
+ observer_attach_inferior_created (hppa_hpux_inferior_created);
}
static void
Index: symfile.c
===================================================================
RCS file: /cvs/src/src/gdb/symfile.c,v
retrieving revision 1.130
diff -u -p -r1.130 symfile.c
--- symfile.c 20 May 2004 09:51:33 -0000 1.130
+++ symfile.c 10 Jun 2004 05:30:42 -0000
@@ -60,18 +60,6 @@
#define O_BINARY 0
#endif
-#ifdef HPUXHPPA
-
-/* Some HP-UX related globals to clear when a new "main"
- symbol file is loaded. HP-specific. */
-
-extern int hp_cxx_exception_support_initialized;
-#define RESET_HP_UX_GLOBALS() do {\
- deprecated_hp_som_som_object_present = 0; /* indicates HP-compiled code */ \
- hp_cxx_exception_support_initialized = 0; /* must reinitialize exception stuff */ \
- } while (0)
-#endif
-
int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num);
void (*deprecated_show_load_progress) (const char *section,
unsigned long section_sent,
@@ -957,10 +945,6 @@ symbol_file_add_main_1 (char *args, int
{
symbol_file_add (args, from_tty, NULL, 1, flags);
-#ifdef HPUXHPPA
- RESET_HP_UX_GLOBALS ();
-#endif
-
/* Getting new symbols may change our opinion about
what is frameless. */
reinit_frame_cache ();
@@ -989,9 +973,6 @@ symbol_file_clear (int from_tty)
symfile_objfile = NULL;
if (from_tty)
printf_unfiltered ("No symbol file now.\n");
-#ifdef HPUXHPPA
- RESET_HP_UX_GLOBALS ();
-#endif
}
static char *
@@ -1944,9 +1925,6 @@ reread_symbols (void)
if (objfile == symfile_objfile)
{
(*objfile->sf->sym_new_init) (objfile);
-#ifdef HPUXHPPA
- RESET_HP_UX_GLOBALS ();
-#endif
}
(*objfile->sf->sym_init) (objfile);
--
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch/rfa] Use inferior_created observer to cleanup HPUXHPPA code
2004-06-10 6:02 [patch/rfa] Use inferior_created observer to cleanup HPUXHPPA code Randolph Chung
@ 2004-06-14 18:40 ` Randolph Chung
2004-06-14 20:25 ` Mark Kettenis
0 siblings, 1 reply; 4+ messages in thread
From: Randolph Chung @ 2004-06-14 18:40 UTC (permalink / raw)
To: gdb-patches
ping? -randolph
In reference to a message from Randolph Chung, dated Jun 09:
> Cleans up some HPUXHPPA code in symfile.c; ok to apply?
>
> randolph
>
> 2004-06-09 Randolph Chung <tausq@debian.org>
>
> * Makefile.in (hppa-hpux-tdep.o): Update dependency.
> * hppa-hpux-tdep.c (hp_cxx_exception_support_initialized): Make
> static.
> (hppa_hpux_inferior_created): New function.
> (hppa_hpux_init_abi): Register observer.
> * symfile.c (hp_cxx_exception_support_initialized)
> (RESET_HP_UX_GLOBALS): Remove HPUXHPPA specific hacks.
> (symbol_file_add_main_1, symbol_file_clear): Likewise.
>
> Index: Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/gdb/Makefile.in,v
> retrieving revision 1.585
> diff -u -p -r1.585 Makefile.in
> --- Makefile.in 7 Jun 2004 02:08:06 -0000 1.585
> +++ Makefile.in 10 Jun 2004 05:30:40 -0000
> @@ -1836,7 +1836,7 @@ hppah-nat.o: hppah-nat.c $(defs_h) $(inf
> hppa-hpux-tdep.o: hppa-hpux-tdep.c $(defs_h) $(arch_utils_h) $(gdbcore_h) \
> $(osabi_h) $(gdb_string_h) $(frame_h) $(frame_unwind_h) \
> $(trad_frame_h) $(symtab_h) $(objfiles_h) $(inferior_h) $(infcall_h) \
> - $(hppa_tdep_h)
> + $(observer_h) $(hppa_tdep_h)
> hppa-tdep.o: hppa-tdep.c $(defs_h) $(frame_h) $(bfd_h) $(inferior_h) \
> $(regcache_h) $(completer_h) $(osabi_h) $(gdb_assert_h) \
> $(arch_utils_h) $(symtab_h) $(dis_asm_h) $(trad_frame_h) \
> Index: hppa-hpux-tdep.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/hppa-hpux-tdep.c,v
> retrieving revision 1.20
> diff -u -p -r1.20 hppa-hpux-tdep.c
> --- hppa-hpux-tdep.c 7 Jun 2004 02:17:29 -0000 1.20
> +++ hppa-hpux-tdep.c 10 Jun 2004 05:30:40 -0000
> @@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
> #include "objfiles.h"
> #include "inferior.h"
> #include "infcall.h"
> +#include "observer.h"
> #include "hppa-tdep.h"
>
> #include <dl.h>
> @@ -533,7 +534,7 @@ __eh_notification;
> /* Is exception-handling support available with this executable? */
> static int hp_cxx_exception_support = 0;
> /* Has the initialize function been run? */
> -int hp_cxx_exception_support_initialized = 0;
> +static int hp_cxx_exception_support_initialized = 0;
> /* Address of __eh_notify_hook */
> static CORE_ADDR eh_notify_hook_addr = 0;
> /* Address of __d_eh_notify_callback */
> @@ -1203,6 +1204,15 @@ hppa_hpux_sigtramp_unwind_sniffer (struc
> return NULL;
> }
>
> +static void
> +hppa_hpux_inferior_created (struct target_ops *objfile, int from_tty)
> +{
> + /* Some HP-UX related globals to clear when a new "main"
> + symbol file is loaded. HP-specific. */
> + deprecated_hp_som_som_object_present = 0;
> + hp_cxx_exception_support_initialized = 0;
> +}
> +
> static void
> hppa_hpux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
> {
> @@ -1219,7 +1375,9 @@ hppa_hpux_init_abi (struct gdbarch_info
> hppa_hpux_in_solib_return_trampoline);
> set_gdbarch_skip_trampoline_code (gdbarch, hppa_hpux_skip_trampoline_code);
>
> frame_unwind_append_sniffer (gdbarch, hppa_hpux_sigtramp_unwind_sniffer);
> +
> + observer_attach_inferior_created (hppa_hpux_inferior_created);
> }
>
> static void
> Index: symfile.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/symfile.c,v
> retrieving revision 1.130
> diff -u -p -r1.130 symfile.c
> --- symfile.c 20 May 2004 09:51:33 -0000 1.130
> +++ symfile.c 10 Jun 2004 05:30:42 -0000
> @@ -60,18 +60,6 @@
> #define O_BINARY 0
> #endif
>
> -#ifdef HPUXHPPA
> -
> -/* Some HP-UX related globals to clear when a new "main"
> - symbol file is loaded. HP-specific. */
> -
> -extern int hp_cxx_exception_support_initialized;
> -#define RESET_HP_UX_GLOBALS() do {\
> - deprecated_hp_som_som_object_present = 0; /* indicates HP-compiled code */ \
> - hp_cxx_exception_support_initialized = 0; /* must reinitialize exception stuff */ \
> - } while (0)
> -#endif
> -
> int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num);
> void (*deprecated_show_load_progress) (const char *section,
> unsigned long section_sent,
> @@ -957,10 +945,6 @@ symbol_file_add_main_1 (char *args, int
> {
> symbol_file_add (args, from_tty, NULL, 1, flags);
>
> -#ifdef HPUXHPPA
> - RESET_HP_UX_GLOBALS ();
> -#endif
> -
> /* Getting new symbols may change our opinion about
> what is frameless. */
> reinit_frame_cache ();
> @@ -989,9 +973,6 @@ symbol_file_clear (int from_tty)
> symfile_objfile = NULL;
> if (from_tty)
> printf_unfiltered ("No symbol file now.\n");
> -#ifdef HPUXHPPA
> - RESET_HP_UX_GLOBALS ();
> -#endif
> }
>
> static char *
> @@ -1944,9 +1925,6 @@ reread_symbols (void)
> if (objfile == symfile_objfile)
> {
> (*objfile->sf->sym_new_init) (objfile);
> -#ifdef HPUXHPPA
> - RESET_HP_UX_GLOBALS ();
> -#endif
> }
>
> (*objfile->sf->sym_init) (objfile);
> --
> Randolph Chung
> Debian GNU/Linux Developer, hppa/ia64 ports
> http://www.tausq.org/
--
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch/rfa] Use inferior_created observer to cleanup HPUXHPPA code
2004-06-14 18:40 ` Randolph Chung
@ 2004-06-14 20:25 ` Mark Kettenis
2004-06-14 20:41 ` Randolph Chung
0 siblings, 1 reply; 4+ messages in thread
From: Mark Kettenis @ 2004-06-14 20:25 UTC (permalink / raw)
To: randolph; +Cc: gdb-patches
Date: Mon, 14 Jun 2004 11:40:14 -0700
From: Randolph Chung <randolph@tausq.org>
ping? -randolph
One minor nit (which is probably just an oversight) -- see below.
With that change this is OK. Please check it in.
Mark
> Index: hppa-hpux-tdep.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/hppa-hpux-tdep.c,v
> retrieving revision 1.20
> diff -u -p -r1.20 hppa-hpux-tdep.c
> --- hppa-hpux-tdep.c 7 Jun 2004 02:17:29 -0000 1.20
> +++ hppa-hpux-tdep.c 10 Jun 2004 05:30:40 -0000
> @@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
> #include "objfiles.h"
> #include "inferior.h"
> #include "infcall.h"
> +#include "observer.h"
> #include "hppa-tdep.h"
>
> #include <dl.h>
> @@ -533,7 +534,7 @@ __eh_notification;
> /* Is exception-handling support available with this executable? */
> static int hp_cxx_exception_support = 0;
> /* Has the initialize function been run? */
> -int hp_cxx_exception_support_initialized = 0;
> +static int hp_cxx_exception_support_initialized = 0;
> /* Address of __eh_notify_hook */
> static CORE_ADDR eh_notify_hook_addr = 0;
> /* Address of __d_eh_notify_callback */
> @@ -1203,6 +1204,15 @@ hppa_hpux_sigtramp_unwind_sniffer (struc
> return NULL;
> }
>
> +static void
> +hppa_hpux_inferior_created (struct target_ops *objfile, int from_tty)
> +{
> + /* Some HP-UX related globals to clear when a new "main"
> + symbol file is loaded. HP-specific. */
Please make sure every full stop is followed by two spaces.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch/rfa] Use inferior_created observer to cleanup HPUXHPPA code
2004-06-14 20:25 ` Mark Kettenis
@ 2004-06-14 20:41 ` Randolph Chung
0 siblings, 0 replies; 4+ messages in thread
From: Randolph Chung @ 2004-06-14 20:41 UTC (permalink / raw)
To: Mark Kettenis; +Cc: gdb-patches
> Please make sure every full stop is followed by two spaces.
oops; thanks! fixed and committed.
randolph
--
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-06-14 20:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-06-10 6:02 [patch/rfa] Use inferior_created observer to cleanup HPUXHPPA code Randolph Chung
2004-06-14 18:40 ` Randolph Chung
2004-06-14 20:25 ` Mark Kettenis
2004-06-14 20:41 ` Randolph Chung
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox