WebSVN – tendra.SVN – Diff – /trunk/src/installers/80x86/solaris/diag_out.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
         (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.
 */
 /* sol86/diag_out.c */
 /**********************************************************************
 $Author: release $
  * Revision 1.14  1997/04/02  10:33:43  pwe
  * diagnose pl_tests
+ *
  * Revision 1.13  1997/03/20  16:24:35  pwe
  * dwarf2
  *
  * Revision 1.12  1997/02/18  11:43:25  pwe
  * NEWDIAGS for debugging optimised code
+ *
  * Revision 1.11  1996/12/10  15:12:06  pwe
  * prep NEWDIAGS
  * Revision 1.3  1995/03/28  14:28:57  pwe
  * correct diagnose empty file
+ *
  * Revision 1.2  1995/03/22  19:02:58  pwe
  * add .file at start
  *
  * Revision 1.1  1995/03/17  18:31:27  pwe
  * stabs diagnostics for solaris and linux
+ *
 **********************************************************************/
 #include "diagtypes.h"
 #include "diag_fns.h"
 #include "mark_scope.h"
 #include "diagglob.h"
 #endif
 extern int locals_offset;	/* declared in cproc.c */
 /*
     FORWARD DECLARATIONS
 */
 #ifdef NEWDIAGS
-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 stab_file PROTO_S ( ( dg_filename ) ) ;
+static void stab_file(dg_filename);
-static void stab_local PROTO_S ( ( dg_name, int ) ) ;
+static void stab_local(dg_name, int);
-static void stab_types PROTO_S ( ( void ) ) ;
+static void stab_types(void);
 #else
-static void stab_scope_open PROTO_S ( ( long ) ) ;
+static void stab_scope_open(long);
-static void stab_scope_close PROTO_S ( ( long ) ) ;
+static void stab_scope_close(long);
-static void stab_file PROTO_S ( ( long, bool ) ) ;
+static void stab_file(long, bool);
-static void stab_local PROTO_S ( ( diag_info *, int, exp ) ) ;
+static void stab_local(diag_info *, int, exp);
-static void stab_types PROTO_S ( ( void ) ) ;
+static void stab_types(void);
 #endif
-	/* label number sequence independent from text code */
+/* label number sequence independent from text code */
 static int diag_lab_no = 0;
-static int next_d_lab
+static int
-    PROTO_Z ()
+next_d_lab(void)
+{
   return ++diag_lab_no;
 }
 /*
     DIAGNOSTICS FILE
 */
-static FILE *dg_file ;
+static FILE *dg_file;
 #ifndef NEWDIAGS
-static char *dg_file_name ;
+static char *dg_file_name;
 #endif
-static void d_outnl
+static void
-    PROTO_Z ()
+d_outnl(void)
+{
   /* avoids indicating completion of executable instruction */
-  IGNORE fputs ("\n", dg_file);
+  IGNORE fputs("\n", dg_file);
+}
 /*
     BASIC TYPE NUMBERS
 */
 #define STAB_SCHAR	4
 #define STAB_UCHAR	6
 #define STAB_SSHRT	2
 #define STAB_USHRT	3
 #define STAB_SLONG	7
 #define STAB_S64	14
 #define STAB_U64	15
 #define STAB_VS		16
 #define NO_STABS	17
 /*
 x86 register numbers
 */
 #ifdef NEWDIAGS
-static long reg_stabno [8] = {0, 2, 1, 3, 7, 6, 5, 4};
+static long reg_stabno[8] = {0, 2, 1, 3, 7, 6, 5, 4};
 #endif
 /*
     BASIC POINTERS
-*/
-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 stab_ptrs[NO_STABS] = {
-/*
-    SIZE OF LAST STAB TYPE OUTPUT
+, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-*/
+};
-static long last_type_sz = 0 ;
 /*
-    CURRENT LINE NUMBER AND FILE NUMBER
+    CURRENT TYPE NUMBER
 */
+static long typeno;
+/*
+    SIZE OF LAST STAB TYPE OUTPUT
+*/
+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
+static long
-    PROTO_Z ()
+next_typen(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 ( (void*)(CH type_sizes),
+	type_sizes = (long *)xrealloc((void *)(CH type_sizes),
-					(size_t)m * sizeof ( long ) ) ;
+				      (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
+void
-    PROTO_N ( (f) )
-    PROTO_T ( filename f )
+stab_collect_files(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 ) {
+    } else if (nofds >= szfds) {
-	szfds += 10 ;
+	szfds += 10;
-	fds = ( filename * ) xrealloc ( (void*)(CH fds),
+	fds = (filename *)xrealloc((void *)(CH fds), szfds * sizeof(filename));
-				szfds * sizeof ( filename ) ) ;
+    }
-    fds [ nofds++ ] = f ;
+    fds[nofds++] = f;
-    return ;
+    return;
+}
 /*
     FIND THE FILE DESCRIPTOR CORRESPONDING TO A FILE NAME
 */
-static long find_file
+static long
-    PROTO_N ( (f) )
-    PROTO_T ( char * f )
+find_file(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
 static int last_proc_cname;
-static char * last_proc_pname = "<<No Proc>>";
+static char *last_proc_pname = "<<No Proc>>";
-static void out_procname
+static void
-    PROTO_Z ()
+out_procname(void)
+{
   if (last_proc_cname == -1) {
-    outs (last_proc_pname);
+    outs(last_proc_pname);
-  }
-  else {
+  } else {
     outs(local_prefix);
-    outn ((long)last_proc_cname);
+    outn((long)last_proc_cname);
-  };
+  }
 }
 /*
     OUTPUT A FILE POSITION CONSTRUCT
 */
 #define N_SLINE 0x44
 #define N_BSLINE 0x48
 #define N_LBRAC  0xc0
 #define N_RBRAC  0xe0
 #ifdef NEWDIAGS
-void stabd
+void
-    PROTO_N ( (f, lno, seg) )
-    PROTO_T ( dg_filename f X long lno X int seg )
+stabd(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) {		/* 0 suppresses always */
-    {
-      if (seg > 0)		/* -ve line nos are put out in the stabs */
+      if (seg > 0) {		/* -ve line nos are put out in the stabs */
-      {
-	i = next_d_lab () ;
+	i = next_d_lab();
-	IGNORE fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+	IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
-	IGNORE fprintf ( dg_file, "\t.stabn\t0x%x,0,%ld,.LL.%ld-",seg,
+	IGNORE fprintf(dg_file, "\t.stabn\t0x%x,0,%ld,.LL.%ld-", seg, lno, i);
-		 lno, i ) ;
-	out_procname ();
+	out_procname();
-	d_outnl ();
+	d_outnl();
       }
     }
-    currentlno = lno ;
+    currentlno = lno;
-    return ;
+    return;
 }
 #else
-static void stabd
+static void
-    PROTO_N ( (findex, lno, seg) )
-    PROTO_T ( long findex X long lno X int seg )
+stabd(long findex, long lno, int seg)
 {
-    long i ;
+    long i;
-    if ( findex == currentfile && lno == currentlno ) return ;
+    if (findex == currentfile && lno == currentlno) {
+	return;
+    }
-    stab_file ( findex, 1 ) ;
+    stab_file(findex, 1);
-    if (seg != 0)		/* 0 suppresses always */
+    if (seg != 0) {		/* 0 suppresses always */
-    {
-      if (seg > 0)		/* -ve line nos are put out in the stabs */
+      if (seg > 0) {		/* -ve line nos are put out in the stabs */
-      {
-	i = next_d_lab () ;
+	i = next_d_lab();
-	IGNORE fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+	IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
-	IGNORE fprintf ( dg_file, "\t.stabn\t0x%x,0,%ld,.LL.%ld-",seg,
+	IGNORE fprintf(dg_file, "\t.stabn\t0x%x,0,%ld,.LL.%ld-", seg, lno, i);
-		 lno, i ) ;
-	out_procname ();
+	out_procname();
-	d_outnl ();
+	d_outnl();
       }
     }
-    currentlno = lno ;
+    currentlno = lno;
-    return ;
+    return;
 }
 #endif
 #ifdef NEWDIAGS
 /*
     OUTPUT DIAGNOSTICS SURROUNDING CODE
 */
-void code_diag_info
+void
-    PROTO_N ( (d, mcode, args) )
-    PROTO_T ( dg_info d X void (*mcode) PROTO_S ((void *)) X void * args )
+code_diag_info(dg_info d, void(*mcode)(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)
+      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;
+}
 #else
 /*
     OUTPUT INITIAL DIAGNOSTICS FOR A DIAGNOSE_TAG
 */
-void output_diag
+void
-    PROTO_N ( (d, proc_no, e) )
-    PROTO_T ( diag_info * d X int proc_no X exp e )
+output_diag(diag_info *d, int proc_no, exp e)
 {
-  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) {
-    exp acc = d -> data.id_scope.access;
+    exp acc = d->data.id_scope.access;
-    if ( isglob ( son ( acc ) ) || no ( son ( acc ) ) == 1 ) return;
+    if (isglob(son(acc)) || no(son(acc)) == 1) {
+	return;
+    }
     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, proc_no, acc );
+    stab_local(d, proc_no, acc);
-    return ;
+    return;
+  }
+}
 /*
     OUTPUT FINAL DIAGNOSTICS FOR A DIAGNOSE_TAG
 */
-void output_end_scope
+void
-    PROTO_N ( (d, e) )
-    PROTO_T ( diag_info * d X exp e )
+output_end_scope(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, lno, N_SLINE) ;
+	stabd(f, 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
+static long
-    PROTO_N ( (s, nm) )
-    PROTO_T ( shape s X char* nm )
+out_sh_type(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
+static long
-    PROTO_N ( ( s ) )
-    PROTO_T ( char* s )
+find_basic_type(char *s)
+{
-  char* x;
+  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"))
-    return ( strstr (s, "unsigned") ? STAB_USHRT : STAB_SSHRT );
-  if ( (x = strstr (s, "long"))) {
-    if (strstr (x+1, "long"))
-      return ( strstr (s, "unsigned") ? STAB_U64 : STAB_S64 );
-    return ( strstr (s, "unsigned") ? STAB_ULONG : STAB_SLONG );
   }
-  if (strstr (s, "int"))
+  if (strstr(s, "short")) {
-    return ( strstr (s, "unsigned") ? STAB_UINT : STAB_SINT );
+    return(strstr(s, "unsigned") ? STAB_USHRT : STAB_SSHRT);
-  if (strstr (s, "void_star"))
-    return ( STAB_VS );
-  return ( STAB_VOID ) ;
-}
+  }
-#else
-static long out_sh_type
-    PROTO_N ( (s) )
-    PROTO_T ( shape s )
+  if ((x = strstr(s, "long"))) {
-{
-    last_type_sz = shape_size ( s ) ;
-    switch ( name ( s ) ) {
+    if (strstr(x+1, "long")) {
-	case scharhd : return ( STAB_SCHAR ) ;
-	case ucharhd : return ( STAB_UCHAR ) ;
-	case swordhd : return ( STAB_SSHRT ) ;
-	case uwordhd : return ( STAB_USHRT ) ;
-	case slonghd : return ( STAB_SINT ) ;
-	case ulonghd : return ( STAB_UINT ) ;
-	case s64hd : return ( STAB_S64 ) ;
-	case u64hd : return ( STAB_U64 ) ;
+      return(strstr(s, "unsigned") ? STAB_U64 : STAB_S64);
-	case shrealhd : return ( STAB_FLOAT ) ;
-	case realhd : return ( STAB_DBL ) ;
-	case doublehd : return ( STAB_LDBL ) ;
+    }
-    return ( STAB_VOID ) ;
+    return(strstr(s, "unsigned") ? STAB_ULONG : STAB_SLONG);
-}
+  }
+  if (strstr(s, "int")) {
+    return(strstr(s, "unsigned") ? STAB_UINT : STAB_SINT);
+  }
+  if (strstr(s, "void_star")) {
-#endif
+    return(STAB_VS);
-/*
+  }
-    OUTPUT DIAGNOSTICS DIRECTIVE FOR A FILE
+  return(STAB_VOID);
-*/
+}
-#ifdef NEWDIAGS
+#else
-static void stab_file
+static long
-    PROTO_N ( ( f ) )
+out_sh_type(shape s)
-    PROTO_T ( dg_filename f )
+{
-    long i = next_d_lab () ;
+    last_type_sz = shape_size(s);
-    int stb;
+    switch (name(s)) {
+	case scharhd:
+		return(STAB_SCHAR);
+	case ucharhd:
+		return(STAB_UCHAR);
+	case swordhd:
+		return(STAB_SSHRT);
+	case uwordhd:
+		return(STAB_USHRT);
+	case slonghd:
+		return(STAB_SINT);
+	case ulonghd:
+		return(STAB_UINT);
+	case s64hd:
+		return(STAB_S64);
+	case u64hd:
+		return(STAB_U64);
+	case shrealhd:
-    if ( f == currentfile || !f ) {
+		return(STAB_FLOAT);
+	case realhd:
-	return ;
+		return(STAB_DBL);
+	case doublehd:
+		return(STAB_LDBL);
+    }
-    stb = (f == prim_file ? 0x64 : 0x84);
-    IGNORE fprintf ( dg_file, ".LL.%ld:\n", i ) ;
-    if (f->file_name[0] != '/' && f->file_path[0])
-      IGNORE fprintf ( dg_file, "\t.stabs\t\"%s/\",0x%x,0,0,.LL.%ld\n", f->file_path, stb, i );
-    IGNORE fprintf ( dg_file, "\t.stabs\t\"%s\",0x%x,0,0,.LL.%ld\n", f->file_name, stb, i );
-    currentfile = f ;
-    return ;
+    return(STAB_VOID);
+}
-#else
+#endif
+/*
+    OUTPUT DIAGNOSTICS DIRECTIVE FOR A FILE
+*/
+#ifdef NEWDIAGS
+static void
+stab_file(dg_filename f)
+{
+    long i = next_d_lab();
+    int stb;
+    if (f == currentfile || !f) {
+	return;
+    }
+    stb = (f == prim_file ? 0x64 : 0x84);
+    IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
+    if (f->file_name[0]!= '/' && f->file_path[0]) {
+      IGNORE fprintf(dg_file, "\t.stabs\t\"%s/\",0x%x,0,0,.LL.%ld\n",
+		     f->file_path, stb, i);
+    }
+    IGNORE fprintf(dg_file, "\t.stabs\t\"%s\",0x%x,0,0,.LL.%ld\n",
+		   f->file_name, stb, i);
+    currentfile = f;
+    return;
+}
-static void stab_file
-    PROTO_N ( (findex, internal) )
-    PROTO_T ( long findex X bool internal )
-{
+#else
-    static long i = 0 ;
+static void
+stab_file(long findex, bool internal)
+{
+    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();
-	IGNORE fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+	IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
-	IGNORE fprintf ( dg_file, "\t.stabs\t\"%s\",0x64,0,0,.LL.%ld\n",
+	IGNORE 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);
     } else {
 	/* included file */
-	IGNORE fprintf ( dg_file, "\t.stabs\t\"%s\",0x84,0,0,.LL.%ld\n",
+	IGNORE 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;
+	    char *nm;
 #ifdef NEWDIAGS
 	    dg_type dt;
 #else
 	    diag_type dt;
 #endif
 enum del_types {D_PARAM, D_LOCAL, D_BRACKET, D_REG};
 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
+static struct delay_stab *
-    PROTO_Z ()
+next_del_stab(void)
+{
     if (c_del_index == DEL_SIZE) {
-	if (c_del_array != last_del_array)
+	if (c_del_array != last_del_array) {
-	    c_del_array = c_del_array -> more;
+	    c_del_array = c_del_array->more;
-	else {
+	} else {
-	    struct del_stab_array * s =
+	    struct del_stab_array *s = (struct del_stab_array *)
-		(struct del_stab_array *) (xmalloc (sizeof(struct del_stab_array)));
+		(xmalloc(sizeof(struct del_stab_array)));
-	    s -> more = NULL;
+	    s->more = NULL;
-	    if (del_stab_start == NULL)
+	    if (del_stab_start == NULL) {
 		del_stab_start = s;
-	    else
+	    } 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 = 0 ;
+static long bracket_level = 0;
 /*
     START OF A DIAGNOSTICS SCOPE
 */
 #ifdef NEWDIAGS
+static void
+stab_scope_open(dg_filename f)
+{
+    long i;
+    stab_file(f);
+    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();
+    IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
+    bracket_level++;
+    open_label = i;
+    return;
+}
+#else
-static void stab_scope_open
+static void
-    PROTO_N ( ( f ) )
-    PROTO_T ( dg_filename f )
+stab_scope_open(long findex)
+{
-    long i ;
+    long i;
-    stab_file ( f ) ;
+    stab_file(findex, 1);
-    if ( open_label != 0 )
+    if (open_label != 0) {
-    {
-	struct delay_stab * t = next_del_stab();
+	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();
-    IGNORE fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+    IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
-    bracket_level++ ;
+    bracket_level++;
-    open_label = i ;
+    open_label = i;
-    return ;
+    return;
+}
-#else
+#endif
+/*
+    END OF A DIAGNOSTICS SCOPE
+*/
+#ifdef NEWDIAGS
-static void stab_scope_open
+static void
-    PROTO_N ( (findex) )
-    PROTO_T ( long findex )
+stab_scope_close(void)
+{
-    long i ;
+    long i;
-    stab_file ( findex, 1 ) ;
+    struct delay_stab *x;
-    if ( open_label != 0 )
+    if (open_label != 0) {
-    {
-	struct delay_stab * t = next_del_stab();
+	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;
+    }
-    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;
-    IGNORE fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+    IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
-    bracket_level++ ;
+    bracket_level--;
-    open_label = i ;
-    return ;
+    return;
+}
-#endif
+#else
-/*
-    END OF A DIAGNOSTICS SCOPE
-*/
-#ifdef NEWDIAGS
-static void stab_scope_close
+static void
-    PROTO_Z ()
+stab_scope_close(long findex)
+{
-    long i ;
+    long i;
-    struct delay_stab * x;
+    struct delay_stab *x;
-    if ( open_label != 0 )
+    if (open_label != 0) {
-    {
-	struct delay_stab * t = next_del_stab();
+	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;
-    IGNORE fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+    IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
-    bracket_level-- ;
-    return ;
-}
-#else
-static void stab_scope_close
-    PROTO_N ( (findex) )
-    PROTO_T ( long findex )
-{
-    long i ;
-    struct delay_stab * x;
-    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 ;
-    }
-    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;
-    IGNORE 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
+static long
-    PROTO_N ( (dt) )
-    PROTO_T ( dg_type dt )
+type_size(dg_type dt)
+{
-  if (!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 tg = dt->data.t_tag;
       if (tg->key == DGK_NONE) {
 	return 0;
       }
       if (tg->key == DGK_TYPE) {
 	dg_type ref_t = tg->p.typ;
-	if (ref_t == dt)
+	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 (tg->key == DGK_NAME) {
 	dg_name ref_n = tg->p.nam;
 	if (ref_n->key == DGN_TYPE /* && ref_n->idnam.id_key == DG_ID_NONE */) {
 	  dg_type ref_t = tg->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)
+      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
+static void
-    PROTO_N ( ( dt ) )
-    PROTO_T ( dg_type dt )
+out_dt_shape(dg_type dt)
+{
   if (!dt) {
-    IGNORE fprintf ( dg_file, "%d", STAB_VOID ) ;
+    IGNORE 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)) {
-    IGNORE fprintf ( dg_file, "%ld", dt->outref.u.l ) ;
+    IGNORE 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;
+  }
 #if 0
   /* SunOS as(1) rejects stab lines >2k so reduce size arbitrarily */
-  if ( depth_now >= max_depth ) {
+  if (depth_now >= max_depth) {
-    IGNORE fprintf ( dg_file, "%d", STAB_SLONG ) ;
+    IGNORE fprintf(dg_file, "%d", STAB_SLONG);
-    return ;
+    return;
+  }
 #endif
-  depth_now++ ;
+  depth_now++;
-  switch ( dt->key ) {
+  switch (dt->key) {
     case DGT_TAGGED: {
       dg_tag tg = dt->data.t_tag;
       if (tg->done) {
 	dt->outref = tg->outref;
-	out_dt_shape (dt);
+	out_dt_shape(dt);
 	break;
+      }
       if (tg->key == DGK_NONE) {
-	failer ("external type");
+	failer("external type");
 	tg->done = 1;
 	tg->outref.k = LAB_D;
 	tg->outref.u.l = 0;
-	out_dt_shape (dt);
+	out_dt_shape(dt);
 	break;
+      }
       if (tg->key == DGK_TYPE) {
 	dg_type ref_t = tg->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 = tg->outref = ref_t->outref;
 	tg->done = 1;
 	break;
+      }
       if (tg->key == DGK_NAME) {
 	dg_name ref_n = tg->p.nam;
 	if (ref_n->key == DGN_TYPE /* && ref_n->idnam.id_key == DG_ID_NONE */) {
 	  dg_type ref_t = tg->p.nam->data.n_typ.raw;
-	  out_dt_shape (ref_t);
+	  out_dt_shape(ref_t);
 	  dt->outref = tg->outref = ref_t->outref;
 	  tg->done = 1;
 	  break;
+	}
+      }
-      failer ("unfinished convolution");
+      failer("unfinished convolution");
       tg->done = 1;
       tg->outref.k = LAB_D;
       tg->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;
-	    IGNORE fprintf ( dg_file, "%ld=*%ld", non, pn ) ;
+	    IGNORE fprintf(dg_file, "%ld=*%ld", non, pn);
+	  } else {
+	    IGNORE fprintf(dg_file, "%ld", non);
+	  }
-	  else {
-	    IGNORE fprintf ( dg_file, "%ld", non ) ;
-	  }
-        }
-        else {
+        } else {
-	  non = (dt->outref.k < 0 ? dt->outref.u.l : next_typen ()) ;
+	  non = (dt->outref.k < 0 ? dt->outref.u.l : next_typen());
-	  IGNORE fprintf ( dg_file, "%ld=*", non ) ;
+	  IGNORE 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 {
+      } 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)
+      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;
-	  IGNORE fprintf ( dg_file, "%ld=", non ) ;
+	  IGNORE fprintf(dg_file, "%ld=", non);
-	  IGNORE fprintf ( dg_file, "ar" ) ;
+	  IGNORE fprintf(dg_file, "ar");
-	  out_dt_shape ( index_type ) ;
+	  out_dt_shape(index_type);
-	  IGNORE fprintf ( dg_file, ";%ld;%ld;", lwb, upb ) ;
+	  IGNORE 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 + 2);
-	  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;
-	  IGNORE fprintf ( dg_file, "%ld=", non ) ;
+	  IGNORE fprintf(dg_file, "%ld=", non);
-	  IGNORE fprintf ( dg_file, "ar" ) ;
+	  IGNORE fprintf(dg_file, "ar");
-	  out_dt_shape ( index_type ) ;
+	  out_dt_shape(index_type);
-	  IGNORE fprintf ( dg_file, ";0;0;" ) ;
+	  IGNORE 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;
+      dg_enum *el = dt->data.t_enum.values.array;
-      if (dt->outref.k >= 0)
+      if (dt->outref.k >= 0) {
-	dt->outref.u.l = next_typen () ;
+	dt->outref.u.l = next_typen();
+      }
       dt->outref.k = LAB_D;
-      IGNORE fprintf ( dg_file, "%ld=e", dt->outref.u.l ) ;
+      IGNORE fprintf(dg_file, "%ld=e", dt->outref.u.l);
       for (i = 0; i < dt->data.t_enum.values.len; i++) {
-	  IGNORE fprintf ( dg_file, "%s:%d,", el[i].enam, no (son(el[i].value)) );
+	  IGNORE fprintf(dg_file, "%s:%d,", el[i].enam, no(son(el[i].value)));
       }
-      IGNORE fprintf ( dg_file, ";" ) ;
+      IGNORE 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)
+      if (dt->outref.k >= 0) {
-	dt->outref.u.l = next_typen () ;
+	dt->outref.u.l = next_typen();
+      }
       dt->outref.k = LAB_D;
-      IGNORE fprintf ( dg_file, "%ld=%c%d", dt->outref.u.l, su, shape_size ( s ) / 8 ) ;
+      IGNORE 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;
-	  IGNORE fprintf (dg_file, "\\\\\",0x80,0,%d,%d\n",0,0 ) ;
+	  IGNORE fprintf(dg_file, "\\\\\",0x80,0,%d,%d\n", 0, 0);
-	  IGNORE fprintf(dg_file,"\t.stabs\t\"");
+	  IGNORE fprintf(dg_file, "\t.stabs\t\"");
+	}
-	depth_now++ ;
+	depth_now++;
-	IGNORE fprintf ( dg_file, "%s:", el[i].d.cm_f.fnam ) ;
+	IGNORE 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);
-	IGNORE fprintf ( dg_file, ",%ld,%ld;", offset, type_size ( el[i].d.cm_f.f_typ ) ) ;
+	IGNORE fprintf(dg_file, ",%ld,%ld;", offset,
+		       type_size(el[i].d.cm_f.f_typ));
+      }
-      IGNORE fprintf ( dg_file, ";" ) ;
+      IGNORE 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;
-      IGNORE fprintf ( dg_file, "%d", (bv.has_sign ? STAB_SINT : STAB_UINT) ) ;
+      IGNORE 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;
-      IGNORE fprintf ( dg_file, "%ld=*%ld=f", non1, non2 ) ;
+      IGNORE 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 : {
-      IGNORE fprintf ( dg_file, "%d", STAB_VOID ) ;
+      IGNORE 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)
+  if (dt->mor && dt->mor->this_tag) {
     dt->mor->this_tag->outref = dt->outref;
+  }
 #endif
-  return ;
+  return;
+}
 #else
-static void out_dt_shape
+static void
-    PROTO_N ( (dt) )
-    PROTO_T ( diag_type dt )
+out_dt_shape(diag_type dt)
+{
-    if ( dt->been_outed ) {
+    if (dt->been_outed) {
-	IGNORE fprintf ( dg_file, "%d",(int) dt->been_outed ) ;
+	IGNORE 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;
     }
     /* SunOS as(1) rejects stab lines >2k so reduce size arbitrarily */
-    if ( depth_now >= max_depth ) {
+    if (depth_now >= max_depth) {
-	IGNORE fprintf ( dg_file, "%d", STAB_SLONG ) ;
+	IGNORE fprintf(dg_file, "%d", STAB_SLONG);
-	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;
-		    IGNORE fprintf ( dg_file, "%ld=*%ld", non, pn ) ;
+		    IGNORE fprintf(dg_file, "%ld=*%ld", non, pn);
 		} else {
-		    IGNORE fprintf ( dg_file, "%ld", non ) ;
+		    IGNORE fprintf(dg_file, "%ld", non);
 		}
 	    } else {
-		non = next_typen () ;
+		non = next_typen();
-		IGNORE fprintf ( dg_file, "%ld=*", non ) ;
+		IGNORE 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: {
 #if 0
-	    long str = no ( dt->data.array.stride ) ;
+	    long str = no(dt->data.array.stride);
 #endif
-	    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;
-	    IGNORE fprintf ( dg_file, "%ld=ar", non ) ;
+	    IGNORE fprintf(dg_file, "%ld=ar", non);
-	    out_dt_shape ( index_type ) ;
+	    out_dt_shape(index_type);
-	    IGNORE fprintf ( dg_file, ";%ld;%ld;", lwb, upb ) ;
+	    IGNORE 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';
 	    }
-	    IGNORE fprintf ( dg_file, "%ld=%c%d", non, su, shape_size ( s ) / 8 ) ;
+	    IGNORE 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 );
-		if ( depth_now >= max_depth ) return ;
-		depth_now++ ;
-		IGNORE fprintf ( dg_file, "%s:", sf->field_name.ints.chars ) ;
+	    for (i = fields->lastused - 1; i >= 0; i--) {
-		out_dt_shape ( sf->field_type ) ;
+		diag_field sf = (fields->array)[i];
-		IGNORE fprintf ( dg_file, ",%ld,%ld;", offset, last_type_sz ) ;
-	    }
-	    IGNORE fprintf ( dg_file, ";" ) ;
-	    last_type_sz = shape_size ( s ) ;
-	    set_stab_size ( non ) ;
+		long offset = no(sf->where);
-	    break ;
-	}
+		if (depth_now >= max_depth) {
+		    return;
+		}
+		depth_now++;
+		IGNORE fprintf(dg_file, "%s:", sf->field_name.ints.chars);
+		out_dt_shape(sf->field_type);
+		IGNORE fprintf(dg_file, ",%ld,%ld;", offset, last_type_sz);
+	    }
+	    IGNORE fprintf(dg_file, ";");
+	    last_type_sz = shape_size(s);
+	    set_stab_size(non);
+	    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));
-	    IGNORE fprintf ( dg_file, "%ld", dt->been_outed ) ;
+	    IGNORE fprintf(dg_file, "%ld", dt->been_outed);
-	    break ;
+	    break;
 	}
 	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;
-	    IGNORE fprintf ( dg_file, "%ld=*%ld=f", non1, non2 ) ;
+	    IGNORE 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: {
 	    /* +++ 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));
-	    IGNORE fprintf ( dg_file, "%ld", dt->been_outed ) ;
+	    IGNORE fprintf(dg_file, "%ld", dt->been_outed);
+	    break;
+	}
+	case DIAG_TYPE_NULL: {
+	    IGNORE fprintf(dg_file, "%d", STAB_VOID);
+	    last_type_sz = 0;
-	    break ;
+	    break;
 	}
-	case DIAG_TYPE_NULL : {
+	case DIAG_TYPE_BITFIELD: {
+	    long sz = dt->data.bitfield.no_of_bits.nat_val.small_nat;
-	    IGNORE fprintf ( dg_file, "%d", STAB_VOID ) ;
+	    IGNORE fprintf(dg_file, "%d", STAB_SINT);
-	    last_type_sz = 0 ;
+	    last_type_sz = sz;
-	    break ;
+	    break;
+	}
-	case DIAG_TYPE_BITFIELD : {
-	    long sz = dt->data.bitfield.no_of_bits.nat_val.small_nat ;
-	    IGNORE fprintf ( dg_file, "%d", STAB_SINT ) ;
-	    last_type_sz = sz ;
-	    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;
-	    IGNORE fprintf ( dg_file, "%ld=e", non ) ;
+	    IGNORE 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];
-		IGNORE fprintf ( dg_file, "%s:%d,", ef->nme.ints.chars, no ( ef->val ) );
+		IGNORE fprintf(dg_file, "%s:%d,", ef->nme.ints.chars,
+			       no(ef->val));
+	    }
-	    IGNORE fprintf ( dg_file, ";" ) ;
+	    IGNORE fprintf(dg_file, ";");
-	    last_type_sz = 32 ;
+	    last_type_sz = 32;
-	    set_stab_size ( non ) ;
+	    set_stab_size(non);
-	    break ;
+	    break;
 	}
 	default : {
-	    IGNORE fprintf ( dg_file, "%d", STAB_VOID ) ;
+	    IGNORE 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 out_diag_global
+void
-    PROTO_N ( (di, global, cname, pname) )
-    PROTO_T ( dg_name di X int global X int cname X char * pname )
+out_diag_global(dg_name di, int global, int cname, char * pname)
 {
   char* nm;
   dg_type dt;
-  if (!di || di->key != DGN_OBJECT)
+  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)
+  if (di->whence.line) {
-    stabd ( di->whence.file, di->whence.line, -N_DSLINE ) ;
+    stabd(di->whence.file, di->whence.line, -N_DSLINE);
+  }
-  IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:%c", nm, (global ? 'G' : 'S'));
+  IGNORE fprintf(dg_file, "\t.stabs\t\"%s:%c", nm, (global ? 'G' : 'S'));
-  OUT_DT_SHAPE ( dt ) ;
+  OUT_DT_SHAPE(dt);
-  if (global)
+  if (global) {
-    IGNORE fprintf ( dg_file, "\",0x20,0,%ld,0\n", di->whence.line);
+    IGNORE fprintf(dg_file, "\",0x20,0,%ld,0\n", di->whence.line);
-  else {
+  } else {
-    IGNORE fprintf ( dg_file, "\",0x28,0,%ld,", di->whence.line);
+    IGNORE fprintf(dg_file, "\",0x28,0,%ld,", di->whence.line);
-    if (cname == -1) {
-      outs (pname);
-    }
-    else {
-      outs(local_prefix);
-      outn ((long)cname);
-    };
-    d_outnl ();
-  };
-  return ;
-}
-#else
-void diag_val_begin
-    PROTO_N ( (d, global, cname, pname) )
-    PROTO_T ( diag_global * d X int global X int cname X char * pname )
-{
-  stabd ( find_file ( d->data.id.whence.file->file.ints.chars ),
-	 ( long ) d->data.id.whence.line_no.nat_val.small_nat
-	 , -N_DSLINE ) ;
-  IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:%c",
-	d->data.id.nme.ints.chars, (global ? 'G' : 'S'));
-  OUT_DT_SHAPE ( d->data.id.new_type ) ;
-  if (global)
-    IGNORE fprintf ( dg_file, "\",0x20,0,%d,0\n",
-	d->data.id.whence.line_no.nat_val.small_nat);
-  else {
-    IGNORE fprintf ( dg_file, "\",0x28,0,%d,",
-	d->data.id.whence.line_no.nat_val.small_nat);
     if (cname == -1) {
-      outs (pname);
+      outs(pname);
-    }
-    else {
+    } else {
       outs(local_prefix);
-      outn ((long)cname);
+      outn((long)cname);
+    }
+    d_outnl();
+  }
+  return;
+}
+#else
+void
+diag_val_begin(diag_global *d, int global, int cname, char *pname)
+{
+  stabd(find_file(d->data.id.whence.file->file.ints.chars),
+	(long)d->data.id.whence.line_no.nat_val.small_nat, -N_DSLINE);
+  IGNORE fprintf(dg_file, "\t.stabs\t\"%s:%c", d->data.id.nme.ints.chars,
+		 (global ? 'G' : 'S'));
+  OUT_DT_SHAPE(d->data.id.new_type);
+  if (global) {
+    IGNORE fprintf(dg_file, "\",0x20,0,%d,0\n",
+		   d->data.id.whence.line_no.nat_val.small_nat);
+  } else {
+    IGNORE fprintf(dg_file, "\",0x28,0,%d,",
+		   d->data.id.whence.line_no.nat_val.small_nat);
+    if (cname == -1) {
+      outs(pname);
+    } else {
+      outs(local_prefix);
+      outn((long)cname);
-    };
+    }
-    d_outnl ();
+    d_outnl();
-  };
+  }
-  return ;
+  return;
+}
-void diag_val_end
+void
-    PROTO_N ( (d) )
-    PROTO_T ( diag_global * d )
+diag_val_end(diag_global *d)
+{
   UNUSED(d);
   return;
+}
 #endif
 /*
     OUTPUT DIAGNOSTICS FOR A PROCEDURE
 */
 #ifdef NEWDIAGS
-void diag_proc_begin
+void
-    PROTO_N ( (di, global, cname, pname) )
-    PROTO_T ( dg_name di X int global X int cname X char * pname )
+diag_proc_begin(dg_name di, int global, int cname, char *pname)
 {
-  char* nm;
+  char *nm;
   dg_type dt;
   last_proc_pname = pname;
   last_proc_cname = cname;
-  if (!di || di->key != DGN_PROC)
+  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 */
+  if (dt->key == DGT_PROC) {	/* it should be */
     dt = dt->data.t_proc.res_type;
+  }
-  if (di->whence.line)
+  if (di->whence.line) {
-    stabd ( di->whence.file, di->whence.line, 0 ) ;
+    stabd(di->whence.file, di->whence.line, 0);
+  }
-  outs ("\t.stabs\t\"");
+  outs("\t.stabs\t\"");
-  outs (nm);
+  outs(nm);
-  if (global)
+  if (global) {
-    outs (":F");
+    outs(":F");
-  else
+  } else {
-    outs (":f");
+    outs(":f");
+  }
-  OUT_DT_SHAPE ( dt ) ;
+  OUT_DT_SHAPE(dt);
-  outs ("\",0x24,0,0,");
+  outs("\",0x24,0,0,");
-  out_procname ();
+  out_procname();
-  d_outnl ();
+  d_outnl();
-  return ;
+  return;
+}
 #else
-void diag_proc_begin
+void
-    PROTO_N ( (d, global, cname, pname) )
-    PROTO_T ( diag_global * d X int global X int cname X char * pname )
+diag_proc_begin(diag_global *d, int global, int cname, char *pname)
+{
   last_proc_pname = pname;
   last_proc_cname = cname;
-  if (!d)
+  if (!d) {
     return;
+  }
-  stabd ( find_file ( d->data.id.whence.file->file.ints.chars ),
+  stabd(find_file(d->data.id.whence.file->file.ints.chars),
-	 ( long ) d->data.id.whence.line_no.nat_val.small_nat
+	(long)d->data.id.whence.line_no.nat_val.small_nat, 0);
-	 ,0) ;
-  outs ("\t.stabs\t\"");
+  outs("\t.stabs\t\"");
-  outs (d->data.id.nme.ints.chars);
+  outs(d->data.id.nme.ints.chars);
-  if (global)
+  if (global) {
-    outs (":F");
+    outs(":F");
-  else
+  } else {
-    outs (":f");
+    outs(":f");
+  }
-  OUT_DT_SHAPE ( d->data.id.new_type->data.proc.result_type ) ;
+  OUT_DT_SHAPE(d->data.id.new_type->data.proc.result_type);
-  outs ("\",0x24,0,0,");
+  outs("\",0x24,0,0,");
-  out_procname ();
+  out_procname();
-  d_outnl ();
+  d_outnl();
-  return ;
+  return;
+}
 #endif
-void diag_proc_end
+void
-    PROTO_Z ()
+diag_proc_end(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) {
-	struct delay_stab * t;
+	struct delay_stab *t;
 	if (this_i == DEL_SIZE) {
 	    this_a = this_a -> more;
 	    this_i = 0;
+	}
-	t = (this_a -> a) + (this_i ++);
+	t = (this_a->a) + (this_i ++);
-	switch (t -> del_t) {
+	switch (t->del_t) {
 	    case D_PARAM:
-		IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:p", t->u.l.nm);
+		IGNORE 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);
-		IGNORE fprintf ( dg_file, "\",0xa0,0,0,%d\n", t->u.l.offset + 8);
+		IGNORE fprintf(dg_file, "\",0xa0,0,0,%d\n", t->u.l.offset + 8);
 		break;
 	    case D_LOCAL:
-		IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:", t->u.l.nm);
+		IGNORE 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);
-		IGNORE fprintf ( dg_file, "\",0x80,0,0,%d\n", t->u.l.offset - locals_offset);
+		IGNORE fprintf(dg_file, "\",0x80,0,0,%d\n", t->u.l.offset -
+			       locals_offset);
 		break;
 	    case D_REG:
-		IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:r", t->u.l.nm);
+		IGNORE 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);
-		IGNORE fprintf ( dg_file, "\",0x40,0,0,%d\n", t->u.l.offset);
+		IGNORE fprintf(dg_file, "\",0x40,0,0,%d\n", t->u.l.offset);
 		break;
 	    default:
-		IGNORE fprintf ( dg_file, "\t.stabn\t0x%x,0,%d,.LL.%d-",
+		IGNORE fprintf(dg_file, "\t.stabn\t0x%x,0,%d,.LL.%d-",
-			t->u.b.br, t->u.b.lev, t->u.b.lab);
+			       t->u.b.br, t->u.b.lev, t->u.b.lab);
-		out_procname ();
+		out_procname();
-		d_outnl ();
+		d_outnl();
+	}
+    }
     c_del_array = del_stab_start;
     c_del_index = 0;
+  }
 /*
     OUTPUT DIAGNOSTICS FOR A LOCAL VARIABLE
 */
 #ifdef NEWDIAGS
-static void stab_local
+static void
-    PROTO_N ( (di, param) )
-    PROTO_T ( dg_name di X int param )
+stab_local(dg_name di, int param)
+{
     exp id = di->data.n_obj.obtain_val;
-    struct delay_stab * t;
+    struct delay_stab *t;
-    char* nm;
+    char *nm;
     dg_type dt;
     long disp;
-    if (di->key != DGN_OBJECT || !id)
+    if (di->key != DGN_OBJECT || !id) {
       return;
+    }
     id = son(id);
-    if (name(id) == cont_tag && name(son(id)) == name_tag && isvar(son(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();
-    t->u.l.nm = nm ;
+    t->u.l.nm = nm;
-    t->u.l.dt = dt ;
+    t->u.l.dt = dt;
     if (ptno(id) == reg_pl) {
       t->del_t = D_REG;
-      t->u.l.offset = reg_stabno [get_reg_no (no(id))];
+      t->u.l.offset = reg_stabno[get_reg_no(no(id))];
-    }
-    else {
+    } else {
       t->del_t = (param ? D_PARAM : D_LOCAL);
       t->u.l.offset = (disp + no(id)) / 8;
-    };
+    }
-    return ;
+    return;
 }
 #else
-static void stab_local
+static void
-    PROTO_N ( (d, proc_no, acc) )
-    PROTO_T ( diag_info * d X int proc_no X exp acc )
+stab_local(diag_info *d, int proc_no, exp acc)
+{
-    struct delay_stab * t = next_del_stab();
+    struct delay_stab *t = next_del_stab();
     t->del_t = (isparam(son(acc)) ? D_PARAM : D_LOCAL);
-    t->u.l.nm = d -> data.id_scope.nme.ints.chars ;
+    t->u.l.nm = d->data.id_scope.nme.ints.chars;
-    t->u.l.dt = d -> data.id_scope.typ ;
+    t->u.l.dt = d->data.id_scope.typ;
     t->u.l.offset = (no(acc) + no(son(acc))) / 8;
-    return ;
+    return;
 }
 #endif
 /*
     DEAL WITH BASIC TYPES
 */
-static void stab_types
+static void
-    PROTO_Z ()
+stab_types(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));
-    IGNORE fputs ( "\t.stabs\t\"int:t1=r1;-2147483648;2147483647;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"int:t1=r1;-2147483648;2147483647;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"short int:t2=r1;-32768;32767;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"short int:t2=r1;-32768;32767;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"short unsigned int:t3=r1;0;65535;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"short unsigned int:t3=r1;0;65535;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"char:t4=r4;0;127;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"char:t4=r4;0;127;\",0x80,0,0,0\n", dg_file);
-	    dg_file ) ;
-    IGNORE fputs ( "\t.stabs\t\"signed char:t5=r1;-128;127;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"signed char:t5=r1;-128;127;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"unsigned char:t6=r1;0;255;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"unsigned char:t6=r1;0;255;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"long int:t7=r1;-2147483648;2147483647;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"long int:t7=r1;-2147483648;2147483647;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"unsigned int:t8=r1;0;-1;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"unsigned int:t8=r1;0;-1;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"long unsigned int:t9=r1;0;-1;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"long unsigned int:t9=r1;0;-1;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"float:t10=r1;4;0;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"float:t10=r1;4;0;\",0x80,0,0,0\n", dg_file);
-	    dg_file ) ;
-    IGNORE fputs ( "\t.stabs\t\"double:t11=r1;8;0;\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"double:t11=r1;8;0;\",0x80,0,0,0\n", dg_file);
-	    dg_file ) ;
-    IGNORE fprintf ( dg_file, "\t.stabs\t\"long double:t12=r1;%d;0;\",0x80,0,0,0\n",
+    IGNORE fprintf(dg_file, "\t.stabs\t\"long double:t12=r1;%d;0;\",0x80,0,0,0\n",
-	      DOUBLE_SZ / 8 ) ;
+		   DOUBLE_SZ / 8);
-    IGNORE fputs ( "\t.stabs\t\"void:t13=13\",0x80,0,0,0\n",
+    IGNORE fputs("\t.stabs\t\"void:t13=13\",0x80,0,0,0\n", dg_file);
-	    dg_file ) ;
-    IGNORE fputs ( "\t.stabs\t\"long long int:t14=r1;", dg_file ) ;
+    IGNORE fputs("\t.stabs\t\"long long int:t14=r1;", dg_file);
-    IGNORE fputs ( "01000000000000000000000;0777777777777777777777;\",0x80,0,0,0\n",
+    IGNORE fputs("01000000000000000000000;0777777777777777777777;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"unsigned long long int:t15=r1;", dg_file ) ;
+    IGNORE fputs("\t.stabs\t\"unsigned long long int:t15=r1;", dg_file);
-    IGNORE fputs ( "0000000000000;01777777777777777777777;\",0x80,0,0,0\n",
+    IGNORE fputs("0000000000000;01777777777777777777777;\",0x80,0,0,0\n",
-	    dg_file ) ;
+		 dg_file);
-    IGNORE fputs ( "\t.stabs\t\"__void_star:t16=*13\",0x80,0,0,0\n",
+    IGNORE 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
+void
-    PROTO_Z ()
+stab_tagdefs(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++ ) {
+    for (i = 0; i < n; i++) {
-	diag_type d = di [i]->d_type ;
+	diag_type d = di[i]->d_type;
 	istag = 1;
-	switch ( d->key ) {
+	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) {
-		    IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:", nme ) ;
+		    IGNORE fprintf(dg_file, "\t.stabs\t\"%s:", nme);
 		} else {
-		    static int s_count = 0 ;
+		    static int s_count = 0;
-		    IGNORE fprintf ( dg_file, "\t.stabs\t\"_struct%d:", s_count++ ) ;
+		    IGNORE 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) {
-		    IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:", nme ) ;
+		    IGNORE fprintf(dg_file, "\t.stabs\t\"%s:", nme);
 		} else {
-		    static int u_count = 0 ;
+		    static int u_count = 0;
-		    IGNORE fprintf ( dg_file, "\t.stabs\t\"_union%d:", u_count++ ) ;
+		    IGNORE 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) {
-		    IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:", nme ) ;
+		    IGNORE fprintf(dg_file, "\t.stabs\t\"%s:", nme);
 		} else {
-		    static int e_count = 0 ;
+		    static int e_count = 0;
-		    IGNORE fprintf ( dg_file, "\t.stabs\t\"_enum%d:", e_count++ ) ;
+		    IGNORE 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) {
-		IGNORE fprintf ( dg_file, "%d", (int)d->been_outed ) ;
+		IGNORE fprintf(dg_file, "%d", (int)d->been_outed);
 	    } else {
-		IGNORE fprintf ( dg_file, "T" ) ;
+		IGNORE fprintf(dg_file, "T");
-		OUT_DT_SHAPE ( d ) ;
+		OUT_DT_SHAPE(d);
+	    }
-	    IGNORE fprintf ( dg_file, "\",0x80,0,0,0\n" ) ;
+	    IGNORE fprintf(dg_file, "\",0x80,0,0,0\n");
+	}
+    }
-    return ;
+    return;
+}
 #endif
 /*
     DEAL WITH TYPEDEFS
 */
 #ifndef NEWDIAGS
-void stab_typedefs
+void
-    PROTO_Z ()
+stab_typedefs(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();
-	    IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:t%ld=",
+	    IGNORE 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);
-	    IGNORE fprintf ( dg_file, "\",0x80,0,0,0\n" ) ;
+	    IGNORE fprintf(dg_file, "\",0x80,0,0,0\n");
 	}
     }
-    return ;
+    return;
+}
 #endif
 /*
   INITIALISE DIAGNOSTICS
 */
 #ifdef NEWDIAGS
+void
-void out_diagnose_prelude
+out_diagnose_prelude(void)
-    PROTO_Z ()
 {
   return;
 }
 #if 0
-static void prep_type
+static void
-    PROTO_N ( (dt) )
-    PROTO_T ( dg_type dt )
+prep_type(dg_type dt)
+{
   if (dt->key == 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;
-  }
-  else {
+  } else {
-    last_type_sz = type_size (dt);
+    last_type_sz = type_size(dt);
     dt->outref.k = -1;
-    dt->outref.u.l = next_typen () ;
+    dt->outref.u.l = next_typen();
-    set_stab_size ( dt->outref.u.l ) ;
+    set_stab_size(dt->outref.u.l);
   }
 #if 0
-  if (dt->mor && dt->mor->this_tag)
+  if (dt->mor && dt->mor->this_tag) {
     dt->mor->this_tag->outref = dt->outref;
+  }
 #endif
+}
 #endif
-void init_stab_aux
+void
-    PROTO_Z ()
+init_stab_aux(void)
+{
   dg_compilation this_comp;
-  dg_file = fpout ;
+  dg_file = fpout;
   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)
+      if (item->key == DGN_PROC && item->data.n_proc.obtain_val) {
 	prim_file = this_comp->prim_file;
+      }
       item = item -> next;
+    }
     this_comp = this_comp->another;
+  }
   if (prim_file) {
-    IGNORE fprintf (dg_file, "\t.file\t\"") ;
+    IGNORE fprintf(dg_file, "\t.file\t\"");
-    if (prim_file->file_name[0] != '/' && prim_file->file_path[0])
+    if (prim_file->file_name[0]!= '/' && prim_file->file_path[0]) {
-      IGNORE fprintf ( dg_file, "%s/", prim_file->file_path );
+      IGNORE fprintf(dg_file, "%s/", prim_file->file_path);
+    }
-    IGNORE fprintf ( dg_file, "%s\"\n",prim_file ->file_name );
+    IGNORE fprintf(dg_file, "%s\"\n",prim_file ->file_name);
-    stab_file (prim_file);
+    stab_file(prim_file);
-  }
-  else
+  } else {
-    IGNORE fprintf (dg_file, "\t.file\t\"no_source_file\"\n") ;
+    IGNORE fprintf(dg_file, "\t.file\t\"no_source_file\"\n");
+  }
-  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)
+	  if (!dt->outref.k) {
-	    prep_type (dt);
+	    prep_type(dt);
-	}
+	  }
-	else
+	} else if ((dt->key == DGT_STRUCT &&
-	if ((dt->key == DGT_STRUCT && dt->data.t_struct.idnam.id_key == DG_ID_SRC
+		    dt->data.t_struct.idnam.id_key == DG_ID_SRC &&
-		&& (s = dt->data.t_struct.idnam.idd.nam, s[0]))
+		    (s = dt->data.t_struct.idnam.idd.nam, s[0])) ||
-	     || (dt->key == DGT_ENUM && (s = dt->data.t_enum.tnam, s[0]))) {
+		   (dt->key == DGT_ENUM && (s = dt->data.t_enum.tnam, s[0]))) {
-	  if (!dt->outref.k)
+	  if (!dt->outref.k) {
-	    prep_type (dt);
+	    prep_type(dt);
+	  }
 	}
       }
-      item = item -> next;
+      item = item->next;
     }
     this_comp = this_comp->another;
   }
 #endif
   this_comp = all_comp_units;
   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]) {
-	  IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:", s ) ;
+	  IGNORE 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) {
-		IGNORE fprintf ( dg_file, "%d", (int)dt->outref.u.l ) ;
+		IGNORE fprintf(dg_file, "%d", (int)dt->outref.u.l);
+	  } else {
+		IGNORE fprintf(dg_file, "t");
+		OUT_DT_SHAPE(dt);
+	  }
+	  IGNORE 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]))) {
+	  IGNORE fprintf(dg_file, "\t.stabs\t\"%s:", s);
+	  if (dt->outref.k == LAB_D) {
+	    IGNORE fprintf(dg_file, "%d",(int)dt->outref.u.l);
-	  else {
+	  } else {
-		IGNORE fprintf ( dg_file, "t" ) ;
+	    IGNORE fprintf(dg_file, "T");
-		OUT_DT_SHAPE ( dt ) ;
+	    OUT_DT_SHAPE(dt);
+	  }
-	  IGNORE fprintf ( dg_file, "\",0x80,0,0,0\n" ) ;
+	  IGNORE 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]))) {
-	  IGNORE fprintf ( dg_file, "\t.stabs\t\"%s:", s ) ;
-	  if ( dt->outref.k == LAB_D ) {
-		IGNORE fprintf ( dg_file, "%d", (int)dt->outref.u.l ) ;
-	    } else {
-		IGNORE fprintf ( dg_file, "T" ) ;
-		OUT_DT_SHAPE ( dt ) ;
-	    }
-	    IGNORE fprintf ( dg_file, "\",0x80,0,0,0\n" ) ;
+	}
 #if 0
