hg/stx-libbasic: comparison ExternalStream.st

equal deleted inserted replaced

-:387eab176223
+:0fbfbdf4a0a5
 architectures since it does not care for byte order or float representation."
 %{
 FILEPOINTER f;
 int cnt, offs, ret, _buffered;
-int objSize, nInstVars, nInstBytes;
+int objSize, nInstBytes;
 char *cp;
 char *extPtr;
 OBJ fp;
 int o_offs;
 __INST(lastErrorNumber) = nil;
 if ((__INST(handleType) == nil)
 || (__INST(handleType) == @symbol(filePointer))
 || (__INST(handleType) == @symbol(socketFilePointer))
 || (__INST(handleType) == @symbol(pipeFilePointer))) {
-	if (((fp = __INST(handle)) != nil)
+if (((fp = __INST(handle)) != nil)
-	    && (__INST(mode) != @symbol(writeonly))
+&& (__INST(mode) != @symbol(writeonly))
-	    && __bothSmallInteger(count, start)
+&& __bothSmallInteger(count, start)
-	) {
+) {
-	    f = __FILEVal(fp);
+f = __FILEVal(fp);
-	    cnt = __intVal(count);
+cnt = __intVal(count);
-	    offs = __intVal(start) - 1;
+offs = __intVal(start) - 1;
-	    if (__isExternalBytesLike(anObject)) {
+if (__isExternalBytesLike(anObject)) {
-		OBJ sz;
+OBJ sz;
-		nInstBytes = 0;
+nInstBytes = 0;
-		extPtr = (char *)(__externalBytesAddress(anObject));
+extPtr = (char *)(__externalBytesAddress(anObject));
-		if (extPtr == NULL) goto bad;
+if (extPtr == NULL) goto bad;
-		sz = __externalBytesSize(anObject);
+sz = __externalBytesSize(anObject);
-		if (__isSmallInteger(sz)) {
+if (__isSmallInteger(sz)) {
-		    objSize = __intVal(sz);
+objSize = __intVal(sz);
-		} else {
+} else {
-		    objSize = 0; /* unknown */
+objSize = 0; /* unknown */
-		}
+}
-	    } else {
+} else {
-		OBJ oClass;
+OBJ oClass = __Class(anObject);
+int nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
-		oClass = __Class(anObject);
-		switch (__intVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
-		    case BYTEARRAY:
-		    case WORDARRAY:
+switch (__intVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-		    case LONGARRAY:
+case BYTEARRAY:
-		    case SWORDARRAY:
+case WORDARRAY:
-		    case SLONGARRAY:
+case LONGARRAY:
-		    case FLOATARRAY:
+case SWORDARRAY:
-		    case DOUBLEARRAY:
+case SLONGARRAY:
-			break;
+case FLOATARRAY:
-		    default:
+case DOUBLEARRAY:
-			goto bad;
+#ifdef __NEED_DOUBLE_ALIGN
-		}
+nInstBytes = (nInstBytes-1+__DOUBLE_ALIGN) &~ (__DOUBLE_ALIGN-1);
-		extPtr = (char *)0;
+#endif
-		nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
+break;
-		nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
+case LONGLONGARRAY:
-		objSize = __Size(anObject) - nInstBytes;
+case SLONGLONGARRAY:
-	    }
+#ifdef __NEED_LONGLONG_ALIGN
+nInstBytes = (nInstBytes-1+__LONGLONG_ALIGN) &~ (__LONGLONG_ALIGN-1);
-	    if ((offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs))) {
+#endif
-		_buffered = (__INST(buffered) == true);
+default:
-		if (_buffered) {
+goto bad;
-		    __READING__(f);
+}
-		}
+extPtr = (char *)0;
+objSize = __Size(anObject) - nInstBytes;
-		if (extPtr) {
+}
-		    __READAVAILBYTES__(ret, f, extPtr+offs, cnt, _buffered, __INST(handleType));
-		} else {
+if ((offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs))) {
-		    /*
+_buffered = (__INST(buffered) == true);
-		     * on interrupt, anObject may be moved to another location.
+if (_buffered) {
-		     * So we pass (char *)__InstPtr(anObject) + nInstBytes + offs to the macro __READ_BYTES__,
+__READING__(f);
-		     * to get a new address.
+}
-		     */
-		    offs += nInstBytes;
+if (extPtr) {
-		    __READAVAILBYTES_OBJ__(ret, f, anObject, offs, cnt, _buffered, __INST(handleType));
+__READAVAILBYTES__(ret, f, extPtr+offs, cnt, _buffered, __INST(handleType));
-		}
+} else {
+/*
+* on interrupt, anObject may be moved to another location.
+* So we pass (char *)__InstPtr(anObject) + nInstBytes + offs to the macro __READ_BYTES__,
+* to get a new address.
+*/
+offs += nInstBytes;
+__READAVAILBYTES_OBJ__(ret, f, anObject, offs, cnt, _buffered, __INST(handleType));
+}
 #ifdef PRE_22_jan_2000
-		if (ret > 0)
+if (ret > 0)
 #else
-		/* 0 is NOT an EOF condition here ... */
+/* 0 is NOT an EOF condition here ... */
-		if (ret >= 0)
+if (ret >= 0)
 #endif
-		{
+{
-		    if (__isSmallInteger(__INST(position))) {
+if (__isSmallInteger(__INST(position))) {
-			INT np = __intVal(__INST(position)) + ret;
+INT np = __intVal(__INST(position)) + ret;
-			OBJ t;
+OBJ t;
-			t = __MKINT(np); __INST(position) = t; __STORE(self, t);
+t = __MKINT(np); __INST(position) = t; __STORE(self, t);
-		    } else {
+} else {
-			__INST(position) = nil; /* i.e. do not know */
+__INST(position) = nil; /* i.e. do not know */
-		    }
+}
-		    RETURN (__mkSmallInteger(ret));
+RETURN (__mkSmallInteger(ret));
-		}
+}
 #ifdef PRE_22_jan_2000
-		if (ret == 0) {
+if (ret == 0) {
-		    __INST(hitEOF) = true;
+__INST(hitEOF) = true;
-		} else /* ret < 0 */
+} else /* ret < 0 */
 #endif
-		{
+{
-		    __INST(position) = nil;
+__INST(position) = nil;
-		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
+__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
-		}
+}
-	    }
+}
-	}
+}
 }
 bad: ;
 %}.
 (hitEOF and:[self pastEndRead isNil]) ifTrue:[^ 0].
 lastErrorNumber notNil ifTrue:[^ self readError].
 since it does not care for byte order or float representation."
 %{
 FILEPOINTER f;
 int cnt, offs, ret, _buffered;
-int objSize, nInstVars, nInstBytes;
+int objSize, nInstBytes;
 char *extPtr;
 OBJ fp;
 __INST(lastErrorNumber) = nil;
 if ((__INST(handleType) == nil)
 || (__INST(handleType) == @symbol(filePointer))
 || (__INST(handleType) == @symbol(socketFilePointer))
 || (__INST(handleType) == @symbol(pipeFilePointer))) {
-	if (((fp = __INST(handle)) != nil)
+if (((fp = __INST(handle)) != nil)
-	    && (__INST(mode) != @symbol(writeonly))
+&& (__INST(mode) != @symbol(writeonly))
-	    && __bothSmallInteger(count, start)
+&& __bothSmallInteger(count, start)
-	) {
+) {
-	    f = __FILEVal(fp);
+f = __FILEVal(fp);
-	    cnt = __intVal(count);
+cnt = __intVal(count);
-	    offs = __intVal(start) - 1;
+offs = __intVal(start) - 1;
-	    if (__isExternalBytesLike(anObject)) {
+if (__isExternalBytesLike(anObject)) {
-		OBJ sz;
+OBJ sz;
-		nInstBytes = 0;
+nInstBytes = 0;
-		extPtr = (char *)(__externalBytesAddress(anObject));
+extPtr = (char *)(__externalBytesAddress(anObject));
-		if (extPtr == NULL) goto bad;
+if (extPtr == NULL) goto bad;
-		sz = __externalBytesSize(anObject);
+sz = __externalBytesSize(anObject);
-		if (__isSmallInteger(sz)) {
+if (__isSmallInteger(sz)) {
-		    objSize = __intVal(sz);
+objSize = __intVal(sz);
-		} else {
+} else {
-		    objSize = 0; /* unknown */
+objSize = 0; /* unknown */
-		}
+}
-	    } else {
+} else {
-		OBJ oClass;
+OBJ oClass = __Class(anObject);
+int nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
-		oClass = __Class(anObject);
-		switch (__intVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
+nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
-		    case BYTEARRAY:
+switch (__intVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
-		    case WORDARRAY:
+case BYTEARRAY:
-		    case LONGARRAY:
+case WORDARRAY:
-		    case SWORDARRAY:
+case LONGARRAY:
-		    case SLONGARRAY:
+case SWORDARRAY:
-		    case FLOATARRAY:
+case SLONGARRAY:
-		    case DOUBLEARRAY:
+case FLOATARRAY:
-			break;
+case DOUBLEARRAY:
-		    default:
+#ifdef __NEED_DOUBLE_ALIGN
-			goto bad;
+nInstBytes = (nInstBytes-1+__DOUBLE_ALIGN) &~ (__DOUBLE_ALIGN-1);
-		}
+#endif
-		extPtr = (char *)0;
+break;
-		nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
+case LONGLONGARRAY:
-		nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
+case SLONGLONGARRAY:
-		objSize = __Size(anObject) - nInstBytes;
+#ifdef __NEED_LONGLONG_ALIGN
-	    }
+nInstBytes = (nInstBytes-1+__LONGLONG_ALIGN) &~ (__LONGLONG_ALIGN-1);
-	    if ((offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs))) {
+#endif
-		_buffered = (__INST(buffered) == true);
+default:
-		if (_buffered) {
+goto bad;
-		    __READING__(f);
+}
-		}
+extPtr = (char *)0;
+objSize = __Size(anObject) - nInstBytes;
-		if (extPtr) {
+}
-		    __READBYTES__(ret, f, extPtr+offs, cnt, _buffered, __INST(handleType));
+if ((offs >= 0) && (cnt >= 0) && (objSize >= (cnt + offs))) {
-		} else {
+_buffered = (__INST(buffered) == true);
-		    /*
+if (_buffered) {
-		     * on interrupt, anObject may be moved to another location.
+__READING__(f);
-		     * So we pass anObject, and the offset to the __READBYTES_OBJ__ macro.
+}
-		     */
-		    offs += nInstBytes;
+if (extPtr) {
-		    __READBYTES_OBJ__(ret, f, anObject, offs, cnt, _buffered, __INST(handleType));
+__READBYTES__(ret, f, extPtr+offs, cnt, _buffered, __INST(handleType));
-		}
+} else {
+/*
-		if (ret > 0) {
+* on interrupt, anObject may be moved to another location.
-		    if (__isSmallInteger(__INST(position))) {
+* So we pass anObject, and the offset to the __READBYTES_OBJ__ macro.
-			INT np = __intVal(__INST(position)) + ret;
+*/
-			OBJ t;
+offs += nInstBytes;
+__READBYTES_OBJ__(ret, f, anObject, offs, cnt, _buffered, __INST(handleType));
-			t = __MKINT(np); __INST(position) = t; __STORE(self, t);
+}
-		    } else {
-			__INST(position) = nil; /* i.e. do not know */
+if (ret > 0) {
-		    }
+if (__isSmallInteger(__INST(position))) {
-		    RETURN (__mkSmallInteger(ret));
+INT np = __intVal(__INST(position)) + ret;
-		}
+OBJ t;
-		if (ret == 0) {
-		    __INST(hitEOF) = true;
+t = __MKINT(np); __INST(position) = t; __STORE(self, t);
-		} else /* ret < 0 */ {
+} else {
-		    __INST(position) = nil;
+__INST(position) = nil; /* i.e. do not know */
-		    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
+}
-		}
+RETURN (__mkSmallInteger(ret));
-	    }
+}
-	}
+if (ret == 0) {
+__INST(hitEOF) = true;
+} else /* ret < 0 */ {
+__INST(position) = nil;
+__INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
+}
+}
+}
 }
 bad: ;
 %}.
 (hitEOF and:[self pastEndRead isNil]) ifTrue:[^ 0].
 lastErrorNumber notNil ifTrue:[^ self readError].
 since it does not care for byte order or float representation."
 %{
 FILEPOINTER f;
 int cnt, len, offs, ret;
-int objSize, nInstVars, nInstBytes, _buffered;
+int objSize, nInstBytes, _buffered;
 char *extPtr;
 OBJ fp;
 __INST(lastErrorNumber) = nil;
 if ((__INST(handleType) == nil)
 objSize = __intVal(sz);
 } else {
 objSize = 0; /* unknown */
 }
 } else {
-OBJ oClass;
+OBJ oClass = __Class(anObject);
+int nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
-oClass = __Class(anObject);
+nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
 switch (__intVal(__ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
 case BYTEARRAY:
 case WORDARRAY:
 case LONGARRAY:
 case SWORDARRAY:
 case SLONGARRAY:
 case FLOATARRAY:
+break;
 case DOUBLEARRAY:
+#ifdef __NEED_DOUBLE_ALIGN
+nInstBytes = (nInstBytes-1+__DOUBLE_ALIGN) &~ (__DOUBLE_ALIGN-1);
+#endif
+break;
+case LONGLONGARRAY:
+case SLONGLONGARRAY:
+#ifdef __NEED_LONGLONG_ALIGN
+nInstBytes = (nInstBytes-1+__LONGLONG_ALIGN) &~ (__LONGLONG_ALIGN-1);
+#endif
 break;
 default:
 goto bad;
 }
 extPtr = (char *)0;
-nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
-nInstBytes = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
 objSize = __Size(anObject) - nInstBytes;
 }
 if ( (offs >= 0) && (len >= 0) && (objSize >= (len + offs)) ) {
 if (_buffered = (__INST(buffered) == true)) {
 __WRITING__(f)
 ! !
 !ExternalStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.378 2014-01-29 13:35:20 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.379 2014-02-12 12:54:11 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.378 2014-01-29 13:35:20 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.379 2014-02-12 12:54:11 stefan Exp $'
 ! !
 ExternalStream initialize!

changeset 15987	0fbfbdf4a0a5
parent 15921	9941c0e5132a
child 15994	cbd013980da3