This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
jcf-dump fix
- To: egcs-patches at cygnus dot com
- Subject: jcf-dump fix
- From: Tom Tromey <tromey at cygnus dot com>
- Date: 13 Oct 1998 12:50:42 -0600
- Reply-To: tromey at cygnus dot com
I checked in the appended patch. It fixes a few minor problems with
the exit status of jcf-dump.
Tom
Index: ChangeLog
===================================================================
RCS file: /cvs/egcs/egcs/gcc/java/ChangeLog,v
retrieving revision 1.14
diff -u -r1.14 ChangeLog
--- ChangeLog 1998/10/12 12:43:28 1.14
+++ ChangeLog 1998/10/13 18:44:19
@@ -1,3 +1,12 @@
+1998-10-13 Tom Tromey <tromey@cygnus.com>
+
+ * jcf-dump.c (process_class): Use FATAL_EXIT_CODE, not -1.
+ (main): Likewise. Exit with SUCCESS_EXIT_CODE at end of
+ function.
+ Include <config.h> and "system.h".
+ (disassemble_method): Undefine RET to avoid clash with
+ config/i386/i386.h.
+
1998-10-09 Tom Tromey <tromey@cygnus.com>
* gjavah.c (decode_signature_piece): New function.
Index: jcf-dump.c
===================================================================
RCS file: /cvs/egcs/egcs/gcc/java/jcf-dump.c,v
retrieving revision 1.2
diff -u -r1.2 jcf-dump.c
--- jcf-dump.c 1998/10/12 12:43:40 1.2
+++ jcf-dump.c 1998/10/13 18:44:25
@@ -46,6 +46,9 @@
*/
+#include <config.h>
+#include "system.h"
+
#include <stdio.h>
#include "jcf.h"
@@ -667,13 +670,13 @@
if (code != 0)
{
fprintf (stderr, "error while parsing constant pool\n");
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
code = verify_constant_pool (jcf);
if (code > 0)
{
fprintf (stderr, "error in constant pool entry #%d\n", code);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
if (flag_print_constant_pool)
print_constant_pool (jcf);
@@ -683,19 +686,19 @@
if (code != 0)
{
fprintf (stderr, "error while parsing fields\n");
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
code = jcf_parse_methods (jcf);
if (code != 0)
{
fprintf (stderr, "error while parsing methods\n");
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
code = jcf_parse_final_attributes (jcf);
if (code != 0)
{
fprintf (stderr, "error while parsing final attributes\n");
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
jcf->filename = NULL;
}
@@ -735,7 +738,7 @@
else
{
fprintf (stderr, "%s: illegal argument\n", argv[argi]);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
}
@@ -750,7 +753,7 @@
else
{
fprintf (stderr, "%s: illegal argument\n", argv[argi]);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
}
else
@@ -780,7 +783,7 @@
if (out)
{
fprintf (stderr, "Cannot open '%s' for output.\n", output_file);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
}
else
@@ -807,7 +810,7 @@
if (class_filename == NULL)
{
perror ("Could not find class");
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
JCF_FILL (jcf, 4);
if (GET_u4 (jcf->read_ptr) == ZIPMAGIC)
@@ -830,7 +833,7 @@
if (magic != 0x04034b50) /* ZIPMAGIC (little-endian) */
{
fprintf (stderr, "bad format of .zip archine\n");
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
JCF_FILL (jcf, 26);
JCF_SKIP (jcf, 2);
@@ -903,6 +906,8 @@
JCF_FINISH(jcf);
}
}
+
+ exit (SUCCESS_EXIT_CODE);
}
static void
@@ -1029,6 +1034,7 @@
saw_index = 0, INT_temp = (OPERAND_VALUE); \
fprintf (out, " %d", saw_index ? INT_temp : oldpc + INT_temp)
+#undef RET /* Defined by config/i386/i386.h */
#define RET(OPERAND_TYPE, OPERAND_VALUE) \
INT_temp = saw_wide ? IMMEDIATE_u2 : (OPERAND_VALUE); \
saw_wide = 0; \