2002-11-21 Andrew Cagney <ac131313@redhat.com>

	* filter.c: Re-indent.
	* filter.h, filter_host.h, gen-engine.c, gen-engine.h: Ditto.
	* gen-icache.c, gen-icache.h, gen-idecode.c: Ditto.
	* gen-idecode.h, gen-itable.c, gen-itable.h: Ditto.
	* gen-model.c, gen-model.h, gen-semantics.c: Ditto.
	* gen-semantics.h, gen-support.c, gen-support.h: Ditto.
	* gen.c, gen.h, igen.c, igen.h, ld-cache.c, ld-cache.h: Ditto.
	* ld-decode.c, ld-decode.h, ld-insn.c, ld-insn.h, lf.c: Ditto.
	* lf.h, misc.c, misc.h, table.c, table.h: Ditto.

1 files changed, 156 insertions, 151 deletions

diff --git a/sim/igen/lf.c b/sim/igen/lf.c
index 5364f41..42985f2 100644
--- a/sim/igen/lf.c
+++ b/sim/igen/lf.c
@@ -43,9 +43,10 @@
 #endif
 #endif
 
-struct _lf {
+struct _lf
+{
   FILE *stream;
-  int line_nr; /* nr complete lines written, curr line is line_nr+1 */
+  int line_nr;			/* nr complete lines written, curr line is line_nr+1 */
   int indent;
   int line_blank;
   const char *name;
@@ -59,70 +60,73 @@ lf *
 lf_open (char *name,
 	 char *real_name,
 	 lf_file_references references,
-	 lf_file_type type,
-	 const char *program)
+	 lf_file_type type, const char *program)
 {
   /* create a file object */
-  lf *new_lf = ZALLOC(lf);
+  lf *new_lf = ZALLOC (lf);
   ASSERT (new_lf != NULL);
   new_lf->references = references;
   new_lf->type = type;
   new_lf->name = (real_name == NULL ? name : real_name);
   new_lf->program = program;
   /* attach to stdout if pipe */
-  if (!strcmp(name, "-")) {
-    new_lf->stream = stdout;
-  }
-  else {
-    /* create a new file */
-    new_lf->stream = fopen(name, "w");
-    if (new_lf->stream == NULL) {
-      perror(name);
-      exit(1);
+  if (!strcmp (name, "-"))
+    {
+      new_lf->stream = stdout;
+    }
+  else
+    {
+      /* create a new file */
+      new_lf->stream = fopen (name, "w");
+      if (new_lf->stream == NULL)
+	{
+	  perror (name);
+	  exit (1);
+	}
     }
-  }
   return new_lf;
 }
 
 
 void
-lf_close(lf *file)
+lf_close (lf *file)
 {
-  if (file->stream != stdout) {
-    if (fclose(file->stream)) {
-      perror("lf_close.fclose");
-      exit(1);
+  if (file->stream != stdout)
+    {
+      if (fclose (file->stream))
+	{
+	  perror ("lf_close.fclose");
+	  exit (1);
+	}
+      free (file);
     }
-    free(file);
-  }
 }
 
 
 int
-lf_putchr(lf *file,
-	  const char chr)
+lf_putchr (lf *file, const char chr)
 {
   int nr = 0;
-  if (chr == '\n') {
-    file->line_nr += 1;
-    file->line_blank = 1;
-  }
-  else if (file->line_blank) {
-    int pad;
-    for (pad = file->indent; pad > 0; pad--)
-      putc(' ', file->stream);
-    nr += file->indent;
-    file->line_blank = 0;
-  }
-  putc(chr, file->stream);
+  if (chr == '\n')
+    {
+      file->line_nr += 1;
+      file->line_blank = 1;
+    }
+  else if (file->line_blank)
+    {
+      int pad;
+      for (pad = file->indent; pad > 0; pad--)
+	putc (' ', file->stream);
+      nr += file->indent;
+      file->line_blank = 0;
+    }
+  putc (chr, file->stream);
   nr += 1;
   return nr;
 }
 
 int
-lf_write (lf *file,
-	  const char *string,
-	  int strlen_string)
+lf_write (lf *file, const char *string, int strlen_string)
 {
   int nr = 0;
   int i;
@@ -133,63 +137,63 @@ lf_write (lf *file,
 
 
 void
-lf_indent_suppress(lf *file)
+lf_indent_suppress (lf *file)
 {
   file->line_blank = 0;
 }
 
 
 int
-lf_putstr(lf *file,
-	  const char *string)
+lf_putstr (lf *file, const char *string)
 {
   int nr = 0;
   const char *chp;
-  if (string != NULL) {
-    for (chp = string; *chp != '\0'; chp++) {
-      nr += lf_putchr(file, *chp);
+  if (string != NULL)
+    {
+      for (chp = string; *chp != '\0'; chp++)
+	{
+	  nr += lf_putchr (file, *chp);
+	}
     }
-  }
   return nr;
 }
 
 static int
-do_lf_putunsigned(lf *file,
-	      unsigned u)
+do_lf_putunsigned (lf *file, unsigned u)
 {
   int nr = 0;
-  if (u > 0) {
-    nr += do_lf_putunsigned(file, u / 10);
-    nr += lf_putchr(file, (u % 10) + '0');
-  }
+  if (u > 0)
+    {
+      nr += do_lf_putunsigned (file, u / 10);
+      nr += lf_putchr (file, (u % 10) + '0');
+    }
   return nr;
 }
 
 
 int
-lf_putint(lf *file,
-	  int decimal)
+lf_putint (lf *file, int decimal)
 {
   int nr = 0;
   if (decimal == 0)
-    nr += lf_putchr(file, '0');
-  else if (decimal < 0) {
-    nr += lf_putchr(file, '-');
-    nr += do_lf_putunsigned(file, -decimal);
-  }
-  else if (decimal > 0) {
-    nr += do_lf_putunsigned(file, decimal);
-  }
+    nr += lf_putchr (file, '0');
+  else if (decimal < 0)
+    {
+      nr += lf_putchr (file, '-');
+      nr += do_lf_putunsigned (file, -decimal);
+    }
+  else if (decimal > 0)
+    {
+      nr += do_lf_putunsigned (file, decimal);
+    }
   else
-    ASSERT(0);
+    ASSERT (0);
   return nr;
 }
 
 
 int
-lf_printf (lf *file,
-	   const char *fmt,
-	   ...)
+lf_printf (lf *file, const char *fmt, ...)
 {
   int nr = 0;
   char buf[1024];
@@ -200,28 +204,25 @@ lf_printf (lf *file,
   /* FIXME - this is really stuffed but so is vsprintf() on a sun! */
   ASSERT (strlen (buf) < sizeof (buf));
   nr += lf_putstr (file, buf);
-  va_end(ap);
+  va_end (ap);
   return nr;
 }
 
 
 int
-lf_print__line_ref (lf *file,
-		    line_ref *line)
+lf_print__line_ref (lf *file, line_ref *line)
 {
   return lf_print__external_ref (file, line->line_nr, line->file_name);
 }
 
 int
-lf_print__external_ref (lf *file,
-			int line_nr,
-			const char *file_name)
+lf_print__external_ref (lf *file, int line_nr, const char *file_name)
 {
   int nr = 0;
   switch (file->references)
     {
     case lf_include_references:
-      lf_indent_suppress(file);
+      lf_indent_suppress (file);
       nr += lf_putstr (file, "#line ");
       nr += lf_putint (file, line_nr);
       nr += lf_putstr (file, " \"");
@@ -243,7 +244,7 @@ int
 lf_print__internal_ref (lf *file)
 {
   int nr = 0;
-  nr += lf_print__external_ref (file, file->line_nr+2, file->name);
+  nr += lf_print__external_ref (file, file->line_nr + 2, file->name);
   /* line_nr == last_line, want to number from next */
   return nr;
 }
@@ -259,10 +260,11 @@ int
 lf_print__gnu_copyleft (lf *file)
 {
   int nr = 0;
-  switch (file->type) {
-  case lf_is_c:
-  case lf_is_h:
-    nr += lf_printf(file, "\
+  switch (file->type)
+    {
+    case lf_is_c:
+    case lf_is_h:
+      nr += lf_printf (file, "\
 /* This file is part of GDB.\n\
 \n\
    Copyright 2002 Free Software Foundation, Inc.\n\
@@ -285,110 +287,115 @@ lf_print__gnu_copyleft (lf *file)
    --\n\
 \n\
    This file was generated by the program %s */\n\
-", filter_filename(file->program));
-    break;
-  default:
-    ASSERT(0);
-    break;
-  }
+", filter_filename (file->program));
+      break;
+    default:
+      ASSERT (0);
+      break;
+    }
   return nr;
 }
 
 
 int
-lf_putbin(lf *file, int decimal, int width)
+lf_putbin (lf *file, int decimal, int width)
 {
   int nr = 0;
   int bit;
-  ASSERT(width > 0);
-  for (bit = 1 << (width-1); bit != 0; bit >>= 1) {
-    if (decimal & bit)
-      nr += lf_putchr(file, '1');
-    else
-      nr += lf_putchr(file, '0');
-  }
+  ASSERT (width > 0);
+  for (bit = 1 << (width - 1); bit != 0; bit >>= 1)
+    {
+      if (decimal & bit)
+	nr += lf_putchr (file, '1');
+      else
+	nr += lf_putchr (file, '0');
+    }
   return nr;
 }
 
 int
-lf_print__this_file_is_empty(lf *file,
-			     const char *reason)
+lf_print__this_file_is_empty (lf *file, const char *reason)
 {
   int nr = 0;
-  switch (file->type) {
-  case lf_is_c:
-  case lf_is_h:
-    nr += lf_printf (file,
-		    "/* This generated file (%s) is intentionally left blank",
-		    file->name);
-    if (reason != NULL)
-      nr += lf_printf (file, " - %s", reason);
-    nr += lf_printf (file, " */\n");
-    break;
-  default:
-    ERROR ("Bad switch");
-  }
+  switch (file->type)
+    {
+    case lf_is_c:
+    case lf_is_h:
+      nr += lf_printf (file,
+		       "/* This generated file (%s) is intentionally left blank",
+		       file->name);
+      if (reason != NULL)
+	nr += lf_printf (file, " - %s", reason);
+      nr += lf_printf (file, " */\n");
+      break;
+    default:
+      ERROR ("Bad switch");
+    }
   return nr;
 }
 
 int
-lf_print__ucase_filename(lf *file)
+lf_print__ucase_filename (lf *file)
 {
   int nr = 0;
   const char *chp = file->name;
-  while (*chp != '\0') {
-    char ch = *chp;
-    if (islower(ch)) {
-      nr += lf_putchr(file, toupper(ch));
+  while (*chp != '\0')
+    {
+      char ch = *chp;
+      if (islower (ch))
+	{
+	  nr += lf_putchr (file, toupper (ch));
+	}
+      else if (ch == '.')
+	nr += lf_putchr (file, '_');
+      else
+	nr += lf_putchr (file, ch);
+      chp++;
     }
-    else if (ch == '.')
-      nr += lf_putchr(file, '_');
-    else
-      nr += lf_putchr(file, ch);
-    chp++;
-  }
   return nr;
 }
 
 int
-lf_print__file_start(lf *file)
+lf_print__file_start (lf *file)
 {
   int nr = 0;
-  switch (file->type) {
-  case lf_is_h:
-  case lf_is_c:
-    nr += lf_print__gnu_copyleft(file);
-    nr += lf_printf(file, "\n");
-    nr += lf_printf(file, "#ifndef ");
-    nr += lf_print__ucase_filename(file);
-    nr += lf_printf(file, "\n");
-    nr += lf_printf(file, "#define ");
-    nr += lf_print__ucase_filename(file);
-    nr += lf_printf(file, "\n");
-    nr += lf_printf(file, "\n");
-    break;
-  default:
-    ASSERT(0);
-  }
+  switch (file->type)
+    {
+    case lf_is_h:
+    case lf_is_c:
+      nr += lf_print__gnu_copyleft (file);
+      nr += lf_printf (file, "\n");
+      nr += lf_printf (file, "#ifndef ");
+      nr += lf_print__ucase_filename (file);
+      nr += lf_printf (file, "\n");
+      nr += lf_printf (file, "#define ");
+      nr += lf_print__ucase_filename (file);
+      nr += lf_printf (file, "\n");
+      nr += lf_printf (file, "\n");
+      break;
+    default:
+      ASSERT (0);
+    }
   return nr;
 }
 
 
 int
-lf_print__file_finish(lf *file)
+lf_print__file_finish (lf *file)
 {
   int nr = 0;
-  switch (file->type) {
-  case lf_is_h:
-  case lf_is_c:
-    nr += lf_printf(file, "\n");
-    nr += lf_printf(file, "#endif /* _");
-    nr += lf_print__ucase_filename(file);
-    nr += lf_printf(file, "_*/\n");
-    break;
-  default:
-    ASSERT(0);
-  }
+  switch (file->type)
+    {
+    case lf_is_h:
+    case lf_is_c:
+      nr += lf_printf (file, "\n");
+      nr += lf_printf (file, "#endif /* _");
+      nr += lf_print__ucase_filename (file);
+      nr += lf_printf (file, "_*/\n");
+      break;
+    default:
+      ASSERT (0);
+    }
   return nr;
 }
 
@@ -396,8 +403,7 @@ lf_print__file_finish(lf *file)
 int
 lf_print__function_type (lf *file,
 			 const char *type,
-			 const char *prefix,
-			 const char *trailing_space)
+			 const char *prefix, const char *trailing_space)
 {
   int nr = 0;
   nr += lf_printf (file, "%s\\\n(%s)", prefix, type);
@@ -408,7 +414,7 @@ lf_print__function_type (lf *file,
 
 int
 lf_print__function_type_function (lf *file,
-				  print_function *print_type,
+				  print_function * print_type,
 				  const char *prefix,
 				  const char *trailing_space)
 {
@@ -420,4 +426,3 @@ lf_print__function_type_function (lf *file,
     nr += lf_printf (file, "%s", trailing_space);
   return nr;
 }
-