# HG changeset patch # User Roland Schatz # Date 1362057325 -3600 # Node ID 775745294caadd3e2593611dd4482af72d87b68c # Parent ea1c2bed2bfa5fc783a2b2e41160239607c6cef7 Change Value to AllocatableValue in move operations. diff -r ea1c2bed2bfa -r 775745294caa graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java --- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Thu Feb 28 14:15:24 2013 +0100 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Thu Feb 28 14:15:25 2013 +0100 @@ -145,9 +145,9 @@ public static class LoadOp extends MemOp { - @Def({REG}) protected Value result; + @Def({REG}) protected AllocatableValue result; - public LoadOp(Value result, AMD64Address address, LIRFrameState state) { + public LoadOp(AllocatableValue result, AMD64Address address, LIRFrameState state) { super(address, state); this.result = result; } @@ -188,9 +188,9 @@ public static class StoreOp extends MemOp { - @Use({REG}) protected Value input; + @Use({REG}) protected AllocatableValue input; - public StoreOp(AMD64Address address, Value input, LIRFrameState state) { + public StoreOp(AMD64Address address, AllocatableValue input, LIRFrameState state) { super(address, state); this.input = input; } @@ -278,10 +278,10 @@ public static class LeaOp extends AMD64LIRInstruction { - @Def({REG}) protected Value result; + @Def({REG}) protected AllocatableValue result; @Use({ADDR, UNINITIALIZED}) protected AMD64Address address; - public LeaOp(Value result, AMD64Address address) { + public LeaOp(AllocatableValue result, AMD64Address address) { this.result = result; this.address = address; } @@ -294,10 +294,10 @@ public static class StackLeaOp extends AMD64LIRInstruction { - @Def({REG}) protected Value result; + @Def({REG}) protected AllocatableValue result; @Use({STACK, UNINITIALIZED}) protected StackSlot slot; - public StackLeaOp(Value result, StackSlot slot) { + public StackLeaOp(AllocatableValue result, StackSlot slot) { this.result = result; this.slot = slot; } @@ -324,7 +324,7 @@ public static class NullCheckOp extends AMD64LIRInstruction { - @Use protected Value input; + @Use protected AllocatableValue input; @State protected LIRFrameState state; public NullCheckOp(Variable input, LIRFrameState state) { @@ -342,12 +342,12 @@ @Opcode("CAS") public static class CompareAndSwapOp extends AMD64LIRInstruction { - @Def protected Value result; + @Def protected AllocatableValue result; @Use({ADDR}) protected AMD64Address address; - @Use protected Value cmpValue; - @Use protected Value newValue; + @Use protected AllocatableValue cmpValue; + @Use protected AllocatableValue newValue; - public CompareAndSwapOp(Value result, AMD64Address address, Value cmpValue, Value newValue) { + public CompareAndSwapOp(AllocatableValue result, AMD64Address address, AllocatableValue cmpValue, AllocatableValue newValue) { this.result = result; this.address = address; this.cmpValue = cmpValue; @@ -550,7 +550,7 @@ } } - protected static void compareAndSwap(TargetMethodAssembler tasm, AMD64MacroAssembler masm, Value result, AMD64Address address, Value cmpValue, Value newValue) { + protected static void compareAndSwap(TargetMethodAssembler tasm, AMD64MacroAssembler masm, AllocatableValue result, AMD64Address address, AllocatableValue cmpValue, AllocatableValue newValue) { assert asRegister(cmpValue) == AMD64.rax && asRegister(result) == AMD64.rax; if (tasm.target.isMP) { diff -r ea1c2bed2bfa -r 775745294caa graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXMove.java --- a/graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXMove.java Thu Feb 28 14:15:24 2013 +0100 +++ b/graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXMove.java Thu Feb 28 14:15:25 2013 +0100 @@ -120,11 +120,11 @@ public static class LoadOp extends PTXLIRInstruction { - @Def({REG}) protected Value result; + @Def({REG}) protected AllocatableValue result; @Use({ADDR}) protected PTXAddress address; @State protected LIRFrameState state; - public LoadOp(Value result, PTXAddress address, LIRFrameState state) { + public LoadOp(AllocatableValue result, PTXAddress address, LIRFrameState state) { this.result = result; this.address = address; this.state = state; @@ -150,10 +150,10 @@ public static class StoreOp extends PTXLIRInstruction { @Use({ADDR}) protected PTXAddress address; - @Use({REG}) protected Value input; + @Use({REG}) protected AllocatableValue input; @State protected LIRFrameState state; - public StoreOp(PTXAddress address, Value input, LIRFrameState state) { + public StoreOp(PTXAddress address, AllocatableValue input, LIRFrameState state) { this.address = address; this.input = input; this.state = state; @@ -177,10 +177,10 @@ public static class LeaOp extends PTXLIRInstruction { - @Def({REG}) protected Value result; + @Def({REG}) protected AllocatableValue result; @Use({ADDR, UNINITIALIZED}) protected PTXAddress address; - public LeaOp(Value result, PTXAddress address) { + public LeaOp(AllocatableValue result, PTXAddress address) { this.result = result; this.address = address; } @@ -193,10 +193,10 @@ public static class StackLeaOp extends PTXLIRInstruction { - @Def({REG}) protected Value result; + @Def({REG}) protected AllocatableValue result; @Use({STACK, UNINITIALIZED}) protected StackSlot slot; - public StackLeaOp(Value result, StackSlot slot) { + public StackLeaOp(AllocatableValue result, StackSlot slot) { this.result = result; this.slot = slot; } @@ -210,12 +210,12 @@ @Opcode("CAS") public static class CompareAndSwapOp extends PTXLIRInstruction { - @Def protected Value result; + @Def protected AllocatableValue result; @Use({ADDR}) protected PTXAddress address; - @Use protected Value cmpValue; - @Use protected Value newValue; + @Use protected AllocatableValue cmpValue; + @Use protected AllocatableValue newValue; - public CompareAndSwapOp(Value result, PTXAddress address, Value cmpValue, Value newValue) { + public CompareAndSwapOp(AllocatableValue result, PTXAddress address, AllocatableValue cmpValue, AllocatableValue newValue) { this.result = result; this.address = address; this.cmpValue = cmpValue; @@ -276,7 +276,7 @@ } @SuppressWarnings("unused") - protected static void compareAndSwap(TargetMethodAssembler tasm, PTXAssembler masm, Value result, PTXAddress address, Value cmpValue, Value newValue) { + protected static void compareAndSwap(TargetMethodAssembler tasm, PTXAssembler masm, AllocatableValue result, PTXAddress address, AllocatableValue cmpValue, AllocatableValue newValue) { throw new InternalError("NYI"); } }