diff options
| author | mycroft <mycroft@NetBSD.org> | 1993-07-07 17:26:32 +0000 |
|---|---|---|
| committer | mycroft <mycroft@NetBSD.org> | 1993-07-07 17:26:32 +0000 |
| commit | e7611f293faaed9c51466efcd4afa2622a102437 (patch) | |
| tree | 59db98c7ebadaeba681120502801600f62b650ab /gnu/usr.bin | |
| parent | 95e239f1d9b189ef482e82de2f022ae322b95132 (diff) | |
Clean up deleted files.
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/grep/Makefile.gnu | 42 | ||||
| -rw-r--r-- | gnu/usr.bin/grep/README.cray | 84 | ||||
| -rw-r--r-- | gnu/usr.bin/grep/README.sunos4 | 99 |
3 files changed, 0 insertions, 225 deletions
diff --git a/gnu/usr.bin/grep/Makefile.gnu b/gnu/usr.bin/grep/Makefile.gnu deleted file mode 100644 index 43c67ac38b9..00000000000 --- a/gnu/usr.bin/grep/Makefile.gnu +++ /dev/null @@ -1,42 +0,0 @@ -# -# Makefile for GNU e?grep -# - -# Add -DUSG for System V. -CFLAGS = -O - -# -# You may add getopt.o if your C library lacks getopt(); note that -# 4.3BSD getopt() is said to be somewhat broken. -# -# Add alloca.o if your machine does not support alloca(). -# -OBJS = dfa.o regex.o -GOBJ = grep.o -EOBJ = egrep.o - -# Space provided for machine dependent libraries. -LIBS = - -all: regress - -regress: egrep grep - cd tests; sh regress.sh - -egrep: $(OBJS) $(EOBJ) - $(CC) $(CFLAGS) -o egrep $(OBJS) $(EOBJ) $(LIBS) - -egrep.o: grep.c - rm -f egrep.c; cp grep.c egrep.c - $(CC) $(CFLAGS) -DEGREP -c egrep.c - rm -f egrep.c - -grep: $(OBJS) $(GOBJ) - $(CC) $(CFLAGS) -o grep $(OBJS) $(GOBJ) $(LIBS) - -clean: - rm -f grep egrep *.o core tests/core tests/tmp.script \ - tests/khadafy.out egrep.c - -dfa.o egrep.o grep.o: dfa.h -egrep.o grep.o regex.o: regex.h diff --git a/gnu/usr.bin/grep/README.cray b/gnu/usr.bin/grep/README.cray deleted file mode 100644 index e8fde0d76f6..00000000000 --- a/gnu/usr.bin/grep/README.cray +++ /dev/null @@ -1,84 +0,0 @@ -(Message inbox:135) -Date: Mon, 17 Oct 88 16:53:33 PDT -To: mike@wheaties.ai.mit.edu -cc: darin%pioneer@eos.arc.nasa.gov, luzmoor@violet.berkeley.edu -From: James A. Woods <jaw@eos.arc.nasa.gov> -Subject: README.cray for GNU e?grep - -I just sent this out to comp.unix.cray: - -------------------------------------------------------------------- -From: jaw@eos.UUCP (James A. Woods) -Newsgroups: comp.unix.cray -Subject: GNU e?grep on Cray machines -Message-ID: <1750@eos.UUCP> -Date: 17 Oct 88 23:47:29 GMT -Organization: NASA Ames Research Center, California -Lines: 66 - -# "What comes after silicon? Oh, gallium arsenide, I'd guess. And after - that, there's a thing called indium phosphide." - -- Seymour Cray, Datamation interview, circa 1980 - - Now that most Cray software development is done on Crays themselves, -thanks to Unix, GNU e?grep should come in handy. Of course, if you're -scanning GENBANK for the Human Genome Project at 10 MB/second (the raw -X/MP Unix I/O rate), you really do need the speed. - - Sample, from one of the Ames Cray 2 machines: - - stokes> time ./egrep astrian web2 # GNU egrep - alabastrian - Lancastrian - Zoroastrian - Zoroastrianism - 0.5980u 0.0772s 0:01 35% - stokes> time /usr/bin/egrep astrian web2 # ATT egrep - alabastrian - Lancastrian - Zoroastrian - Zoroastrianism - 7.6765u 0.1373s 0:15 49% - -(web2 is a 2.4 MB wordlist, standard on BSD Unix.) - - To bring up GNU E?GREP, ftp Mike Haertel's version 1.1 package from -'prep.ai.mit.edu' or 'ames.arc.nasa.gov'. Mention -DUSG in the Makefile, -and specify - - #define SIGN_EXTEND_CHAR(c) ((c)>(char)127?(c)-256:(c)) - -in regex.c. [Cray characters, like MIPS chars, are unsigned, but the -compiler won't allow ... #define SIGN_EXTEND_CHAR(c) ((signed char) (c))] - - However, at least on the Cray 2, there's a compiler bug involving the -increment operator in complex expressions, which requires the following -modification (also in regex.c): - -change - m->elems[m->nelem++].constraint |= s2->elems[j++].constraint; -to - m->elems[m->nelem].constraint |= s2->elems[j].constraint; - m->nelem++; - j++; - -Thanks go to Darin Okuyama of NASA ARC for providing this workaround. - --- James A. Woods (ames!jaw) - NASA Ames Research Center - -P.S. -Though Crays are not at their best pushing bytes, the timing difference -is even more exaggerated with heavier regexpr processing, to wit: - - time ./egrep -i 'as.*Trian' web2 - ... - 0.7677u 0.0769s 0:01 44% -vs. - time /usr/bin/egrep -i 'as.*Trian' web2 - ... - 16.1327u 0.1379s 0:32 49% - -which is a mite unfair given a known System 5 egrep -i gaffe. You get -extra credit for vectorizing the inner loop of the Boyer/Moore/Gosper -code, though changing all chars to ints might help also. diff --git a/gnu/usr.bin/grep/README.sunos4 b/gnu/usr.bin/grep/README.sunos4 deleted file mode 100644 index fc01d2aead8..00000000000 --- a/gnu/usr.bin/grep/README.sunos4 +++ /dev/null @@ -1,99 +0,0 @@ -[ N.B. This bug strikes on a Sun 3 running SunOS 4 with the cc -O4 option - as well as on the sparc. -Mike ] - -Date: Fri, 24 Feb 89 15:36:40 -0600 -To: mike@wheaties.ai.mit.edu -From: Dave Cohrs <dave@cs.wisc.edu> -Subject: bug + fix in gnu grep 1.2 (from prep.ai.mit.edu) - -I tried installing the GNU grep 1.2 on a Sun4 running 4.0.1 and -"Spencer test #36" failed. After some experimenting, I found and -fixed the bug. Well, actually, the bug in the the C compiler, but -I managed a workaround. - -Description: - -The Sun4 4.0.1 C compiler with -O doesn't generate the correct for -statements of the form - if("string") - x; - else - y; -To be exact, "y;" gets executed, while "x;" should. This causes the -#define FETCH() to fail for test #36. - -Fix: - -In an #ifdef sparc in dfa.c, I made two versions of FETCH, FETCH0() and -the regular FETCH(). The former takes only one argument, the latter -expects its 2nd argument to contain a non-nil string. This removes -the need to test the constant strings, and the compiler bug isn't -exercised. I then changed the one instance of FETCH() with a nil -second argument to be FETCH0() instead. - -dave cohrs - -=================================================================== -RCS file: RCS/dfa.c,v -retrieving revision 1.1 -diff -c -r1.1 dfa.c -*** /tmp/,RCSt1a05930 Fri Feb 24 15:32:33 1989 ---- dfa.c Fri Feb 24 15:23:34 1989 -*************** -*** 285,293 **** ---- 285,315 ---- - is turned off). */ - - /* Note that characters become unsigned here. */ -+ #ifdef sparc -+ /* -+ * Sun4 4.0.1 C compiler can't compare constant strings correctly. -+ * e.g. if("test") { x; } else { y; } -+ * the compiler will not generate code to execute { x; }, but -+ * executes { y; } instead. -+ */ -+ #define FETCH0(c) \ -+ { \ -+ if (! lexleft) \ -+ return _END; \ -+ (c) = (unsigned char) *lexptr++; \ -+ --lexleft; \ -+ } - #define FETCH(c, eoferr) \ - { \ - if (! lexleft) \ -+ regerror(eoferr); \ -+ (c) = (unsigned char) *lexptr++; \ -+ --lexleft; \ -+ } -+ #else -+ #define FETCH(c, eoferr) \ -+ { \ -+ if (! lexleft) \ - if (eoferr) \ - regerror(eoferr); \ - else \ -*************** -*** 295,300 **** ---- 317,323 ---- - (c) = (unsigned char) *lexptr++; \ - --lexleft; \ - } -+ #endif sparc - - static _token - lex() -*************** -*** 303,309 **** ---- 326,336 ---- - int invert; - _charset cset; - -+ #ifdef sparc -+ FETCH0(c); -+ #else - FETCH(c, (char *) 0); -+ #endif sparc - switch (c) - { - case '^': |
