Mercurial > hg > truffle
changeset 15012:289a017dd9e2
reduced upstream delta
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 07 Apr 2014 20:52:09 +0200 |
parents | c8e575742f36 |
children | deea05f9c316 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java src/share/vm/oops/klass.hpp src/share/vm/runtime/arguments.cpp src/share/vm/runtime/arguments.hpp |
diffstat | 4 files changed, 5 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Mon Apr 07 19:21:22 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Mon Apr 07 20:52:09 2014 +0200 @@ -153,7 +153,7 @@ * Checks that a factory overriding is valid. A factory B can only override/replace a factory A * if the B.getClass() is a subclass of A.getClass(). This models the assumption that B is * extends the behavior of A and has therefore understood the behavior expected of A. - * + * * @param baseFactory * @param overridingFactory */ @@ -265,15 +265,13 @@ /** * Gets the Graal mirror for a {@link Class} object. - * + * * @return the {@link HotSpotResolvedJavaType} corresponding to {@code javaClass} */ public ResolvedJavaType fromClass(Class<?> javaClass) { return graalMirrors.get(javaClass); } - public static final String GRAAL_GPU_ISALIST_PROPERTY_NAME = "graal.gpu.isalist"; - /** * Gets the names of the supported GPU architectures for the purpose of finding the * corresponding {@linkplain HotSpotBackendFactory backend} objects. @@ -320,7 +318,7 @@ /** * Converts a name to a Java type. - * + * * @param name a well formed Java type in {@linkplain JavaType#getName() internal} format * @param accessingType the context of resolution (may be null) * @param resolve force resolution to a {@link ResolvedJavaType}. If true, this method will @@ -383,7 +381,7 @@ /** * The offset from the origin of an array to the first element. - * + * * @return the offset in bytes */ public static int getArrayBaseOffset(Kind kind) { @@ -413,7 +411,7 @@ /** * The scale used for the index when accessing elements of an array of this kind. - * + * * @return the scale in order to convert the index into a byte offset */ public static int getArrayIndexScale(Kind kind) {
--- a/src/share/vm/oops/klass.hpp Mon Apr 07 19:21:22 2014 +0200 +++ b/src/share/vm/oops/klass.hpp Mon Apr 07 20:52:09 2014 +0200 @@ -298,10 +298,6 @@ static ByteSize modifier_flags_offset() { return in_ByteSize(offset_of(Klass, _modifier_flags)); } static ByteSize layout_helper_offset() { return in_ByteSize(offset_of(Klass, _layout_helper)); } static ByteSize access_flags_offset() { return in_ByteSize(offset_of(Klass, _access_flags)); } -#ifdef GRAAL - static ByteSize next_sibling_offset() { return in_ByteSize(offset_of(Klass, _next_sibling)); } - static ByteSize subklass_offset() { return in_ByteSize(offset_of(Klass, _subklass)); } -#endif // Unpacking layout_helper: enum {
--- a/src/share/vm/runtime/arguments.cpp Mon Apr 07 19:21:22 2014 +0200 +++ b/src/share/vm/runtime/arguments.cpp Mon Apr 07 20:52:09 2014 +0200 @@ -35,7 +35,6 @@ #include "prims/jvmtiExport.hpp" #include "runtime/arguments.hpp" #include "runtime/globals_extension.hpp" -#include "runtime/gpu.hpp" #include "runtime/java.hpp" #include "services/management.hpp" #include "services/memTracker.hpp"
--- a/src/share/vm/runtime/arguments.hpp Mon Apr 07 19:21:22 2014 +0200 +++ b/src/share/vm/runtime/arguments.hpp Mon Apr 07 20:52:09 2014 +0200 @@ -264,9 +264,6 @@ static SystemProperty *_java_home; static SystemProperty *_java_class_path; static SystemProperty *_sun_boot_class_path; -#ifdef GRAAL - static SystemProperty *_graal_gpu_isalist; -#endif // Meta-index for knowing what packages are in the boot class path static char* _meta_index_path;