2005-11-21 Joel Sherrill <joel.sherrill@oarcorp.com>

[pf3gnuchains/gcc-fork.git] / gcc / java / resource.c

diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index b71a670..0f4cafa 100644 (file)
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -1,5 +1,5 @@
 /* Functions related to building resource files.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+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.
@@ -41,6 +41,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "stdio.h"
 #include "target.h"
 #include "expr.h"
+#include "tree-iterator.h"
+#include "cgraph.h"
 
 /* DOS brain-damage */
 #ifndef O_BINARY
@@ -50,9 +52,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 /* A list of all the resources files.  */
 static GTY(()) tree resources = NULL;
 
-/* Function used to register resources.  */
-static GTY(()) rtx registerResource_libfunc;
-
 /* Count of all the resources compiled in this invocation.  */
 static int Jr_count = 0;
 
@@ -71,14 +70,15 @@ compile_resource_data (const char *name, const char *buffer, int length)
   FINISH_RECORD (rtype);
   START_RECORD_CONSTRUCTOR (rinit, rtype);
   PUSH_FIELD_VALUE (rinit, "name_length", 
-                   build_int_2 (strlen (name), 0));
+                   build_int_cst (NULL_TREE, strlen (name)));
   PUSH_FIELD_VALUE (rinit, "resource_length", 
-                   build_int_2 (length, 0));
+                   build_int_cst (NULL_TREE, length));
   data = build_string (strlen(name) + length, buffer);
   TREE_TYPE (data) = data_type;
   PUSH_FIELD_VALUE (rinit, "data", data);
   FINISH_RECORD_CONSTRUCTOR (rinit);
   TREE_CONSTANT (rinit) = 1;
+  TREE_INVARIANT (rinit) = 1;
 
   /* Generate a unique-enough identifier.  */
   sprintf (buf, "_Jr%d", ++Jr_count);
@@ -92,69 +92,34 @@ compile_resource_data (const char *name, const char *buffer, int length)
   DECL_INITIAL (decl) = rinit;
   layout_decl (decl, 0);
   pushdecl (decl);
-  rest_of_decl_compilation (decl, (char*) 0, global_bindings_p (), 0);
-  make_decl_rtl (decl, (char*) 0);
-  assemble_variable (decl, 1, 0, 0);
+  rest_of_decl_compilation (decl, global_bindings_p (), 0);
+  cgraph_varpool_finalize_decl (decl);
 
   resources = tree_cons (NULL_TREE, decl, resources);
 }
 
 void
-write_resource_constructor (void)
+write_resource_constructor (tree *list_p)
 {
-  tree init_name, init_type, init_decl;
-  tree iter;
-  location_t saved_loc = input_location;
+  tree iter, t, register_resource_fn;
 
-  /* Only do work if required.  */
-  if (resources == NULL_TREE)
+  if (resources == NULL)
     return;
 
-  init_name = get_file_function_name ('I');
-  init_type = build_function_type (void_type_node, end_params_node);
-
-  init_decl = build_decl (FUNCTION_DECL, init_name, init_type);
-  DECL_SOURCE_LINE (init_decl) = 0;
-  SET_DECL_ASSEMBLER_NAME (init_decl, init_name);
-  TREE_STATIC (init_decl) = 1;
-  current_function_decl = init_decl;
-  DECL_RESULT (init_decl) = build_decl (RESULT_DECL, 
-                                       NULL_TREE, void_type_node);
-
-  /* It can be a static function as long as collect2 does not have
-     to scan the object file to find its ctor/dtor routine.  */
-  TREE_PUBLIC (init_decl) = ! targetm.have_ctors_dtors;
-
-  pushlevel (0);
-  make_decl_rtl (init_decl, NULL);
-  init_function_start (init_decl);
-  expand_function_start (init_decl, 0);
+  t = build_function_type_list (void_type_node, ptr_type_node, NULL);
+  t = build_decl (FUNCTION_DECL, get_identifier ("_Jv_RegisterResource"), t);
+  TREE_PUBLIC (t) = 1;
+  DECL_EXTERNAL (t) = 1;
+  register_resource_fn = t;
 
   /* Write out entries in the same order in which they were defined.  */
-  for (iter = nreverse (resources); iter != NULL_TREE;
-       iter = TREE_CHAIN (iter))
+  for (iter = nreverse (resources); iter ; iter = TREE_CHAIN (iter))
     {
-      emit_library_call (registerResource_libfunc, 0, VOIDmode, 1,
-                        expand_expr (build_address_of (TREE_VALUE (iter)),
-                                     0, Pmode, 0),
-                        Pmode);
+      t = build_fold_addr_expr (TREE_VALUE (iter));
+      t = tree_cons (NULL, t, NULL);
+      t = build_function_call_expr (register_resource_fn, t);
+      append_to_statement_list (t, list_p);
     }
-
-  input_location = DECL_SOURCE_LOCATION (init_decl);
-  expand_function_end ();
-  poplevel (1, 0, 1);
-  { 
-    /* Force generation, even with -O3 or deeper.  Gross hack.
-       FIXME.  */
-    int saved_flag = flag_inline_functions;
-    flag_inline_functions = 0; 
-    rest_of_compilation (init_decl);
-    flag_inline_functions = saved_flag;
-  }
-  current_function_decl = NULL_TREE;
-  (* targetm.asm_out.constructor) (XEXP (DECL_RTL (init_decl), 0),
-                                  DEFAULT_INIT_PRIORITY);
-  input_location = saved_loc;
 }
 
 /* Generate a byte array representing the contents of FILENAME.  The
@@ -186,14 +151,6 @@ compile_resource_file (const char *name, const char *filename)
   close (fd);
 
   compile_resource_data (name, buffer, stat_buf.st_size);
-  write_resource_constructor ();
-}
-
-void
-init_resource_processing (void)
-{
-  registerResource_libfunc =
-    gen_rtx_SYMBOL_REF (Pmode, "_Jv_RegisterResource");
 }
 
 #include "gt-java-resource.h"