# HG changeset patch
# User Lukas Stadler <lukas.stadler@oracle.com>
# Date 1282157044 25200
# Node ID ed6bd46ad55e48d68855a66d46b06cd4d2403da1
# Parent  98fffb304868d02df60782a408473e60f0dc4c40
small cleanup

diff -r 98fffb304868 -r ed6bd46ad55e c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java	Tue Aug 17 17:34:25 2010 -0700
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java	Wed Aug 18 11:44:04 2010 -0700
@@ -127,38 +127,6 @@
         return templates;
     }
 
-    private XirTemplate buildNewInstance() {
-        XirOperand result = asm.restart(CiKind.Word);
-        XirOperand type = asm.createInputParameter("type", CiKind.Object);
-        XirOperand instanceSize = asm.createConstantInputParameter("instance size", CiKind.Word);
-
-        XirOperand thread = asm.createRegister("thread", CiKind.Word, AMD64.r15);
-        XirOperand temp1 = asm.createTemp("temp1", CiKind.Word);
-        XirOperand temp2 = asm.createTemp("temp2", CiKind.Word);
-        XirLabel tlabFull = asm.createOutOfLineLabel("tlab full");
-        XirLabel resume = asm.createInlineLabel("resume");
-
-        asm.pload(CiKind.Word, result, thread, asm.i(config.threadTlabTopOffset), false);
-        asm.add(temp1, result, instanceSize);
-        asm.pload(CiKind.Word, temp2, thread, asm.i(config.threadTlabEndOffset), false);
-
-        asm.jgt(tlabFull, temp1, temp2);
-        asm.pstore(CiKind.Word, thread, asm.i(config.threadTlabTopOffset), temp1, false);
-        asm.bindInline(resume);
-
-        asm.pload(CiKind.Word, temp1, type, asm.i(config.instanceHeaderPrototypeOffset), false);
-        asm.pstore(CiKind.Word, result, temp1, false);
-        asm.pstore(CiKind.Object, result, asm.i(config.hubOffset), type, false);
-
-        asm.bindOutOfLine(tlabFull);
-        XirOperand arg = asm.createRegister("runtime call argument", CiKind.Object, AMD64.rdx);
-        asm.mov(arg, type);
-        asm.callRuntime(config.newInstanceStub, result);
-        asm.jmp(resume);
-
-        return asm.finishTemplate("new instance");
-    }
-
     private XirTemplate buildPrologue(boolean staticMethod) {
         asm.restart(CiKind.Void);
         XirOperand temp = asm.createRegister("temp (rax)", CiKind.Int, AMD64.rax);
@@ -430,6 +398,38 @@
         return asm.finishTemplate(addr, "invokespecial");
     }
 
+    private XirTemplate buildNewInstance() {
+        XirOperand result = asm.restart(CiKind.Word);
+        XirOperand type = asm.createInputParameter("type", CiKind.Object);
+        XirOperand instanceSize = asm.createConstantInputParameter("instance size", CiKind.Word);
+
+        XirOperand thread = asm.createRegister("thread", CiKind.Word, AMD64.r15);
+        XirOperand temp1 = asm.createTemp("temp1", CiKind.Word);
+        XirOperand temp2 = asm.createTemp("temp2", CiKind.Word);
+        XirLabel tlabFull = asm.createOutOfLineLabel("tlab full");
+        XirLabel resume = asm.createInlineLabel("resume");
+
+        asm.pload(CiKind.Word, result, thread, asm.i(config.threadTlabTopOffset), false);
+        asm.add(temp1, result, instanceSize);
+        asm.pload(CiKind.Word, temp2, thread, asm.i(config.threadTlabEndOffset), false);
+
+        asm.jgt(tlabFull, temp1, temp2);
+        asm.pstore(CiKind.Word, thread, asm.i(config.threadTlabTopOffset), temp1, false);
+        asm.bindInline(resume);
+
+        asm.pload(CiKind.Word, temp1, type, asm.i(config.instanceHeaderPrototypeOffset), false);
+        asm.pstore(CiKind.Word, result, temp1, false);
+        asm.pstore(CiKind.Object, result, asm.i(config.hubOffset), type, false);
+
+        asm.bindOutOfLine(tlabFull);
+        XirOperand arg = asm.createRegister("runtime call argument", CiKind.Object, AMD64.rdx);
+        asm.mov(arg, type);
+        asm.callRuntime(config.newInstanceStub, result);
+        asm.jmp(resume);
+
+        return asm.finishTemplate("new instance");
+    }
+
     @Override
     public XirSnippet genArrayLength(XirSite site, XirArgument array) {
         return new XirSnippet(arrayLengthTemplate, array);