White space and comments only. The devo tree prior to this delta is

tagged as "vanilla" for your convenience.

There are also some comment changes.

1 files changed, 135 insertions, 128 deletions

diff --git a/gas/as.c b/gas/as.c
index c975766..a158ea5 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -1,23 +1,21 @@
 /* as.c - GAS main program.
    Copyright (C) 1987, 1990, 1991 Free Software Foundation, Inc.
-
-This file is part of GAS, the GNU Assembler.
-
-GAS 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, or (at your option)
-any later version.
-
-GAS 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 GAS; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-/* static const char rcsid[] = "$Id$"; */
+   
+   This file is part of GAS, the GNU Assembler.
+   
+   GAS 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, or (at your option)
+   any later version.
+   
+   GAS 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 GAS; see the file COPYING.  If not, write to
+   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /*
  * Main program for AS; a 32-bit assembler of GNU.
@@ -48,11 +46,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include "subsegs.h"
 #ifdef __STDC__
 
- /* This prototype for got_sig() is ansi.  If you want
-    anything else, then your compiler is lying to you when
-    it says that it is __STDC__.  If you want to change it,
-    #ifdef protect it from those of us with real ansi
-    compilers. */
+/* This prototype for got_sig() is ansi.  If you want
+   anything else, then your compiler is lying to you when
+   it says that it is __STDC__.  If you want to change it,
+   #ifdef protect it from those of us with real ansi
+   compilers. */
 
 #define SIGTY void
 
@@ -91,18 +89,18 @@ char **argv;
 	char *arg;		/* an arg to program */
 	char a;		/* an arg flag (after -) */
 	static const int sig[] = { SIGHUP, SIGINT, SIGPIPE, SIGTERM, 0};
-
+	
 	for(a=0;sig[a]!=0;a++)
-		if(signal(sig[a], SIG_IGN) != SIG_IGN)
-			signal(sig[a], got_sig);
-
+	    if(signal(sig[a], SIG_IGN) != SIG_IGN)
+		signal(sig[a], got_sig);
+	
 	myname=argv[0];
 	bzero (flagseen, sizeof(flagseen)); /* aint seen nothing yet */
 #ifndef OBJ_DEFAULT_OUTPUT_FILE_NAME
 #define OBJ_DEFAULT_OUTPUT_FILE_NAME "a.out"
 #endif /* OBJ_DEFAULT_OUTPUT_FILE_NAME */
 	out_file_name = OBJ_DEFAULT_OUTPUT_FILE_NAME;
-
+	
 	symbol_begin();		/* symbols.c */
 	subsegs_begin();		/* subsegs.c */
 	read_begin();			/* read.c */
@@ -121,84 +119,93 @@ char **argv;
 	 * name(s) and ""(s) denoting stdin. These file names are used
 	 * (perhaps more than once) later.
 	 */
