CVS: sml-dist/src/eXene/lib/protocol xdisplay.sml,1.3,1.4 xio.sml,1.3,1.4 xreply.sml,1.4,1.5 xrequest.sml,1.3,1.4 xsendevt.sml,1.3,1.4

Update of /cvsroot/smlnj/sml-dist/src/eXene/lib/protocol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31565/src/eXene/lib/protocol

Modified Files:
	xdisplay.sml xio.sml xreply.sml xrequest.sml xsendevt.sml 
Log Message:
updated runtime system, CML, and eXene to reflect recent changes to Basis

Index: xdisplay.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/eXene/lib/protocol/xdisplay.sml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xdisplay.sml	17 Sep 2003 21:28:40 -0000	1.3
--- xdisplay.sml	2 Nov 2005 22:24:38 -0000	1.4
***************
*** 126,130 ****
  (*-DEBUG*)
  	    val hdr = SockUtil.recvVec (sock, 8)
! 	    val len = 4 * LargeWord.toIntX(Pack16Big.subVec(hdr, 3))
  (*+DEBUG*)
  val _ = XDebug.trace(XDebug.ioTM, fn () => [
--- 126,130 ----
  (*-DEBUG*)
  	    val hdr = SockUtil.recvVec (sock, 8)
! 	    val len = 4 * LargeWord.toIntX(PackWord16Big.subVec(hdr, 3))
  (*+DEBUG*)
  val _ = XDebug.trace(XDebug.ioTM, fn () => [

Index: xio.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/eXene/lib/protocol/xio.sml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xio.sml	17 Sep 2003 21:28:40 -0000	1.3
--- xio.sml	2 Nov 2005 22:24:38 -0000	1.4
***************
*** 125,129 ****
  		  case W8V.sub(msg, 0)
  		   of 0w1 => let  (* reply *)
! 			val extraLen = LargeWord.toIntX(Pack32Big.subVec(msg, 1))
  			in
  			  if (extraLen > 0)
--- 125,129 ----
  		  case W8V.sub(msg, 0)
  		   of 0w1 => let  (* reply *)
! 			val extraLen = LargeWord.toIntX(PackWord32Big.subVec(msg, 1))
  			in
  			  if (extraLen > 0)
***************
*** 438,442 ****
   **)
  		      fun getSeqN () = let
! 			    val shortSeqN = W.fromLargeWord(Pack16Big.subVec(msg, 1))
  			    val seqn' = W.orb(
  				  W.andb(lastReqIn, W.notb 0wxffff),
--- 438,442 ----
   **)
  		      fun getSeqN () = let
! 			    val shortSeqN = W.fromLargeWord(PackWord16Big.subVec(msg, 1))
  			    val seqn' = W.orb(
  				  W.andb(lastReqIn, W.notb 0wxffff),

Index: xreply.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/eXene/lib/protocol/xreply.sml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xreply.sml	17 Sep 2003 21:28:40 -0000	1.4
--- xreply.sml	2 Nov 2005 22:24:38 -0000	1.5
***************
*** 44,57 ****
        fun getSigned8 arg = W8.toIntX(W8V.sub arg)
  
!       fun get16 (s, i) = Pack16Big.subVec(s, i div 2)
        fun getWord16 (s, i) = Word.fromLargeWord(get16(s, i))
        fun getInt16 (s, i) = LargeWord.toInt(get16(s, i))
!       fun getSigned16 (s, i) = LargeWord.toIntX(Pack16Big.subVecX(s, i div 2))
  
!       fun get32 (s, i) = Word32.fromLargeWord(Pack32Big.subVec(s, i div 4))
        fun getSigned32 (s, i) =
! 	    Int32.fromLarge(LargeWord.toLargeInt(Pack32Big.subVecX(s, i div 4)))
        fun getWord (s, i) = Word.fromLargeWord(get32(s, i))
!       fun getInt (s, i) = LargeWord.toIntX(Pack32Big.subVecX(s, i div 4))
  
        val w8vextract = Word8VectorSlice.vector o Word8VectorSlice.slice
--- 44,57 ----
        fun getSigned8 arg = W8.toIntX(W8V.sub arg)
  
!       fun get16 (s, i) = PackWord16Big.subVec(s, i div 2)
        fun getWord16 (s, i) = Word.fromLargeWord(get16(s, i))
        fun getInt16 (s, i) = LargeWord.toInt(get16(s, i))
!       fun getSigned16 (s, i) = LargeWord.toIntX(PackWord16Big.subVecX(s, i div 2))
  
!       fun get32 (s, i) = Word32.fromLargeWord(PackWord32Big.subVec(s, i div 4))
        fun getSigned32 (s, i) =
! 	    Int32.fromLarge(LargeWord.toLargeInt(PackWord32Big.subVecX(s, i div 4)))
        fun getWord (s, i) = Word.fromLargeWord(get32(s, i))
!       fun getInt (s, i) = LargeWord.toIntX(PackWord32Big.subVecX(s, i div 4))
  
        val w8vextract = Word8VectorSlice.vector o Word8VectorSlice.slice

Index: xrequest.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/eXene/lib/protocol/xrequest.sml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xrequest.sml	5 Sep 2003 21:34:26 -0000	1.3
--- xrequest.sml	2 Nov 2005 22:24:38 -0000	1.4
***************
*** 39,47 ****
        fun putSigned8 (buf, i, x) = put8(buf, i, Word8.fromInt x)
  
!       fun put16 (buf, i, x) = Pack16Big.update(v2a buf, i div 2, x)
        fun putWord16 (buf, i, x) = put16(buf, i, Word.toLargeWord x)
        fun putSigned16 (buf, i, x) = put16(buf, i, LargeWord.fromInt x)
  
!       fun put32 (buf, i, x) = Pack32Big.update(v2a buf, i div 4, x)
        fun putWord32 (buf, i, x) = put32(buf, i, Word.toLargeWord x)
        fun putSigned32 (buf, i, x) = put32(buf, i, LargeWord.fromInt x)
--- 39,47 ----
        fun putSigned8 (buf, i, x) = put8(buf, i, Word8.fromInt x)
  
!       fun put16 (buf, i, x) = PackWord16Big.update(v2a buf, i div 2, x)
        fun putWord16 (buf, i, x) = put16(buf, i, Word.toLargeWord x)
        fun putSigned16 (buf, i, x) = put16(buf, i, LargeWord.fromInt x)
  
!       fun put32 (buf, i, x) = PackWord32Big.update(v2a buf, i div 4, x)
        fun putWord32 (buf, i, x) = put32(buf, i, Word.toLargeWord x)
        fun putSigned32 (buf, i, x) = put32(buf, i, LargeWord.fromInt x)

Index: xsendevt.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/eXene/lib/protocol/xsendevt.sml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xsendevt.sml	8 Sep 2000 02:09:17 -0000	1.3
--- xsendevt.sml	2 Nov 2005 22:24:38 -0000	1.4
***************
*** 27,35 ****
  
        fun put16 (buf, i, x) =
! 	    Pack16Big.update(v2a buf, i div 2 + eventOffset div 2, x)
        fun putSigned16 (buf, i, x) = put16(buf, i, LargeWord.fromInt x)
  
        fun put32 (buf, i, x) =
! 	    Pack32Big.update(v2a buf, i div 4 + eventOffset div 4, x)
        fun putWord32 (buf, i, x) = put32(buf, i, Word.toLargeWord x)
        fun putSigned32 (buf, i, x) = put32(buf, i, LargeWord.fromInt x)
--- 27,35 ----
  
        fun put16 (buf, i, x) =
! 	    PackWord16Big.update(v2a buf, i div 2 + eventOffset div 2, x)
        fun putSigned16 (buf, i, x) = put16(buf, i, LargeWord.fromInt x)
  
        fun put32 (buf, i, x) =
! 	    PackWord32Big.update(v2a buf, i div 4 + eventOffset div 4, x)
        fun putWord32 (buf, i, x) = put32(buf, i, Word.toLargeWord x)
        fun putSigned32 (buf, i, x) = put32(buf, i, LargeWord.fromInt x)



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php