Mercurial > hg > graal-compiler
changeset 22782:ef56f81f88ee
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 08 Oct 2015 15:59:44 +0200 |
parents | 4c101dcc419d (current diff) 4899ae79cf25 (diff) |
children | da7d39c53b92 |
files | |
diffstat | 2 files changed, 8 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Log.java Thu Oct 08 15:57:40 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Log.java Thu Oct 08 15:59:44 2015 +0200 @@ -39,16 +39,11 @@ public final class Log { public static final ForeignCallDescriptor LOG_PRIMITIVE = new ForeignCallDescriptor("logPrimitive", void.class, int.class, long.class, boolean.class); - public static final ForeignCallDescriptor LOG_OBJECT = new ForeignCallDescriptor("logObject", void.class, Object.class, int.class); + public static final ForeignCallDescriptor LOG_OBJECT = new ForeignCallDescriptor("logObject", void.class, Object.class, boolean.class, boolean.class); public static final ForeignCallDescriptor LOG_PRINTF = new ForeignCallDescriptor("logPrintf", void.class, Object.class, long.class, long.class, long.class); - // Note: Must be kept in sync with constants in jvmciRuntime.hpp - private static final int LOG_OBJECT_NEWLINE = 0x01; - private static final int LOG_OBJECT_STRING = 0x02; - private static final int LOG_OBJECT_ADDRESS = 0x04; - @NodeIntrinsic(ForeignCallNode.class) - private static native void log(@ConstantNodeParameter ForeignCallDescriptor logObject, Object object, int flags); + private static native void log(@ConstantNodeParameter ForeignCallDescriptor logObject, Object object, boolean asString, boolean newline); @NodeIntrinsic(ForeignCallNode.class) private static native void log(@ConstantNodeParameter ForeignCallDescriptor logPrimitive, int typeChar, long value, boolean newline); @@ -124,15 +119,11 @@ } public static void print(String value) { - log(LOG_OBJECT, value, LOG_OBJECT_STRING); - } - - public static void printAddress(Object o) { - log(LOG_OBJECT, o, LOG_OBJECT_ADDRESS); + log(LOG_OBJECT, value, true, false); } public static void printObject(Object o) { - log(LOG_OBJECT, o, 0); + log(LOG_OBJECT, o, false, false); } public static void println(boolean value) { @@ -184,15 +175,11 @@ } public static void println(String value) { - log(LOG_OBJECT, value, LOG_OBJECT_NEWLINE | LOG_OBJECT_STRING); - } - - public static void printlnAddress(Object o) { - log(LOG_OBJECT, o, LOG_OBJECT_NEWLINE | LOG_OBJECT_ADDRESS); + log(LOG_OBJECT, value, true, true); } public static void printlnObject(Object o) { - log(LOG_OBJECT, o, LOG_OBJECT_NEWLINE); + log(LOG_OBJECT, o, false, true); } public static void println() {
--- a/mx.graal/suite.py Thu Oct 08 15:57:40 2015 +0200 +++ b/mx.graal/suite.py Thu Oct 08 15:59:44 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "9692347207a759e81c3b190c3a2c9240b654660a", + "version" : "7d4688ad5afdf6db8e9d250c05f9f0e1bf765361", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"}, @@ -14,7 +14,7 @@ }, { "name" : "truffle", - "version" : "371045b1312d412bafa29882e6c3f7bfe6c0f8f1", + "version" : "cf203af4610c25642a6db00a8fd98e20e8f515b0", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/truffle", "kind" : "hg"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},