--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/nodes/TailcallNode.java	Sun Jan 29 02:13:31 2012 +0100
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/nodes/TailcallNode.java	Sun Jan 29 11:40:04 2012 +0100
@@ -30,6 +30,7 @@
 import com.oracle.max.graal.compiler.gen.*;
 import com.oracle.max.graal.hotspot.*;
 import com.oracle.max.graal.hotspot.target.amd64.*;
+import com.oracle.max.graal.java.*;
 import com.oracle.max.graal.nodes.*;
 import com.oracle.max.graal.nodes.spi.*;
 import com.oracle.max.graal.nodes.type.*;
@@ -62,10 +63,10 @@
 
         CiKind[] signature = CiUtil.signatureToKinds(method.signature(), isStatic ? null : method.holder().kind(true));
         CiCallingConvention cc = gen.frameMap().registerConfig.getCallingConvention(CiCallingConvention.Type.JavaCall, signature, gen.target(), false);
-        gen.frameMap().callsMethod(cc, CiCallingConvention.Type.JavaCall);
+        gen.frameMap().callsMethod(cc, CiCallingConvention.Type.JavaCall); // TODO (aw): I think this is unnecessary for a tail call.
         List<ValueNode> parameters = new ArrayList<>();
-        for (int i = 0; i < cc.locations.length; i++) {
-            parameters.add(frameState.localAt(i));
+        for (int i = 0, slot = 0; i < cc.locations.length; i++, slot += FrameStateBuilder.stackSlots(frameState.localAt(slot).kind())) {
+            parameters.add(frameState.localAt(slot));
         }
         List<CiValue> argList = gen.visitInvokeArguments(cc, parameters, null);
 

--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/target/amd64/AMD64TailcallOp.java	Sun Jan 29 02:13:31 2012 +0100
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/target/amd64/AMD64TailcallOp.java	Sun Jan 29 11:40:04 2012 +0100
@@ -37,9 +37,15 @@
  * Performs a hard-coded tail call to the specified target, which normally should be an RiCompiledCode instance.
  */
 public class AMD64TailcallOp extends AMD64LIRInstruction {
+
     public AMD64TailcallOp(List<CiValue> parameters, CiValue target, CiValue[] callingConvention) {
         super("TAILCALL", LIRInstruction.NO_OPERANDS, null, toArray(parameters, target), LIRInstruction.NO_OPERANDS, callingConvention.clone());
         assert inputs.length == temps.length + 1;
+
+        for (int i = 0; i < temps.length; i++) {
+            assert isRegister(temps[i]) : "too many parameters for tail call";
+            assert sameRegister(temps[i], inputs[i]) : "inputs do not match calling convention";
+        }
     }
 
     private static CiValue[] toArray(List<CiValue> parameters, CiValue target) {
@@ -51,19 +57,6 @@
 
     @Override
     public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) {
-        // move all parameters to the correct positions, according to the calling convention
-        // TODO: These moves should not be part of the TAILCALL opcode, but emitted as separate MOVE instructions before.
-        for (int i = 0; i < inputs.length - 1; i++) {
-            assert inputs[i].kind == CiKind.Object || inputs[i].kind == CiKind.Int || inputs[i].kind == CiKind.Long : "only Object, int and long supported for now";
-            assert isRegister(temps[i]) : "too many parameters";
-            if (isRegister(inputs[i])) {
-                if (inputs[i] != temps[i]) {
-                    masm.movq(asRegister(temps[i]), asRegister(inputs[i]));
-                }
-            } else {
-                masm.movq(asRegister(temps[i]), tasm.asAddress(inputs[i]));
-            }
-        }
         // destroy the current frame (now the return address is the top of stack)
         masm.leave();
 
@@ -74,10 +67,10 @@
 
     @Override
     protected EnumSet<OperandFlag> flagsFor(OperandMode mode, int index) {
-        if (mode == OperandMode.Input && index == 0) {
-            return EnumSet.of(OperandFlag.Register, OperandFlag.Constant, OperandFlag.Stack);
-        } else if (mode == OperandMode.Temp && index == 0) {
-            return EnumSet.of(OperandFlag.Register, OperandFlag.Stack);
+        if (mode == OperandMode.Input) {
+            return EnumSet.of(OperandFlag.Register);
+        } else if (mode == OperandMode.Temp) {
+            return EnumSet.of(OperandFlag.Register);
         }
         throw Util.shouldNotReachHere();
     }