gprof cleanups

[Ben Elliston]

I'm trying to make some of the binutils directories less cluttered
with #if 0 code that is clearly obsolete.  I started with gprof, but
in this case, I just converted them to comments.  I've used diff -w to
minimise the size of the patch as there was a bit of reformatting
required.

Committed as obvious.

2005-01-21  Ben Elliston  <bje@au.ibm.com>

	* gmon.h, alpha.c, vax.c: Remove #if 0'd chunks.

Index: gmon.h
===================================================================
RCS file: /home/bje/src-cvs/src/gprof/gmon.h,v
retrieving revision 1.4
diff -u -p -w -r1.4 gmon.h
--- gmon.h	30 Jul 2002 09:07:00 -0000	1.4
+++ gmon.h	20 Jan 2005 23:26:36 -0000
@@ -33,19 +33,20 @@
 #define GMON_HDRSIZE_BSD44_32 (4 + 4 + 4 + 4 + 4 + (3 * 4))
 #define GMON_HDRSIZE_BSD44_64 (8 + 8 + 4 + 4 + 4 + (3 * 4))
 
-#if 0 /* For documentation purposes only.  */
+/* For documentation purposes only.
+
   struct raw_phdr
     {
-      char low_pc[sizeof(void *)]; /* base pc address of sample buffer */
-      char high_pc[sizeof(void *)];/* max pc address of sampled buffer */
-      char ncnt[4];		   /* size of sample buffer (plus this
-				      header) */
-
-      char version[4];		   /* version number */
-      char profrate[4];		   /* profiling clock rate */
-      char spare[3*4];		   /* reserved */
+      char low_pc[sizeof(void *)];   -- base pc address of sample buffer
+      char high_pc[sizeof(void *)];  -- max pc address of sampled buffer
+      char ncnt[4];		     -- size of sample buffer (plus this
+				        header)
+
+      char version[4];		     -- version number
+      char profrate[4];		     -- profiling clock rate
+      char spare[3*4];		     -- reserved
     };
-#endif
+*/
 
 #define GMONVERSION     0x00051879
 
@@ -60,22 +61,22 @@
 #define GMON_HDRSIZE_OLDBSD_64 (8 + 8 + 4)
 #endif
 
-#if 0 /* For documentation purposes only.  */
+/* For documentation purposes only.
+
   struct old_raw_phdr
     {
-      char low_pc[sizeof(void *)]; /* base pc address of sample buffer */
-      char high_pc[sizeof(void *)];/* max pc address of sampled buffer */
-      char ncnt[4];		   /* size of sample buffer (plus this
-				      header) */
-#if defined (__alpha__) && defined (__osf__)
-      /*
-       * DEC's OSF v3.0 uses 4 bytes of padding to bring the header to
-       * a size that is a multiple of 8.
-       */
-      char pad[4];
-#endif
+      char low_pc[sizeof(void *)];  -- base pc address of sample buffer
+      char high_pc[sizeof(void *)]  -- max pc address of sampled buffer
+      char ncnt[4];		    -- size of sample buffer (plus this
+				       header)
+
+      if defined (__alpha__) && defined (__osf__)
+      char pad[4];		    -- DEC's OSF v3.0 uses 4 bytes of padding
+				    -- to bring the header to a size that is a
+				    -- multiple of 8.
+      endif
     };
-#endif
+*/
 
 /*
  * Histogram counters are unsigned shorts:
@@ -130,14 +131,16 @@ struct tostruct
  * as to get a packed representation (otherwise, different compilers
  * might introduce different padding):
  */
-#if 0 /* For documentation purposes only.  */
+
+/* For documentation purposes only.
+
   struct raw_arc
     {
       char from_pc[sizeof(void *)];
       char self_pc[sizeof(void *)];
       char count[sizeof(long)];
     };
-#endif
+*/
 
 /*
  * General rounding functions:
Index: alpha.c
===================================================================
RCS file: /home/bje/src-cvs/src/gprof/alpha.c,v
retrieving revision 1.8
diff -u -p -w -r1.8 alpha.c
--- alpha.c	26 May 2004 04:55:55 -0000	1.8
+++ alpha.c	20 Jan 2005 23:26:36 -0000
@@ -45,9 +45,9 @@
 #define Jxx_FUNC_RET		2
 #define Jxx_FUNC_JSR_COROUTINE	3
 
-#if 0
 /* Here to document only.  We can't use this when cross compiling as
-   the bitfield layout might not be the same as native.  */
+   the bitfield layout might not be the same as native.
+
 typedef union
   {
     struct
@@ -55,14 +55,14 @@ typedef union
 	unsigned other:26;
 	unsigned op_code:6;
       }
-    a;				/* any format */
+       a;				-- any format
     struct
       {
 	int disp:21;
 	unsigned ra:5;
 	unsigned op_code:6;
       }
-    b;				/* branch format */
+       b;				-- branch format
     struct
       {
 	int hint:14;
@@ -71,10 +71,10 @@ typedef union
 	unsigned ra:5;
 	unsigned op_code:6;
       }
-    j;				/* jump format */
+       j;				-- jump format
   }
 alpha_Instruction;
-#endif
+*/
 
 static Sym indirect_child;
 
Index: vax.c
===================================================================
RCS file: /home/bje/src-cvs/src/gprof/vax.c,v
retrieving revision 1.11
diff -u -p -w -r1.11 vax.c
--- vax.c	26 May 2004 04:55:55 -0000	1.11
+++ vax.c	20 Jan 2005 23:26:36 -0000
@@ -53,15 +53,15 @@ enum opermodes
   };
 typedef enum opermodes operandenum;
 
-#if 0
 /* Here to document only.  We can't use this when cross compiling as
-   the bitfield layout might not be the same as native.  */
+   the bitfield layout might not be the same as native.
+
 struct modebyte
   {
     unsigned int regfield:4;
     unsigned int modefield:4;
   };
-#endif
+*/
 
 /*
  * A symbol to be the child of indirect calls:

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <https://sourceware.org/pipermail/binutils/attachments/20050120/255ea009/attachment.sig>