hg/stx-libbasic: comparison String.st

equal deleted inserted replaced

-:f64dd57ad912
+:cf16402b6366
 %{  /* NOCONTEXT */
 #ifdef __SCHTEAM__
 if (start.isSmallInteger()
 && aCharacter.isSTCharacter()) {
-	int idx1Based = start.intValue();   // st index is 1 based
+int idx1Based = start.intValue();   // st index is 1 based
-	int jIdx = self.asString().indexOf(aCharacter.charValue(), idx1Based-1);
+int jIdx = self.asString().indexOf(aCharacter.charValue(), idx1Based-1);
-	return context._RETURN( jIdx+1 );    // st index is 1 based
+return context._RETURN( jIdx+1 );    // st index is 1 based
 }
 #else
-# undef __UNROLL_LOOPS__
+# if defined(__BORLANDC__) || defined(__VISUALC__)
-# undef FAST_MEMCHR
+#  undef __UNROLL_LOOPS__
-# define V2
+#  undef FAST_MEMCHR
+#  define V2
+# endif
 REGISTER unsigned char *cp;
-# ifdef FAST_MEMCHR
-REGISTER unsigned char *ncp;
-# endif
 REGISTER INT index;
 REGISTER unsigned byteValue;
 int last;
 OBJ cls;
 if (__isSmallInteger(start)) {
-	index = __intVal(start);
+index = __intVal(start);
-	if (index > 0) {
+if (index > 0) {
-	    if (__isCharacter(aCharacter)) {
+if (__isCharacter(aCharacter)) {
-		byteValue = __intVal(__characterVal(aCharacter));
+byteValue = __intVal(__characterVal(aCharacter));
-		if (byteValue <= 0xFF) {
+if (byteValue <= 0xFF) {
-		    last = __stringSize(self);
+last = __stringSize(self);
-		    cp = __stringVal(self);
+cp = __stringVal(self);
-		    if ((cls = __qClass(self)) != String) {
+if ((cls = __qClass(self)) != String) {
-			int numInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+int numInstBytes = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
-			cp += numInstBytes;
+cp += numInstBytes;
-			last -= numInstBytes;
+last -= numInstBytes;
-		    }
+}
-		    if (index <= last) {
+if (index <= last) {
 # ifdef FAST_MEMCHR
-			ncp = (unsigned char *) memchr(cp+index-1, byteValue, last+1-index);
+REGISTER unsigned char *ncp;
-			if (ncp) {
-			    RETURN ( __mkSmallInteger(ncp - cp + 1) );
+ncp = (unsigned char *) memchr(cp+index-1, byteValue, last+1-index);
-			}
+if (ncp) {
+RETURN ( __mkSmallInteger(ncp - cp + 1) );
+}
 # else
 #  ifdef __UNROLL_LOOPS__
-			{
+{
-			    int last3 = last-3;
+int last3 = last-3;
-			    for (; index <= last3; index += 4) {
+for (; index <= last3; index += 4) {
-				if (cp[index-1] == byteValue) { RETURN ( __mkSmallInteger(index) ); }
+if (cp[index-1] == byteValue) { RETURN ( __mkSmallInteger(index) ); }
-				if (cp[index-1+1] == byteValue) { RETURN ( __mkSmallInteger(index+1) ); }
+if (cp[index-1+1] == byteValue) { RETURN ( __mkSmallInteger(index+1) ); }
-				if (cp[index-1+2] == byteValue) { RETURN ( __mkSmallInteger(index+2) ); }
+if (cp[index-1+2] == byteValue) { RETURN ( __mkSmallInteger(index+2) ); }
-				if (cp[index-1+3] == byteValue) { RETURN ( __mkSmallInteger(index+3) ); }
+if (cp[index-1+3] == byteValue) { RETURN ( __mkSmallInteger(index+3) ); }
-			    }
+}
-			}
+}
 #  endif
 #  ifdef V1
-			for (; index <= last; index++) {
+for (; index <= last; index++) {
-			    if (cp[index-1] == byteValue) {
+if (cp[index-1] == byteValue) {
-				RETURN ( __mkSmallInteger(index) );
+RETURN ( __mkSmallInteger(index) );
-			    }
+}
-			}
+}
 #  endif
 #  ifdef V2
-			{
+{
-			    // see bit twiddling hacks
+// see bit twiddling hacks
 #                           define hasZeroByte(v) (((v) - 0x01010101UL) & ~(v) & 0x80808080UL)
 #                           define hasByteM(v,m)   hasZeroByte( (v) ^ m)
 #   if __POINTER_SIZE__ == 8
 #                           define hasZeroByte8(v) (((v) - 0x0101010101010101ULL) & ~(v) & 0x8080808080808080ULL)
 #                           define hasByteM8(v,m)   hasZeroByte8( (v) ^ m)
-			    // the following loop checks eight bytes at once
+// the following loop checks eight bytes at once
-			    if (((index-1) & 0x7) == 0) {
+if (((index-1) & 0x7) == 0) {
-				int last8 = last-8;
+int last8 = last-8;
-				INT m = (~0ULL/255 * (byteValue));
+INT m = (~0ULL/255 * (byteValue));
-				while (index <= last8) {
+while (index <= last8) {
-				    unsigned INT v = *(unsigned INT *)(cp+index-1);
+unsigned INT v = *(unsigned INT *)(cp+index-1);
-				    if (hasByteM8(v,m)) break;
+if (hasByteM8(v,m)) break;
-				    index += 8;
+index += 8;
-				}
+}
-			    }
+}
 #   endif
-			    // the following loop checks four bytes at once
+// the following loop checks four bytes at once
-			    if (((index-1) & 0x3) == 0) {
+if (((index-1) & 0x3) == 0) {
-				int last4 = last-4;
+int last4 = last-4;
-				int m = (~0UL/255 * (byteValue));
+int m = (~0UL/255 * (byteValue));
-				while (index <= last4) {
+while (index <= last4) {
-				    unsigned int v = *(unsigned int *)(cp+index-1);
+unsigned int v = *(unsigned int *)(cp+index-1);
-				    if (hasByteM(v,m)) break;
+if (hasByteM(v,m)) break;
-				    index += 4;
+index += 4;
-				}
+}
-			    }
+}
-			    while (index <= last) {
+while (index <= last) {
-				if (cp[index-1] == byteValue) {
+if (cp[index-1] == byteValue) {
-				    RETURN ( __mkSmallInteger(index) );
+RETURN ( __mkSmallInteger(index) );
-				}
+}
-				index++;
+index++;
-			    }
+}
-			}
+}
 #  endif
 # endif
-		    }
+}
-		}
+}
-	    }
+}
-	    RETURN ( __mkSmallInteger(0) );
+RETURN ( __mkSmallInteger(0) );
-	}
+}
 }
 # undef V2
 #endif /* not SCHTEAM */
 %}.
 ^ super indexOf:aCharacter startingAt:start
 |s|
 s := String new:1024.
 s atAllPut:$a.
 s at:512 put:(Character space).
 Time millisecondsToRun:[
-	1000000 timesRepeat:[ s indexOf:(Character space) ]
+1000000 timesRepeat:[ s indexOf:(Character space) ]
 ]
 timing (ms):
-	v1: 1763 normal
+bcc                 OSX(2007 powerbook)
-	    2340 +unroll
+v1: 1763 normal
-	    3308 memsrch !!
+2340 +unroll
-	v2: 1045
+3308 memsrch !!       90
+v2: 1045                150
 "
 "Modified: / 10-01-2012 / 17:09:34 / cg"
 !

changeset 19745	cf16402b6366
parent 19744	f64dd57ad912
child 19748	44eae32d9fad