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/trunk/src/ml-nlffi-lib/internals/c-int.sml
ViewVC logotype

Diff of /sml/trunk/src/ml-nlffi-lib/internals/c-int.sml

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

revision 1741, Tue Dec 21 19:20:57 2004 UTC revision 1742, Tue Dec 21 21:04:01 2004 UTC
# Line 89  Line 89 
89      type ushort = MLRep.Unsigned.word      type ushort = MLRep.Unsigned.word
90      type slong = MLRep.Signed.int      type slong = MLRep.Signed.int
91      type ulong = MLRep.Unsigned.word      type ulong = MLRep.Unsigned.word
92        type slonglong = MLRep.LongLongSigned.int
93        type ulonglong = MLRep.LongLongUnsigned.word
94      type float = MLRep.Real.real      type float = MLRep.Real.real
95      type double = MLRep.Real.real      type double = MLRep.Real.real
96    
# Line 100  Line 102 
102      type 'c ushort_obj = (ushort, 'c) obj      type 'c ushort_obj = (ushort, 'c) obj
103      type 'c slong_obj = (slong, 'c) obj      type 'c slong_obj = (slong, 'c) obj
104      type 'c ulong_obj = (ulong, 'c) obj      type 'c ulong_obj = (ulong, 'c) obj
105        type 'c slonglong_obj = (slonglong, 'c) obj
106        type 'c ulonglong_obj = (ulonglong, 'c) obj
107      type 'c float_obj = (float, 'c) obj      type 'c float_obj = (float, 'c) obj
108      type 'c double_obj = (double, 'c) obj      type 'c double_obj = (double, 'c) obj
109      type 'c voidptr_obj = (voidptr, 'c) obj      type 'c voidptr_obj = (voidptr, 'c) obj
# Line 115  Line 119 
119      type 'c ushort_obj' = (ushort, 'c) obj'      type 'c ushort_obj' = (ushort, 'c) obj'
120      type 'c slong_obj' = (slong, 'c) obj'      type 'c slong_obj' = (slong, 'c) obj'
121      type 'c ulong_obj' = (ulong, 'c) obj'      type 'c ulong_obj' = (ulong, 'c) obj'
122        type 'c slonglong_obj' = (slonglong, 'c) obj'
123        type 'c ulonglong_obj' = (ulonglong, 'c) obj'
124      type 'c float_obj' = (float, 'c) obj'      type 'c float_obj' = (float, 'c) obj'
125      type 'c double_obj' = (double, 'c) obj'      type 'c double_obj' = (double, 'c) obj'
126      type 'c voidptr_obj' = (voidptr, 'c) obj'      type 'c voidptr_obj' = (voidptr, 'c) obj'
# Line 204  Line 210 
210          val ushort = CMemory.short_size          val ushort = CMemory.short_size
211          val slong  = CMemory.long_size          val slong  = CMemory.long_size
212          val ulong  = CMemory.long_size          val ulong  = CMemory.long_size
213            val slonglong = CMemory.longlong_size
214            val ulonglong = CMemory.longlong_size
215          val float  = CMemory.float_size          val float  = CMemory.float_size
216          val double = CMemory.double_size          val double = CMemory.double_size
217    
# Line 249  Line 257 
257          val ushort = BASE S.ushort          val ushort = BASE S.ushort
258          val slong  = BASE S.slong          val slong  = BASE S.slong
259          val ulong  = BASE S.ulong          val ulong  = BASE S.ulong
260            val slonglong = BASE S.slonglong
261            val ulonglong = BASE S.ulonglong
262          val float  = BASE S.float          val float  = BASE S.float
263          val double = BASE S.double          val double = BASE S.double
264    
# Line 283  Line 293 
293          fun c_ushort (s: ushort) = s          fun c_ushort (s: ushort) = s
294          fun c_slong (l: slong) = l          fun c_slong (l: slong) = l
295          fun c_ulong (l: ulong) = l          fun c_ulong (l: ulong) = l
296            fun c_slonglong (l: slonglong) = l
297            fun c_ulonglong (l: ulonglong) = l
298          fun c_float (f: float) = f          fun c_float (f: float) = f
299          fun c_double (d: double) = d          fun c_double (d: double) = d
300          fun i2c_enum (e: 'e enum) = e          fun i2c_enum (e: 'e enum) = e
# Line 295  Line 307 
307          val ml_ushort = c_ushort          val ml_ushort = c_ushort
308          val ml_slong = c_slong          val ml_slong = c_slong
309          val ml_ulong = c_ulong          val ml_ulong = c_ulong
310            val ml_slonglong = c_slonglong
311            val ml_ulonglong = c_ulonglong
312          val ml_float = c_float          val ml_float = c_float
313          val ml_double = c_double          val ml_double = c_double
314          val c2i_enum = i2c_enum          val c2i_enum = i2c_enum
# Line 309  Line 323 
323          val sshort' = CMemory.load_sshort          val sshort' = CMemory.load_sshort
324          val ulong' = CMemory.load_ulong          val ulong' = CMemory.load_ulong
325          val slong' = CMemory.load_slong          val slong' = CMemory.load_slong
326            val ulonglong' = CMemory.load_ulonglong
327            val slonglong' = CMemory.load_slonglong
328          val float' = CMemory.load_float          val float' = CMemory.load_float
329          val double' = CMemory.load_double          val double' = CMemory.load_double
330          val enum' = CMemory.load_sint          val enum' = CMemory.load_sint
# Line 325  Line 341 
341          val sshort = sshort' o strip_type          val sshort = sshort' o strip_type
342          val ulong = ulong' o strip_type          val ulong = ulong' o strip_type
343          val slong = slong' o strip_type          val slong = slong' o strip_type
344            val ulonglong = ulonglong' o strip_type
345            val slonglong = slonglong' o strip_type
346          val float = float' o strip_type          val float = float' o strip_type
347          val double = double' o strip_type          val double = double' o strip_type
348          val voidptr = voidptr' o strip_type          val voidptr = voidptr' o strip_type
# Line 355  Line 373 
373          val sshort' = CMemory.store_sshort          val sshort' = CMemory.store_sshort
374          val ulong' = CMemory.store_ulong          val ulong' = CMemory.store_ulong
375          val slong' = CMemory.store_slong          val slong' = CMemory.store_slong
376            val ulonglong' = CMemory.store_ulonglong
377            val slonglong' = CMemory.store_slonglong
378          val float' = CMemory.store_float          val float' = CMemory.store_float
379          val double' = CMemory.store_double          val double' = CMemory.store_double
380          val enum' = CMemory.store_sint          val enum' = CMemory.store_sint
# Line 376  Line 396 
396              val sshort = sshort' $ strip_type              val sshort = sshort' $ strip_type
397              val ulong = ulong' $ strip_type              val ulong = ulong' $ strip_type
398              val slong = slong' $ strip_type              val slong = slong' $ strip_type
399                val ulonglong = ulonglong' $ strip_type
400                val slonglong = slonglong' $ strip_type
401              val float = float' $ strip_type              val float = float' $ strip_type
402              val double = double' $ strip_type              val double = double' $ strip_type
403              val voidptr = voidptr' $ strip_type              val voidptr = voidptr' $ strip_type

Legend:
Removed from v.1741  
changed lines
  Added in v.1742

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