/* Parser for Java(TM) .class files.
- Copyright (C) 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
-This file is part of GNU CC.
+This file is part of GCC.
-GNU CC is free software; you can redistribute it and/or modify
+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)
any later version.
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
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 GNU CC; 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 COPYING. If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Java and all Java-based marks are trademarks or registered trademarks
of Sun Microsystems, Inc. in the United States and other countries.
#include "config.h"
#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
#include "tree.h"
+#include "real.h"
#include "obstack.h"
#include "flags.h"
#include "java-except.h"
#include "java-tree.h"
#include "toplev.h"
#include "parse.h"
+#include "ggc.h"
+#include "debug.h"
+#include "assert.h"
+#include "tm_p.h"
+#include "cgraph.h"
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#ifdef HAVE_LANGINFO_CODESET
+#include <langinfo.h>
+#endif
/* A CONSTANT_Utf8 element is converted to an IDENTIFIER_NODE at parse time. */
#define JPOOL_UTF(JCF, INDEX) CPOOL_UTF(&(JCF)->cpool, INDEX)
text = (JCF)->read_ptr; \
save = text[LENGTH]; \
text[LENGTH] = 0; \
- (JCF)->cpool.data[INDEX] = (jword) get_identifier (text); \
+ (JCF)->cpool.data[INDEX].t = get_identifier ((const char *) text); \
text[LENGTH] = save; \
JCF_SKIP (JCF, LENGTH); } while (0)
#include "jcf.h"
-extern struct obstack *saveable_obstack;
extern struct obstack temporary_obstack;
-extern struct obstack permanent_obstack;
-/* Set to non-zero value in order to emit class initilization code
- before static field references. */
-extern int always_initialize_class_p;
+static GTY(()) tree parse_roots[3];
-/* The class we are currently processing. */
-tree current_class = NULL_TREE;
+/* The FIELD_DECL for the current field. */
+#define current_field parse_roots[0]
-/* The class we started with. */
-tree main_class = NULL_TREE;
+/* The METHOD_DECL for the current method. */
+#define current_method parse_roots[1]
-/* List of all class DECL seen so far. */
-tree all_class_list = NULL_TREE;
+/* A list of TRANSLATION_UNIT_DECLs for the files to be compiled. */
+#define current_file_list parse_roots[2]
-/* The FIELD_DECL for the current field. */
-static tree current_field = NULL_TREE;
+/* Line 0 in current file, if compiling from bytecode. */
+static location_t file_start_location;
-/* The METHOD_DECL for the current method. */
-static tree current_method = NULL_TREE;
+/* The Java archive that provides main_class; the main input file. */
+static GTY(()) struct JCF * main_jcf;
-/* The Java .class file that provides main_class; the main input file. */
-static struct JCF main_jcf[1];
+static struct ZipFile *localToFile;
/* Declarations of some functions used here. */
-static tree give_name_to_class PARAMS ((JCF *jcf, int index));
-static void parse_zip_file_entries PARAMS ((void));
-static void process_zip_dir PARAMS ((void));
-static void parse_source_file PARAMS ((tree));
-static void jcf_parse_source PARAMS ((void));
-static int jcf_figure_file_type PARAMS ((JCF *));
-static int find_in_current_zip PARAMS ((const char *, struct JCF **));
-static void parse_class_file PARAMS ((void));
-static void set_source_filename PARAMS ((JCF *, int));
-static int predefined_filename_p PARAMS ((tree));
+static void handle_innerclass_attribute (int count, JCF *);
+static tree give_name_to_class (JCF *jcf, int index);
+static char *compute_class_name (struct ZipDirectory *zdir);
+static int classify_zip_file (struct ZipDirectory *zdir);
+static void parse_zip_file_entries (void);
+static void process_zip_dir (FILE *);
+static void parse_source_file_1 (tree, const char *, FILE *);
+static void parse_source_file_2 (void);
+static void parse_source_file_3 (void);
+static void parse_class_file (void);
+static void handle_deprecated (void);
+static void set_source_filename (JCF *, int);
+static void jcf_parse (struct JCF*);
+static void load_inner_classes (tree);
+
+/* Handle "Deprecated" attribute. */
+static void
+handle_deprecated (void)
+{
+ if (current_field != NULL_TREE)
+ FIELD_DEPRECATED (current_field) = 1;
+ else if (current_method != NULL_TREE)
+ METHOD_DEPRECATED (current_method) = 1;
+ else if (current_class != NULL_TREE)
+ CLASS_DEPRECATED (TYPE_NAME (current_class)) = 1;
+ else
+ {
+ /* Shouldn't happen. */
+ gcc_unreachable ();
+ }
+}
/* Handle "SourceFile" attribute. */
static void
-set_source_filename (jcf, index)
- JCF *jcf;
- int index;
+set_source_filename (JCF *jcf, int index)
{
tree sfname_id = get_name_constant (jcf, index);
- char *sfname = IDENTIFIER_POINTER (sfname_id);
- if (input_filename != NULL)
+ const char *sfname = IDENTIFIER_POINTER (sfname_id);
+ const char *old_filename = input_filename;
+ int new_len = IDENTIFIER_LENGTH (sfname_id);
+ if (old_filename != NULL)
{
- int old_len = strlen (input_filename);
- int new_len = IDENTIFIER_LENGTH (sfname_id);
+ int old_len = strlen (old_filename);
/* Use the current input_filename (derived from the class name)
if it has a directory prefix, but otherwise matches sfname. */
if (old_len > new_len
- && strcmp (sfname, input_filename + old_len - new_len) == 0
- && (input_filename[old_len - new_len - 1] == '/'
- || input_filename[old_len - new_len - 1] == '\\'))
- return;
+ && strcmp (sfname, old_filename + old_len - new_len) == 0
+ && (old_filename[old_len - new_len - 1] == '/'
+ || old_filename[old_len - new_len - 1] == '\\'))
+ {
+#ifndef USE_MAPPED_LOCATION
+ DECL_SOURCE_LOCATION (TYPE_NAME (current_class)) = input_location;
+ file_start_location = input_location;
+#endif
+ return;
+ }
}
+ if (strchr (sfname, '/') == NULL && strchr (sfname, '\\') == NULL)
+ {
+ const char *class_name
+ = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (current_class)));
+ char *dot = strrchr (class_name, '.');
+ if (dot != NULL)
+ {
+ /* Length of prefix, not counting final dot. */
+ int i = dot - class_name;
+ /* Concatenate current package prefix with new sfname. */
+ char *buf = XNEWVEC (char, i + new_len + 2); /* Space for '.' and '\0'. */
+ strcpy (buf + i + 1, sfname);
+ /* Copy package from class_name, replacing '.' by DIR_SEPARATOR.
+ Note we start at the end with the final package dot. */
+ for (; i >= 0; i--)
+ {
+ char c = class_name[i];
+ if (c == '.')
+ c = DIR_SEPARATOR;
+ buf[i] = c;
+ }
+ sfname_id = get_identifier (buf);
+ free (buf);
+ sfname = IDENTIFIER_POINTER (sfname_id);
+ }
+ }
+
+#ifdef USE_MAPPED_LOCATION
+ line_table.maps[line_table.used-1].to_file = sfname;
+#else
input_filename = sfname;
- DECL_SOURCE_FILE (TYPE_NAME (current_class)) = sfname;
- if (current_class == main_class) main_input_filename = input_filename;
+ DECL_SOURCE_LOCATION (TYPE_NAME (current_class)) = input_location;
+ file_start_location = input_location;
+#endif
+ if (current_class == main_class) main_input_filename = sfname;
}
#define HANDLE_SOURCEFILE(INDEX) set_source_filename (jcf, INDEX)
#define HANDLE_CLASS_INFO(ACCESS_FLAGS, THIS, SUPER, INTERFACES_COUNT) \
{ tree super_class = SUPER==0 ? NULL_TREE : get_class_constant (jcf, SUPER); \
- current_class = give_name_to_class (jcf, THIS); \
+ output_class = current_class = give_name_to_class (jcf, THIS); \
set_super_info (ACCESS_FLAGS, current_class, super_class, INTERFACES_COUNT);}
#define HANDLE_CLASS_INTERFACE(INDEX) \
{ int sig_index = SIGNATURE; \
current_field = add_field (current_class, get_name_constant (jcf, NAME), \
parse_signature (jcf, sig_index), ACCESS_FLAGS); \
- set_java_signature (TREE_TYPE (current_field), JPOOL_UTF (jcf, sig_index)); }
+ set_java_signature (TREE_TYPE (current_field), JPOOL_UTF (jcf, sig_index)); \
+ if ((ACCESS_FLAGS) & ACC_FINAL) \
+ MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (current_field); \
+}
#define HANDLE_END_FIELDS() \
(current_field = NULL_TREE)
DECL_LINENUMBERS_OFFSET (current_method) = 0)
#define HANDLE_END_METHODS() \
-{ tree handle_type = CLASS_TO_HANDLE_TYPE (current_class); \
- if (handle_type != current_class) layout_type (handle_type); }
+{ current_method = NULL_TREE; }
#define HANDLE_CODE_ATTRIBUTE(MAX_STACK, MAX_LOCALS, CODE_LENGTH) \
{ DECL_MAX_STACK (current_method) = (MAX_STACK); \
DECL_FUNCTION_THROWS (current_method) = nreverse (list); \
}
+#define HANDLE_DEPRECATED_ATTRIBUTE() handle_deprecated ()
+
/* Link seen inner classes to their outer context and register the
inner class to its outer context. They will be later loaded. */
-#define HANDLE_INNERCLASSES_ATTRIBUTE(COUNT) \
-{ \
- int c = (count); \
- while (c--) \
- { \
- tree class = get_class_constant (jcf, JCF_readu2 (jcf)); \
- if (!CLASS_COMPLETE_P (class)) \
- { \
- tree outer = TYPE_NAME (get_class_constant (jcf, \
- JCF_readu2 (jcf))); \
- tree alias = get_name_constant (jcf, JCF_readu2 (jcf)); \
- tree decl = TYPE_NAME (class); \
- JCF_SKIP (jcf, 2); \
- IDENTIFIER_GLOBAL_VALUE (alias) = decl; \
- DECL_CONTEXT (decl) = outer; \
- DECL_INNER_CLASS_LIST (outer) = \
- tree_cons (decl, alias, DECL_INNER_CLASS_LIST (outer)); \
- CLASS_COMPLETE_P (class) = 1; \
- } \
- else \
- JCF_SKIP (jcf, 6); \
- } \
+#define HANDLE_INNERCLASSES_ATTRIBUTE(COUNT) \
+ handle_innerclass_attribute (COUNT, jcf)
+
+#define HANDLE_SYNTHETIC_ATTRIBUTE() \
+{ \
+ /* Irrelevant decls should have been nullified by the END macros. \
+ We only handle the `Synthetic' attribute on method DECLs. \
+ DECL_ARTIFICIAL on fields is used for something else (See \
+ PUSH_FIELD in java-tree.h) */ \
+ if (current_method) \
+ DECL_ARTIFICIAL (current_method) = 1; \
}
-#include "jcf-reader.c"
+#define HANDLE_GCJCOMPILED_ATTRIBUTE() \
+{ \
+ if (current_class == object_type_node) \
+ jcf->right_zip = 1; \
+}
-static int yydebug;
+#include "jcf-reader.c"
tree
-parse_signature (jcf, sig_index)
- JCF *jcf;
- int sig_index;
-{
- if (sig_index <= 0 || sig_index >= JPOOL_SIZE(jcf)
- || JPOOL_TAG (jcf, sig_index) != CONSTANT_Utf8)
- fatal ("invalid field/method signature");
- else
- {
- return parse_signature_string (JPOOL_UTF_DATA (jcf, sig_index),
- JPOOL_UTF_LENGTH (jcf, sig_index));
- }
-}
-
-void
-init_lex ()
+parse_signature (JCF *jcf, int sig_index)
{
- /* Make identifier nodes long enough for the language-specific slots. */
- set_identifier_size (sizeof (struct lang_identifier));
-}
+ gcc_assert (sig_index > 0
+ && sig_index < JPOOL_SIZE (jcf)
+ && JPOOL_TAG (jcf, sig_index) == CONSTANT_Utf8);
-void
-set_yydebug (value)
- int value;
-{
- yydebug = value;
+ return parse_signature_string (JPOOL_UTF_DATA (jcf, sig_index),
+ JPOOL_UTF_LENGTH (jcf, sig_index));
}
tree
-get_constant (jcf, index)
- JCF *jcf;
- int index;
+get_constant (JCF *jcf, int index)
{
tree value;
int tag;
goto bad;
tag = JPOOL_TAG (jcf, index);
if ((tag & CONSTANT_ResolvedFlag) || tag == CONSTANT_Utf8)
- return (tree) jcf->cpool.data[index];
- push_obstacks (&permanent_obstack, &permanent_obstack);
+ return jcf->cpool.data[index].t;
switch (tag)
{
case CONSTANT_Integer:
{
jint num = JPOOL_INT(jcf, index);
- value = build_int_2 (num, num < 0 ? -1 : 0);
- TREE_TYPE (value) = int_type_node;
+ value = build_int_cst (int_type_node, num);
break;
}
case CONSTANT_Long:
{
- jint num = JPOOL_INT (jcf, index);
- HOST_WIDE_INT lo, hi;
+ unsigned HOST_WIDE_INT num = JPOOL_UINT (jcf, index);
+ unsigned HOST_WIDE_INT lo;
+ HOST_WIDE_INT hi;
+
lshift_double (num, 0, 32, 64, &lo, &hi, 0);
- num = JPOOL_INT (jcf, index+1);
- add_double (lo, hi, (uint32)num, 0, &lo, &hi);
- value = build_int_2 (lo, hi);
- TREE_TYPE (value) = long_type_node;
- force_fit_type (value, 0);
+ num = JPOOL_UINT (jcf, index+1);
+ add_double (lo, hi, num, 0, &lo, &hi);
+ value = build_int_cst_wide (long_type_node, lo, hi);
+ value = force_fit_type (value, 0, false, false);
break;
}
-#if TARGET_FLOAT_FORMAT == IEEE_FLOAT_FORMAT
+
case CONSTANT_Float:
{
jint num = JPOOL_INT(jcf, index);
+ long buf = num;
REAL_VALUE_TYPE d;
-#ifdef REAL_ARITHMETIC
- d = REAL_VALUE_FROM_TARGET_SINGLE (num);
-#else
- union { float f; jint i; } u;
- u.i = num;
- d = u.f;
-#endif
+
+ real_from_target_fmt (&d, &buf, &ieee_single_format);
value = build_real (float_type_node, d);
break;
}
+
case CONSTANT_Double:
{
- HOST_WIDE_INT num[2];
+ long buf[2], lo, hi;
REAL_VALUE_TYPE d;
- HOST_WIDE_INT lo, hi;
- num[0] = JPOOL_INT (jcf, index);
- lshift_double (num[0], 0, 32, 64, &lo, &hi, 0);
- num[0] = JPOOL_INT (jcf, index+1);
- add_double (lo, hi, num[0], 0, &lo, &hi);
+
+ hi = JPOOL_UINT (jcf, index);
+ lo = JPOOL_UINT (jcf, index+1);
+
if (FLOAT_WORDS_BIG_ENDIAN)
- {
- num[0] = hi;
- num[1] = lo;
- }
+ buf[0] = hi, buf[1] = lo;
else
- {
- num[0] = lo;
- num[1] = hi;
- }
-#ifdef REAL_ARITHMETIC
- d = REAL_VALUE_FROM_TARGET_DOUBLE (num);
-#else
- {
- union { double d; jint i[2]; } u;
- u.i[0] = (jint) num[0];
- u.i[1] = (jint) num[1];
- d = u.d;
- }
-#endif
+ buf[0] = lo, buf[1] = hi;
+
+ real_from_target_fmt (&d, buf, &ieee_double_format);
value = build_real (double_type_node, d);
break;
}
-#endif /* TARGET_FLOAT_FORMAT == IEEE_FLOAT_FORMAT */
+
case CONSTANT_String:
{
- extern struct obstack *expression_obstack;
tree name = get_name_constant (jcf, JPOOL_USHORT1 (jcf, index));
const char *utf8_ptr = IDENTIFIER_POINTER (name);
- unsigned char *str_ptr;
int utf8_len = IDENTIFIER_LENGTH (name);
- const unsigned char *str = (const unsigned char *)utf8_ptr;
- int i = utf8_len;
- int str_len;
+ const unsigned char *utf8;
+ int i;
- /* Count the number of Unicode characters in the string,
- while checking for a malformed Utf8 string. */
- for (str_len = 0; i > 0; str_len++)
+ /* Check for a malformed Utf8 string. */
+ utf8 = (const unsigned char *) utf8_ptr;
+ i = utf8_len;
+ while (i > 0)
{
- int char_len = UT8_CHAR_LENGTH (*str);
- if (char_len < 0 || char_len > 2 || char_len > i)
- fatal ("bad string constant");
- str += char_len;
+ int char_len = UT8_CHAR_LENGTH (*utf8);
+ if (char_len < 0 || char_len > 3 || char_len > i)
+ fatal_error ("bad string constant");
+
+ utf8 += char_len;
i -= char_len;
}
- value = make_node (STRING_CST);
+ /* Allocate a new string value. */
+ value = build_string (utf8_len, utf8_ptr);
TREE_TYPE (value) = build_pointer_type (string_type_node);
- TREE_STRING_LENGTH (value) = 2 * str_len;
- TREE_STRING_POINTER (value)
- = obstack_alloc (expression_obstack, 2 * str_len);
- str_ptr = (unsigned char *) TREE_STRING_POINTER (value);
- str = (const unsigned char *)utf8_ptr;
- for (i = 0; i < str_len; i++)
- {
- int char_value;
- int char_len = UT8_CHAR_LENGTH (*str);
- switch (char_len)
- {
- case 1:
- char_value = *str++;
- break;
- case 2:
- char_value = *str++ & 0x1F;
- char_value = (char_value << 6) | (*str++ & 0x3F);
- break;
- case 3:
- char_value = *str_ptr++ & 0x0F;
- char_value = (char_value << 6) | (*str++ & 0x3F);
- char_value = (char_value << 6) | (*str++ & 0x3F);
- break;
- default:
- goto bad;
- }
- if (BYTES_BIG_ENDIAN)
- {
- *str_ptr++ = char_value >> 8;
- *str_ptr++ = char_value & 0xFF;
- }
- else
- {
- *str_ptr++ = char_value & 0xFF;
- *str_ptr++ = char_value >> 8;
- }
- }
}
break;
default:
goto bad;
}
- pop_obstacks ();
- JPOOL_TAG(jcf, index) = tag | CONSTANT_ResolvedFlag;
- jcf->cpool.data [index] = (jword) value;
+ JPOOL_TAG (jcf, index) = tag | CONSTANT_ResolvedFlag;
+ jcf->cpool.data[index].t = value;
return value;
bad:
- fatal ("bad value constant type %d, index %d",
- JPOOL_TAG( jcf, index ), index);
+ internal_error ("bad value constant type %d, index %d",
+ JPOOL_TAG (jcf, index), index);
}
tree
-get_name_constant (jcf, index)
- JCF *jcf;
- int index;
+get_name_constant (JCF *jcf, int index)
{
tree name = get_constant (jcf, index);
- if (TREE_CODE (name) != IDENTIFIER_NODE)
- fatal ("bad nameandtype index %d", index);
+ gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);
return name;
}
+/* Handle reading innerclass attributes. If a nonzero entry (denoting
+ a non anonymous entry) is found, We augment the inner class list of
+ the outer context with the newly resolved innerclass. */
+
+static void
+handle_innerclass_attribute (int count, JCF *jcf)
+{
+ int c = (count);
+ while (c--)
+ {
+ /* Read inner_class_info_index. This may be 0 */
+ int icii = JCF_readu2 (jcf);
+ /* Read outer_class_info_index. If the innerclasses attribute
+ entry isn't a member (like an inner class) the value is 0. */
+ int ocii = JCF_readu2 (jcf);
+ /* Read inner_name_index. If the class we're dealing with is
+ an anonymous class, it must be 0. */
+ int ini = JCF_readu2 (jcf);
+ /* Read the access flag. */
+ int acc = JCF_readu2 (jcf);
+ /* If icii is 0, don't try to read the class. */
+ if (icii >= 0)
+ {
+ tree class = get_class_constant (jcf, icii);
+ tree decl = TYPE_NAME (class);
+ /* Skip reading further if ocii is null */
+ if (DECL_P (decl) && !CLASS_COMPLETE_P (decl) && ocii)
+ {
+ tree outer = TYPE_NAME (get_class_constant (jcf, ocii));
+ tree alias = (ini ? get_name_constant (jcf, ini) : NULL_TREE);
+ set_class_decl_access_flags (acc, decl);
+ DECL_CONTEXT (decl) = outer;
+ DECL_INNER_CLASS_LIST (outer) =
+ tree_cons (decl, alias, DECL_INNER_CLASS_LIST (outer));
+ CLASS_COMPLETE_P (decl) = 1;
+ }
+ }
+ }
+}
+
static tree
-give_name_to_class (jcf, i)
- JCF *jcf;
- int i;
+give_name_to_class (JCF *jcf, int i)
{
- if (i <= 0 || i >= JPOOL_SIZE(jcf)
- || JPOOL_TAG (jcf, i) != CONSTANT_Class)
- fatal ("bad class index %d", i);
- else
+ gcc_assert (i > 0
+ && i < JPOOL_SIZE (jcf)
+ && JPOOL_TAG (jcf, i) == CONSTANT_Class);
+
{
+ tree package_name = NULL_TREE, tmp;
tree this_class;
int j = JPOOL_USHORT1 (jcf, i);
/* verify_constant_pool confirmed that j is a CONSTANT_Utf8. */
- tree class_name = unmangle_classname (JPOOL_UTF_DATA (jcf, j),
+ tree class_name = unmangle_classname ((const char *) JPOOL_UTF_DATA (jcf, j),
JPOOL_UTF_LENGTH (jcf, j));
this_class = lookup_class (class_name);
- input_filename = DECL_SOURCE_FILE (TYPE_NAME (this_class));
- lineno = 0;
+#ifdef USE_MAPPED_LOCATION
+ {
+ tree source_name = identifier_subst (class_name, "", '.', '/', ".java");
+ const char *sfname = IDENTIFIER_POINTER (source_name);
+ linemap_add (&line_table, LC_ENTER, false, sfname, 0);
+ input_location = linemap_line_start (&line_table, 0, 1);
+ file_start_location = input_location;
+ DECL_SOURCE_LOCATION (TYPE_NAME (this_class)) = input_location;
+ if (main_input_filename == NULL && jcf == main_jcf)
+ main_input_filename = sfname;
+ }
+#else
+ input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class));
if (main_input_filename == NULL && jcf == main_jcf)
main_input_filename = input_filename;
+#endif
- jcf->cpool.data[i] = (jword) this_class;
+ jcf->cpool.data[i].t = this_class;
JPOOL_TAG (jcf, i) = CONSTANT_ResolvedClass;
+ split_qualified_name (&package_name, &tmp,
+ DECL_NAME (TYPE_NAME (this_class)));
+ TYPE_PACKAGE (this_class) = package_name;
return this_class;
}
}
/* Get the class of the CONSTANT_Class whose constant pool index is I. */
tree
-get_class_constant (JCF *jcf , int i)
+get_class_constant (JCF *jcf, int i)
{
tree type;
- if (i <= 0 || i >= JPOOL_SIZE(jcf)
- || (JPOOL_TAG (jcf, i) & ~CONSTANT_ResolvedFlag) != CONSTANT_Class)
- fatal ("bad class index %d", i);
+ gcc_assert (i > 0
+ && i < JPOOL_SIZE (jcf)
+ && (JPOOL_TAG (jcf, i) & ~CONSTANT_ResolvedFlag) == CONSTANT_Class);
if (JPOOL_TAG (jcf, i) != CONSTANT_ResolvedClass)
{
int name_index = JPOOL_USHORT1 (jcf, i);
/* verify_constant_pool confirmed that name_index is a CONSTANT_Utf8. */
- const char *name = JPOOL_UTF_DATA (jcf, name_index);
+ const char *name = (const char *) JPOOL_UTF_DATA (jcf, name_index);
int nlength = JPOOL_UTF_LENGTH (jcf, name_index);
+
if (name[0] == '[') /* Handle array "classes". */
- type = TREE_TYPE (parse_signature_string (name, nlength));
+ type = TREE_TYPE (parse_signature_string ((const unsigned char *) name, nlength));
else
{
tree cname = unmangle_classname (name, nlength);
type = lookup_class (cname);
}
- jcf->cpool.data[i] = (jword) type;
+ jcf->cpool.data[i].t = type;
JPOOL_TAG (jcf, i) = CONSTANT_ResolvedClass;
}
else
- type = (tree) jcf->cpool.data[i];
+ type = jcf->cpool.data[i].t;
return type;
}
define the class it is supposed to.) */
int
-read_class (name)
- tree name;
+read_class (tree name)
{
JCF this_jcf, *jcf;
+ tree icv, class = NULL_TREE;
tree save_current_class = current_class;
- char *save_input_filename = input_filename;
+ tree save_output_class = output_class;
+ location_t save_location = input_location;
JCF *save_current_jcf = current_jcf;
- long saved_pos = 0;
- if (current_jcf->read_state)
- saved_pos = ftell (current_jcf->read_state);
- push_obstacks (&permanent_obstack, &permanent_obstack);
+ if ((icv = IDENTIFIER_CLASS_VALUE (name)) != NULL_TREE)
+ {
+ class = TREE_TYPE (icv);
+ jcf = TYPE_JCF (class);
+ }
+ else
+ jcf = NULL;
- /* Search in current zip first. */
- if (find_in_current_zip (IDENTIFIER_POINTER (name), &jcf) == 0)
+ if (jcf == NULL)
{
- if (find_class (IDENTIFIER_POINTER (name), IDENTIFIER_LENGTH (name),
- &this_jcf, 1) == 0)
- {
- pop_obstacks (); /* FIXME: one pop_obstack() per function */
- return 0;
- }
+ const char* path_name;
+ this_jcf.zipd = NULL;
+ jcf = &this_jcf;
+
+ path_name = find_class (IDENTIFIER_POINTER (name),
+ IDENTIFIER_LENGTH (name),
+ &this_jcf, 1);
+ if (path_name == 0)
+ return 0;
else
+ free((char *) path_name);
+ }
+
+ current_jcf = jcf;
+
+ if (current_jcf->java_source)
+ {
+ const char *filename = current_jcf->filename;
+ char *real_path;
+ tree given_file, real_file;
+ FILE *finput;
+ int generate;
+
+ java_parser_context_save_global ();
+ java_push_parser_context ();
+
+ given_file = get_identifier (filename);
+ filename = IDENTIFIER_POINTER (given_file);
+ real_path = lrealpath (filename);
+ real_file = get_identifier (real_path);
+ free (real_path);
+
+ generate = IS_A_COMMAND_LINE_FILENAME_P (given_file);
+ output_class = current_class = NULL_TREE;
+ current_function_decl = NULL_TREE;
+
+ if (! HAS_BEEN_ALREADY_PARSED_P (real_file))
{
- this_jcf.seen_in_zip = 0;
- current_jcf = &this_jcf;
+ if (! (finput = fopen (filename, "r")))
+ fatal_error ("can't reopen %s: %m", filename);
+
+ parse_source_file_1 (real_file, filename, finput);
+ parse_source_file_2 ();
+ parse_source_file_3 ();
+
+ if (fclose (finput))
+ fatal_error ("can't close %s: %m", input_filename);
+#ifdef USE_MAPPED_LOCATION
+ linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
+#endif
}
+ JCF_FINISH (current_jcf);
+ java_pop_parser_context (generate);
+ java_parser_context_restore_global ();
}
else
- current_jcf = jcf;
-
- if (current_jcf->java_source)
- jcf_parse_source ();
- else {
- java_parser_context_save_global ();
- java_push_parser_context ();
- input_filename = current_jcf->filename;
- jcf_parse (current_jcf);
- java_pop_parser_context (0);
- java_parser_context_restore_global ();
- }
-
- if (!current_jcf->seen_in_zip)
- JCF_FINISH (current_jcf);
- pop_obstacks ();
+ {
+ if (class == NULL_TREE || ! CLASS_PARSED_P (class))
+ {
+ java_parser_context_save_global ();
+ java_push_parser_context ();
+ output_class = current_class = class;
+ ctxp->save_location = input_location;
+ if (JCF_SEEN_IN_ZIP (current_jcf))
+ read_zip_member(current_jcf,
+ current_jcf->zipd, current_jcf->zipd->zipf);
+ jcf_parse (current_jcf);
+ /* Parsing might change the class, in which case we have to
+ put it back where we found it. */
+ if (current_class != class && icv != NULL_TREE)
+ TREE_TYPE (icv) = current_class;
+ class = current_class;
+ java_pop_parser_context (0);
+ java_parser_context_restore_global ();
+ }
+ layout_class (class);
+ load_inner_classes (class);
+ }
+ output_class = save_output_class;
current_class = save_current_class;
- input_filename = save_input_filename;
+ input_location = save_location;
current_jcf = save_current_jcf;
- if (current_jcf->read_state)
- fseek (current_jcf->read_state, saved_pos, SEEK_SET);
return 1;
}
/* Load CLASS_OR_NAME. CLASS_OR_NAME can be a mere identifier if
called from the parser, otherwise it's a RECORD_TYPE node. If
VERBOSE is 1, print error message on failure to load a class. */
-
-/* Replace calls to load_class by having callers call read_class directly
- - and then perhaps rename read_class to load_class. FIXME */
-
void
-load_class (class_or_name, verbose)
- tree class_or_name;
- int verbose;
+load_class (tree class_or_name, int verbose)
{
- tree name;
+ tree name, saved;
+ int class_loaded = 0;
+ tree class_decl = NULL_TREE;
+ bool is_compiled_class = false;
+
+ /* We've already failed, don't try again. */
+ if (TREE_CODE (class_or_name) == RECORD_TYPE
+ && TYPE_DUMMY (class_or_name))
+ return;
/* class_or_name can be the name of the class we want to load */
if (TREE_CODE (class_or_name) == IDENTIFIER_NODE)
else
name = DECL_NAME (TYPE_NAME (class_or_name));
- if (read_class (name) == 0 && verbose)
- fatal ("Cannot find file for class %s.", IDENTIFIER_POINTER (name));
-}
+ class_decl = IDENTIFIER_CLASS_VALUE (name);
+ if (class_decl != NULL_TREE)
+ {
+ tree type = TREE_TYPE (class_decl);
+ is_compiled_class
+ = ((TYPE_JCF (type) && JCF_SEEN_IN_ZIP (TYPE_JCF (type)))
+ || CLASS_FROM_CURRENTLY_COMPILED_P (type));
+ }
-/* Parse a source file when JCF refers to a source file. */
+ /* If the class is from source code, then it must already be loaded. */
+ class_decl = IDENTIFIER_CLASS_VALUE (name);
+ if (class_decl && CLASS_FROM_SOURCE_P (TREE_TYPE (class_decl)))
+ return;
-static void
-jcf_parse_source ()
-{
- tree file;
+ saved = name;
+
+ /* If flag_verify_invocations is unset, we don't try to load a class
+ unless we're looking for Object (which is fixed by the ABI) or
+ it's a class that we're going to compile. */
+ if (flag_verify_invocations
+ || class_or_name == object_type_node
+ || is_compiled_class
+ || TREE_CODE (class_or_name) == IDENTIFIER_NODE)
+ {
+ while (1)
+ {
+ char *separator;
- java_parser_context_save_global ();
- java_push_parser_context ();
- input_filename = current_jcf->filename;
- file = get_identifier (input_filename);
- if (!HAS_BEEN_ALREADY_PARSED_P (file))
+ /* We've already loaded it. */
+ if (IDENTIFIER_CLASS_VALUE (name) != NULL_TREE)
+ {
+ tree tmp_decl = IDENTIFIER_CLASS_VALUE (name);
+ if (CLASS_PARSED_P (TREE_TYPE (tmp_decl)))
+ break;
+ }
+
+ if (read_class (name))
+ break;
+
+ /* We failed loading name. Now consider that we might be looking
+ for an inner class. */
+ if ((separator = strrchr (IDENTIFIER_POINTER (name), '$'))
+ || (separator = strrchr (IDENTIFIER_POINTER (name), '.')))
+ {
+ int c = *separator;
+ *separator = '\0';
+ name = get_identifier (IDENTIFIER_POINTER (name));
+ *separator = c;
+ }
+ /* Otherwise, we failed, we bail. */
+ else
+ break;
+ }
+
+ {
+ /* have we found the class we're looking for? */
+ tree type_decl = IDENTIFIER_CLASS_VALUE (saved);
+ tree type = type_decl ? TREE_TYPE (type_decl) : NULL;
+ class_loaded = type && CLASS_PARSED_P (type);
+ }
+ }
+
+ if (!class_loaded)
{
- if (!(finput = fopen (input_filename, "r")))
- fatal ("input file `%s' just disappeared - jcf_parse_source",
- input_filename);
- parse_source_file (file);
- if (fclose (finput))
- fatal ("can't close input file `%s' stream - jcf_parse_source",
- input_filename);
+ if (flag_verify_invocations || ! flag_indirect_dispatch
+ || flag_emit_class_files)
+ {
+ if (verbose)
+ error ("cannot find file for class %s", IDENTIFIER_POINTER (saved));
+ }
+ else if (verbose)
+ {
+ /* This is just a diagnostic during testing, not a real problem. */
+ if (!quiet_flag)
+ warning (0, "cannot find file for class %s",
+ IDENTIFIER_POINTER (saved));
+
+ /* Fake it. */
+ if (TREE_CODE (class_or_name) == RECORD_TYPE)
+ {
+ set_super_info (0, class_or_name, object_type_node, 0);
+ TYPE_DUMMY (class_or_name) = 1;
+ /* We won't be able to output any debug info for this class. */
+ DECL_IGNORED_P (TYPE_NAME (class_or_name)) = 1;
+ }
+ }
}
- java_pop_parser_context (IS_A_COMMAND_LINE_FILENAME_P (file));
- java_parser_context_restore_global ();
}
/* Parse the .class file JCF. */
-void
-jcf_parse (jcf)
- JCF* jcf;
+static void
+jcf_parse (JCF* jcf)
{
int i, code;
- tree current;
if (jcf_parse_preamble (jcf) != 0)
- fatal ("Not a valid Java .class file.\n");
+ fatal_error ("not a valid Java .class file");
code = jcf_parse_constant_pool (jcf);
if (code != 0)
- fatal ("error while parsing constant pool");
+ fatal_error ("error while parsing constant pool");
code = verify_constant_pool (jcf);
if (code > 0)
- fatal ("error in constant pool entry #%d\n", code);
+ fatal_error ("error in constant pool entry #%d\n", code);
jcf_parse_class (jcf);
if (main_class == NULL_TREE)
fprintf (stderr, " %s %s",
(jcf->access_flags & ACC_INTERFACE) ? "interface" : "class",
IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (current_class))));
- if (CLASS_LOADED_P (current_class))
- return;
- CLASS_LOADED_P (current_class) = 1;
+ if (CLASS_PARSED_P (current_class))
+ {
+ /* FIXME - where was first time */
+ fatal_error ("reading class %s for the second time from %s",
+ IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (current_class))),
+ jcf->filename);
+ }
+ CLASS_PARSED_P (current_class) = 1;
for (i = 1; i < JPOOL_SIZE(jcf); i++)
{
code = jcf_parse_fields (jcf);
if (code != 0)
- fatal ("error while parsing fields");
+ fatal_error ("error while parsing fields");
code = jcf_parse_methods (jcf);
if (code != 0)
- fatal ("error while parsing methods");
+ fatal_error ("error while parsing methods");
code = jcf_parse_final_attributes (jcf);
if (code != 0)
- fatal ("error while parsing final attributes");
+ fatal_error ("error while parsing final attributes");
+#ifdef USE_MAPPED_LOCATION
+ linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
+#endif
/* The fields of class_type_node are already in correct order. */
if (current_class != class_type_node && current_class != object_type_node)
TYPE_FIELDS (current_class) = nreverse (TYPE_FIELDS (current_class));
- push_obstacks (&permanent_obstack, &permanent_obstack);
- layout_class (current_class);
if (current_class == object_type_node)
- layout_class_methods (object_type_node);
+ {
+ layout_class_methods (object_type_node);
+ /* If we don't have the right archive, emit a verbose warning.
+ If we're generating bytecode, emit the warning only if
+ -fforce-classes-archive-check was specified. */
+ if (!jcf->right_zip
+ && (!flag_emit_class_files || flag_force_classes_archive_check))
+ fatal_error ("the %<java.lang.Object%> that was found in %qs didn't have the special zero-length %<gnu.gcj.gcj-compiled%> attribute. This generally means that your classpath is incorrectly set. Use %<info gcj \"Input Options\"%> to see the info page describing how to set the classpath", jcf->filename);
+ }
else
- all_class_list = tree_cons (NULL_TREE,
+ all_class_list = tree_cons (NULL_TREE,
TYPE_NAME (current_class), all_class_list );
+}
- /* And if we came accross inner classes, load them now. */
- for (current = DECL_INNER_CLASS_LIST (TYPE_NAME (current_class)); current;
+/* If we came across inner classes, load them now. */
+static void
+load_inner_classes (tree cur_class)
+{
+ tree current;
+ for (current = DECL_INNER_CLASS_LIST (TYPE_NAME (cur_class)); current;
current = TREE_CHAIN (current))
- load_class (DECL_NAME (TREE_PURPOSE (current)), 1);
-
- pop_obstacks ();
+ {
+ tree name = DECL_NAME (TREE_PURPOSE (current));
+ tree decl = IDENTIFIER_GLOBAL_VALUE (name);
+ if (decl && ! CLASS_LOADED_P (TREE_TYPE (decl))
+ && !CLASS_BEING_LAIDOUT (TREE_TYPE (decl)))
+ load_class (name, 1);
+ }
}
-void
-init_outgoing_cpool ()
+static void
+duplicate_class_warning (const char *filename)
{
- current_constant_pool_data_ref = NULL_TREE;
- outgoing_cpool = (struct CPool *)xmalloc (sizeof (struct CPool));
- bzero (outgoing_cpool, sizeof (struct CPool));
+ location_t warn_loc;
+#ifdef USE_MAPPED_LOCATION
+ linemap_add (&line_table, LC_RENAME, 0, filename, 0);
+ warn_loc = linemap_line_start (&line_table, 0, 1);
+#else
+ warn_loc.file = filename;
+ warn_loc.line = 0;
+#endif
+ warning (0, "%Hduplicate class will only be compiled once", &warn_loc);
}
static void
-parse_class_file ()
+parse_class_file (void)
{
tree method;
- char *save_input_filename = input_filename;
- int save_lineno = lineno;
+ location_t save_location = input_location;
java_layout_seen_class_methods ();
- input_filename = DECL_SOURCE_FILE (TYPE_NAME (current_class));
- lineno = 0;
- debug_start_source_file (input_filename);
- init_outgoing_cpool ();
+ input_location = DECL_SOURCE_LOCATION (TYPE_NAME (current_class));
+ file_start_location = input_location;
+ (*debug_hooks->start_source_file) (input_line, input_filename);
+
+ gen_indirect_dispatch_tables (current_class);
- /* Currently we always have to emit calls to _Jv_InitClass when
- compiling from class files. */
- always_initialize_class_p = 1;
+ java_mark_class_local (current_class);
- for ( method = TYPE_METHODS (CLASS_TO_HANDLE_TYPE (current_class));
- method != NULL_TREE; method = TREE_CHAIN (method))
+ for (method = TYPE_METHODS (current_class);
+ method != NULL_TREE; method = TREE_CHAIN (method))
{
JCF *jcf = current_jcf;
- if (METHOD_NATIVE (method) || METHOD_ABSTRACT (method))
+ if (METHOD_ABSTRACT (method) || METHOD_DUMMY (method))
continue;
+ if (METHOD_NATIVE (method))
+ {
+ tree arg;
+ int decl_max_locals;
+
+ if (! flag_jni)
+ continue;
+ /* We need to compute the DECL_MAX_LOCALS. We need to take
+ the wide types into account too. */
+ for (arg = TYPE_ARG_TYPES (TREE_TYPE (method)), decl_max_locals = 0;
+ arg != end_params_node;
+ arg = TREE_CHAIN (arg), decl_max_locals += 1)
+ {
+ if (TREE_VALUE (arg) && TYPE_IS_WIDE (TREE_VALUE (arg)))
+ decl_max_locals += 1;
+ }
+ DECL_MAX_LOCALS (method) = decl_max_locals;
+ start_java_method (method);
+ give_name_to_locals (jcf);
+ *get_stmts () = build_jni_stub (method);
+ end_java_method ();
+ continue;
+ }
+
if (DECL_CODE_OFFSET (method) == 0)
{
+ current_function_decl = method;
error ("missing Code attribute");
continue;
}
- lineno = 0;
+ input_location = DECL_SOURCE_LOCATION (TYPE_NAME (current_class));
if (DECL_LINENUMBERS_OFFSET (method))
{
- register int i;
- register unsigned char *ptr;
+ int i;
+ int min_line = 0;
+ unsigned char *ptr;
JCF_SEEK (jcf, DECL_LINENUMBERS_OFFSET (method));
linenumber_count = i = JCF_readu2 (jcf);
linenumber_table = ptr = jcf->read_ptr;
for (ptr += 2; --i >= 0; ptr += 4)
{
int line = GET_u2 (ptr);
- /* Set initial lineno lineno to smallest linenumber.
+ /* Set initial input_line to smallest linenumber.
* Needs to be set before init_function_start. */
- if (lineno == 0 || line < lineno)
- lineno = line;
- }
+ if (min_line == 0 || line < min_line)
+ min_line = line;
+ }
+#ifdef USE_MAPPED_LOCATION
+ if (min_line != 0)
+ input_location = linemap_line_start (&line_table, min_line, 1);
+#else
+ if (min_line != 0)
+ input_line = min_line;
+#endif
}
else
{
start_java_method (method);
+ note_instructions (jcf, method);
+
give_name_to_locals (jcf);
- /* Actually generate code. */
+ /* Bump up start_label_pc_this_method so we get a unique label number
+ and reset highest_label_pc_this_method. */
+ if (highest_label_pc_this_method >= 0)
+ {
+ /* We adjust to the next multiple of 1000. This is just a frill
+ so the last 3 digits of the label number match the bytecode
+ offset, which might make debugging marginally more convenient. */
+ start_label_pc_this_method
+ = ((((start_label_pc_this_method + highest_label_pc_this_method)
+ / 1000)
+ + 1)
+ * 1000);
+ highest_label_pc_this_method = -1;
+ }
+
+ /* Convert bytecode to trees. */
expand_byte_code (jcf, method);
end_java_method ();
finish_class ();
- debug_end_source_file (save_lineno);
- input_filename = save_input_filename;
- lineno = save_lineno;
+ (*debug_hooks->end_source_file) (LOCATION_LINE (save_location));
+ input_location = save_location;
}
/* Parse a source file, as pointed by the current value of INPUT_FILENAME. */
static void
-parse_source_file (file)
- tree file;
+parse_source_file_1 (tree real_file, const char *filename, FILE *finput)
{
int save_error_count = java_error_count;
- /* Mark the file as parsed */
- HAS_BEEN_ALREADY_PARSED_P (file) = 1;
- jcf_dependency_add_file (input_filename, 0);
+ /* Mark the file as parsed. */
+ HAS_BEEN_ALREADY_PARSED_P (real_file) = 1;
lang_init_source (1); /* Error msgs have no method prototypes */
- java_init_lex (); /* Initialize the parser */
+ /* There's no point in trying to find the current encoding unless we
+ are going to do something intelligent with it -- hence the test
+ for iconv. */
+#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_LANGINFO_CODESET)
+ setlocale (LC_CTYPE, "");
+ if (current_encoding == NULL)
+ current_encoding = nl_langinfo (CODESET);
+#endif
+ if (current_encoding == NULL || *current_encoding == '\0')
+ current_encoding = DEFAULT_ENCODING;
+
+#ifdef USE_MAPPED_LOCATION
+ linemap_add (&line_table, LC_ENTER, false, filename, 0);
+ input_location = linemap_line_start (&line_table, 0, 125);
+#else
+ input_filename = filename;
+ input_line = 0;
+#endif
+ ctxp->file_start_location = input_location;
+ ctxp->filename = filename;
+
+ jcf_dependency_add_file (input_filename, 0);
+
+ /* Initialize the parser */
+ java_init_lex (finput, current_encoding);
java_parse_abort_on_error ();
java_parse (); /* Parse and build partial tree nodes. */
java_parse_abort_on_error ();
+}
+
+/* Process a parsed source file, resolving names etc. */
+
+static void
+parse_source_file_2 (void)
+{
+ int save_error_count = java_error_count;
+ flag_verify_invocations = true;
java_complete_class (); /* Parse unsatisfied class decl. */
java_parse_abort_on_error ();
+}
+
+static void
+parse_source_file_3 (void)
+{
+ int save_error_count = java_error_count;
java_check_circular_reference (); /* Check on circular references */
java_parse_abort_on_error ();
java_fix_constructors (); /* Fix the constructors */
java_reorder_fields (); /* Reorder the fields */
}
-static int
-predefined_filename_p (node)
- tree node;
+void
+add_predefined_file (tree name)
{
- int i;
- for (i = 0; i < predef_filenames_size; i++)
- if (predef_filenames [i] == node)
- return 1;
- return 0;
+ predef_filenames = tree_cons (NULL_TREE, name, predef_filenames);
}
int
-yyparse ()
+predefined_filename_p (tree node)
{
- int several_files = 0;
- char *list = xstrdup (input_filename), *next;
- tree node, current_file_list = NULL_TREE;
+ tree iter;
- do
+ for (iter = predef_filenames; iter != NULL_TREE; iter = TREE_CHAIN (iter))
{
- next = strchr (list, '&');
- if (next)
- {
- *next++ = '\0';
- several_files = 1;
- }
+ if (TREE_VALUE (iter) == node)
+ return 1;
+ }
+ return 0;
+}
- if (list[0])
- {
- char *value;
- tree id;
- int twice = 0;
+/* Generate a function that does all static initialization for this
+ translation unit. */
- int len = strlen (list);
+static void
+java_emit_static_constructor (void)
+{
+ tree body = NULL;
- if (*list != '/' && several_files)
- obstack_grow (&temporary_obstack, "./", 2);
+ emit_register_classes (&body);
+ write_resource_constructor (&body);
- obstack_grow0 (&temporary_obstack, list, len);
- value = obstack_finish (&temporary_obstack);
+ if (body)
+ cgraph_build_static_cdtor ('I', body, DEFAULT_INIT_PRIORITY);
+}
- /* Exclude file that we see twice on the command line. For
- all files except {Class,Error,Object,RuntimeException,String,
- Throwable}.java we can rely on maybe_get_identifier. For
- these files, we need to do a linear search of
- current_file_list. This search happens only for these
- files, presumably only when we're recompiling libgcj. */
-
- if ((id = maybe_get_identifier (value)))
+void
+java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
+{
+ int filename_count = 0;
+ location_t save_location = input_location;
+ char *file_list = NULL, *list, *next;
+ tree node;
+ FILE *finput = NULL;
+ int in_quotes = 0;
+
+ if (flag_filelist_file)
+ {
+ int avail = 2000;
+ finput = fopen (main_input_filename, "r");
+ if (finput == NULL)
+ fatal_error ("can't open %s: %m", input_filename);
+ list = XNEWVEC (char, avail);
+ next = list;
+ for (;;)
+ {
+ int count;
+ if (avail < 500)
{
- if (predefined_filename_p (id))
+ count = next - list;
+ avail = 2 * (count + avail);
+ list = xrealloc (list, avail);
+ next = list + count;
+ avail = avail - count;
+ }
+ /* Subtract to to guarantee space for final '\0'. */
+ count = fread (next, 1, avail - 1, finput);
+ if (count == 0)
+ {
+ if (! feof (finput))
+ fatal_error ("error closing %s: %m", input_filename);
+ *next = '\0';
+ break;
+ }
+ avail -= count;
+ next += count;
+ }
+ fclose (finput);
+ finput = NULL;
+ file_list = list;
+ }
+ else
+ list = (char *) main_input_filename;
+
+ while (list)
+ {
+ for (next = list; ; )
+ {
+ char ch = *next;
+ if (flag_filelist_file && ! in_quotes
+ && (ch == '\n' || ch == '\r' || ch == '\t' || ch == ' '
+ || ch == '&') /* FIXME */)
+ {
+ if (next == list)
{
- tree c;
- for (c = current_file_list; c; c = TREE_CHAIN (c))
- if (TREE_VALUE (c) == id)
- twice = 1;
+ next++;
+ list = next;
+ continue;
}
else
- twice = 1;
+ {
+ *next++ = '\0';
+ break;
+ }
}
-
- if (twice)
+ if (flag_filelist_file && ch == '"')
+ {
+ in_quotes = ! in_quotes;
+ *next++ = '\0';
+ if (in_quotes)
+ list = next;
+ else
+ break;
+ }
+ if (ch == '\0')
{
- char *saved_input_filename = input_filename;
- input_filename = value;
- warning ("source file seen twice on command line and will be compiled only once.");
- input_filename = saved_input_filename;
+ next = NULL;
+ break;
}
+ next++;
+ }
+
+ if (list[0])
+ {
+ node = get_identifier (list);
+
+ filename_count++;
+
+ /* Exclude file that we see twice on the command line. */
+
+ if (IS_A_COMMAND_LINE_FILENAME_P (node))
+ duplicate_class_warning (IDENTIFIER_POINTER (node));
else
{
- node = get_identifier (value);
+ tree file_decl = build_decl (TRANSLATION_UNIT_DECL, node, NULL);
+ TREE_CHAIN (file_decl) = current_file_list;
+ current_file_list = file_decl;
IS_A_COMMAND_LINE_FILENAME_P (node) = 1;
- current_file_list = tree_cons (NULL_TREE, node,
- current_file_list);
}
}
list = next;
}
- while (next);
+
+ if (file_list != NULL)
+ free (file_list);
+
+ if (filename_count == 0)
+ warning (0, "no input file specified");
+
+ if (resource_name)
+ {
+ const char *resource_filename;
+
+ /* Only one resource file may be compiled at a time. */
+ assert (TREE_CHAIN (current_file_list) == NULL);
+
+ resource_filename = IDENTIFIER_POINTER (DECL_NAME (current_file_list));
+ compile_resource_file (resource_name, resource_filename);
+
+ goto finish;
+ }
current_jcf = main_jcf;
current_file_list = nreverse (current_file_list);
for (node = current_file_list; node; node = TREE_CHAIN (node))
{
- tree name = TREE_VALUE (node);
+ unsigned char magic_string[4];
+ char *real_path;
+ uint32 magic = 0;
+ tree name = DECL_NAME (node);
+ tree real_file;
+ const char *filename = IDENTIFIER_POINTER (name);
/* Skip already parsed files */
- if (HAS_BEEN_ALREADY_PARSED_P (name))
+ real_path = lrealpath (filename);
+ real_file = get_identifier (real_path);
+ free (real_path);
+ if (HAS_BEEN_ALREADY_PARSED_P (real_file))
continue;
-
+
/* Close previous descriptor, if any */
- if (main_jcf->read_state && fclose (main_jcf->read_state))
- fatal ("failed to close input file `%s' - yyparse",
- (main_jcf->filename ? main_jcf->filename : "<unknown>"));
+ if (finput && fclose (finput))
+ fatal_error ("can't close input file %s: %m", main_input_filename);
- /* Set jcf up and open a new file */
- JCF_ZERO (main_jcf);
- main_jcf->read_state = fopen (IDENTIFIER_POINTER (name), "rb");
- if (main_jcf->read_state == NULL)
- pfatal_with_name (IDENTIFIER_POINTER (name));
-
- /* Set new input_filename and finput */
- finput = main_jcf->read_state;
+ finput = fopen (filename, "rb");
+ if (finput == NULL)
+ fatal_error ("can't open %s: %m", filename);
+
#ifdef IO_BUFFER_SIZE
- setvbuf (finput, (char *) xmalloc (IO_BUFFER_SIZE),
+ setvbuf (finput, xmalloc (IO_BUFFER_SIZE),
_IOFBF, IO_BUFFER_SIZE);
#endif
- input_filename = IDENTIFIER_POINTER (name);
- main_jcf->filbuf = jcf_filbuf_from_stdio;
- switch (jcf_figure_file_type (current_jcf))
+ /* Figure what kind of file we're dealing with */
+ if (fread (magic_string, 1, 4, finput) == 4)
{
- case JCF_ZIP:
- parse_zip_file_entries ();
- break;
- case JCF_CLASS:
+ fseek (finput, 0L, SEEK_SET);
+ magic = GET_u4 (magic_string);
+ }
+ if (magic == 0xcafebabe)
+ {
+ CLASS_FILE_P (node) = 1;
+ current_jcf = ggc_alloc (sizeof (JCF));
+ JCF_ZERO (current_jcf);
+ current_jcf->read_state = finput;
+ current_jcf->filbuf = jcf_filbuf_from_stdio;
jcf_parse (current_jcf);
- parse_class_file ();
- break;
- case JCF_SOURCE:
+ DECL_SOURCE_LOCATION (node) = file_start_location;
+ TYPE_JCF (current_class) = current_jcf;
+ if (CLASS_FROM_CURRENTLY_COMPILED_P (current_class))
+ {
+ /* We've already compiled this class. */
+ duplicate_class_warning (filename);
+ continue;
+ }
+ CLASS_FROM_CURRENTLY_COMPILED_P (current_class) = 1;
+ TREE_TYPE (node) = current_class;
+ }
+ else if (magic == (JCF_u4)ZIPMAGIC)
+ {
+ main_jcf = ggc_alloc (sizeof (JCF));
+ JCF_ZERO (main_jcf);
+ main_jcf->read_state = finput;
+ main_jcf->filbuf = jcf_filbuf_from_stdio;
+#ifdef USE_MAPPED_LOCATION
+ linemap_add (&line_table, LC_ENTER, false, filename, 0);
+ input_location = linemap_line_start (&line_table, 0, 1);
+#endif
+ if (open_in_zip (main_jcf, filename, NULL, 0) < 0)
+ fatal_error ("bad zip/jar file %s", filename);
+ localToFile = SeenZipFiles;
+ /* Register all the classes defined there. */
+ process_zip_dir (main_jcf->read_state);
+#ifdef USE_MAPPED_LOCATION
+ linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
+#endif
+ parse_zip_file_entries ();
+ }
+ else
+ {
java_push_parser_context ();
java_parser_context_save_global ();
- parse_source_file (name);
+
+ parse_source_file_1 (real_file, filename, finput);
java_parser_context_restore_global ();
java_pop_parser_context (1);
- break;
+#ifdef USE_MAPPED_LOCATION
+ linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
+#endif
+ }
+ }
+
+ for (ctxp = ctxp_for_generation; ctxp; ctxp = ctxp->next)
+ {
+ input_location = ctxp->file_start_location;
+ parse_source_file_2 ();
+ }
+
+ for (ctxp = ctxp_for_generation; ctxp; ctxp = ctxp->next)
+ {
+ input_location = ctxp->file_start_location;
+ parse_source_file_3 ();
+ }
+
+ for (node = current_file_list; node; node = TREE_CHAIN (node))
+ {
+ input_location = DECL_SOURCE_LOCATION (node);
+ if (CLASS_FILE_P (node))
+ {
+ /* FIXME: These two flags really should be independent. We
+ should be able to compile fully binary compatible, but
+ with flag_verify_invocations on. */
+ flag_verify_invocations = ! flag_indirect_dispatch;
+ output_class = current_class = TREE_TYPE (node);
+
+ current_jcf = TYPE_JCF (current_class);
+ layout_class (current_class);
+ load_inner_classes (current_class);
+ parse_class_file ();
+ JCF_FINISH (current_jcf);
}
}
+ input_location = save_location;
java_expand_classes ();
- if (!java_report_errors () && !flag_syntax_only)
- emit_register_classes ();
- return 0;
+ if (java_report_errors () || flag_syntax_only)
+ return;
+
+ /* Expand all classes compiled from source. */
+ java_finish_classes ();
+
+ finish:
+ /* Arrange for any necessary initialization to happen. */
+ java_emit_static_constructor ();
+
+ /* Only finalize the compilation unit after we've told cgraph which
+ functions have their addresses stored. */
+ cgraph_finalize_compilation_unit ();
+ cgraph_optimize ();
+}
+
+
+/* Return the name of the class corresponding to the name of the file
+ in this zip entry. The result is newly allocated using ALLOC. */
+static char *
+compute_class_name (struct ZipDirectory *zdir)
+{
+ char *class_name_in_zip_dir = ZIPDIR_FILENAME (zdir);
+ char *class_name;
+ int i;
+ int filename_length = zdir->filename_length;
+
+ while (filename_length > 2 && strncmp (class_name_in_zip_dir, "./", 2) == 0)
+ {
+ class_name_in_zip_dir += 2;
+ filename_length -= 2;
+ }
+
+ filename_length -= strlen (".class");
+ class_name = XNEWVEC (char, filename_length + 1);
+ memcpy (class_name, class_name_in_zip_dir, filename_length);
+ class_name [filename_length] = '\0';
+
+ for (i = 0; i < filename_length; i++)
+ if (class_name[i] == '/')
+ class_name[i] = '.';
+
+ return class_name;
}
-static struct ZipFileCache *localToFile;
+/* Return 0 if we should skip this entry, 1 if it is a .class file, 2
+ if it is a property file of some sort. */
+static int
+classify_zip_file (struct ZipDirectory *zdir)
+{
+ char *class_name_in_zip_dir = ZIPDIR_FILENAME (zdir);
+
+ if (zdir->filename_length > 6
+ && !strncmp (&class_name_in_zip_dir[zdir->filename_length - 6],
+ ".class", 6))
+ return 1;
+
+ /* For now we drop the manifest, but not other information. */
+ if (zdir->filename_length == 20
+ && !strncmp (class_name_in_zip_dir, "META-INF/MANIFEST.MF", 20))
+ return 0;
+
+ /* Drop directory entries. */
+ if (zdir->filename_length > 0
+ && class_name_in_zip_dir[zdir->filename_length - 1] == '/')
+ return 0;
+
+ return 2;
+}
/* Process all class entries found in the zip file. */
static void
struct ZipDirectory *zdir;
int i;
- for (i = 0, zdir = (ZipDirectory *)localToFile->z.central_directory;
- i < localToFile->z.count; i++, zdir = ZIPDIR_NEXT (zdir))
+ for (i = 0, zdir = (ZipDirectory *)localToFile->central_directory;
+ i < localToFile->count; i++, zdir = ZIPDIR_NEXT (zdir))
{
tree class;
-
- /* We don't need to consider those files. */
- if (!zdir->size || !zdir->filename_offset)
- continue;
-
- class = lookup_class (get_identifier (ZIPDIR_FILENAME (zdir)));
- current_jcf = TYPE_JCF (class);
- current_class = class;
- if ( !CLASS_LOADED_P (class))
+ switch (classify_zip_file (zdir))
{
- fseek (current_jcf->read_state, current_jcf->zip_offset, SEEK_SET);
- jcf_parse (current_jcf);
- }
+ case 0:
+ continue;
- if (TYPE_SIZE (current_class) != error_mark_node)
- {
- input_filename = current_jcf->filename;
- parse_class_file ();
- FREE (current_jcf->buffer); /* No longer necessary */
- /* Note: there is a way to free this buffer right after a
- class seen in a zip file has been parsed. The idea is the
- set its jcf in such a way that buffer will be reallocated
- the time the code for the class will be generated. FIXME. */
+ case 1:
+ {
+ char *class_name = compute_class_name (zdir);
+ class = lookup_class (get_identifier (class_name));
+ FREE (class_name);
+ current_jcf = TYPE_JCF (class);
+ output_class = current_class = class;
+
+ if (CLASS_FROM_CURRENTLY_COMPILED_P (current_class))
+ {
+ /* We've already compiled this class. */
+ duplicate_class_warning (current_jcf->filename);
+ break;
+ }
+
+ CLASS_FROM_CURRENTLY_COMPILED_P (current_class) = 1;
+
+ /* This is a dummy class, and now we're compiling it for
+ real. */
+ gcc_assert (! TYPE_DUMMY (class));
+
+ /* This is for a corner case where we have a superclass
+ but no superclass fields.
+
+ This can happen if we earlier failed to lay out this
+ class because its superclass was still in the process
+ of being laid out; this occurs when we have recursive
+ class dependencies via inner classes. Setting
+ TYPE_SIZE to null here causes CLASS_LOADED_P to return
+ false, so layout_class() will be called again. */
+ if (TYPE_SIZE (class) && CLASSTYPE_SUPER (class)
+ && integer_zerop (TYPE_SIZE (class)))
+ TYPE_SIZE (class) = NULL_TREE;
+
+ if (! CLASS_LOADED_P (class))
+ {
+ if (! CLASS_PARSED_P (class))
+ {
+ read_zip_member (current_jcf, zdir, localToFile);
+ jcf_parse (current_jcf);
+ }
+ layout_class (current_class);
+ load_inner_classes (current_class);
+ }
+
+ if (TYPE_SIZE (current_class) != error_mark_node)
+ {
+ parse_class_file ();
+ free (current_jcf->buffer); /* No longer necessary */
+ /* Note: there is a way to free this buffer right after a
+ class seen in a zip file has been parsed. The idea is the
+ set its jcf in such a way that buffer will be reallocated
+ the time the code for the class will be generated. FIXME. */
+ }
+ }
+ break;
+
+ case 2:
+ {
+ char *file_name, *class_name_in_zip_dir, *buffer;
+ JCF *jcf;
+ file_name = XNEWVEC (char, zdir->filename_length + 1);
+ class_name_in_zip_dir = ZIPDIR_FILENAME (zdir);
+ strncpy (file_name, class_name_in_zip_dir, zdir->filename_length);
+ file_name[zdir->filename_length] = '\0';
+ jcf = XNEW (JCF);
+ JCF_ZERO (jcf);
+ jcf->read_state = finput;
+ jcf->filbuf = jcf_filbuf_from_stdio;
+ jcf->java_source = 0;
+ jcf->classname = NULL;
+ jcf->filename = file_name;
+ jcf->zipd = zdir;
+
+ if (read_zip_member (jcf, zdir, localToFile) < 0)
+ fatal_error ("error while reading %s from zip file", file_name);
+
+ buffer = XNEWVEC (char, zdir->filename_length + 1 +
+ (jcf->buffer_end - jcf->buffer));
+ strcpy (buffer, file_name);
+ /* This is not a typo: we overwrite the trailing \0 of the
+ file name; this is just how the data is laid out. */
+ memcpy (buffer + zdir->filename_length,
+ jcf->buffer, jcf->buffer_end - jcf->buffer);
+
+ compile_resource_data (file_name, buffer,
+ jcf->buffer_end - jcf->buffer);
+ JCF_FINISH (jcf);
+ free (jcf);
+ free (buffer);
+ }
+ break;
+
+ default:
+ gcc_unreachable ();
}
}
}
/* Read all the entries of the zip file, creates a class and a JCF. Sets the
jcf up for further processing and link it to the created class. */
-static void process_zip_dir()
+static void
+process_zip_dir (FILE *finput)
{
int i;
ZipDirectory *zdir;
- for (i = 0, zdir = (ZipDirectory *)localToFile->z.central_directory;
- i < localToFile->z.count; i++, zdir = ZIPDIR_NEXT (zdir))
+ for (i = 0, zdir = (ZipDirectory *)localToFile->central_directory;
+ i < localToFile->count; i++, zdir = ZIPDIR_NEXT (zdir))
{
char *class_name, *file_name, *class_name_in_zip_dir;
tree class;
JCF *jcf;
- int j;
class_name_in_zip_dir = ZIPDIR_FILENAME (zdir);
- /* We choose to not to process entries with a zero size or entries
- not bearing the .class extention. */
- if (!zdir->size || !zdir->filename_offset ||
- strncmp (&class_name_in_zip_dir[zdir->filename_length-6],
- ".class", 6))
- {
- /* So it will be skipped in parse_zip_file_entries */
- zdir->size = 0;
- continue;
- }
+ /* Here we skip non-class files; we handle them later. */
+ if (classify_zip_file (zdir) != 1)
+ continue;
- class_name = ALLOC (zdir->filename_length+1-6);
- file_name = ALLOC (zdir->filename_length+1);
- jcf = ALLOC (sizeof (JCF));
+ class_name = compute_class_name (zdir);
+ file_name = XNEWVEC (char, zdir->filename_length+1);
+ jcf = ggc_alloc (sizeof (JCF));
JCF_ZERO (jcf);
- strncpy (class_name, class_name_in_zip_dir, zdir->filename_length-6);
- class_name [zdir->filename_length-6] = '\0';
strncpy (file_name, class_name_in_zip_dir, zdir->filename_length);
file_name [zdir->filename_length] = '\0';
- for (j=0; class_name[j]; j++)
- class_name [j] = (class_name [j] == '/' ? '.' : class_name [j]);
-
- /* Yes, we write back the true class name into the zip directory. */
- strcpy (class_name_in_zip_dir, class_name);
- zdir->filename_length = j;
class = lookup_class (get_identifier (class_name));
jcf->read_state = finput;
jcf->filbuf = jcf_filbuf_from_stdio;
- jcf->seen_in_zip = 1;
jcf->java_source = 0;
- jcf->zip_offset = zdir->filestart;
jcf->classname = class_name;
jcf->filename = file_name;
+ jcf->zipd = zdir;
TYPE_JCF (class) = jcf;
}
}
-/* Lookup class NAME and figure whether is a class already found in the current
- zip file. */
-static int
-DEFUN(find_in_current_zip, (name, length, jcf),
- const char *name AND JCF **jcf)
-{
- JCF *local_jcf;
- tree class_name = maybe_get_identifier (name), class, icv;
-
- if (!class_name)
- return 0;
-
- if (!(icv = IDENTIFIER_CLASS_VALUE (class_name)))
- return 0;
-
- class = TREE_TYPE (icv);
-
- /* Doesn't have jcf specific info ? It's not ours */
- if (!TYPE_JCF (class))
- return 0;
-
- *jcf = local_jcf = TYPE_JCF (class);
- fseek (local_jcf->read_state, local_jcf->zip_offset, SEEK_SET);
- return 1;
-}
+/* Initialization. */
-/* Figure what kind of file we're dealing with */
-static int
-DEFUN(jcf_figure_file_type, (jcf),
- JCF *jcf)
+void
+init_jcf_parse (void)
{
- unsigned char magic_string[4];
- uint32 magic;
-
- if (fread (magic_string, 1, 4, jcf->read_state) != 4)
- jcf_unexpected_eof (jcf, 4);
-
- fseek (jcf->read_state, 0L, SEEK_SET);
- magic = GET_u4 (magic_string);
-
- if (magic == 0xcafebabe)
- return JCF_CLASS;
-
- /* FIXME: is it a system file? */
- if (magic == (JCF_u4)ZIPMAGIC
- && !open_in_zip (jcf, input_filename, NULL, 0))
- {
- localToFile = ALLOC (sizeof (struct ZipFileCache));
- bcopy ((PTR) SeenZipFiles, (PTR) localToFile, sizeof (struct ZipFileCache));
- process_zip_dir (); /* Register all the class defined there */
- return JCF_ZIP;
- }
-
- return JCF_SOURCE;
+ init_src_parse ();
}
+#include "gt-java-jcf-parse.h"
OSDN Git Service
