diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/lang.c | 22 |
2 files changed, 14 insertions, 16 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 426720770cb..be360b45873 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +2002-03-12 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * lang.c (java_tree_code_type, java_tree_code_length, + tree_code_name): Delete. + (tree_code_type, tree_code_length, tree_code_name): Define. + (java_init): Don't try to copy into the various tree_code + arrays. + 2002-03-12 Tom Tromey <tromey@redhat.com> * jcf-parse.c (get_constant) [CONSTANT_String]: String values are diff --git a/gcc/java/lang.c b/gcc/java/lang.c index a71f5ccc89e..24e0375e275 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -70,7 +70,8 @@ static int process_option_with_no PARAMS ((const char *, #define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, -static const char java_tree_code_type[] = { +const char tree_code_type[] = { +#include "tree.def" 'x', #include "java-tree.def" }; @@ -82,7 +83,8 @@ static const char java_tree_code_type[] = { #define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, -static const int java_tree_code_length[] = { +const unsigned char tree_code_length[] = { +#include "tree.def" 0, #include "java-tree.def" }; @@ -92,7 +94,8 @@ static const int java_tree_code_length[] = { Used for printing out the tree and error messages. */ #define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME, -static const char *const java_tree_code_name[] = { +const char *const tree_code_name[] = { +#include "tree.def" "@@dummy", #include "java-tree.def" }; @@ -505,19 +508,6 @@ java_init (filename) print_error_function = lang_print_error; lang_expand_expr = java_lang_expand_expr; - /* Append to Gcc tree node definition arrays */ - - memcpy (tree_code_type + (int) LAST_AND_UNUSED_TREE_CODE, - java_tree_code_type, - (int)LAST_JAVA_TREE_CODE - (int)LAST_AND_UNUSED_TREE_CODE); - memcpy (tree_code_length + (int) LAST_AND_UNUSED_TREE_CODE, - java_tree_code_length, - (LAST_JAVA_TREE_CODE - - (int)LAST_AND_UNUSED_TREE_CODE) * sizeof (int)); - memcpy (tree_code_name + (int) LAST_AND_UNUSED_TREE_CODE, - java_tree_code_name, - (LAST_JAVA_TREE_CODE - - (int)LAST_AND_UNUSED_TREE_CODE) * sizeof (char *)); java_init_decl_processing (); using_eh_for_cleanups (); |