--- patchy-4.15/p4sub-i386.diff.i386 1998-11-16 23:02:11.000000000 +0900 +++ patchy-4.15/p4sub-i386.diff 2005-11-11 15:07:00.000000000 +0900 @@ -1,5 +1,51 @@ ---- p4sub/iofile.f.orig Fri Nov 13 23:13:15 1998 -+++ p4sub/iofile.f Fri Nov 13 23:18:35 1998 +diff -ur p4sub.orig/cbyt.f p4sub/cbyt.f +--- p4sub.orig/cbyt.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/cbyt.f 2005-11-08 22:41:14.000000000 +0900 +@@ -7,7 +7,7 @@ + PARAMETER (NBITPW=32) + PARAMETER (IALL11 = -1) + C +- IX = OR ( AND (IX, ++ IX = iOR ( iAND (IX, + + NOT(ISHFT (ISHFT(IALL11,-NBITPW+NB), LX-1))) + +, ISHFT (ISHFT(ISHFT(M,-LM+1),NBITPW-NB), -NBITPW-1+LX+NB)) + RETURN +diff -ur p4sub.orig/cctoup.f p4sub/cctoup.f +--- p4sub.orig/cctoup.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/cctoup.f 2005-11-08 22:08:57.000000000 +0900 +@@ -17,7 +17,7 @@ + + DO 49 JCH=1,NCH + +- JVAL = AND (MV(JCH),255) ++ JVAL = iAND (MV(JCH),255) + IF (JVAL.LT.97) GO TO 49 + IF (JVAL.GE.123) GO TO 49 + +@@ -25,7 +25,7 @@ + + 24 JLOW = JCH + +- MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X) ++ MV(JCH) = iAND (MV(JCH), X'FFFFFFDF') + + 49 CONTINUE + JCCLOW = MAX (JCCLOW,JLOW) +diff -ur p4sub.orig/csethi.f p4sub/csethi.f +--- p4sub.orig/csethi.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/csethi.f 2005-11-08 22:08:58.000000000 +0900 +@@ -20,7 +20,7 @@ + NGSLAT = 0 + + 12 IF (JJ.LT.JL) GO TO 97 +- K = AND (IVAL,15) ++ K = iAND (IVAL,15) + IVAL = ISHFT (IVAL,-4) + IF (K.LT.10) THEN + CHV(JJ:JJ) = CHAR(K+48) +diff -ur p4sub.orig/iofile.f p4sub/iofile.f +--- p4sub.orig/iofile.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/iofile.f 2005-11-08 22:12:20.000000000 +0900 @@ -21,12 +21,13 @@ C INTEGER ACTION(8) A6M @@ -16,3 +62,396 @@ +, 'EOFREW','CLOSE ' / C------ CODE BITS IN IOTALL, IOTOFF, IOTON, IOTYP +diff -ur p4sub.orig/iucomh.f p4sub/iucomh.f +--- p4sub.orig/iucomh.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/iucomh.f 2005-11-08 22:08:57.000000000 +0900 +@@ -23,8 +23,8 @@ + NL = MIN(NDO,4) + + DO 28 J=1,NL +- ICHAR1 = AND (IWD1,255) +- ICHAR2 = AND (IWD2,255) ++ ICHAR1 = iAND (IWD1,255) ++ ICHAR2 = iAND (IWD2,255) + IF (ICHAR1-ICHAR2) 32, 26, 31 + 26 IWD1 = ISHFT (IWD1,-8) + 28 IWD2 = ISHFT (IWD2,-8) +diff -ur p4sub.orig/iuforw.f p4sub/iuforw.f +--- p4sub.orig/iuforw.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/iuforw.f 2005-11-08 22:08:58.000000000 +0900 +@@ -12,7 +12,7 @@ + IVAL = 0 + C + 12 IF (JEND.GT.JR) GO TO 20 +- K = AND (IC(JEND),255) ++ K = iAND (IC(JEND),255) + IF (K.EQ.32) GO TO 19 + IF (K.GE.58) GO TO 20 + K = K - 48 +diff -ur p4sub.orig/jartpx.f p4sub/jartpx.f +--- p4sub.orig/jartpx.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/jartpx.f 2005-11-08 22:43:47.000000000 +0900 +@@ -16,18 +16,18 @@ + C-------------- END CDE -------------- + C DIMENSION MM(10), ITP(9) A8M + DIMENSION MM(6), ITP(9) -A8M +- PARAMETER ( NBLANK = '20202000'X ) ++ PARAMETER ( NBLANK = X'20202000' ) + + IT = ITP(1) + JARTPX = 0 + JCCTPX = 0 +- MM(2) = AND(IT,255) ++ MM(2) = iAND(IT,255) + IF (MM(2).EQ.43) GO TO 21 + IF (NOTHCC.EQ.0) RETURN + + C-- CHECK OTHER CONTROL CHAR + +- MM(1) = OR (MM(2), NBLANK) ++ MM(1) = iOR (MM(2), NBLANK) + J = IUCOMP (MM(1),MORGCC(1),NOTHCC) + IF (J.EQ.0) RETURN + +diff -ur p4sub.orig/jartyp.f p4sub/jartyp.f +--- p4sub.orig/jartyp.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/jartyp.f 2005-11-08 22:41:34.000000000 +0900 +@@ -13,7 +13,7 @@ + + + IT = ITP(1) +- MM(2) = AND(IT,255) ++ MM(2) = iAND(IT,255) + IF (MM(2).EQ.43) GO TO 21 + JARTYP = 0 + RETURN +diff -ur p4sub.orig/jbit.f p4sub/jbit.f +--- p4sub.orig/jbit.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/jbit.f 2005-11-08 22:08:58.000000000 +0900 +@@ -8,6 +8,6 @@ + C it should be replaced by a machine-specific fast routine + + +- JBIT = AND (ISHFT (IZW,-IZP+1), 1) ++ JBIT = iAND (ISHFT (IZW,-IZP+1), 1) + RETURN + END +diff -ur p4sub.orig/jbytet.f p4sub/jbytet.f +--- p4sub.orig/jbytet.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/jbytet.f 2005-11-08 22:08:58.000000000 +0900 +@@ -8,7 +8,7 @@ + C it should be replaced by a machine-specific fast routine + PARAMETER (NBITPW=32) + +- JBYTET = AND (MZ, ISHFT (ISHFT (IZW,NBITPW+1-IZP-NZB), ++ JBYTET = iAND (MZ, ISHFT (ISHFT (IZW,NBITPW+1-IZP-NZB), + + -NBITPW+NZB) ) + RETURN + END +diff -ur p4sub.orig/kdcopy.f p4sub/kdcopy.f +--- p4sub.orig/kdcopy.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/kdcopy.f 2005-11-08 22:41:43.000000000 +0900 +@@ -14,7 +14,7 @@ + + DO 16 J=1,KDNWT1 + KIMA(J)= MV(J) +- IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 ++ IF (iAND(KIMA(J),X'FF000000').EQ.0) GO TO 31 + 16 CONTINUE + J = KDNWT + KIMA(J)= MV(J) +diff -ur p4sub.orig/kdfill.f p4sub/kdfill.f +--- p4sub.orig/kdfill.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/kdfill.f 2005-11-08 22:41:56.000000000 +0900 +@@ -13,7 +13,7 @@ + + DO 16 J=1,KDNWT1 + KIMA(J)= MV(J) +- IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 ++ IF (iAND(KIMA(J),X'FF000000').EQ.0) GO TO 31 + 16 CONTINUE + J = KDNWT + KIMA(J)= MV(J) +diff -ur p4sub.orig/kdstep.f p4sub/kdstep.f +--- p4sub.orig/kdstep.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/kdstep.f 2005-11-08 22:42:10.000000000 +0900 +@@ -17,7 +17,7 @@ + DO 31 JC=1,NCD + J = J+1 + DO 19 JJ=1,KDNWT1 +- IF (AND(MV(J),'FF000000'X).EQ.0) GO TO 31 ++ IF (iAND(MV(J),X'FF000000').EQ.0) GO TO 31 + 19 J = J+1 + 31 CONTINUE + +diff -ur p4sub.orig/mbytet.f p4sub/mbytet.f +--- p4sub.orig/mbytet.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/mbytet.f 2005-11-08 22:08:58.000000000 +0900 +@@ -8,7 +8,7 @@ + C it should be replaced by a machine-specific fast routine + PARAMETER (NBITPW=32) + +- MBYTET = AND (IZW, NOT(ISHFT (ISHFT (NOT(MZ),NBITPW-NZB), ++ MBYTET = iAND (IZW, NOT(ISHFT (ISHFT (NOT(MZ),NBITPW-NZB), + + -NBITPW-1+IZP+NZB)) ) + RETURN + END +diff -ur p4sub.orig/msbit.f p4sub/msbit.f +--- p4sub.orig/msbit.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/msbit.f 2005-11-08 22:30:00.000000000 +0900 +@@ -8,7 +8,7 @@ + C it should be replaced by a machine-specific fast routine + + +- MSBIT = OR (AND (IZW, NOT(ISHFT (1,IZP-1)) ) +- +, ISHFT (AND(MZ,1),IZP-1) ) ++ MSBIT = OR (iAND (IZW, NOT(ISHFT (1,IZP-1)) ) ++ +, ISHFT (iAND(MZ,1),IZP-1) ) + RETURN + END +diff -ur p4sub.orig/msbit0.f p4sub/msbit0.f +--- p4sub.orig/msbit0.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/msbit0.f 2005-11-08 22:08:58.000000000 +0900 +@@ -8,6 +8,6 @@ + C it should be replaced by a machine-specific fast routine + + +- MSBIT0 = AND (IZW, NOT(ISHFT (1,IZP-1))) ++ MSBIT0 = iAND (IZW, NOT(ISHFT (1,IZP-1))) + RETURN + END +Only in p4sub.orig/: p4comp.fca.mkfca +Only in p4sub.orig/: p4comp.fca.shfca +Only in p4sub: p4comp.mkfca +Only in p4sub: p4comp.shfca +diff -ur p4sub.orig/pkbyt.f p4sub/pkbyt.f +--- p4sub.orig/pkbyt.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/pkbyt.f 2005-11-08 22:42:32.000000000 +0900 +@@ -46,8 +46,8 @@ + IZW = MBV(JBV) + + 24 JIV = JIV + 1 +- IZW = OR (AND(NOT(MSKU),IZW), +- + AND(MSKU,ISHFT (MIV(JIV),NL))) ++ IZW = iOR (iAND(NOT(MSKU),IZW), ++ + iAND(MSKU,ISHFT (MIV(JIV),NL))) + IF (JIV.EQ.JIVE) GO TO 27 + NL = NL + NZB + MSKU = ISHFT (MSKU,NZB) +diff -ur p4sub.orig/sbit.f p4sub/sbit.f +--- p4sub.orig/sbit.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/sbit.f 2005-11-08 22:40:21.000000000 +0900 +@@ -8,7 +8,7 @@ + C it should be replaced by a machine-specific fast routine + + +- IZW = OR ( AND (IZW, NOT(ISHFT (1,IZP-1))) +- +, ISHFT (AND(IT,1), IZP-1) ) ++ IZW = iOR ( iAND (IZW, NOT(ISHFT (1,IZP-1))) ++ +, ISHFT (iAND(IT,1), IZP-1) ) + RETURN + END +diff -ur p4sub.orig/sbit0.f p4sub/sbit0.f +--- p4sub.orig/sbit0.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/sbit0.f 2005-11-08 22:08:58.000000000 +0900 +@@ -8,6 +8,6 @@ + C it should be replaced by a machine-specific fast routine + + +- IZW = AND (IZW, NOT(ISHFT (1,IZP-1)) ) ++ IZW = iAND (IZW, NOT(ISHFT (1,IZP-1)) ) + RETURN + END +diff -ur p4sub.orig/sbit1.f p4sub/sbit1.f +--- p4sub.orig/sbit1.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/sbit1.f 2005-11-08 22:40:36.000000000 +0900 +@@ -8,6 +8,6 @@ + C it should be replaced by a machine-specific fast routine + + +- IZW = OR (IZW, ISHFT (1,IZP-1)) ++ IZW = iOR (IZW, ISHFT (1,IZP-1)) + RETURN + END +diff -ur p4sub.orig/sbyt.f p4sub/sbyt.f +--- p4sub.orig/sbyt.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/sbyt.f 2005-11-08 22:40:50.000000000 +0900 +@@ -11,7 +11,7 @@ + PARAMETER (IALL11 = -1) + + MSK = ISHFT (IALL11,-NBITPW+NZB) +- IZW = OR ( AND (IZW, NOT(ISHFT (MSK,IZP-1))) +- +, ISHFT (AND(IT,MSK),IZP-1)) ++ IZW = iOR ( iAND (IZW, NOT(ISHFT (MSK,IZP-1))) ++ +, ISHFT (iAND(IT,MSK),IZP-1)) + RETURN + END +diff -ur p4sub.orig/sbytor.f p4sub/sbytor.f +--- p4sub.orig/sbytor.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/sbytor.f 2005-11-08 22:41:01.000000000 +0900 +@@ -10,7 +10,7 @@ + PARAMETER (NBITPW=32) + PARAMETER (IALL11 = -1) + +- IZW = OR (IZW, +- + ISHFT (AND(IT,ISHFT (IALL11,-NBITPW+NZB)), IZP-1)) ++ IZW = iOR (IZW, ++ + ISHFT (iAND(IT,ISHFT (IALL11,-NBITPW+NZB)), IZP-1)) + RETURN + END +diff -ur p4sub.orig/ublow.f p4sub/ublow.f +--- p4sub.orig/ublow.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/ublow.f 2005-11-08 22:32:51.000000000 +0900 +@@ -12,7 +12,7 @@ + NCH = NCHP(1) + IF (NCH) 91, 29, 11 + 11 NWS = ishft (NCH,-2) +- NTRAIL = AND (NCH,3) ++ NTRAIL = iAND (NCH,3) + JT = 0 + IF (NWS.EQ.0) GO TO 26 + +@@ -20,10 +20,10 @@ + + DO 24 JS=1,NWS + MWD = MS(JS) +- MT(JT+1) = OR (IBLAN1,AND(MASK1,MWD)) +- MT(JT+2) = OR (IBLAN1,AND(MASK1,ISHFT(MWD, -8))) +- MT(JT+3) = OR (IBLAN1,AND(MASK1,ISHFT(MWD,-16))) +- MT(JT+4) = OR (IBLAN1, ISHFT(MWD,-24) ) ++ MT(JT+1) = iOR (IBLAN1,iAND(MASK1,MWD)) ++ MT(JT+2) = iOR (IBLAN1,iAND(MASK1,ISHFT(MWD, -8))) ++ MT(JT+3) = iOR (IBLAN1,iAND(MASK1,ISHFT(MWD,-16))) ++ MT(JT+4) = iOR (IBLAN1, ISHFT(MWD,-24) ) + 24 JT = JT + 4 + + IF (NTRAIL.EQ.0) RETURN +@@ -33,7 +33,7 @@ + 26 MWD = MS(NWS+1) + + DO 28 JS=1,NTRAIL +- MT(JT+1) = OR (IBLAN1,AND(MASK1,MWD)) ++ MT(JT+1) = iOR (IBLAN1,iAND(MASK1,MWD)) + MWD = ISHFT (MWD,-8) + 28 JT = JT + 1 + 29 RETURN +diff -ur p4sub.orig/ubunch.f p4sub/ubunch.f +--- p4sub.orig/ubunch.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/ubunch.f 2005-11-08 22:33:56.000000000 +0900 +@@ -12,17 +12,17 @@ + NCH = NCHP(1) + IF (NCH) 91,39,11 + 11 NWT = ishft (NCH,-2) +- NTRAIL = AND (NCH,3) ++ NTRAIL = iAND (NCH,3) + JS = 0 + IF (NWT.EQ.0) GO TO 31 + + C-- Pack the initial complete words + + DO 24 JT=1,NWT +- MT(JT) = OR (OR (OR ( +- + AND(MS(JS+1),MASK1), +- + ishft (AND(MS(JS+2),MASK1), 8)), +- + ishft (AND(MS(JS+3),MASK1),16)), ++ MT(JT) = iOR (iOR (iOR ( ++ + iAND(MS(JS+1),MASK1), ++ + ishft (iAND(MS(JS+2),MASK1), 8)), ++ + ishft (iAND(MS(JS+3),MASK1),16)), + + ishft (MS(JS+4), 24) ) + 24 JS = JS + 4 + +@@ -34,7 +34,7 @@ + JS = NCH + + DO 34 JT=1,NTRAIL +- MWD = OR (ishft(MWD,8), AND(MS(JS),MASK1)) ++ MWD = iOR (ishft(MWD,8), iAND(MS(JS),MASK1)) + 34 JS = JS - 1 + MT(NWT+1) = MWD + 39 RETURN +diff -ur p4sub.orig/upkbyt.f p4sub/upkbyt.f +--- p4sub.orig/upkbyt.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/upkbyt.f 2005-11-08 22:08:58.000000000 +0900 +@@ -44,7 +44,7 @@ + 22 JIVE = MIN (NINT,JIVE) + + 24 JIV = JIV + 1 +- MIV(JIV) = AND (MSKA,IZW) ++ MIV(JIV) = iAND (MSKA,IZW) + IF (JIV.EQ.JIVE) GO TO 27 + IZW = ISHFT (IZW,-NZB) + GO TO 24 +diff -ur p4sub.orig/ysfind.f p4sub/ysfind.f +--- p4sub.orig/ysfind.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/ysfind.f 2005-11-08 22:08:57.000000000 +0900 +@@ -60,7 +60,7 @@ + IF (JCARD.GE.NTOTCC) RETURN + LE = LTK + KDNWT1 - 1 + DO 12 L=LTK,LE +- IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 ++ IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 + 12 CONTINUE + NWTK = KDNWT + NCH = 80 +diff -ur p4sub.orig/yshtag.f p4sub/yshtag.f +--- p4sub.orig/yshtag.f 2005-11-08 22:09:31.000000000 +0900 ++++ p4sub/yshtag.f 2005-11-08 22:08:57.000000000 +0900 +@@ -47,7 +47,7 @@ + IF (JCARD.GE.NTOTCC) RETURN + LE = LTK + KDNWT1 - 1 + DO 13 L=LTK,LE +- IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 ++ IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 + 13 CONTINUE + NWTK = KDNWT + NCHCCT = 80 +diff -uNr p4sub.orig/kdnextch.f p4sub/kdnextch.f +--- p4sub.orig/kdnextch.f 2005-10-10 15:47:46.000000000 +0900 ++++ p4sub/kdnextch.f 2005-10-10 15:48:29.000000000 +0900 +@@ -30,7 +30,8 @@ + + + IF (IPROMU.NE.0) WRITE (IQTYPE,9001) +- 9001 FORMAT ($,' y> ') ++c 9001 FORMAT ($,' y> ') ++ 9001 FORMAT (' y> ') + + READ (LUNPAM,8000,END=41) KCH + 8000 FORMAT (A) +diff -uNr p4sub.orig/flink.f p4sub/flink.f +--- p4sub.orig/flink.f 2005-11-11 14:40:42.000000000 +0900 ++++ p4sub/flink.f 2005-11-11 14:57:14.000000000 +0900 +@@ -99,7 +99,7 @@ + IF (IOMODE(8).NE.0) GO TO 41 + + IF (MODXA.EQ.2) THEN +- OPEN (LUN,FILE=TEXT(1:NTXT),STATUS=OST,ACCESS=APX,FORM=USF) ++ OPEN (LUN,FILE=TEXT(1:NTXT),STATUS=OST,FORM=USF) + ELSEIF (MODXA.EQ.4) THEN + OPEN (LUN,STATUS=OST,FORM=USF) + ELSEIF (MODXA.EQ.0) THEN +diff -uNr p4sub.ORIG/ysfind.f p4sub/ysfind.f +--- p4sub.ORIG/ysfind.f 2005-11-11 14:40:42.000000000 +0900 ++++ p4sub/ysfind.f 2005-11-11 15:04:40.000000000 +0900 +@@ -60,7 +60,7 @@ + IF (JCARD.GE.NTOTCC) RETURN + LE = LTK + KDNWT1 - 1 + DO 12 L=LTK,LE +- IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 ++ IF (iAND(IQ(L),X'FF000000').EQ.0) GO TO 14 + 12 CONTINUE + NWTK = KDNWT + NCH = 80 +diff -uNr p4sub.ORIG/yshtag.f p4sub/yshtag.f +--- p4sub.ORIG/yshtag.f 2005-11-11 14:40:42.000000000 +0900 ++++ p4sub/yshtag.f 2005-11-11 15:05:04.000000000 +0900 +@@ -47,7 +47,7 @@ + IF (JCARD.GE.NTOTCC) RETURN + LE = LTK + KDNWT1 - 1 + DO 13 L=LTK,LE +- IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 ++ IF (iAND(IQ(L),X'FF000000').EQ.0) GO TO 14 + 13 CONTINUE + NWTK = KDNWT + NCHCCT = 80