From e63f20d27fb671946a8d73221e0d8e4b8d1828f3 Mon Sep 17 00:00:00 2001 From: Stu Grossman Date: Mon, 28 Sep 1992 21:27:05 +0000 Subject: [PATCH] Use new interfaces to native/target stuff. --- gdb/energize-patches | 148 +++++++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 70 deletions(-) diff --git a/gdb/energize-patches b/gdb/energize-patches index 7876bd09649..5c2994f8846 100755 --- a/gdb/energize-patches +++ b/gdb/energize-patches @@ -3,8 +3,8 @@ # and then Sanitize. =================================================================== -*** 2.71 1992/09/25 17:04:36 ---- .Sanitize 1992/09/25 23:47:40 +*** 2.72 1992/09/27 06:48:41 +--- .Sanitize 1992/09/28 16:15:04 *************** *** 74,79 **** --- 74,82 ---- @@ -18,8 +18,8 @@ environ.h eval.c =================================================================== -*** 1.186 1992/09/25 17:03:18 ---- Makefile.in 1992/09/26 00:20:58 +*** 1.187 1992/09/26 08:06:30 +--- Makefile.in 1992/09/28 17:46:22 *************** *** 123,128 **** --- 123,135 ---- @@ -37,25 +37,31 @@ # -I. for config files. # -I${srcdir} possibly for regex.h also. *************** -*** 158,164 **** +*** 157,166 **** + # Libraries and corresponding dependencies for compiling gdb. # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs. # TERMCAP comes after readline, since readline depends on it. - CLIBS = ${BFD_LIB} ${RL_LIB} ${TERMCAP} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} \ +! CLIBS = ${BFD_LIB} ${RL_LIB} ${TERMCAP} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} \ ! ${XM_CLIBS} ${TM_CLIBS} ${NAT_CLIBS} - CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${NAT_CDEPS} \ - ${BFD_LIB} ${RL_LIB} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} +! CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${NAT_CDEPS} \ +! ${BFD_LIB} ${RL_LIB} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} ---- 165,171 ---- + ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES} + ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES} +--- 164,173 ---- + # Libraries and corresponding dependencies for compiling gdb. # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs. # TERMCAP comes after readline, since readline depends on it. - CLIBS = ${BFD_LIB} ${RL_LIB} ${TERMCAP} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} \ -! ${ENERGIZE_LIB} ${XM_CLIBS} ${TM_CLIBS} ${NAT_CLIBS} - CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${NAT_CDEPS} \ - ${BFD_LIB} ${RL_LIB} ${OPCODES} ${MMALLOC_LIB} ${LIBIBERTY} +! CLIBS = ${BFD_LIB} ${RL_LIB} ${TERMCAP} ${OPCODES} ${MMALLOC_LIB} \ +! ${LIBIBERTY} ${XM_CLIBS} ${TM_CLIBS} ${NAT_CLIBS} ${ENERGIZE_LIB} +! CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${NAT_CDEPS} ${BFD_LIB} ${RL_LIB} ${OPCODES} \ +! ${MMALLOC_LIB} ${LIBIBERTY} ${ENERGIZE_LIB} + ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES} + ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES} *************** *** 200,206 **** - mem-break.c target.c inftarg.c \ + mem-break.c target.c \ dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c stabsread.c \ ieee-float.c language.c parse.c buildsym.c objfiles.c \ ! minsyms.c mipsread.c maint.c @@ -63,7 +69,7 @@ # Source files in subdirectories (which will be handled separately by # 'make gdb.tar.Z'). --- 207,213 ---- - mem-break.c target.c inftarg.c \ + mem-break.c target.c \ dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c stabsread.c \ ieee-float.c language.c parse.c buildsym.c objfiles.c \ ! minsyms.c mipsread.c maint.c energize.c @@ -74,7 +80,7 @@ *** 289,295 **** command.o utils.o expprint.o environ.o version.o gdbtypes.o \ copying.o $(DEPFILES) mem-break.o target.o \ - inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \ + ieee-float.o putenv.o parse.o language.o $(YYOBJ) \ ! buildsym.o objfiles.o minsyms.o maint.o demangle.o \ dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o \ stabsread.o core.o @@ -82,7 +88,7 @@ --- 296,302 ---- command.o utils.o expprint.o environ.o version.o gdbtypes.o \ copying.o $(DEPFILES) mem-break.o target.o \ - inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \ + ieee-float.o putenv.o parse.o language.o $(YYOBJ) \ ! buildsym.o objfiles.o minsyms.o maint.o demangle.o energize.o \ dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o \ stabsread.o core.o @@ -129,7 +135,7 @@ # on itself without copying the executable. So "make gdb1" will make =================================================================== *** 1.47 1992/09/19 11:47:08 ---- breakpoint.c 1992/09/25 23:47:48 +--- breakpoint.c 1992/09/28 16:15:05 *************** *** 273,278 **** --- 273,279 ---- @@ -246,7 +252,7 @@ if (xgdb_verbose && bpt->type == bp_breakpoint) =================================================================== *** 1.18 1992/07/10 17:22:30 ---- command.c 1992/09/18 19:23:13 +--- command.c 1992/09/28 16:15:06 *************** *** 1093,1098 **** --- 1093,1100 ---- @@ -277,7 +283,7 @@ error ("Fork failed"); =================================================================== *** 1.67 1992/09/21 20:01:00 ---- configure.in 1992/09/25 23:47:53 +--- configure.in 1992/09/28 16:15:06 *************** *** 1,4 **** ! configdirs="doc" @@ -291,7 +297,7 @@ =================================================================== *** 1.48 1992/09/15 08:55:59 ---- defs.h 1992/09/15 08:54:35 +--- defs.h 1992/09/28 16:15:07 *************** *** 811,814 **** --- 811,816 ---- @@ -303,7 +309,7 @@ #endif /* !defined (DEFS_H) */ =================================================================== *** 2.5 1992/09/03 16:26:03 ---- demangle.c 1992/09/15 05:19:59 +--- demangle.c 1992/09/28 16:15:07 *************** *** 37,43 **** the appropriate target configuration file. */ @@ -322,8 +328,21 @@ /* String name for the current demangling style. Set by the "set demangling" =================================================================== +*** 1.34 1992/09/26 05:20:04 +--- infcmd.c 1992/09/28 16:53:10 +*************** +*** 242,247 **** +--- 242,248 ---- + + target_create_inferior (exec_file, inferior_args, + environ_vector (inferior_environ)); ++ energize_new_process(); + } + + static void +=================================================================== *** 1.29 1992/09/25 19:19:00 ---- inflow.c 1992/09/25 23:48:13 +--- inflow.c 1992/09/28 16:15:07 *************** *** 87,93 **** static short pgrp_inferior; @@ -342,52 +361,41 @@ # endif /* not def SHORT_PGRP */ #else /* not def TIOCGPGRP */ =================================================================== -*** 1.14 1992/09/25 19:19:08 ---- inftarg.c 1992/09/26 00:25:51 -*************** -*** 76,86 **** - int pid; - - do { -! #ifdef USE_PROC_FS -! pid = proc_wait (status); -! #else -! pid = wait (status); -! #endif - if (pid == -1) /* No more children to wait for */ - { - fprintf (stderr, "Child process unexpectedly missing.\n"); ---- 76,82 ---- - int pid; +*** 1.59 1992/09/26 01:49:01 +--- infrun.c 1992/09/28 16:22:33 +*************** +*** 519,525 **** + flush_cached_frames (); + registers_changed (); - do { -! pid = energize_wait (status); - if (pid == -1) /* No more children to wait for */ - { - fprintf (stderr, "Child process unexpectedly missing.\n"); +! target_wait (&w); + + #ifdef SIGTRAP_STOP_AFTER_LOAD + +--- 519,525 ---- + flush_cached_frames (); + registers_changed (); + +! energize_wait (&w); + + #ifdef SIGTRAP_STOP_AFTER_LOAD + +=================================================================== +*** 1.17 1992/09/26 09:06:10 +--- inftarg.c 1992/09/28 16:43:53 *************** -*** 138,143 **** ---- 134,140 ---- +*** 123,128 **** +--- 123,129 ---- attach (pid); inferior_pid = pid; + energize_new_process(); push_target (&child_ops); - - mark_breakpoints_out (); -*************** -*** 394,399 **** ---- 391,397 ---- - Here we must get it up to actual execution of the real program. */ - - inferior_pid = pid; /* Needed for wait_for_inferior stuff below */ -+ energize_new_process(); - - clear_proceed_status (); - + #endif /* ATTACH_DETACH */ + } =================================================================== *** 1.56 1992/09/22 05:23:29 ---- main.c 1992/09/25 23:48:21 +--- main.c 1992/09/28 16:15:08 *************** *** 441,446 **** --- 441,447 ---- @@ -488,7 +496,7 @@ break; =================================================================== *** 1.32 1992/09/15 06:27:00 ---- printcmd.c 1992/09/15 06:30:06 +--- printcmd.c 1992/09/28 16:15:08 *************** *** 778,783 **** --- 778,792 ---- @@ -541,7 +549,7 @@ =================================================================== *** 1.35 1992/09/18 09:20:00 ---- stack.c 1992/09/25 23:48:37 +--- stack.c 1992/09/28 16:15:09 *************** *** 159,165 **** if (addressprint) @@ -623,7 +631,7 @@ if (sal.symtab) =================================================================== *** 1.58 1992/09/19 16:55:36 ---- symfile.c 1992/09/25 23:48:39 +--- symfile.c 1992/09/28 16:15:09 *************** *** 614,619 **** --- 614,621 ---- @@ -636,8 +644,8 @@ } =================================================================== -*** 1.62 1992/09/18 09:21:36 ---- utils.c 1992/09/25 23:48:47 +*** 1.63 1992/09/26 05:34:06 +--- utils.c 1992/09/28 16:15:09 *************** *** 700,720 **** fflush (stdout); @@ -721,7 +729,7 @@ || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX)) =================================================================== *** 1.54 1992/09/15 06:27:03 ---- valprint.c 1992/09/15 06:30:13 +--- valprint.c 1992/09/28 16:15:10 *************** *** 488,493 **** --- 488,494 ---- @@ -793,8 +801,8 @@ if (i < len) fprintf_filtered (stream, "..."); =================================================================== -*** 1.4 1992/06/10 02:05:16 ---- config/amix.mh 1992/07/21 20:18:16 +*** 1.5 1992/09/26 08:07:45 +--- amix.mh 1992/09/28 16:15:10 *************** *** 22,24 **** --- 22,38 ---- @@ -816,8 +824,8 @@ + ENERGIZE_LIBS = ${ENERGIZE_LIB} -L/usr/lib -lm -lnet -lresolv -lform \ + -lsocket -lc /usr/ucblib/libucb.a -lnsl =================================================================== -*** 1.4 1992/06/15 19:25:13 ---- config/ncr3000.mh 1992/09/15 01:51:32 +*** 1.5 1992/09/26 08:08:14 +--- ncr3000.mh 1992/09/28 16:15:10 *************** *** 38,40 **** --- 38,59 ---- -- 2.30.2