dont use memset4 if its undefined
authorClaus Gittinger <cg@exept.de>
Tue, 19 Dec 1995 20:09:03 +0100
changeset 788 e80f1c42b87b
parent 787 6c76287c00fd
child 789 155eca125ef0
dont use memset4 if its undefined
Array.st
Behavior.st
ByteArray.st
--- a/Array.st	Mon Dec 18 21:21:44 1995 +0100
+++ b/Array.st	Tue Dec 19 20:09:03 1995 +0100
@@ -93,7 +93,7 @@
 		_InstPtr(newobj)->o_class = self;
 		__qSTORE(newobj, self);
 
-#if defined(FAST_ARRAY_MEMSET4)
+#if defined(memset4) && defined(FAST_ARRAY_MEMSET4)
 		memset4(_InstPtr(newobj)->i_instvars, nil, nInstVars);
 #else
 # if !defined(NEGATIVE_ADDRESSES)
@@ -1320,4 +1320,4 @@
 !Array class methodsFor:'documentation'!
 
 version
-^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.48 1995-11-23 16:51:57 cg Exp $'! !
+^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.49 1995-12-19 19:08:18 cg Exp $'! !
--- a/Behavior.st	Mon Dec 18 21:21:44 1995 +0100
+++ b/Behavior.st	Tue Dec 19 20:09:03 1995 +0100
@@ -1397,7 +1397,7 @@
 	__qSTORE(newobj, self);
 
 	if (nInstVars) {
-#if defined(FAST_OBJECT_MEMSET4) || defined(FAST_MEMSET4)
+#if defined(memset4) && defined(FAST_OBJECT_MEMSET4) || defined(FAST_MEMSET4)
 	    memset4(_InstPtr(newobj)->i_instvars, nil, nInstVars);
 #else
 	    REGISTER OBJ *op;
@@ -1553,7 +1553,7 @@
 			     */
 			    _qCheckedNew(newobj, instsize);
 			    _InstPtr(newobj)->o_class = self;
-#if defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
+#if defined(memset4) && defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
 			    nInstVars = nindexedinstvars >> 2;
 			    if (nindexedinstvars & 3) nInstVars++;
 			    memset4(_InstPtr(newobj)->i_instvars, 0, nInstVars);
@@ -1585,7 +1585,7 @@
 		    _InstPtr(newobj)->o_class = self;
 		    __qSTORE(newobj, self);
 
-#if defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
+#if defined(memset4) && defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
 		    nInstVars = (instsize-OHDR_SIZE) >> 2;
 		    if (instsize & 3) nInstVars++;
 		    memset4(_InstPtr(newobj)->i_instvars, 0, nInstVars);
@@ -1654,7 +1654,7 @@
 		    _InstPtr(newobj)->o_class = self;
 		    __qSTORE(newobj, self);
 
-#if defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
+#if defined(memset4) && defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
 		    /*
 		     * knowing that nil is 0
 		     */
@@ -1748,7 +1748,7 @@
 		    _InstPtr(newobj)->o_class = self;
 		    __qSTORE(newobj, self);
 
-#if defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
+#if defined(memset4) && defined(FAST_ARRAY_MEMSET4) || defined(FAST_MEMSET4)
 		    memset4(_InstPtr(newobj)->i_instvars, nil, nInstVars);
 #else
 # if !defined(NEGATIVE_ADDRESSES)
@@ -1838,7 +1838,7 @@
 			__qSTORE(newobj, self);
 
 			if (nInstVars) {
-#if defined(FAST_OBJECT_MEMSET4) || defined(FAST_MEMSET4)
+#if defined(memset4) && defined(FAST_OBJECT_MEMSET4) || defined(FAST_MEMSET4)
 			    memset4(_InstPtr(newobj)->i_instvars, nil, nInstVars);
 #else
 # if defined(FAST_MEMSET) && ! defined(NEGATIVE_ADDRESSES)
@@ -2981,5 +2981,5 @@
 !Behavior class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.58 1995-12-15 12:47:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Behavior.st,v 1.59 1995-12-19 19:08:40 cg Exp $'
 ! !
--- a/ByteArray.st	Mon Dec 18 21:21:44 1995 +0100
+++ b/ByteArray.st	Tue Dec 19 20:09:03 1995 +0100
@@ -156,7 +156,7 @@
 		    /*
 		     * still have to nil out named instvars ...
 		     */
-#if defined(FAST_OBJECT_MEMSET4)
+#if defined(memset4) && defined(FAST_OBJECT_MEMSET4)
 		    memset4(_InstPtr(newobj)->i_instvars, nil, nInstVars);
 #else
 # if defined(FAST_MEMSET) && !defined(NEGATIVE_ADDRESSES)
@@ -2009,5 +2009,5 @@
 !ByteArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ByteArray.st,v 1.39 1995-11-23 16:59:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ByteArray.st,v 1.40 1995-12-19 19:09:03 cg Exp $'
 ! !