aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorKaveh R. Ghazi <ghazi@caip.rutgers.edu>1999-09-02 21:57:09 +0000
committerKaveh Ghazi <ghazi@gcc.gnu.org>1999-09-02 21:57:09 +0000
commitd593dd8c6ad055660e9ddd4112363f1b88827fb6 (patch)
treed78f68fd548b7fe100d1c9c862b04b87d0c5606d /gcc/java
parent57bcb97aac8ba7f801c3ce18ef287ae9a4ac6ae9 (diff)
downloadgcc-d593dd8c6ad055660e9ddd4112363f1b88827fb6.zip
gcc-d593dd8c6ad055660e9ddd4112363f1b88827fb6.tar.gz
gcc-d593dd8c6ad055660e9ddd4112363f1b88827fb6.tar.bz2
class.c (finish_class): Remove unused parameter, all callers changed.
* class.c (finish_class): Remove unused parameter, all callers changed. * expr.c (build_java_athrow): Change return type to void. (java_lang_expand_expr): Make sure each case in switch returns a value. * java-tree.h (finish_class): Fix prototype to take void args. * jcf-dump.c (usage): Mark with ATTRIBUTE_NORETURN. (main): Issue return from main, not exit. * jcf-parse.c (parse_class_file): Fix call to `finish_class'. * jcf.h (jcf_unexpected_eof): Mark with ATTRIBUTE_NORETURN. * jv-scan.c (main): Issue return from main, not exit. * parse.y (check_abstract_method_definitions, java_check_abstract_method_definitions): Add static prototypes. (java_complete_expand_methods): Fix call to `finish_class'. * verify.c (verify_jvm_instructions): Initialize variables `oldpc' and `prevpc'. From-SVN: r29065
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog27
-rw-r--r--gcc/java/class.c3
-rw-r--r--gcc/java/expr.c8
-rw-r--r--gcc/java/java-tree.h2
-rw-r--r--gcc/java/jcf-dump.c12
-rw-r--r--gcc/java/jcf-parse.c2
-rw-r--r--gcc/java/jcf.h2
-rw-r--r--gcc/java/jv-scan.c4
-rw-r--r--gcc/java/parse.c4
-rw-r--r--gcc/java/parse.y4
-rw-r--r--gcc/java/verify.c4
11 files changed, 51 insertions, 21 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 29bba84..fbb6773 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,30 @@
+1999-09-02 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * class.c (finish_class): Remove unused parameter, all callers
+ changed.
+
+ * expr.c (build_java_athrow): Change return type to void.
+ (java_lang_expand_expr): Make sure each case in switch returns a
+ value.
+
+ * java-tree.h (finish_class): Fix prototype to take void args.
+
+ * jcf-dump.c (usage): Mark with ATTRIBUTE_NORETURN.
+ (main): Issue return from main, not exit.
+
+ * jcf-parse.c (parse_class_file): Fix call to `finish_class'.
+
+ * jcf.h (jcf_unexpected_eof): Mark with ATTRIBUTE_NORETURN.
+
+ * jv-scan.c (main): Issue return from main, not exit.
+
+ * parse.y (check_abstract_method_definitions,
+ java_check_abstract_method_definitions): Add static prototypes.
+ (java_complete_expand_methods): Fix call to `finish_class'.
+
+ * verify.c (verify_jvm_instructions): Initialize variables `oldpc'
+ and `prevpc'.
+
1999-08-30 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* lang.c (language_string): Constify.
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 5e345e0..2b945e0 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1198,8 +1198,7 @@ make_class_data (type)
}
void
-finish_class (cl)
- tree cl;
+finish_class ()
{
tree method;
tree type_methods = TYPE_METHODS (CLASS_TO_HANDLE_TYPE (current_class));
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 8ce632d..48d5146 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -46,7 +46,7 @@ static void push_value PROTO ((tree));
static tree pop_value PROTO ((tree));
static void java_stack_swap PROTO ((void));
static void java_stack_dup PROTO ((int, int));
-static tree build_java_athrow PROTO ((tree));
+static void build_java_athrow PROTO ((tree));
static void build_java_jsr PROTO ((tree, tree));
static void build_java_ret PROTO ((tree));
static void expand_java_multianewarray PROTO ((tree, int));
@@ -525,7 +525,7 @@ java_stack_dup (size, offset)
/* Calls _Jv_Throw. Discard the contents of the value stack. */
-static tree
+static void
build_java_athrow (node)
tree node;
{
@@ -1982,7 +1982,7 @@ java_lang_expand_expr (exp, target, tmode, modifier)
expand_end_bindings (getdecls (), 1, 0);
return const0_rtx;
}
- break;
+ return const0_rtx;
case CASE_EXPR:
{
@@ -2033,7 +2033,7 @@ java_lang_expand_expr (exp, target, tmode, modifier)
end_catch_handler ();
}
expand_end_all_catch ();
- break;
+ return const0_rtx;
default:
fatal ("Can't expand '%s' tree - java_lang_expand_expr",
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index 0e6e2f9..83b6398 100644
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -586,7 +586,7 @@ extern void parse_error_context PVPROTO ((tree cl, const char *, ...))
ATTRIBUTE_PRINTF_2;
extern tree build_primtype_type_ref PROTO ((const char *));
extern tree java_get_real_method_name PROTO ((tree));
-extern void finish_class PROTO ((tree));
+extern void finish_class PROTO ((void));
extern void java_layout_seen_class_methods PROTO ((void));
extern void check_for_initialization PROTO ((tree));
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 676a751..2f20e30 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -86,7 +86,7 @@ static void disassemble_method PROTO ((JCF*, const unsigned char *, int));
static void print_name PROTO ((FILE*, JCF*, int));
static void print_signature PROTO ((FILE*, JCF*, int, int));
static int utf8_equal_string PROTO ((struct JCF*, int, const char *));
-static int usage PROTO ((void));
+static int usage PROTO ((void)) ATTRIBUTE_NORETURN;
static void process_class PROTO ((struct JCF *));
static void print_constant_pool PROTO ((struct JCF *));
static void print_exception_table PROTO ((struct JCF *,
@@ -760,7 +760,7 @@ DEFUN(main, (argc, argv),
else
{
fprintf (stderr, "%s: illegal argument\n", argv[argi]);
- exit (FATAL_EXIT_CODE);
+ return FATAL_EXIT_CODE;
}
}
@@ -784,7 +784,7 @@ DEFUN(main, (argc, argv),
if (out)
{
fprintf (stderr, "Cannot open '%s' for output.\n", output_file);
- exit (FATAL_EXIT_CODE);
+ return FATAL_EXIT_CODE;
}
}
else
@@ -811,7 +811,7 @@ DEFUN(main, (argc, argv),
if (class_filename == NULL)
{
perror ("Could not find class");
- exit (FATAL_EXIT_CODE);
+ return FATAL_EXIT_CODE;
}
JCF_FILL (jcf, 4);
if (GET_u4 (jcf->read_ptr) == ZIPMAGIC)
@@ -834,7 +834,7 @@ DEFUN(main, (argc, argv),
if (magic != 0x04034b50) /* ZIPMAGIC (little-endian) */
{
fprintf (stderr, "bad format of .zip/.jar archive\n");
- exit (FATAL_EXIT_CODE);
+ return FATAL_EXIT_CODE;
}
JCF_FILL (jcf, 26);
JCF_SKIP (jcf, 2);
@@ -908,7 +908,7 @@ DEFUN(main, (argc, argv),
}
}
- exit (SUCCESS_EXIT_CODE);
+ return SUCCESS_EXIT_CODE;
}
static void
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 78daf2d..0a5f5c3 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -733,7 +733,7 @@ parse_class_file ()
if (flag_emit_class_files)
write_classfile (current_class);
- finish_class (current_class);
+ finish_class ();
debug_end_source_file (save_lineno);
input_filename = save_input_filename;
diff --git a/gcc/java/jcf.h b/gcc/java/jcf.h
index 56b35a5..bcf69b7 100644
--- a/gcc/java/jcf.h
+++ b/gcc/java/jcf.h
@@ -227,7 +227,7 @@ extern const char *find_class PROTO ((const char *, int, JCF*, int));
extern const char *find_classfile PROTO ((char *, JCF*, const char *));
extern int jcf_filbuf_from_stdio PROTO ((JCF *jcf, int count));
extern void jcf_out_of_synch PROTO((JCF *));
-extern int jcf_unexpected_eof PROTO ((JCF*, int));
+extern int jcf_unexpected_eof PROTO ((JCF*, int)) ATTRIBUTE_NORETURN;
/* Extract a character from a Java-style Utf8 string.
* PTR points to the current character.
diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index 36ab396..d24b74c 100644
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -95,7 +95,7 @@ DEFUN (main, (argc, argv),
/* No flags? Do nothing */
if (!flag_find_main && !flag_dump_class)
- exit (0);
+ return 0;
/* Check on bad usage */
if (flag_find_main && flag_dump_class)
@@ -134,7 +134,7 @@ DEFUN (main, (argc, argv),
if (!output_file)
fclose (out);
- exit (0);
+ return 0;
}
/* Error report, memory, obstack initialization and other utility
diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index 5d999a4..1a8ff40 100644
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -338,6 +338,8 @@ static int java_decl_equiv PROTO ((tree, tree));
static int binop_compound_p PROTO ((enum tree_code));
static tree search_loop PROTO ((tree));
static int labeled_block_contains_loop_p PROTO ((tree, tree));
+static void check_abstract_method_definitions PROTO ((int, tree, tree));
+static void java_check_abstract_method_definitions PROTO ((tree));
/* Number of error found so far. */
int java_error_count;
@@ -8651,7 +8653,7 @@ java_complete_expand_methods ()
if (flag_emit_xref)
expand_xref (current_class);
else if (! flag_syntax_only)
- finish_class (current_class);
+ finish_class ();
}
}
}
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 469105e..d952f80 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -262,6 +262,8 @@ static int java_decl_equiv PROTO ((tree, tree));
static int binop_compound_p PROTO ((enum tree_code));
static tree search_loop PROTO ((tree));
static int labeled_block_contains_loop_p PROTO ((tree, tree));
+static void check_abstract_method_definitions PROTO ((int, tree, tree));
+static void java_check_abstract_method_definitions PROTO ((tree));
/* Number of error found so far. */
int java_error_count;
@@ -6064,7 +6066,7 @@ java_complete_expand_methods ()
if (flag_emit_xref)
expand_xref (current_class);
else if (! flag_syntax_only)
- finish_class (current_class);
+ finish_class ();
}
}
}
diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index 77d9671..41eba10 100644
--- a/gcc/java/verify.c
+++ b/gcc/java/verify.c
@@ -354,8 +354,8 @@ verify_jvm_instructions (jcf, byte_ops, length)
int wide = 0;
int op_code;
int PC;
- int oldpc; /* PC of start of instruction. */
- int prevpc; /* If >= 0, PC of previous instruction. */
+ int oldpc = 0; /* PC of start of instruction. */
+ int prevpc = 0; /* If >= 0, PC of previous instruction. */
const char *message;
int i;
register unsigned char *p;