Mercurial > hg > graal-compiler
changeset 6405:6b56cf2bf7da
Rename snippet factory method to a less generic name
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Fri, 14 Sep 2012 14:07:58 -0700 |
parents | 4ee4f44b55c6 |
children | 33dab7b4b006 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/UnsafeSnippets.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java |
diffstat | 2 files changed, 37 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/UnsafeSnippets.java Fri Sep 14 14:03:43 2012 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/UnsafeSnippets.java Fri Sep 14 14:07:58 2012 -0700 @@ -51,9 +51,9 @@ } public Object getObjectVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); Object result = getObject(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -62,9 +62,9 @@ } public void putObjectVolatile(Object o, long offset, Object x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putObject(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } public int getInt(Object o, long offset) { @@ -73,9 +73,9 @@ } public int getIntVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); int result = getInt(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -84,9 +84,9 @@ } public void putIntVolatile(Object o, long offset, int x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putInt(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } public boolean getBoolean(Object o, long offset) { @@ -96,9 +96,9 @@ } public boolean getBooleanVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); boolean result = getBoolean(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -107,9 +107,9 @@ } public void putBooleanVolatile(Object o, long offset, boolean x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putBoolean(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } public byte getByte(Object o, long offset) { @@ -119,9 +119,9 @@ } public byte getByteVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); byte result = getByte(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -130,9 +130,9 @@ } public void putByteVolatile(Object o, long offset, byte x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putByte(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } public short getShort(Object o, long offset) { @@ -142,9 +142,9 @@ } public short getShortVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); short result = getShort(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -153,9 +153,9 @@ } public void putShortVolatile(Object o, long offset, short x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putShort(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } public char getChar(Object o, long offset) { @@ -165,9 +165,9 @@ } public char getCharVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); char result = getChar(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -176,9 +176,9 @@ } public void putCharVolatile(Object o, long offset, char x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putChar(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } public long getLong(Object o, long offset) { @@ -188,9 +188,9 @@ } public long getLongVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); long result = getLong(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -199,9 +199,9 @@ } public void putLongVolatile(Object o, long offset, long x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putLong(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } public float getFloat(Object o, long offset) { @@ -211,9 +211,9 @@ } public float getFloatVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); float result = getFloat(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -222,9 +222,9 @@ } public void putFloatVolatile(Object o, long offset, float x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putFloat(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } public double getDouble(Object o, long offset) { @@ -234,9 +234,9 @@ } public double getDoubleVolatile(Object o, long offset) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_READ); double result = getDouble(o, offset); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_READ); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_READ); return result; } @@ -245,8 +245,8 @@ } public void putDoubleVolatile(Object o, long offset, double x) { - MembarNode.get(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_PRE_VOLATILE_WRITE); putDouble(o, offset, x); - MembarNode.get(MemoryBarriers.JMM_POST_VOLATILE_WRITE); + MembarNode.memoryBarrier(MemoryBarriers.JMM_POST_VOLATILE_WRITE); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Fri Sep 14 14:03:43 2012 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Fri Sep 14 14:07:58 2012 -0700 @@ -49,7 +49,7 @@ @SuppressWarnings("unused") @NodeIntrinsic - public static void get(@ConstantNodeParameter int barriers) { + public static void memoryBarrier(@ConstantNodeParameter int barriers) { throw new UnsupportedOperationException("This method may only be compiled with the Graal compiler"); } }