obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 238 insertions, 0 deletions

diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c
new file mode 100644
index 000000000..f4a9af619
--- /dev/null
+++ b/gcc/java/boehm.c
@@ -0,0 +1,238 @@
+/* Functions related to the Boehm garbage collector.
+   Copyright (C) 2000, 2003, 2004, 2006, 2009, 2010
+   Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+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 3, or (at your option)
+any later version.
+
+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 GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.
+
+Java and all Java-based marks are trademarks or registered trademarks
+of Sun Microsystems, Inc. in the United States and other countries.
+The Free Software Foundation is independent of Sun Microsystems, Inc.  */
+
+/* Written by Tom Tromey <tromey@cygnus.com>.  */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "double-int.h"
+#include "tm.h"
+#include "tree.h"
+#include "java-tree.h"
+#include "parse.h"
+#include "diagnostic-core.h"
+
+static void mark_reference_fields (tree, double_int *, unsigned int,
+				   int *, int *, int *, HOST_WIDE_INT *);
+
+/* A procedure-based object descriptor.  We know that our
+   `kind' is 0, and `env' is likewise 0, so we have a simple
+   computation.  From the GC sources:
+   (((((env) << LOG_MAX_MARK_PROCS) | (proc_index)) << DS_TAG_BITS)	\
+   | DS_PROC)
+   Here DS_PROC == 2.  */
+#define PROCEDURE_OBJECT_DESCRIPTOR 2
+
+/* Recursively mark reference fields.  */
+static void
+mark_reference_fields (tree field,
+		       double_int *mask,
+		       unsigned int ubit,
+		       int *pointer_after_end,
+		       int *all_bits_set,
+		       int *last_set_index,
+		       HOST_WIDE_INT *last_view_index)
+{
+  /* See if we have fields from our superclass.  */
+  if (DECL_NAME (field) == NULL_TREE)
+    {
+      mark_reference_fields (TYPE_FIELDS (TREE_TYPE (field)),
+			     mask, ubit,
+			     pointer_after_end, all_bits_set,
+			     last_set_index, last_view_index);
+      field = DECL_CHAIN (field);
+    }
+
+  for (; field != NULL_TREE; field = DECL_CHAIN (field))
+    {
+      HOST_WIDE_INT offset;
+      HOST_WIDE_INT size_bytes;
+
+      if (FIELD_STATIC (field))
+	continue;
+
+      offset = int_byte_position (field);
+      size_bytes = int_size_in_bytes (TREE_TYPE (field));
+
+      if (JREFERENCE_TYPE_P (TREE_TYPE (field))
+	  /* An `object' of type gnu.gcj.RawData is actually non-Java
+	     data.  */
+	  && TREE_TYPE (field) != rawdata_ptr_type_node)
+	{
+	  unsigned int count;
+	  unsigned int size_words;
+	  unsigned int i;
+
+	  /* If this reference slot appears to overlay a slot we think
+	     we already covered, then we are doomed.  */
+	  gcc_assert (offset > *last_view_index);
+
+	  if (offset % (HOST_WIDE_INT) (POINTER_SIZE / BITS_PER_UNIT))
+	    {
+	      *all_bits_set = -1;
+	      *pointer_after_end = 1;
+	      break;
+	    }
+
+	  count = offset * BITS_PER_UNIT / POINTER_SIZE;
+	  size_words = size_bytes * BITS_PER_UNIT / POINTER_SIZE;
+
+	  *last_set_index = count;
+	     
+	  /* First word in object corresponds to most significant byte of 
+	     bitmap. 
+	     
+	     In the case of a multiple-word record, we set pointer 
+	     bits for all words in the record. This is conservative, but the 
+	     size_words != 1 case is impossible in regular java code. */
+	  for (i = 0; i < size_words; ++i)
+	    *mask = double_int_setbit (*mask, ubit - count - i - 1);
+
+	  if (count >= ubit - 2)
+	    *pointer_after_end = 1;
+
+	  /* If we saw a non-reference field earlier, then we can't
+	     use the count representation.  We keep track of that in
+	     *ALL_BITS_SET.  */
+	  if (! *all_bits_set)
+	    *all_bits_set = -1;
+	}
+      else if (*all_bits_set > 0)
+	*all_bits_set = 0;
+
+      *last_view_index = offset;
+    }
+}
+
+/* Return the marking bitmap for the class TYPE.  For now this is a
+   single word describing the type.  */
+tree
+get_boehm_type_descriptor (tree type)
+{
+  unsigned int count, log2_size, ubit;
+  int bit;
+  int all_bits_set = 1;
+  int last_set_index = 0;
+  HOST_WIDE_INT last_view_index = -1;
+  int pointer_after_end = 0;
+  double_int mask;
+  tree field, value, value_type;
+
+  mask = double_int_zero;
+
+  /* If the GC wasn't requested, just use a null pointer.  */
+  if (! flag_use_boehm_gc)
+    return null_pointer_node;
+
+  value_type = java_type_for_mode (ptr_mode, 1);
+  /* If we have a type of unknown size, use a proc.  */
+  if (int_size_in_bytes (type) == -1)
+    goto procedure_object_descriptor;
+
+  bit = POINTER_SIZE / BITS_PER_UNIT;
+  /* The size of this node has to be known.  And, we only support 32
+     and 64 bit targets, so we need to know that the log2 is one of
+     our values.  */
+  log2_size = exact_log2 (bit);
+  if (bit == -1 || (log2_size != 2 && log2_size != 3))
+    {
+      /* This means the GC isn't supported.  We should probably
+	 abort or give an error.  Instead, for now, we just silently
+	 revert.  FIXME.  */
+      return null_pointer_node;
+    }
+  bit *= BITS_PER_UNIT;
+
+  /* Warning avoidance.  */
+  ubit = (unsigned int) bit;
+
+  if (type == class_type_node)
+    goto procedure_object_descriptor;
+
+  field = TYPE_FIELDS (type);
+  mark_reference_fields (field, &mask, ubit,
+			 &pointer_after_end, &all_bits_set,
+			 &last_set_index, &last_view_index);
+
+  /* If the object is all pointers, or if the part with pointers fits
+     in our bitmap, then we are ok.  Otherwise we have to allocate it
+     a different way.  */
+  if (all_bits_set != -1 || (pointer_after_end && flag_reduced_reflection))
+    {
+      /* In this case the initial part of the object is all reference
+	 fields, and the end of the object is all non-reference
+	 fields.  We represent the mark as a count of the fields,
+	 shifted.  In the GC the computation looks something like
+	 this:
+	 value = DS_LENGTH | WORDS_TO_BYTES (last_set_index + 1);
+	 DS_LENGTH is 0.
+	 WORDS_TO_BYTES shifts by log2(bytes-per-pointer).
+
+         In the case of flag_reduced_reflection and the bitmap would
+         overflow, we tell the gc that the object is all pointers so
+         that we don't have to emit reflection data for run time
+         marking. */
+      count = 0;
+      mask = double_int_zero;
+      ++last_set_index;
+      while (last_set_index)
+	{
+	  if ((last_set_index & 1))
+	    mask = double_int_setbit (mask, log2_size + count);
+	  last_set_index >>= 1;
+	  ++count;
+	}
+      value = double_int_to_tree (value_type, mask);
+    }
+  else if (! pointer_after_end)
+    {
+      /* Bottom two bits for bitmap mark type are 01.  */
+      mask = double_int_setbit (mask, 0);
+      value = double_int_to_tree (value_type, mask);
+    }
+  else
+    {
+    procedure_object_descriptor:
+      value = build_int_cst (value_type, PROCEDURE_OBJECT_DESCRIPTOR);
+    }
+
+  return value;
+}
+
+/* The fourth (index of 3) element in the vtable is the GC descriptor.
+   A value of 2 indicates that the class uses _Jv_MarkObj. */
+bool
+uses_jv_markobj_p (tree dtable)
+{
+  tree v;
+  /* FIXME: what do we return if !flag_use_boehm_gc ? */
+  gcc_assert (flag_use_boehm_gc);
+  /* FIXME: this is wrong if TARGET_VTABLE_USES_DESCRIPTORS.  However,
+     this function is only used with flag_reduced_reflection.  No
+     point in asserting unless we hit the bad case.  */
+  gcc_assert (!flag_reduced_reflection || TARGET_VTABLE_USES_DESCRIPTORS == 0);
+  v = VEC_index (constructor_elt, CONSTRUCTOR_ELTS (dtable), 3)->value;
+  return (PROCEDURE_OBJECT_DESCRIPTOR == TREE_INT_CST_LOW (v));
+}