[MLton-commit] r7367

[Matthew Fluet]

More descriptive variable names.
----------------------------------------------------------------------

U   mlton/trunk/include/x86-main.h
U   mlton/trunk/mlton/codegen/x86-codegen/x86-generate-transfers.fun
U   mlton/trunk/mlton/codegen/x86-codegen/x86-mlton-basic.fun
U   mlton/trunk/mlton/codegen/x86-codegen/x86-mlton-basic.sig

----------------------------------------------------------------------

Modified: mlton/trunk/include/x86-main.h
===================================================================
--- mlton/trunk/include/x86-main.h	2009-11-07 21:32:35 UTC (rev 7366)
+++ mlton/trunk/include/x86-main.h	2009-12-02 22:04:24 UTC (rev 7367)
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2007 Henry Cejtin, Matthew Fluet, Suresh
+/* Copyright (C) 2009 Matthew Fluet.
+ * Copyright (C) 2000-2007 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  *
  * MLton is released under a BSD-style license.
@@ -11,8 +12,8 @@
 #include "common-main.h"
 
 /* Globals */
-PRIVATE Word32 applyFFTemp;
-PRIVATE Word32 applyFFTemp2;
+PRIVATE Word32 applyFFTempFun;
+PRIVATE Word32 applyFFTempArg;
 PRIVATE Word32 checkTemp;
 PRIVATE Word32 cReturnTemp[16];
 PRIVATE Pointer c_stackP;

Modified: mlton/trunk/mlton/codegen/x86-codegen/x86-generate-transfers.fun
===================================================================
--- mlton/trunk/mlton/codegen/x86-codegen/x86-generate-transfers.fun	2009-11-07 21:32:35 UTC (rev 7366)
+++ mlton/trunk/mlton/codegen/x86-codegen/x86-generate-transfers.fun	2009-12-02 22:04:24 UTC (rev 7367)
@@ -1,4 +1,5 @@
-(* Copyright (C) 1999-2008 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 2009 Matthew Fluet.
+ * Copyright (C) 1999-2008 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  * Copyright (C) 1997-2000 NEC Research Institute.
  *
@@ -1152,8 +1153,8 @@
                      val c_stackP = x86MLton.c_stackPContentsOperand
                      val c_stackPDerefFloat = x86MLton.c_stackPDerefFloatOperand
                      val c_stackPDerefDouble = x86MLton.c_stackPDerefDoubleOperand
-                     val applyFFTemp = x86MLton.applyFFTempContentsOperand
-                     val applyFFTemp2 = x86MLton.applyFFTemp2ContentsOperand
+                     val applyFFTempFun = x86MLton.applyFFTempFunContentsOperand
+                     val applyFFTempArg = x86MLton.applyFFTempArgContentsOperand
                      val (fptrArg, args) =
                         case target of 
                            Direct _ => (AppendList.empty, args)
@@ -1167,7 +1168,7 @@
                                  (AppendList.single
                                   (Assembly.instruction_mov
                                    {src = #1 fptrArg,
-                                    dst = applyFFTemp2,
+                                    dst = applyFFTempFun,
                                     size = #2 fptrArg}),
                                   args)
                               end
@@ -1206,12 +1207,12 @@
                                    then (AppendList.fromList
                                          [Assembly.instruction_movx
                                           {oper = Instruction.MOVZX,
-                                           dst = applyFFTemp,
+                                           dst = applyFFTempArg,
                                            src = arg,
                                            dstsize = wordSize,
                                            srcsize = size},
                                           Assembly.instruction_ppush
-                                          {src = applyFFTemp,
+                                          {src = applyFFTempArg,
                                            base = c_stackP,
                                            size = wordSize}],
                                          Size.toBytes wordSize)
@@ -1440,7 +1441,7 @@
                               AppendList.fromList
                               [Assembly.directive_ccall (),
                                Assembly.instruction_call
-                               {target = applyFFTemp2,
+                               {target = applyFFTempFun,
                                 absolute = true}]
                      val kill
                        = if isSome frameInfo

Modified: mlton/trunk/mlton/codegen/x86-codegen/x86-mlton-basic.fun
===================================================================
--- mlton/trunk/mlton/codegen/x86-codegen/x86-mlton-basic.fun	2009-11-07 21:32:35 UTC (rev 7366)
+++ mlton/trunk/mlton/codegen/x86-codegen/x86-mlton-basic.fun	2009-12-02 22:04:24 UTC (rev 7367)
@@ -175,20 +175,20 @@
                     size = pointerSize,
                     class = Classes.StaticNonTemp}
   
-  val applyFFTemp = Label.fromString "applyFFTemp"
-  val applyFFTempContents 
-    = makeContents {base = Immediate.label applyFFTemp,
+  val applyFFTempFun = Label.fromString "applyFFTempFun"
+  val applyFFTempFunContents
+    = makeContents {base = Immediate.label applyFFTempFun,
                     size = wordSize,
                     class = Classes.StaticTemp}
-  val applyFFTempContentsOperand
-    = Operand.memloc applyFFTempContents
-  val applyFFTemp2 = Label.fromString "applyFFTemp2"
-  val applyFFTemp2Contents 
-    = makeContents {base = Immediate.label applyFFTemp2,
+  val applyFFTempFunContentsOperand
+    = Operand.memloc applyFFTempFunContents
+  val applyFFTempArg = Label.fromString "applyFFTempArg"
+  val applyFFTempArgContents
+    = makeContents {base = Immediate.label applyFFTempArg,
                     size = wordSize,
                     class = Classes.StaticTemp}
-  val applyFFTemp2ContentsOperand
-    = Operand.memloc applyFFTemp2Contents
+  val applyFFTempArgContentsOperand
+    = Operand.memloc applyFFTempArgContents
 
   val realTemp1D = Label.fromString "realTemp1D"
   val realTemp1ContentsD

Modified: mlton/trunk/mlton/codegen/x86-codegen/x86-mlton-basic.sig
===================================================================
--- mlton/trunk/mlton/codegen/x86-codegen/x86-mlton-basic.sig	2009-11-07 21:32:35 UTC (rev 7366)
+++ mlton/trunk/mlton/codegen/x86-codegen/x86-mlton-basic.sig	2009-12-02 22:04:24 UTC (rev 7367)
@@ -86,8 +86,8 @@
     val globalOffsetTableContents : x86.MemLoc.t
 
     (* Static temps defined in x86-main.h *)
-    val applyFFTempContentsOperand : x86.Operand.t
-    val applyFFTemp2ContentsOperand : x86.Operand.t
+    val applyFFTempFunContentsOperand : x86.Operand.t
+    val applyFFTempArgContentsOperand : x86.Operand.t
     val realTemp1ContentsOperand : x86.Size.t -> x86.Operand.t
     val realTemp2ContentsOperand : x86.Size.t -> x86.Operand.t
     val realTemp3ContentsOperand : x86.Size.t -> x86.Operand.t