gdb diffs (part 2 of 2)

Bob Rose rrr at naucse.UUCP
Sat Aug 13 03:04:22 AEST 1988


>From bobert!rrr Fri Aug 12 00:29:39 1988
Date: Fri, 12 Aug 88 00:29:32 mst
From: bobert!rrr
Message-Id: <8808120729.AA16204 at naucse.local>
Apparently-To: rrr
Status: R

#! /bin/sh
# This is a shell archive.  Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file".  To overwrite existing
# files, type "sh file -c".  You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g..  If this archive is complete, you
# will see the following message at the end:
#		"End of archive 2 (of 2)."
# Contents:  Diffs
# Wrapped by rrr at bobert on Wed Aug 10 13:52:35 1988
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'Diffs' -a "${1}" != "-c" ; then 
  echo shar: Will not clobber existing file \"'Diffs'\"
else
echo shar: Extracting \"'Diffs'\" \(33017 characters\)
sed "s/^X//" >'Diffs' <<'END_OF_FILE'
X*** Makefile	Thu Feb  4 16:39:43 1988
X--- /usr/local/src/Gnu/gdb/Makefile	Wed Jul 27 13:03:22 1988
X***************
X*** 1,5
X  # -I. for "#include <obstack.h>"
X! CFLAGS = -g -I.
X  # NOTE!!! -O  may FAIL TO WORK!  See initialize.h for some weird hacks.
X  
X  # define this to be "obstack.o" if you don't have the obstack library installed
X
X--- 1,5 -----
X  # -I. for "#include <obstack.h>"
X! CFLAGS = -g -I. -DCOFF_FORMAT -DUSG -Dunixpc
X  # NOTE!!! -O  may FAIL TO WORK!  See initialize.h for some weird hacks.
X  
X  # define this to be "obstack.o" if you don't have the obstack library installed
X***************
X*** 5,12
X  # define this to be "obstack.o" if you don't have the obstack library installed
X  # you must at the same time define OBSTACK1 as "obstack.o" 
X  # so that the dependencies work right.
X! OBSTACK = obstack.o
X! OBSTACK1 = obstack.o
X  
X  STARTOBS = main.o firstfile.o
X  
X
X--- 5,12 -----
X  # define this to be "obstack.o" if you don't have the obstack library installed
X  # you must at the same time define OBSTACK1 as "obstack.o" 
X  # so that the dependencies work right.
X! OBSTACK = obstack.o regex.o alloca.o signals.o insque.o
X! OBSTACK1 = obstack.o regex.o alloca.o signals.o insque.o
X  
X  STARTOBS = main.o firstfile.o
X  
X***************
X*** 21,27
X  ENDOBS = lastfile.o command.o utils.o expread.o expprint.o pinsn.o \
X  	environ.o version.o
X  
X! TSSTART = /lib/crt0.o
X  
X  NTSSTART = kdb-start.o
X  
X
X--- 21,28 -----
X  ENDOBS = lastfile.o command.o utils.o expread.o expprint.o pinsn.o \
X  	environ.o version.o
X  
X! #TSSTART = /lib/crt0.o
X! TSSTART =
X  
X  NTSSTART = kdb-start.o
X  
X***************
X*** 26,32
X  NTSSTART = kdb-start.o
X  
X  gdb : $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) $(OBSTACK1)
X! 	$(CC) -o gdb $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) -lg $(OBSTACK)
X  
X  xgdb : $(STARTOBS) $(OBS) xgdb.o $(TSOBS) $(ENDOBS) $(OBSTACK1)
X  	$(CC) -o xgdb $(STARTOBS) $(OBS) xgdb.o $(TSOBS) $(ENDOBS) \
X
X--- 27,33 -----
X  NTSSTART = kdb-start.o
X  
X  gdb : $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) $(OBSTACK1)
X! 	$(CC) -o gdb $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) $(OBSTACK)
X  
X  xgdb : $(STARTOBS) $(OBS) xgdb.o $(TSOBS) $(ENDOBS) $(OBSTACK1)
X  	$(CC) -o xgdb $(STARTOBS) $(OBS) xgdb.o $(TSOBS) $(ENDOBS) \
X*** /usr/local/src/Gnu/gdb/coffread.c	Sat Jul 30 16:58:53 1988
X--- coffread.c	Fri Feb  5 11:38:22 1988
X***************
X*** 31,39
X  #include <stdio.h>
X  #include <obstack.h>
X  #include <sys/param.h>
X- #ifdef USG
X- #include <fcntl.h>
X- #else
X  #include <sys/file.h>
X  #endif
X  
X
X--- 31,36 -----
X  #include <stdio.h>
X  #include <obstack.h>
X  #include <sys/param.h>
X  #include <sys/file.h>
X  
X  static void add_symbol_to_list ();
X***************
X*** 35,41
X  #include <fcntl.h>
X  #else
X  #include <sys/file.h>
X- #endif
X  
X  static void add_symbol_to_list ();
X  static void read_coff_symtab ();
X
X--- 32,37 -----
X  #include <obstack.h>
X  #include <sys/param.h>
X  #include <sys/file.h>
X  
X  static void add_symbol_to_list ();
X  static void read_coff_symtab ();
X***************
X*** 168,174
X  struct pending_block *pending_blocks;
X  
X  extern CORE_ADDR first_object_file_end;	/* From blockframe.c */
X- static CORE_ADDR first_object_file_begin;
X  
X  /* File name symbols were loaded from.  */
X  
X
X--- 164,169 -----
X  struct pending_block *pending_blocks;
X  
X  extern CORE_ADDR first_object_file_end;	/* From blockframe.c */
X  
X  /* File name symbols were loaded from.  */
X  
X***************
X*** 819,830
X  	    end_symtab ();
X  
X  	  start_symtab ();
X- #if 0
X-   last_source_file = savestring ("_globals_", strlen ("_globals_"));
X-   cur_src_start_addr = first_object_file_begin;
X-   cur_src_end_addr = first_object_file_end;
X- #else
X- #if 0
X  	  complete_symtab ("_globals_", 0, first_object_file_end);
X  #endif
X  	  complete_symtab ("_globals_", first_object_file_begin, first_object_file_end);
X
X--- 814,819 -----
X  	    end_symtab ();
X  
X  	  start_symtab ();
X  	  complete_symtab ("_globals_", 0, first_object_file_end);
X  	  /* done with all files, everything from here on out is globals */
X  	}
X***************
X*** 826,834
X  #else
X  #if 0
X  	  complete_symtab ("_globals_", 0, first_object_file_end);
X- #endif
X- 	  complete_symtab ("_globals_", first_object_file_begin, first_object_file_end);
X- #endif
X  	  /* done with all files, everything from here on out is globals */
X  	}
X  
X
X--- 815,820 -----
X  
X  	  start_symtab ();
X  	  complete_symtab ("_globals_", 0, first_object_file_end);
X  	  /* done with all files, everything from here on out is globals */
X  	}
X  
X***************
X*** 916,923
X  		    if (num_object_files == 1)
X  		      {
X  			/* Record end address of first file, crt0.s */
X- 			first_object_file_begin = cs->c_value;
X- #if 0
X  			first_object_file_end =
X  			    cs->c_value + main_aux.x_scn.x_scnlen;
X  #else
X
X--- 902,907 -----
X  		    if (num_object_files == 1)
X  		      {
X  			/* Record end address of first file, crt0.s */
X  			first_object_file_end =
X  			    cs->c_value + main_aux.x_scn.x_scnlen;
X  		      }
X***************
X*** 920,928
X  #if 0
X  			first_object_file_end =
X  			    cs->c_value + main_aux.x_scn.x_scnlen;
X- #else
X- 			first_object_file_end = main_aux.x_scn.x_scnlen;
X- #endif
X  		      }
X  		    /*
X  		     * Fill in missing information for debugged 
X
X--- 904,909 -----
X  			/* Record end address of first file, crt0.s */
X  			first_object_file_end =
X  			    cs->c_value + main_aux.x_scn.x_scnlen;
X  		      }
X  		    /*
X  		     * Fill in missing information for debugged 
X***************
X*** 936,953
X  		    break;
X  		  }
X  		else if (strcmp (cs->c_name, _DATA) == 0)
X- 		  {
X- 		    if (num_object_files == 1)
X- 		      {
X- 			/* Record end address of first file, crt0.s */
X- 			first_object_file_begin = cs->c_value;
X- #if 0
X- 			first_object_file_end =
X- 			    cs->c_value + main_aux.x_scn.x_scnlen;
X- #else
X- 			first_object_file_end = main_aux.x_scn.x_scnlen;
X- #endif
X- 		      }
X  		  break;
X  		  }
X  		else if (strcmp (cs->c_name, _BSS) == 0)
X
X--- 917,922 -----
X  		    break;
X  		  }
X  		else if (strcmp (cs->c_name, _DATA) == 0)
X  		  break;
X  		else if (strcmp (cs->c_name, _BSS) == 0)
X  		  break;
X***************
X*** 949,955
X  #endif
X  		      }
X  		  break;
X- 		  }
X  		else if (strcmp (cs->c_name, _BSS) == 0)
X  		  break;
X  
X
X--- 918,923 -----
X  		  }
X  		else if (strcmp (cs->c_name, _DATA) == 0)
X  		  break;
X  		else if (strcmp (cs->c_name, _BSS) == 0)
X  		  break;
X  
X***************
X*** 972,978
X  	      {
X  		/* value contains address of exit/return from function */
X  			/* round it up to next multiple of 16 */
X- #if 0
X  		cs->c_value = (cs->c_value + 15) & -16;
X  #endif
X  		/* { main_aux.x_sym.x_misc.x_lnsz.x_lnno
X
X--- 940,945 -----
X  	      {
X  		/* value contains address of exit/return from function */
X  			/* round it up to next multiple of 16 */
X  		cs->c_value = (cs->c_value + 15) & -16;
X  		/* { main_aux.x_sym.x_misc.x_lnsz.x_lnno
X  			    contains number of lines to '}' */
X***************
X*** 974,980
X  			/* round it up to next multiple of 16 */
X  #if 0
X  		cs->c_value = (cs->c_value + 15) & -16;
X- #endif
X  		/* { main_aux.x_sym.x_misc.x_lnsz.x_lnno
X  			    contains number of lines to '}' */
X  		fcn_last_line = main_aux.x_sym.x_misc.x_lnsz.x_lnno;
X
X--- 941,946 -----
X  		/* value contains address of exit/return from function */
X  			/* round it up to next multiple of 16 */
X  		cs->c_value = (cs->c_value + 15) & -16;
X  		/* { main_aux.x_sym.x_misc.x_lnsz.x_lnno
X  			    contains number of lines to '}' */
X  		fcn_last_line = main_aux.x_sym.x_misc.x_lnsz.x_lnno;
X***************
X*** 1047,1057
X  
X    switch (file_hdr->f_magic)
X      {
X- #ifdef MC68KWRMAGIC
X-       case MC68KWRMAGIC:
X-       case MC68KROMAGIC:
X-       case MC68KPGMAGIC:
X- #else
X        case NS32GMAGIC:
X        case NS32SMAGIC:
X  #endif
X
X--- 1013,1018 -----
X  
X    switch (file_hdr->f_magic)
X      {
X        case NS32GMAGIC:
X        case NS32SMAGIC:
X  	return file_hdr->f_nsyms;
X***************
X*** 1054,1060
X  #else
X        case NS32GMAGIC:
X        case NS32SMAGIC:
X- #endif
X  	return file_hdr->f_nsyms;
X  
X        default:
X
X--- 1015,1020 -----
X      {
X        case NS32GMAGIC:
X        case NS32SMAGIC:
X  	return file_hdr->f_nsyms;
X  
X        default:
X***************
X*** 1189,1198
X    char *result;
X    extern char *rindex ();
X  
X- #ifdef unixpc
X-   strncpy (buffer, aux_entry->x_file.x_fname, FILNMLEN);
X-   buffer[FILNMLEN] = '\0';
X- #else
X    if (aux_entry->x_file.x_foff != 0)
X      strcpy (buffer, stringtab + aux_entry->x_file.x_foff);
X    else
X
X--- 1149,1154 -----
X    char *result;
X    extern char *rindex ();
X  
X    if (aux_entry->x_file.x_foff != 0)
X      strcpy (buffer, stringtab + aux_entry->x_file.x_foff);
X    else
X***************
X*** 1200,1206
X        strncpy (buffer, aux_entry->x_file.x_fname, FILNMLEN);
X        buffer[FILNMLEN] = '\0';
X      }
X- #endif
X    result = buffer;
X    if ((temp = rindex (result, '/')) != NULL)
X      result = temp + 1;
X
X--- 1156,1161 -----
X        strncpy (buffer, aux_entry->x_file.x_fname, FILNMLEN);
X        buffer[FILNMLEN] = '\0';
X      }
X    result = buffer;
X    if ((temp = rindex (result, '/')) != NULL)
X      result = temp + 1;
X***************
X*** 1598,1604
X    switch (c_type)
X      {
X        case T_NULL:
X! 	return builtin_type_void;
X  
X        case T_ARG:
X  	/* shouldn't show up here */
X
X--- 1553,1560 -----
X    switch (c_type)
X      {
X        case T_NULL:
X! 	/* shouldn't show up here */
X! 	break;
X  
X        case T_ARG:
X  	/* shouldn't show up here */
X*** /usr/local/src/Gnu/gdb/command.c	Wed Jul 27 08:43:50 1988
X--- command.c	Thu Feb 11 17:24:58 1988
X***************
X*** 103,111
X  what you give them.   Help stamp out software-hoarding!  */
X  
X  
X- #ifdef USG
X- #define bcopy(a,b,c) memcpy(b,a,c)
X- #endif
X  #include "command.h"
X  #include <stdio.h>
X  
X
X--- 103,108 -----
X  what you give them.   Help stamp out software-hoarding!  */
X  
X  
X  #include "command.h"
X  #include <stdio.h>
X  
X*** /usr/local/src/Gnu/gdb/core.c	Wed Jul 27 17:22:16 1988
X--- core.c	Sat Feb  6 22:57:06 1988
X***************
X*** 27,35
X  #include <signal.h>
X  #include <sys/param.h>
X  #include <sys/dir.h>
X- #ifdef USG
X- #include <fcntl.h>
X- #else
X  #include <sys/file.h>
X  #endif
X  #include <sys/stat.h>
X
X--- 27,32 -----
X  #include <signal.h>
X  #include <sys/param.h>
X  #include <sys/dir.h>
X  #include <sys/file.h>
X  #include <sys/stat.h>
X  
X***************
X*** 31,37
X  #include <fcntl.h>
X  #else
X  #include <sys/file.h>
X- #endif
X  #include <sys/stat.h>
X  
X  /* Recognize COFF format systems because a.out.h defines AOUTHDR.  */
X
X--- 28,33 -----
X  #include <sys/param.h>
X  #include <sys/dir.h>
X  #include <sys/file.h>
X  #include <sys/stat.h>
X  
X  /* Recognize COFF format systems because a.out.h defines AOUTHDR.  */
X***************
X*** 252,258
X  	stack_start = stack_end - NBPG * u.u_ssize;
X  	data_offset = NBPG * UPAGES;
X  	stack_offset = NBPG * (UPAGES + u.u_dsize);
X! 	reg_offset = (int) u.u_ar0 + KERNEL_U_ADDR;
X  
X  	/* I don't know where to find this info.
X  	   So, for now, mark it as not available.  */
X
X--- 248,254 -----
X  	stack_start = stack_end - NBPG * u.u_ssize;
X  	data_offset = NBPG * UPAGES;
X  	stack_offset = NBPG * (UPAGES + u.u_dsize);
X! 	reg_offset = (int) u.u_ar0 - KERNEL_U_ADDR;
X  
X  	/* I don't know where to find this info.
X  	   So, for now, mark it as not available.  */
X*** /usr/local/src/Gnu/gdb/defs.h	Wed Jul 27 13:07:15 1988
X--- defs.h	Wed Feb  3 16:31:01 1988
X***************
X*** 77,90
X  /* String containing the current directory (what getwd would return).  */
X  
X  char *current_directory;
X- 
X- #ifdef USG
X- #define MAXPATHLEN 1024
X- #define getwd(x) getcwd(x,MAXPATHLEN)
X- #define bzero(x,s) memset(x,0,s)
X- #define bcopy(a,b,c) memcpy(b,a,c)
X- #define bcmp memcmp
X- #define index strchr
X- #define rindex strrchr
X- #define vfork fork
X- #endif
X
X--- 77,79 -----
X  /* String containing the current directory (what getwd would return).  */
X  
X  char *current_directory;
X*** /usr/local/src/Gnu/gdb/environ.c	Wed Jul 27 08:13:02 1988
X--- environ.c	Thu Feb 11 17:24:40 1988
X***************
X*** 103,111
X  #define min(a, b) ((a) < (b) ? (a) : (b))
X  #define max(a, b) ((a) > (b) ? (a) : (b))
X  
X- #ifdef USG
X- #include "defs.h"
X- #endif
X  #include "environ.h"
X  
X  /* Return a new environment object.  */
X
X--- 103,108 -----
X  #define min(a, b) ((a) < (b) ? (a) : (b))
X  #define max(a, b) ((a) > (b) ? (a) : (b))
X  
X  #include "environ.h"
X  
X  /* Return a new environment object.  */
X*** /usr/local/src/Gnu/gdb/firstfile.c	Wed Jul 27 08:13:29 1988
X--- firstfile.c	Thu Feb 11 17:24:25 1988
X***************
X*** 127,135
X     After the files to be found must come the file `lastfile'
X     which ends the chain of calls.  */
X  
X- #ifdef USG
X- #include "defs.h"
X- #endif
X  #include "initialize.h"
X  
X  static initialize_next_file ();
X
X--- 127,132 -----
X     After the files to be found must come the file `lastfile'
X     which ends the chain of calls.  */
X  
X  #include "initialize.h"
X  
X  static initialize_next_file ();
X*** /usr/local/src/Gnu/gdb/inflow.c	Wed Jul 27 19:33:59 1988
X--- inflow.c	Wed Feb  3 15:58:08 1988
X***************
X*** 30,38
X  #include <sys/user.h>
X  #include <signal.h>
X  #include <sys/ioctl.h>
X- #ifdef USG
X- #include <termio.h>
X- #else
X  #include <sgtty.h>
X  #endif
X  #include <fcntl.h>
X
X--- 30,35 -----
X  #include <sys/user.h>
X  #include <signal.h>
X  #include <sys/ioctl.h>
X  #include <sgtty.h>
X  #include <fcntl.h>
X  
X***************
X*** 34,40
X  #include <termio.h>
X  #else
X  #include <sgtty.h>
X- #endif
X  #include <fcntl.h>
X  
X  #ifdef UMAX_PTRACE
X
X--- 31,36 -----
X  #include <signal.h>
X  #include <sys/ioctl.h>
X  #include <sgtty.h>
X  #include <fcntl.h>
X  
X  #ifdef UMAX_PTRACE
X***************
X*** 57,71
X  
X  /* Record terminal status separately for debugger and inferior.  */
X  
X- #ifdef USG
X- static struct termio tm_inferior;
X- static int lmode_inferior;
X- static int tflags_inferior;
X- 
X- static struct termio tm_ours;
X- static int lmode_ours;
X- static int tflags_ours;
X- #else
X  static struct sgttyb sg_inferior;
X  static struct tchars tc_inferior;
X  static struct ltchars ltc_inferior;
X
X--- 53,58 -----
X  
X  /* Record terminal status separately for debugger and inferior.  */
X  
X  static struct sgttyb sg_inferior;
X  static struct tchars tc_inferior;
X  static struct ltchars ltc_inferior;
X***************
X*** 79,85
X  static int lmode_ours;
X  static int tflags_ours;
X  static int pgrp_ours;
X- #endif
X  
X  /* Copy of inferior_io_terminal when inferior was last started.  */
X  static char *inferior_thisrun_terminal;
X
X--- 66,71 -----
X  static int lmode_ours;
X  static int tflags_ours;
X  static int pgrp_ours;
X  
X  /* Copy of inferior_io_terminal when inferior was last started.  */
X  static char *inferior_thisrun_terminal;
X***************
X*** 99,109
X    if (remote_debugging)
X      return;
X  
X- #ifdef USG
X-   tm_inferior = tm_ours;
X-   lmode_inferior = lmode_ours;
X-   tflags_inferior = tflags_ours;
X- #else
X    sg_inferior = sg_ours;
X    tc_inferior = tc_ours;
X    ltc_inferior = ltc_ours;
X
X--- 85,90 -----
X    if (remote_debugging)
X      return;
X  
X    sg_inferior = sg_ours;
X    tc_inferior = tc_ours;
X    ltc_inferior = ltc_ours;
X***************
X*** 110,116
X    lmode_inferior = lmode_ours;
X    tflags_inferior = tflags_ours;
X    pgrp_inferior = inferior_pid;
X- #endif
X  
X    terminal_is_ours = 1;
X  }
X
X--- 91,96 -----
X    lmode_inferior = lmode_ours;
X    tflags_inferior = tflags_ours;
X    pgrp_inferior = inferior_pid;
X  
X    terminal_is_ours = 1;
X  }
X***************
X*** 128,137
X      {
X        fcntl (0, F_SETFL, tflags_inferior);
X        fcntl (0, F_SETFL, tflags_inferior);
X-       fcntl (0, F_SETFL, tflags_inferior);
X- #ifdef USG
X-       ioctl (0, TCSETA, &tm_inferior);
X- #else
X        ioctl (0, TIOCSETN, &sg_inferior);
X        ioctl (0, TIOCSETC, &tc_inferior);
X        ioctl (0, TIOCSLTC, &ltc_inferior);
X
X--- 108,113 -----
X      {
X        fcntl (0, F_SETFL, tflags_inferior);
X        fcntl (0, F_SETFL, tflags_inferior);
X        ioctl (0, TIOCSETN, &sg_inferior);
X        ioctl (0, TIOCSETC, &tc_inferior);
X        ioctl (0, TIOCSLTC, &ltc_inferior);
X***************
X*** 137,143
X        ioctl (0, TIOCSLTC, &ltc_inferior);
X        ioctl (0, TIOCLSET, &lmode_inferior);
X        ioctl (0, TIOCSPGRP, &pgrp_inferior);
X- #endif
X      }
X    terminal_is_ours = 0;
X  }
X
X--- 113,118 -----
X        ioctl (0, TIOCSLTC, &ltc_inferior);
X        ioctl (0, TIOCLSET, &lmode_inferior);
X        ioctl (0, TIOCSPGRP, &pgrp_inferior);
X      }
X    terminal_is_ours = 0;
X  }
X***************
X*** 183,191
X      {
X        terminal_is_ours = 1;
X  
X- #ifdef USG
X-       ioctl (0, TCGETA, &tm_inferior);
X- #else
X        osigttou = signal (SIGTTOU, SIG_IGN);
X  
X        ioctl (0, TIOCGPGRP, &pgrp_inferior);
X
X--- 158,163 -----
X      {
X        terminal_is_ours = 1;
X  
X        osigttou = signal (SIGTTOU, SIG_IGN);
X  
X        ioctl (0, TIOCGPGRP, &pgrp_inferior);
X***************
X*** 198,204
X        ioctl (0, TIOCGETC, &tc_inferior);
X        ioctl (0, TIOCGLTC, &ltc_inferior);
X        ioctl (0, TIOCLGET, &lmode_inferior);
X- #endif
X      }
X  
X  #ifdef USG
X
X--- 170,175 -----
X        ioctl (0, TIOCGETC, &tc_inferior);
X        ioctl (0, TIOCGLTC, &ltc_inferior);
X        ioctl (0, TIOCLGET, &lmode_inferior);
X      }
X  
X    sg_ours.sg_flags &= ~RAW & ~CBREAK;
X***************
X*** 201,215
X  #endif
X      }
X  
X- #ifdef USG
X-   tm_ours.c_lflag |= (ISIG | ICANON);
X-   if (output_only)
X-     tm_ours.c_lflag &= ~(ISIG | ICANON) | tm_inferior.c_lflag;
X-   fcntl (0, F_SETFL, tflags_ours);
X-   fcntl (0, F_SETFL, tflags_ours);
X-   ioctl (0, TCSETA, &tm_ours);
X-   tm_ours.c_lflag |= (ISIG | ICANON);
X- #else
X    sg_ours.sg_flags &= ~RAW & ~CBREAK;
X    if (output_only)
X      sg_ours.sg_flags |= (RAW | CBREAK) & sg_inferior.sg_flags;
X
X--- 172,177 -----
X        ioctl (0, TIOCLGET, &lmode_inferior);
X      }
X  
X    sg_ours.sg_flags &= ~RAW & ~CBREAK;
X    if (output_only)
X      sg_ours.sg_flags |= (RAW | CBREAK) & sg_inferior.sg_flags;
X***************
X*** 221,227
X    ioctl (0, TIOCSLTC, &ltc_ours);
X    ioctl (0, TIOCLSET, &lmode_ours);
X    sg_ours.sg_flags &= ~RAW & ~CBREAK;
X- #endif
X  }
X  
X  static void
X
X--- 183,188 -----
X    ioctl (0, TIOCSLTC, &ltc_ours);
X    ioctl (0, TIOCLSET, &lmode_ours);
X    sg_ours.sg_flags &= ~RAW & ~CBREAK;
X  }
X  
X  static void
X***************
X*** 236,244
X      }
X  
X    printf ("Inferior's terminal status (currently saved by GDB):\n");
X- #ifdef USG
X- 
X- #else
X    printf ("fcntl flags = 0x%x, lmode = 0x%x,\nsgttyb.sg_flags = 0x%x, owner pid = %d.\n",
X  	  tflags_inferior, lmode_inferior,
X  	  sg_inferior.sg_flags, pgrp_inferior);
X
X--- 197,202 -----
X      }
X  
X    printf ("Inferior's terminal status (currently saved by GDB):\n");
X    printf ("fcntl flags = 0x%x, lmode = 0x%x,\nsgttyb.sg_flags = 0x%x, owner pid = %d.\n",
X  	  tflags_inferior, lmode_inferior,
X  	  sg_inferior.sg_flags, pgrp_inferior);
X***************
X*** 250,256
X    for (i = 0; i < sizeof (struct ltchars); i++)
X      printf ("0x%x ", ((char *)&ltc_inferior)[i]);
X    printf ("\n");
X- #endif
X  }
X  
X  static void
X
X--- 208,213 -----
X    for (i = 0; i < sizeof (struct ltchars); i++)
X      printf ("0x%x ", ((char *)&ltc_inferior)[i]);
X    printf ("\n");
X  }
X  
X  static void
X***************
X*** 279,288
X    if (tty == -1)
X      _exit(1);
X  
X- #ifdef USG
X-   close(0); close(1); close(2);
X-   dup(tty); dup(tty); dup(tty);
X- #else
X    dup2(tty, 0);
X    dup2(tty, 1);
X    dup2(tty, 2);
X
X--- 236,241 -----
X    if (tty == -1)
X      _exit(1);
X  
X    dup2(tty, 0);
X    dup2(tty, 1);
X    dup2(tty, 2);
X***************
X*** 286,292
X    dup2(tty, 0);
X    dup2(tty, 1);
X    dup2(tty, 2);
X- #endif
X    close(tty);
X  }
X  
X
X--- 239,244 -----
X    dup2(tty, 0);
X    dup2(tty, 1);
X    dup2(tty, 2);
X    close(tty);
X  }
X  
X***************
X*** 313,319
X  
X    if (pid == 0)
X      {
X- #ifndef USG
X        /* Run inferior in a separate process group.  */
X        setpgrp (getpid (), getpid ());
X  #endif
X
X--- 265,270 -----
X  
X    if (pid == 0)
X      {
X        /* Run inferior in a separate process group.  */
X        setpgrp (getpid (), getpid ());
X  
X***************
X*** 316,322
X  #ifndef USG
X        /* Run inferior in a separate process group.  */
X        setpgrp (getpid (), getpid ());
X- #endif
X  
X        inferior_thisrun_terminal = inferior_io_terminal;
X        if (inferior_io_terminal != 0)
X
X--- 267,272 -----
X      {
X        /* Run inferior in a separate process group.  */
X        setpgrp (getpid (), getpid ());
X  
X        inferior_thisrun_terminal = inferior_io_terminal;
X        if (inferior_io_terminal != 0)
X***************
X*** 328,334
X        signal (SIGINT, SIG_DFL);  */
X  
X        ptrace (0);
X- #ifdef USG
X        execle ("/bin/sh", "sh", "-c", allargs, 0, env);
X        /* execle (allargs, allargs, 0, env); */
X  #else
X
X--- 278,283 -----
X        signal (SIGINT, SIG_DFL);  */
X  
X        ptrace (0);
X        execle ("/bin/sh", "sh", "-c", allargs, 0, env);
X  
X        fprintf (stderr, "Cannot exec /bin/sh: %s.\n",
X***************
X*** 330,339
X        ptrace (0);
X  #ifdef USG
X        execle ("/bin/sh", "sh", "-c", allargs, 0, env);
X-       /* execle (allargs, allargs, 0, env); */
X- #else
X-       execle ("/bin/sh", "sh", "-c", allargs, 0, env);
X- #endif
X  
X        fprintf (stderr, "Cannot exec /bin/sh: %s.\n",
X  	       errno < sys_nerr ? sys_errlist[errno] : "unknown error");
X
X--- 279,284 -----
X  
X        ptrace (0);
X        execle ("/bin/sh", "sh", "-c", allargs, 0, env);
X  
X        fprintf (stderr, "Cannot exec /bin/sh: %s.\n",
X  	       errno < sys_nerr ? sys_errlist[errno] : "unknown error");
X***************
X*** 500,506
X  #else
X    struct user u;
X    unsigned int offset = (char *) &u.u_ar0 - (char *) &u;
X!   offset = ptrace (3, inferior_pid, offset, 0) + KERNEL_U_ADDR;
X  #endif
X  
X    for (regno = 0; regno < NUM_REGS; regno++)
X
X--- 445,451 -----
X  #else
X    struct user u;
X    unsigned int offset = (char *) &u.u_ar0 - (char *) &u;
X!   offset = ptrace (3, inferior_pid, offset, 0) - KERNEL_U_ADDR;
X  #endif
X  
X    for (regno = 0; regno < NUM_REGS; regno++)
X***************
X*** 530,536
X  #else
X    struct user u;
X    unsigned int offset = (char *) &u.u_ar0 - (char *) &u;
X!   offset = ptrace (3, inferior_pid, offset, 0) + KERNEL_U_ADDR;
X  #endif
X  
X    if (regno >= 0)
X
X--- 475,481 -----
X  #else
X    struct user u;
X    unsigned int offset = (char *) &u.u_ar0 - (char *) &u;
X!   offset = ptrace (3, inferior_pid, offset, 0) - KERNEL_U_ADDR;
X  #endif
X  
X    if (regno >= 0)
X***************
X*** 646,652
X        if (remote_debugging)
X  	remote_store_word (addr, buffer[i]);
X        else
X- #ifdef USG
X  	ptrace (4, inferior_pid, addr, buffer[i]);
X  #else
X  	ptrace (4, inferior_pid, addr, buffer[i]);
X
X--- 591,596 -----
X        if (remote_debugging)
X  	remote_store_word (addr, buffer[i]);
X        else
X  	ptrace (4, inferior_pid, addr, buffer[i]);
X        if (errno)
X  	return errno;
X***************
X*** 648,656
X        else
X  #ifdef USG
X  	ptrace (4, inferior_pid, addr, buffer[i]);
X- #else
X- 	ptrace (4, inferior_pid, addr, buffer[i]);
X- #endif
X        if (errno)
X  	return errno;
X      }
X
X--- 592,597 -----
X  	remote_store_word (addr, buffer[i]);
X        else
X  	ptrace (4, inferior_pid, addr, buffer[i]);
X        if (errno)
X  	return errno;
X      }
X***************
X*** 699,708
X  
X    inferior_pid = 0;
X  
X- #ifdef USG
X-   ioctl (0, TCGETA, &tm_ours);
X-   fcntl (0, F_GETFL, tflags_ours);
X- #else
X    ioctl (0, TIOCGETP, &sg_ours);
X    ioctl (0, TIOCGETC, &tc_ours);
X    ioctl (0, TIOCGLTC, &ltc_ours);
X
X--- 640,645 -----
X  
X    inferior_pid = 0;
X  
X    ioctl (0, TIOCGETP, &sg_ours);
X    ioctl (0, TIOCGETC, &tc_ours);
X    ioctl (0, TIOCGLTC, &ltc_ours);
X***************
X*** 709,715
X    ioctl (0, TIOCLGET, &lmode_ours);
X    fcntl (0, F_GETFL, tflags_ours);
X    ioctl (0, TIOCGPGRP, &pgrp_ours);
X- #endif
X  
X    terminal_is_ours = 1;
X  }
X
X--- 646,651 -----
X    ioctl (0, TIOCLGET, &lmode_ours);
X    fcntl (0, F_GETFL, tflags_ours);
X    ioctl (0, TIOCGPGRP, &pgrp_ours);
X  
X    terminal_is_ours = 1;
X  }
X*** /usr/local/src/Gnu/gdb/m68k-pinsn.c	Wed Jul 27 07:57:07 1988
X--- m68k-pinsn.c	Thu Jan 28 07:02:14 1988
X***************
X*** 714,720
X       char *from;
X       double *to;
X  {
X- #ifndef USG
X  #if 0
X    asm ("movl a6@(8),a0");
X    asm ("movl a6@(12),a1");
X
X--- 714,719 -----
X       char *from;
X       double *to;
X  {
X  #if 0
X    asm ("movl a6@(8),a0");
X    asm ("movl a6@(12),a1");
X***************
X*** 730,736
X    asm (".long 0xf2104800");
X    asm (".long 0xf2117400");
X  #endif
X- #endif
X  }
X  
X  /* The converse: convert the double *FROM to an extended float
X
X--- 729,734 -----
X    asm (".long 0xf2104800");
X    asm (".long 0xf2117400");
X  #endif
X  }
X  
X  /* The converse: convert the double *FROM to an extended float
X***************
X*** 740,746
X       double *from;
X       char *to;
X  {
X- #ifndef USG
X  #if 0
X    asm ("movl a6@(8),a0");
X    asm ("movl a6@(12),a1");
X
X--- 738,743 -----
X       double *from;
X       char *to;
X  {
X  #if 0
X    asm ("movl a6@(8),a0");
X    asm ("movl a6@(12),a1");
X***************
X*** 754,759
X    asm (".word 12");
X    asm (".long 0xf2105400");
X    asm (".long 0xf2116800");
X- #endif
X  #endif
X  }
X
X--- 751,755 -----
X    asm (".word 12");
X    asm (".long 0xf2105400");
X    asm (".long 0xf2116800");
X  #endif
X  }
X*** /usr/local/src/Gnu/gdb/main.c	Wed Jul 27 13:07:40 1988
X--- main.c	Thu Feb 11 17:23:24 1988
X***************
X*** 337,343
X      }
X  }
X  
X- #ifdef SIGTSTP
X  static void
X  stop_sig ()
X  {
X
X--- 337,342 -----
X      }
X  }
X  
X  static void
X  stop_sig ()
X  {
X***************
X*** 351,357
X    /* Forget about any previous command -- null line now will do nothing.  */
X    *line = 0;
X  }
X- #endif
X  
X  /* Commands call this if they do not want to be repeated by null lines.  */
X  
X
X--- 350,355 -----
X    /* Forget about any previous command -- null line now will do nothing.  */
X    *line = 0;
X  }
X  
X  /* Commands call this if they do not want to be repeated by null lines.  */
X  
X***************
X*** 378,384
X    /* Control-C quits instantly if typed while in this loop
X       since it should not wait until the user types a newline.  */
X    immediate_quit++;
X- #ifdef SIGTSTP
X    signal (SIGTSTP, stop_sig);
X  #endif
X  
X
X--- 376,381 -----
X    /* Control-C quits instantly if typed while in this loop
X       since it should not wait until the user types a newline.  */
X    immediate_quit++;
X    signal (SIGTSTP, stop_sig);
X  
X    while (1)
X***************
X*** 380,386
X    immediate_quit++;
X  #ifdef SIGTSTP
X    signal (SIGTSTP, stop_sig);
X- #endif
X  
X    while (1)
X      {
X
X--- 377,382 -----
X       since it should not wait until the user types a newline.  */
X    immediate_quit++;
X    signal (SIGTSTP, stop_sig);
X  
X    while (1)
X      {
X***************
X*** 397,403
X        *p++ = c;
X      }
X  
X- #ifdef SIGTSTP
X    signal (SIGTSTP, SIG_DFL);
X  #endif
X    immediate_quit--;
X
X--- 393,398 -----
X        *p++ = c;
X      }
X  
X    signal (SIGTSTP, SIG_DFL);
X    immediate_quit--;
X  
X***************
X*** 399,405
X  
X  #ifdef SIGTSTP
X    signal (SIGTSTP, SIG_DFL);
X- #endif
X    immediate_quit--;
X  
X    /* If we just got an empty line, and that is supposed
X
X--- 394,399 -----
X      }
X  
X    signal (SIGTSTP, SIG_DFL);
X    immediate_quit--;
X  
X    /* If we just got an empty line, and that is supposed
X***************
X*** 667,673
X  static void
X  copying_info ()
X  {
X- #ifndef NOMONSTERSTRINGS
X    immediate_quit++;
X    printf ("		    GDB GENERAL PUBLIC LICENSE\n\
X  \n\		    (Clarified 11 Feb 1988)
X
X--- 661,666 -----
X  static void
X  copying_info ()
X  {
X    immediate_quit++;
X    printf ("		    GDB GENERAL PUBLIC LICENSE\n\
X  \n\		    (Clarified 11 Feb 1988)
X***************
X*** 814,820
X  anyone else from sharing it farther.  Help stamp out software hoarding!\n\
X  ");
X    immediate_quit--;
X- #endif
X  }
X  
X  static void
X
X--- 807,812 -----
X  anyone else from sharing it farther.  Help stamp out software hoarding!\n\
X  ");
X    immediate_quit--;
X  }
X  
X  static void
X***************
X*** 820,826
X  static void
X  warranty_info ()
X  {
X- #ifndef NOMONSTERSTRINGS
X    immediate_quit++;
X    printf ("			 NO WARRANTY\n\
X  \n\
X
X--- 812,817 -----
X  static void
X  warranty_info ()
X  {
X    immediate_quit++;
X    printf ("			 NO WARRANTY\n\
X  \n\
X***************
X*** 846,852
X  IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR\n\
X  ANY CLAIM BY ANY OTHER PARTY.\n");
X    immediate_quit--;
X- #endif
X  }
X  
X  static void
X
X--- 837,842 -----
X  IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR\n\
X  ANY CLAIM BY ANY OTHER PARTY.\n");
X    immediate_quit--;
X  }
X  
X  static void
X***************
X*** 852,858
X  static void
X  print_gdb_version ()
X  {
X- #ifdef NOMONSTERSTRINGS
X    printf ("GDB %s, Copyright (C) 1988 Free Software Foundation, Inc.\n\
X  There is ABSOLUTELY NO WARRANTY for GDB; type \"info warranty\" for details.\n\
X  GDB is free software and you are welcome to distribute copies of it\n\
X
X--- 842,847 -----
X  static void
X  print_gdb_version ()
X  {
X    printf ("GDB %s, Copyright (C) 1988 Free Software Foundation, Inc.\n\
X  There is ABSOLUTELY NO WARRANTY for GDB; type \"info warranty\" for details.\n\
X  GDB is free software and you are welcome to distribute copies of it\n\
X***************
X*** 858,864
X  GDB is free software and you are welcome to distribute copies of it\n\
X   under certain conditions; type \"info copying\" to see the conditions.\n",
X  	  version);
X- #endif
X  }
X  
X  static void
X
X--- 847,852 -----
X  GDB is free software and you are welcome to distribute copies of it\n\
X   under certain conditions; type \"info copying\" to see the conditions.\n",
X  	  version);
X  }
X  
X  static void
X*** /usr/local/src/Gnu/gdb/param.h	Tue Jul 26 23:43:14 1988
X--- param.h	Thu Nov  5 22:04:00 1987
X***************
X*** 1
X! #include "m-3b1.h"
X
X--- 1 -----
X! #include "m-sun3.h"
X*** /usr/local/src/Gnu/gdb/remote.c	Wed Jul 27 00:44:54 1988
X--- remote.c	Thu Feb  4 17:06:33 1988
X***************
X*** 74,82
X  #include <sys/wait.h>
X  #include <sys/ioctl.h>
X  #include <a.out.h>
X- #ifdef USG
X- #include <fcntl.h>
X- #else
X  #include <sys/file.h>
X  #endif
X  #include <sgtty.h>
X
X--- 74,79 -----
X  #include <sys/wait.h>
X  #include <sys/ioctl.h>
X  #include <a.out.h>
X  #include <sys/file.h>
X  #include <sgtty.h>
X  
X***************
X*** 78,84
X  #include <fcntl.h>
X  #else
X  #include <sys/file.h>
X- #endif
X  #include <sgtty.h>
X  
X  int kiodebug;
X
X--- 75,80 -----
X  #include <sys/ioctl.h>
X  #include <a.out.h>
X  #include <sys/file.h>
X  #include <sgtty.h>
X  
X  int kiodebug;
X*** /usr/local/src/Gnu/gdb/source.c	Wed Jul 27 13:07:40 1988
X--- source.c	Sat Feb  6 12:40:27 1988
X***************
X*** 21,29
X  #include <stdio.h>
X  #include <sys/param.h>
X  #include <sys/stat.h>
X- #ifdef USG
X- #include <fcntl.h>
X- #else
X  #include <sys/file.h>
X  #endif
X  #include "defs.h"
X
X--- 21,26 -----
X  #include <stdio.h>
X  #include <sys/param.h>
X  #include <sys/stat.h>
X  #include <sys/file.h>
X  #include "defs.h"
X  #include "initialize.h"
X***************
X*** 25,31
X  #include <fcntl.h>
X  #else
X  #include <sys/file.h>
X- #endif
X  #include "defs.h"
X  #include "initialize.h"
X  #include "symtab.h"
X
X--- 22,27 -----
X  #include <sys/param.h>
X  #include <sys/stat.h>
X  #include <sys/file.h>
X  #include "defs.h"
X  #include "initialize.h"
X  #include "symtab.h"
X*** /usr/local/src/Gnu/gdb/symseg.h	Wed Jul 27 00:02:05 1988
X--- symseg.h	Wed Feb 10 12:47:49 1988
X***************
X*** 355,358
X  {
X    char *name;			/* Name of file */
X    struct linetable contents;
X! };
X
X--- 355,358 -----
X  {
X    char *name;			/* Name of file */
X    struct linetable contents;
X! }
X*** /usr/local/src/Gnu/gdb/utils.c	Wed Jul 27 14:28:06 1988
X--- utils.c	Thu Aug 20 00:08:51 1987
X***************
X*** 19,27
X  */
X  
X  #include <stdio.h>
X- #ifdef USG
X- #include <termio.h>
X- #else
X  #include <sys/ioctl.h>
X  #endif
X  #include "defs.h"
X
X--- 19,24 -----
X  */
X  
X  #include <stdio.h>
X  #include <sys/ioctl.h>
X  #include "defs.h"
X  
X***************
X*** 23,29
X  #include <termio.h>
X  #else
X  #include <sys/ioctl.h>
X- #endif
X  #include "defs.h"
X  
X  void error ();
X
X--- 20,25 -----
X  
X  #include <stdio.h>
X  #include <sys/ioctl.h>
X  #include "defs.h"
X  
X  void error ();
X***************
X*** 195,203
X  quit ()
X  {
X    fflush (stdout);
X- #ifdef USG
X-   ioctl (fileno (stdout), TCFLSH, 2);
X- #else
X    ioctl (fileno (stdout), TIOCFLUSH, 0);
X  #endif
X    error ("Quit");
X
X--- 191,196 -----
X  quit ()
X  {
X    fflush (stdout);
X    ioctl (fileno (stdout), TIOCFLUSH, 0);
X    error ("Quit");
X  }
X***************
X*** 199,205
X    ioctl (fileno (stdout), TCFLSH, 2);
X  #else
X    ioctl (fileno (stdout), TIOCFLUSH, 0);
X- #endif
X    error ("Quit");
X  }
X  
X
X--- 192,197 -----
X  {
X    fflush (stdout);
X    ioctl (fileno (stdout), TIOCFLUSH, 0);
X    error ("Quit");
X  }
X  
X***************
X*** 206,213
X  /* Control C comes here */
X  
X  void
X! request_quit (sig)
X! int sig;
X  {
X  #ifdef USG
X    void request_quit();
X
X--- 198,204 -----
X  /* Control C comes here */
X  
X  void
X! request_quit ()
X  {
X    quit_flag = 1;
X    if (immediate_quit)
X***************
X*** 209,219
X  request_quit (sig)
X  int sig;
X  {
X- #ifdef USG
X-   void request_quit();
X- 
X-   signal(sig, request_quit);
X- #endif
X    quit_flag = 1;
X    if (immediate_quit)
X      quit ();
X
X--- 200,205 -----
X  void
X  request_quit ()
X  {
X    quit_flag = 1;
X    if (immediate_quit)
X      quit ();
END_OF_FILE
if test 33017 -ne `wc -c <'Diffs'`; then
    echo shar: \"'Diffs'\" unpacked with wrong size!
fi
# end of 'Diffs'
fi
echo shar: End of archive 2 \(of 2\).
cp /dev/null ark2isdone
MISSING=""
for I in 1 2 ; do
    if test ! -f ark${I}isdone ; then
	MISSING="${MISSING} ${I}"
    fi
done
if test "${MISSING}" = "" ; then
    echo You have unpacked both archives.
    rm -f ark[1-9]isdone
else
    echo You still need to unpack the following archives:
    echo "        " ${MISSING}
fi
##  End of shell archive.
exit 0



More information about the Comp.sys.att mailing list