[MLton-commit] r4632

[Matthew Fluet]

Merge trunk revisions 4553:4631 into x86_64 branch
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/doc/changelog
U   mlton/branches/on-20050822-x86_64-branch/mlton/codegen/x86-codegen/x86-generate-transfers.fun

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

Modified: mlton/branches/on-20050822-x86_64-branch/doc/changelog
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/doc/changelog	2006-06-08 23:20:48 UTC (rev 4631)
+++ mlton/branches/on-20050822-x86_64-branch/doc/changelog	2006-06-08 23:28:54 UTC (rev 4632)
@@ -1,5 +1,9 @@
 Here are the changes since version 20051202.
 
+* 2006-06-08
+  - Fixed a bug in the native codegen's implementation of the C-calling
+    convention.
+	
 * 2006-05-11
   - Ported to PowerPC-AIX.
   - Fixed a bug in the runtime for the cases where nonblocking IO with

Modified: mlton/branches/on-20050822-x86_64-branch/mlton/codegen/x86-codegen/x86-generate-transfers.fun
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/mlton/codegen/x86-codegen/x86-generate-transfers.fun	2006-06-08 23:20:48 UTC (rev 4631)
+++ mlton/branches/on-20050822-x86_64-branch/mlton/codegen/x86-codegen/x86-generate-transfers.fun	2006-06-08 23:28:54 UTC (rev 4632)
@@ -1128,7 +1128,8 @@
                                     {src = arg,
                                      dst = c_stackPDerefFloat,
                                      size = size}]
-                            else if Size.eq (size, Size.BYTE)
+                            else if Size.eq (size, Size.BYTE) 
+                                    orelse Size.eq (size, Size.WORD)
                               then AppendList.fromList
                                    [Assembly.instruction_movx
                                     {oper = Instruction.MOVZX,