CVS: sml-dist/src/cm/main cm-boot.sml,1.86,1.87 specific-symval-fn.sml,1.8,1.9 symval.sml,1.6,1.7

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

Modified Files:
	cm-boot.sml specific-symval-fn.sml symval.sml 
Log Message:
hooked intel mac abi code into main system

Index: cm-boot.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/cm/main/cm-boot.sml,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** cm-boot.sml	18 May 2005 16:59:22 -0000	1.86
--- cm-boot.sml	14 Feb 2006 23:31:14 -0000	1.87
***************
*** 30,34 ****
        structure SSV =
  	  SpecificSymValFn (val arch = HostBackend.architecture
! 			    val os = os)
  
        val system_values =
--- 30,35 ----
        structure SSV =
  	  SpecificSymValFn (val arch = HostBackend.architecture
! 			    val os = os
! 			    val abi_variant = HostBackend.abi_variant)
  
        val system_values =

Index: specific-symval-fn.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/cm/main/specific-symval-fn.sml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** specific-symval-fn.sml	21 Dec 2004 21:03:59 -0000	1.8
--- specific-symval-fn.sml	14 Feb 2006 23:31:14 -0000	1.9
***************
*** 7,11 ****
   *)
  functor SpecificSymValFn (val arch: string
! 			  val os: SMLofNJ.SysInfo.os_kind) =
      struct
  	local
--- 7,12 ----
   *)
  functor SpecificSymValFn (val arch: string
! 			  val os: SMLofNJ.SysInfo.os_kind
! 			  val abi_variant: string option) =
      struct
  	local
***************
*** 22,28 ****
  		  | arch => ErrorMsg.impossible
  				("unknown architecture: " ^ arch)
  	    val env0 = SymVal.default
  			   { arch = arch, big = big, size = size, os = os,
! 			     version = #version_id SMLNJVersion.version }
  	    val er = ref env0
  	in
--- 23,34 ----
  		  | arch => ErrorMsg.impossible
  				("unknown architecture: " ^ arch)
+ 	    val extra_syms =
+ 		case abi_variant of
+ 		    NONE => []
+ 		  | SOME s => ["ABI_" ^ s]
  	    val env0 = SymVal.default
  			   { arch = arch, big = big, size = size, os = os,
! 			     version = #version_id SMLNJVersion.version,
! 			     extra_syms = extra_syms }
  	    val er = ref env0
  	in

Index: symval.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/cm/main/symval.sml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** symval.sml	1 Jun 2000 18:33:17 -0000	1.6
--- symval.sml	14 Feb 2006 23:31:14 -0000	1.7
***************
*** 18,22 ****
  		    size: int,
  		    os: SMLofNJ.SysInfo.os_kind,
! 		    version: int list }
  	-> env
  end
--- 18,23 ----
  		    size: int,
  		    os: SMLofNJ.SysInfo.os_kind,
! 		    version: int list,
! 		    extra_syms: string list }
  	-> env
  end
***************
*** 35,39 ****
        | define (e, s, SOME v) = StringMap.insert (e, s, v)
  
!     fun default { arch, big, size, os, version } = let
  	val arch_sym = "ARCH_" ^ arch
  	val endian_sym = if big then "BIG_ENDIAN" else "LITTLE_ENDIAN"
--- 36,40 ----
        | define (e, s, SOME v) = StringMap.insert (e, s, v)
  
!     fun default { arch, big, size, os, version, extra_syms } = let
  	val arch_sym = "ARCH_" ^ arch
  	val endian_sym = if big then "BIG_ENDIAN" else "LITTLE_ENDIAN"
***************
*** 53,63 ****
  	val minor_sym = "SMLNJ_MINOR_VERSION"
  
! 	val alldefs = [(arch_sym, 1),
! 		       (endian_sym, 1),
! 		       (size_sym, 1),
! 		       (os_sym, 1),
! 		       (major_sym, major),
! 		       (minor_sym, minor),
! 		       ("NEW_CM", 1)]
      in
  	foldl StringMap.insert' empty alldefs
--- 54,67 ----
  	val minor_sym = "SMLNJ_MINOR_VERSION"
  
! 	val alldefs =
! 	    foldr (fn (s, l) => (s, 1) :: l)
! 		  [(arch_sym, 1),
! 		   (endian_sym, 1),
! 		   (size_sym, 1),
! 		   (os_sym, 1),
! 		   (major_sym, major),
! 		   (minor_sym, minor),
! 		   ("NEW_CM", 1)]
! 		  extra_syms
      in
  	foldl StringMap.insert' empty alldefs



-------------------------------------------------------
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