OSDN Git Service

Add TLS checks to ObjC
[pf3gnuchains/gcc-fork.git] / gcc / java / jcf-dump.c
index 0776629..b29c7e4 100644 (file)
@@ -1,14 +1,14 @@
 /* Program to dump out a Java(TM) .class file.
    Functionally similar to Sun's javap.
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GCC is distributed in the hope that it will be useful,
@@ -17,9 +17,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  
 
 Java and all Java-based marks are trademarks or registered trademarks
 of Sun Microsystems, Inc. in the United States and other countries.
@@ -65,7 +64,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include <getopt.h>
 #include <math.h>
 
-/* Outout file. */
+/* Output file. */
 FILE *out;
 /* Name of output file, if NULL if stdout. */
 char *output_file = NULL;
@@ -74,7 +73,7 @@ int verbose = 0;
 
 int flag_disassemble_methods = 0;
 int flag_print_class_info = 1;
-int flag_print_constant_pool = 1;
+int flag_print_constant_pool = 0;
 int flag_print_fields = 1;
 int flag_print_methods = 1;
 int flag_print_attributes = 1;
@@ -91,11 +90,12 @@ int this_class_index = 0;
 
 int class_access_flags = 0;
 
-/* Print in format similar to javap.  VERY IMCOMPLETE. */
+/* Print in format similar to javap.  VERY INCOMPLETE. */
 int flag_javap_compatible = 0;
 
 static void print_access_flags (FILE *, uint16, char);
 static void print_constant_terse (FILE*, JCF*, int, int);
+static void print_constant_terse_with_index (FILE *, JCF *, int, int);
 static void print_constant (FILE *, JCF *, int, int);
 static void print_constant_ref (FILE *, JCF *, int);
 static void disassemble_method (JCF*, const unsigned char *, int);
@@ -109,6 +109,11 @@ static void process_class (struct JCF *);
 static void print_constant_pool (struct JCF *);
 static void print_exception_table (struct JCF *, const unsigned char *entries,
                                   int);
+static void indent (FILE *, int);
+static void print_element_value (FILE *, JCF *, int);
+static void print_annotation (FILE *, JCF *, int);
+static void print_annotations (FILE *, JCF *, int);
+static void print_parameter_annotations (FILE *, JCF *, int);
 
 #define PRINT_SIGNATURE_RESULT_ONLY 1
 #define PRINT_SIGNATURE_ARGS_ONLY 2
@@ -132,7 +137,7 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
   if (flag_print_class_info) \
     fprintf (out, \
              "Magic number: 0x%0lx, minor_version: %ld, major_version: %ld.\n",\
-            (long) MAGIC, (long) MINOR, (long) MAJOR)
+            (unsigned long) MAGIC, (long) MINOR, (long) MAJOR)
 
 #define HANDLE_START_CONSTANT_POOL(COUNT) \
   if (flag_print_constant_pool) \
@@ -152,9 +157,7 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
       print_access_flags (out, ACCESS_FLAGS, 'c'); \
       fputc ('\n', out); \
       fprintf (out, "This class: "); \
-      if (flag_print_constant_pool) \
-        fprintf (out, "%d=", THIS); \
-      print_constant_terse (out, jcf, THIS, CONSTANT_Class); \
+      print_constant_terse_with_index (out, jcf, THIS, CONSTANT_Class); \
       if (flag_print_constant_pool || SUPER != 0) \
         fprintf (out, ", super: "); \
       if (flag_print_constant_pool) \
@@ -173,8 +176,8 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
 
 #define HANDLE_CLASS_INTERFACE(INDEX) \
   if (flag_print_class_info) \
-    { fprintf (out, "- Implements: %d=", INDEX); \
-      print_constant_terse (out, jcf, INDEX, CONSTANT_Class); \
+    { fprintf (out, "- Implements: "); \
+      print_constant_terse_with_index (out, jcf, INDEX, CONSTANT_Class); \
       fputc ('\n', out); }
 
 #define HANDLE_START_FIELDS(FIELDS_COUNT) \
@@ -186,7 +189,7 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
     { fprintf (out, "Field name:"); \
       print_constant_terse (out, jcf, NAME, CONSTANT_Utf8); \
       print_access_flags (out, ACCESS_FLAGS, 'f'); \
-      fprintf (out, " Signature: "); \
+      fprintf (out, " Descriptor: "); \
       if (flag_print_constant_pool) \
         fprintf (out, "%d=", SIGNATURE); \
       print_signature (out, jcf, SIGNATURE, 0); \
@@ -229,7 +232,7 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
          fprintf (out, "\nMethod name:"); \
          print_constant_terse (out, jcf, NAME, CONSTANT_Utf8); \
          print_access_flags (out, ACCESS_FLAGS, 'm'); \
-         fprintf (out, " Signature: "); \
+         fprintf (out, " Descriptor: "); \
          if (flag_print_constant_pool) \
            fprintf (out, "%d=", SIGNATURE); \
          print_signature (out, jcf, SIGNATURE, 0); \
@@ -287,12 +290,36 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
     int name_index = JCF_readu2 (jcf); \
     int signature_index = JCF_readu2 (jcf); \
     int slot = JCF_readu2 (jcf); \
-    fprintf (out, "  slot#%d: name: %d=", slot, name_index); \
+    fprintf (out, "  slot#%d: name: ", slot); \
+    if (flag_print_constant_pool) \
+      fprintf (out, "%d=", name_index); \
     print_name (out, jcf, name_index); \
-    fprintf (out, ", type: %d=", signature_index); \
+    fprintf (out, ", type: "); \
+    if (flag_print_constant_pool) \
+      fprintf (out, "%d=", signature_index); \
     print_signature (out, jcf, signature_index, 0); \
     fprintf (out, " (pc: %d length: %d)\n", start_pc, length); }}
 
+#define HANDLE_LOCALVARIABLETYPETABLE_ATTRIBUTE(COUNT)                 \
+{ int n = (COUNT); int i;                                              \
+  COMMON_HANDLE_ATTRIBUTE(JCF, attribute_name, attribute_length);      \
+  fprintf (out, ", count: %d\n", n);                                   \
+  for (i = 0; i < n; i++) {                                            \
+    int start_pc = JCF_readu2 (jcf);                                   \
+    int length = JCF_readu2 (jcf);                                     \
+    int name_index = JCF_readu2 (jcf);                                 \
+    int signature_index = JCF_readu2 (jcf);                            \
+    int slot = JCF_readu2 (jcf);                                       \
+    fprintf (out, "  slot#%d: name: ", slot);                          \
+    if (flag_print_constant_pool)                                      \
+      fprintf (out, "%d=", name_index);                                        \
+    print_name (out, jcf, name_index);                                 \
+    fprintf (out, ", type: ");                                         \
+    if (flag_print_constant_pool)                                      \
+      fprintf (out, "%d=", signature_index);                           \
+    print_signature (out, jcf, signature_index, 0);                    \
+    fprintf (out, " (pc: %d length: %d)\n", start_pc, length); }}
+
 #define HANDLE_LINENUMBERTABLE_ATTRIBUTE(COUNT) \
 { int n = (COUNT); int i; \
   COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length); \
@@ -317,26 +344,98 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
                                                                            \
       if (flag_print_class_info)                                           \
        {                                                                   \
-         fprintf (out, "\n  class: ");                                     \
-         if (flag_print_constant_pool)                                     \
-           fprintf (out, "%d=", inner_class_info_index);                   \
-         print_constant_terse (out, jcf,                                   \
-                               inner_class_info_index, CONSTANT_Class);    \
-         fprintf (out, " (%d=", inner_name_index);                         \
-         print_constant_terse (out, jcf, inner_name_index, CONSTANT_Utf8); \
-         fprintf (out, "), access flags: 0x%x", inner_class_access_flags); \
+         fprintf (out, "\n  inner: ");                                     \
+         if (inner_class_info_index == 0)                                  \
+           fprintf (out, " (no inner info index)");                        \
+         else                                                              \
+           print_constant_terse_with_index (out, jcf,                      \
+                                            inner_class_info_index,        \
+                                            CONSTANT_Class);               \
+         if (inner_name_index == 0)                                        \
+           fprintf (out, " (anonymous)");                                  \
+         else if (verbose || flag_print_constant_pool)                     \
+           {                                                               \
+             fprintf (out, " (");                                          \
+             print_constant_terse_with_index (out, jcf, inner_name_index,  \
+                                              CONSTANT_Utf8);              \
+             fputc (')', out);                                             \
+           }                                                               \
+         fprintf (out, ", access flags: 0x%x", inner_class_access_flags);  \
          print_access_flags (out, inner_class_access_flags, 'c');          \
          fprintf (out, ", outer class: ");                                 \
-         if (flag_print_constant_pool)                                     \
-           fprintf (out, "%d=", outer_class_info_index);                   \
-         print_constant_terse (out, jcf,                                   \
-                               outer_class_info_index, CONSTANT_Class);    \
+         if (outer_class_info_index == 0)                                  \
+           fprintf (out, "(not a member)");                                \
+         else                                                              \
+           print_constant_terse_with_index (out, jcf,                      \
+                                            outer_class_info_index,        \
+                                            CONSTANT_Class);               \
        }                                                                   \
     }                                                                      \
-      if (flag_print_class_info)                                           \
-       fputc ('\n', out);                                                  \
+  if (flag_print_class_info)                                               \
+    fputc ('\n', out);                                                     \
+}
+
+#define HANDLE_SOURCEDEBUGEXTENSION_ATTRIBUTE(LENGTH) \
+{ int i, n = (LENGTH), c = 0;                                    \
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length); \
+  fputc ('\n', out); \
+  for (i = 0;  i < n;  i++) { c = JCF_readu(jcf); fputc(c, out); } \
+  if (c != '\r' && c != '\n') fputc('\n', out); }
+
+#define HANDLE_ENCLOSINGMETHOD_ATTRIBUTE()                             \
+  { uint16 class_index, method_index;                                  \
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);      \
+  class_index = JCF_readu2 (jcf);                                      \
+  method_index = JCF_readu2 (jcf);                                     \
+  fprintf (out, "\n  Class: ");                                                \
+  print_constant_terse_with_index (out, jcf, class_index, CONSTANT_Class); \
+  fprintf (out, "\n  Method: ");                                       \
+  print_constant_terse_with_index (out, jcf, method_index,             \
+                                  CONSTANT_NameAndType);               \
+  fputc ('\n', out);                                                   \
+}
+
+#define HANDLE_SIGNATURE_ATTRIBUTE()                                   \
+{                                                                      \
+  uint16 signature;                                                    \
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);      \
+  signature = JCF_readu2 (jcf);                                                \
+  fprintf (out, "\n  Value: ");                                                \
+  print_constant_terse_with_index (out, jcf, signature, CONSTANT_Utf8);        \
+  fputc ('\n', out);                                                   \
+}
+
+#define HANDLE_RUNTIMEVISIBLEANNOTATIONS_ATTRIBUTE()                   \
+{                                                                      \
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);      \
+  print_annotations (out, jcf, 1);                                     \
+}
+
+#define HANDLE_RUNTIMEINVISIBLEANNOTATIONS_ATTRIBUTE()                 \
+{                                                                      \
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);      \
+  print_annotations (out, jcf, 1);                                     \
+}
+
+#define HANDLE_RUNTIMEVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE()          \
+{                                                                      \
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);      \
+  print_parameter_annotations (out, jcf, 1);                           \
+}
+
+#define HANDLE_RUNTIMEINVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE()                \
+{                                                                      \
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);      \
+  print_parameter_annotations (out, jcf, 1);                           \
+}
+
+#define HANDLE_ANNOTATIONDEFAULT_ATTRIBUTE()                           \
+{                                                                      \
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);      \
+  print_element_value (out, jcf, 1);                                   \
 }
 
+
 #define PROCESS_OTHER_ATTRIBUTE(JCF, INDEX, LENGTH) \
 { COMMON_HANDLE_ATTRIBUTE(JCF, INDEX, LENGTH); \
   fputc ('\n', out); JCF_SKIP (JCF, LENGTH); }
@@ -347,15 +446,171 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
 
 #include "javaop.h"
 
+\f
+
+static void
+indent (FILE *stream, int level)
+{
+  int i;
+  for (i = 0; i < level; ++i)
+    fprintf (stream, "  ");
+}
+
+static void
+print_element_value (FILE *stream, JCF *jcf, int level)
+{
+  uint8 tag = JCF_readu (jcf);
+  indent (stream, level);
+  switch (tag)
+    {
+    case 'B':
+    case 'C':
+    case 'S':
+    case 'Z':
+    case 'I':
+      {
+       uint16 cindex = JCF_readu2 (jcf);
+       print_constant_terse_with_index (stream, jcf, cindex,
+                                        CONSTANT_Integer);
+      }
+      break;
+    case 'D':
+      {
+       uint16 cindex = JCF_readu2 (jcf);
+       print_constant_terse_with_index (stream, jcf, cindex,
+                                        CONSTANT_Double);
+      }
+      break;
+    case 'F':
+      {
+       uint16 cindex = JCF_readu2 (jcf);
+       print_constant_terse_with_index (stream, jcf, cindex,
+                                        CONSTANT_Float);
+      }
+      break;
+    case 'J':
+      {
+       uint16 cindex = JCF_readu2 (jcf);
+       print_constant_terse_with_index (stream, jcf, cindex,
+                                        CONSTANT_Long);
+      }
+      break;
+    case 's':
+      {
+       uint16 cindex = JCF_readu2 (jcf);
+       /* Despite what the JVM spec says, compilers generate a Utf8
+          constant here, not a String.  */
+       print_constant_terse_with_index (stream, jcf, cindex,
+                                        CONSTANT_Utf8);
+      }
+      break;
+
+    case 'e':
+      {
+       uint16 type_name_index = JCF_readu2 (jcf);
+       uint16 const_name_index = JCF_readu2 (jcf);
+       fprintf (stream, "enum class: ");
+       print_constant_terse_with_index (stream, jcf, type_name_index,
+                                        CONSTANT_Utf8);
+       fprintf (stream, "\n");
+       indent (stream, level);
+       fprintf (stream, "Field: ");
+       print_constant_terse_with_index (stream, jcf, const_name_index,
+                                        CONSTANT_Utf8);
+      }
+      break;
+    case 'c':
+      {
+       uint16 class_info_index = JCF_readu2 (jcf);
+       print_constant_terse_with_index (stream, jcf, class_info_index,
+                                        CONSTANT_Utf8);
+      }
+      break;
+    case '@':
+      {
+       fprintf (stream, "Annotation:\n");
+       print_annotation (stream, jcf, level + 1);
+      }
+      break;
+    case '[':
+      {
+       uint16 n_array_elts = JCF_readu2 (jcf);
+       fprintf (stream, "array[%d]: [\n", (int) n_array_elts);
+       while (n_array_elts--)
+         print_element_value (stream, jcf, level + 1);
+       indent (stream, level);
+       fprintf (stream, "]");
+      }
+      break;
+    default:
+      fprintf (stream, "Unexpected tag value: %d", (int) tag);
+      break;
+    }
+  fputc ('\n', stream);
+}
+
+static void
+print_annotation (FILE *stream, JCF *jcf, int level)
+{
+  uint16 type_index = JCF_readu2 (jcf);
+  uint16 npairs = JCF_readu2 (jcf);
+  fprintf (stream, "\n");
+  indent (stream, level);
+  fprintf (stream, "Annotation name: ");
+  print_constant_terse_with_index (stream, jcf, type_index,
+                                  CONSTANT_Utf8);
+  if (npairs)
+    {
+      fprintf (stream, "\n");
+      while (npairs--)
+       {
+         uint16 name_index = JCF_readu2 (jcf);
+         indent (stream, level + 1);
+         fprintf (stream, "Name: ");
+         print_constant_terse_with_index (stream, jcf, name_index,
+                                          CONSTANT_Utf8);
+         fprintf (stream, "\n");
+         print_element_value (stream, jcf, level + 2);
+       }
+    }
+}
+
+static void
+print_annotations (FILE *stream, JCF *jcf, int level)
+{
+  uint16 num = JCF_readu2 (jcf);
+  while (num--)
+    print_annotation (stream, jcf, level);
+}
+
+static void
+print_parameter_annotations (FILE *stream, JCF *jcf, int level)
+{
+  uint8 nparams = JCF_readu (jcf);
+  uint8 i;
+  for (i = 0; i < nparams; ++i)
+    {
+      indent (stream, level);
+      fprintf (stream, "Parameter annotations (%d):\n", (int) i);
+      print_annotations (stream, jcf, level + 1);
+    }
+}
+
+\f
+
 static void
 print_constant_ref (FILE *stream, JCF *jcf, int index)
 {
-  fprintf (stream, "#%d=<", index);
   if (index <= 0 || index >= JPOOL_SIZE(jcf))
-    fprintf (stream, "out of range");
+    fprintf (stream, "<out of range>");
   else
-    print_constant (stream, jcf, index, 1);
-  fprintf (stream, ">");
+    {
+      if (flag_print_constant_pool)
+       fprintf (stream, "#%d=", index);
+      fputc ('<', stream);
+      print_constant (stream, jcf, index, 1);
+      fputc ('>', stream);
+    }
 }
 
 /* Print the access flags given by FLAGS.
@@ -371,8 +626,10 @@ print_access_flags (FILE *stream, uint16 flags, char context)
   if (flags & ACC_ABSTRACT) fprintf (stream, " abstract");
   if (flags & ACC_STATIC) fprintf (stream, " static");
   if (flags & ACC_FINAL) fprintf (stream, " final");
-  if (flags & ACC_TRANSIENT) fprintf (stream, " transient");
-  if (flags & ACC_VOLATILE) fprintf (stream, " volatile");
+  if (flags & ACC_TRANSIENT)
+    fprintf (stream, context == 'm' ? " varargs" : " transient");
+  if (flags & ACC_VOLATILE)
+    fprintf (stream, context == 'm' ? " bridge" : " volatile");
   if (flags & ACC_NATIVE) fprintf (stream, " native");
   if (flags & ACC_SYNCHRONIZED)
     {
@@ -381,8 +638,11 @@ print_access_flags (FILE *stream, uint16 flags, char context)
       else
        fprintf (stream, " synchronized");
     }
-  if (flags & ACC_INTERFACE) fprintf (stream, " interface");
+  if (flags & ACC_INTERFACE)
+    fprintf (stream, (flags & ACC_ANNOTATION) ? " @interface" : " interface");
+  if (flags & ACC_ENUM) fprintf (stream, " enum");
   if (flags & ACC_STRICT) fprintf (stream, " strictfp");
+  if (flags & ACC_SYNTHETIC) fprintf (stream, " synthetic");
 }
 
 
@@ -414,6 +674,14 @@ print_constant_terse (FILE *out, JCF *jcf, int index, int expected)
     print_constant (out, jcf, index, 0);
 }
 
+static void
+print_constant_terse_with_index (FILE *out, JCF *jcf, int index, int expected)
+{
+  if (flag_print_constant_pool)
+    fprintf (out, "%d=", index);
+  print_constant_terse (out, jcf, index, expected);
+}
+
 /* Print the constant at INDEX in JCF's constant pool.
    If verbosity==0, print very tersely (no extraneous text).
    If verbosity==1, prefix the type of the constant.
@@ -542,7 +810,7 @@ print_constant (FILE *out, JCF *jcf, int index, int verbosity)
          }
 
        if (verbosity > 1)
-         fprintf (out, ", bits = 0x%08lx", JPOOL_UINT (jcf, index));
+         fprintf (out, ", bits = 0x%08lx", (unsigned long) JPOOL_UINT (jcf, index));
        
        break;
       }
@@ -582,16 +850,19 @@ print_constant (FILE *out, JCF *jcf, int index, int verbosity)
            if (dnum.mantissa0 == 0 && dnum.mantissa1 == 0)
              fputs ("Inf", out);
            else if (dnum.mantissa0 & JDOUBLE_QNAN_MASK)
-             fprintf (out, "QNaN(%llu)", (unsigned long long)mantissa);
+             fprintf (out, "QNaN(%" HOST_LONG_LONG_FORMAT "u)",
+                (unsigned long long)mantissa);
            else
-             fprintf (out, "SNaN(%llu)", (unsigned long long)mantissa);
+             fprintf (out, "SNaN(%" HOST_LONG_LONG_FORMAT "u)",
+                (unsigned long long)mantissa);
          }
        if (verbosity > 1)
          {
            int32 hi, lo;
            hi = JPOOL_UINT (jcf, index);
            lo = JPOOL_UINT (jcf, index + 1);
-           fprintf (out, ", bits = 0x%08lx%08lx", (long) hi, (long) lo);
+           fprintf (out, ", bits = 0x%08lx%08lx", (unsigned long) hi,
+                    (unsigned long) lo);
          }
        break;
       }
@@ -775,15 +1046,13 @@ print_exception_table (JCF *jcf, const unsigned char *entries, int count)
          int end_pc = GET_u2 (ptr+2);
          int handler_pc = GET_u2 (ptr+4);
          int catch_type = GET_u2 (ptr+6);
-         fprintf (out, "  start: %d, end: %d, handler: %d, type: %d",
-                  start_pc, end_pc, handler_pc, catch_type);
+         fprintf (out, "  start: %d, end: %d, handler: %d, type: ",
+                  start_pc, end_pc, handler_pc);
          if (catch_type == 0)
-           fputs (" /* finally */", out);
+           fputs ("0 /* finally */", out);
          else
-           {
-             fputc('=', out);
-             print_constant_terse (out, jcf, catch_type, CONSTANT_Class);
-           }
+           print_constant_terse_with_index (out, jcf,
+                                            catch_type, CONSTANT_Class);
          fputc ('\n', out);
        }
     }
@@ -859,14 +1128,15 @@ static const struct option options[] =
   { "verbose",       no_argument,       NULL, 'v' },
   { "version",       no_argument,       NULL, OPT_VERSION },
   { "javap",         no_argument,       NULL, OPT_JAVAP },
-  { "print-main",    no_argument,      &flag_print_main, 1 },
+  { "print-main",    no_argument,       &flag_print_main, 1 },
+  { "print-constants", no_argument,     &flag_print_constant_pool, 1 },
   { NULL,            no_argument,       NULL, 0 }
 };
 
 static void
 usage (void)
 {
-  fprintf (stderr, _("Try `jcf-dump --help' for more information.\n"));
+  fprintf (stderr, _("Try 'jcf-dump --help' for more information.\n"));
   exit (1);
 }
 
@@ -876,7 +1146,7 @@ help (void)
   printf (_("Usage: jcf-dump [OPTION]... CLASS...\n\n"));
   printf (_("Display contents of a class file in readable form.\n\n"));
   printf (_("  -c                      Disassemble method bodies\n"));
-  printf (_("  --javap                 Generate output in `javap' format\n"));
+  printf (_("  --javap                 Generate output in 'javap' format\n"));
   printf ("\n");
   printf (_("  --classpath PATH        Set path to find .class files\n"));
   printf (_("  -IDIR                   Append directory to class path\n"));
@@ -896,8 +1166,8 @@ help (void)
 static void
 version (void)
 {
-  printf ("jcf-dump (GCC) %s\n\n", version_string);
-  printf ("Copyright %s 2004 Free Software Foundation, Inc.\n", _("(C)"));
+  printf ("jcf-dump %s%s\n\n", pkgversion_string, version_string);
+  printf ("Copyright %s 2010 Free Software Foundation, Inc.\n", _("(C)"));
   printf (_("This is free software; see the source for copying conditions.  There is NO\n"
            "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"));
   exit (0);
@@ -909,6 +1179,9 @@ main (int argc, char** argv)
   JCF jcf[1];
   int argi, opt;
 
+  /* Unlock the stdio streams.  */
+  unlock_std_streams ();
+
   gcc_init_libintl ();
 
   if (argc <= 1)
@@ -976,6 +1249,9 @@ main (int argc, char** argv)
        }
     }
 
+  if (verbose && ! flag_javap_compatible)
+    flag_print_constant_pool = 1;
+
   if (optind == argc)
     {
       fprintf (stderr, _("jcf-dump: no classes specified\n"));
@@ -1016,7 +1292,7 @@ main (int argc, char** argv)
       for (argi = optind; argi < argc; argi++)
        {
          char *arg = argv[argi];
-         const char *class_filename = find_class (arg, strlen (arg), jcf, 0);
+         const char *class_filename = find_class (arg, strlen (arg), jcf);
          if (class_filename == NULL)
            class_filename = find_classfile (arg, jcf, NULL);
          if (class_filename == NULL)
@@ -1029,7 +1305,6 @@ main (int argc, char** argv)
            {
              long compressed_size, member_size;
              int compression_method, filename_length, extra_length;
-             int general_purpose_bits;
              const char *filename;
              int total_length;
              if (flag_print_class_info)
@@ -1049,7 +1324,7 @@ main (int argc, char** argv)
                    }
                  JCF_FILL (jcf, 26);
                  JCF_SKIP (jcf, 2);
-                 general_purpose_bits = JCF_readu2_le (jcf);
+                 (void) /* general_purpose_bits = */ JCF_readu2_le (jcf);
                  compression_method = JCF_readu2_le (jcf);
                  JCF_SKIP (jcf, 8);
                  compressed_size = JCF_readu4_le (jcf);
@@ -1061,7 +1336,7 @@ main (int argc, char** argv)
                  if (jcf->read_end - jcf->read_ptr < total_length)
                    jcf_trim_old_input (jcf);
                  JCF_FILL (jcf, total_length);
-                 filename = jcf->read_ptr;
+                 filename = (const char *) jcf->read_ptr;
                  JCF_SKIP (jcf, filename_length);
                  JCF_SKIP (jcf, extra_length);
                  if (filename_length > 0
@@ -1162,7 +1437,7 @@ disassemble_method (JCF* jcf, const unsigned char *byte_ops, int len)
 #define VAR_INDEX_2 (saw_index = 1, IMMEDIATE_u2)
 
 #define CHECK_PC_IN_RANGE(PC) (PC < 0 || PC > len ? \
-  (fprintf(stderr, _("Bad byte codes.\n")), exit(-1)) : 1)
+  (fprintf(stderr, _("Bad byte codes.\n")), exit(-1), 0) : 1)
 
 /* Print out operand (if not implied by the opcode) for PUSCH opcodes.
    These all push a constant onto the opcode stack. */