/hg/icedtea6: 4 new changesets
aph at icedtea.classpath.org
aph at icedtea.classpath.org
Thu Oct 27 09:05:58 PDT 2011
changeset fd72f69cc3e9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fd72f69cc3e9
author: aph
date: Wed Oct 19 12:37:40 2011 -0400
Reinstate the ARM assembler port. 2011-09-15 Andrew Haley
<aph at redhat.com>
Reinstate the ARM assembler port. Back out this patch:
2011-07-11 Xerxes R??nby <xerxes at zafena.se>
Removal of the ARM assembler port, unbreaks Zero and Shark
builds.
* Makefile.am: (ICEDTEA_PATCHES): Remove patches/arm.patch.
(clean-ports): Removed. (stamps/ports.stamp): Likewise.
(hotspot-ports): Likewise.
* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Removed.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Likewise.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Likewise.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
* arm_port/hotspot/tools/mkbc.c: Likewise.
* patches/arm.patch: Likewise.
changeset 080e299556a0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=080e299556a0
author: aph
date: Wed Oct 26 13:10:04 2011 -0400
merge
changeset 68d8fd484caa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=68d8fd484caa
author: aph
date: Thu Oct 27 13:49:16 2011 +0100
merge
changeset 628e5ee78eca in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=628e5ee78eca
author: aph
date: Thu Oct 27 13:54:50 2011 +0100
Update ARM port to HS20 and hard FP.
2011-10-26 Andrew Haley <aph at redhat.com>
* patches/arm.patch (CFLAGS): Enable the ARM assembler port.
PR icedtea/484:
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(fast_empty_entry, normal_entry_synchronized, normal_entry):
Return 0, #deoptimized_frames.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return):
Likewise.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
(return_unsafe, ireturn_unsafe, lreturn_unsafe)
(ireturn,areturn,freturn): Return deoptimized_frames = 0.
PR icedtea/323:
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Replace
all stores to THREAD_LAST_JAVA_SP with stores to
THREAD_LAST_JAVA_FP. Add stores to THREAD_LAST_JAVA_SP.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
* Makefile.am (ICEDTEA_PATCHES): Add patches/arm-
debug.patch. (stamps/ports.stamp): Use cp -l to link the ARM
interpreter sources into the target dir rather than copying
them. (EXTRA_DIST): Add arm_port.
Update to HS20:
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Replace all calls
to fatal1() (which no longer exists) with calls to fatal().
(Thumb2_is_zombie, Thumb2_pass2): invoke* and {get,put}* now take
native, not Java, byte ordered indexes. (Thumb2_disass,
Thumb2_codegen, Thumb2_tablegen):
Bytecodes::special_length_at() takes different arguments from the
previous version; adjust suitably.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Replace
call to report_fatal_vararg(char const*, int, char const*, ...)
(which no longer exists) with call to Helper_report_fatal.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (new):
Renumber the fast bytecodes iload_0_iconst_N to iload_3_iload_N.
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
* patches/arm.patch: Likewise. Add *.S to the list of source
files.
* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (All #includes)
: Move to new OpenJDK include file format.
(Helper_report_fatal): New assember helper.
(print_vm_offsets): Add THREAD_LAST_JAVA_FP.
Hard FP port:
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Initialize):
Add hard FP variants for the stubs that need it.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(POPF0, POPF1, POPD0, POPD1,PUSHF0, PUSHD0): New macros.
(.eabi_attribute): Use real names. Add declaration for hard
FP ABI. (.fast_native_return_double,
.fast_native_return_float, .fast_copy_double,
.fast_copy_float): New. (fast_native_entry): use
SIZEOF_FFI_CIF, not 24. Add logic to handle args in FP
registers. (FIND_LOWEST_BIT, FIND_LOWEST_BIT_PAIR,
COPY_DOUBLE, COPY_FLOAT): New macros.
(.copy_float_table, .copy_double_table): New.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (frem,
drem, f2i, f2l, d2i, d2l): Add hardfp args.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(REWRITE_PAIRS): New macro.
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Use
REWRITE_PAIRS to prevent rewriting pairs of bytecodes in the
instruction stream.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(fast_native_entry): Update ISTATE_SELF_LINK to get correct
stack traces.
* patches/arm-debug.patch: New file.
diffstat:
ChangeLog | 102 +
Makefile.am | 35 +-
NEWS | 3 +-
arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp | 610 +
arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 7696 +++++++++++++++++
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 6683 ++++++++++++++
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 7537 ++++++++++++++++
arm_port/hotspot/tools/mkbc.c | 607 +
patches/arm-debug.patch | 39 +
patches/arm.patch | 226 +
patches/openjdk/7103224-glibc_name_collision.patch | 230 +
11 files changed, 23762 insertions(+), 6 deletions(-)
diffs (truncated from 23890 to 500 lines):
diff -r a60a29a6dace -r 628e5ee78eca ChangeLog
--- a/ChangeLog Fri Oct 21 15:04:36 2011 +0100
+++ b/ChangeLog Thu Oct 27 13:54:50 2011 +0100
@@ -1,3 +1,105 @@
+2011-10-26 Andrew Haley <aph at redhat.com>
+
+ * patches/arm.patch (CFLAGS): Enable the ARM assembler port.
+
+ PR icedtea/484:
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (fast_empty_entry, normal_entry_synchronized, normal_entry):
+ Return 0, #deoptimized_frames.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Return):
+ Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
+ (return_unsafe, ireturn_unsafe, lreturn_unsafe)
+ (ireturn,areturn,freturn): Return deoptimized_frames = 0.
+
+ PR icedtea/323:
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Replace
+ all stores to THREAD_LAST_JAVA_SP with stores to
+ THREAD_LAST_JAVA_FP. Add stores to THREAD_LAST_JAVA_SP.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
+
+ * Makefile.am (ICEDTEA_PATCHES): Add patches/arm-debug.patch.
+ (stamps/ports.stamp): Use cp -l to link the ARM interpreter
+ sources into the target dir rather than copying them.
+ (EXTRA_DIST): Add arm_port.
+
+ Update to HS20:
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Replace all calls
+ to fatal1() (which no longer exists) with calls to fatal().
+ (Thumb2_is_zombie, Thumb2_pass2): invoke* and {get,put}* now take
+ native, not Java, byte ordered indexes.
+ (Thumb2_disass, Thumb2_codegen, Thumb2_tablegen):
+ Bytecodes::special_length_at() takes different arguments from the
+ previous version; adjust suitably.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Replace
+ call to report_fatal_vararg(char const*, int, char const*, ...)
+ (which no longer exists) with call to Helper_report_fatal.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (new):
+ Renumber the fast bytecodes iload_0_iconst_N to iload_3_iload_N.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
+ * patches/arm.patch: Likewise.
+ Add *.S to the list of source files.
+ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (All #includes)
+ : Move to new OpenJDK include file format.
+ (Helper_report_fatal): New assember helper.
+ (print_vm_offsets): Add THREAD_LAST_JAVA_FP.
+
+ Hard FP port:
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Initialize):
+ Add hard FP variants for the stubs that need it.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (POPF0, POPF1, POPD0, POPD1,PUSHF0, PUSHD0): New macros.
+ (.eabi_attribute): Use real names. Add declaration for hard
+ FP ABI.
+ (.fast_native_return_double, .fast_native_return_float,
+ .fast_copy_double, .fast_copy_float): New.
+ (fast_native_entry): use SIZEOF_FFI_CIF, not 24. Add logic to
+ handle args in FP registers.
+ (FIND_LOWEST_BIT, FIND_LOWEST_BIT_PAIR, COPY_DOUBLE, COPY_FLOAT):
+ New macros.
+ (.copy_float_table, .copy_double_table): New.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
+ (frem, drem, f2i, f2l, d2i, d2l): Add hardfp args.
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (REWRITE_PAIRS): New macro.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Use
+ REWRITE_PAIRS to prevent rewriting pairs of bytecodes in the
+ instruction stream.
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (fast_native_entry):
+ Update ISTATE_SELF_LINK to get correct stack traces.
+
+ * patches/arm-debug.patch: New file.
+
+2011-10-26 Andrew Haley <aph at redhat.com>
+
+ Reinstate the ARM assembler port. Back out this patch:
+
+ 2011-07-11 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ Removal of the ARM assembler port, unbreaks Zero and Shark builds.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove patches/arm.patch.
+ (clean-ports): Removed.
+ (stamps/ports.stamp): Likewise.
+ (hotspot-ports): Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp: Removed.
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Likewise.
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
+ * arm_port/hotspot/tools/mkbc.c: Likewise.
+ * patches/arm.patch: Likewise.
+
+2011-10-26 Omair Majid <omajid at redhat.com>
+
+ S7103224: collision between __LEAF define in interfaceSupport.hpp and
+ /usr/include/sys/cdefs.h with gcc
+ * NEWS: Update with fix.
+ * patches/openjdk/7103224-glibc_name_collision.patch: New file. Export of
+ OpenJDK changeset.
+ * Makefile.am (ICEDTEA_PATCHES): Add the above.
+
2011-10-21 Andrew John Hughes <ahughes at redhat.com>
* patches/security/20111018/7083012.patch:
diff -r a60a29a6dace -r 628e5ee78eca Makefile.am
--- a/Makefile.am Fri Oct 21 15:04:36 2011 +0100
+++ b/Makefile.am Thu Oct 27 13:54:50 2011 +0100
@@ -289,6 +289,7 @@
patches/openjdk/6959123-libpng_14.patch \
patches/applet_hole.patch \
patches/jtreg-httpTest.patch \
+ patches/arm.patch \
patches/debug-dir.patch \
patches/override-redirect-metacity.patch \
patches/openjdk/6967533-pre_epoch.patch \
@@ -407,7 +408,8 @@
patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch \
patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
- patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch
+ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
+ patches/openjdk/7103224-glibc_name_collision.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -623,7 +625,8 @@
EXTRA_DIST = generated \
$(top_srcdir)/patches/* \
- contrib overlays \
+ contrib arm_port \
+ overlays \
jconsole.desktop policytool.desktop \
$(JTREG_SRCS) HACKING pulseaudio fsg.sh \
hotspot.map \
@@ -644,7 +647,7 @@
check-local: jtregcheck
clean-local: clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \
- clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract \
+ clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract clean-ports \
clean-overlay clean-native-ecj clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \
@@ -681,7 +684,7 @@
clean-icedtea-against-ecj \
clean-jamvm clean-add-jamvm clean-add-jamvm-debug \
clean-cacao clean-add-cacao clean-add-cacao-debug \
- clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
+ clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \
clean-rewriter clean-rewrite-rhino clean-add-systemtap clean-add-systemtap-debug \
clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
@@ -1037,7 +1040,27 @@
clean-replace-hotspot:
rm -f stamps/replace-hotspot.stamp
-stamps/generated.stamp: stamps/replace-hotspot.stamp
+# Copy ports sources into tree
+stamps/ports.stamp: stamps/replace-hotspot.stamp
+if !WITH_ALT_HSBUILD
+ for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
+ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
+ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
+ cp -rlv $$target $$link; \
+ done
+endif
+ mkdir -p stamps
+ touch stamps/ports.stamp
+
+clean-ports:
+ for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
+ $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
+ link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
+ rm -rf $$link; \
+ done
+ rm -f stamps/ports.stamp
+
+stamps/generated.stamp: stamps/ports.stamp
if [ ! -e $(GENERATED_BUILD_DIR) ]; then \
cp -a $(abs_top_srcdir)/generated $(GENERATED_BUILD_DIR) && \
chmod -R ug+rwX $(GENERATED_BUILD_DIR) ; \
@@ -2289,6 +2312,8 @@
extract-ecj: stamps/extract-ecj.stamp
+hotspot-ports: stamps/ports.stamp
+
icedtea: stamps/icedtea.stamp
icedtea-against-icedtea: stamps/icedtea-against-icedtea.stamp
diff -r a60a29a6dace -r 628e5ee78eca NEWS
--- a/NEWS Fri Oct 21 15:04:36 2011 +0100
+++ b/NEWS Thu Oct 27 13:54:50 2011 +0100
@@ -21,6 +21,7 @@
- PR752: ImageFormatException extends Exception not RuntimeException
- PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
- RH727195: Japanese font mappings are broken
+ - LP862286: Fix exception on trying to start PulseAudio playback
* Import of OpenJDK6 b23 including upgrade to HotSpot 20
- S7023111: Add webrev script to make/scripts
- S6909331: Add vsvars.sh to the jdk repository (handy cygwin way to get vcvars32.bat run)
@@ -372,7 +373,7 @@
- S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog
- S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false"
- S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types
- - LP862286: Fix exception on trying to start PulseAudio playback
+ - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
* CACAO
- CA149: Used wrong class loader.
diff -r a60a29a6dace -r 628e5ee78eca arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Thu Oct 27 13:54:50 2011 +0100
@@ -0,0 +1,610 @@
+/*
+ * Copyright 2009, 2010 Edward Nevill
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define ARCH_THUMBEE (1<<16)
+#define ARCH_VFP (1<<17)
+#define ARCH_CLZ (1<<18)
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "interp_masm_zero.hpp"
+#include "interpreter/bytecodeInterpreter.hpp"
+#include "interpreter/bytecodeInterpreter.inline.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
+#include "oops/methodDataOop.hpp"
+#include "oops/methodOop.hpp"
+#include "oops/oop.inline.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "prims/jvmtiThreadState.hpp"
+#include "runtime/deoptimization.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/synchronizer.hpp"
+#include "runtime/vframeArray.hpp"
+#include "utilities/debug.hpp"
+
+#ifndef STATIC_OFFSETS
+
+#include <linux/auxvec.h>
+#include <asm/hwcap.h>
+
+#define VECBUFF_SIZE 64
+
+extern "C" unsigned hwcap(void)
+{
+ int fd;
+ unsigned vecs[VECBUFF_SIZE];
+ unsigned *p;
+ int i, n;
+ unsigned rc = 0;
+ unsigned arch = 4;
+
+ fd = open("/proc/self/auxv", O_RDONLY);
+ if (fd < 0) return 0;
+ do {
+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
+ p = vecs;
+ i = n/8;
+ while (--i >= 0) {
+ unsigned tag = *p++;
+ unsigned value = *p++;
+ if (tag == 0) goto fini;
+ if (tag == AT_HWCAP) {
+ if (value & HWCAP_THUMBEE) rc |= ARCH_THUMBEE;
+ if (value & HWCAP_VFP) rc |= ARCH_VFP;
+ } else if (tag == AT_PLATFORM) {
+ const char *s = (const char *)value;
+ int c;
+
+ if (*s++ == 'v') {
+ arch = 0;
+ while ((isdigit)(c = *s++)) arch = arch * 10 + c - '0';
+ }
+ }
+ }
+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
+fini:
+ close(fd);
+// printf("arch = %d, rc = 0x%08x\n", arch, rc);
+ if (arch >= 5) rc |= ARCH_CLZ;
+ if (arch >= 7) rc |= ARCH_THUMBEE;
+ return rc | (1<<arch);
+}
+
+/* Thease functions allow the ASM interpreter to call CPP virtual functions.
+ * Otherwise the ASM interpreter has to grup around in the VTABLE which is
+ * not very portable.
+ */
+extern "C" bool JavaThread_is_lock_owned(JavaThread *r0, address r1)
+{
+ return r0->is_lock_owned(r1);
+}
+
+extern "C" HeapWord **CollectedHeap_top_addr(CollectedHeap *r0)
+{
+ return r0->top_addr();
+}
+
+extern "C" HeapWord **CollectedHeap_end_addr(CollectedHeap *r0)
+{
+ return r0->end_addr();
+}
+
+extern "C" char *SharedRuntime_generate_class_cast_message(const char *name, const char *klass)
+{
+ return SharedRuntime::generate_class_cast_message(name, klass);
+}
+
+#define HELPER_THROW(thread, name, msg) Exceptions::_throw_msg(thread, __FILE__, __LINE__, name, msg)
+
+class VMStructs {
+public:
+ static inline klassOop klass_at_addr(constantPoolOop constants, u2 index) {
+ return (klassOop) *constants->obj_at_addr(index);
+ }
+};
+
+extern "C" oop Helper_new(interpreterState istate, unsigned index)
+{
+ JavaThread *thread = istate->thread();
+
+ constantPoolOop constants = istate->method()->constants();
+ oop result = NULL;
+ if (!constants->tag_at(index).is_unresolved_klass()) {
+ // Make sure klass is initialized and doesn't have a finalizer
+ oop entry = VMStructs::klass_at_addr(constants, index);
+ klassOop k_entry = (klassOop) entry;
+ instanceKlass* ik = (instanceKlass*) k_entry->klass_part();
+ if ( ik->is_initialized() && ik->can_be_fastpath_allocated() ) {
+ size_t obj_size = ik->size_helper();
+ // If the TLAB isn't pre-zeroed then we'll have to do it
+ bool need_zero = !ZeroTLAB;
+ if (UseTLAB) {
+ result = (oop) thread->tlab().allocate(obj_size);
+ }
+ if (result == NULL) {
+ need_zero = true;
+ // Try allocate in shared eden
+ retry:
+ HeapWord* compare_to = *Universe::heap()->top_addr();
+ HeapWord* new_top = compare_to + obj_size;
+ if (new_top <= *Universe::heap()->end_addr()) {
+ if (Atomic::cmpxchg_ptr(new_top, Universe::heap()->top_addr(), compare_to) != compare_to) {
+ goto retry;
+ }
+ result = (oop) compare_to;
+ }
+ }
+ if (result != NULL) {
+ // Initialize object (if nonzero size and need) and then the header
+ if (need_zero ) {
+ HeapWord* to_zero = (HeapWord*) result + sizeof(oopDesc) / oopSize;
+ obj_size -= sizeof(oopDesc) / oopSize;
+ if (obj_size > 0 ) {
+ memset(to_zero, 0, obj_size * HeapWordSize);
+ }
+ }
+ if (UseBiasedLocking) {
+ result->set_mark(ik->prototype_header());
+ } else {
+ result->set_mark(markOopDesc::prototype());
+ }
+ result->set_klass_gap(0);
+ result->set_klass(k_entry);
+ return result;
+ }
+ }
+ }
+ // Slow case allocation
+ InterpreterRuntime::_new(thread, istate->method()->constants(), index);
+ result = thread->vm_result();
+ thread->set_vm_result(NULL);
+ return result;
+}
+
+extern "C" int Helper_instanceof(interpreterState istate, unsigned index, oop tos)
+{
+ if (tos == NULL) return 0;
+
+ // Constant pool may have actual klass or unresolved klass. If it is
+ // unresolved we must resolve it
+ if (istate->method()->constants()->tag_at(index).is_unresolved_klass()) {
+ InterpreterRuntime::quicken_io_cc(istate->thread());
+ if (istate->thread()->has_pending_exception()) return 0;
+ }
+ klassOop klassOf = VMStructs::klass_at_addr(istate->method()->constants(), index);
+ klassOop objKlassOop = tos->klass();
+ //
+ // Check for compatibilty. This check must not GC!!
+ // Seems way more expensive now that we must dispatch
+ //
+ return objKlassOop == klassOf || objKlassOop->klass_part()->is_subtype_of(klassOf);
+}
+
+extern "C" oop Helper_checkcast(interpreterState istate, unsigned index, oop tos)
+{
+ if (tos == NULL) return NULL;
+
+ // Constant pool may have actual klass or unresolved klass. If it is
+ // unresolved we must resolve it
+ if (istate->method()->constants()->tag_at(index).is_unresolved_klass()) {
+ oop except_oop;
+ InterpreterRuntime::quicken_io_cc(istate->thread());
+ if (except_oop = istate->thread()->pending_exception()) return except_oop;
+ }
+ klassOop klassOf = VMStructs::klass_at_addr(istate->method()->constants(), index);
+ klassOop objKlassOop = tos->klass(); //ebx
+ //
+ // Check for compatibilty. This check must not GC!!
+ // Seems way more expensive now that we must dispatch
+ //
+ if (objKlassOop != klassOf && !objKlassOop->klass_part()->is_subtype_of(klassOf)) {
+ ResourceMark rm(istate->thread());
+ const char* objName = Klass::cast(objKlassOop)->external_name();
+ const char* klassName = Klass::cast(klassOf)->external_name();
+ char* message = SharedRuntime::generate_class_cast_message(objName, klassName);
+ ThreadInVMfromJava trans(istate->thread());
+ HELPER_THROW(istate->thread(), vmSymbols::java_lang_ClassCastException(), message);
+ }
+ return istate->thread()->pending_exception();
+}
+
+extern "C" oop Helper_aastore(interpreterState istate, oop value, int index, arrayOop arrayref)
+{
+ if (arrayref == NULL) {
+ ThreadInVMfromJava trans(istate->thread());
+ HELPER_THROW(istate->thread(), vmSymbols::java_lang_NullPointerException(), "");
+ } else if ((uint32_t)index >= (uint32_t)arrayref->length()) {
+ char message[jintAsStringSize];
+ sprintf(message, "%d", index);
+ HELPER_THROW(istate->thread(), vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message);
+ } else {
+ if (value != NULL) {
+ /* Check assignability of value into arrayref */
+ klassOop rhsKlassOop = value->klass(); // EBX (subclass)
+ klassOop elemKlassOop = ((objArrayKlass*) arrayref->klass()->klass_part())->element_klass();
+ //
+ // Check for compatibilty. This check must not GC!!
+ // Seems way more expensive now that we must dispatch
+ //
+ if (rhsKlassOop != elemKlassOop && !rhsKlassOop->klass_part()->is_subtype_of(elemKlassOop)) {
+ HELPER_THROW(istate->thread(), vmSymbols::java_lang_ArrayStoreException(), "");
+ goto handle_exception;
+ }
+ }
+ oop* elem_loc = (oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop));
+ // *(oop*)(((address) arrayref->base(T_OBJECT)) + index * sizeof(oop)) = value;
+ *elem_loc = value;
+ // Mark the card
+ BarrierSet* bs = Universe::heap()->barrier_set();
+ static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base);
+ OrderAccess::release_store(&_byte_map_base[(uintptr_t)elem_loc >> CardTableModRefBS::card_shift], 0);
+ }
+handle_exception:
+ return istate->thread()->pending_exception();
+}
+
+extern "C" void Helper_aputfield(oop obj)
+{
+ BarrierSet* bs = Universe::heap()->barrier_set();
+ static volatile jbyte* _byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base);
+ OrderAccess::release_store(&_byte_map_base[(uintptr_t)obj >> CardTableModRefBS::card_shift], 0);
+}
+
+extern "C" oop Helper_synchronized_enter(JavaThread *thread, BasicObjectLock *mon)
+{
+ BasicLock *lock = mon->lock();
+ markOop displaced = lock->displaced_header();
+
+ if (thread->is_lock_owned((address)displaced->clear_lock_bits()))
+ lock->set_displaced_header(NULL);
+ else
+ InterpreterRuntime::monitorenter(thread, mon);
+ return thread->pending_exception();
More information about the distro-pkg-dev
mailing list