WebSVN – tendra.SVN – Diff – /branches/tendra5/src/installers/sparc/solaris/sparcdiags.c

+/*
+ * Copyright (c) 2002-2005 The TenDRA Project <http://www.tendra.org/>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of The TenDRA Project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific, prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+ * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id$
+ */
 /*
     		 Crown Copyright (c) 1997
     This TenDRA(r) Computer Program is subject to Copyright
     owned by the United Kingdom Secretary of State for Defence
     acting through the Defence Evaluation and Research Agency
     (DERA).  It is made available to Recipients with a
     royalty-free licence for its use, reproduction, transfer
     to other parties and amendment for any purpose not excluding
     product development provided that any such use et cetera
     shall be deemed to be acceptance of the following conditions:-
         (1) Its Recipients shall ensure that this Notice is
         reproduced upon any copies or amended versions of it;
         (2) Any amended version of it shall be clearly marked to
         show both the nature of and the organisation responsible
         for the relevant amendment or amendments;
         (3) Its onward transfer from a recipient to another
         party shall be deemed to be that party's acceptance of
         these conditions;
         (4) DERA gives no warranty or assurance as to its
         quality or suitability for any purpose and DERA accepts
         no liability whatsoever in relation to any use to which
         it may be put.
 */
  * Revision 1.5  1995/06/29  08:20:22  john
  * Reformatting
+ *
  * Revision 1.4  1995/06/27  08:47:38  john
  * Some reformatting
  *
  * Revision 1.3  1995/04/20  08:06:36  john
  * Minor change
+ *
  * Revision 1.2  1995/03/27  12:50:40  john
  * Fix for c-style varargs handling
  * Revision 1.1  1994/05/03  14:49:53  djch
  * Initial revision
+ *
  * Revision 1.6  93/09/27  14:55:15  14:55:15  ra (Robert Andrews)
  * Only whitespace.
  *
  * Revision 1.5  93/08/27  11:37:55  11:37:55  ra (Robert Andrews)
  * A couple of lint-like changes.
  *
  * Revision 1.4  93/08/13  14:45:51  14:45:51  ra (Robert Andrews)
  * Allow the stabs for long double to vary depending on DOUBLE_SZ.
  *
  * Revision 1.3  93/07/05  18:26:29  18:26:29  ra (Robert Andrews)
  * A couple of minor corrections.  Introduced stab_ptrs to avoid duplication
  * of basic pointer types.
  *
  * Revision 1.2  93/06/29  14:32:54  14:32:54  ra (Robert Andrews)
  * Fairly major rewrite and reformat.  There were a number of errors which
  * meant that the diagnostics were not previously working.
  *
  * Revision 1.1  93/06/24  14:59:22  14:59:22  ra (Robert Andrews)
  * Initial revision
  *
 --------------------------------------------------------------------------
 */
 #define SPARCTRANS_CODE
 #include "mark_scope.h"
 #include "diagglob.h"
 #endif
-extern bool last_param PROTO_S ( ( exp ) ) ;
+extern bool last_param(exp);
 #if 0
 void init_stab
-    PROTO_Z ()
+(void)
+{
   return;
+}
 void init_stab_aux
-    PROTO_Z ()
+(void)
+{
   return;
+}
 #endif
   FORWARD DECLARATIONS
 */
 #ifdef NEWDIAGS
-static void stab_file PROTO_S ( ( dg_filename ) ) ;
+static void stab_file(dg_filename);
-static void stab_scope_open PROTO_S ( ( dg_filename ) ) ;
+static void stab_scope_open(dg_filename);
-static void stab_scope_close PROTO_S ( ( void ) ) ;
+static void stab_scope_close(void);
-static void out_dt_shape PROTO_S ( ( dg_type ) ) ;
+static void out_dt_shape(dg_type);
-static void stab_local PROTO_S ( ( dg_name, int ) ) ;
+static void stab_local(dg_name, int);
 #else
-static void stab_scope_open PROTO_S ( ( long ) ) ;
+static void stab_scope_open(long);
-static void stab_scope_close PROTO_S ( ( void ) ) ;
+static void stab_scope_close(void);
 #endif
 /*
   DIAGNOSTICS FILE
 */
-static FILE *dg_file ;
+static FILE *dg_file;
 #ifndef NEWDIAGS
-static char *dg_file_name ;
+static char *dg_file_name;
 #endif
 	/* label number sequence independent from text code */
 static int diag_lab_no = 0;
 static int next_d_lab
-    PROTO_Z ()
+(void)
+{
   return ++diag_lab_no;
+}
 /*
   BASIC POINTERS
 */
-static long stab_ptrs [ NO_STABS ] = {
+static long stab_ptrs[NO_STABS] = {
 , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-} ;
+};
 /*
   CURRENT TYPE NUMBER
 */
-static long typeno ;
+static long typeno;
 /*
   SIZE OF LAST STAB TYPE OUTPUT
 */
-static long last_type_sz = 0 ;
+static long last_type_sz = 0;
 /*
   CURRENT LINE NUMBER AND FILE NUMBER
 */
-long currentlno = -1 ;
+long currentlno = -1;
 #ifdef NEWDIAGS
 dg_filename currentfile = (dg_filename)0;
 dg_filename prim_file = (dg_filename)0;
 #else
-long currentfile = -1 ;
+long currentfile = -1;
 #endif
 /*
   ARRAY OF TYPE SIZES
 */
-static long *type_sizes ;
+static long *type_sizes;
-static int total_type_sizes = 0 ;
+static int total_type_sizes = 0;
 /*
   SETTING AND GETTING TYPE SIZES
 */
-#define set_stab_size( i )	type_sizes [ ( i ) ] = last_type_sz
+#define set_stab_size(i)	type_sizes[(i)] = last_type_sz
-#define get_stab_size( i )	( type_sizes [ ( i ) ] )
+#define get_stab_size(i)	(type_sizes[(i)])
-#define shape_stab_size( i, s )	type_sizes [ ( i ) ] = shape_size (s)
+#define shape_stab_size(i, s)	type_sizes[(i)] = shape_size(s)
 /*
   GET THE NEXT TYPE NUMBER
 */
 static long next_typen
