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

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 310a3957ec13c50224b0a46b0630c6bed88489cc..c1c74a5ca8c6b6f463876c66167526f1b745dc5f 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-21  Ben Elliston  <bje@au.ibm.com>
+
+       * gmon.h, alpha.c, vax.c: Remove #if 0'd chunks.
+
 2004-11-30  Tero Niemela  <tero_niemela@yahoo.com>
 
        * Makefile.am: Change LOCALEDIR to $(datadir)/share.

diff --git a/gprof/alpha.c b/gprof/alpha.c
index 83c4009d59e002bf3897c1687042dadbaa9b3c60..b89e9ccf553dbb71fda43905f660df8e88fad646 100644 (file)
--- a/gprof/alpha.c
+++ b/gprof/alpha.c
@@ -45,36 +45,38 @@
 #define Jxx_FUNC_RET           2
 #define Jxx_FUNC_JSR_COROUTINE 3
 
-#if 0
+/* *INDENT-OFF* */
 /* Here to document only.  We can't use this when cross compiling as
-   the bitfield layout might not be the same as native.  */
-typedef union
-  {
-    struct
-      {
-       unsigned other:26;
-       unsigned op_code:6;
-      }
-    a;                         /* any format */
-    struct
-      {
-       int disp:21;
-       unsigned ra:5;
-       unsigned op_code:6;
-      }
-    b;                         /* branch format */
-    struct
-      {
-       int hint:14;
-       unsigned func:2;
-       unsigned rb:5;
-       unsigned ra:5;
-       unsigned op_code:6;
-      }
-    j;                         /* jump format */
-  }
-alpha_Instruction;
-#endif
+   the bitfield layout might not be the same as native.
+
+   typedef union
+     {
+       struct
+         {
+          unsigned other:26;
+          unsigned op_code:6;
+         }
+       a;                              -- any format
+       struct
+         {
+          int disp:21;
+          unsigned ra:5;
+          unsigned op_code:6;
+         }
+       b;                              -- branch format
+       struct
+         {
+          int hint:14;
+          unsigned func:2;
+          unsigned rb:5;
+          unsigned ra:5;
+          unsigned op_code:6;
+         }
+       j;                              -- jump format
+     }
+    alpha_Instruction;
+*/
+/* *INDENT-ON* */
 
 static Sym indirect_child;
 

diff --git a/gprof/gmon.h b/gprof/gmon.h
index 7f1c333525e50d42dcf212088bcd9b7828a84a5b..be670ffc44639a2f9dd834ac3dc6f19680c4d8de 100644 (file)
--- a/gprof/gmon.h
+++ b/gprof/gmon.h
@@ -33,19 +33,22 @@
 #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.  */
-  struct raw_phdr
+/* *INDENT-OFF* */
+/* 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
+*/
+/* *INDENT-ON* */
 
 #define GMONVERSION     0x00051879
 
@@ -60,22 +63,24 @@
 #define GMON_HDRSIZE_OLDBSD_64 (8 + 8 + 4)
 #endif
 
-#if 0 /* For documentation purposes only.  */
+/* *INDENT-OFF* */
+/* 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
+*/
+/* *INDENT-ON* */
 
 /*
  * Histogram counters are unsigned shorts:
@@ -130,14 +135,18 @@ struct tostruct
  * as to get a packed representation (otherwise, different compilers
  * might introduce different padding):
  */
-#if 0 /* For documentation purposes only.  */
+
+/* *INDENT-OFF* */
+/* For documentation purposes only.
+
   struct raw_arc
     {
       char from_pc[sizeof(void *)];
       char self_pc[sizeof(void *)];
       char count[sizeof(long)];
     };
-#endif
+*/
+/* *INDENT-ON* */
 
 /*
  * General rounding functions:

diff --git a/gprof/vax.c b/gprof/vax.c
index 9c0665010ec9f848ab097b5ddb9f16654597951f..6216589d96059faad3cb9e2be24c0738f680cbe9 100644 (file)
--- a/gprof/vax.c
+++ b/gprof/vax.c
@@ -53,15 +53,17 @@ enum opermodes
   };
 typedef enum opermodes operandenum;
 
-#if 0
+/* *INDENT-OFF* */
 /* Here to document only.  We can't use this when cross compiling as
-   the bitfield layout might not be the same as native.  */
-struct modebyte
-  {
-    unsigned int regfield:4;
-    unsigned int modefield:4;
-  };
-#endif
+   the bitfield layout might not be the same as native.
+
+   struct modebyte
+     {
+       unsigned int regfield:4;
+       unsigned int modefield:4;
+     };
+*/
+/* *INDENT-ON* */
 
 /*
  * A symbol to be the child of indirect calls: