hg/stx-libbasic: comparison UninterpretedBytes.st

equal deleted inserted replaced

-:6eb57a6369be
+:07dede3d264c
 "Modified: / 23.4.1996 / 15:56:25 / cg"
 "Modified: / 5.3.1998 / 14:56:22 / stefan"
 ! !
 !UninterpretedBytes methodsFor:'Compatibility'!
 doubleWordAt:index
 "return the 4-bytes starting at index as an (unsigned) Integer.
 The index is a smalltalk index (i.e. 1-based).
 val := 0.
 bigEndian ifTrue:[
 highByte := (self at:index).
 index to:index+n-1 do:[:i |
-val := (val<<8) + (self at:i)
+val := (val<<8) + (self byteAt:i)
 ]
 ] ifFalse:[
 highByte := (self at:index+n-1).
 index+n-1 to:index by:-1 do:[:i |
-val := (val<<8) + (self at:i)
+val := (val<<8) + (self byteAt:i)
 ]
 ].
 (highByte bitTest:16r80) ifTrue:[
 ^ val - (1 bitShift:(n*8))
 ].
 |val|
 val := 0.
 bigEndian ifTrue:[
-	index to:index+n-1 do:[:i |
+index to:index+n-1 do:[:i |
-	    val := (val<<8) + (self at:i)
+val := (val<<8) + (self byteAt:i)
-	]
+]
 ] ifFalse:[
-	index+n-1 to:index by:-1 do:[:i |
+index+n-1 to:index by:-1 do:[:i |
-	    val := (val<<8) + (self at:i)
+val := (val<<8) + (self byteAt:i)
-	]
+]
 ].
 ^ val
 "
 |b|
 |val|
 val := newValue.
 bigEndian ifTrue:[
 index to:index+n-1 do:[:i |
-self at:i put:(val bitAnd:16rFF).
+self byteAt:i put:(val bitAnd:16rFF).
 val := val bitShift:-8.
 ]
 ] ifFalse:[
 index+n-1 to:index by:-1 do:[:i |
-self at:i put:(val bitAnd:16rFF).
+self byteAt:i put:(val bitAnd:16rFF).
 val := val bitShift:-8.
 ]
 ].
 "
 "
 "Modified (comment): / 26-09-2011 / 11:57:36 / cg"
 !
-signedByteAt:index
+byteAt:byteIndex
-"return the byte at index as a signed 8 bit value in the range -128..+127.
+"return the byte at byteIndex as an unsigned 8 bit value in the range 0..255.
-The index is a smalltalk index (i.e. 1-based).
+The index is a smalltalk index (i.e. 1-based)."
-This may be worth a primitive."
+%{
-^ (self at:index) signExtendedByteValue
+if (__isSmallInteger(byteIndex)) {
+unsigned char *cp;
-"
+INT sz;
-|b|
-b := ByteArray new:2.
+__fetchBytePointerAndSize__(self, &cp, &sz);
+if (cp) {
+unsigned INT idx = ((unsigned INT)__intVal(byteIndex)) - 1;
+char ch;
+if (idx < sz) {
+ch = cp[idx] & 0xFF;
+RETURN (__mkSmallInteger( ch ));
+}
+}
+}
+%}.
+^ self at:byteIndex
+"
+|b|
+b := ByteArray new:3.
 b at:1 put:16rFF.
 b at:2 put:16r7F.
-b signedByteAt:1
+b at:3 put:16r80.
+b byteAt:1.
+b byteAt:2.
+b byteAt:3.
 "
 "Modified: / 01-07-1996 / 21:13:53 / cg"
 "Modified (comment): / 26-09-2011 / 11:57:14 / cg"
 !
+byteAt:byteIndex put:anInteger
+"set the byte at byteIndex as an unsigned 8 bit value in the range 0..255.
+The index is a smalltalk index (i.e. 1-based)."
+%{
+if (__isSmallInteger(byteIndex) && __isSmallInteger(anInteger)) {
+unsigned char *cp;
+INT sz;
+INT val = __intVal(anInteger);
+if ( ((unsigned INT)val) <= 0xFF ) {
+__fetchBytePointerAndSize__(self, &cp, &sz);
+if (cp) {
+unsigned INT idx = ((unsigned INT)__intVal(byteIndex)) - 1;
+if (idx < sz) {
+cp[idx] = val & 0xFF;
+RETURN (anInteger);
+}
+}
+}
+}
+%}.
+^ self at:byteIndex put:anInteger
+"
+|b|
+b := ByteArray new:3.
+b byteAt:1 put:16rFF.
+b byteAt:2 put:16r7F.
+b byteAt:3 put:16r80.
+b signedByteAt:1.
+b signedByteAt:2.
+b signedByteAt:3.
+"
+!
+signedByteAt:byteIndex
+"return the byte at byteIndex as a signed 8 bit value in the range -128..+127.
+The index is a smalltalk index (i.e. 1-based).
+This may be worth a primitive."
+%{
+/*
+* handle the most common cases fast ...
+*/
+if (__isSmallInteger(byteIndex)) {
+unsigned char *cp;
+INT sz;
+__fetchBytePointerAndSize__(self, &cp, &sz);
+if (cp) {
+unsigned INT idx = ((unsigned INT)__intVal(byteIndex)) - 1;
+char ch;
+if (idx < sz) {
+cp += idx;
+ch = cp[0];
+# ifndef HAS_SIGNED_CHAR
+if ( (unsigned int)ch >= 0x80 ) {
+ch = ch - 0x100;
+}
+#endif
+RETURN (__mkSmallInteger( ch ));
+}
+}
+}
+%}.
+^ (self byteAt:byteIndex) signExtendedByteValue
+"
+|b|
+b := ByteArray new:3.
+b at:1 put:16rFF.
+b at:2 put:16r7F.
+b at:3 put:16r80.
+b byteAt:1.
+b byteAt:2.
+b byteAt:3.
+"
+"Modified: / 01-07-1996 / 21:13:53 / cg"
+"Modified (comment): / 26-09-2011 / 11:57:14 / cg"
+!
 signedByteAt:index put:aSignedByteValue
 "return the byte at index as a signed 8 bit value in the range -128..+127.
 The index is a smalltalk index (i.e. 1-based).
 Return the signedByteValue argument.
 This may be worth a primitive."
 |b "{ Class: SmallInteger }"|
 aSignedByteValue >= 0 ifTrue:[
-	b := aSignedByteValue
+b := aSignedByteValue
 ] ifFalse:[
-	b := 16r100 + aSignedByteValue
+b := 16r100 + aSignedByteValue
 ].
-self at:index put:b.
+self byteAt:index put:b.
 ^ aSignedByteValue
 "
 |b|
 b := ByteArray new:2.
 %{
 /*
 * handle the most common cases fast ...
 */
 if (__isSmallInteger(index)) {
-	unsigned char *cp;
+unsigned char *cp;
-	INT sz;
+INT sz;
-	__fetchBytePointerAndSize__(self, &cp, &sz);
+__fetchBytePointerAndSize__(self, &cp, &sz);
-	if (cp) {
+if (cp) {
-	    unsigned INT idx = ((unsigned INT)__intVal(index)) - 1;
+unsigned INT idx = ((unsigned INT)__intVal(index)) - 1;
-	    if ((idx+(sizeof(double)-1)) < sz) {
+if ((idx+(sizeof(double)-1)) < sz) {
-		cp += idx;
+cp += idx;
-		/*
+/*
-		 * aligned
+* aligned
-		 */
+*/
-		if (((INT)cp & (sizeof(double)-1)) == 0) {
+if (((INT)cp & (sizeof(double)-1)) == 0) {
-		    double dVal = ((double *)cp)[0];
+double dVal = ((double *)cp)[0];
-		    OBJ f;
+OBJ f;
-		    __qMKFLOAT(f, dVal);
+__qMKFLOAT(f, dVal);
-		    RETURN (f);
+RETURN (f);
-		}
+}
-	    }
+}
-	}
+}
 }
 %}.
 newFloat := Float basicNew.
 1 to:8 do:[:destIndex|
-	newFloat basicAt:destIndex put:(self at:index - 1 + destIndex)
+newFloat basicAt:destIndex put:(self byteAt:(index - 1 + destIndex))
 ].
 ^ newFloat.
 "
 |b|
 machine, some conversion is usually needed."
 |newFloat|
 msb == IsBigEndian ifTrue:[
-	^ self doubleAt:index.
+^ self doubleAt:index.
 ].
 newFloat := Float basicNew.
 1 to:8 do:[:destIndex|
-	newFloat basicAt:(9-destIndex) put:(self at:index - 1 + destIndex)
+newFloat basicAt:(9-destIndex) put:(self byteAt:(index - 1 + destIndex))
 ].
 ^ newFloat.
 "Created: / 15.5.1998 / 17:21:45 / cg"
 !
 %{
 /*
 * handle the most common cases fast ...
 */
 if (__isSmallInteger(index)) {
-	unsigned char *cp;
+unsigned char *cp;
-	INT sz;
+INT sz;
-	__fetchBytePointerAndSize__(self, &cp, &sz);
+__fetchBytePointerAndSize__(self, &cp, &sz);
-	if (cp) {
+if (cp) {
-	    unsigned INT idx = ((unsigned INT)__intVal(index)) - 1;
+unsigned INT idx = ((unsigned INT)__intVal(index)) - 1;
-	    if ((idx+(sizeof(double)-1)) < sz) {
+if ((idx+(sizeof(double)-1)) < sz) {
-		cp += idx;
+cp += idx;
-		/*
+/*
-		 * aligned
+* aligned
-		 */
+*/
-		if (((INT)cp & (sizeof(double)-1)) == 0) {
+if (((INT)cp & (sizeof(double)-1)) == 0) {
-		    if (__isFloat(aFloat)) {
+if (__isFloat(aFloat)) {
-			((double *)cp)[0] = __floatVal(aFloat);
+((double *)cp)[0] = __floatVal(aFloat);
-			RETURN (aFloat);
+RETURN (aFloat);
-		    }
+}
-		    if (__isShortFloat(aFloat)) {
+if (__isShortFloat(aFloat)) {
-			((double *)cp)[0] = (double)(__shortFloatVal(aFloat));
+((double *)cp)[0] = (double)(__shortFloatVal(aFloat));
-			RETURN (aFloat);
+RETURN (aFloat);
-		    }
+}
-		    if (__isSmallInteger(aFloat)) {
+if (__isSmallInteger(aFloat)) {
-			((double *)cp)[0] = (double)(__intVal(aFloat));
+((double *)cp)[0] = (double)(__intVal(aFloat));
-			RETURN (aFloat);
+RETURN (aFloat);
-		    }
+}
-		}
+}
-	    }
+}
-	}
+}
 }
 %}.
 flt := aFloat asFloat.
 1 to:8 do:[:srcIndex|
-	self at:index - 1 + srcIndex put:(flt basicAt:srcIndex)
+self byteAt:(index - 1 + srcIndex) put:(flt basicAt:srcIndex)
 ].
 ^ aFloat
 !
 doubleAt:index put:aFloat MSB:msb
 machine, some conversion is usually needed."
 |flt|
 msb == IsBigEndian ifTrue:[
-	^ self doubleAt:index put:aFloat.
+^ self doubleAt:index put:aFloat.
 ].
 flt := aFloat asFloat.
 1 to:8 do:[:srcIndex|
-	self at:index - 1 + srcIndex put:(flt basicAt:(9-srcIndex))
+self byteAt:(index - 1 + srcIndex) put:(flt basicAt:(9-srcIndex))
 ].
 ^ aFloat
 "Created: / 15.5.1998 / 17:22:27 / cg"
 "Modified: / 15.5.1998 / 17:26:29 / cg"
 %{
 /*
 * handle the most common cases fast ...
 */
 if (__isSmallInteger(index)) {
-	unsigned char *cp;
+unsigned char *cp;
-	INT sz;
+INT sz;
-	__fetchBytePointerAndSize__(self, &cp, &sz);
+__fetchBytePointerAndSize__(self, &cp, &sz);
-	if (cp) {
+if (cp) {
-	    unsigned INT idx = ((unsigned INT)__intVal(index)) - 1;
+unsigned INT idx = ((unsigned INT)__intVal(index)) - 1;
-	    if ((idx+(sizeof(float)-1)) < sz) {
+if ((idx+(sizeof(float)-1)) < sz) {
-		cp += idx;
+cp += idx;
-		/*
+/*
-		 * aligned
+* aligned
-		 */
+*/
-		if (((INT)cp & (sizeof(float)-1)) == 0) {
+if (((INT)cp & (sizeof(float)-1)) == 0) {
-		    float fVal = ((float *)cp)[0];
+float fVal = ((float *)cp)[0];
-		    OBJ f;
+OBJ f;
-		    __qMKSFLOAT(f, fVal);
+__qMKSFLOAT(f, fVal);
-		    RETURN (f);
+RETURN (f);
-		}
+}
-	    }
+}
-	}
+}
 }
 %}.
 newFloat := ShortFloat basicNew.
 1 to:4 do:[:destIndex|
-	newFloat basicAt:destIndex put:(self at:index - 1 + destIndex)
+newFloat basicAt:destIndex put:(self byteAt:(index - 1 + destIndex))
 ].
 ^ newFloat.
 !
 floatAt:index MSB:msb
 machine, some conversion is usually needed."
 |newFloat|
 msb == IsBigEndian ifTrue:[
-	^ self floatAt:index
+^ self floatAt:index
 ].
 newFloat := ShortFloat basicNew.
 1 to:4 do:[:destIndex|
-	newFloat basicAt:(5-destIndex) put:(self at:index - 1 + destIndex)
+newFloat basicAt:(5-destIndex) put:(self byteAt:(index - 1 + destIndex))
 ].
 ^ newFloat.
 "Modified: / 15.5.1998 / 17:20:19 / cg"
 "Created: / 15.5.1998 / 17:20:35 / cg"
 %{
 /*
 * handle the most common cases fast ...
 */
 if (__isSmallInteger(index)) {
-	unsigned char *cp;
+unsigned char *cp;
-	INT sz;
+INT sz;
-	__fetchBytePointerAndSize__(self, &cp, &sz);
+__fetchBytePointerAndSize__(self, &cp, &sz);
-	if (cp) {
+if (cp) {
-	    unsigned INT idx = ((unsigned INT)__intVal(index)) - 1;
+unsigned INT idx = ((unsigned INT)__intVal(index)) - 1;
-	    if ((idx+(sizeof(float)-1)) < sz) {
+if ((idx+(sizeof(float)-1)) < sz) {
-		cp += idx;
+cp += idx;
-		/*
+/*
-		 * aligned
+* aligned
-		 */
+*/
-		if (((INT)cp & (sizeof(float)-1)) == 0) {
+if (((INT)cp & (sizeof(float)-1)) == 0) {
-		    if (__isShortFloat(aFloat)) {
+if (__isShortFloat(aFloat)) {
-			((float *)cp)[0] = __shortFloatVal(aFloat);
+((float *)cp)[0] = __shortFloatVal(aFloat);
-			RETURN (self);
+RETURN (self);
-		    }
+}
-		    if (__isFloat(aFloat)) {
+if (__isFloat(aFloat)) {
-			((float *)cp)[0] = (float)__floatVal(aFloat);
+((float *)cp)[0] = (float)__floatVal(aFloat);
-			RETURN (self);
+RETURN (self);
-		    }
+}
-		    if (__isSmallInteger(aFloat)) {
+if (__isSmallInteger(aFloat)) {
-			((float *)cp)[0] = (float)__intVal(aFloat);
+((float *)cp)[0] = (float)__intVal(aFloat);
-			RETURN (self);
+RETURN (self);
-		    }
+}
-		    // bail out to smalltalk code
+// bail out to smalltalk code
-		}
+}
-	    }
+}
-	}
+}
 }
 %}.
 sflt := aFloat asShortFloat.
 1 to:4 do:[:srcIndex|
-	self at:index - 1 + srcIndex put:(sflt basicAt:srcIndex)
+self byteAt:index - 1 + srcIndex put:(sflt basicAt:srcIndex)
 ].
 !
 floatAt:index put:aFloat MSB:msb
 "store the 4 bytes of value of the argument, aFloat into the receiver
 machine, some conversion is usually needed."
 |sflt|
 msb == IsBigEndian ifTrue:[
-	self floatAt:index put:aFloat.
+self floatAt:index put:aFloat.
-	^ self.
+^ self.
 ].
 sflt := aFloat asShortFloat.
 1 to:4 do:[:srcIndex|
-	self at:index - 1 + srcIndex put:(sflt basicAt:(5-srcIndex))
+self byteAt:(index - 1 + srcIndex) put:(sflt basicAt:(5-srcIndex))
 ].
 "Created: / 15.5.1998 / 17:20:41 / cg"
 !
 ] ifFalse:[
 bIdx := byteIndex.
 delta := 1
 ].
 1 to:8 do:[:i |
-l digitAt:i put:(self basicAt:bIdx).
+l digitAt:i put:(self byteAt:bIdx).
 bIdx := bIdx + delta
 ].
 ^ l compressed
 "
 ] ifFalse:[
 bIdx := byteIndex.
 delta := 1
 ].
 1 to:8 do:[:i |
-self basicAt:bIdx put:(anInteger digitAt:i).
+self byteAt:bIdx put:(anInteger digitAt:i).
 bIdx := bIdx + delta.
 ].
 ^ anInteger
 "

changeset 19351	07dede3d264c
parent 19349	d10a0648ff0f
child 19352	3c5b0c74be2e