-	if (item->mor && item->mor->this_tag)
+	if (item->mor && item->mor->this_tag) {
 	  item->mor->this_tag->outref = item->data.n_typ.raw->outref;
+	}
 #endif
+      }
-      item = item -> next;
+      item = item->next;
+    }
     this_comp = this_comp->another;
+  }
   return;
 }
 #else
+void
-void out_diagnose_prelude
+out_diagnose_prelude(void)
-    PROTO_Z ()
 {
-    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) {
-	failer ( "Can't open temporary diagnostics file" ) ;
+	failer("Can't open temporary diagnostics file");
-	exit (EXIT_FAILURE) ;
+	exit(EXIT_FAILURE);
     }
-    stab_types () ;
+    stab_types();
-    return ;
+    return;
 }
-void init_stab_aux
+void
-    PROTO_Z ()
+init_stab_aux(void)
 {
-    int c ;
+    int c;
-    FILE *f ;
+    FILE *f;
-    int i, j = -1 ;
+    int i, j = -1;
-    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;
+	}
+    }
+    IGNORE fclose(dg_file);
+    dg_file = fpout;
+    if (j >= 0) {
+	IGNORE fprintf(dg_file, "\t.file\t\"%s\"\n", fds[j] ->file.ints.chars);
+    } else {
+	IGNORE fprintf(dg_file, "\t.file\t\"no_source_file\"\n");
+    }
+    stab_file((long)j, 0);
+    f = fopen(dg_file_name, "r");
+    if (f == NULL) {
+	failer("Can't open temporary diagnostics file");
+	exit(EXIT_FAILURE);
+    }
-    IGNORE fclose ( dg_file ) ;
+    while (c = fgetc(f), c != EOF) {
-    dg_file = fpout ;
-    if (j >= 0)
-	IGNORE fprintf (dg_file, "\t.file\t\"%s\"\n", fds[j]->file.ints.chars) ;
-    else
+	outc(c);
-	IGNORE fprintf (dg_file, "\t.file\t\"no_source_file\"\n") ;
-    stab_file ( ( long ) j, 0 ) ;
-    f = fopen ( dg_file_name, "r" ) ;
-    if ( f == NULL ) {
-	failer ( "Can't open temporary diagnostics file" ) ;
-	exit (EXIT_FAILURE) ;
+    }
-    while ( c = fgetc ( f ), c != EOF ) outc ( c ) ;
-    IGNORE fclose ( f ) ;
+    IGNORE fclose(f);
-    remove ( dg_file_name ) ;
+    remove(dg_file_name);
-    return ;
+    return;
+}
 #endif
+void
-void out_diagnose_postlude
+out_diagnose_postlude(void)
-    PROTO_Z ()
+{
-    long i = next_d_lab () ;
+    long i = next_d_lab();
-    IGNORE fprintf ( dg_file, ".LL.%ld:\n", i ) ;
+    IGNORE fprintf(dg_file, ".LL.%ld:\n", i);
-    IGNORE fprintf ( dg_file, "\t.stabs\t\"\",0x64,0,0,.LL.%ld\n", i ) ;
+    IGNORE fprintf(dg_file, "\t.stabs\t\"\",0x64,0,0,.LL.%ld\n", i);
-    return ;
+    return;
+}

Subversion Repositories tendra.SVN

(root)/trunk/src/installers/80x86/solaris/diag_out.c – Rev 2 → 7