diff options
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/objc-act.c | 52 | ||||
| -rw-r--r-- | gcc/objc/objc-lang.c | 44 |
2 files changed, 44 insertions, 52 deletions
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 814e675..0c9e9fd 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -86,40 +86,6 @@ Boston, MA 02111-1307, USA. */ #define OBJC_FORWARDING_MIN_OFFSET 0 #endif -/* Define the special tree codes that we use. */ - -/* Table indexed by tree code giving a string containing a character - classifying the tree code. */ - -#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, - -static const char objc_tree_code_type[] = { - 'x', -#include "objc-tree.def" -}; -#undef DEFTREECODE - -/* Table indexed by tree code giving number of expression - operands beyond the fixed part of the node structure. - Not used for types or decls. */ - -#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, - -static const int objc_tree_code_length[] = { - 0, -#include "objc-tree.def" -}; -#undef DEFTREECODE - -/* Names of tree components. - Used for printing out the tree and error messages. */ -#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME, - -static const char * const objc_tree_code_name[] = { - "@@dummy", -#include "objc-tree.def" -}; -#undef DEFTREECODE /* Set up for use of obstacks. */ @@ -270,7 +236,6 @@ static void dump_interface PARAMS ((FILE *, tree)); /* Everything else. */ -static void add_objc_tree_codes PARAMS ((void)); static tree define_decl PARAMS ((tree, tree)); static tree lookup_method_in_protocol_list PARAMS ((tree, tree, int)); static tree lookup_protocol_in_reflist PARAMS ((tree, tree)); @@ -511,7 +476,6 @@ objc_init (filename) const char *filename; { filename = c_objc_common_init (filename); - add_objc_tree_codes (); decl_printable_name = objc_printable_name; @@ -8072,22 +8036,6 @@ objc_printable_name (decl, kind) return objc_demangle (IDENTIFIER_POINTER (DECL_NAME (decl))); } -/* Adds the tree codes specific to the ObjC/ObjC++ front end to the - list of all tree codes. */ - -static void -add_objc_tree_codes () -{ - int add = (int) LAST_OBJC_TREE_CODE - (int) LAST_BASE_TREE_CODE; - - memcpy (tree_code_type + (int) LAST_BASE_TREE_CODE, - objc_tree_code_type, add); - memcpy (tree_code_length + (int) LAST_BASE_TREE_CODE, - objc_tree_code_length, add * sizeof (int)); - memcpy (tree_code_name + (int) LAST_BASE_TREE_CODE, - objc_tree_code_name, add * sizeof (char *)); -} - static void init_objc () { diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c index 8f155c2..2577f65 100644 --- a/gcc/objc/objc-lang.c +++ b/gcc/objc/objc-lang.c @@ -66,6 +66,50 @@ static void objc_post_options PARAMS ((void)); /* Each front end provides its own hooks, for toplev.c. */ const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; +/* Define the special tree codes that we use. */ + +/* Table indexed by tree code giving a string containing a character + classifying the tree code. */ + +#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, + +const char tree_code_type[] = { +#include "tree.def" + 'x', +#include "c-common.def" + 'x', +#include "objc-tree.def" +}; +#undef DEFTREECODE + +/* Table indexed by tree code giving number of expression + operands beyond the fixed part of the node structure. + Not used for types or decls. */ + +#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, + +const unsigned char tree_code_length[] = { +#include "tree.def" + 0, +#include "c-common.def" + 0, +#include "objc-tree.def" +}; +#undef DEFTREECODE + +/* Names of tree components. + Used for printing out the tree and error messages. */ +#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME, + +const char * const tree_code_name[] = { +#include "tree.def" + "@@dummy", +#include "c-common.def" + "@@dummy", +#include "objc-tree.def" +}; +#undef DEFTREECODE + static void objc_init_options () { |