Mercurial > hg > release > icedtea-1.9
changeset 1734:1c92b0f7c071
2009-03-12 Gary Benson <gbenson@redhat.com>
* ports/hotspot/src/share/vm/shark/sharkValue.hpp
(LLVMValue): Moved to llvmValue.hpp
(SharkValue::create_generic): Moved from sharkInline.hpp.
(SharkValue::create_returnAddress): Likewise.
* ports/hotspot/src/share/vm/shark/llvmValue.hpp: New file.
* ports/hotspot/src/share/vm/shark/sharkValue.inline.hpp: Removed.
* ports/hotspot/src/share/vm/includeDB_shark: Updated.
(transplanted from 1caf618d2b4cf5fc2a58d3754526fa5db09b10ab)
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Thu, 12 Mar 2009 10:23:39 -0400 |
| parents | 019ce4c19ba2 |
| children | 80257489410d |
| files | ChangeLog ports/hotspot/src/share/vm/includeDB_shark ports/hotspot/src/share/vm/shark/llvmValue.hpp ports/hotspot/src/share/vm/shark/sharkValue.hpp ports/hotspot/src/share/vm/shark/sharkValue.inline.hpp |
| diffstat | 5 files changed, 103 insertions(+), 81 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 12 07:08:14 2009 -0400 +++ b/ChangeLog Thu Mar 12 10:23:39 2009 -0400 @@ -1,3 +1,16 @@ +2009-03-12 Gary Benson <gbenson@redhat.com> + + * ports/hotspot/src/share/vm/shark/sharkValue.hpp + (LLVMValue): Moved to llvmValue.hpp + (SharkValue::create_generic): Moved from sharkInline.hpp. + (SharkValue::create_returnAddress): Likewise. + + * ports/hotspot/src/share/vm/shark/llvmValue.hpp: New file. + + * ports/hotspot/src/share/vm/shark/sharkValue.inline.hpp: Removed. + + * ports/hotspot/src/share/vm/includeDB_shark: Updated. + 2009-03-12 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/includeDB_shark Thu Mar 12 07:08:14 2009 -0400 +++ b/ports/hotspot/src/share/vm/includeDB_shark Thu Mar 12 10:23:39 2009 -0400 @@ -75,6 +75,9 @@ globals.cpp shark_globals.hpp +llvmValue.hpp llvmHeaders.hpp +llvmValue.hpp sharkType.hpp + methodOop.cpp sharkEntry.hpp shark_globals.cpp shark_globals.hpp @@ -85,12 +88,13 @@ sharkBlock.cpp debug.hpp sharkBlock.cpp bytecodes.hpp sharkBlock.cpp llvmHeaders.hpp +sharkBlock.cpp llvmValue.hpp sharkBlock.cpp shark_globals.hpp sharkBlock.cpp sharkBlock.hpp sharkBlock.cpp sharkBuilder.hpp sharkBlock.cpp sharkRuntime.hpp sharkBlock.cpp sharkState.inline.hpp -sharkBlock.cpp sharkValue.inline.hpp +sharkBlock.cpp sharkValue.hpp sharkBlock.hpp allocation.hpp sharkBlock.hpp ciMethod.hpp @@ -104,6 +108,7 @@ sharkBuilder.cpp ciMethod.hpp sharkBuilder.cpp debug.hpp sharkBuilder.cpp llvmHeaders.hpp +sharkBuilder.cpp llvmValue.hpp sharkBuilder.cpp methodOop.hpp sharkBuilder.cpp os.hpp sharkBuilder.cpp resourceArea.hpp @@ -119,14 +124,16 @@ sharkBuilder.hpp ciType.hpp sharkBuilder.hpp debug.hpp sharkBuilder.hpp llvmHeaders.hpp +sharkBuilder.hpp llvmValue.hpp sharkBuilder.hpp sizes.hpp sharkBuilder.hpp sharkCompiler.hpp sharkBuilder.hpp sharkType.hpp -sharkBuilder.hpp sharkValue.inline.hpp +sharkBuilder.hpp sharkValue.hpp sharkBuilder.hpp sharkEntry.hpp sharkCacheDecache.cpp ciMethod.hpp sharkCacheDecache.cpp debugInfoRec.hpp +sharkCacheDecache.cpp llvmValue.hpp sharkCacheDecache.cpp sharkBuilder.hpp sharkCacheDecache.cpp sharkCacheDecache.hpp sharkCacheDecache.cpp sharkFunction.hpp @@ -168,12 +175,13 @@ sharkConstantPool.cpp cpCacheOop.hpp sharkConstantPool.cpp debug.hpp sharkConstantPool.cpp llvmHeaders.hpp +sharkConstantPool.cpp llvmValue.hpp sharkConstantPool.cpp methodOop.hpp sharkConstantPool.cpp sharkBuilder.hpp sharkConstantPool.cpp sharkConstantPool.hpp sharkConstantPool.cpp sharkState.inline.hpp sharkConstantPool.cpp sharkType.hpp -sharkConstantPool.cpp sharkValue.inline.hpp +sharkConstantPool.cpp sharkValue.hpp sharkConstantPool.hpp allocation.hpp sharkConstantPool.hpp llvmHeaders.hpp @@ -188,6 +196,7 @@ sharkFunction.cpp ciTypeFlow.hpp sharkFunction.cpp debug.hpp sharkFunction.cpp llvmHeaders.hpp +sharkFunction.cpp llvmValue.hpp sharkFunction.cpp shark_globals.hpp sharkFunction.cpp sharkBuilder.hpp sharkFunction.cpp sharkEntry.hpp @@ -201,6 +210,7 @@ sharkFunction.hpp ciStreams.hpp sharkFunction.hpp ciTypeFlow.hpp sharkFunction.hpp llvmHeaders.hpp +sharkFunction.hpp llvmValue.hpp sharkFunction.hpp sharkBuilder.hpp sharkInliner.cpp allocation.hpp @@ -212,7 +222,7 @@ sharkInliner.cpp sharkInliner.hpp sharkInliner.cpp sharkIntrinsics.hpp sharkInliner.cpp sharkState.inline.hpp -sharkInliner.cpp sharkValue.inline.hpp +sharkInliner.cpp sharkValue.hpp sharkInliner.hpp allocation.hpp sharkInliner.hpp ciMethod.hpp @@ -225,7 +235,7 @@ sharkIntrinsics.cpp sharkIntrinsics.hpp sharkIntrinsics.cpp sharkRuntime.hpp sharkIntrinsics.cpp sharkState.inline.hpp -sharkIntrinsics.cpp sharkValue.inline.hpp +sharkIntrinsics.cpp sharkValue.hpp sharkIntrinsics.hpp allocation.hpp sharkIntrinsics.hpp ciMethod.hpp @@ -240,6 +250,7 @@ sharkMemoryManager.cpp sharkMemoryManager.hpp sharkMonitor.cpp llvmHeaders.hpp +sharkMonitor.cpp llvmValue.hpp sharkMonitor.cpp sharkMonitor.hpp sharkMonitor.cpp sharkRuntime.hpp sharkMonitor.cpp sharkState.inline.hpp @@ -247,6 +258,7 @@ sharkMonitor.hpp allocation.hpp sharkMonitor.hpp llvmHeaders.hpp +sharkMonitor.hpp llvmValue.hpp sharkMonitor.hpp sharkBuilder.hpp sharkMonitor.hpp sharkFunction.hpp @@ -273,7 +285,7 @@ sharkState.cpp sharkState.inline.hpp sharkState.cpp sharkTopLevelBlock.hpp sharkState.cpp sharkType.hpp -sharkState.cpp sharkValue.inline.hpp +sharkState.cpp sharkValue.hpp sharkState.hpp allocation.hpp sharkState.hpp ciMethod.hpp @@ -301,6 +313,7 @@ sharkTopLevelBlock.cpp debug.hpp sharkTopLevelBlock.cpp deoptimization.hpp sharkTopLevelBlock.cpp llvmHeaders.hpp +sharkTopLevelBlock.cpp llvmValue.hpp sharkTopLevelBlock.cpp shark_globals.hpp sharkTopLevelBlock.cpp sharkTopLevelBlock.hpp sharkTopLevelBlock.cpp sharkBuilder.hpp @@ -308,7 +321,7 @@ sharkTopLevelBlock.cpp sharkInliner.hpp sharkTopLevelBlock.cpp sharkRuntime.hpp sharkTopLevelBlock.cpp sharkState.inline.hpp -sharkTopLevelBlock.cpp sharkValue.inline.hpp +sharkTopLevelBlock.cpp sharkValue.hpp sharkTopLevelBlock.hpp allocation.hpp sharkTopLevelBlock.hpp bytecodes.hpp @@ -321,7 +334,7 @@ sharkTopLevelBlock.hpp sharkFunction.hpp sharkTopLevelBlock.hpp sharkMonitor.hpp sharkTopLevelBlock.hpp sharkState.inline.hpp -sharkTopLevelBlock.hpp sharkValue.inline.hpp +sharkTopLevelBlock.hpp sharkValue.hpp sharkType.cpp arrayOop.hpp sharkType.cpp globalDefinitions.hpp @@ -338,9 +351,5 @@ sharkValue.hpp allocation.hpp sharkValue.hpp ciType.hpp sharkValue.hpp llvmHeaders.hpp +sharkValue.hpp llvmValue.hpp sharkValue.hpp sharkType.hpp - -sharkValue.inline.hpp ciType.hpp -sharkValue.inline.hpp llvmHeaders.hpp -sharkValue.inline.hpp sharkValue.hpp -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ports/hotspot/src/share/vm/shark/llvmValue.hpp Thu Mar 12 10:23:39 2009 -0400 @@ -0,0 +1,58 @@ +/* + * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2008 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 + * 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. + * + * 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. + * + */ + +class LLVMValue : public AllStatic { + public: + static llvm::ConstantInt* jbyte_constant(jbyte value) + { + return llvm::ConstantInt::get(SharkType::jbyte_type(), value, true); + } + static llvm::ConstantInt* jint_constant(jint value) + { + return llvm::ConstantInt::get(SharkType::jint_type(), value, true); + } + static llvm::ConstantInt* jlong_constant(jlong value) + { + return llvm::ConstantInt::get(SharkType::jlong_type(), value, true); + } + static llvm::ConstantFP* jfloat_constant(jfloat value) + { + return llvm::ConstantFP::get(SharkType::jfloat_type(), value); + } + static llvm::ConstantFP* jdouble_constant(jdouble value) + { + return llvm::ConstantFP::get(SharkType::jdouble_type(), value); + } + static llvm::ConstantPointerNull* null() + { + return llvm::ConstantPointerNull::get(SharkType::jobject_type()); + } + + public: + static llvm::ConstantInt* intptr_constant(intptr_t value) + { + return llvm::ConstantInt::get(SharkType::intptr_type(), value, false); + } +};
--- a/ports/hotspot/src/share/vm/shark/sharkValue.hpp Thu Mar 12 07:08:14 2009 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkValue.hpp Thu Mar 12 10:23:39 2009 -0400 @@ -23,40 +23,6 @@ * */ -class LLVMValue : public AllStatic { - public: - static llvm::ConstantInt* jbyte_constant(jbyte value) - { - return llvm::ConstantInt::get(SharkType::jbyte_type(), value, true); - } - static llvm::ConstantInt* jint_constant(jint value) - { - return llvm::ConstantInt::get(SharkType::jint_type(), value, true); - } - static llvm::ConstantInt* jlong_constant(jlong value) - { - return llvm::ConstantInt::get(SharkType::jlong_type(), value, true); - } - static llvm::ConstantFP* jfloat_constant(jfloat value) - { - return llvm::ConstantFP::get(SharkType::jfloat_type(), value); - } - static llvm::ConstantFP* jdouble_constant(jdouble value) - { - return llvm::ConstantFP::get(SharkType::jdouble_type(), value); - } - static llvm::ConstantPointerNull* null() - { - return llvm::ConstantPointerNull::get(SharkType::jobject_type()); - } - - public: - static llvm::ConstantInt* intptr_constant(intptr_t value) - { - return llvm::ConstantInt::get(SharkType::intptr_type(), value, false); - } -}; - class SharkValue : public ResourceObj { protected: SharkValue() {} @@ -403,6 +369,11 @@ } }; +inline SharkValue* SharkValue::create_generic(ciType* type, llvm::Value* value) +{ + return new SharkComputableValue(type, value); +} + class SharkReturnAddressValue : public SharkValue { friend class SharkValue; @@ -451,3 +422,8 @@ assert(_bci == value->returnAddress_value(), "should be"); } }; + +inline SharkValue* SharkValue::create_returnAddress(int bci) +{ + return new SharkReturnAddressValue(bci); +}
--- a/ports/hotspot/src/share/vm/shark/sharkValue.inline.hpp Thu Mar 12 07:08:14 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -/* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 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 - * 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. - * - * 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. - * - */ - -inline SharkValue* SharkValue::create_generic(ciType* type, llvm::Value* value) -{ - return new SharkComputableValue(type, value); -} - -inline SharkValue* SharkValue::create_returnAddress(int bci) -{ - return new SharkReturnAddressValue(bci); -}