-    PROTO_Z ()
+(void)
+{
-  if ( typeno >= total_type_sizes ) {
+  if (typeno >= total_type_sizes) {
-    int i, n = total_type_sizes, m = n + 100 ;
+    int i, n = total_type_sizes, m = n + 100;
-    type_sizes = ( long * ) xrealloc ( type_sizes, (size_t)m * sizeof ( long ) ) ;
+    type_sizes = (long *)xrealloc(type_sizes,(size_t)m * sizeof(long));
-    for ( i = n ; i < m ; i++ ) type_sizes [i] = 0 ;
+    for (i = n; i < m; i++)type_sizes[i] = 0;
-    total_type_sizes = m ;
+    total_type_sizes = m;
+  }
-  return ( typeno++ ) ;
+  return(typeno++);
+}
 #ifndef NEWDIAGS
 /*
     ARRAY OF FILE DESCRIPTORS
 */
-static filename *fds = null ;
+static filename *fds = null;
-static int szfds = 0 ;
+static int szfds = 0;
-static int nofds = 0 ;
+static int nofds = 0;
 /*
   ADD A NEW FILE TO THE ARRAY OF FILE DESCRIPTORS
 */
 void stab_collect_files
-    PROTO_N ( ( f ) )
-    PROTO_T ( filename f )
+(filename f)
+{
-  if ( fds == null ) {
+  if (fds == null) {
-    szfds += 10 ;
+    szfds += 10;
-    fds = ( filename * ) xmalloc ( szfds * sizeof ( filename ) ) ;
+    fds = (filename *)xmalloc(szfds * sizeof(filename));
-  }
-  else if ( nofds >= szfds ) {
-    szfds += 10 ;
-    fds = ( filename * ) xrealloc ( fds, szfds * sizeof ( filename ) ) ;
+  }
+  else if (nofds >= szfds) {
+    szfds += 10;
+    fds = (filename *)xrealloc(fds, szfds * sizeof(filename));
+  }
-  fds [ nofds++ ] = f ;
+  fds[nofds++] = f;
-  return ;
+  return;
+}
 /*
   FIND THE FILE DESCRIPTOR CORRESPONDING TO A FILE NAME
 */
 static long find_file
-    PROTO_N ( ( f ) )
-    PROTO_T ( char * f )
+(char * f)
+{
-  long i ;
+  long i;
-  for ( i = 0 ; i < nofds ; i++ ) {
+  for (i = 0; i < nofds; i++) {
-    if ( strcmp ( f, fds [i]->file.ints.chars ) == 0 ) return ( i ) ;
+    if (strcmp(f, fds[i] ->file.ints.chars) == 0) return(i);
+  }
-  return ( 0 ) ;
+  return(0);
+}
 #endif
 			     /* solaris stores line no's relative
 			    to the start of the procedure, so
 			    remember the name */
 static char * last_proc_lab = "<<No Proc>>";
 /*
   OUTPUT A FILE POSITION CONSTRUCT
 #define N_LBRAC  0xc0
 #define N_RBRAC  0xe0
 #ifdef NEWDIAGS
 void stabd
-    PROTO_N ( ( f, lno, seg ) )
-    PROTO_T ( dg_filename f X long lno X int seg )
+(dg_filename f, long lno, int seg)
+{
-  long i ;
+  long i;
-  if ( f == currentfile && lno == currentlno ) return ;
+  if (f == currentfile && lno == currentlno) return;
-  stab_file ( f ) ;
+  stab_file(f);
+  if (seg != 0){		/* 0 suppresses always */
+    if (seg > 0)	/* -ve line nos are put out in the stabs */
+      {
+	i = next_d_lab();
+	fprintf(dg_file, "\t.stabn\t0x%x,0,%ld,.LL.%ld-%s\n",seg,
+		  lno, i, last_proc_lab);
+	fprintf(dg_file, ".LL.%ld:\n", i);
+      }
+  }
+  currentlno = lno;
+  return;
+}
+#else
+void stabd
+(long findex, long lno, int seg)
+{
+  long i;
+  if (findex == currentfile && lno == currentlno) return;
+  stab_file(findex, 1);
   if (seg != 0){		/* 0 suppresses always */
-    if (seg > 0)	/* -ve line nos are put out in the stabs */
-      {
-	i = next_d_lab () ;
-	fprintf ( dg_file, "\t.stabn\t0x%x,0,%ld,.LL.%ld-%s\n",seg,
-		  lno, i, last_proc_lab ) ;
-	fprintf ( dg_file, ".LL.%ld:\n", i ) ;
-      }
-  }
-  currentlno = lno ;
-  return ;
-}
-#else
-void stabd
-    PROTO_N ( ( findex, lno, seg ) )
-    PROTO_T ( long findex X long lno X int seg )
-{
-  long i ;
-  if ( findex == currentfile && lno == currentlno ) return ;
-  stab_file ( findex, 1 ) ;
-  if (seg != 0){		/* 0 suppresses always */
     if (seg > 0)	/* -ve line nos are put out in the stabs */
+      {
-	i = next_d_lab () ;
+	i = next_d_lab();
-	fprintf ( dg_file, "\t.stabn\t0x%x,0,%ld,.LL.%ld-%s\n",seg,
+	fprintf(dg_file, "\t.stabn\t0x%x,0,%ld,.LL.%ld-%s\n",seg,
-		  lno, i, last_proc_lab ) ;
+		  lno, i, last_proc_lab);
-	fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+	fprintf(dg_file, ".LL.%ld:\n", i);
       }
   }
-  currentlno = lno ;
+  currentlno = lno;
-  return ;
+  return;
 }
 #endif
 #ifdef NEWDIAGS
 /*
     OUTPUT DIAGNOSTICS SURROUNDING CODE
 */
 void code_diag_info
-    PROTO_N ( (d, mcode, args) )
-    PROTO_T ( dg_info d X void (*mcode) PROTO_S ((void *)) X void * args )
+(dg_info d, void(*mcode)PROTO_S((void *)), void * args)
+{
   if (d == nildiag) {
-    (*mcode)(args);
+   (*mcode)(args);
     return;
+  }
   switch (d->key) {
     case DGA_PARAMS: {
       dg_name arg = d->data.i_param.args;
       while (arg) {
-	stab_local (arg, 1);
+	stab_local(arg, 1);
 	arg = arg->next;
+      }
-      code_diag_info (d->more, mcode, args);
+      code_diag_info(d->more, mcode, args);
       break;
+    }
     case DGA_SRC: {
       if (d->data.i_src.startpos.line) {
-	stabd ( d->data.i_src.startpos.file, d->data.i_src.startpos.line,
+	stabd(d->data.i_src.startpos.file, d->data.i_src.startpos.line,
-		N_SLINE ) ;
+		N_SLINE);
+      }
-      code_diag_info (d->more, mcode, args);
+      code_diag_info(d->more, mcode, args);
       if (d->data.i_src.endpos.line)
-	stabd ( d->data.i_src.endpos.file, d->data.i_src.endpos.line,
+	stabd(d->data.i_src.endpos.file, d->data.i_src.endpos.line,
-		N_SLINE ) ;
+		N_SLINE);
       break;
+    }
     case DGA_SCOPE:
     case DGA_EXTRA: {
       dg_filename f = currentfile;
       long l = currentlno + 1;
       if (d->data.i_scope.lexpos.line) {
 	f = d->data.i_scope.lexpos.file;
 	l = d->data.i_scope.lexpos.line;
+      }
-      stab_scope_open ( f ) ;
+      stab_scope_open(f);
-      stabd ( f, l, N_SLINE ) ;
+      stabd(f, l, N_SLINE);
-      code_diag_info (d->more, mcode, args);
+      code_diag_info(d->more, mcode, args);
-      stab_scope_close () ;
+      stab_scope_close();
       if (d->data.i_scope.endpos.line)
-	stabd ( d->data.i_scope.endpos.file, d->data.i_scope.endpos.line,
+	stabd(d->data.i_scope.endpos.file, d->data.i_scope.endpos.line,
-		N_SLINE ) ;
+		N_SLINE);
       break;
+    }
     case DGA_NAME: {
-      stab_local (d->data.i_nam.dnam, 0);
+      stab_local(d->data.i_nam.dnam, 0);
-      code_diag_info (d->more, mcode, args);
+      code_diag_info(d->more, mcode, args);
       break;
+    }
     default: {
-      code_diag_info (d->more, mcode, args);
+      code_diag_info(d->more, mcode, args);
       break;
+    }
   };
   return;
+}
 /*
   OUTPUT INITIAL DIAGNOSTICS FOR A DIAGNOSE_TAG
 */
 void stab_begin
-    PROTO_N ( ( d, proc_no, e ) )
-    PROTO_T ( diag_info * d X int proc_no X exp e )
+(diag_info * d, int proc_no, exp e)
+{
-  exp x ;
+  exp x;
-  if ( d->key == DIAG_INFO_SOURCE ) {
+  if (d->key == DIAG_INFO_SOURCE) {
-    sourcemark *s = &d->data.source.beg ;
+    sourcemark *s = &d->data.source.beg;
-    long f = find_file ( s->file->file.ints.chars ) ;
+    long f = find_file(s->file->file.ints.chars);
-    stabd ( f, ( long ) s->line_no.nat_val.small_nat ,N_SLINE) ;
+    stabd(f,(long)s->line_no.nat_val.small_nat ,N_SLINE);
-    return ;
+    return;
+  }
-  if ( d->key != DIAG_INFO_ID ) {
+  if (d->key != DIAG_INFO_ID) {
     /* not implemented */
-    return ;
+    return;
+  }
-  x = d->data.id_scope.access ;
+  x = d->data.id_scope.access;
   /* MIPS */
-  if ( isglob ( son ( x ) ) || no ( son ( x ) ) == 1 ) return;
+  if (isglob(son(x)) || no(son(x)) == 1) return;
-  mark_scope ( e ) ;
+  mark_scope(e);
-  if ( props ( e ) & 0x80 ) {
+  if (props(e) & 0x80) {
-    stab_scope_open ( currentfile ) ;
+    stab_scope_open(currentfile);
-    stabd ( currentfile, ( long ) ( currentlno + 1 ), N_SLINE ) ;
+    stabd(currentfile,(long)(currentlno + 1), N_SLINE);
   }
-  stab_local ( d->data.id_scope.nme.ints.chars, d->data.id_scope.typ,
+  stab_local(d->data.id_scope.nme.ints.chars, d->data.id_scope.typ,
-	       x, 0, currentfile ) ;
+	       x, 0, currentfile);
-  if ( last_param ( son ( x ) ) ) {
+  if (last_param(son(x))) {
-    stabd ( currentfile, ( long ) ( currentlno + 1 ),N_SLINE) ;
+    stabd(currentfile,(long)(currentlno + 1),N_SLINE);
+  }
-  return ;
+  return;
+}
 /*
   OUTPUT FINAL DIAGNOSTICS FOR A DIAGNOSE_TAG
 */
 void stab_end
-    PROTO_N ( ( d, e ) )
-    PROTO_T ( diag_info * d X exp e )
+(diag_info * d, exp e)
 {
-  if ( d->key == DIAG_INFO_SOURCE ) {
+  if (d->key == DIAG_INFO_SOURCE) {
-    sourcemark *s = &d->data.source.end ;
+    sourcemark *s = &d->data.source.end;
-    long f = find_file ( s->file->file.ints.chars ) ;
+    long f = find_file(s->file->file.ints.chars);
-    long lno = s->line_no.nat_val.small_nat ;
+    long lno = s->line_no.nat_val.small_nat;
-    stabd (f,(long)lno,N_SLINE);
+    stabd(f,(long)lno,N_SLINE);
-    return ;
+    return;
   }
-  if ( d->key == DIAG_INFO_ID && props ( e ) & 0x80 ) {
+  if (d->key == DIAG_INFO_ID && props(e) & 0x80) {
-    stab_scope_close ( currentfile ) ;
+    stab_scope_close(currentfile);
-    return ;
+    return;
   }
-  return ;
+  return;
+}
 #endif
 /*
   FIND THE STAB OF A SIMPLE SHAPE
 */
 #ifdef NEWDIAGS
 static long out_sh_type
-    PROTO_N ( ( s, nm ) )
-    PROTO_T ( shape s X char* nm )
+(shape s, char* nm)
 {
-  last_type_sz = shape_size ( s ) ;
+  last_type_sz = shape_size(s);
-  switch ( name ( s ) ) {
+  switch (name(s)) {
-    case scharhd : return ( STAB_SCHAR ) ;
+    case scharhd: return(STAB_SCHAR);
-    case ucharhd : return ( STAB_UCHAR ) ;
+    case ucharhd: return(STAB_UCHAR);
-    case swordhd : return ( STAB_SSHRT ) ;
+    case swordhd: return(STAB_SSHRT);
-    case uwordhd : return ( STAB_USHRT ) ;
+    case uwordhd: return(STAB_USHRT);
-    case slonghd : return ( strstr (nm, "long") ? STAB_SLONG : STAB_SINT ) ;
+    case slonghd: return(strstr(nm, "long")? STAB_SLONG : STAB_SINT);
-    case ulonghd : return ( strstr (nm, "long") ? STAB_ULONG : STAB_UINT ) ;
+    case ulonghd: return(strstr(nm, "long")? STAB_ULONG : STAB_UINT);
-    case s64hd : return ( STAB_S64 ) ;
+    case s64hd: return(STAB_S64);
-    case u64hd : return ( STAB_U64 ) ;
+    case u64hd: return(STAB_U64);
-    case shrealhd : return ( STAB_FLOAT ) ;
+    case shrealhd: return(STAB_FLOAT);
-    case realhd : return ( STAB_DBL ) ;
+    case realhd: return(STAB_DBL);
-    case doublehd : return ( STAB_LDBL ) ;
+    case doublehd: return(STAB_LDBL);
+  }
-  return ( STAB_VOID ) ;
+  return(STAB_VOID);
+}
 static long find_basic_type
-    PROTO_N ( ( s ) )
-    PROTO_T ( char* s )
+(char* s)
+{
   char* x;
-  if (strstr (s, "char"))
+  if (strstr(s, "char"))
-    return ( strstr (s, "unsigned") ? STAB_UCHAR : STAB_SCHAR );
+    return(strstr(s, "unsigned")? STAB_UCHAR : STAB_SCHAR);
-  if (strstr (s, "double"))
+  if (strstr(s, "double"))
-    return ( strstr (s, "long") ? STAB_LDBL : STAB_DBL );
+    return(strstr(s, "long")? STAB_LDBL : STAB_DBL);
-  if (strstr (s, "float"))
+  if (strstr(s, "float"))
-    return ( STAB_FLOAT );
+    return(STAB_FLOAT);
-  if (strstr (s, "short"))
+  if (strstr(s, "short"))
-    return ( strstr (s, "unsigned") ? STAB_USHRT : STAB_SSHRT );
+    return(strstr(s, "unsigned")? STAB_USHRT : STAB_SSHRT);
-  if ( (x = strstr (s, "long"))) {
+  if ((x = strstr(s, "long"))) {
-    if (strstr (x+1, "long"))
+    if (strstr(x+1, "long"))
-      return ( strstr (s, "unsigned") ? STAB_U64 : STAB_S64 );
+      return(strstr(s, "unsigned")? STAB_U64 : STAB_S64);
-    return ( strstr (s, "unsigned") ? STAB_ULONG : STAB_SLONG );
+    return(strstr(s, "unsigned")? STAB_ULONG : STAB_SLONG);
   }
-  if (strstr (s, "int"))
+  if (strstr(s, "int"))
-    return ( strstr (s, "unsigned") ? STAB_UINT : STAB_SINT );
+    return(strstr(s, "unsigned")? STAB_UINT : STAB_SINT);
-  if (strstr (s, "void_star"))
+  if (strstr(s, "void_star"))
-    return ( STAB_VS );
+    return(STAB_VS);
-  return ( STAB_VOID ) ;
+  return(STAB_VOID);
 }
 #else
 static long out_sh_type
-    PROTO_N ( ( s ) )
-    PROTO_T ( shape s )
+(shape s)
+{
-  last_type_sz = shape_size ( s ) ;
+  last_type_sz = shape_size(s);
-  switch ( name ( s ) ) {
+  switch (name(s)) {
-    case scharhd : return ( STAB_SCHAR ) ;
+    case scharhd: return(STAB_SCHAR);
-    case ucharhd : return ( STAB_UCHAR ) ;
+    case ucharhd: return(STAB_UCHAR);
-    case swordhd : return ( STAB_SSHRT ) ;
+    case swordhd: return(STAB_SSHRT);
-    case uwordhd : return ( STAB_USHRT ) ;
+    case uwordhd: return(STAB_USHRT);
-    case slonghd : return ( STAB_SINT ) ;
+    case slonghd: return(STAB_SINT);
-    case ulonghd : return ( STAB_UINT ) ;
+    case ulonghd: return(STAB_UINT);
-    case s64hd : return ( STAB_S64 ) ;
+    case s64hd: return(STAB_S64);
-    case u64hd : return ( STAB_U64 ) ;
+    case u64hd: return(STAB_U64);
-    case shrealhd : return ( STAB_FLOAT ) ;
+    case shrealhd: return(STAB_FLOAT);
-    case realhd : return ( STAB_DBL ) ;
+    case realhd: return(STAB_DBL);
-    case doublehd : return ( STAB_LDBL ) ;
+    case doublehd: return(STAB_LDBL);
+  }
-  return ( STAB_VOID ) ;
+  return(STAB_VOID);
+}
 #endif
 /*
   OUTPUT DIAGNOSTICS DIRECTIVE FOR A FILE
 */
 #ifdef NEWDIAGS
 static void stab_file
-    PROTO_N ( ( f ) )
-    PROTO_T ( dg_filename f )
+(dg_filename f)
 {
-  long i = next_d_lab () ;
+  long i = next_d_lab();
   int stb;
-  if ( f == currentfile || !f ) {
+  if (f == currentfile || !f) {
-    return ;
+    return;
   }
   stb = (f == prim_file ? 0x64 : 0x84);
-  if (f->file_name[0] != '/' && f->file_path[0])
+  if (f->file_name[0]!= '/' && f->file_path[0])
-    fprintf ( dg_file, "\t.stabs\t\"%s/\",0x%x,0,0,.LL.%ld\n", f->file_path, stb, i );
+    fprintf(dg_file, "\t.stabs\t\"%s/\",0x%x,0,0,.LL.%ld\n", f->file_path, stb, i);
-  fprintf ( dg_file, "\t.stabs\t\"%s\",0x%x,0,0,.LL.%ld\n", f->file_name, stb, i );
+  fprintf(dg_file, "\t.stabs\t\"%s\",0x%x,0,0,.LL.%ld\n", f->file_name, stb, i);
-  fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+  fprintf(dg_file, ".LL.%ld:\n", i);
-  currentfile = f ;
+  currentfile = f;
-  return ;
+  return;
 }
 #else
 void stab_file
-    PROTO_N ( ( findex, internal ) )
-    PROTO_T ( long findex X bool internal )
+(long findex, bool internal)
+{
-  static long i = 0 ;
+  static long i = 0;
-  if ( findex == currentfile || findex < 0 || findex >= szfds ) {
+  if (findex == currentfile || findex < 0 || findex >= szfds) {
-    return ;
+    return;
+  }
-  if ( !internal ) {
+  if (!internal) {
     /* source file */
-    i = next_d_lab () ;
+    i = next_d_lab();
-    fprintf ( dg_file, "\t.stabs\t\"%s\",0x64,0,0,.LL.%ld\n",
+    fprintf(dg_file, "\t.stabs\t\"%s\",0x64,0,0,.LL.%ld\n",
-	      fds [ findex ]->file.ints.chars, i ) ;
+	      fds[findex] ->file.ints.chars, i);
-    fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+    fprintf(dg_file, ".LL.%ld:\n", i);
   }
   else {
     /* included file */
-    fprintf ( dg_file, "\t.stabs\t\"%s\",0x84,0,0,.LL.%ld\n",
+    fprintf(dg_file, "\t.stabs\t\"%s\",0x84,0,0,.LL.%ld\n",
-	      fds [ findex ]->file.ints.chars, i ) ;
+	      fds[findex] ->file.ints.chars, i);
+    }
-    currentfile = findex ;
+    currentfile = findex;
-    return ;
+    return;
+}
 #endif
 /*
   LIST OF DIAGNOSTIC SCOPES AND LOCAL VARIABLES
 */
 #define DEL_SIZE 50
 struct delay_stab {
     int del_t;
     union {
 	struct {
 	    char * nm;
 #ifdef NEWDIAGS
 	    dg_type dt;
 #else
 	    diag_type dt;
 #endif
 	    int offset;
 enum del_types {D_PARAM, D_LOCAL, D_BRACKET};
 struct del_stab_array {
     struct del_stab_array *more;
-    struct delay_stab a [DEL_SIZE];
+    struct delay_stab a[DEL_SIZE];
 };
 static struct del_stab_array *del_stab_start = NULL;
 static struct del_stab_array *last_del_array = NULL;
 static struct del_stab_array *c_del_array = NULL;
 static int c_del_index = DEL_SIZE;
 static struct delay_stab * next_del_stab
-    PROTO_Z ()
+(void)
+{
     if (c_del_index == DEL_SIZE) {
 	if (c_del_array != last_del_array)
 	    c_del_array = c_del_array -> more;
 	else {
 	    struct del_stab_array * s =
-		(struct del_stab_array *) (xmalloc (sizeof(struct del_stab_array)));
+		(struct del_stab_array *)(xmalloc(sizeof(struct del_stab_array)));
 	    s -> more = NULL;
 	    if (del_stab_start == NULL)
 		del_stab_start = s;
 	    else
 		last_del_array -> more = s;
 	    c_del_array = last_del_array = s;
+	}
 	c_del_index = 0;
+    }
-    return ((c_del_array -> a) + (c_del_index ++));
+    return((c_del_array -> a) + (c_del_index ++));
+}
-static long open_label = 0 ;
+static long open_label = 0;
-static long bracket_level = 1 ;
+static long bracket_level = 1;
 /*
   START OF A DIAGNOSTICS SCOPE
 */
 #ifdef NEWDIAGS
 static void stab_scope_open
-    PROTO_N ( ( f ) )
-    PROTO_T ( dg_filename f )
+(dg_filename f)
 {
-  long i ;
+  long i;
-  stab_file ( f ) ;
+  stab_file(f);
-    if ( open_label != 0 )
+    if (open_label != 0)
     {
 	struct delay_stab * t = next_del_stab();
 	t->del_t = D_BRACKET;
 	t->u.b.br = N_LBRAC;
 	t->u.b.lev = bracket_level;
 	t->u.b.lab = open_label;
     }
-  i = next_d_lab () ;
+  i = next_d_lab();
-  fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+  fprintf(dg_file, ".LL.%ld:\n", i);
-  open_label = i ;
+  open_label = i;
-  bracket_level++ ;
+  bracket_level++;
-  return ;
+  return;
 }
 #else
 static void stab_scope_open
-    PROTO_N ( ( findex ) )
-    PROTO_T ( long findex )
+(long findex)
+{
-  long i ;
+  long i;
-  stab_file ( findex, 1 ) ;
+  stab_file(findex, 1);
-    if ( open_label != 0 )
+    if (open_label != 0)
+    {
 	struct delay_stab * t = next_del_stab();
 	t->del_t = D_BRACKET;
 	t->u.b.br = N_LBRAC;
 	t->u.b.lev = bracket_level;
 	t->u.b.lab = open_label;
+    }
-  i = next_d_lab () ;
+  i = next_d_lab();
-  fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+  fprintf(dg_file, ".LL.%ld:\n", i);
-  open_label = i ;
+  open_label = i;
-  bracket_level++ ;
+  bracket_level++;
-  return ;
+  return;
+}
 #endif
 */
 #ifdef NEWDIAGS
 static void stab_scope_close
-    PROTO_Z ()
+(void)
+{
-  long i ;
+  long i;
   struct delay_stab * x;
-  if ( open_label != 0 ) {
+  if (open_label != 0) {
     struct delay_stab * t = next_del_stab();
     t->del_t = D_BRACKET;
     t->u.b.br = N_LBRAC;
     t->u.b.lev = bracket_level;
     t->u.b.lab = open_label;
-    open_label = 0 ;
+    open_label = 0;
+  }
-  i = next_d_lab () ;
+  i = next_d_lab();
   x = next_del_stab();
   x->del_t = D_BRACKET;
   x->u.b.br = N_RBRAC;
   x->u.b.lev = bracket_level;
   x->u.b.lab = i;
-  fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+  fprintf(dg_file, ".LL.%ld:\n", i);
-  bracket_level-- ;
+  bracket_level--;
-  return ;
+  return;
+}
 #else
 static void stab_scope_close
-    PROTO_N ( ( findex ) )
-    PROTO_T ( long findex )
+(long findex)
+{
-  long i ;
+  long i;
   struct delay_stab * x;
-  if ( open_label != 0 ) {
+  if (open_label != 0) {
     struct delay_stab * t = next_del_stab();
     t->del_t = D_BRACKET;
     t->u.b.br = N_LBRAC;
     t->u.b.lev = bracket_level;
     t->u.b.lab = open_label;
-    open_label = 0 ;
+    open_label = 0;
   }
-  i = next_d_lab () ;
+  i = next_d_lab();
   x = next_del_stab();
   x->del_t = D_BRACKET;
   x->u.b.br = N_RBRAC;
   x->u.b.lev = bracket_level;
   x->u.b.lab = i;
-  fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+  fprintf(dg_file, ".LL.%ld:\n", i);
-  bracket_level-- ;
+  bracket_level--;
-  return ;
+  return;
 }
 #endif
 /*
   DEPTH COUNT FOR STAB TYPES
 */
-static int max_depth = 64 ;
+static int max_depth = 64;
-static int depth_now = 0 ;
+static int depth_now = 0;
 /*
   OUTPUT A DIAGNOSTICS TYPE
 */
-#define OUT_DT_SHAPE( dt )	out_dt_shape ( ( depth_now = 0, dt ) )
+#define OUT_DT_SHAPE(dt)	out_dt_shape((depth_now = 0, dt))
 #ifdef NEWDIAGS
 static long type_size
-    PROTO_N ( (dt) )
-    PROTO_T ( dg_type dt )
+(dg_type dt)
+{
   if (!dt)
     return 0;
-  if ( dt->outref.k == LAB_D || dt->outref.k < 0 )
+  if (dt->outref.k == LAB_D || dt->outref.k < 0)
-    return get_stab_size ( dt->outref.u.l ) ;
+    return get_stab_size(dt->outref.u.l);
-  switch ( dt->key ) {
+  switch (dt->key) {
     case DGT_TAGGED: {
       dg_tag tag = dt->data.t_tag;
       if (tag->key == DGK_NONE) {
 	return 0;
+      }
       if (tag->key == DGK_TYPE) {
 	dg_type ref_t = tag->p.typ;
 	if (ref_t == dt)
-	  return type_sizes [ find_basic_type (ref_t->outref.u.s) ];
+	  return type_sizes[find_basic_type(ref_t->outref.u.s)];
-	return type_size (ref_t);
+	return type_size(ref_t);
+      }
       if (tag->key == DGK_NAME) {
 	dg_name ref_n = tag->p.nam;
 	if (ref_n->key == DGN_TYPE /* && ref_n->idnam.id_key == DG_ID_NONE */) {
 	  dg_type ref_t = tag->p.nam->data.n_typ.raw;
-	  return type_size (ref_t);
+	  return type_size(ref_t);
 	}
       }
       return 0;
     }
     case DGT_BASIC: {
-      return shape_size (dt->data.t_bas.b_sh);
+      return shape_size(dt->data.t_bas.b_sh);
+    }
     case DGT_QUAL: {
       if (dt->data.t_qual.q_key == DG_PTR_T)
         return 32;
+      {
-	dg_type pdt = dt->data.t_qual.typ ;
+	dg_type pdt = dt->data.t_qual.typ;
-	return type_size ( pdt ) ;
+	return type_size(pdt);
+      }
+    }
     case DGT_ARRAY: {
       if (dt->data.t_arr.dims.len == 1) {
 	dg_dim x;
 	x = dt->data.t_arr.dims.array[0];
 	if (x.d_key == DG_DIM_BOUNDS && !x.low_ref && !x.hi_ref && !x.hi_cnt) {
-	  long lwb = no (son(x.lower.x));
+	  long lwb = no(son(x.lower.x));
-	  long upb = no (son(x.upper.x));
+	  long upb = no(son(x.upper.x));
-	  long stride = no (son(dt->data.t_arr.stride));
+	  long stride = no(son(dt->data.t_arr.stride));
-	  return ( stride * ( upb - lwb + 1 ) );
+	  return(stride *(upb - lwb + 1));
+	}
+      }
       return 0;
+    }
     case DGT_ENUM: {
-      return shape_size (dt->data.t_enum.sha);
+      return shape_size(dt->data.t_enum.sha);
+    }
     case DGT_STRUCT: {
-      return shape_size (dt->data.t_struct.sha);
+      return shape_size(dt->data.t_struct.sha);
+    }
-    case DGT_BITF : {
+    case DGT_BITF: {
       return dt->data.t_bitf.bv.bits;
     }
     case DGT_PROC: {
       return 32;
+    }
     default :
       return 0;
   }
 }
 static void out_dt_shape
-    PROTO_N ( ( dt ) )
-    PROTO_T ( dg_type dt )
+(dg_type dt)
+{
   if (!dt) {
-    fprintf ( dg_file, "%d", STAB_VOID ) ;
+    fprintf(dg_file, "%d", STAB_VOID);
-    last_type_sz = 0 ;
+    last_type_sz = 0;
-    return ;
+    return;
   }
-  if ( dt->outref.k == LAB_D || ( dt->outref.k < 0 && depth_now != 0 ) ) {
+  if (dt->outref.k == LAB_D || (dt->outref.k < 0 && depth_now != 0)) {
-    fprintf ( dg_file, "%ld", dt->outref.u.l ) ;
+    fprintf(dg_file, "%ld", dt->outref.u.l);
-    last_type_sz = get_stab_size ( dt->outref.u.l ) ;
+    last_type_sz = get_stab_size(dt->outref.u.l);
-    return ;
+    return;
+  }
-  depth_now++ ;
+  depth_now++;
-  switch ( dt->key ) {
+  switch (dt->key) {
     case DGT_TAGGED: {
       dg_tag tag = dt->data.t_tag;
       if (tag->done) {
 	dt->outref = tag->outref;
-	out_dt_shape (dt);
+	out_dt_shape(dt);
 	break;
+      }
       if (tag->key == DGK_NONE) {
-	failer ("external type");
+	failer("external type");
 	tag->done = 1;
 	tag->outref.k = LAB_D;
 	tag->outref.u.l = 0;
-	out_dt_shape (dt);
+	out_dt_shape(dt);
 	break;
+      }
       if (tag->key == DGK_TYPE) {
 	dg_type ref_t = tag->p.typ;
 	if (ref_t == dt) {
 	  if (ref_t->outref.k != LAB_STR)
-	    failer ("uninitialised?");
+	    failer("uninitialised?");
 	  ref_t->outref.k = LAB_D;
-	  ref_t->outref.u.l = find_basic_type (ref_t->outref.u.s);
+	  ref_t->outref.u.l = find_basic_type(ref_t->outref.u.s);
+	}
-	out_dt_shape (ref_t);
+	out_dt_shape(ref_t);
 	dt->outref = tag->outref = ref_t->outref;
 	tag->done = 1;
 	break;
+      }
       if (tag->key == DGK_NAME) {
 	dg_name ref_n = tag->p.nam;
 	if (ref_n->key == DGN_TYPE /* && ref_n->idnam.id_key == DG_ID_NONE */) {
 	  dg_type ref_t = tag->p.nam->data.n_typ.raw;
-	  out_dt_shape (ref_t);
+	  out_dt_shape(ref_t);
 	  dt->outref = tag->outref = ref_t->outref;
 	  tag->done = 1;
 	  break;
+	}
+      }
-      failer ("unfinished convolution");
+      failer("unfinished convolution");
       tag->done = 1;
       tag->outref.k = LAB_D;
       tag->outref.u.l = 0;
-      out_dt_shape (dt);
+      out_dt_shape(dt);
       break;
+    }
     case DGT_BASIC: {
-      dt->outref.u.l = out_sh_type (dt->data.t_bas.b_sh, dt->data.t_bas.tnam);
+      dt->outref.u.l = out_sh_type(dt->data.t_bas.b_sh, dt->data.t_bas.tnam);
       dt->outref.k = LAB_D;
-      out_dt_shape (dt);
+      out_dt_shape(dt);
       break;
+    }
     case DGT_QUAL: {
       if (dt->data.t_qual.q_key == DG_PTR_T) {
-	long non ;
+	long non;
-	dg_type pdt = dt->data.t_qual.typ ;
+	dg_type pdt = dt->data.t_qual.typ;
-	if ( pdt->key == DGT_BASIC ) {
+	if (pdt->key == DGT_BASIC) {
-	  long pn = out_sh_type (pdt->data.t_bas.b_sh, pdt->data.t_bas.tnam);
+	  long pn = out_sh_type(pdt->data.t_bas.b_sh, pdt->data.t_bas.tnam);
-	  non = stab_ptrs [ pn ] ;
+	  non = stab_ptrs[pn];
-	  if ( non == 0 ) {
+	  if (non == 0) {
-	    non = (dt->outref.k < 0 ? dt->outref.u.l : next_typen ()) ;
+	    non = (dt->outref.k < 0 ? dt->outref.u.l : next_typen());
-	    stab_ptrs [ pn ] = non ;
+	    stab_ptrs[pn] = non;
-	    fprintf ( dg_file, "%ld=*%ld", non, pn ) ;
+	    fprintf(dg_file, "%ld=*%ld", non, pn);
 	  }
 	  else {
-	    fprintf ( dg_file, "%ld", non ) ;
+	    fprintf(dg_file, "%ld", non);
+	  }
         }
         else {
-	  non = (dt->outref.k < 0 ? dt->outref.u.l : next_typen ()) ;
+	  non = (dt->outref.k < 0 ? dt->outref.u.l : next_typen());
-	  fprintf ( dg_file, "%ld=*", non ) ;
+	  fprintf(dg_file, "%ld=*", non);
-	  out_dt_shape ( pdt ) ;
+	  out_dt_shape(pdt);
+	}
-	dt->outref.u.l = non ;
+	dt->outref.u.l = non;
 	dt->outref.k = LAB_D;
-	last_type_sz = 32 ;
+	last_type_sz = 32;
-	set_stab_size ( non ) ;
+	set_stab_size(non);
+      }
       else {
-	dg_type pdt = dt->data.t_qual.typ ;
+	dg_type pdt = dt->data.t_qual.typ;
-	out_dt_shape ( pdt ) ;
+	out_dt_shape(pdt);
 	dt->outref = pdt->outref;
+      }
       break;
+    }
     case DGT_ARRAY: {
       long non;
       if (dt->outref.k >= 0)
-	dt->outref.u.l = next_typen () ;
+	dt->outref.u.l = next_typen();
       dt->outref.k = LAB_D;
       non = dt->outref.u.l;
       if (dt->data.t_arr.dims.len == 1) {
 	dg_dim x;
 	x = dt->data.t_arr.dims.array[0];
 	if (x.d_key == DG_DIM_BOUNDS && !x.low_ref && !x.hi_ref && !x.hi_cnt) {
-	  long lwb = no (son(x.lower.x));
+	  long lwb = no(son(x.lower.x));
-	  long upb = no (son(x.upper.x));
+	  long upb = no(son(x.upper.x));
-	  long stride = no (son(dt->data.t_arr.stride));
+	  long stride = no(son(dt->data.t_arr.stride));
 	  dg_type index_type = x.d_typ;
 	  dg_type element_type = dt->data.t_arr.elem_type;
-	  fprintf ( dg_file, "%ld=", non ) ;
+	  fprintf(dg_file, "%ld=", non);
-	  fprintf ( dg_file, "ar" ) ;
+	  fprintf(dg_file, "ar");
-	  out_dt_shape ( index_type ) ;
+	  out_dt_shape(index_type);
-	  fprintf ( dg_file, ";%ld;%ld;", lwb, upb ) ;
+	  fprintf(dg_file, ";%ld;%ld;", lwb, upb);
-	  out_dt_shape ( element_type ) ;
+	  out_dt_shape(element_type);
-	  last_type_sz = stride * ( upb - lwb + 1 ) ;
+	  last_type_sz = stride *(upb - lwb + 1);
-	  set_stab_size ( non ) ;
+	  set_stab_size(non);
-	  break ;
+	  break;
+	}
 	if (x.d_key == DG_DIM_NONE) {
 	  dg_type index_type = x.d_typ;
 	  dg_type element_type = dt->data.t_arr.elem_type;
-	  fprintf ( dg_file, "%ld=", non ) ;
+	  fprintf(dg_file, "%ld=", non);
-	  fprintf ( dg_file, "ar" ) ;
+	  fprintf(dg_file, "ar");
-	  out_dt_shape ( index_type ) ;
+	  out_dt_shape(index_type);
-	  fprintf ( dg_file, ";0;0;" ) ;
+	  fprintf(dg_file, ";0;0;");
-	  out_dt_shape ( element_type ) ;
+	  out_dt_shape(element_type);
-	  last_type_sz = 0 ;
+	  last_type_sz = 0;
-	  set_stab_size ( non ) ;
+	  set_stab_size(non);
-	  break ;
+	  break;
+	}
+      }
-      failer ("complex array");
+      failer("complex array");
       break;
+    }
     case DGT_ENUM: {
-      int i ;
+      int i;
       dg_enum * el = dt->data.t_enum.values.array;
       if (dt->outref.k >= 0)
-	dt->outref.u.l = next_typen () ;
+	dt->outref.u.l = next_typen();
       dt->outref.k = LAB_D;
-      fprintf ( dg_file, "%ld=e", dt->outref.u.l ) ;
+      fprintf(dg_file, "%ld=e", dt->outref.u.l);
       for (i = 0; i < dt->data.t_enum.values.len; i++) {
-	  fprintf ( dg_file, "%s:%d,", el[i].enam, no (son(el[i].value)) );
+	  fprintf(dg_file, "%s:%d,", el[i].enam, no(son(el[i].value)));
       }
-      fprintf ( dg_file, ";" ) ;
+      fprintf(dg_file, ";");
-      last_type_sz = shape_size (dt->data.t_enum.sha);
+      last_type_sz = shape_size(dt->data.t_enum.sha);
-      set_stab_size ( dt->outref.u.l ) ;
+      set_stab_size(dt->outref.u.l);
-      break ;
+      break;
     }
     case DGT_STRUCT: {
-      int i ;
+      int i;
       char su = (dt->data.t_struct.is_union ? 'u' : 's');
       shape s = dt->data.t_struct.sha;
       dg_classmem * el = dt->data.t_struct.u.fields.array;
       if (dt->outref.k >= 0)
-	dt->outref.u.l = next_typen () ;
+	dt->outref.u.l = next_typen();
       dt->outref.k = LAB_D;
-      fprintf ( dg_file, "%ld=%c%d", dt->outref.u.l, su, shape_size ( s ) / 8 ) ;
+      fprintf(dg_file, "%ld=%c%d", dt->outref.u.l, su, shape_size(s) / 8);
       for (i = 0; i < dt->data.t_struct.u.fields.len; i++) {
-	long offset = no ( son(el[i].d.cm_f.f_offset) );
+	long offset = no(son(el[i].d.cm_f.f_offset));
-	if(depth_now >= max_depth){
+	if (depth_now >= max_depth) {
 	  depth_now = 0;
-	  fprintf (dg_file, "\\\\\",0x80,0,%d,%d\n",0,0 ) ;
+	  fprintf(dg_file, "\\\\\",0x80,0,%d,%d\n",0,0);
-	  fprintf(dg_file,"\t.stabs\t\"");
+	  fprintf(dg_file,	}
-	}
-	depth_now++ ;
+	depth_now++;
-	fprintf ( dg_file, "%s:", el[i].d.cm_f.fnam ) ;
+	fprintf(dg_file, "%s:", el[i].d.cm_f.fnam);
-	out_dt_shape ( el[i].d.cm_f.f_typ ) ;
+	out_dt_shape(el[i].d.cm_f.f_typ);
-	fprintf ( dg_file, ",%ld,%ld;", offset, type_size ( el[i].d.cm_f.f_typ ) ) ;
+	fprintf(dg_file, ",%ld,%ld;", offset, type_size(el[i].d.cm_f.f_typ));
+      }
-      fprintf ( dg_file, ";" ) ;
+      fprintf(dg_file, ";");
-      last_type_sz = shape_size ( s ) ;
+      last_type_sz = shape_size(s);
-      set_stab_size ( dt->outref.u.l ) ;
+      set_stab_size(dt->outref.u.l);
-      break ;
+      break;
+    }
-    case DGT_BITF : {
+    case DGT_BITF: {
       bitfield_variety bv;
       bv = dt->data.t_bitf.bv;
-      fprintf ( dg_file, "%d", (bv.has_sign ? STAB_SINT : STAB_UINT) ) ;
+      fprintf(dg_file, "%d",(bv.has_sign ? STAB_SINT : STAB_UINT));
-      last_type_sz = bv.bits ;
+      last_type_sz = bv.bits;
-      break ;
+      break;
+    }
     case DGT_PROC: {
-      dg_type result_type = dt->data.t_proc.res_type ;
+      dg_type result_type = dt->data.t_proc.res_type;
-      long non1 = next_typen () ;
+      long non1 = next_typen();
-      long non2 = next_typen () ;
+      long non2 = next_typen();
       dt->outref.u.l = non1;
       dt->outref.k = LAB_D;
-      fprintf ( dg_file, "%ld=*%ld=f", non1, non2 ) ;
+      fprintf(dg_file, "%ld=*%ld=f", non1, non2);
-      out_dt_shape ( result_type ) ;
+      out_dt_shape(result_type);
-      last_type_sz = 32 ;
+      last_type_sz = 32;
-      set_stab_size ( non1 ) ;
+      set_stab_size(non1);
-      set_stab_size ( non2 ) ;
+      set_stab_size(non2);
-      break ;
+      break;
+    }
     default : {
-      fprintf ( dg_file, "%d", STAB_VOID ) ;
+      fprintf(dg_file, "%d", STAB_VOID);
       dt->outref.u.l = STAB_VOID;
       dt->outref.k = LAB_D;
-      last_type_sz = 0 ;
+      last_type_sz = 0;
-      break ;
+      break;
+    }
+  }
 #if 0
   if (dt->mor && dt->mor->this_tag)
     dt->mor->this_tag->outref = dt->outref;
 #endif
-  return ;
+  return;
 }
 #else
 static void out_dt_shape
-    PROTO_N ( ( dt ) )
-    PROTO_T ( diag_type dt )
+(diag_type dt)
+{
-  if ( dt->been_outed ) {
+  if (dt->been_outed) {
-    fprintf ( dg_file, "%d",(int) dt->been_outed ) ;
+    fprintf(dg_file, "%d",(int)dt->been_outed);
-    last_type_sz = get_stab_size ( dt->been_outed ) ;
+    last_type_sz = get_stab_size(dt->been_outed);
-    return ;
+    return;
+  }
-  depth_now++ ;
+  depth_now++;
-  switch ( dt->key ) {
+  switch (dt->key) {
-    case DIAG_TYPE_PTR : {
+    case DIAG_TYPE_PTR: {
-      long non ;
+      long non;
-      diag_type pdt = dt->data.ptr.object ;
+      diag_type pdt = dt->data.ptr.object;
-      if ( pdt->key == DIAG_TYPE_VARIETY ) {
+      if (pdt->key == DIAG_TYPE_VARIETY) {
-	long pn = out_sh_type ( f_integer ( pdt->data.var ) ) ;
+	long pn = out_sh_type(f_integer(pdt->data.var));
-	non = stab_ptrs [ pn ] ;
+	non = stab_ptrs[pn];
-	if ( non == 0 ) {
+	if (non == 0) {
-	  non = next_typen () ;
+	  non = next_typen();
-	  stab_ptrs [ pn ] = non ;
+	  stab_ptrs[pn] = non;
-	  fprintf ( dg_file, "%ld=*%ld", non, pn ) ;
+	  fprintf(dg_file, "%ld=*%ld", non, pn);
 	}
 	else {
-	  fprintf ( dg_file, "%ld", non ) ;
+	  fprintf(dg_file, "%ld", non);
+	}
       }
       else {
-	non = next_typen () ;
+	non = next_typen();
-	fprintf ( dg_file, "%ld=*", non ) ;
+	fprintf(dg_file, "%ld=*", non);
-	out_dt_shape ( dt->data.ptr.object ) ;
+	out_dt_shape(dt->data.ptr.object);
       }
-      dt->been_outed = non ;
+      dt->been_outed = non;
-      last_type_sz = 32 ;
+      last_type_sz = 32;
-      set_stab_size ( non ) ;
+      set_stab_size(non);
-      break ;
+      break;
     }
-    case DIAG_TYPE_ARRAY : {
+    case DIAG_TYPE_ARRAY: {
-      long lwb = no ( dt->data.array.lower_b ) ;
+      long lwb = no(dt->data.array.lower_b);
-      long upb = no ( dt->data.array.upper_b ) ;
+      long upb = no(dt->data.array.upper_b);
-      diag_type index_type = dt->data.array.index_type ;
+      diag_type index_type = dt->data.array.index_type;
-      diag_type element_type = dt->data.array.element_type ;
+      diag_type element_type = dt->data.array.element_type;
-      long non = next_typen () ;
+      long non = next_typen();
-      dt->been_outed = non ;
+      dt->been_outed = non;
-      fprintf ( dg_file, "%ld=", non ) ;
+      fprintf(dg_file, "%ld=", non);
-      fprintf ( dg_file, "ar" ) ;
+      fprintf(dg_file, "ar");
-      out_dt_shape ( index_type ) ;
+      out_dt_shape(index_type);
-      fprintf ( dg_file, ";%ld;%ld;", lwb, upb ) ;
+      fprintf(dg_file, ";%ld;%ld;", lwb, upb);
-      out_dt_shape ( element_type ) ;
+      out_dt_shape(element_type);
-      last_type_sz *= ( upb - lwb + 1 ) ;
+      last_type_sz *= (upb - lwb + 1);
-      set_stab_size ( non ) ;
+      set_stab_size(non);
-      break ;
+      break;
+    }
-    case DIAG_TYPE_STRUCT :
+    case DIAG_TYPE_STRUCT:
-    case DIAG_TYPE_UNION : {
+    case DIAG_TYPE_UNION: {
-      int i ;
+      int i;
-      char su ;
+      char su;
-      shape s ;
+      shape s;
-      diag_field_list fields ;
+      diag_field_list fields;
-      long non = next_typen () ;
+      long non = next_typen();
-      dt->been_outed = non ;
+      dt->been_outed = non;
-      if ( dt->key == DIAG_TYPE_STRUCT ) {
+      if (dt->key == DIAG_TYPE_STRUCT) {
-	fields = dt->data.t_struct.fields ;
+	fields = dt->data.t_struct.fields;
-	s = dt->data.t_struct.tdf_shape ;
+	s = dt->data.t_struct.tdf_shape;
 	su = 's';
       }
       else {
-	fields = dt->data.t_union.fields ;
+	fields = dt->data.t_union.fields;
 	s = dt->data.t_union.tdf_shape;
-	su = 'u' ;
+	su = 'u';
       }
-      fprintf ( dg_file, "%ld=%c%d", non, su, shape_size ( s ) / 8 ) ;
+      fprintf(dg_file, "%ld=%c%d", non, su, shape_size(s) / 8);
+      for (i = fields->lastused - 1; i >= 0; i--) {
+	diag_field sf = (fields->array)[i];
+	long offset = no(sf->where);
-      for ( i = fields->lastused - 1 ; i >= 0 ; i-- ) {
-	diag_field sf =  ( fields->array ) [i] ;
-	long offset = no ( sf->where );
 /*	if ( depth_now >= max_depth ) return ;*/
-	if(depth_now >= max_depth){
+	if (depth_now >= max_depth) {
 	  depth_now = 0;
-	  fprintf (dg_file, "\\\\\",0x80,0,%d,%d\n",0,0 ) ;
+	  fprintf(dg_file, "\\\\\",0x80,0,%d,%d\n",0,0);
-	  fprintf(dg_file,"\t.stabs\t\"");
+	  fprintf(dg_file,	}
-	}
-	depth_now++ ;
+	depth_now++;
-	fprintf ( dg_file, "%s:", sf->field_name.ints.chars ) ;
+	fprintf(dg_file, "%s:", sf->field_name.ints.chars);
-	out_dt_shape ( sf->field_type ) ;
+	out_dt_shape(sf->field_type);
-	fprintf ( dg_file, ",%ld,%ld;", offset, last_type_sz ) ;
+	fprintf(dg_file, ",%ld,%ld;", offset, last_type_sz);
       }
-      fprintf ( dg_file, ";" ) ;
+      fprintf(dg_file, ";");
-      last_type_sz = shape_size ( s ) ;
+      last_type_sz = shape_size(s);
-      set_stab_size ( non ) ;
+      set_stab_size(non);
-      break ;
+      break;
     }
-    case DIAG_TYPE_VARIETY : {
+    case DIAG_TYPE_VARIETY: {
-      dt->been_outed = out_sh_type ( f_integer ( dt->data.var ) ) ;
+      dt->been_outed = out_sh_type(f_integer(dt->data.var));
-      fprintf ( dg_file, "%ld", dt->been_outed ) ;
+      fprintf(dg_file, "%ld", dt->been_outed);
-      break ;
+      break;
     }
-    case DIAG_TYPE_PROC : {
+    case DIAG_TYPE_PROC: {
-      diag_type result_type = dt->data.proc.result_type ;
+      diag_type result_type = dt->data.proc.result_type;
-      long non1 = next_typen () ;
+      long non1 = next_typen();
-      long non2 = next_typen () ;
+      long non2 = next_typen();
-      dt->been_outed = non1 ;
+      dt->been_outed = non1;
-      fprintf ( dg_file, "%ld=*%ld=f", non1, non2 ) ;
+      fprintf(dg_file, "%ld=*%ld=f", non1, non2);
-      out_dt_shape ( result_type ) ;
+      out_dt_shape(result_type);
-      last_type_sz = 32 ;
+      last_type_sz = 32;
-      set_stab_size ( non1 ) ;
+      set_stab_size(non1);
-      set_stab_size ( non2 ) ;
+      set_stab_size(non2);
-      break ;
+      break;
     }
-    case DIAG_TYPE_LOC : {
+    case DIAG_TYPE_LOC: {
       /* +++ use qualifier which gives "const"/"volatile" */
-      out_dt_shape ( dt->data.loc.object ) ;
+      out_dt_shape(dt->data.loc.object);
-      break ;
+      break;
     }
-    case DIAG_TYPE_FLOAT : {
+    case DIAG_TYPE_FLOAT: {
-      dt->been_outed = out_sh_type ( f_floating ( dt->data.f_var ) ) ;
+      dt->been_outed = out_sh_type(f_floating(dt->data.f_var));
-      fprintf ( dg_file, "%ld", dt->been_outed ) ;
+      fprintf(dg_file, "%ld", dt->been_outed);
-      break ;
+      break;
+    }
-    case DIAG_TYPE_NULL : {
+    case DIAG_TYPE_NULL: {
-      fprintf ( dg_file, "%d", STAB_VOID ) ;
+      fprintf(dg_file, "%d", STAB_VOID);
-      last_type_sz = 0 ;
+      last_type_sz = 0;
-      break ;
+      break;
     }
-    case DIAG_TYPE_BITFIELD : {
+    case DIAG_TYPE_BITFIELD: {
-      long sz = dt->data.bitfield.no_of_bits.nat_val.small_nat ;
+      long sz = dt->data.bitfield.no_of_bits.nat_val.small_nat;
-      fprintf ( dg_file, "%d", STAB_SINT ) ;
+      fprintf(dg_file, "%d", STAB_SINT);
-      last_type_sz = sz ;
+      last_type_sz = sz;
-      break ;
+      break;
+    }
-    case DIAG_TYPE_ENUM : {
+    case DIAG_TYPE_ENUM: {
-      int i ;
+      int i;
       enum_values_list enumvals = dt->data.t_enum.values;
-      long non = next_typen () ;
+      long non = next_typen();
-      dt->been_outed = non ;
+      dt->been_outed = non;
-      fprintf ( dg_file, "%ld=e", non ) ;
+      fprintf(dg_file, "%ld=e", non);
-      for ( i = enumvals->lastused - 1 ; i >= 0 ; i-- ) {
+      for (i = enumvals->lastused - 1; i >= 0; i--) {
-	  enum_values ef =  ( enumvals->array ) [i] ;
+	  enum_values ef = (enumvals->array)[i];
-	  fprintf ( dg_file, "%s:%d,", ef->nme.ints.chars, no ( ef->val ) );
+	  fprintf(dg_file, "%s:%d,", ef->nme.ints.chars, no(ef->val));
+      }
-      fprintf ( dg_file, ";" ) ;
+      fprintf(dg_file, ";");
-      last_type_sz = 32 ;
+      last_type_sz = 32;
-      set_stab_size ( non ) ;
+      set_stab_size(non);
-      break ;
+      break;
     }
     default : {
-      fprintf ( dg_file, "%d", STAB_VOID ) ;
+      fprintf(dg_file, "%d", STAB_VOID);
-      last_type_sz = 0 ;
+      last_type_sz = 0;
-      break ;
+      break;
+    }
+  }
-    return ;
+    return;
+}
 #endif
   OUTPUT DIAGNOSTICS FOR A GLOBAL VARIABLE
 */
 #ifdef NEWDIAGS
 void stab_global
-    PROTO_N ( ( di, global, id, ext ) )
-    PROTO_T ( dg_name di X exp global X char * id X int ext )
+(dg_name di, exp global, char * id, int ext)
+{
   char* nm;
   dg_type dt;
   if (!di || di->key != DGN_OBJECT)
     return;
-  nm = idname_chars (di->idnam);
+  nm = idname_chars(di->idnam);
   dt = di->data.n_obj.typ;
   if (di->whence.line)
-    stabd ( di->whence.file, di->whence.line, -N_DSLINE ) ;
+    stabd(di->whence.file, di->whence.line, -N_DSLINE);
-  fprintf ( dg_file, "\t.stabs\t\"%s:%c", nm, ( ext ? 'G' : 'S' ) ) ;
+  fprintf(dg_file, "\t.stabs\t\"%s:%c", nm,(ext ? 'G' : 'S'));
-  OUT_DT_SHAPE ( dt ) ;
+  OUT_DT_SHAPE(dt);
-  fprintf ( dg_file, "\",%#x,0,%ld,%s\n", ( ext ? 0x24 : ((no(global)!=0)?0x26:0x28) ),
+  fprintf(dg_file, "\",%#x,0,%ld,%s\n",(ext ? 0x24 :((no(global)!=0)?0x26:0x28)),
 				/* solaris puts line no,0 rather than
 , varname, so suppress the stabd
 				 above, and do here. */
 	   di->whence.line,
 	   id
-	   ) ;
+	  );
-  return ;
+  return;
+}
 #else
 void stab_global
-    PROTO_N ( ( dd, global, id, ext ) )
-    PROTO_T ( diag_descriptor * dd X exp global X char * id X bool ext )
+(diag_descriptor * dd, exp global, char * id, bool ext)
+{
-  if ( dd == NULL ) return ;
+  if (dd == NULL) return;
-  stabd ( find_file ( dd->data.id.whence.file->file.ints.chars ),
-	 ( long ) dd->data.id.whence.line_no.nat_val.small_nat
-	 , -N_DSLINE ) ;
+  stabd(find_file(dd->data.id.whence.file->file.ints.chars),
+	(long)dd->data.id.whence.line_no.nat_val.small_nat
+	 , -N_DSLINE);
-  fprintf ( dg_file, "\t.stabs\t\"%s:%c", dd->data.id.nme.ints.chars,
+  fprintf(dg_file, "\t.stabs\t\"%s:%c", dd->data.id.nme.ints.chars,
-	   ( ext ? 'G' : 'S' ) ) ;
+	  (ext ? 'G' : 'S'));
-  OUT_DT_SHAPE ( dd->data.id.new_type ) ;
+  OUT_DT_SHAPE(dd->data.id.new_type);
-  fprintf ( dg_file, "\",%#x,0,%ld,%s\n", ( ext ? 0x24 : ((no(global)!=0)?0x26:0x28) ),
+  fprintf(dg_file, "\",%#x,0,%ld,%s\n",(ext ? 0x24 :((no(global)!=0)?0x26:0x28)),
 				/* solaris puts line no,0 rather than
 , varname, so suppress the stabd
 				 above, and do here. */
 	   dd->data.id.whence.line_no.nat_val.small_nat,
 	   id
-	   ) ;
+	  );
-  return ;
+  return;
 }
 #endif
   OUTPUT DIAGNOSTICS FOR A PROCEDURE
 */
 #ifdef NEWDIAGS
 void stab_proc
-    PROTO_N ( ( di, proc, id, ext ) )
-    PROTO_T ( dg_name di X exp proc X char * id X int ext )
+(dg_name di, exp proc, char * id, int ext)
+{
   char* nm;
   dg_type dt;
   if (!di || di->key != DGN_PROC)
     return;
-  nm = idname_chars (di->idnam);
+  nm = idname_chars(di->idnam);
   dt = di->data.n_proc.typ;
   if (dt->key == DGT_PROC)	/* it should be */
     dt = dt->data.t_proc.res_type;
   last_proc_lab = id;
   if (di->whence.line)
-    stabd ( di->whence.file, di->whence.line, 0 ) ;
+    stabd(di->whence.file, di->whence.line, 0);
-  fprintf ( dg_file, "\t.stabs\t\"%s:%c", nm, ( ext ? 'F' : 'f' ) ) ;
+  fprintf(dg_file, "\t.stabs\t\"%s:%c", nm,(ext ? 'F' : 'f'));
-  OUT_DT_SHAPE ( dt ) ;
+  OUT_DT_SHAPE(dt);
-  fprintf ( dg_file, "\",0x24,0,%ld,%s\n", di->whence.line, id ) ;
+  fprintf(dg_file, "\",0x24,0,%ld,%s\n", di->whence.line, id);
-  return ;
+  return;
+}
 #else
 void stab_proc
-    PROTO_N ( ( dd, proc, id, ext ) )
-    PROTO_T ( diag_descriptor * dd X exp proc X char * id X bool ext )
+(diag_descriptor * dd, exp proc, char * id, bool ext)
+{
     last_proc_lab = id;		/* id is passed from translate_capsule,
 				 so stays in scope while needed */
-  if ( dd == NULL ) return ;
+  if (dd == NULL) return;
-  stabd ( find_file ( dd->data.id.whence.file->file.ints.chars ),
-	 ( long ) dd->data.id.whence.line_no.nat_val.small_nat
-	 ,0) ;
+  stabd(find_file(dd->data.id.whence.file->file.ints.chars),
+	(long)dd->data.id.whence.line_no.nat_val.small_nat
+	 ,0);
-  fprintf ( dg_file, "\t.stabs\t\"%s:%c",
+  fprintf(dg_file, "\t.stabs\t\"%s:%c",
-	   dd->data.id.nme.ints.chars, ( ext ? 'F' : 'f' ) ) ;
+	   dd->data.id.nme.ints.chars,(ext ? 'F' : 'f'));
-  OUT_DT_SHAPE ( dd->data.id.new_type->data.proc.result_type ) ;
+  OUT_DT_SHAPE(dd->data.id.new_type->data.proc.result_type);
-  fprintf ( dg_file, "\",0x24,0,%ld,%s\n",
+  fprintf(dg_file, "\",0x24,0,%ld,%s\n",
-	   dd->data.id.whence.line_no.nat_val.small_nat, id ) ;
+	   dd->data.id.whence.line_no.nat_val.small_nat, id);
-  return ;
+  return;
+}
 #endif
 void stab_proc_end
-    PROTO_Z ()
+(void)
+{
   if (del_stab_start != NULL) {
     struct del_stab_array *this_a = del_stab_start;
     int this_i = 0;
     while (this_a != c_del_array || this_i != c_del_index) {
+	}
 	t = (this_a -> a) + (this_i ++);
 	switch (t -> del_t) {
 	    case D_PARAM: {
 		long disp = t->u.l.offset;
-		fprintf ( dg_file, "\t.stabs\t\"%s:p", t->u.l.nm);
+		fprintf(dg_file, "\t.stabs\t\"%s:p", t->u.l.nm);
-		OUT_DT_SHAPE ( t->u.l.dt ) ;
+		OUT_DT_SHAPE(t->u.l.dt);
-		fprintf ( dg_file, "\",0xa0,0,%d,%ld\n", 0, disp);
+		fprintf(dg_file, "\",0xa0,0,%d,%ld\n", 0, disp);
 		if (disp <= 88) { /* register useage comment */
-		  fprintf ( dg_file, "\t.stabs\t\"%s:r", t->u.l.nm);
+		  fprintf(dg_file, "\t.stabs\t\"%s:r", t->u.l.nm);
-		  OUT_DT_SHAPE ( t->u.l.dt ) ;
+		  OUT_DT_SHAPE(t->u.l.dt);
-		  fprintf ( dg_file, "\",0x40,0,%d,%ld\n",0,24+ ((disp-68)/4));
+		  fprintf(dg_file, "\",0x40,0,%d,%ld\n",0,24+ ((disp-68) /4));
+		}
 		break;
+	    }
 	    case D_LOCAL: {
 		long disp = t->u.l.offset;
-		fprintf ( dg_file, "\t.stabs\t\"%s:", t->u.l.nm);
+		fprintf(dg_file, "\t.stabs\t\"%s:", t->u.l.nm);
-		OUT_DT_SHAPE ( t->u.l.dt ) ;
+		OUT_DT_SHAPE(t->u.l.dt);
-		fprintf ( dg_file, "\",0x80,0,%d,%ld\n", 0, disp);
+		fprintf(dg_file, "\",0x80,0,%d,%ld\n", 0, disp);
 		break;
+	    }
 	    default: {
-		fprintf ( dg_file, "\t.stabn\t0x%x,0,%d,.LL.%d-%s\n",
+		fprintf(dg_file, "\t.stabn\t0x%x,0,%d,.LL.%d-%s\n",
-			t->u.b.br, t->u.b.lev, t->u.b.lab, last_proc_lab );
+			t->u.b.br, t->u.b.lev, t->u.b.lab, last_proc_lab);
+	    }
+	}
     }
     c_del_array = del_stab_start;
     c_del_index = 0;
+  }
   return;
+}
 /*
   OUTPUT DIAGNOSTICS FOR A LOCAL VARIABLE
 */
 #ifdef NEWDIAGS
 static void stab_local
-    PROTO_N ( ( di, param ) )
-    PROTO_T ( dg_name di X int param )
+(dg_name di, int param)
+{
   exp id = di->data.n_obj.obtain_val;
   struct delay_stab * t;
   char* nm;
   dg_type dt;
   if (di->key != DGN_OBJECT || !id)
     return;
   id = son(id);
   if (name(id) == cont_tag && name(son(id)) == name_tag && isvar(son(son(id))))
 	  id = son(id);
-  if (name(id) != name_tag || isdiscarded(id) || (isglob(son(id)) &&
+  if (name(id)!= name_tag || isdiscarded(id) || (isglob(son(id)) &&
-	no(son(id)) == 0 && !(brog(son(id))->dec_u.dec_val.extnamed)))
+	no(son(id)) == 0 && !(brog(son(id)) ->dec_u.dec_val.extnamed)))
     return;
   disp = no(id);
   id = son(id);
-  nm = idname_chars (di->idnam);
+  nm = idname_chars(di->idnam);
   dt = di->data.n_obj.typ;
   t = next_del_stab();
-  if (name (id) == ident_tag && ((props (id) & defer_bit) == 0))
+  if (name(id) == ident_tag && ((props(id) & defer_bit) == 0))
     disp += boff ( id ).offset ;	/* is this condition right ? */
   again :
-    if ( name ( id ) == ident_tag ) {
+    if (name(id) == ident_tag) {
-      if ( ( props ( id ) & defer_bit ) == 0 ) {
+      if ((props(id) & defer_bit) == 0) {
 	/* +++ add assembler comment to say which reg is being used */
-	  t->del_t = (param ? D_PARAM : D_LOCAL) ;
+	  t->del_t = (param ? D_PARAM : D_LOCAL);
-	  t->u.l.nm = nm ;
+	  t->u.l.nm = nm;
-	  t->u.l.dt = dt ;
+	  t->u.l.dt = dt;
 	  t->u.l.offset = disp;
-	  return ;
+	  return;
       }
       else {
-	exp sn = son ( id ) ;
+	exp sn = son(id);
-	long d = disp ;
+	long d = disp;
-	while ( sn != nilexp ) {
+	while (sn != nilexp) {
-	  switch ( name ( sn ) ) {
+	  switch (name(sn)) {
-	    case name_tag : {
+	    case name_tag: {
-	      disp = d + no ( sn ) ;
+	      disp = d + no(sn);
-	      id = son ( sn ) ;
+	      id = son(sn);
 	      /* if ( isvar ( id ) ) dt = dt->data.ptr.object ;		?????????? */
-	      goto again ;
+	      goto again;
+	    }
-	    case reff_tag : {
+	    case reff_tag: {
-	      d += no ( sn ) ;
+	      d += no(sn);
-	      sn = son ( sn ) ;
+	      sn = son(sn);
-	      break ;
+	      break;
 	    }
-	    case cont_tag : {
+	    case cont_tag: {
-	      sn = son ( sn ) ;
+	      sn = son(sn);
-	      break ;
+	      break;
+	    }
 	    default : {
-	      return ;
+	      return;
+	    }
+	  }
+	}
+      }
+    }
-  return ;
+  return;
+}
 #else
 void stab_local
-    PROTO_N ( ( nm, dt, ldid, disp, findex ) )
-    PROTO_T ( char *nm X diag_type dt X exp ldid X long disp X long findex )
+(char *nm, diag_type dt, exp ldid, long disp, long findex)
+{
-  exp id = son ( ldid ) ;
+  exp id = son(ldid);
   struct delay_stab * t = next_del_stab();
-  if (name (id) == ident_tag && ((props (id) & defer_bit) == 0))
+  if (name(id) == ident_tag && ((props(id) & defer_bit) == 0))
     disp += boff ( id ).offset ;	/* is this condition right ? */
   again :
-    if ( name ( id ) == ident_tag ) {
+    if (name(id) == ident_tag) {
-      if ( ( props ( id ) & defer_bit ) == 0 ) {
+      if ((props(id) & defer_bit) == 0) {
 	/* +++ add assembler comment to say which reg is being used */
-	if ( isparam ( id ) ) {
+	if (isparam(id)) {
 	  t->del_t = D_PARAM;
-	  t->u.l.nm = nm ;
+	  t->u.l.nm = nm;
-	  t->u.l.dt = dt ;
+	  t->u.l.dt = dt;
 	  t->u.l.offset = disp;
-	  return ;
+	  return;
 	}
 	else {
 	  t->del_t = D_LOCAL;
-	  t->u.l.nm = nm ;
+	  t->u.l.nm = nm;
-	  t->u.l.dt = dt ;
+	  t->u.l.dt = dt;
 	  t->u.l.offset = disp;
-	  return ;
+	  return;
+	}
       }
       else {
-	exp sn = son ( id ) ;
+	exp sn = son(id);
-	long d = disp ;
+	long d = disp;
-	while ( sn != nilexp ) {
+	while (sn != nilexp) {
-	  switch ( name ( sn ) ) {
+	  switch (name(sn)) {
-	    case name_tag : {
+	    case name_tag: {
-	      disp = d + no ( sn ) ;
+	      disp = d + no(sn);
-	      id = son ( sn ) ;
+	      id = son(sn);
-	      if ( isvar ( id ) ) dt = dt->data.ptr.object ;
+	      if (isvar(id))dt = dt->data.ptr.object;
-	      goto again ;
+	      goto again;
+	    }
-	    case reff_tag : {
+	    case reff_tag: {
-	      d += no ( sn ) ;
+	      d += no(sn);
-	      sn = son ( sn ) ;
+	      sn = son(sn);
-	      break ;
+	      break;
+	    }
-	    case cont_tag : {
+	    case cont_tag: {
-	      sn = son ( sn ) ;
+	      sn = son(sn);
-	      break ;
+	      break;
+	    }
 	    default : {
-	      return ;
+	      return;
+	    }
+	  }
+	}
+      }
+    }
-  return ;
+  return;
 }
 #endif
 /*
   DEAL WITH BASIC TYPES
 */
 void stab_types
-    PROTO_Z ()
+(void)
 {
-  total_type_sizes = NO_STABS ;
+  total_type_sizes = NO_STABS;
-  typeno = NO_STABS ;
+  typeno = NO_STABS;
-  type_sizes = ( long * ) xmalloc ( NO_STABS * sizeof ( long ) ) ;
+  type_sizes = (long *)xmalloc(NO_STABS * sizeof(long));
-  fputs ( "\t.stabs\t\"int:t1=r1;-2147483648;2147483647;\",0x80,0,0,0\n", dg_file ) ;
+  fputs("\t.stabs\t\"int:t1=r1;-2147483648;2147483647;\",0x80,0,0,0\n", dg_file);
-  fputs ( "\t.stabs\t\"short int:t2=r1;-32768;32767;\",0x80,0,0,0\n",
+  fputs("\t.stabs\t\"short int:t2=r1;-32768;32767;\",0x80,0,0,0\n",
-	    dg_file ) ;
+	    dg_file);
-  fputs ( "\t.stabs\t\"short unsigned int:t3=r1;0;65535;\",0x80,0,0,0\n", dg_file ) ;
+  fputs("\t.stabs\t\"short unsigned int:t3=r1;0;65535;\",0x80,0,0,0\n", dg_file);
-  fputs ( "\t.stabs\t\"char:t4=r4;0;127;\",0x80,0,0,0\n", dg_file ) ;
+  fputs("\t.stabs\t\"char:t4=r4;0;127;\",0x80,0,0,0\n", dg_file);
-  fputs ( "\t.stabs\t\"signed char:t5=r1;-128;127;\",0x80,0,0,0\n",
+  fputs("\t.stabs\t\"signed char:t5=r1;-128;127;\",0x80,0,0,0\n",
-	  dg_file ) ;
+	  dg_file);
-  fputs ( "\t.stabs\t\"unsigned char:t6=r1;0;255;\",0x80,0,0,0\n",
+  fputs("\t.stabs\t\"unsigned char:t6=r1;0;255;\",0x80,0,0,0\n",
-	  dg_file ) ;
+	  dg_file);
-  fputs ( "\t.stabs\t\"long int:t7=r1;-2147483648;2147483647;\",0x80,0,0,0\n", dg_file ) ;
+  fputs("\t.stabs\t\"long int:t7=r1;-2147483648;2147483647;\",0x80,0,0,0\n", dg_file);
-    fputs ( "\t.stabs\t\"unsigned int:t8=r1;0;-1;\",0x80,0,0,0\n",
+    fputs("\t.stabs\t\"unsigned int:t8=r1;0;-1;\",0x80,0,0,0\n",
-	    dg_file ) ;
+	    dg_file);
-    fputs ( "\t.stabs\t\"long unsigned int:t9=r1;0;-1;\",0x80,0,0,0\n",
+    fputs("\t.stabs\t\"long unsigned int:t9=r1;0;-1;\",0x80,0,0,0\n",
-	    dg_file ) ;
+	    dg_file);
-    fputs ( "\t.stabs\t\"float:t10=r1;4;0;\",0x80,0,0,0\n", dg_file ) ;
+    fputs("\t.stabs\t\"float:t10=r1;4;0;\",0x80,0,0,0\n", dg_file);
-    fputs ( "\t.stabs\t\"double:t11=r1;8;0;\",0x80,0,0,0\n", dg_file ) ;
+    fputs("\t.stabs\t\"double:t11=r1;8;0;\",0x80,0,0,0\n", dg_file);
-    fprintf ( dg_file, "\t.stabs\t\"long double:t12=r1;%ld;0;\",0x80,0,0,0\n",
+    fprintf(dg_file, "\t.stabs\t\"long double:t12=r1;%ld;0;\",0x80,0,0,0\n",
-	      DOUBLE_SZ / 8 ) ;
+	      DOUBLE_SZ / 8);
-    fputs ( "\t.stabs\t\"void:t13=13\",0x80,0,0,0\n", dg_file ) ;
+    fputs("\t.stabs\t\"void:t13=13\",0x80,0,0,0\n", dg_file);
-    fputs ( "\t.stabs\t\"long long int:t14=r1;", dg_file ) ;
+    fputs("\t.stabs\t\"long long int:t14=r1;", dg_file);
-    fputs ( "01000000000000000000000;0777777777777777777777;\",0x80,0,0,0\n",
+    fputs("01000000000000000000000;0777777777777777777777;\",0x80,0,0,0\n",
-	    dg_file ) ;
+	    dg_file);
-    fputs ( "\t.stabs\t\"unsigned long long int:t15=r1;", dg_file ) ;
+    fputs("\t.stabs\t\"unsigned long long int:t15=r1;", dg_file);
-    fputs ( "0000000000000;01777777777777777777777;\",0x80,0,0,0\n",
+    fputs("0000000000000;01777777777777777777777;\",0x80,0,0,0\n",
-	    dg_file ) ;
+	    dg_file);
-    fputs ( "\t.stabs\t\"__void_star:t16=*13\",0x80,0,0,0\n",
+    fputs("\t.stabs\t\"__void_star:t16=*13\",0x80,0,0,0\n",
-	    dg_file ) ;
+	    dg_file);
-    type_sizes [0] = 0 ;
+    type_sizes[0] = 0;
-    type_sizes [1] = 32 ;
+    type_sizes[1] = 32;
-    type_sizes [2] = 16 ;
+    type_sizes[2] = 16;
-    type_sizes [3] = 16 ;
+    type_sizes[3] = 16;
-    type_sizes [4] = 8 ;
+    type_sizes[4] = 8;
-    type_sizes [5] = 8 ;
+    type_sizes[5] = 8;
-    type_sizes [6] = 8 ;
+    type_sizes[6] = 8;
-    type_sizes [7] = 32 ;
+    type_sizes[7] = 32;
-    type_sizes [8] = 32 ;
+    type_sizes[8] = 32;
-    type_sizes [9] = 32 ;
+    type_sizes[9] = 32;
-    type_sizes [10] = 32 ;
+    type_sizes[10] = 32;
-    type_sizes [11] = 64 ;
+    type_sizes[11] = 64;
-    type_sizes [12] = DOUBLE_SZ ;
+    type_sizes[12] = DOUBLE_SZ;
-    type_sizes [13] = 0 ;
+    type_sizes[13] = 0;
-    type_sizes [14] = 64 ;
+    type_sizes[14] = 64;
-    type_sizes [15] = 64 ;
+    type_sizes[15] = 64;
-    type_sizes [16] = 32 ;
+    type_sizes[16] = 32;
-    return ;
+    return;
 }
 #ifndef NEWDIAGS
 /*
     DEAL WITH STRUCTURE, UNION AND ENUM TAGS
 */
 void stab_tagdefs
-    PROTO_Z ()
+(void)
+{
-    diag_tagdef **di = unit_ind_diagtags ;
+    diag_tagdef **di = unit_ind_diagtags;
-    int i, n = unit_no_of_diagtags, istag ;
+    int i, n = unit_no_of_diagtags, istag;
-    for ( i = 0 ; i < n ; i++ ) {
-	diag_type d = di [i]->d_type ;
-	istag = 1;
-	switch ( d->key ) {
+    for (i = 0; i < n; i++) {
+	diag_type d = di[i] ->d_type;
+	istag = 1;
+	switch (d->key) {
-	    case DIAG_TYPE_STRUCT : {
+	    case DIAG_TYPE_STRUCT: {
-		char *nme = d->data.t_struct.nme.ints.chars ;
+		char *nme = d->data.t_struct.nme.ints.chars;
-		if ( nme && *nme ) {
+		if (nme && *nme) {
-		    fprintf ( dg_file, "\t.stabs\t\"%s:", nme ) ;
+		    fprintf(dg_file, "\t.stabs\t\"%s:", nme);
 		} else {
-		    static int s_count = 0 ;
+		    static int s_count = 0;
-		    fprintf ( dg_file, "\t.stabs\t\"_struct%d:", s_count++ ) ;
+		    fprintf(dg_file, "\t.stabs\t\"_struct%d:", s_count++);
+		}
-		break ;
+		break;
+	    }
-	    case DIAG_TYPE_UNION : {
+	    case DIAG_TYPE_UNION: {
-		char *nme = d->data.t_union.nme.ints.chars ;
+		char *nme = d->data.t_union.nme.ints.chars;
-		if ( nme && *nme ) {
+		if (nme && *nme) {
-		    fprintf ( dg_file, "\t.stabs\t\"%s:", nme ) ;
+		    fprintf(dg_file, "\t.stabs\t\"%s:", nme);
 		} else {
-		    static int u_count = 0 ;
+		    static int u_count = 0;
-		    fprintf ( dg_file, "\t.stabs\t\"_union%d:", u_count++ ) ;
+		    fprintf(dg_file, "\t.stabs\t\"_union%d:", u_count++);
+		}
-		break ;
+		break;
+	    }
-	    case DIAG_TYPE_ENUM : {
+	    case DIAG_TYPE_ENUM: {
-		char *nme = d->data.t_enum.nme.ints.chars ;
+		char *nme = d->data.t_enum.nme.ints.chars;
-		if ( nme && *nme ) {
+		if (nme && *nme) {
-		    fprintf ( dg_file, "\t.stabs\t\"%s:", nme ) ;
+		    fprintf(dg_file, "\t.stabs\t\"%s:", nme);
 		} else {
-		    static int e_count = 0 ;
+		    static int e_count = 0;
-		    fprintf ( dg_file, "\t.stabs\t\"_enum%d:", e_count++ ) ;
+		    fprintf(dg_file, "\t.stabs\t\"_enum%d:", e_count++);
+		}
-		break ;
+		break;
+	    }
 	    default: {
-		istag = 0 ;
+		istag = 0;
-		break ;
+		break;
 	    }
+	}
 	if (istag) {
-	    if ( d->been_outed && 0) {
+	    if (d->been_outed && 0) {
-		fprintf ( dg_file, "%d", (int)d->been_outed ) ;
+		fprintf(dg_file, "%d",(int)d->been_outed);
 	    } else {
-		fprintf ( dg_file, "T" ) ;
+		fprintf(dg_file, "T");
-		OUT_DT_SHAPE ( d ) ;
+		OUT_DT_SHAPE(d);
+	    }
-	    fprintf ( dg_file, "\",0x80,0,0,0\n" ) ;
+	    fprintf(dg_file, "\",0x80,0,0,0\n");
+	}
+    }
-    return ;
+    return;
+}
 #endif
 /*
   DEAL WITH TYPEDEFS
 */
 #ifndef NEWDIAGS
 void stab_typedefs
-    PROTO_Z ()
+(void)
+{
-  diag_descriptor *di = unit_diagvar_tab.array ;
+  diag_descriptor *di = unit_diagvar_tab.array;
-  int i, n = unit_diagvar_tab.lastused ;
+  int i, n = unit_diagvar_tab.lastused;
-  for ( i = 0 ; i < n ; i++ ) {
+  for (i = 0; i < n; i++) {
-    if ( di [i].key == DIAG_TYPEDEF_KEY ) {
+    if (di[i].key == DIAG_TYPEDEF_KEY) {
-      long non = next_typen () ;
+      long non = next_typen();
-      fprintf ( dg_file, "\t.stabs\t\"%s:t%ld=",
+      fprintf(dg_file, "\t.stabs\t\"%s:t%ld=",
-		di [i].data.typ.nme.ints.chars, non ) ;
+		di[i].data.typ.nme.ints.chars, non);
-      OUT_DT_SHAPE ( di [i].data.typ.new_type ) ;
+      OUT_DT_SHAPE(di[i].data.typ.new_type);
-      fprintf ( dg_file, "\",0x80,0,0,0\n" ) ;
+      fprintf(dg_file, "\",0x80,0,0,0\n");
+    }
+  }
-  return ;
+  return;
+}
 #endif
 /*
   INITIALISE DIAGNOSTICS
 */
 #ifdef NEWDIAGS
 void init_stab
-    PROTO_Z ()
+(void)
 {
   return;
+}
 void init_stab_aux
-    PROTO_Z ()
+(void)
+{
   dg_compilation this_comp;
-  dg_file = as_file ;
+  dg_file = as_file;
   this_comp = all_comp_units;
   while (this_comp) {
     dg_name item = this_comp->dn_list;
     while (item) {
       if (item->key == DGN_PROC && item->data.n_proc.obtain_val)
       item = item -> next;
+    }
     this_comp = this_comp->another;
+  }
   if (prim_file)
-    stab_file (prim_file);
+    stab_file(prim_file);
-  stab_types () ;
+  stab_types();
 #if 0
   this_comp = all_comp_units;
   while (this_comp) {
     dg_name item = this_comp->dn_list;
     while (item) {
       if (item->key == DGN_TYPE) {
 	dg_type dt = item->data.n_typ.raw;
-	char * s = idname_chars (item->idnam);
+	char * s = idname_chars(item->idnam);
 	if (s[0]) {
 	  if (!dt->outref.k) {
 	    dt->outref.k = -1;
-	    dt->outref.u.l = next_typen () ;
+	    dt->outref.u.l = next_typen();
 	    if (dt->key == DGT_STRUCT)
-	      shape_stab_size (dt->outref.u.l, dt->data.t_struct.sha);
+	      shape_stab_size(dt->outref.u.l, dt->data.t_struct.sha);
 	    else
 	    if (dt->key == DGT_ENUM)
-	      shape_stab_size (dt->outref.u.l, dt->data.t_enum.sha);
+	      shape_stab_size(dt->outref.u.l, dt->data.t_enum.sha);
+	  }
+	}
 	else
 	if ((dt->key == DGT_STRUCT &&
 		(dt->data.t_struct.idnam.id_key == DG_ID_SRC ||
 		   dt->data.t_struct.idnam.id_key == DG_ID_EXT)
 		&& (s = dt->data.t_struct.idnam.idd.nam, s[0]))
 	     || (dt->key == DGT_ENUM && (s = dt->data.t_enum.tnam, s[0]))) {
 	  if (!dt->outref.k) {
 	    dt->outref.k = -1;
-	    dt->outref.u.l = next_typen () ;
+	    dt->outref.u.l = next_typen();
 	    if (dt->key == DGT_STRUCT)
-	      shape_stab_size (dt->outref.u.l, dt->data.t_struct.sha);
+	      shape_stab_size(dt->outref.u.l, dt->data.t_struct.sha);
 	    else
 	    if (dt->key == DGT_ENUM)
-	      shape_stab_size (dt->outref.u.l, dt->data.t_enum.sha);
+	      shape_stab_size(dt->outref.u.l, dt->data.t_enum.sha);
+	  }
+	}
+      }
       item = item -> next;
+    }
   while (this_comp) {
     dg_name item = this_comp->dn_list;
     while (item) {
       if (item->key == DGN_TYPE && item->data.n_typ.raw->key != DGT_UNKNOWN) {
 	dg_type dt = item->data.n_typ.raw;
-	char * s = idname_chars (item->idnam);
+	char * s = idname_chars(item->idnam);
 	if (s[0]) {
-	  fprintf ( dg_file, "\t.stabs\t\"%s:", s ) ;
+	  fprintf(dg_file, "\t.stabs\t\"%s:", s);
 	  if (dt->outref.k == LAB_STR) {
 	    dt->outref.k = LAB_D;
-	    dt->outref.u.l = find_basic_type (dt->outref.u.s);
+	    dt->outref.u.l = find_basic_type(dt->outref.u.s);
+	  }
-	  if ( dt->outref.k == LAB_D ) {
+	  if (dt->outref.k == LAB_D) {
-		fprintf ( dg_file, "%d", (int)dt->outref.u.l ) ;
+		fprintf(dg_file, "%d",(int)dt->outref.u.l);
 	    } else {
-		fprintf ( dg_file, "t" ) ;
+		fprintf(dg_file, "t");
-		OUT_DT_SHAPE ( dt ) ;
+		OUT_DT_SHAPE(dt);
+	    }
-	  fprintf ( dg_file, "\",0x80,0,0,0\n" ) ;
+	  fprintf(dg_file, "\",0x80,0,0,0\n");
+	}
 	else
 	if ((dt->key == DGT_STRUCT &&
 		(dt->data.t_struct.idnam.id_key == DG_ID_SRC ||
 		   dt->data.t_struct.idnam.id_key == DG_ID_EXT)
 		&& (s = dt->data.t_struct.idnam.idd.nam, s[0]))
 	     || (dt->key == DGT_ENUM && (s = dt->data.t_enum.tnam, s[0]))) {
-	  fprintf ( dg_file, "\t.stabs\t\"%s:", s ) ;
+	  fprintf(dg_file, "\t.stabs\t\"%s:", s);
-	  if ( dt->outref.k == LAB_D ) {
+	  if (dt->outref.k == LAB_D) {
-		fprintf ( dg_file, "%d", (int)dt->outref.u.l ) ;
+		fprintf(dg_file, "%d",(int)dt->outref.u.l);
 	    } else {
-		fprintf ( dg_file, "T" ) ;
+		fprintf(dg_file, "T");
-		OUT_DT_SHAPE ( dt ) ;
+		OUT_DT_SHAPE(dt);
+	    }
-	    fprintf ( dg_file, "\",0x80,0,0,0\n" ) ;
+	    fprintf(dg_file, "\",0x80,0,0,0\n");
+	}
 #if 0
 	if (item->mor && item->mor->this_tag)
 	  item->mor->this_tag->outref = item->data.n_typ.raw->outref;
 #endif
   return;
+}
 #else
 void init_stab
-    PROTO_Z ()
+(void)
 {
-  dg_file_name = tmpnam ( NULL ) ;
+  dg_file_name = tmpnam(NULL);
-  dg_file = fopen ( dg_file_name, "w" ) ;
+  dg_file = fopen(dg_file_name, "w");
-  if ( dg_file == NULL ) {
+  if (dg_file == NULL) {
-    fail ( "Can't open temporary diagnostics file" ) ;
+    fail("Can't open temporary diagnostics file");
-    exit ( EXIT_FAILURE ) ;
+    exit(EXIT_FAILURE);
   }
-  stab_types () ;
+  stab_types();
-  return ;
+  return;
+}
 void init_stab_aux
-    PROTO_Z ()
+(void)
+{
-  int c ;
+  int c;
-  FILE *f ;
+  FILE *f;
-  int i, j = 0 ;
+  int i, j = 0;
-  for ( i = 0 ; i < nofds ; i++ ) {
+  for (i = 0; i < nofds; i++) {
-    char *s = fds [i]->file.ints.chars ;
+    char *s = fds[i] ->file.ints.chars;
-    int n = ( int ) strlen ( s ) ;
+    int n = (int)strlen(s);
-    if ( n && s [ n - 1 ] != 'h' ) j = i ;
+    if (n && s[n - 1]!= 'h')j = i;
-  }
-  fclose ( dg_file ) ;
-  dg_file = as_file ;
-  stab_file ( ( long ) j, 0 ) ;
-  f = fopen ( dg_file_name, "r" ) ;
-  if ( f == NULL ) {
-    fail ( "Can't open temporary diagnostics file" ) ;
-    exit ( EXIT_FAILURE ) ;
+  }
+  fclose(dg_file);
+  dg_file = as_file;
+  stab_file((long)j, 0);
+  f = fopen(dg_file_name, "r");
+  if (f == NULL) {
+    fail("Can't open temporary diagnostics file");
+    exit(EXIT_FAILURE);
+  }
-  while ( c = fgetc ( f ), c != EOF ) outc ( c ) ;
+  while (c = fgetc(f), c != EOF)outc(c);
-  fclose ( f ) ;
+  fclose(f);
-  remove ( dg_file_name ) ;
+  remove(dg_file_name);
-  return ;
+  return;
+}
 #endif

Subversion Repositories tendra.SVN

(root)/branches/tendra5/src/installers/sparc/solaris/sparcdiags.c – Rev 5 → 6