/hg/icedtea: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 28 04:43:29 PDT 2010
changeset 3c4a53467c72 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3c4a53467c72
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Feb 22 16:54:32 2010 -0500
Centralized and increased timeouts to give slow-loading applets
enough time to load.
changeset e84a0f2d1198 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e84a0f2d1198
author: Xerxes R?nby <xerxes at zafena.se>
date: Sun Feb 21 16:24:11 2010 +0100
Update Shark for LLVM r95390 API change.
2010-02-21 Xerxes R?nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(MCPU): Explicitly defined for use by LLVM command line parser.
(MAttrs): Likewise. (SharkCompiler::SharkCompiler): Create
the JIT using LLVM EngineBuilder in order to explicitly set
MCPU and MAttrs when using LLVM 2.7.
* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Include
llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the JIT
are linked in.
changeset c6ae89cfecdb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c6ae89cfecdb
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 21 12:38:45 2010 +0000
Add missing -debug suffix in icedtea-debug.stamp target.
2010-02-21 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (icedtea-debug.stamp): Add missing
-debug on end of $(BUILD_OUTPUT_DIR).
changeset 9155cdff48d1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9155cdff48d1
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 09:01:28 2010 +0000
Comment fix
changeset a29dbceee050 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a29dbceee050
author: Gary Benson <gbenson at redhat.com>
date: Fri May 28 12:42:07 2010 +0100
Add 2010 to some copyright headers that were missing it
2010-02-23 Gary Benson <gbenson at redhat.com>
* ports/hotspot/make/linux/makefiles/shark.make: Update
copyright.
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
diffstat:
8 files changed, 84 insertions(+), 24 deletions(-)
ChangeLog | 33 +++++++++++++
Makefile.am | 16 +++---
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 10 ++--
ports/hotspot/make/linux/makefiles/shark.make | 4 -
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 8 +--
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 1
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 34 ++++++++++++--
ports/hotspot/src/share/vm/shark/sharkContext.hpp | 2
diffs (254 lines):
diff -r cf649a549a40 -r a29dbceee050 ChangeLog
--- a/ChangeLog Fri Feb 19 14:19:25 2010 +0000
+++ b/ChangeLog Fri May 28 12:42:07 2010 +0100
@@ -1,3 +1,36 @@ 2010-02-19 Andrew John Hughes <ahughes@
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
+2010-02-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (icedtea-debug.stamp): Add missing -debug on
+ end of $(BUILD_OUTPUT_DIR).
+
+2010-02-21 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+ (MCPU): Explicitly defined for use by LLVM command line parser.
+ (MAttrs): Likewise.
+ (SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
+ in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+ Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
+ JIT are linked in.
+
+2010-02-22 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
+ and increased timeouts to give slow-loading applets enough time to load.
+
2010-02-19 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
diff -r cf649a549a40 -r a29dbceee050 Makefile.am
--- a/Makefile.am Fri Feb 19 14:19:25 2010 +0000
+++ b/Makefile.am Fri May 28 12:42:07 2010 +0100
@@ -1844,31 +1844,31 @@ if WITH_CACAO
printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
if ENABLE_SYSTEMTAP
- mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+ mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset ; \
grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
if test $$? -eq 0; then \
sed -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot.stp \
- > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \
sed -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_jni.stp \
- > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/jstack.stp
endif
if ENABLE_NSS
cp $(abs_top_builddir)/nss.cfg \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security;
endif
if WITH_TZDATA_DIR
cp $(abs_top_builddir)/tz.properties \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib;
endif
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
mkdir -p stamps
diff -r cf649a549a40 -r a29dbceee050 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Feb 19 14:19:25 2010 +0000
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 28 12:42:07 2010 +0100
@@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Applet a;
// Wait for panel to come alive
- int maxWait = 5000; // wait 5 seconds max for panel to come alive
+ int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
int wait = 0;
while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
try {
@@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
private long handle = 0;
private WindowListener windowEventListener = null;
private AppletEventListener appletEventListener = null;
+
+ public static final int APPLET_TIMEOUT = 60000;
/**
* Null constructor to allow instantiation via newInstance()
@@ -613,7 +615,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
if (message.startsWith("handle")) {
PluginDebug.debug("handle command waiting for applet to complete loading.");
- int maxWait = 10000; // wait 10 seconds max for applet to fully load
+ int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
int wait = 0;
while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
(wait < maxWait)) {
@@ -660,7 +662,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
if (message.startsWith("width")) {
// Wait for panel to come alive
- int maxWait = 5000; // wait 5 seconds max for panel to come alive
+ int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
int wait = 0;
while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
try {
@@ -721,7 +723,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Object o;
// Wait for panel to come alive
- int maxWait = 5000; // wait 5 seconds max for panel to come alive
+ int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
int wait = 0;
while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
try {
diff -r cf649a549a40 -r a29dbceee050 ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make Fri Feb 19 14:19:25 2010 +0000
+++ b/ports/hotspot/make/linux/makefiles/shark.make Fri May 28 12:42:07 2010 +0100
@@ -1,6 +1,6 @@
#
# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 2010 Red Hat, Inc.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
#
#
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
TYPE = SHARK
diff -r cf649a549a40 -r a29dbceee050 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Fri Feb 19 14:19:25 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Fri May 28 12:42:07 2010 +0100
@@ -1,6 +1,6 @@
/*
* Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,8 @@
*
*/
-//
-// Sets the default values for platform dependent flags used by the
-// shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler. See globals.hpp for details of what they do.
define_pd_global(bool, BackgroundCompilation, true );
define_pd_global(bool, UseTLAB, true );
diff -r cf649a549a40 -r a29dbceee050 ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Fri Feb 19 14:19:25 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Fri May 28 12:42:07 2010 +0100
@@ -44,6 +44,7 @@
#include <llvm/ExecutionEngine/JITMemoryManager.h>
#include <llvm/Support/CommandLine.h>
#if SHARK_LLVM_VERSION >= 27
+#include <llvm/ExecutionEngine/JIT.h>
#include <llvm/ADT/StringMap.h>
#include <llvm/Support/Debug.h>
#include <llvm/System/Host.h>
diff -r cf649a549a40 -r a29dbceee050 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Fri Feb 19 14:19:25 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Fri May 28 12:42:07 2010 +0100
@@ -1,6 +1,6 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,17 @@
#include <fnmatch.h>
using namespace llvm;
+
+#if SHARK_LLVM_VERSION >= 27
+namespace {
+ cl::opt<std::string>
+ MCPU("mcpu");
+
+ cl::list<std::string>
+ MAttrs("mattr",
+ cl::CommaSeparated);
+}
+#endif
SharkCompiler::SharkCompiler()
: AbstractCompiler()
@@ -77,9 +88,24 @@ SharkCompiler::SharkCompiler()
cl::ParseCommandLineOptions(args.size() - 1, (char **) &args[0]);
// Create the JIT
- _execution_engine = ExecutionEngine::createJIT(
- _normal_context->module(),
- NULL, memory_manager(), CodeGenOpt::Default);
+ std::string ErrorMsg;
+
+ EngineBuilder builder(_normal_context->module());
+ builder.setMCPU(MCPU);
+ builder.setMAttrs(MAttrs);
+ builder.setJITMemoryManager(memory_manager());
+ builder.setEngineKind(EngineKind::JIT);
+ builder.setErrorStr(&ErrorMsg);
+ _execution_engine = builder.create();
+
+ if (!execution_engine()) {
+ if (!ErrorMsg.empty())
+ printf("Error while creating Shark JIT: %s\n",ErrorMsg.c_str());
+ else
+ printf("Unknown error while creating Shark JIT\n");
+ exit(1);
+ }
+
execution_engine()->addModule(
_native_context->module());
#else
diff -r cf649a549a40 -r a29dbceee050 ports/hotspot/src/share/vm/shark/sharkContext.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp Fri Feb 19 14:19:25 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp Fri May 28 12:42:07 2010 +0100
@@ -1,6 +1,6 @@
/*
* Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2009 Red Hat, Inc.
+ * Copyright 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
More information about the distro-pkg-dev
mailing list