- /* FIXME-SOMEDAY this should use getopt. */
+	/* FIXME-SOMEDAY this should use getopt. */
 	work_argc = argc-1;		/* don't count argv[0] */
 	work_argv = argv+1;		/* skip argv[0] */
 	for (;work_argc--;work_argv++) {
 		arg = * work_argv;	/* work_argv points to this argument */
-
+		
 		if (*arg!='-')		/* Filename. We need it later. */
-			continue;	/* Keep scanning args looking for flags. */
+		    continue;	/* Keep scanning args looking for flags. */
 		if (arg[1] == '-' && arg[2] == 0) {
 			/* "--" as an argument means read STDIN */
 			/* on this scan, we don't want to think about filenames */
 			* work_argv = "";	/* Code that means 'use stdin'. */
 			continue;
 		}
-				/* This better be a switch. */
+		/* This better be a switch. */
 		arg ++;		/*->letter. */
-
+		
 		while ((a = * arg) != '\0')  {/* scan all the 1-char flags */
 			arg ++;	/* arg->after letter. */
 			a &= 0x7F;	/* ascii only please */
 			/* if (flagseen[a])
-				as_tsktsk("%s: Flag option - %c has already been seen.", myname, a); */
+			   as_tsktsk("%s: Flag option - %c has already been seen.", myname, a); */
 			flagseen[a] = 1;
 			switch (a) {
-			    
-			  case 'a': 
-			  {
-			    int loop =1;
-			    
-			    while (loop) {
-				switch (*arg) 
+				
+			case 'a': 
 				{
-				case 'l':
-				  listing |= LISTING_LISTING;
-				  arg++;
-				  break;
-				case 's':
-				  listing |= LISTING_SYMBOLS;
-				  arg++;
-				  break;
-				case 'n':
-				  listing |= LISTING_NOFORM;
-				  arg++;
-				  break;
-				default:
-				  if (!listing)
-				   listing= LISTING_DEFAULT;
-				  loop = 0;
-				  break;
+					int loop =1;
+					
+					while (loop) {
+						switch (*arg) 
+						    {
+						    case 'l':
+							    listing |= LISTING_LISTING;
+							    arg++;
+							    break;
+						    case 's':
+							    listing |= LISTING_SYMBOLS;
+							    arg++;
+							    break;
+						    case 'h':
+							    listing |= LISTING_HLL;
+							    arg++;
+							    break;
+							    
+						    case 'n':
+							    listing |= LISTING_NOFORM;
+							    arg++;
+							    break;
+						    case 'd':
+							    listing |= LISTING_NODEBUG;
+							    arg++;
+							    break;
+						    default:
+							    if (!listing)
+								listing= LISTING_DEFAULT;
+							    loop = 0;
+							    break;
+						    }
+					}
 				}
-			      }
-			  }
-			  
-			    break;
-			    
-			    
+				
+				break;
+				
+				
 			case 'f':
 				break;	/* -f means fast - no need for "app" preprocessor. */
-
+				
 			case 'D':
 				/* DEBUG is implemented: it debugs different */
 				/* things to other people's assemblers. */
 				break;
-
+				
 #ifdef DONTDEF
 			case 'G':	/* GNU AS switch: include gdbsyms. */
 				if (*arg)	/* Rest of argument is file-name. */
-					gdb_symbol_file_name = stralloc (arg);
+				    gdb_symbol_file_name = stralloc (arg);
 				else if (work_argc) {	/* Next argument is file-name. */
 					work_argc --;
 					* work_argv = NULL; /* Not a source file-name. */
 					gdb_symbol_file_name = * ++ work_argv;
 				} else
-					as_warn("%s: I expected a filename after -G", myname);
+				    as_warn("%s: I expected a filename after -G", myname);
 				arg = "";	/* Finished with this arg. */
 				break;
 #endif
-
+				
 			case 'I': { /* Include file directory */
 				
 				char *temp = NULL;
@@ -214,45 +221,45 @@ char **argv;
 				arg = "";	/* Finished with this arg. */
 				break;
 			}
-
+				
 #ifndef WORKING_DOT_WORD
 			case 'k':
 				break;
 #endif
-
+				
 			case 'L': /* -L means keep L* symbols */
 				break;
-
+				
 			case 'o':
 				if (*arg)	/* Rest of argument is object file-name. */
-					out_file_name = stralloc (arg);
+				    out_file_name = stralloc (arg);
 				else if (work_argc) {	/* Want next arg for a file-name. */
 					* work_argv = NULL; /* This is not a file-name. */
 					work_argc--;
 					out_file_name = * ++ work_argv;
 				} else
-					as_warn("%s: I expected a filename after -o. \"%s\" assumed.", myname, out_file_name);
+				    as_warn("%s: I expected a filename after -o. \"%s\" assumed.", myname, out_file_name);
 				arg = "";	/* Finished with this arg. */
 				break;
-
+				
 			case 'R':
 				/* -R means put data into text segment */
 				break;
-
+				
 			case 'v':
 #ifdef	VMS
 				{
-				extern char *compiler_version_string;
-				compiler_version_string = arg;
+					extern char *compiler_version_string;
+					compiler_version_string = arg;
 				}
 #else /* not VMS */
 				fprintf(stderr,version_string);
 				if(*arg && strcmp(arg,"ersion"))
-					as_warn("Unknown -v option ignored");
+				    as_warn("Unknown -v option ignored");
 #endif
 				while(*arg) arg++;	/* Skip the rest */
 				break;
-
+				
 			case 'W':
 				/* -W means don't warn about things */
 			case 'X':
@@ -260,13 +267,13 @@ char **argv;
 			case 'Z':
 				/* -Z means attempt to generate object file even after errors. */
 				break;
-
+				
 			default:
 				--arg;
 				if(md_parse_option(&arg,&work_argc,&work_argv)==0)
-					as_warn("%s: I don't understand '%c' flag.", myname, a);
+				    as_warn("%s: I don't understand '%c' flag.", myname, a);
 				if(arg && *arg)
-					arg++;
+				    arg++;
 				break;
 			}
 		}
@@ -282,7 +289,7 @@ char **argv;
 	}
 #ifdef DONTDEF
 	if (gdb_begin(gdb_symbol_file_name) == 0)
