Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /sml/branches/num64/system/smlnj/init/built-in32.sml
ViewVC logotype

Diff of /sml/branches/num64/system/smlnj/init/built-in32.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 5252, Sat Jun 1 19:56:51 2019 UTC revision 5253, Sat Jun 1 21:11:08 2019 UTC
# Line 198  Line 198 
198    
199      structure Word =      structure Word =
200        struct        struct
201          val toLarge : word -> word32      = InLine.unsigned_word_to_word32          val toLarge : word -> word64      = InLine.unsigned_word_to_word64
202          val toLargeX : word -> word32     = InLine.signed_word_to_word32          val toLargeX : word -> word64     = InLine.signed_word_to_word64
203          val fromLarge : word32 -> word    = InLine.word32_to_word          val fromLarge : word64 -> word    = InLine.word64_to_word
204          val toInt : word -> int           = InLine.unsigned_word_to_int          val toInt : word -> int           = InLine.unsigned_word_to_int
205          val toIntX : word -> int          = InLine.signed_word_to_int          val toIntX : word -> int          = InLine.signed_word_to_int
206          val fromInt : int -> word         = InLine.int_to_word          val fromInt : int -> word         = InLine.int_to_word
# Line 212  Line 212 
212          val toInt32 : word -> int32 = InLine.copy_word_to_int32          val toInt32 : word -> int32 = InLine.copy_word_to_int32
213          val toWord32 : word -> word32 = InLine.word_to_word32          val toWord32 : word -> word32 = InLine.word_to_word32
214          val toWord64 : word -> word64 = InLine.word_to_word64          val toWord64 : word -> word64 = InLine.word_to_word64
215            val fromWord32 : word32 -> word = InLine.word32_to_word
216    
217          val orb     : word * word -> word = InLine.word_orb          val orb     : word * word -> word = InLine.word_orb
218          val xorb    : word * word -> word = InLine.word_xorb          val xorb    : word * word -> word = InLine.word_xorb
# Line 240  Line 241 
241    
242      structure Word8 =      structure Word8 =
243        struct        struct
244            val toLarge       = InLine.unsigned_word8_to_word64
245        (* 64BIT: LargeWord is still 32 bit: *)          val toLargeX      = InLine.signed_word8_to_word64
246          val toLarge       = InLine.unsigned_word8_to_word32          val fromLarge     = InLine.word64_to_word8
         val toLargeX      = InLine.signed_word8_to_word32  
         val fromLarge     = InLine.word32_to_word8  
247          val toInt         = InLine.unsigned_word8_to_int          val toInt         = InLine.unsigned_word8_to_int
248          val toIntX        = InLine.signed_word8_to_int          val toIntX        = InLine.signed_word8_to_int
249          val fromInt       = InLine.int_to_word8          val fromInt       = InLine.int_to_word8
# Line 283  Line 282 
282    
283      structure Word32 =      structure Word32 =
284        struct        struct
285          val toLarge : word32 -> word32   = InLine.inl_identity          val toLarge : word32 -> word64   = InLine.unsigned_word32_to_word64
286          val toLargeX : word32 -> word32  = InLine.inl_identity          val toLargeX : word32 -> word64  = InLine.signed_word32_to_word64
287          val fromLarge : word32 -> word32 = InLine.inl_identity          val fromLarge : word64 -> word32 = InLine.word64_to_word32
288          val toInt                        = InLine.unsigned_word32_to_int          val toInt                        = InLine.unsigned_word32_to_int
289          val toIntX                       = InLine.signed_word32_to_int          val toIntX                       = InLine.signed_word32_to_int
290          val fromInt                      = InLine.int_to_word32          val fromInt                      = InLine.int_to_word32
# Line 323  Line 322 
322    
323      structure Word64 =      structure Word64 =
324        struct        struct
   
325          val extern : word64 -> word32 * word32   = InLine.word64_to_pair          val extern : word64 -> word32 * word32   = InLine.word64_to_pair
326          val intern : word32 * word32 -> word64   = InLine.word64_from_pair          val intern : word32 * word32 -> word64   = InLine.word64_from_pair
327    
328  (* 64BIT: add these once LargeWord = Word64          val toLarge : word64 -> word64           = InLine.inl_identity
329          val toLarge : word64 -> ??               = ??          val toLargeX : word64 -> word64          = InLine.inl_identity
330          val toLargeX : word64 -> ??              = ??          val fromLarge : word64 -> word64         = InLine.inl_identity
         val fromLarge : ?? -> word64             = ??  
 *)  
331          val toInt : word64 -> int                = InLine.unsigned_word64_to_int          val toInt : word64 -> int                = InLine.unsigned_word64_to_int
332          val toIntX : word64 -> int               = InLine.signed_word64_to_int          val toIntX : word64 -> int               = InLine.signed_word64_to_int
333          val fromInt : int -> word64              = InLine.int_to_word64          val fromInt : int -> word64              = InLine.int_to_word64
# Line 368  Line 364 
364    
365      structure Char =      structure Char =
366        struct        struct
   
367          val maxOrd = 255          val maxOrd = 255
368    
369          exception Chr = Core.Chr          exception Chr = Core.Chr

Legend:
Removed from v.5252  
changed lines
  Added in v.5253

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0