/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 28 06:43:17 PDT 2010
changeset 9101193ed8b7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9101193ed8b7
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Feb 22 17:53:44 2010 -0500
- Fixed IcedTea Bug# 446: Use JDK_UPDATE_VERSION to set the jpi
version.
changeset 3b7e7b51b89f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3b7e7b51b89f
author: Gary Benson <gbenson at redhat.com>
date: Fri May 28 14:38:51 2010 +0100
Reformat Shark to match upstream HotSpot
2010-02-23 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp:
Reformatted with trailing opening braces to match upstream
HotSpot.
* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkConstant.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkEntry.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkValue.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
changeset 44d5f7a1a79b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=44d5f7a1a79b
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 17:36:57 2010 +0000
Whitespace fixes
2010-02-23 Gary Benson <gbenson at redhat.com>
* ports/hotspot/make/linux/makefiles/shark.make: Whitespace
fixes.
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
* ports/hotspot/src/share/vm/includeDB_shark: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkInliner.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
diffstat:
45 files changed, 896 insertions(+), 1488 deletions(-)
ChangeLog | 83 +++++
Makefile.am | 1
plugin/icedteanp/IcedTeaNPPlugin.cc | 4
ports/hotspot/make/linux/makefiles/shark.make | 2
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 4
ports/hotspot/src/share/vm/includeDB_shark | 2
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 157 ++++------
ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 85 ++---
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 193 ++++---------
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 14
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 67 +---
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 129 ++------
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 18 -
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 36 +-
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 15 -
ports/hotspot/src/share/vm/shark/sharkConstant.cpp | 9
ports/hotspot/src/share/vm/shark/sharkConstant.hpp | 12
ports/hotspot/src/share/vm/shark/sharkContext.cpp | 17 -
ports/hotspot/src/share/vm/shark/sharkContext.hpp | 87 ++---
ports/hotspot/src/share/vm/shark/sharkEntry.hpp | 21 -
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 46 +--
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 37 --
ports/hotspot/src/share/vm/shark/sharkInliner.cpp | 107 ++-----
ports/hotspot/src/share/vm/shark/sharkInliner.hpp | 2
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | 34 --
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp | 3
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp | 3
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 50 +--
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 51 +--
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 12
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 17 -
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp | 68 +---
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 52 ---
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 19 -
ports/hotspot/src/share/vm/shark/sharkStack.cpp | 65 +---
ports/hotspot/src/share/vm/shark/sharkStack.hpp | 92 ++----
ports/hotspot/src/share/vm/shark/sharkState.cpp | 42 +-
ports/hotspot/src/share/vm/shark/sharkState.hpp | 65 +---
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 13
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 5
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 222 +++++----------
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 115 ++-----
ports/hotspot/src/share/vm/shark/sharkType.hpp | 75 +----
ports/hotspot/src/share/vm/shark/sharkValue.cpp | 168 +++--------
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 65 +---
diffs (truncated from 6222 to 500 lines):
diff -r 6efc1920dff5 -r 44d5f7a1a79b ChangeLog
--- a/ChangeLog Fri May 28 13:59:18 2010 +0100
+++ b/ChangeLog Tue Feb 23 17:36:57 2010 +0000
@@ -1,3 +1,86 @@ 2010-05-28 Andrew John Hughes <ahughes@
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+ * ports/hotspot/src/share/vm/includeDB_shark: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInliner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Reformatted
+ with trailing opening braces to match upstream HotSpot.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkConstant.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkEntry.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-22 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
+ jpi version.
+
2010-05-28 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 6efc1920dff5 -r 44d5f7a1a79b Makefile.am
--- a/Makefile.am Fri May 28 13:59:18 2010 +0100
+++ b/Makefile.am Tue Feb 23 17:36:57 2010 +0000
@@ -2051,6 +2051,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
$(PLUGIN_BUILD_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
mkdir -p $(PLUGIN_BUILD_DIR) && \
$(CXX) $(CXXFLAGS) \
+ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
-DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
-DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
$(GLIB_CFLAGS) \
diff -r 6efc1920dff5 -r 44d5f7a1a79b plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 28 13:59:18 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Feb 23 17:36:57 2010 +0000
@@ -107,7 +107,7 @@ exception statement from your version. *
"application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \
"application/x-java-applet;version=1.5:class,jar:IcedTea;" \
"application/x-java-applet;version=1.6:class,jar:IcedTea;" \
- "application/x-java-applet;jpi-version=1.6.0_00:class,jar:IcedTea;" \
+ "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \
"application/x-java-bean:class,jar:IcedTea;" \
"application/x-java-bean;version=1.1:class,jar:IcedTea;" \
"application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \
@@ -123,7 +123,7 @@ exception statement from your version. *
"application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \
"application/x-java-bean;version=1.5:class,jar:IcedTea;" \
"application/x-java-bean;version=1.6:class,jar:IcedTea;" \
- "application/x-java-bean;jpi-version=1.6.0_00:class,jar:IcedTea;" \
+ "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" \
"application/x-java-vm-npruntime::IcedTea;"
#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
diff -r 6efc1920dff5 -r 44d5f7a1a79b ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make Fri May 28 13:59:18 2010 +0100
+++ b/ports/hotspot/make/linux/makefiles/shark.make Tue Feb 23 17:36:57 2010 +0000
@@ -20,7 +20,7 @@
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
-#
+#
#
# Sets make macros for making Shark version of VM
diff -r 6efc1920dff5 -r 44d5f7a1a79b ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Fri May 28 13:59:18 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Tue Feb 23 17:36:57 2010 +0000
@@ -20,7 +20,7 @@
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
- *
+ *
*/
// Set the default values for platform dependent flags used by the
@@ -50,7 +50,7 @@ define_pd_global(intx, NewRatio,
define_pd_global(intx, NewRatio, 12 );
define_pd_global(intx, NewSizeThreadIncrease, 4*K );
define_pd_global(intx, InitialCodeCacheSize, 160*K);
-define_pd_global(intx, ReservedCodeCacheSize, 32*M );
+define_pd_global(intx, ReservedCodeCacheSize, 32*M );
define_pd_global(bool, ProfileInterpreter, false);
define_pd_global(intx, CodeCacheExpansionSize, 32*K );
define_pd_global(uintx, CodeCacheMinBlockLength, 1 );
diff -r 6efc1920dff5 -r 44d5f7a1a79b ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark Fri May 28 13:59:18 2010 +0100
+++ b/ports/hotspot/src/share/vm/includeDB_shark Tue Feb 23 17:36:57 2010 +0000
@@ -20,7 +20,7 @@
// Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
// CA 95054 USA or visit www.sun.com if you need additional information or
// have any questions.
-//
+//
//
// NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
diff -r 6efc1920dff5 -r 44d5f7a1a79b ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Fri May 28 13:59:18 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Tue Feb 23 17:36:57 2010 +0000
@@ -28,8 +28,7 @@
using namespace llvm;
-void SharkBlock::parse_bytecode(int start, int limit)
-{
+void SharkBlock::parse_bytecode(int start, int limit) {
SharkValue *a, *b, *c, *d;
int i;
@@ -45,7 +44,7 @@ void SharkBlock::parse_bytecode(int star
if (SharkTraceBytecodes)
tty->print_cr("%4d: %s", bci(), Bytecodes::name(bc()));
-
+
if (has_trap() && trap_bci() == bci()) {
do_trap(trap_request());
return;
@@ -96,7 +95,7 @@ void SharkBlock::parse_bytecode(int star
}
}
break;
- }
+ }
}
switch (bc()) {
@@ -295,25 +294,25 @@ void SharkBlock::parse_bytecode(int star
xpop();
xpop();
break;
- case Bytecodes::_swap:
+ case Bytecodes::_swap:
a = xpop();
b = xpop();
xpush(a);
xpush(b);
- break;
+ break;
case Bytecodes::_dup:
a = xpop();
xpush(a);
xpush(a);
break;
- case Bytecodes::_dup_x1:
+ case Bytecodes::_dup_x1:
a = xpop();
b = xpop();
xpush(a);
xpush(b);
xpush(a);
break;
- case Bytecodes::_dup_x2:
+ case Bytecodes::_dup_x2:
a = xpop();
b = xpop();
c = xpop();
@@ -322,7 +321,7 @@ void SharkBlock::parse_bytecode(int star
xpush(b);
xpush(a);
break;
- case Bytecodes::_dup2:
+ case Bytecodes::_dup2:
a = xpop();
b = xpop();
xpush(b);
@@ -395,7 +394,7 @@ void SharkBlock::parse_bytecode(int star
do_irem();
break;
case Bytecodes::_ineg:
- a = pop();
+ a = pop();
push(SharkValue::create_jint(
builder()->CreateNeg(a->jint_value()), a->zero_checked()));
break;
@@ -471,7 +470,7 @@ void SharkBlock::parse_bytecode(int star
do_lrem();
break;
case Bytecodes::_lneg:
- a = pop();
+ a = pop();
push(SharkValue::create_jlong(
builder()->CreateNeg(a->jlong_value()), a->zero_checked()));
break;
@@ -548,18 +547,18 @@ void SharkBlock::parse_bytecode(int star
break;
case Bytecodes::_fdiv:
b = pop();
- a = pop();
+ a = pop();
push(SharkValue::create_jfloat(
builder()->CreateFDiv(a->jfloat_value(), b->jfloat_value())));
break;
case Bytecodes::_frem:
b = pop();
- a = pop();
+ a = pop();
push(SharkValue::create_jfloat(
builder()->CreateFRem(a->jfloat_value(), b->jfloat_value())));
break;
case Bytecodes::_fneg:
- a = pop();
+ a = pop();
push(SharkValue::create_jfloat(
builder()->CreateFNeg(a->jfloat_value())));
break;
@@ -584,18 +583,18 @@ void SharkBlock::parse_bytecode(int star
break;
case Bytecodes::_ddiv:
b = pop();
- a = pop();
+ a = pop();
push(SharkValue::create_jdouble(
builder()->CreateFDiv(a->jdouble_value(), b->jdouble_value())));
break;
case Bytecodes::_drem:
b = pop();
- a = pop();
+ a = pop();
push(SharkValue::create_jdouble(
builder()->CreateFRem(a->jdouble_value(), b->jdouble_value())));
break;
case Bytecodes::_dneg:
- a = pop();
+ a = pop();
push(SharkValue::create_jdouble(
builder()->CreateFNeg(a->jdouble_value())));
break;
@@ -628,7 +627,7 @@ void SharkBlock::parse_bytecode(int star
break;
case Bytecodes::_i2l:
- a = pop();
+ a = pop();
push(SharkValue::create_jlong(
builder()->CreateIntCast(
a->jint_value(), SharkType::jlong_type(), true), a->zero_checked()));
@@ -890,18 +889,15 @@ void SharkBlock::parse_bytecode(int star
}
}
-SharkState* SharkBlock::initial_current_state()
-{
+SharkState* SharkBlock::initial_current_state() {
return entry_state()->copy();
}
-int SharkBlock::switch_default_dest()
-{
+int SharkBlock::switch_default_dest() {
return iter()->get_dest_table(0);
}
-int SharkBlock::switch_table_length()
-{
+int SharkBlock::switch_table_length() {
switch(bc()) {
case Bytecodes::_tableswitch:
return iter()->get_int_table(2) - iter()->get_int_table(1) + 1;
@@ -911,11 +907,10 @@ int SharkBlock::switch_table_length()
default:
ShouldNotReachHere();
- }
+ }
}
-int SharkBlock::switch_key(int i)
-{
+int SharkBlock::switch_key(int i) {
switch(bc()) {
case Bytecodes::_tableswitch:
return iter()->get_int_table(1) + i;
@@ -925,11 +920,10 @@ int SharkBlock::switch_key(int i)
default:
ShouldNotReachHere();
- }
+ }
}
-int SharkBlock::switch_dest(int i)
-{
+int SharkBlock::switch_dest(int i) {
switch(bc()) {
case Bytecodes::_tableswitch:
return iter()->get_dest_table(i + 3);
@@ -939,11 +933,10 @@ int SharkBlock::switch_dest(int i)
default:
ShouldNotReachHere();
- }
+ }
}
-void SharkBlock::do_div_or_rem(bool is_long, bool is_rem)
-{
+void SharkBlock::do_div_or_rem(bool is_long, bool is_rem) {
SharkValue *sb = pop();
SharkValue *sa = pop();
@@ -973,7 +966,7 @@ void SharkBlock::do_div_or_rem(bool is_l
builder()->CreateICmpEQ(a, p),
builder()->CreateICmpEQ(b, q)),
special_case, general_case);
-
+
builder()->SetInsertPoint(special_case);
Value *special_result;
if (is_rem) {
@@ -1010,8 +1003,7 @@ void SharkBlock::do_div_or_rem(bool is_l
push(SharkValue::create_jint(result, false));
}
-void SharkBlock::do_field_access(bool is_get, bool is_field)
-{
+void SharkBlock::do_field_access(bool is_get, bool is_field) {
bool will_link;
ciField *field = iter()->get_field(will_link);
assert(will_link, "typeflow responsibility");
@@ -1041,12 +1033,12 @@ void SharkBlock::do_field_access(bool is
BasicType basic_type = field->type()->basic_type();
const Type *stack_type = SharkType::to_stackType(basic_type);
const Type *field_type = SharkType::to_arrayType(basic_type);
-
+
Value *addr = builder()->CreateAddressOfStructEntry(
object, in_ByteSize(field->offset_in_bytes()),
PointerType::getUnqual(field_type),
"addr");
-
+
// Do the access
if (is_get) {
Value *field_value = builder()->CreateLoad(addr);
@@ -1065,7 +1057,7 @@ void SharkBlock::do_field_access(bool is
field_value, field_type, basic_type != T_CHAR);
builder()->CreateStore(field_value, addr);
-
+
if (!field->type()->is_primitive_type())
builder()->CreateUpdateBarrierSet(oopDesc::bs(), addr);
@@ -1079,8 +1071,7 @@ void SharkBlock::do_field_access(bool is
push(value);
}
-void SharkBlock::do_lcmp()
-{
+void SharkBlock::do_lcmp() {
Value *b = pop()->jlong_value();
Value *a = pop()->jlong_value();
@@ -1111,8 +1102,7 @@ void SharkBlock::do_lcmp()
push(SharkValue::create_jint(result, false));
}
-void SharkBlock::do_fcmp(bool is_double, bool unordered_is_greater)
-{
+void SharkBlock::do_fcmp(bool is_double, bool unordered_is_greater) {
Value *a, *b;
if (is_double) {
b = pop()->jdouble_value();
@@ -1159,137 +1149,110 @@ void SharkBlock::do_fcmp(bool is_double,
push(SharkValue::create_jint(result, false));
}
-void SharkBlock::emit_IR()
-{
+void SharkBlock::emit_IR() {
ShouldNotCallThis();
}
-SharkState* SharkBlock::entry_state()
-{
+SharkState* SharkBlock::entry_state() {
ShouldNotCallThis();
}
-void SharkBlock::do_zero_check(SharkValue* value)
-{
+void SharkBlock::do_zero_check(SharkValue* value) {
ShouldNotCallThis();
}
-void SharkBlock::maybe_add_backedge_safepoint()
-{
+void SharkBlock::maybe_add_backedge_safepoint() {
ShouldNotCallThis();
}
-bool SharkBlock::has_trap()
-{
+bool SharkBlock::has_trap() {
return false;
}
-int SharkBlock::trap_request()
-{
+int SharkBlock::trap_request() {
ShouldNotCallThis();
}
-int SharkBlock::trap_bci()
-{
+int SharkBlock::trap_bci() {
ShouldNotCallThis();
}
-void SharkBlock::do_trap(int trap_request)
-{
+void SharkBlock::do_trap(int trap_request) {
ShouldNotCallThis();
}
-void SharkBlock::do_arraylength()
-{
+void SharkBlock::do_arraylength() {
ShouldNotCallThis();
}
-void SharkBlock::do_aload(BasicType basic_type)
-{
+void SharkBlock::do_aload(BasicType basic_type) {
ShouldNotCallThis();
}
-void SharkBlock::do_astore(BasicType basic_type)
More information about the distro-pkg-dev
mailing list