-		flagseen ['G'] = 0;	/* Don't do any gdbsym stuff. */
+	    flagseen ['G'] = 0;	/* Don't do any gdbsym stuff. */
 #endif
 	/* Here with flags set up in flagseen[]. */
 	perform_an_assembly_pass(argc,argv); /* Assemble it. */
@@ -294,14 +301,14 @@ char **argv;
 		 || had_errors() > 0)) { 
 		write_object_file(); /* relax() addresses then emit object file */
 	} /* we also check in write_object_file() just before emit. */
-
+	
 	input_scrub_end();
 	md_end();			/* MACHINE.c */
-
+	
 #ifndef NO_LISTING
 	listing_print();
 #endif
-
+	
 #ifndef	VMS
 	return((had_warnings() && flagseen['Z'])
 	       || had_errors() > 0);			/* WIN */
@@ -309,7 +316,7 @@ char **argv;
 	return(!((had_warnings() && flagseen['Z'])
 		 || had_errors() > 0));			/* WIN */
 #endif	/* VMS */
-
+	
 } /* main() */
 
 
@@ -328,43 +335,43 @@ static void perform_an_assembly_pass(argc, argv)
 int argc;
 char **argv;
 {
-  int saw_a_file = 0;
-  unsigned int i;
-  need_pass_2		= 0;
-
+	int saw_a_file = 0;
+	unsigned int i;
+	need_pass_2		= 0;
+	
 #ifdef MANY_SEGMENTS
-
-  for (i= SEG_E0; i < SEG_UNKNOWN; i++) 
-      {
-	segment_info[i].fix_root = 0;
-      }
-  /* Create the three fixed ones */
-  subseg_new (SEG_E0, 0);
-  subseg_new (SEG_E1, 0);
-  subseg_new (SEG_E2, 0);
-  strcpy(segment_info[SEG_E0].scnhdr.s_name,".text");
-  strcpy(segment_info[SEG_E1].scnhdr.s_name,".data");
-  strcpy(segment_info[SEG_E2].scnhdr.s_name,".bss");
-  
-  subseg_new (SEG_E0, 0);
+	
+	for (i= SEG_E0; i < SEG_UNKNOWN; i++) 
+	    {
+		    segment_info[i].fix_root = 0;
+	    }
+	/* Create the three fixed ones */
+	subseg_new (SEG_E0, 0);
+	subseg_new (SEG_E1, 0);
+	subseg_new (SEG_E2, 0);
+	strcpy(segment_info[SEG_E0].scnhdr.s_name,".text");
+	strcpy(segment_info[SEG_E1].scnhdr.s_name,".data");
+	strcpy(segment_info[SEG_E2].scnhdr.s_name,".bss");
+	
+	subseg_new (SEG_E0, 0);
 #else
-  text_fix_root		= NULL;
-  data_fix_root		= NULL;
-
-  subseg_new (SEG_TEXT, 0);
+	text_fix_root		= NULL;
+	data_fix_root		= NULL;
+	
+	subseg_new (SEG_TEXT, 0);
 #endif
-  argv++; /* skip argv[0] */
-  argc--; /* skip argv[0] */
-  while (argc--) {
-    if (*argv) { /* Is it a file-name argument? */
-      saw_a_file++;
-      /* argv->"" if stdin desired, else->filename */
-      read_a_source_file(*argv);
-    }
-    argv++; /* completed that argv */
-  }
-  if(!saw_a_file)
-    read_a_source_file("");
+	argv++; /* skip argv[0] */
+	argc--; /* skip argv[0] */
+	while (argc--) {
+		if (*argv) { /* Is it a file-name argument? */
+			saw_a_file++;
+			/* argv->"" if stdin desired, else->filename */
+			read_a_source_file(*argv);
+		}
+		argv++; /* completed that argv */
+	}
+	if(!saw_a_file)
+	    read_a_source_file("");
 } /* perform_an_assembly_pass() */
 
 /*
@@ -375,12 +382,12 @@ char **argv;
  */
 
 static char *
-stralloc (str)
+    stralloc (str)
 char *	str;
 {
 	register char *	retval;
 	register long len;
-
+	
 	len = strlen (str) + 1;
 	retval = xmalloc (len);
 	(void) strcpy(retval, str);
@@ -395,14 +402,14 @@ static void lose() {
 #endif /* comment */
 
 static SIGTY
-got_sig(sig)
+    got_sig(sig)
 int sig;
 {
 	static here_before = 0;
-
+	
 	as_bad("Interrupted by signal %d", sig);
 	if(here_before++)
-		exit(1);
+	    exit(1);
 	return((SIGTY) 0);
 }
 
@@ -413,4 +420,4 @@ int sig;
  * End:
  */
 
-/* end: as.c */
+/* end of as.c */