# HG changeset patch
# User Christian Wimmer <Christian.Wimmer@Oracle.com>
# Date 1325808587 28800
# Node ID d713eaf4d28896d3e9beabb0e5ed47c28045d8fe
# Parent  b780ecb920c955959f01491d693131c346b37927
Renaming

diff -r b780ecb920c9 -r d713eaf4d288 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64MoveOpcode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64MoveOpcode.java	Thu Jan 05 20:15:45 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64MoveOpcode.java	Thu Jan 05 16:09:47 2012 -0800
@@ -91,8 +91,8 @@
     }
 
 
-    public enum LeaOpcode implements LIROpcode {
-        LEA;
+    public enum LeaMemoryOpcode implements LIROpcode {
+        LEA_MEMORY;
 
         public LIRInstruction create(Variable result, CiValue addrBase, CiValue addrIndex, final CiAddress.Scale addrScale, final int addrDisplacement) {
             CiValue[] inputs = new CiValue[] {addrBase, addrIndex};
@@ -112,8 +112,8 @@
     // However, the address that is loaded depends on the stack slot, and the stack slot numbers are
     // only fixed after register allocation when the number of spill slots is known. Therefore, the address
     // is not known when the LIR is generated.
-    public enum LeaStackBlockOpcode implements LIROpcode {
-        LEA_STACK_BLOCK;
+    public enum LeaStackOpcode implements LIROpcode {
+        LEA_STACK;
 
         public LIRInstruction create(Variable result, final CiStackSlot stackBlock) {
             CiValue[] outputs = new CiValue[] {result};
diff -r b780ecb920c9 -r d713eaf4d288 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64StandardOpcode.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64StandardOpcode.java	Thu Jan 05 20:15:45 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64StandardOpcode.java	Thu Jan 05 16:09:47 2012 -0800
@@ -32,8 +32,8 @@
     public static final AMD64MoveOpcode.MoveOpcode MOVE = AMD64MoveOpcode.MoveOpcode.MOVE;
     public static final AMD64MoveOpcode.LoadOpcode LOAD = AMD64MoveOpcode.LoadOpcode.LOAD;
     public static final AMD64MoveOpcode.StoreOpcode STORE = AMD64MoveOpcode.StoreOpcode.STORE;
-    public static final AMD64MoveOpcode.LeaOpcode LEA_MEMORY = AMD64MoveOpcode.LeaOpcode.LEA;
-    public static final AMD64MoveOpcode.LeaStackBlockOpcode LEA_STACK = AMD64MoveOpcode.LeaStackBlockOpcode.LEA_STACK_BLOCK;
+    public static final AMD64MoveOpcode.LeaMemoryOpcode LEA_MEMORY = AMD64MoveOpcode.LeaMemoryOpcode.LEA_MEMORY;
+    public static final AMD64MoveOpcode.LeaStackOpcode LEA_STACK = AMD64MoveOpcode.LeaStackOpcode.LEA_STACK;
     public static final AMD64MoveOpcode.MembarOpcode MEMBAR = AMD64MoveOpcode.MembarOpcode.MEMBAR;
     public static final AMD64MoveOpcode.NullCheckOpcode NULL_CHECK = AMD64MoveOpcode.NullCheckOpcode.NULL_CHECK;
     public static final AMD64MoveOpcode.CompareAndSwapOpcode CAS = AMD64MoveOpcode.CompareAndSwapOpcode.CAS;