CVS: sml-dist/src/compiler/CodeGen/x86 x86CG.sml,1.27,1.28 x86gen.sml,1.4,1.5

Update of /cvsroot/smlnj/sml-dist/src/compiler/CodeGen/x86
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9167/src/compiler/CodeGen/x86

Modified Files:
	x86CG.sml x86gen.sml 
Log Message:
hooked intel mac abi code into main system

Index: x86CG.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/CodeGen/x86/x86CG.sml,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** x86CG.sml	13 Feb 2006 22:17:29 -0000	1.27
--- x86CG.sml	14 Feb 2006 23:31:16 -0000	1.28
***************
*** 2,6 ****
   * X86 specific backend.  This one uses the new RA8 scheme.
   *)
! structure X86CG = 
    MachineGen
    ( structure I          = X86Instr
--- 2,14 ----
   * X86 specific backend.  This one uses the new RA8 scheme.
   *)
! local
!     val fast_floating_point =
! 	MLRiscControl.mkFlag ("x86-fast-fp",
! 			      "whether to use the fast-fp backend (x86)")
! in
! functor X86CG (structure CCallParams: sig val frameAlign : int
! 					  val returnSmallStructsInRegs : bool
! 				      end
!                val abi_variant: string option) =
    MachineGen
    ( structure I          = X86Instr
***************
*** 11,14 ****
--- 19,23 ----
  
      structure MachSpec   = X86Spec
+     val abi_variant      = abi_variant
      structure ClientPseudoOps = X86ClientPseudoOps
      structure PseudoOps  = X86PseudoOps
***************
*** 19,25 ****
      structure Shuffle    = X86Shuffle
  
!     val fast_floating_point =
! 	MLRiscControl.mkFlag ("x86-fast-fp",
! 			      "whether to use the fast-fp backend (x86)")
  
      structure CCalls     = IA32SVID_CCalls (
--- 28,32 ----
      structure Shuffle    = X86Shuffle
  
!     val fast_floating_point = fast_floating_point
  
      structure CCalls     = IA32SVID_CCalls (
***************
*** 28,33 ****
  	val fast_floating_point = fast_floating_point
  (* NOTE: the following need to be changed for MacOS X on Intel *)
! 	val frameAlign = 4
! 	val returnSmallStructsInRegs = false)
  
      structure OmitFramePtr = 
--- 35,40 ----
  	val fast_floating_point = fast_floating_point
  (* NOTE: the following need to be changed for MacOS X on Intel *)
! 	val frameAlign = CCallParams.frameAlign
! 	val returnSmallStructsInRegs = CCallParams.returnSmallStructsInRegs)
  
      structure OmitFramePtr = 
***************
*** 198,201 ****
        end
      ) (* X86RA *)
!   ) 
! 
--- 205,208 ----
        end
      ) (* X86RA *)
!   ) (* X86CG *)
! end

Index: x86gen.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/CodeGen/x86/x86gen.sml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** x86gen.sml	8 Mar 2002 21:05:26 -0000	1.4
--- x86gen.sml	14 Feb 2006 23:31:16 -0000	1.5
***************
*** 1,5 ****
! structure X86MC = 
    FLINTComp(
!     structure Gen=X86CG
      fun collect epthunk = (Gen.finish ();
  			   CodeString.getCodeString (epthunk ())))
--- 1,13 ----
! (* x86gen.sml
!  *
!  * Copyright (c) 2006 by The Fellowship of SML/NJ
!  *)
! functor X86MC (structure CCallParams : sig val frameAlign : int
! 					   val returnSmallStructsInRegs : bool
! 				       end
!                val abi_variant: string option) =
    FLINTComp(
!     structure Gen=X86CG (structure CCallParams = CCallParams
!                          val abi_variant = abi_variant)
      fun collect epthunk = (Gen.finish ();
  			   CodeString.getCodeString (epthunk ())))



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642