changes from donn@utah-cs for common header file for pcc

SCCS-vsn: usr.bin/pascal/src/call.c 2.2
SCCS-vsn: usr.bin/pascal/src/conv.c 2.2
SCCS-vsn: usr.bin/pascal/src/cset.c 2.2
SCCS-vsn: usr.bin/pascal/src/fdec.c 2.2
SCCS-vsn: usr.bin/pascal/src/fend.c 2.3
SCCS-vsn: usr.bin/pascal/src/fhdr.c 2.3
SCCS-vsn: usr.bin/pascal/src/flvalue.c 2.2
SCCS-vsn: usr.bin/pascal/src/forop.c 2.2
SCCS-vsn: usr.bin/pascal/src/lab.c 2.2
SCCS-vsn: usr.bin/pascal/src/lval.c 2.2
SCCS-vsn: usr.bin/pascal/src/p2put.c 2.2
SCCS-vsn: usr.bin/pascal/src/pccaseop.c 2.3
SCCS-vsn: usr.bin/pascal/src/pcfunc.c 2.2
SCCS-vsn: usr.bin/pascal/src/pclval.c 2.2
SCCS-vsn: usr.bin/pascal/pc0/Makefile 2.2
SCCS-vsn: usr.bin/pascal/src/pcproc.c 2.2
SCCS-vsn: usr.bin/pascal/src/rval.c 2.3
SCCS-vsn: usr.bin/pascal/src/sconv.c 2.2
SCCS-vsn: usr.bin/pascal/src/stat.c 2.2
SCCS-vsn: usr.bin/pascal/src/stkrval.c 2.2
SCCS-vsn: usr.bin/pascal/src/var.c 2.3

diff --git a/usr/src/usr.bin/pascal/pc0/Makefile b/usr/src/usr.bin/pascal/pc0/Makefile
index 3a3fe3a..56fd095 100644 (file)
--- a/usr/src/usr.bin/pascal/pc0/Makefile
+++ b/usr/src/usr.bin/pascal/pc0/Makefile
@@ -1,4 +1,4 @@
-SCCSID = "@(#)Makefile 2.1 %G%"
+SCCSID = "@(#)Makefile 2.2 %G%"

 
 INSTALLDIR = $(DESTDIR)/usr/lib
 INSTALLNAME = ${INSTALLDIR}/pc0
 
 INSTALLDIR = $(DESTDIR)/usr/lib
 INSTALLNAME = ${INSTALLDIR}/pc0


@@ -218,32 +218,36 @@ call.o: ../src/tree.h
 call.o: opcode.h
 call.o: ../src/objfmt.h
 call.o: ../src/pc.h
 call.o: opcode.h
 call.o: ../src/objfmt.h
 call.o: ../src/pc.h

-call.o: ../src/pcops.h

 call.o: ../src/tmps.h
 call.o: ../src/tmps.h

+call.o: ../src/tree_ty.h

 case.o: whoami.h
 case.o: ../src/0.h
 case.o: ../src/tree.h
 case.o: opcode.h
 case.o: whoami.h
 case.o: ../src/0.h
 case.o: ../src/tree.h
 case.o: opcode.h

+case.o: ../src/tree_ty.h

 clas.o: whoami.h
 clas.o: ../src/0.h
 clas.o: ../src/tree.h
 clas.o: whoami.h
 clas.o: ../src/0.h
 clas.o: ../src/tree.h

+clas.o: ../src/tree_ty.h

 const.o: whoami.h
 const.o: ../src/0.h
 const.o: ../src/tree.h
 const.o: whoami.h
 const.o: ../src/0.h
 const.o: ../src/tree.h

+const.o: ../src/tree_ty.h

 conv.o: whoami.h
 conv.o: ../src/0.h
 conv.o: opcode.h
 conv.o: whoami.h
 conv.o: ../src/0.h
 conv.o: opcode.h

-conv.o: ../src/pcops.h
+conv.o: ../src/tree_ty.h

 cset.o: whoami.h
 cset.o: ../src/0.h
 cset.o: ../src/tree.h
 cset.o: opcode.h
 cset.o: ../src/objfmt.h
 cset.o: whoami.h
 cset.o: ../src/0.h
 cset.o: ../src/tree.h
 cset.o: opcode.h
 cset.o: ../src/objfmt.h

+cset.o: ../src/tree_ty.h

 cset.o: ../src/pc.h
 cset.o: ../src/pc.h

-cset.o: ../src/pcops.h

 cset.o: ../src/align.h
 error.o: whoami.h
 error.o: ../src/0.h
 cset.o: ../src/align.h
 error.o: whoami.h
 error.o: ../src/0.h

+error.o: ../src/tree_ty.h

 error.o: ../src/yy.h
 fdec.o: whoami.h
 fdec.o: ../src/0.h
 error.o: ../src/yy.h
 fdec.o: whoami.h
 fdec.o: ../src/0.h


@@ -253,7 +257,6 @@ fdec.o: ../src/objfmt.h
 fdec.o: ../src/align.h
 fdec.o: ../src/tmps.h
 fdec.o: ../src/pc.h
 fdec.o: ../src/align.h
 fdec.o: ../src/tmps.h
 fdec.o: ../src/pc.h

-fdec.o: ../src/pcops.h

 fend.o: whoami.h
 fend.o: ../src/0.h
 fend.o: ../src/tree.h
 fend.o: whoami.h
 fend.o: ../src/0.h
 fend.o: ../src/tree.h


@@ -262,22 +265,22 @@ fend.o: ../src/objfmt.h
 fend.o: ../src/align.h
 fend.o: ../src/tmps.h
 fend.o: ../src/pc.h
 fend.o: ../src/align.h
 fend.o: ../src/tmps.h
 fend.o: ../src/pc.h

-fend.o: ../src/pcops.h
+fend.o: ../src/tree_ty.h

 fhdr.o: whoami.h
 fhdr.o: ../src/0.h
 fhdr.o: ../src/tree.h
 fhdr.o: opcode.h
 fhdr.o: ../src/objfmt.h
 fhdr.o: ../src/align.h
 fhdr.o: whoami.h
 fhdr.o: ../src/0.h
 fhdr.o: ../src/tree.h
 fhdr.o: opcode.h
 fhdr.o: ../src/objfmt.h
 fhdr.o: ../src/align.h

+fhdr.o: ../src/tree_ty.h

 fhdr.o: ../src/pc.h
 fhdr.o: ../src/pc.h

-fhdr.o: ../src/pcops.h

 flvalue.o: whoami.h
 flvalue.o: ../src/0.h
 flvalue.o: ../src/tree.h
 flvalue.o: opcode.h
 flvalue.o: ../src/objfmt.h
 flvalue.o: whoami.h
 flvalue.o: ../src/0.h
 flvalue.o: ../src/tree.h
 flvalue.o: opcode.h
 flvalue.o: ../src/objfmt.h

+flvalue.o: ../src/tree_ty.h

 flvalue.o: ../src/pc.h
 flvalue.o: ../src/pc.h

-flvalue.o: ../src/pcops.h

 flvalue.o: ../src/tmps.h
 forop.o: whoami.h
 forop.o: ../src/0.h
 flvalue.o: ../src/tmps.h
 forop.o: whoami.h
 forop.o: ../src/0.h


@@ -285,8 +288,8 @@ forop.o: opcode.h
 forop.o: ../src/tree.h
 forop.o: ../src/objfmt.h
 forop.o: ../src/pc.h
 forop.o: ../src/tree.h
 forop.o: ../src/objfmt.h
 forop.o: ../src/pc.h

-forop.o: ../src/pcops.h

 forop.o: ../src/tmps.h
 forop.o: ../src/tmps.h

+forop.o: ../src/tree_ty.h

 flvalue.o: whoami.h
 flvalue.o: 0.h
 flvalue.o: tree.h
 flvalue.o: whoami.h
 flvalue.o: 0.h
 flvalue.o: tree.h


@@ -298,6 +301,7 @@ func.o: whoami.h
 func.o: ../src/0.h
 func.o: ../src/tree.h
 func.o: opcode.h
 func.o: ../src/0.h
 func.o: ../src/tree.h
 func.o: opcode.h

+func.o: ../src/tree_ty.h

 gen.o: whoami.h
 gen.o: ../src/0.h
 gen.o: ../src/tree.h
 gen.o: whoami.h
 gen.o: ../src/0.h
 gen.o: ../src/tree.h


@@ -305,6 +309,7 @@ gen.o: opcode.h
 gen.o: ../src/objfmt.h
 hash.o: whoami.h
 hash.o: ../src/0.h
 gen.o: ../src/objfmt.h
 hash.o: whoami.h
 hash.o: ../src/0.h

+hash.o: ../src/tree_ty.h

 hash.o: ../src/yy.h
 lab.o: whoami.h
 lab.o: ../src/0.h
 hash.o: ../src/yy.h
 lab.o: whoami.h
 lab.o: ../src/0.h


@@ -312,7 +317,7 @@ lab.o: ../src/tree.h
 lab.o: opcode.h
 lab.o: ../src/objfmt.h
 lab.o: ../src/pc.h
 lab.o: opcode.h
 lab.o: ../src/objfmt.h
 lab.o: ../src/pc.h

-lab.o: ../src/pcops.h
+lab.o: ../src/tree_ty.h

 lookup.o: whoami.h
 lookup.o: ../src/0.h
 lval.o: whoami.h
 lookup.o: whoami.h
 lookup.o: ../src/0.h
 lval.o: whoami.h


@@ -320,10 +325,11 @@ lval.o: ../src/0.h
 lval.o: ../src/tree.h
 lval.o: opcode.h
 lval.o: ../src/objfmt.h
 lval.o: ../src/tree.h
 lval.o: opcode.h
 lval.o: ../src/objfmt.h

+lval.o: ../src/tree_ty.h

 lval.o: ../src/pc.h
 lval.o: ../src/pc.h

-lval.o: ../src/pcops.h

 main.o: whoami.h
 main.o: ../src/0.h
 main.o: whoami.h
 main.o: ../src/0.h

+main.o: ../src/tree_ty.h

 main.o: ../src/yy.h
 main.o: ../src/objfmt.h
 main.o: ../src/config.h
 main.o: ../src/yy.h
 main.o: ../src/objfmt.h
 main.o: ../src/config.h


@@ -333,8 +339,8 @@ nl.o: opcode.h
 nl.o: ../src/objfmt.h
 opc.o: ../src/OPnames.h
 pcproc.o: ../src/pc.h
 nl.o: ../src/objfmt.h
 opc.o: ../src/OPnames.h
 pcproc.o: ../src/pc.h

-pcproc.o: ../src/pcops.h

 pcproc.o: ../src/tmps.h
 pcproc.o: ../src/tmps.h

+pcproc.o: ../src/tree_ty.h

 pic.o: ../src/OPnames.h
 proc.o: whoami.h
 proc.o: ../src/0.h
 pic.o: ../src/OPnames.h
 proc.o: whoami.h
 proc.o: ../src/0.h


@@ -342,6 +348,7 @@ proc.o: ../src/tree.h
 proc.o: opcode.h
 proc.o: ../src/objfmt.h
 proc.o: ../src/tmps.h
 proc.o: opcode.h
 proc.o: ../src/objfmt.h
 proc.o: ../src/tmps.h

+proc.o: ../src/tree_ty.h

 put.o: whoami.h
 put.o: opcode.h
 put.o: ../src/0.h
 put.o: whoami.h
 put.o: opcode.h
 put.o: ../src/0.h


@@ -354,14 +361,15 @@ rec.o: ../src/0.h
 rec.o: ../src/tree.h
 rec.o: opcode.h
 rec.o: ../src/align.h
 rec.o: ../src/tree.h
 rec.o: opcode.h
 rec.o: ../src/align.h

+rec.o: ../src/tree_ty.h

 rval.o: whoami.h
 rval.o: ../src/0.h
 rval.o: ../src/tree.h
 rval.o: opcode.h
 rval.o: ../src/objfmt.h
 rval.o: ../src/pc.h
 rval.o: whoami.h
 rval.o: ../src/0.h
 rval.o: ../src/tree.h
 rval.o: opcode.h
 rval.o: ../src/objfmt.h
 rval.o: ../src/pc.h

-rval.o: ../src/pcops.h

 rval.o: ../src/tmps.h
 rval.o: ../src/tmps.h

+rval.o: ../src/tree_ty.h

 savenl.o: whoami.h
 savenl.o: ../src/0.h
 savenl.o: ../src/objfmt.h
 savenl.o: whoami.h
 savenl.o: ../src/0.h
 savenl.o: ../src/objfmt.h


@@ -372,26 +380,26 @@ savenl.o: ../src/../pdx/mappings.h
 savenl.o: ../src/../pdx/mappings/filetab.h
 sconv.o: whoami.h
 sconv.o: ../src/0.h
 savenl.o: ../src/../pdx/mappings/filetab.h
 sconv.o: whoami.h
 sconv.o: ../src/0.h

-sconv.o: ../src/pcops.h

 stat.o: whoami.h
 stat.o: ../src/0.h
 stat.o: ../src/tree.h
 stat.o: ../src/objfmt.h
 stat.o: whoami.h
 stat.o: ../src/0.h
 stat.o: ../src/tree.h
 stat.o: ../src/objfmt.h

-stat.o: ../src/pcops.h

 stat.o: ../src/pc.h
 stat.o: ../src/tmps.h
 stat.o: opcode.h
 stat.o: ../src/pc.h
 stat.o: ../src/tmps.h
 stat.o: opcode.h

+stat.o: ../src/tree_ty.h

 stklval.o: whoami.h
 stklval.o: ../src/0.h
 stklval.o: ../src/tree.h
 stklval.o: opcode.h
 stklval.o: ../src/objfmt.h
 stklval.o: whoami.h
 stklval.o: ../src/0.h
 stklval.o: ../src/tree.h
 stklval.o: opcode.h
 stklval.o: ../src/objfmt.h

+stklval.o: ../src/tree_ty.h

 stkrval.o: whoami.h
 stkrval.o: ../src/0.h
 stkrval.o: ../src/tree.h
 stkrval.o: opcode.h
 stkrval.o: ../src/objfmt.h
 stkrval.o: whoami.h
 stkrval.o: ../src/0.h
 stkrval.o: ../src/tree.h
 stkrval.o: opcode.h
 stkrval.o: ../src/objfmt.h

-stkrval.o: ../src/pcops.h
+stkrval.o: ../src/tree_ty.h

 string.o: whoami.h
 string.o: ../src/0.h
 string.o: ../src/send.h
 string.o: whoami.h
 string.o: ../src/0.h
 string.o: ../src/send.h


@@ -401,68 +409,88 @@ tmps.o: whoami.h
 tmps.o: ../src/0.h
 tmps.o: ../src/objfmt.h
 tmps.o: ../src/pc.h
 tmps.o: ../src/0.h
 tmps.o: ../src/objfmt.h
 tmps.o: ../src/pc.h

+tmps.o: ../src/align.h

 tmps.o: ../src/tmps.h
 tree.o: whoami.h
 tree.o: ../src/0.h
 tmps.o: ../src/tmps.h
 tree.o: whoami.h
 tree.o: ../src/0.h

+treen.o: ../src/0.h
+treen.o: ../src/tree_ty.h

 type.o: whoami.h
 type.o: ../src/0.h
 type.o: ../src/tree.h
 type.o: ../src/objfmt.h
 type.o: whoami.h
 type.o: ../src/0.h
 type.o: ../src/tree.h
 type.o: ../src/objfmt.h

+type.o: ../src/tree_ty.h

 var.o: whoami.h
 var.o: ../src/0.h
 var.o: ../src/objfmt.h
 var.o: ../src/align.h
 var.o: ../src/iorec.h
 var.o: ../src/pc.h
 var.o: whoami.h
 var.o: ../src/0.h
 var.o: ../src/objfmt.h
 var.o: ../src/align.h
 var.o: ../src/iorec.h
 var.o: ../src/pc.h

-var.o: ../src/pcops.h

 var.o: ../src/tmps.h
 var.o: ../src/tmps.h

+var.o: ../src/tree_ty.h
+yycopy.o: whoami.h

 yycopy.o: ../src/0.h
 yycopy.o: ../src/0.h

+yycopy.o: ../src/tree_ty.h

 yycopy.o: ../src/yy.h
 yycosts.o: whoami.h
 yycosts.o: ../src/0.h
 yycopy.o: ../src/yy.h
 yycosts.o: whoami.h
 yycosts.o: ../src/0.h

+yycosts.o: ../src/tree_ty.h

 yycosts.o: ../src/yy.h
 yyerror.o: whoami.h
 yyerror.o: ../src/0.h
 yycosts.o: ../src/yy.h
 yyerror.o: whoami.h
 yyerror.o: ../src/0.h

+yyerror.o: ../src/tree_ty.h

 yyerror.o: ../src/yy.h
 yyget.o: whoami.h
 yyget.o: ../src/0.h
 yyerror.o: ../src/yy.h
 yyget.o: whoami.h
 yyget.o: ../src/0.h

+yyget.o: ../src/tree_ty.h

 yyget.o: ../src/yy.h
 yyid.o: whoami.h
 yyid.o: ../src/0.h
 yyget.o: ../src/yy.h
 yyid.o: whoami.h
 yyid.o: ../src/0.h

+yyid.o: ../src/tree_ty.h

 yyid.o: ../src/yy.h
 yylex.o: whoami.h
 yylex.o: ../src/0.h
 yyid.o: ../src/yy.h
 yylex.o: whoami.h
 yylex.o: ../src/0.h

+yylex.o: ../src/tree_ty.h

 yylex.o: ../src/yy.h
 yymain.o: whoami.h
 yymain.o: ../src/0.h
 yylex.o: ../src/yy.h
 yymain.o: whoami.h
 yymain.o: ../src/0.h

+yymain.o: ../src/tree_ty.h

 yymain.o: ../src/yy.h
 yymain.o: ../src/objfmt.h
 yymain.o: ../src/config.h
 yyoptions.o: whoami.h
 yyoptions.o: ../src/0.h
 yymain.o: ../src/yy.h
 yymain.o: ../src/objfmt.h
 yymain.o: ../src/config.h
 yyoptions.o: whoami.h
 yyoptions.o: ../src/0.h

+yyoptions.o: ../src/tree_ty.h

 yyoptions.o: ../src/yy.h
 yypanic.o: whoami.h
 yypanic.o: ../src/0.h
 yyoptions.o: ../src/yy.h
 yypanic.o: whoami.h
 yypanic.o: ../src/0.h

+yypanic.o: ../src/tree_ty.h

 yypanic.o: ../src/yy.h
 yyparse.o: whoami.h
 yyparse.o: ../src/0.h
 yypanic.o: ../src/yy.h
 yyparse.o: whoami.h
 yyparse.o: ../src/0.h

+yyparse.o: ../src/tree_ty.h

 yyparse.o: ../src/yy.h
 yyprint.o: whoami.h
 yyprint.o: ../src/0.h
 yyparse.o: ../src/yy.h
 yyprint.o: whoami.h
 yyprint.o: ../src/0.h

+yyprint.o: ../src/tree_ty.h

 yyprint.o: ../src/yy.h
 yyput.o: whoami.h
 yyput.o: ../src/0.h
 yyput.o: ../src/tree.h
 yyprint.o: ../src/yy.h
 yyput.o: whoami.h
 yyput.o: ../src/0.h
 yyput.o: ../src/tree.h

+yyput.o: ../src/tree_ty.h

 yyput.o: ../src/yy.h
 yyrecover.o: whoami.h
 yyrecover.o: ../src/0.h
 yyput.o: ../src/yy.h
 yyrecover.o: whoami.h
 yyrecover.o: ../src/0.h

+yyrecover.o: ../src/tree_ty.h

 yyrecover.o: ../src/yy.h
 yyseman.o: whoami.h
 yyseman.o: ../src/0.h
 yyrecover.o: ../src/yy.h
 yyseman.o: whoami.h
 yyseman.o: ../src/0.h

+yyseman.o: ../src/tree_ty.h

 yyseman.o: ../src/yy.h
 yytree.o: whoami.h
 yytree.o: ../src/0.h
 yytree.o: ../src/tree.h
 yyseman.o: ../src/yy.h
 yytree.o: whoami.h
 yytree.o: ../src/0.h
 yytree.o: ../src/tree.h

+yytree.o: ../src/tree_ty.h

 # DEPENDENCIES MUST END AT END OF FILE
 # IF YOU PUT STUFF HERE IT WILL GO AWAY
 # see make depend above
 # DEPENDENCIES MUST END AT END OF FILE
 # IF YOU PUT STUFF HERE IT WILL GO AWAY
 # see make depend above

diff --git a/usr/src/usr.bin/pascal/src/call.c b/usr/src/usr.bin/pascal/src/call.c
index 492c35f..23a5e4f 100644 (file)
--- a/usr/src/usr.bin/pascal/src/call.c
+++ b/usr/src/usr.bin/pascal/src/call.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)call.c 2.1 %G%";
+static char sccsid[] = "@(#)call.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -11,7 +11,7 @@ static        char sccsid[] = "@(#)call.c 2.1 %G%";
 #include "objfmt.h"
 #ifdef PC
 #   include "pc.h"
 #include "objfmt.h"
 #ifdef PC
 #   include "pc.h"

-#   include "pcops.h"
+#   include <pcc.h>

 #endif PC
 #include "tmps.h"
 #include "tree_ty.h"
 #endif PC
 #include "tmps.h"
 #include "tree_ty.h"


@@ -109,17 +109,17 @@ call(p, argv_node, porf, psbn)
                tempdescrp = tmpalloc((long) (sizeof( struct formalrtn *)),
                                        NLNIL, REGOK );
                putRV((char *) 0 , cbn , tempdescrp -> value[ NL_OFFS ] ,
                tempdescrp = tmpalloc((long) (sizeof( struct formalrtn *)),
                                        NLNIL, REGOK );
                putRV((char *) 0 , cbn , tempdescrp -> value[ NL_OFFS ] ,

-                       tempdescrp -> extra_flags , P2PTR|P2STRTY );
+                       tempdescrp -> extra_flags , PCCTM_PTR|PCCT_STRTY );

                putRV((char *) 0 , psbn , p -> value[ NL_OFFS ] ,
                putRV((char *) 0 , psbn , p -> value[ NL_OFFS ] ,

-                       p -> extra_flags , P2PTR|P2STRTY );
-               putop( P2ASSIGN , P2PTR | P2STRTY );
+                       p -> extra_flags , PCCTM_PTR|PCCT_STRTY );
+               putop( PCC_ASSIGN , PCCTM_PTR | PCCT_STRTY );

            }
                /*
                 *      if we have to store a temporary,
                 *      temptype will be its type,
            }
                /*
                 *      if we have to store a temporary,
                 *      temptype will be its type,

-                *      otherwise, it's P2UNDEF.
+                *      otherwise, it's PCCT_UNDEF.

                 */
                 */

-           temptype = P2UNDEF;
+           temptype = PCCT_UNDEF;

            if ( porf == FUNC ) {
                p_type_width = width( p -> type );
                switch( p_type_class ) {
            if ( porf == FUNC ) {
                p_type_width = width( p -> type );
                switch( p_type_class ) {


@@ -128,7 +128,7 @@ call(p, argv_node, porf, psbn)
                    case TREC:
                    case TFILE:
                    case TARY:
                    case TREC:
                    case TFILE:
                    case TARY:

-                       temptype = P2STRTY;
+                       temptype = PCCT_STRTY;

                        p_type_align = align( p -> type );
                        break;
                    default:
                        p_type_align = align( p -> type );
                        break;
                    default:


@@ -137,7 +137,7 @@ call(p, argv_node, porf, psbn)
                        }
                        break;
                }
                        }
                        break;
                }

-               if ( temptype != P2UNDEF ) {
+               if ( temptype != PCCT_UNDEF ) {

                    tempnlp = tmpalloc(p_type_width, p -> type, NOREG);
                        /*
                         *      temp
                    tempnlp = tmpalloc(p_type_width, p -> type, NOREG);
                        /*
                         *      temp


@@ -154,7 +154,7 @@ call(p, argv_node, porf, psbn)
                         *      ... p( ...
                         */
                    sextname( extname , p -> symbol , BLOCKNO(p -> nl_block) );
                         *      ... p( ...
                         */
                    sextname( extname , p -> symbol , BLOCKNO(p -> nl_block) );

-                   putleaf( P2ICON , 0 , 0 , p2type( p ) , extname );
+                   putleaf( PCC_ICON , 0 , 0 , p2type( p ) , extname );

                    break;
                case FFUNC:
                case FPROC:
                    break;
                case FFUNC:
                case FPROC:


@@ -164,29 +164,29 @@ call(p, argv_node, porf, psbn)
                             */
                            /*  the descriptor */
                        putRV((char *) 0 , cbn , tempdescrp -> value[ NL_OFFS ] ,
                             */
                            /*  the descriptor */
                        putRV((char *) 0 , cbn , tempdescrp -> value[ NL_OFFS ] ,

-                               tempdescrp -> extra_flags , P2PTR | P2STRTY );
+                               tempdescrp -> extra_flags , PCCTM_PTR | PCCT_STRTY );

                            /*  the entry address within the descriptor */
                        if ( FENTRYOFFSET != 0 ) {
                            /*  the entry address within the descriptor */
                        if ( FENTRYOFFSET != 0 ) {

-                           putleaf( P2ICON , FENTRYOFFSET , 0 , P2INT , 
+                           putleaf( PCC_ICON , FENTRYOFFSET , 0 , PCCT_INT , 

                                                (char *) 0 );
                                                (char *) 0 );

-                           putop( P2PLUS , 
-                               ADDTYPE(
-                                   ADDTYPE( ADDTYPE( p2type( p ) , P2FTN ) ,
-                                           P2PTR ) ,
-                                       P2PTR ) );
+                           putop( PCC_PLUS , 
+                               PCCM_ADDTYPE(
+                                   PCCM_ADDTYPE( PCCM_ADDTYPE( p2type( p ) , PCCTM_FTN ) ,
+                                           PCCTM_PTR ) ,
+                                       PCCTM_PTR ) );

                        }
                            /*
                             *  indirect to fetch the formal entry address
                             *  with the result type of the routine.
                             */
                        if (p -> class == FFUNC) {
                        }
                            /*
                             *  indirect to fetch the formal entry address
                             *  with the result type of the routine.
                             */
                        if (p -> class == FFUNC) {

-                           putop( P2UNARY P2MUL ,
-                               ADDTYPE(ADDTYPE(p2type(p -> type), P2FTN),
-                                       P2PTR));
+                           putop( PCCOM_UNARY PCC_MUL ,
+                               PCCM_ADDTYPE(PCCM_ADDTYPE(p2type(p -> type), PCCTM_FTN),
+                                       PCCTM_PTR));

                        } else {
                                /* procedures are int returning functions */
                        } else {
                                /* procedures are int returning functions */

-                           putop( P2UNARY P2MUL ,
-                               ADDTYPE(ADDTYPE(P2INT, P2FTN), P2PTR));
+                           putop( PCCOM_UNARY PCC_MUL ,
+                               PCCM_ADDTYPE(PCCM_ADDTYPE(PCCT_INT, PCCTM_FTN), PCCTM_PTR));

                        }
                        break;
                default:
                        }
                        break;
                default:


@@ -304,15 +304,15 @@ conf_err:                     if (p1->chain->type->class == CRANGE) {
                                                putRV(p2->symbol, (p2->nl_block
                                                    & 037), p2->value[0],
                                                    p2->extra_flags,p2type(p2));
                                                putRV(p2->symbol, (p2->nl_block
                                                    & 037), p2->value[0],
                                                    p2->extra_flags,p2type(p2));

-                                               putop(P2LISTOP, P2INT);
+                                               putop(PCC_CM, PCCT_INT);

                                            }
                                        } else {
                                            }
                                        } else {

-                                           putleaf(P2ICON, q->range[0], 0,P2INT,0);
-                                           putop( P2LISTOP , P2INT );
-                                           putleaf(P2ICON, q->range[1], 0,P2INT,0);
-                                           putop( P2LISTOP , P2INT );
-                                           putleaf(P2ICON,aryconst(ctype,i),0,P2INT,0);
-                                           putop( P2LISTOP , P2INT );
+                                           putleaf(PCC_ICON, q->range[0], 0,PCCT_INT,0);
+                                           putop( PCC_CM , PCCT_INT );
+                                           putleaf(PCC_ICON, q->range[1], 0,PCCT_INT,0);
+                                           putop( PCC_CM , PCCT_INT );
+                                           putleaf(PCC_ICON,aryconst(ctype,i),0,PCCT_INT,0);
+                                           putop( PCC_CM , PCCT_INT );

                                        }
 #                                      endif PC
                                        p1 = p1->chain->chain;
                                        }
 #                                      endif PC
                                        p1 = p1->chain->chain;


@@ -355,7 +355,7 @@ conf_err:                       if (p1->chain->type->class == CRANGE) {
                                case TDOUBLE:
                                q = stkrval(argv_node->list_node.list,
                                                p1 -> type , (long) RREQ );
                                case TDOUBLE:
                                q = stkrval(argv_node->list_node.list,
                                                p1 -> type , (long) RREQ );

-                                   sconv(p2type(q), P2DOUBLE);
+                                   sconv(p2type(q), PCCT_DOUBLE);

                                    break;
                                default:
                                    q = rvalue(argv_node->list_node.list,
                                    break;
                                default:
                                    q = rvalue(argv_node->list_node.list,


@@ -386,7 +386,7 @@ conf_err:                       if (p1->chain->type->class == CRANGE) {
                                case TREC:
                                case TSET:
                                case TSTR:
                                case TREC:
                                case TSET:
                                case TSTR:

-                                       putstrop( P2STARG
+                                       putstrop( PCC_STARG

                                            , p2type( p1 -> type )
                                            , (int) lwidth( p1 -> type )
                                            , align( p1 -> type ) );
                                            , p2type( p1 -> type )
                                            , (int) lwidth( p1 -> type )
                                            , align( p1 -> type ) );


@@ -425,7 +425,7 @@ conf_err:                       if (p1->chain->type->class == CRANGE) {
                if ( noarguments ) {
                        noarguments = FALSE;
                } else {
                if ( noarguments ) {
                        noarguments = FALSE;
                } else {

-                       putop( P2LISTOP , P2INT );
+                       putop( PCC_CM , PCCT_INT );

                }
 #          endif PC
            argv_node = argv_node->list_node.next;
                }
 #          endif PC
            argv_node = argv_node->list_node.next;


@@ -458,14 +458,14 @@ conf_err:                     if (p1->chain->type->class == CRANGE) {
                 */
            if ( p -> class == FFUNC || p -> class == FPROC ) {
                putRV((char *) 0 , cbn , tempdescrp -> value[ NL_OFFS ] ,
                 */
            if ( p -> class == FFUNC || p -> class == FPROC ) {
                putRV((char *) 0 , cbn , tempdescrp -> value[ NL_OFFS ] ,

-                       tempdescrp -> extra_flags , P2PTR|P2STRTY );
+                       tempdescrp -> extra_flags , PCCTM_PTR|PCCT_STRTY );

                if ( !noarguments ) {
                if ( !noarguments ) {

-                   putop( P2LISTOP , P2INT );
+                   putop( PCC_CM , PCCT_INT );

                }
                noarguments = FALSE;
                putLV((char *) 0 , cbn , savedispnp -> value[ NL_OFFS ] ,
                }
                noarguments = FALSE;
                putLV((char *) 0 , cbn , savedispnp -> value[ NL_OFFS ] ,

-                       savedispnp -> extra_flags , P2PTR | P2STRTY );
-               putop( P2LISTOP , P2INT );
+                       savedispnp -> extra_flags , PCCTM_PTR | PCCT_STRTY );
+               putop( PCC_CM , PCCT_INT );

            }
                /*
                 *      do the actual call:
            }
                /*
                 *      do the actual call:


@@ -481,52 +481,52 @@ conf_err:                     if (p1->chain->type->class == CRANGE) {
                    case TSCAL:
                    case TDOUBLE:
                    case TPTR:
                    case TSCAL:
                    case TDOUBLE:
                    case TPTR:

-                       putop( ( noarguments ? P2UNARY P2CALL : P2CALL ) ,
+                       putop( ( noarguments ? PCCOM_UNARY PCC_CALL : PCC_CALL ) ,

                                (int) p_type_p2type );
                        if ( p -> class == FFUNC ) {
                                (int) p_type_p2type );
                        if ( p -> class == FFUNC ) {

-                           putop( P2ASSIGN , (int) p_type_p2type );
+                           putop( PCC_ASSIGN , (int) p_type_p2type );

                        }
                        break;
                    default:
                        }
                        break;
                    default:

-                       putstrop( ( noarguments ? P2UNARY P2STCALL : P2STCALL ),
-                               (int) ADDTYPE( p_type_p2type , P2PTR ) ,
+                       putstrop( ( noarguments ? PCCOM_UNARY PCC_STCALL : PCC_STCALL ),
+                               (int) PCCM_ADDTYPE( p_type_p2type , PCCTM_PTR ) ,

                                (int) p_type_width ,(int) p_type_align );
                                (int) p_type_width ,(int) p_type_align );

-                       putstrop(P2STASG, (int) ADDTYPE(p_type_p2type, P2PTR),
+                       putstrop(PCC_STASG, (int) PCCM_ADDTYPE(p_type_p2type, PCCTM_PTR),

                                (int) lwidth(p -> type), align(p -> type));
                        break;
                }
            } else {
                                (int) lwidth(p -> type), align(p -> type));
                        break;
                }
            } else {

-               putop( ( noarguments ? P2UNARY P2CALL : P2CALL ) , P2INT );
+               putop( ( noarguments ? PCCOM_UNARY PCC_CALL : PCC_CALL ) , PCCT_INT );

            }
                /*
                 *      ( t=p , ... , FRTN( t ) ...
                 */
            if ( p -> class == FFUNC || p -> class == FPROC ) {
            }
                /*
                 *      ( t=p , ... , FRTN( t ) ...
                 */
            if ( p -> class == FFUNC || p -> class == FPROC ) {

-               putop( P2COMOP , P2INT );
-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR ) ,
+               putop( PCC_COMOP , PCCT_INT );
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) ,

                        "_FRTN" );
                putRV((char *) 0 , cbn , tempdescrp -> value[ NL_OFFS ] ,
                        "_FRTN" );
                putRV((char *) 0 , cbn , tempdescrp -> value[ NL_OFFS ] ,

-                       tempdescrp -> extra_flags , P2PTR | P2STRTY );
+                       tempdescrp -> extra_flags , PCCTM_PTR | PCCT_STRTY );

                putLV((char *) 0 , cbn , savedispnp -> value[ NL_OFFS ] ,
                putLV((char *) 0 , cbn , savedispnp -> value[ NL_OFFS ] ,

-                       savedispnp -> extra_flags , P2PTR | P2STRTY );
-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
-               putop( P2COMOP , P2INT );
+                       savedispnp -> extra_flags , PCCTM_PTR | PCCT_STRTY );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );
+               putop( PCC_COMOP , PCCT_INT );

            }
                /*
                 *      if required:
                 *      either  ... , temp )
                 *      or      ... , &temp )
                 */
            }
                /*
                 *      if required:
                 *      either  ... , temp )
                 *      or      ... , &temp )
                 */

-           if ( porf == FUNC && temptype != P2UNDEF ) {
-               if ( temptype != P2STRTY ) {
+           if ( porf == FUNC && temptype != PCCT_UNDEF ) {
+               if ( temptype != PCCT_STRTY ) {

                    putRV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                            tempnlp -> extra_flags , (int) p_type_p2type );
                } else {
                    putLV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                            tempnlp -> extra_flags , (int) p_type_p2type );
                }
                    putRV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                            tempnlp -> extra_flags , (int) p_type_p2type );
                } else {
                    putLV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                            tempnlp -> extra_flags , (int) p_type_p2type );
                }

-               putop( P2COMOP , P2INT );
+               putop( PCC_COMOP , PCCT_INT );

            }
            if ( porf == PROC ) {
                putdot( filename , line );
            }
            if ( porf == PROC ) {
                putdot( filename , line );

diff --git a/usr/src/usr.bin/pascal/src/conv.c b/usr/src/usr.bin/pascal/src/conv.c
index 314e47e..c6a8660 100644 (file)
--- a/usr/src/usr.bin/pascal/src/conv.c
+++ b/usr/src/usr.bin/pascal/src/conv.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)conv.c 2.1 %G%";
+static char sccsid[] = "@(#)conv.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -9,7 +9,7 @@ static char sccsid[] = "@(#)conv.c 2.1 %G%";
 #include "0.h"
 #include "opcode.h"
 #ifdef PC
 #include "0.h"
 #include "opcode.h"
 #ifdef PC

-#   include    "pcops.h"
+#   include    <pcc.h>

 #endif PC
 #include "tree_ty.h"
 
 #endif PC
 #include "tree_ty.h"
 


@@ -250,13 +250,13 @@ precheck( p , name1 , name2 )
        }
        switch ( p -> class ) {
            case CRANGE:
        }
        switch ( p -> class ) {
            case CRANGE:

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                            , name1);
                break;
            case RANGE:
                if ( p != nl + T4INT ) {
                            , name1);
                break;
            case RANGE:
                if ( p != nl + T4INT ) {

-                   putleaf( P2ICON , 0 , 0 ,
-                           ADDTYPE( P2FTN | P2INT , P2PTR ),
+                   putleaf( PCC_ICON , 0 , 0 ,
+                           PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ),

                            p -> range[0] != 0 ? name1 : name2 );
                }
                break;
                            p -> range[0] != 0 ? name1 : name2 );
                }
                break;


@@ -297,31 +297,31 @@ postcheck(need, have)
     switch ( need -> class ) {
        case RANGE:
            if ( need != nl + T4INT ) {
     switch ( need -> class ) {
        case RANGE:
            if ( need != nl + T4INT ) {

-               sconv(p2type(have), P2INT);
+               sconv(p2type(have), PCCT_INT);

                if (need -> range[0] != 0 ) {
                if (need -> range[0] != 0 ) {

-                   putleaf( P2ICON , (int) need -> range[0] , 0 , P2INT ,
+                   putleaf( PCC_ICON , (int) need -> range[0] , 0 , PCCT_INT ,

                                                        (char *) 0 );
                                                        (char *) 0 );

-                   putop( P2LISTOP , P2INT );
+                   putop( PCC_CM , PCCT_INT );

                }
                }

-               putleaf( P2ICON , (int) need -> range[1] , 0 , P2INT ,
+               putleaf( PCC_ICON , (int) need -> range[1] , 0 , PCCT_INT ,

                                (char *) 0 );
                                (char *) 0 );

-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
-               sconv(P2INT, p2type(have));
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );
+               sconv(PCCT_INT, p2type(have));

            }
            break;
        case CRANGE:
            }
            break;
        case CRANGE:

-           sconv(p2type(have), P2INT);
+           sconv(p2type(have), PCCT_INT);

            p = need->nptr[0];
            putRV(p->symbol, (p->nl_block & 037), p->value[0],
                    p->extra_flags, p2type( p ) );
            p = need->nptr[0];
            putRV(p->symbol, (p->nl_block & 037), p->value[0],
                    p->extra_flags, p2type( p ) );

-           putop( P2LISTOP , P2INT );
+           putop( PCC_CM , PCCT_INT );

            p = need->nptr[1];
            putRV(p->symbol, (p->nl_block & 037), p->value[0],
                    p->extra_flags, p2type( p ) );
            p = need->nptr[1];
            putRV(p->symbol, (p->nl_block & 037), p->value[0],
                    p->extra_flags, p2type( p ) );

-           putop( P2LISTOP , P2INT );
-           putop( P2CALL , P2INT );
-           sconv(P2INT, p2type(have));
+           putop( PCC_CM , PCCT_INT );
+           putop( PCC_CALL , PCCT_INT );
+           sconv(PCCT_INT, p2type(have));

            break;
        case SCAL:
            break;
            break;
        case SCAL:
            break;

diff --git a/usr/src/usr.bin/pascal/src/cset.c b/usr/src/usr.bin/pascal/src/cset.c
index cf32057..28e00eb 100644 (file)
--- a/usr/src/usr.bin/pascal/src/cset.c
+++ b/usr/src/usr.bin/pascal/src/cset.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)cset.c 2.1 %G%";
+static char sccsid[] = "@(#)cset.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -12,7 +12,7 @@ static char sccsid[] = "@(#)cset.c 2.1 %G%";
 #include "tree_ty.h"
 #ifdef PC
 #include "pc.h"
 #include "tree_ty.h"
 #ifdef PC
 #include "pc.h"

-#include "pcops.h"
+#include <pcc.h>

 #include "align.h"
 #endif PC
 
 #include "align.h"
 #endif PC
 


@@ -417,7 +417,7 @@ postcset( r , csetp )
                }
                putprintf("     .text", 0);
                sprintf( labelname , PREFIXFORMAT , LABELPREFIX , (char *) label );
                }
                putprintf("     .text", 0);
                sprintf( labelname , PREFIXFORMAT , LABELPREFIX , (char *) label );

-               putleaf( P2ICON , 0 , 0 , P2PTR | P2STRTY , labelname );
+               putleaf( PCC_ICON , 0 , 0 , PCCTM_PTR | PCCT_STRTY , labelname );

 #          endif PC
 #          ifdef OBJ
                (void) put(2, O_CON, (int)(((set.uprbp >> LG2BITSLONG) + 1) *
 #          endif PC
 #          ifdef OBJ
                (void) put(2, O_CON, (int)(((set.uprbp >> LG2BITSLONG) + 1) *


@@ -433,20 +433,20 @@ postcset( r , csetp )
 #endif CONSETS
        } else {
 #          ifdef PC
 #endif CONSETS
        } else {
 #          ifdef PC

-               putleaf( P2ICON , (int) csetp -> paircnt , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putleaf( P2ICON , (int) csetp -> singcnt , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
+               putleaf( PCC_ICON , (int) csetp -> paircnt , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putleaf( PCC_ICON , (int) csetp -> singcnt , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );

                for ( el = r->cset_node.el_list ; el != NIL ; el = el->list_node.next ) {
                    e = el->list_node.list;
                    if ( e->tag == T_RANG ) {
                        (void) rvalue( e->rang.expr2 , NLNIL , RREQ );
                for ( el = r->cset_node.el_list ; el != NIL ; el = el->list_node.next ) {
                    e = el->list_node.list;
                    if ( e->tag == T_RANG ) {
                        (void) rvalue( e->rang.expr2 , NLNIL , RREQ );

-                       putop( P2LISTOP , P2INT );
+                       putop( PCC_CM , PCCT_INT );

                        (void) rvalue( e->rang.expr1 , NLNIL , RREQ );
                        (void) rvalue( e->rang.expr1 , NLNIL , RREQ );

-                       putop( P2LISTOP , P2INT );
+                       putop( PCC_CM , PCCT_INT );

                    } else {
                        (void) rvalue( e , NLNIL , RREQ );
                    } else {
                        (void) rvalue( e , NLNIL , RREQ );

-                       putop( P2LISTOP , P2INT );
+                       putop( PCC_CM , PCCT_INT );

                    }
                }
 #          endif PC
                    }
                }
 #          endif PC

diff --git a/usr/src/usr.bin/pascal/src/fdec.c b/usr/src/usr.bin/pascal/src/fdec.c
index 1678dfc..150cafd 100644 (file)
--- a/usr/src/usr.bin/pascal/src/fdec.c
+++ b/usr/src/usr.bin/pascal/src/fdec.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)fdec.c 2.1 %G%";
+static char sccsid[] = "@(#)fdec.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -21,7 +21,7 @@ int   bodycnts[ DSPLYSZ ];
 
 #ifdef PC
 #   include "pc.h"
 
 #ifdef PC
 #   include "pc.h"

-#   include "pcops.h"
+#   include <pcc.h>

 #endif PC
 
 #ifdef OBJ
 #endif PC
 
 #ifdef OBJ

diff --git a/usr/src/usr.bin/pascal/src/fend.c b/usr/src/usr.bin/pascal/src/fend.c
index fdcf749..0a975a1 100644 (file)
--- a/usr/src/usr.bin/pascal/src/fend.c
+++ b/usr/src/usr.bin/pascal/src/fend.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)fend.c 2.2 %G%";
+static char sccsid[] = "@(#)fend.c 2.3 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -21,7 +21,7 @@ int   bodycnts[ DSPLYSZ ];
 
 #ifdef PC
 #   include "pc.h"
 
 #ifdef PC
 #   include "pc.h"

-#   include "pcops.h"
+#   include <pcc.h>

 #endif PC
 
 #ifdef OBJ
 #endif PC
 
 #ifdef OBJ


@@ -194,10 +194,10 @@ funcend(fp, bundle, endline)
 #              endif OBJ
 #              ifdef PC
                    if ( opt( 'b' ) != 1 ) {
 #              endif OBJ
 #              ifdef PC
                    if ( opt( 'b' ) != 1 ) {

-                       putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_BUFF" );
-                       putleaf( P2ICON , opt( 'b' ) , 0 , P2INT , (char *) 0 );
-                       putop( P2CALL , P2INT );
+                       putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_BUFF" );
+                       putleaf( PCC_ICON , opt( 'b' ) , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CALL , PCCT_INT );

                        putdot( filename , line );
                    }
 #              endif PC
                        putdot( filename , line );
                    }
 #              endif PC


@@ -238,22 +238,22 @@ funcend(fp, bundle, endline)
                            (void) put(1, O_DEFNAME);
 #                      endif OBJ
 #                      ifdef PC
                            (void) put(1, O_DEFNAME);
 #                      endif OBJ
 #                      ifdef PC

-                           putleaf( P2ICON , 0 , 0
-                                   , ADDTYPE( P2FTN | P2INT , P2PTR )
+                           putleaf( PCC_ICON , 0 , 0
+                                   , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                    , "_DEFNAME" );
                            putLV( p -> symbol , bn , iop -> value[NL_OFFS] ,
                                    iop -> extra_flags , p2type( iop ) );
                            putCONG( p -> symbol , strlen( p -> symbol )
                                    , LREQ );
                                    , "_DEFNAME" );
                            putLV( p -> symbol , bn , iop -> value[NL_OFFS] ,
                                    iop -> extra_flags , p2type( iop ) );
                            putCONG( p -> symbol , strlen( p -> symbol )
                                    , LREQ );

-                           putop( P2LISTOP , P2INT );
-                           putleaf( P2ICON , strlen( p -> symbol )
-                                   , 0 , P2INT , (char *) 0 );
-                           putop( P2LISTOP , P2INT );
-                           putleaf( P2ICON
+                           putop( PCC_CM , PCCT_INT );
+                           putleaf( PCC_ICON , strlen( p -> symbol )
+                                   , 0 , PCCT_INT , (char *) 0 );
+                           putop( PCC_CM , PCCT_INT );
+                           putleaf( PCC_ICON

                                , text(iop->type) ? 0 : width(iop->type->type)
                                , text(iop->type) ? 0 : width(iop->type->type)

-                               , 0 , P2INT , (char *) 0 );
-                           putop( P2LISTOP , P2INT );
-                           putop( P2CALL , P2INT );
+                               , 0 , PCCT_INT , (char *) 0 );
+                           putop( PCC_CM , PCCT_INT );
+                           putop( PCC_CALL , PCCT_INT );

                            putdot( filename , line );
 #                      endif PC
                }
                            putdot( filename , line );
 #                      endif PC
                }


@@ -279,14 +279,14 @@ funcend(fp, bundle, endline)
 #      endif OBJ
 #      ifdef PC
            if ( fp -> class == PROG && monflg ) {
 #      endif OBJ
 #      ifdef PC
            if ( fp -> class == PROG && monflg ) {

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_PMFLUSH" );
                        , "_PMFLUSH" );

-               putleaf( P2ICON , cnts , 0 , P2INT , (char *) 0 );
-               putleaf( P2ICON , pfcnt , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putLV( PCPCOUNT , 0 , 0 , NGLOBAL , P2INT );
-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
+               putleaf( PCC_ICON , cnts , 0 , PCCT_INT , (char *) 0 );
+               putleaf( PCC_ICON , pfcnt , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putLV( PCPCOUNT , 0 , 0 , NGLOBAL , PCCT_INT );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
            }
 #      endif PC
                putdot( filename , line );
            }
 #      endif PC


@@ -419,7 +419,7 @@ funcend(fp, bundle, endline)
                 */
            if ( monflg && fp -> class == PROG ) {
                putprintf( "    .data" , 0 );
                 */
            if ( monflg && fp -> class == PROG ) {
                putprintf( "    .data" , 0 );

-               aligndot(P2INT);
+               aligndot(PCCT_INT);

                putprintf( "    .comm   " , 1 );
                putprintf( PCPCOUNT , 1 );
                putprintf( ",%d" , 0 , ( cnts + 1 ) * sizeof (long) );
                putprintf( "    .comm   " , 1 );
                putprintf( PCPCOUNT , 1 );
                putprintf( ",%d" , 0 , ( cnts + 1 ) * sizeof (long) );


@@ -611,27 +611,27 @@ fp_entrycode(eecookiep)
         *      by calling blkclr( bytes of locals , starting local address );
         */
     if ( opt( 't' ) && ( -sizes[ cbn ].om_max ) > DPOFF1 ) {
         *      by calling blkclr( bytes of locals , starting local address );
         */
     if ( opt( 't' ) && ( -sizes[ cbn ].om_max ) > DPOFF1 ) {

-       putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+       putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                , "_blkclr" );
                , "_blkclr" );

-       putLV((char *) 0 , cbn , (int) sizes[ cbn ].om_max , NLOCAL , P2CHAR );
-       putleaf( P2ICON ,  (int) (( -sizes[ cbn ].om_max ) - DPOFF1)
-               , 0 , P2INT ,(char *) 0 );
-       putop( P2LISTOP , P2INT );
-       putop( P2CALL , P2INT );
+       putLV((char *) 0 , cbn , (int) sizes[ cbn ].om_max , NLOCAL , PCCT_CHAR );
+       putleaf( PCC_ICON ,  (int) (( -sizes[ cbn ].om_max ) - DPOFF1)
+               , 0 , PCCT_INT ,(char *) 0 );
+       putop( PCC_CM , PCCT_INT );
+       putop( PCC_CALL , PCCT_INT );

        putdot( filename , line );
     }
        /*
         *  set up goto vector if non-local goto to this frame
         */
     if ( parts[ cbn ] & NONLOCALGOTO ) {
        putdot( filename , line );
     }
        /*
         *  set up goto vector if non-local goto to this frame
         */
     if ( parts[ cbn ] & NONLOCALGOTO ) {

-       putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+       putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                , "_setjmp" );
                , "_setjmp" );

-       putLV( (char *) 0 , cbn , GOTOENVOFFSET , NLOCAL , P2PTR|P2STRTY );
-       putop( P2CALL , P2INT );
-       putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
-       putop( P2NE , P2INT );
-       putleaf( P2ICON , setjmp0 , 0 , P2INT , (char *) 0 );
-       putop( P2CBRANCH , P2INT );
+       putLV( (char *) 0 , cbn , GOTOENVOFFSET , NLOCAL , PCCTM_PTR|PCCT_STRTY );
+       putop( PCC_CALL , PCCT_INT );
+       putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );
+       putop( PCC_NE , PCCT_INT );
+       putleaf( PCC_ICON , setjmp0 , 0 , PCCT_INT , (char *) 0 );
+       putop( PCC_CBRANCH , PCCT_INT );

        putdot( filename , line );
            /*
             *  on non-local goto, setjmp returns with address to
        putdot( filename , line );
            /*
             *  on non-local goto, setjmp returns with address to


@@ -650,10 +650,10 @@ fp_exitcode(eecookiep)
         *      call PCLOSE( ap ) to clean them up.
         */
     if ( dfiles[ cbn ] ) {
         *      call PCLOSE( ap ) to clean them up.
         */
     if ( dfiles[ cbn ] ) {

-       putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+       putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                , "_PCLOSE" );
                , "_PCLOSE" );

-       putleaf( P2REG , 0 , P2AP , ADDTYPE( P2CHAR , P2PTR ) , (char *) 0 );
-       putop( P2CALL , P2INT );
+       putleaf( PCC_REG , 0 , P2AP , PCCM_ADDTYPE( PCCT_CHAR , PCCTM_PTR ) , (char *) 0 );
+       putop( PCC_CALL , PCCT_INT );

        putdot( filename , line );
     }
        /*
        putdot( filename , line );
     }
        /*


@@ -679,7 +679,7 @@ fp_exitcode(eecookiep)
                        fvar -> value[ NL_OFFS ] ,
                        fvar -> extra_flags ,
                        (int) fvartype );
                        fvar -> value[ NL_OFFS ] ,
                        fvar -> extra_flags ,
                        (int) fvartype );

-               putop( P2FORCE , (int) fvartype );
+               putop( PCC_FORCE , (int) fvartype );

                break;
            default:
                label = (int) getlab();
                break;
            default:
                label = (int) getlab();


@@ -689,17 +689,17 @@ fp_exitcode(eecookiep)
                putprintf( "    .lcomm  %s,%d" , 0 ,
                            (int) labelname , (int) lwidth( fvar -> type ) );
                putprintf( "    .text" , 0 );
                putprintf( "    .lcomm  %s,%d" , 0 ,
                            (int) labelname , (int) lwidth( fvar -> type ) );
                putprintf( "    .text" , 0 );

-               putleaf( P2NAME , 0 , 0 , (int) fvartype , labelname );
+               putleaf( PCC_NAME , 0 , 0 , (int) fvartype , labelname );

                putLV( fvar -> symbol , ( fvar -> nl_block ) & 037 ,
                        fvar -> value[ NL_OFFS ] ,
                        fvar -> extra_flags ,
                        (int) fvartype );
                putLV( fvar -> symbol , ( fvar -> nl_block ) & 037 ,
                        fvar -> value[ NL_OFFS ] ,
                        fvar -> extra_flags ,
                        (int) fvartype );

-               putstrop( P2STASG , (int) ADDTYPE(fvartype, P2PTR) ,
+               putstrop( PCC_STASG , (int) PCCM_ADDTYPE(fvartype, PCCTM_PTR) ,

                        (int) lwidth( fvar -> type ) ,
                        align( fvar -> type ) );
                putdot( filename , line );
                        (int) lwidth( fvar -> type ) ,
                        align( fvar -> type ) );
                putdot( filename , line );

-               putleaf( P2ICON , 0 , 0 , (int) ADDTYPE(fvartype, P2PTR), labelname );
-               putop( P2FORCE , (int) ADDTYPE(fvartype, P2PTR) );
+               putleaf( PCC_ICON , 0 , 0 , (int) PCCM_ADDTYPE(fvartype, PCCTM_PTR), labelname );
+               putop( PCC_FORCE , (int) PCCM_ADDTYPE(fvartype, PCCTM_PTR) );

                break;
        }
        putdot( filename , line );
                break;
        }
        putdot( filename , line );


@@ -736,13 +736,13 @@ fp_formalentry(eecookiep)
     putprintf("        .align 1", 0);
     putprintf("%s%s:" , 0 , (int) FORMALPREFIX , (int) eecookiep -> extname );
     putprintf("        .word   %s%d", 0, (int) SAVE_MASK_LABEL, eecookiep -> savlabel );
     putprintf("        .align 1", 0);
     putprintf("%s%s:" , 0 , (int) FORMALPREFIX , (int) eecookiep -> extname );
     putprintf("        .word   %s%d", 0, (int) SAVE_MASK_LABEL, eecookiep -> savlabel );

-    putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_FCALL" );
+    putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_FCALL" );

     putRV((char *) 0 , cbn ,
        eecookiep -> nlp -> value[ NL_OFFS ] + sizeof( struct formalrtn * ) ,
     putRV((char *) 0 , cbn ,
        eecookiep -> nlp -> value[ NL_OFFS ] + sizeof( struct formalrtn * ) ,

-       NPARAM , P2PTR | P2STRTY );
-    putRV((char *) 0, cbn, eecookiep -> nlp -> value[NL_OFFS], NPARAM, P2PTR|P2STRTY);
-    putop( P2LISTOP , P2INT );
-    putop( P2CALL , P2INT );
+       NPARAM , PCCTM_PTR | PCCT_STRTY );
+    putRV((char *) 0, cbn, eecookiep -> nlp -> value[NL_OFFS], NPARAM, PCCTM_PTR|PCCT_STRTY);
+    putop( PCC_CM , PCCT_INT );
+    putop( PCC_CALL , PCCT_INT );

     putdot( filename , line );
     putjbr( (long) eecookiep -> toplabel );
 }
     putdot( filename , line );
     putjbr( (long) eecookiep -> toplabel );
 }


@@ -848,27 +848,27 @@ fp_entrycode(eecookiep)
         *      by calling blkclr( bytes of locals , starting local address );
         */
     if ( opt( 't' ) && ( -sizes[ cbn ].om_max ) > DPOFF1 ) {
         *      by calling blkclr( bytes of locals , starting local address );
         */
     if ( opt( 't' ) && ( -sizes[ cbn ].om_max ) > DPOFF1 ) {

-       putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+       putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                , "_blkclr" );
                , "_blkclr" );

-       putLV( 0 , cbn , sizes[ cbn ].om_max , NLOCAL , P2CHAR );
-       putleaf( P2ICON ,  ( -sizes[ cbn ].om_max ) - DPOFF1
-               , 0 , P2INT , 0 );
-       putop( P2LISTOP , P2INT );
-       putop( P2CALL , P2INT );
+       putLV( 0 , cbn , sizes[ cbn ].om_max , NLOCAL , PCCT_CHAR );
+       putleaf( PCC_ICON ,  ( -sizes[ cbn ].om_max ) - DPOFF1
+               , 0 , PCCT_INT , 0 );
+       putop( PCC_CM , PCCT_INT );
+       putop( PCC_CALL , PCCT_INT );

        putdot( filename , line );
     }
        /*
         *  set up goto vector if non-local goto to this frame
         */
     if ( parts[ cbn ] & NONLOCALGOTO ) {
        putdot( filename , line );
     }
        /*
         *  set up goto vector if non-local goto to this frame
         */
     if ( parts[ cbn ] & NONLOCALGOTO ) {

-       putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+       putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                , "_setjmp" );
                , "_setjmp" );

-       putLV( 0 , cbn , GOTOENVOFFSET , NLOCAL , P2PTR|P2STRTY );
-       putop( P2CALL , P2INT );
-       putleaf( P2ICON , 0 , 0 , P2INT , 0 );
-       putop( P2NE , P2INT );
-       putleaf( P2ICON , setjmp0 , 0 , P2INT , 0 );
-       putop( P2CBRANCH , P2INT );
+       putLV( 0 , cbn , GOTOENVOFFSET , NLOCAL , PCCTM_PTR|PCCT_STRTY );
+       putop( PCC_CALL , PCCT_INT );
+       putleaf( PCC_ICON , 0 , 0 , PCCT_INT , 0 );
+       putop( PCC_NE , PCCT_INT );
+       putleaf( PCC_ICON , setjmp0 , 0 , PCCT_INT , 0 );
+       putop( PCC_CBRANCH , PCCT_INT );

        putdot( filename , line );
            /*
             *  on non-local goto, setjmp returns with address to
        putdot( filename , line );
            /*
             *  on non-local goto, setjmp returns with address to


@@ -888,10 +888,10 @@ fp_exitcode(eecookiep)
         *      call PCLOSE( ap ) to clean them up.
         */
     if ( dfiles[ cbn ] ) {
         *      call PCLOSE( ap ) to clean them up.
         */
     if ( dfiles[ cbn ] ) {

-       putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+       putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                , "_PCLOSE" );
                , "_PCLOSE" );

-       putleaf( P2REG , 0 , P2AP , ADDTYPE( P2CHAR , P2PTR ) , 0 );
-       putop( P2CALL , P2INT );
+       putleaf( PCC_REG , 0 , P2AP , PCCM_ADDTYPE( PCCT_CHAR , PCCTM_PTR ) , 0 );
+       putop( PCC_CALL , PCCT_INT );

        putdot( filename , line );
     }
        /*
        putdot( filename , line );
     }
        /*


@@ -917,24 +917,24 @@ fp_exitcode(eecookiep)
                        fvar -> value[ NL_OFFS ] ,
                        fvar -> extra_flags ,
                        fvartype );
                        fvar -> value[ NL_OFFS ] ,
                        fvar -> extra_flags ,
                        fvartype );

-               putop( P2FORCE , fvartype );
+               putop( PCC_FORCE , fvartype );

                break;
            default:
                label = getlab();
                sprintf( labelname , PREFIXFORMAT , LABELPREFIX , label );
                putprintf("     .lcomm  %s,%d", 0,
                        labelname, lwidth(fvar -> type));
                break;
            default:
                label = getlab();
                sprintf( labelname , PREFIXFORMAT , LABELPREFIX , label );
                putprintf("     .lcomm  %s,%d", 0,
                        labelname, lwidth(fvar -> type));

-               putleaf( P2NAME , 0 , 0 , fvartype , labelname );
+               putleaf( PCC_NAME , 0 , 0 , fvartype , labelname );

                putLV( fvar -> symbol , ( fvar -> nl_block ) & 037 ,
                        fvar -> value[ NL_OFFS ] ,
                        fvar -> extra_flags ,
                        fvartype );
                putLV( fvar -> symbol , ( fvar -> nl_block ) & 037 ,
                        fvar -> value[ NL_OFFS ] ,
                        fvar -> extra_flags ,
                        fvartype );

-               putstrop( P2STASG , ADDTYPE(fvartype, P2PTR) ,
+               putstrop( PCC_STASG , PCCM_ADDTYPE(fvartype, PCCTM_PTR) ,

                        lwidth( fvar -> type ) ,
                        align( fvar -> type ) );
                putdot( filename , line );
                        lwidth( fvar -> type ) ,
                        align( fvar -> type ) );
                putdot( filename , line );

-               putleaf( P2ICON , 0 , 0 , ADDTYPE(fvartype, P2PTR), labelname );
-               putop( P2FORCE , ADDTYPE(fvartype, P2PTR) );
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE(fvartype, PCCTM_PTR), labelname );
+               putop( PCC_FORCE , PCCM_ADDTYPE(fvartype, PCCTM_PTR) );

                break;
        }
        putdot( filename , line );
                break;
        }
        putdot( filename , line );


@@ -969,16 +969,15 @@ fp_formalentry(eecookiep)
        /* touch new end of stack, to break more stack space */
     putprintf("        tstb    sp@(-%s%d)", 0, PAGE_BREAK_LABEL, ftnno);
     putprintf("        moveml  #%s%d,sp@", 0, SAVE_MASK_LABEL, ftnno);
        /* touch new end of stack, to break more stack space */
     putprintf("        tstb    sp@(-%s%d)", 0, PAGE_BREAK_LABEL, ftnno);
     putprintf("        moveml  #%s%d,sp@", 0, SAVE_MASK_LABEL, ftnno);

-    putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_FCALL" );
+    putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_FCALL" );

     putRV( 0 , cbn ,
        eecookiep -> nlp -> value[ NL_OFFS ] + sizeof( struct formalrtn * ) ,
     putRV( 0 , cbn ,
        eecookiep -> nlp -> value[ NL_OFFS ] + sizeof( struct formalrtn * ) ,

-       NPARAM , P2PTR | P2STRTY );
-    putRV(0, cbn, eecookiep -> nlp -> value[NL_OFFS], NPARAM, P2PTR|P2STRTY);
-    putop( P2LISTOP , P2INT );
-    putop( P2CALL , P2INT );
+       NPARAM , PCCTM_PTR | PCCT_STRTY );
+    putRV(0, cbn, eecookiep -> nlp -> value[NL_OFFS], NPARAM, PCCTM_PTR|PCCT_STRTY);
+    putop( PCC_CM , PCCT_INT );
+    putop( PCC_CALL , PCCT_INT );

     putdot( filename , line );
     putjbr( eecookiep -> toplabel );
 }
 #endif mc68000
 #endif PC
     putdot( filename , line );
     putjbr( eecookiep -> toplabel );
 }
 #endif mc68000
 #endif PC

-

diff --git a/usr/src/usr.bin/pascal/src/fhdr.c b/usr/src/usr.bin/pascal/src/fhdr.c
index e133c63..1bd78ab 100644 (file)
--- a/usr/src/usr.bin/pascal/src/fhdr.c
+++ b/usr/src/usr.bin/pascal/src/fhdr.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)fhdr.c 2.2 %G%";
+static char sccsid[] = "@(#)fhdr.c 2.3 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -21,7 +21,6 @@ int   bodycnts[ DSPLYSZ ];
 
 #ifdef PC
 #   include "pc.h"
 
 #ifdef PC
 #   include "pc.h"

-#   include "pcops.h"

 #endif PC
 
 #ifdef OBJ
 #endif PC
 
 #ifdef OBJ

diff --git a/usr/src/usr.bin/pascal/src/flvalue.c b/usr/src/usr.bin/pascal/src/flvalue.c
index cf44151..11fb734 100644 (file)
--- a/usr/src/usr.bin/pascal/src/flvalue.c
+++ b/usr/src/usr.bin/pascal/src/flvalue.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1980 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1980 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)flvalue.c 2.1 %G%";
+static char sccsid[] = "@(#)flvalue.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -12,7 +12,7 @@ static char sccsid[] = "@(#)flvalue.c 2.1 %G%";
 #include "tree_ty.h"
 #ifdef PC
 #   include "pc.h"
 #include "tree_ty.h"
 #ifdef PC
 #   include "pc.h"

-#   include "pcops.h"
+#   include <pcc.h>

 #endif PC
 #include "tmps.h"
 
 #endif PC
 #include "tmps.h"
 


@@ -85,19 +85,19 @@ flvalue( r , formalp )
                        (void) put(2, O_FSAV | bn << 8, (long)p->value[NL_ENTLOC]);
 #                  endif OBJ
 #                  ifdef PC
                        (void) put(2, O_FSAV | bn << 8, (long)p->value[NL_ENTLOC]);
 #                  endif OBJ
 #                  ifdef PC

-                       putleaf( P2ICON , 0 , 0 ,
-                           ADDTYPE( P2PTR , ADDTYPE( P2FTN , P2PTR|P2STRTY ) ) ,
+                       putleaf( PCC_ICON , 0 , 0 ,
+                           PCCM_ADDTYPE( PCCTM_PTR , PCCM_ADDTYPE( PCCTM_FTN , PCCTM_PTR|PCCT_STRTY ) ) ,

                            "_FSAV" );
                        sprintf( extname , "%s" , FORMALPREFIX );
                        sextname( &extname[ strlen( extname ) ] ,
                                    p -> symbol , bn );
                            "_FSAV" );
                        sprintf( extname , "%s" , FORMALPREFIX );
                        sextname( &extname[ strlen( extname ) ] ,
                                    p -> symbol , bn );

-                       putleaf( P2ICON , 0 , 0 , p2type( p ) , extname );
-                       putleaf( P2ICON , bn , 0 , P2INT , (char *) 0 );
-                       putop( P2LISTOP , P2INT );
+                       putleaf( PCC_ICON , 0 , 0 , p2type( p ) , extname );
+                       putleaf( PCC_ICON , bn , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CM , PCCT_INT );

                        putLV( (char *) 0 , cbn , tempnlp -> value[NL_OFFS] ,
                        putLV( (char *) 0 , cbn , tempnlp -> value[NL_OFFS] ,

-                               tempnlp -> extra_flags , P2STRTY );
-                       putop( P2LISTOP , P2INT );
-                       putop( P2CALL , P2PTR | P2STRTY );
+                               tempnlp -> extra_flags , PCCT_STRTY );
+                       putop( PCC_CM , PCCT_INT );
+                       putop( PCC_CALL , PCCTM_PTR | PCCT_STRTY );

 #                  endif PC
                    return p;
            default:
 #                  endif PC
                    return p;
            default:

diff --git a/usr/src/usr.bin/pascal/src/forop.c b/usr/src/usr.bin/pascal/src/forop.c
index f85e4a0..f2d350c 100644 (file)
--- a/usr/src/usr.bin/pascal/src/forop.c
+++ b/usr/src/usr.bin/pascal/src/forop.c
@@ -2,7 +2,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)forop.c    2.1     (Berkeley)      84/02/08";
+static char sccsid[] = "@(#)forop.c    2.2     (Berkeley)      85/03/20";

 #endif
 
 #include       "whoami.h"
 #endif
 
 #include       "whoami.h"


@@ -12,7 +12,7 @@ static char sccsid[] = "@(#)forop.c   2.1     (Berkeley)      84/02/08";
 #include       "objfmt.h"
 #ifdef PC
 #    include   "pc.h"
 #include       "objfmt.h"
 #ifdef PC
 #    include   "pc.h"

-#    include   "pcops.h"
+#    include   <pcc.h>

 #endif PC
 #include       "tmps.h"
 #include       "tree_ty.h"
 #endif PC
 #include       "tmps.h"
 #include       "tree_ty.h"


@@ -184,7 +184,7 @@ nogood:
                 * compute and save the initial expression
                 */
            putRV((char *) 0 , cbn , initnlp -> value[ NL_OFFS ] ,
                 * compute and save the initial expression
                 */
            putRV((char *) 0 , cbn , initnlp -> value[ NL_OFFS ] ,

-                   initnlp -> extra_flags , P2INT );
+                   initnlp -> extra_flags , PCCT_INT );

 #      endif PC
 #      ifdef OBJ
            (void) put(2, O_LV | cbn<<8+INDX, initnlp -> value[ NL_OFFS ] );
 #      endif PC
 #      ifdef OBJ
            (void) put(2, O_LV | cbn<<8+INDX, initnlp -> value[ NL_OFFS ] );


@@ -200,14 +200,14 @@ nogood:
            goto byebye;
        }
 #      ifdef PC
            goto byebye;
        }
 #      ifdef PC

-           sconv(p2type(inittype), P2INT);
-           putop( P2ASSIGN , P2INT );
+           sconv(p2type(inittype), PCCT_INT);
+           putop( PCC_ASSIGN , PCCT_INT );

            putdot( filename , line );
                /*
                 * compute and save the termination expression
                 */
            putRV((char *) 0 , cbn , termnlp -> value[ NL_OFFS ] ,
            putdot( filename , line );
                /*
                 * compute and save the termination expression
                 */
            putRV((char *) 0 , cbn , termnlp -> value[ NL_OFFS ] ,

-                   termnlp -> extra_flags , P2INT );
+                   termnlp -> extra_flags , PCCT_INT );

 #      endif PC
 #      ifdef OBJ
            (void) gen(O_AS2, O_AS2, sizeof(long), width(inittype));
 #      endif PC
 #      ifdef OBJ
            (void) gen(O_AS2, O_AS2, sizeof(long), width(inittype));


@@ -226,20 +226,20 @@ nogood:
            goto byebye;
        }
 #      ifdef PC
            goto byebye;
        }
 #      ifdef PC

-           sconv(p2type(termtype), P2INT);
-           putop( P2ASSIGN , P2INT );
+           sconv(p2type(termtype), PCCT_INT);
+           putop( PCC_ASSIGN , PCCT_INT );

            putdot( filename , line );
                /*
                 * we can skip the loop altogether if !( init <= term )
                 */
            after = (int) getlab();
            putRV((char *) 0 , cbn , initnlp -> value[ NL_OFFS ] ,
            putdot( filename , line );
                /*
                 * we can skip the loop altogether if !( init <= term )
                 */
            after = (int) getlab();
            putRV((char *) 0 , cbn , initnlp -> value[ NL_OFFS ] ,

-                   initnlp -> extra_flags , P2INT );
+                   initnlp -> extra_flags , PCCT_INT );

            putRV((char *) 0 , cbn , termnlp -> value[ NL_OFFS ] ,
            putRV((char *) 0 , cbn , termnlp -> value[ NL_OFFS ] ,

-                   termnlp -> extra_flags , P2INT );
-           putop( ( tree_node->tag == T_FORU ? P2LE : P2GE ) , P2INT );
-           putleaf( P2ICON , after , 0 , P2INT, (char *) 0 );
-           putop( P2CBRANCH , P2INT );
+                   termnlp -> extra_flags , PCCT_INT );
+           putop( ( tree_node->tag == T_FORU ? PCC_LE : PCC_GE ) , PCCT_INT );
+           putleaf( PCC_ICON , after , 0 , PCCT_INT, (char *) 0 );
+           putop( PCC_CBRANCH , PCCT_INT );

            putdot( filename , line );
                /*
                 * okay, so we have to execute the loop body,
            putdot( filename , line );
                /*
                 * okay, so we have to execute the loop body,


@@ -250,7 +250,7 @@ nogood:
            if (opt('t')) {
                precheck(fortype, "_RANG4", "_RSNG4");
                putRV((char *) 0, cbn, termnlp -> value[NL_OFFS],
            if (opt('t')) {
                precheck(fortype, "_RANG4", "_RSNG4");
                putRV((char *) 0, cbn, termnlp -> value[NL_OFFS],

-                   termnlp -> extra_flags, P2INT);
+                   termnlp -> extra_flags, PCCT_INT);

                postcheck(fortype, nl+T4INT);
                putdot(filename, line);
            }
                postcheck(fortype, nl+T4INT);
                putdot(filename, line);
            }


@@ -263,14 +263,14 @@ nogood:
            if (opt('t')) {
                precheck(fortype, "_RANG4", "_RSNG4");
                putRV((char *) 0, cbn, initnlp -> value[NL_OFFS],
            if (opt('t')) {
                precheck(fortype, "_RANG4", "_RSNG4");
                putRV((char *) 0, cbn, initnlp -> value[NL_OFFS],

-                   initnlp -> extra_flags, P2INT);
+                   initnlp -> extra_flags, PCCT_INT);

                postcheck(fortype, nl+T4INT);
            } else {
                putRV((char *) 0, cbn, initnlp -> value[NL_OFFS],
                postcheck(fortype, nl+T4INT);
            } else {
                putRV((char *) 0, cbn, initnlp -> value[NL_OFFS],

-                   initnlp -> extra_flags, P2INT);
+                   initnlp -> extra_flags, PCCT_INT);

            }
            }

-           sconv(P2INT, forp2type);
-           putop(P2ASSIGN, forp2type);
+           sconv(PCCT_INT, forp2type);
+           putop(PCC_ASSIGN, forp2type);

            putdot(filename, line);
                /*
                 * put down the label at the top of the loop
            putdot(filename, line);
                /*
                 * put down the label at the top of the loop


@@ -284,7 +284,7 @@ nogood:
            (void) lvalue(lhs, NOUSE, RREQ);
            putRV((char *) 0, cbn, shadownlp -> value[NL_OFFS],
                    shadownlp -> extra_flags, forp2type);
            (void) lvalue(lhs, NOUSE, RREQ);
            putRV((char *) 0, cbn, shadownlp -> value[NL_OFFS],
                    shadownlp -> extra_flags, forp2type);

-           putop(P2ASSIGN, forp2type);
+           putop(PCC_ASSIGN, forp2type);

            putdot(filename, line);
 #      endif PC
 #      ifdef OBJ
            putdot(filename, line);
 #      endif PC
 #      ifdef OBJ


@@ -358,26 +358,26 @@ nogood:
 #      ifdef PC
            if ( opt( 'p' ) ) {
                if ( opt('t') ) {
 #      ifdef PC
            if ( opt( 'p' ) ) {
                if ( opt('t') ) {

-                   putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+                   putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                            , "_LINO" );
                            , "_LINO" );

-                   putop( P2UNARY P2CALL , P2INT );
+                   putop( PCCOM_UNARY PCC_CALL , PCCT_INT );

                    putdot( filename , line );
                } else {
                    putdot( filename , line );
                } else {

-                   putRV( STMTCOUNT , 0 , 0 , NGLOBAL , P2INT );
-                   putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-                   putop( P2ASG P2PLUS , P2INT );
+                   putRV( STMTCOUNT , 0 , 0 , NGLOBAL , PCCT_INT );
+                   putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+                   putop( PCCOM_ASG PCC_PLUS , PCCT_INT );

                    putdot( filename , line );
                }
            }
            /*rvalue( lhs_node , NIL , RREQ );*/
            putRV( (char *) 0 , cbn , shadownlp -> value[ NL_OFFS ] ,
                    shadownlp -> extra_flags , forp2type );
                    putdot( filename , line );
                }
            }
            /*rvalue( lhs_node , NIL , RREQ );*/
            putRV( (char *) 0 , cbn , shadownlp -> value[ NL_OFFS ] ,
                    shadownlp -> extra_flags , forp2type );

-           sconv(forp2type, P2INT);
+           sconv(forp2type, PCCT_INT);

            putRV( (char *) 0 , cbn , termnlp -> value[ NL_OFFS ] ,
            putRV( (char *) 0 , cbn , termnlp -> value[ NL_OFFS ] ,

-                   termnlp -> extra_flags , P2INT );
-           putop( ( tree_node->tag == T_FORU ? P2LT : P2GT ) , P2INT );
-           putleaf( P2ICON , after , 0 , P2INT , (char *) 0 );
-           putop( P2CBRANCH , P2INT );
+                   termnlp -> extra_flags , PCCT_INT );
+           putop( ( tree_node->tag == T_FORU ? PCC_LT : PCC_GT ) , PCCT_INT );
+           putleaf( PCC_ICON , after , 0 , PCCT_INT , (char *) 0 );
+           putop( PCC_CBRANCH , PCCT_INT );

            putdot( filename , line );
                /*
                 * okay, so we have to do it again,
            putdot( filename , line );
                /*
                 * okay, so we have to do it again,


@@ -391,11 +391,11 @@ nogood:
            /*rvalue( lhs_node , NIL , RREQ );*/
            putRV( (char *) 0 , cbn , shadownlp -> value[ NL_OFFS ] ,
                    shadownlp -> extra_flags , forp2type );
            /*rvalue( lhs_node , NIL , RREQ );*/
            putRV( (char *) 0 , cbn , shadownlp -> value[ NL_OFFS ] ,
                    shadownlp -> extra_flags , forp2type );

-           sconv(forp2type, P2INT);
-           putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-           putop( ( tree_node->tag == T_FORU ? P2PLUS : P2MINUS ) , P2INT );
-           sconv(P2INT, forp2type);
-           putop( P2ASSIGN , forp2type );
+           sconv(forp2type, PCCT_INT);
+           putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+           putop( ( tree_node->tag == T_FORU ? PCC_PLUS : PCC_MINUS ) , PCCT_INT );
+           sconv(PCCT_INT, forp2type);
+           putop( PCC_ASSIGN , forp2type );

            putdot( filename , line );
                /*
                 * and do it all again
            putdot( filename , line );
                /*
                 * and do it all again

diff --git a/usr/src/usr.bin/pascal/src/lab.c b/usr/src/usr.bin/pascal/src/lab.c
index 2e9fcb9..f39350e 100644 (file)
--- a/usr/src/usr.bin/pascal/src/lab.c
+++ b/usr/src/usr.bin/pascal/src/lab.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)lab.c 2.1 %G%";
+static char sccsid[] = "@(#)lab.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -11,7 +11,7 @@ static char sccsid[] = "@(#)lab.c 2.1 %G%";
 #include "objfmt.h"
 #ifdef PC
 #   include    "pc.h"
 #include "objfmt.h"
 #ifdef PC
 #   include    "pc.h"

-#   include    "pcops.h"
+#   include    <pcc.h>

 #endif PC
 #include "tree_ty.h"
 
 #endif PC
 #include "tree_ty.h"
 


@@ -182,27 +182,27 @@ gotoop(s)
                     *  will be in its stack frame.
                     */
                parts[ bn ] |= NONLOCALGOTO;
                     *  will be in its stack frame.
                     */
                parts[ bn ] |= NONLOCALGOTO;

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_PCLOSE" );
                if ( bn > 1 ) {
                    p = lookup( enclosing[ bn - 1 ] );
                    sprintf( extname, "%s%d+%d",
                        FRAME_SIZE_LABEL, p -> value[NL_ENTLOC], sizeof(int));
                    p = lookup(s);
                        , "_PCLOSE" );
                if ( bn > 1 ) {
                    p = lookup( enclosing[ bn - 1 ] );
                    sprintf( extname, "%s%d+%d",
                        FRAME_SIZE_LABEL, p -> value[NL_ENTLOC], sizeof(int));
                    p = lookup(s);

-                   putLV( extname , bn , 0 , NNLOCAL , P2PTR | P2CHAR );
+                   putLV( extname , bn , 0 , NNLOCAL , PCCTM_PTR | PCCT_CHAR );

                } else {
                    putLV((char *) 0 , bn , -( DPOFF1 + sizeof( int ) ) , LOCALVAR ,
                } else {
                    putLV((char *) 0 , bn , -( DPOFF1 + sizeof( int ) ) , LOCALVAR ,

-                       P2PTR | P2CHAR );
+                       PCCTM_PTR | PCCT_CHAR );

                }
                }

-               putop( P2CALL , P2INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                putdot( filename , line );

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_longjmp" );
                        , "_longjmp" );

-               putLV((char *) 0 , bn , GOTOENVOFFSET , NLOCAL , P2PTR|P2STRTY );
+               putLV((char *) 0 , bn , GOTOENVOFFSET , NLOCAL , PCCTM_PTR|PCCT_STRTY );

                extlabname( extname , p -> symbol , bn );
                extlabname( extname , p -> symbol , bn );

-               putLV( extname , 0 , 0 , NGLOBAL , P2PTR|P2STRTY );
-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
+               putLV( extname , 0 , 0 , NGLOBAL , PCCTM_PTR|PCCT_STRTY );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
            }
 #      endif PC
                putdot( filename , line );
            }
 #      endif PC

diff --git a/usr/src/usr.bin/pascal/src/lval.c b/usr/src/usr.bin/pascal/src/lval.c
index a0230e2..84bc570 100644 (file)
--- a/usr/src/usr.bin/pascal/src/lval.c
+++ b/usr/src/usr.bin/pascal/src/lval.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)lval.c 2.1 %G%";
+static char sccsid[] = "@(#)lval.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -12,7 +12,7 @@ static char sccsid[] = "@(#)lval.c 2.1 %G%";
 #include "tree_ty.h"
 #ifdef PC
 #   include    "pc.h"
 #include "tree_ty.h"
 #ifdef PC
 #   include    "pc.h"

-#   include    "pcops.h"
+#   include    <pcc.h>

 #endif PC
 
 extern int flagwas;
 #endif PC
 
 extern int flagwas;


@@ -402,7 +402,7 @@ int arycod(np, el, n)
                    }
 #                  ifdef PC
                        postcheck(p, ap);
                    }
 #                  ifdef PC
                        postcheck(p, ap);

-                       sconv(p2type(ap),P2INT);
+                       sconv(p2type(ap),PCCT_INT);

 #                  endif PC
                }
                if (incompat(ap, p->type, el->list_node.list)) {
 #                  endif PC
                }
                if (incompat(ap, p->type, el->list_node.list)) {


@@ -464,8 +464,8 @@ int arycod(np, el, n)
                    if (constsub) {
                        sub *= w;
                        if (sub != 0) {
                    if (constsub) {
                        sub *= w;
                        if (sub != 0) {

-                           putleaf( P2ICON , (int) sub , 0 , P2INT , (char *) 0 );
-                           putop(P2PLUS, ADDTYPE(p2type(np->type), P2PTR));
+                           putleaf( PCC_ICON , (int) sub , 0 , PCCT_INT , (char *) 0 );
+                           putop(PCC_PLUS, PCCM_ADDTYPE(p2type(np->type), PCCTM_PTR));

                        }
                        el = el->list_node.next;
                        continue;
                        }
                        el = el->list_node.next;
                        continue;


@@ -477,31 +477,31 @@ int arycod(np, el, n)
                        ap = p->nptr[0];
                        putRV(ap->symbol, (ap->nl_block & 037), ap->value[0], 
                                ap->extra_flags, p2type( ap ) );
                        ap = p->nptr[0];
                        putRV(ap->symbol, (ap->nl_block & 037), ap->value[0], 
                                ap->extra_flags, p2type( ap ) );

-                       putop( P2MINUS, P2INT );
+                       putop( PCC_MINUS, PCCT_INT );

                        /*
                         *      and multiply by the width of the elements
                         */
                        ap = p->nptr[2];
                        putRV( 0 , (ap->nl_block & 037), ap->value[0], 
                                ap->extra_flags, p2type( ap ) );
                        /*
                         *      and multiply by the width of the elements
                         */
                        ap = p->nptr[2];
                        putRV( 0 , (ap->nl_block & 037), ap->value[0], 
                                ap->extra_flags, p2type( ap ) );

-                       putop( P2MUL , P2INT );
+                       putop( PCC_MUL , PCCT_INT );

                    } else {
                        if ( p -> range[ 0 ] != 0 ) {
                    } else {
                        if ( p -> range[ 0 ] != 0 ) {

-                           putleaf( P2ICON , (int) p -> range[0] , 0 , P2INT , (char *) 0 );
-                           putop( P2MINUS , P2INT );
+                           putleaf( PCC_ICON , (int) p -> range[0] , 0 , PCCT_INT , (char *) 0 );
+                           putop( PCC_MINUS , PCCT_INT );

                        }
                            /*
                             *  multiply by the width of the elements
                             */
                        if ( w != 1 ) {
                        }
                            /*
                             *  multiply by the width of the elements
                             */
                        if ( w != 1 ) {

-                           putleaf( P2ICON , w , 0 , P2INT , (char *) 0 );
-                           putop( P2MUL , P2INT );
+                           putleaf( PCC_ICON , w , 0 , PCCT_INT , (char *) 0 );
+                           putop( PCC_MUL , PCCT_INT );

                        }
                    }
                        /*
                         *      and add it to the base address
                         */
                        }
                    }
                        /*
                         *      and add it to the base address
                         */

-                   putop( P2PLUS , ADDTYPE( p2type( np -> type ) , P2PTR ) );
+                   putop( PCC_PLUS , PCCM_ADDTYPE( p2type( np -> type ) , PCCTM_PTR ) );

                el = el->list_node.next;
 #              endif PC
        }
                el = el->list_node.next;
 #              endif PC
        }

diff --git a/usr/src/usr.bin/pascal/src/p2put.c b/usr/src/usr.bin/pascal/src/p2put.c
index 3a03bd0..99b2f55 100644 (file)
--- a/usr/src/usr.bin/pascal/src/p2put.c
+++ b/usr/src/usr.bin/pascal/src/p2put.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)p2put.c 2.1 %G%";
+static char sccsid[] = "@(#)p2put.c 2.2 %G%";

 #endif
 
     /*
 #endif
 
     /*


@@ -14,18 +14,10 @@ static      char sccsid[] = "@(#)p2put.c 2.1 %G%";
 #ifdef PC
 #include       "0.h"
 #include       "objfmt.h"
 #ifdef PC
 #include       "0.h"
 #include       "objfmt.h"

-#include       "pcops.h"
+#include       <pcc.h>

 #include       "pc.h"
 #include       "align.h"
 #include       "tmps.h"
 #include       "pc.h"
 #include       "align.h"
 #include       "tmps.h"

-
-    /*
-     * mash into f77's format
-     * lovely, isn't it?
-     */
-#define                TOF77( fop,val,rest )   ( ( ( (rest) & 0177777 ) << 16 ) \
-                                       | ( ( (val) & 0377 ) << 8 )      \
-                                       | ( (fop) & 0377 ) )

 \f
     /*
      * emits an ftext operator and a string to the pcstream
 \f
     /*
      * emits an ftext operator and a string to the pcstream


@@ -37,10 +29,10 @@ puttext( string )
 
        if ( !CGENNING )
            return;
 
        if ( !CGENNING )
            return;

-       p2word( TOF77( P2FTEXT , length , 0 ) );
+       p2word( PCCM_TRIPLE( PCCF_FTEXT , length , 0 ) );

 #      ifdef DEBUG
            if ( opt( 'k' ) ) {
 #      ifdef DEBUG
            if ( opt( 'k' ) ) {

-               fprintf( stdout , "P2FTEXT | %3d | 0    " , length );
+               fprintf( stdout , "PCCF_FTEXT | %3d | 0 " , length );

            }
 #      endif
        p2string( string );
            }
 #      endif
        p2string( string );


@@ -103,11 +95,11 @@ putlbracket(ftnno, sizesp)
 #   endif mc68000
     alignedframesize = roundup((int)(BITSPERBYTE * -sizesp->curtmps.om_off),
        (long)(BITSPERBYTE * A_STACK));
 #   endif mc68000
     alignedframesize = roundup((int)(BITSPERBYTE * -sizesp->curtmps.om_off),
        (long)(BITSPERBYTE * A_STACK));

-    p2word( TOF77( P2FLBRAC , maxtempreg , ftnno ) );
+    p2word( PCCM_TRIPLE( PCCF_FLBRAC , maxtempreg , ftnno ) );

     p2word(alignedframesize);
 #   ifdef DEBUG
        if ( opt( 'k' ) ) {
     p2word(alignedframesize);
 #   ifdef DEBUG
        if ( opt( 'k' ) ) {

-           fprintf(stdout, "P2FLBRAC | %3d | %d        %d\n",
+           fprintf(stdout, "PCCF_FLBRAC | %3d | %d     %d\n",

                maxtempreg, ftnno, alignedframesize);
        }
 #   endif
                maxtempreg, ftnno, alignedframesize);
        }
 #   endif


@@ -122,10 +114,10 @@ putrbracket( ftnno )
     int        ftnno;
     {
 
     int        ftnno;
     {
 

-       p2word( TOF77( P2FRBRAC , 0 , ftnno ) );
+       p2word( PCCM_TRIPLE( PCCF_FRBRAC , 0 , ftnno ) );

 #      ifdef DEBUG
            if ( opt( 'k' ) ) {
 #      ifdef DEBUG
            if ( opt( 'k' ) ) {

-               fprintf( stdout , "P2FRBRAC |   0 | %d\n" , ftnno );
+               fprintf( stdout , "PCCF_FRBRAC |   0 | %d\n" , ftnno );

            }
 #      endif
     }
            }
 #      endif
     }


@@ -136,10 +128,10 @@ putrbracket( ftnno )
 puteof()
     {
        
 puteof()
     {
        

-       p2word( P2FEOF );
+       p2word( PCCF_FEOF );

 #      ifdef DEBUG
            if ( opt( 'k' ) ) {
 #      ifdef DEBUG
            if ( opt( 'k' ) ) {

-               fprintf( stdout , "P2FEOF\n" );
+               fprintf( stdout , "PCCF_FEOF\n" );

            }
 #      endif
     }
            }
 #      endif
     }


@@ -158,10 +150,10 @@ putdot( filename , line )
        if ( line < 0 ) {
            line = -line;
        }
        if ( line < 0 ) {
            line = -line;
        }

-       p2word( TOF77( P2FEXPR , length , line ) );
+       p2word( PCCM_TRIPLE( PCCF_FEXPR , length , line ) );

 #      ifdef DEBUG
            if ( opt( 'k' ) ) {
 #      ifdef DEBUG
            if ( opt( 'k' ) ) {

-               fprintf( stdout , "P2FEXPR | %3d | %d   " , length , line );
+               fprintf( stdout , "PCCF_FEXPR | %3d | %d        " , length , line );

            }
 #      endif
        p2string( filename );
            }
 #      endif
        p2string( filename );


@@ -182,12 +174,12 @@ putleaf( op , lval , rval , type , name )
        switch ( op ) {
            default:
                panic( "[putleaf]" );
        switch ( op ) {
            default:
                panic( "[putleaf]" );

-           case P2ICON:
-               p2word( TOF77( P2ICON , name != NIL , type ) );
+           case PCC_ICON:
+               p2word( PCCM_TRIPLE( PCC_ICON , name != NIL , type ) );

                p2word( lval );
 #              ifdef DEBUG
                    if ( opt( 'k' ) ) {
                p2word( lval );
 #              ifdef DEBUG
                    if ( opt( 'k' ) ) {

-                       fprintf( stdout , "P2ICON | %3d | 0x%x  " 
+                       fprintf( stdout , "PCC_ICON | %3d | 0x%x        " 

                               , name != NIL , type );
                        fprintf( stdout , "%d\n" , lval );
                    }
                               , name != NIL , type );
                        fprintf( stdout , "%d\n" , lval );
                    }


@@ -195,13 +187,13 @@ putleaf( op , lval , rval , type , name )
                if ( name )
                    p2name( name );
                break;
                if ( name )
                    p2name( name );
                break;

-           case P2NAME:
-               p2word( TOF77( P2NAME , lval != 0 , type ) );
+           case PCC_NAME:
+               p2word( PCCM_TRIPLE( PCC_NAME , lval != 0 , type ) );

                if ( lval ) 
                    p2word( lval );
 #              ifdef DEBUG
                    if ( opt( 'k' ) ) {
                if ( lval ) 
                    p2word( lval );
 #              ifdef DEBUG
                    if ( opt( 'k' ) ) {

-                       fprintf( stdout , "P2NAME | %3d | 0x%x  " 
+                       fprintf( stdout , "PCC_NAME | %3d | 0x%x        " 

                               , lval != 0 , type );
                        if ( lval )
                            fprintf( stdout , "%d       " , lval );
                               , lval != 0 , type );
                        if ( lval )
                            fprintf( stdout , "%d       " , lval );


@@ -209,11 +201,11 @@ putleaf( op , lval , rval , type , name )
 #              endif
                p2name( name );
                break;
 #              endif
                p2name( name );
                break;

-           case P2REG:
-               p2word( TOF77( P2REG , rval , type ) );
+           case PCC_REG:
+               p2word( PCCM_TRIPLE( PCC_REG , rval , type ) );

 #              ifdef DEBUG
                    if ( opt( 'k' ) ) {
 #              ifdef DEBUG
                    if ( opt( 'k' ) ) {

-                       fprintf( stdout , "P2REG | %3d | 0x%x\n" ,
+                       fprintf( stdout , "PCC_REG | %3d | 0x%x\n" ,

                                rval , type );
                    }
 #              endif
                                rval , type );
                    }
 #              endif


@@ -242,7 +234,7 @@ putRV( name , level , offset , other_flags , type )
            if ( ( offset < 0 ) || ( offset > P2FP ) ) {
                panic( "putRV regvar" );
            }
            if ( ( offset < 0 ) || ( offset > P2FP ) ) {
                panic( "putRV regvar" );
            }

-           putleaf( P2REG , 0 , offset , type , (char *) 0 );
+           putleaf( PCC_REG , 0 , offset , type , (char *) 0 );

            return;
        }
        if ( whereis( offset , other_flags ) == GLOBALVAR ) {
            return;
        }
        if ( whereis( offset , other_flags ) == GLOBALVAR ) {


@@ -253,14 +245,14 @@ putRV( name , level , offset , other_flags , type )
                } else {
                        printname = name;
                }
                } else {
                        printname = name;
                }

-               putleaf( P2NAME , offset , 0 , type , printname );
+               putleaf( PCC_NAME , offset , 0 , type , printname );

                return;
            } else {
                panic( "putRV no name" );
            }
        }
        putLV( name , level , offset , other_flags , type );
                return;
            } else {
                panic( "putRV no name" );
            }
        }
        putLV( name , level , offset , other_flags , type );

-       putop( P2UNARY P2MUL , type );
+       putop( PCCOM_UNARY PCC_MUL , type );

     }
 
     /*
     }
 
     /*


@@ -293,7 +285,7 @@ putLV( name , level , offset , other_flags , type )
                } else {
                        printname = name;
                }
                } else {
                        printname = name;
                }

-               putleaf( P2ICON , offset , 0 , ADDTYPE( type , P2PTR )
+               putleaf( PCC_ICON , offset , 0 , PCCM_ADDTYPE( type , PCCTM_PTR )

                        , printname );
                return;
            } else {
                        , printname );
                return;
            } else {


@@ -301,36 +293,36 @@ putLV( name , level , offset , other_flags , type )
            }
        case PARAMVAR:
            if ( level == cbn ) {
            }
        case PARAMVAR:
            if ( level == cbn ) {

-               putleaf( P2REG, 0, P2AP, ADDTYPE( type , P2PTR ), (char *) 0 );
+               putleaf( PCC_REG, 0, P2AP, PCCM_ADDTYPE( type , PCCTM_PTR ), (char *) 0 );

            } else {
            } else {

-               putleaf( P2NAME , (level * sizeof(struct dispsave)) + AP_OFFSET
-                   , 0 , P2PTR | P2CHAR , DISPLAYNAME );
+               putleaf( PCC_NAME , (level * sizeof(struct dispsave)) + AP_OFFSET
+                   , 0 , PCCTM_PTR | PCCT_CHAR , DISPLAYNAME );

                parts[ level ] |= NONLOCALVAR;
            }
                parts[ level ] |= NONLOCALVAR;
            }

-           putleaf( P2ICON , offset , 0 , P2INT , (char *) 0 );
-           putop( P2PLUS , P2PTR | P2CHAR );
+           putleaf( PCC_ICON , offset , 0 , PCCT_INT , (char *) 0 );
+           putop( PCC_PLUS , PCCTM_PTR | PCCT_CHAR );

            break;
        case LOCALVAR:
            if ( level == cbn ) {
            break;
        case LOCALVAR:
            if ( level == cbn ) {

-               putleaf( P2REG, 0, P2FP, ADDTYPE( type , P2PTR ), (char *) 0 );
+               putleaf( PCC_REG, 0, P2FP, PCCM_ADDTYPE( type , PCCTM_PTR ), (char *) 0 );

            } else {
            } else {

-               putleaf( P2NAME , (level * sizeof(struct dispsave)) + FP_OFFSET
-                   , 0 , P2PTR | P2CHAR , DISPLAYNAME );
+               putleaf( PCC_NAME , (level * sizeof(struct dispsave)) + FP_OFFSET
+                   , 0 , PCCTM_PTR | PCCT_CHAR , DISPLAYNAME );

                parts[ level ] |= NONLOCALVAR;
            }
                parts[ level ] |= NONLOCALVAR;
            }

-           putleaf( P2ICON , -offset , 0 , P2INT , (char *) 0 );
-           putop( P2MINUS , P2PTR | P2CHAR );
+           putleaf( PCC_ICON , -offset , 0 , PCCT_INT , (char *) 0 );
+           putop( PCC_MINUS , PCCTM_PTR | PCCT_CHAR );

            break;
        case NAMEDLOCALVAR:
            if ( level == cbn ) {
            break;
        case NAMEDLOCALVAR:
            if ( level == cbn ) {

-               putleaf( P2REG, 0, P2FP, ADDTYPE( type , P2PTR ), (char *) 0 );
+               putleaf( PCC_REG, 0, P2FP, PCCM_ADDTYPE( type , PCCTM_PTR ), (char *) 0 );

            } else {
            } else {

-               putleaf( P2NAME , (level * sizeof(struct dispsave)) + FP_OFFSET
-                   , 0 , P2PTR | P2CHAR , DISPLAYNAME );
+               putleaf( PCC_NAME , (level * sizeof(struct dispsave)) + FP_OFFSET
+                   , 0 , PCCTM_PTR | PCCT_CHAR , DISPLAYNAME );

                parts[ level ] |= NONLOCALVAR;
            }
                parts[ level ] |= NONLOCALVAR;
            }

-           putleaf( P2ICON , 0 , 0 , P2INT , name );
-           putop( P2MINUS , P2PTR | P2CHAR );
+           putleaf( PCC_ICON , 0 , 0 , PCCT_INT , name );
+           putop( PCC_MINUS , PCCTM_PTR | PCCT_CHAR );

            break;
     }
     return;
            break;
     }
     return;


@@ -339,7 +331,7 @@ putLV( name , level , offset , other_flags , type )
     /*
      * put out a floating point constant leaf node
      * the constant is declared in aligned data space
     /*
      * put out a floating point constant leaf node
      * the constant is declared in aligned data space

-     * and a P2NAME leaf put out for it
+     * and a PCC_NAME leaf put out for it

      */
 putCON8( val )
     double     val;
      */
 putCON8( val )
     double     val;


@@ -361,7 +353,7 @@ putCON8( val )
 #      endif mc68000
        putprintf( "    .text" , 0 );
        sprintf( name , PREFIXFORMAT , LABELPREFIX , label );
 #      endif mc68000
        putprintf( "    .text" , 0 );
        sprintf( name , PREFIXFORMAT , LABELPREFIX , label );

-       putleaf( P2NAME , 0 , 0 , P2DOUBLE , name );
+       putleaf( PCC_NAME , 0 , 0 , PCCT_DOUBLE , name );

     }
 
        /*
     }
 
        /*


@@ -406,9 +398,9 @@ putCONG( string , length , required )
        putprintf( "    .text"  , 0 );
        sprintf( name , PREFIXFORMAT , LABELPREFIX , label );
        if ( required == RREQ ) {
        putprintf( "    .text"  , 0 );
        sprintf( name , PREFIXFORMAT , LABELPREFIX , label );
        if ( required == RREQ ) {

-           putleaf( P2NAME , 0 , 0 , P2ARY | P2CHAR , name );
+           putleaf( PCC_NAME , 0 , 0 , PCCTM_ARY | PCCT_CHAR , name );

        } else {
        } else {

-           putleaf( P2ICON , 0 , 0 , P2PTR | P2CHAR , name );
+           putleaf( PCC_ICON , 0 , 0 , PCCTM_PTR | PCCT_CHAR , name );

        }
     }
 
        }
     }
 


@@ -446,33 +438,33 @@ typerecur( np , quals )
     {
        
        if ( np == NIL || quals > MAXQUALS ) {
     {
        
        if ( np == NIL || quals > MAXQUALS ) {

-           return P2UNDEF;
+           return PCCT_UNDEF;

        }
        switch ( np -> class ) {
            case SCAL :
            case RANGE :
            case CRANGE :
                if ( np -> type == ( nl + TDOUBLE ) ) {
        }
        switch ( np -> class ) {
            case SCAL :
            case RANGE :
            case CRANGE :
                if ( np -> type == ( nl + TDOUBLE ) ) {

-                   return P2DOUBLE;
+                   return PCCT_DOUBLE;

                }
                switch ( bytes( np -> range[0] , np -> range[1] ) ) {
                    case 1:
                }
                switch ( bytes( np -> range[0] , np -> range[1] ) ) {
                    case 1:

-                       return P2CHAR;
+                       return PCCT_CHAR;

                    case 2:
                    case 2:

-                       return P2SHORT;
+                       return PCCT_SHORT;

                    case 4:
                    case 4:

-                       return P2INT;
+                       return PCCT_INT;

                    default:
                        panic( "p2type int" );
                        /* NOTREACHED */
                }
            case STR :
                    default:
                        panic( "p2type int" );
                        /* NOTREACHED */
                }
            case STR :

-               return ( P2ARY | P2CHAR );
+               return ( PCCTM_ARY | PCCT_CHAR );

            case RECORD :
            case SET :
            case RECORD :
            case SET :

-               return P2STRTY;
+               return PCCT_STRTY;

            case FILET :
            case FILET :

-               return ( P2PTR | P2STRTY );
+               return ( PCCTM_PTR | PCCT_STRTY );

            case CONST :
            case VAR :
            case FIELD :
            case CONST :
            case VAR :
            case FIELD :


@@ -480,40 +472,40 @@ typerecur( np , quals )
            case TYPE :
                switch ( nloff( np ) ) {
                    case TNIL :
            case TYPE :
                switch ( nloff( np ) ) {
                    case TNIL :

-                       return ( P2PTR | P2UNDEF );
+                       return ( PCCTM_PTR | PCCT_UNDEF );

                    case TSTR :
                    case TSTR :

-                       return ( P2ARY | P2CHAR );
+                       return ( PCCTM_ARY | PCCT_CHAR );

                    case TSET :
                    case TSET :

-                       return P2STRTY;
+                       return PCCT_STRTY;

                    default :
                        return ( p2type( np -> type ) );
                }
            case REF:
            case WITHPTR:
            case PTR :
                    default :
                        return ( p2type( np -> type ) );
                }
            case REF:
            case WITHPTR:
            case PTR :

-               return ADDTYPE( typerecur( np -> type , quals + 1 ) , P2PTR );
+               return PCCM_ADDTYPE( typerecur( np -> type , quals + 1 ) , PCCTM_PTR );

            case ARRAY :
            case ARRAY :

-               return ADDTYPE( typerecur( np -> type , quals + 1 ) , P2ARY );
+               return PCCM_ADDTYPE( typerecur( np -> type , quals + 1 ) , PCCTM_ARY );

            case FUNC :
                    /*
                     * functions are really pointers to functions
                     * which return their underlying type.
                     */
            case FUNC :
                    /*
                     * functions are really pointers to functions
                     * which return their underlying type.
                     */

-               return ADDTYPE( ADDTYPE( typerecur( np -> type , quals + 2 ) ,
-                                       P2FTN ) , P2PTR );
+               return PCCM_ADDTYPE( PCCM_ADDTYPE( typerecur( np -> type , quals + 2 ) ,
+                                       PCCTM_FTN ) , PCCTM_PTR );

            case PROC :
                    /*
                     * procedures are pointers to functions 
                     * which return integers (whether you look at them or not)
                     */
            case PROC :
                    /*
                     * procedures are pointers to functions 
                     * which return integers (whether you look at them or not)
                     */

-               return ADDTYPE( ADDTYPE( P2INT , P2FTN ) , P2PTR );
+               return PCCM_ADDTYPE( PCCM_ADDTYPE( PCCT_INT , PCCTM_FTN ) , PCCTM_PTR );

            case FFUNC :
            case FPROC :
                    /*
                     *  formal procedures and functions are pointers
                     *  to structures which describe their environment.
                     */
            case FFUNC :
            case FPROC :
                    /*
                     *  formal procedures and functions are pointers
                     *  to structures which describe their environment.
                     */

-               return ( P2PTR | P2STRTY );
+               return ( PCCTM_PTR | PCCT_STRTY );

            default :
                panic( "p2type" );
                /* NOTREACHED */
            default :
                panic( "p2type" );
                /* NOTREACHED */


@@ -527,15 +519,15 @@ putop( op , type )
     int                op;
     int                type;
     {
     int                op;
     int                type;
     {

-       extern char     *p2opnames[];
+       extern char     *p2opname();

        
        if ( !CGENNING )
            return;
        
        if ( !CGENNING )
            return;

-       p2word( TOF77( op , 0 , type ) );
+       p2word( PCCM_TRIPLE( op , 0 , type ) );

 #      ifdef DEBUG
            if ( opt( 'k' ) ) {
                fprintf( stdout , "%s (%d) |   0 | 0x%x\n"
 #      ifdef DEBUG
            if ( opt( 'k' ) ) {
                fprintf( stdout , "%s (%d) |   0 | 0x%x\n"

-                       , p2opnames[ op ] , op , type );
+                       , p2opname( op ) , op , type );

            }
 #      endif
     }
            }
 #      endif
     }


@@ -551,17 +543,17 @@ putstrop( op , type , size , alignment )
     int        size;
     int        alignment;
     {
     int        size;
     int        alignment;
     {

-       extern char     *p2opnames[];
+       extern char     *p2opname();

        
        if ( !CGENNING )
            return;
        
        if ( !CGENNING )
            return;

-       p2word( TOF77( op , 0 , type ) );
+       p2word( PCCM_TRIPLE( op , 0 , type ) );

        p2word( size );
        p2word( alignment );
 #      ifdef DEBUG
            if ( opt( 'k' ) ) {
                fprintf( stdout , "%s (%d) |   0 | 0x%x %d %d\n"
        p2word( size );
        p2word( alignment );
 #      ifdef DEBUG
            if ( opt( 'k' ) ) {
                fprintf( stdout , "%s (%d) |   0 | 0x%x %d %d\n"

-                       , p2opnames[ op ] , op , type , size , alignment );
+                       , p2opname( op ) , op , type , size , alignment );

            }
 #      endif
     }
            }
 #      endif
     }


@@ -569,120 +561,93 @@ putstrop( op , type , size , alignment )
     /*
      * the string names of p2ops
      */
     /*
      * the string names of p2ops
      */

-char   *p2opnames[] = {
-       "",
-       "P2UNDEFINED",          /* 1 */
-       "P2NAME",               /* 2 */
-       "P2STRING",             /* 3 */
-       "P2ICON",               /* 4 */
-       "P2FCON",               /* 5 */
-       "P2PLUS",               /* 6 */
-       "",
-       "P2MINUS",              /* 8            also unary == P2NEG */
-       "",
-       "P2NEG",
-       "P2MUL",                /* 11           also unary == P2INDIRECT */
-       "",
-       "P2INDIRECT",
-       "P2AND",                /* 14           also unary == P2ADDROF */
-       "",
-       "P2ADDROF",
-       "P2OR",                 /* 17 */
-       "",
-       "P2ER",                 /* 19 */
-       "",
-       "P2QUEST",              /* 21 */
-       "P2COLON",              /* 22 */
-       "P2ANDAND",             /* 23 */
-       "P2OROR",               /* 24 */
-       "",                     /* 25 */
-       "",                     /* 26 */
-       "",                     /* 27 */
-       "",                     /* 28 */
-       "",                     /* 29 */
-       "",                     /* 30 */
-       "",                     /* 31 */
-       "",                     /* 32 */
-       "",                     /* 33 */
-       "",                     /* 34 */
-       "",                     /* 35 */
-       "",                     /* 36 */
-       "",                     /* 37 */
-       "",                     /* 38 */
-       "",                     /* 39 */
-       "",                     /* 40 */
-       "",                     /* 41 */
-       "",                     /* 42 */
-       "",                     /* 43 */
-       "",                     /* 44 */
-       "",                     /* 45 */
-       "",                     /* 46 */
-       "",                     /* 47 */
-       "",                     /* 48 */
-       "",                     /* 49 */
-       "",                     /* 50 */
-       "",                     /* 51 */
-       "",                     /* 52 */
-       "",                     /* 53 */
-       "",                     /* 54 */
-       "",                     /* 55 */
-       "P2LISTOP",             /* 56 */
-       "",
-       "P2ASSIGN",             /* 58 */
-       "P2COMOP",              /* 59 */
-       "P2DIV",                /* 60 */
-       "",
-       "P2MOD",                /* 62 */
-       "",
-       "P2LS",                 /* 64 */
-       "",
-       "P2RS",                 /* 66 */
-       "",
-       "P2DOT",                /* 68 */
-       "P2STREF",              /* 69 */
-       "P2CALL",               /* 70           also unary */
-       "",
-       "P2UNARYCALL",
-       "P2FORTCALL",           /* 73           also unary */
-       "",
-       "P2UNARYFORTCALL",
-       "P2NOT",                /* 76 */
-       "P2COMPL",              /* 77 */
-       "P2INCR",               /* 78 */
-       "P2DECR",               /* 79 */
-       "P2EQ",                 /* 80 */
-       "P2NE",                 /* 81 */
-       "P2LE",                 /* 82 */
-       "P2LT",                 /* 83 */
-       "P2GE",                 /* 84 */
-       "P2GT",                 /* 85 */
-       "P2ULE",                /* 86 */
-       "P2ULT",                /* 87 */
-       "P2UGE",                /* 88 */
-       "P2UGT",                /* 89 */
-       "P2SETBIT",             /* 90 */
-       "P2TESTBIT",            /* 91 */
-       "P2RESETBIT",           /* 92 */
-       "P2ARS",                /* 93 */
-       "P2REG",                /* 94 */
-       "P2OREG",               /* 95 */
-       "P2CCODES",             /* 96 */
-       "P2FREE",               /* 97 */
-       "P2STASG",              /* 98 */
-       "P2STARG",              /* 99 */
-       "P2STCALL",             /* 100          also unary */
-       "",
-       "P2UNARYSTCALL",
-       "P2FLD",                /* 103 */
-       "P2SCONV",              /* 104 */
-       "P2PCONV",              /* 105 */
-       "P2PMCONV",             /* 106 */
-       "P2PVCONV",             /* 107 */
-       "P2FORCE",              /* 108 */
-       "P2CBRANCH",            /* 109 */
-       "P2INIT",               /* 110 */
-       "P2CAST",               /* 111 */
+
+struct p2op {
+    int op;
+    char *name;
+};
+
+static struct p2op     p2opnames[] = {
+       PCC_ERROR, "PCC_ERROR",
+       PCC_NAME, "PCC_NAME",
+       PCC_STRING, "PCC_STRING",
+       PCC_ICON, "PCC_ICON",
+       PCC_FCON, "PCC_FCON",
+       PCC_PLUS, "PCC_PLUS",
+       PCC_MINUS, "PCC_MINUS",
+       PCC_UMINUS, "PCC_UMINUS",
+       PCC_MUL, "PCC_MUL",
+       PCC_DEREF, "PCC_DEREF",
+       PCC_AND, "PCC_AND",
+       PCC_ADDROF, "PCC_ADDROF",
+       PCC_OR, "PCC_OR",
+       PCC_ER, "PCC_ER",
+       PCC_QUEST, "PCC_QUEST",
+       PCC_COLON, "PCC_COLON",
+       PCC_ANDAND, "PCC_ANDAND",
+       PCC_OROR, "PCC_OROR",
+       PCC_CM, "PCC_CM",
+       PCC_ASSIGN, "PCC_ASSIGN",
+       PCC_COMOP, "PCC_COMOP",
+       PCC_DIV, "PCC_DIV",
+       PCC_MOD, "PCC_MOD",
+       PCC_LS, "PCC_LS",
+       PCC_RS, "PCC_RS",
+       PCC_DOT, "PCC_DOT",
+       PCC_STREF, "PCC_STREF",
+       PCC_CALL, "PCC_CALL",
+       PCC_UCALL, "PCC_UCALL",
+       PCC_FORTCALL, "PCC_FORTCALL",
+       PCC_UFORTCALL, "PCC_UFORTCALL",
+       PCC_NOT, "PCC_NOT",
+       PCC_COMPL, "PCC_COMPL",
+       PCC_INCR, "PCC_INCR",
+       PCC_DECR, "PCC_DECR",
+       PCC_EQ, "PCC_EQ",
+       PCC_NE, "PCC_NE",
+       PCC_LE, "PCC_LE",
+       PCC_LT, "PCC_LT",
+       PCC_GE, "PCC_GE",
+       PCC_GT, "PCC_GT",
+       PCC_ULE, "PCC_ULE",
+       PCC_ULT, "PCC_ULT",
+       PCC_UGE, "PCC_UGE",
+       PCC_UGT, "PCC_UGT",
+       PCC_REG, "PCC_REG",
+       PCC_OREG, "PCC_OREG",
+       PCC_CCODES, "PCC_CCODES",
+       PCC_FREE, "PCC_FREE",
+       PCC_STASG, "PCC_STASG",
+       PCC_STARG, "PCC_STARG",
+       PCC_STCALL, "PCC_STCALL",
+       PCC_USTCALL, "PCC_USTCALL",
+       PCC_FLD, "PCC_FLD",
+       PCC_SCONV, "PCC_SCONV",
+       PCC_PCONV, "PCC_PCONV",
+       PCC_PMCONV, "PCC_PMCONV",
+       PCC_PVCONV, "PCC_PVCONV",
+       PCC_FORCE, "PCC_FORCE",
+       PCC_CBRANCH, "PCC_CBRANCH",
+       PCC_INIT, "PCC_INIT",
+       PCC_CAST, "PCC_CAST",
+       -1, ""

     };
     };

+
+char *
+p2opname( op )
+    register int       op;
+    {
+       static char             *p2map[PCC_MAXOP+1];
+       static bool             mapready = FALSE;
+       register struct p2op    *pp;
+
+       if ( mapready == FALSE ) {
+           for ( pp = p2opnames; pp->op >= 0; pp++ )
+               p2map[ pp->op ] = pp->name;
+           mapready = TRUE;
+       }
+       return ( p2map[ op ] ? p2map[ op ] : "unknown" );
+    }

 \f
     /*
      * low level routines
 \f
     /*
      * low level routines

diff --git a/usr/src/usr.bin/pascal/src/pccaseop.c b/usr/src/usr.bin/pascal/src/pccaseop.c
index 7f776bc..3c0e442 100644 (file)
--- a/usr/src/usr.bin/pascal/src/pccaseop.c
+++ b/usr/src/usr.bin/pascal/src/pccaseop.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1980 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1980 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)pccaseop.c 2.2 %G%";
+static char sccsid[] = "@(#)pccaseop.c 2.3 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -12,7 +12,7 @@ static char sccsid[] = "@(#)pccaseop.c 2.2 %G%";
 #include "0.h"
 #include "tree.h"
 #include "objfmt.h"
 #include "0.h"
 #include "tree.h"
 #include "objfmt.h"

-#include "pcops.h"
+#include <pcc.h>

 #include "pc.h"
 #include "tmps.h"
 #include "tree_ty.h"
 #include "pc.h"
 #include "tmps.h"
 #include "tree_ty.h"


@@ -28,7 +28,7 @@ struct ct {
 };
 
     /*
 };
 
     /*

-     * the P2FORCE operator puts its operand into a register.
+     * the PCC_FORCE operator puts its operand into a register.

      * these to keep from thinking of it as r0 all over.
      */
 #ifdef vax
      * these to keep from thinking of it as r0 all over.
      */
 #ifdef vax


@@ -112,11 +112,11 @@ pccaseop( tcase )
        exprctype = p2type( exprtype );
        exprnlp = tmpalloc( (long) (sizeof (long)), nl + T4INT , NOREG );
        putRV((char *) 0 , cbn , exprnlp -> value[ NL_OFFS ] ,
        exprctype = p2type( exprtype );
        exprnlp = tmpalloc( (long) (sizeof (long)), nl + T4INT , NOREG );
        putRV((char *) 0 , cbn , exprnlp -> value[ NL_OFFS ] ,

-                       exprnlp -> extra_flags , P2INT );
+                       exprnlp -> extra_flags , PCCT_INT );

        (void) rvalue( tcase->expr , NLNIL , RREQ );
        (void) rvalue( tcase->expr , NLNIL , RREQ );

-       sconv((int) exprctype, (int) P2INT);
-       putop( P2ASSIGN , P2INT );
-       putop( P2FORCE , P2INT );
+       sconv((int) exprctype, (int) PCCT_INT);
+       putop( PCC_ASSIGN , PCCT_INT );
+       putop( PCC_FORCE , PCCT_INT );

        putdot( filename , line );
        swlabel = getlab();
        putjbr( (long) swlabel );
        putdot( filename , line );
        swlabel = getlab();
        putjbr( (long) swlabel );


@@ -204,10 +204,10 @@ pccaseop( tcase )
         *      default action is to call error
         */
     (void) putlab( (char *) ctab[0].clabel );
         *      default action is to call error
         */
     (void) putlab( (char *) ctab[0].clabel );

-    putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_CASERNG" );
+    putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_CASERNG" );

     putRV((char *) 0 , cbn , exprnlp -> value[ NL_OFFS ] ,
     putRV((char *) 0 , cbn , exprnlp -> value[ NL_OFFS ] ,

-                   exprnlp -> extra_flags , P2INT );
-    putop( P2CALL , P2INT );
+                   exprnlp -> extra_flags , PCCT_INT );
+    putop( PCC_CALL , PCCT_INT );

     putdot( filename , line );
        /*
         *  sort the cases
     putdot( filename , line );
        /*
         *  sort the cases

diff --git a/usr/src/usr.bin/pascal/src/pcfunc.c b/usr/src/usr.bin/pascal/src/pcfunc.c
index 1562d47..7b5ef51 100644 (file)
--- a/usr/src/usr.bin/pascal/src/pcfunc.c
+++ b/usr/src/usr.bin/pascal/src/pcfunc.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)pcfunc.c 2.1 %G%";
+static char sccsid[] = "@(#)pcfunc.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -14,7 +14,7 @@ static        char sccsid[] = "@(#)pcfunc.c 2.1 %G%";
 #include "objfmt.h"
 #include "opcode.h"
 #include "pc.h"
 #include "objfmt.h"
 #include "opcode.h"
 #include "pc.h"

-#include "pcops.h"
+#include <pcc.h>

 #include "tmps.h"
 #include "tree_ty.h"
 
 #include "tmps.h"
 #include "tree_ty.h"
 


@@ -79,7 +79,7 @@ pcfunccod( r )
                error("%s is a nonstandard function", p->symbol);
        }
        if ( op == O_ARGC ) {
                error("%s is a nonstandard function", p->symbol);
        }
        if ( op == O_ARGC ) {

-           putleaf( P2NAME , 0 , 0 , P2INT , "__argc" );
+           putleaf( PCC_NAME , 0 , 0 , PCCT_INT , "__argc" );

            return nl + T4INT;
        }
        switch (op) {
            return nl + T4INT;
        }
        switch (op) {


@@ -98,10 +98,10 @@ noargs:
                                rvlist(argv);
                                return (NLNIL);
                        }
                                rvlist(argv);
                                return (NLNIL);
                        }

-                       putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2INT , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                , funcname );
                                , funcname );

-                       putop( P2UNARY P2CALL , P2INT );
+                       putop( PCCOM_UNARY PCC_CALL , PCCT_INT );

                        return (nl+T4INT);
                case O_WCLCK:
                        if (argc != 0) {
                        return (nl+T4INT);
                case O_WCLCK:
                        if (argc != 0) {


@@ -109,11 +109,11 @@ noargs:
                                rvlist(argv);
                                return (NLNIL);
                        }
                                rvlist(argv);
                                return (NLNIL);
                        }

-                       putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2INT , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                , "_time" );
                                , "_time" );

-                       putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
-                       putop( P2CALL , P2INT );
+                       putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CALL , PCCT_INT );

                        return (nl+T4INT);
                case O_EOF:
                case O_EOLN:
                        return (nl+T4INT);
                case O_EOF:
                case O_EOLN:


@@ -182,22 +182,22 @@ mathfunc:
                            error("%s's argument must be integer or real, not %s", p->symbol, nameof(p1));
                            return (NLNIL);
                    }
                            error("%s's argument must be integer or real, not %s", p->symbol, nameof(p1));
                            return (NLNIL);
                    }

-                   putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( P2FTN | P2DOUBLE , P2PTR ) , funcname );
+                   putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_DOUBLE , PCCTM_PTR ) , funcname );

                    p1 = stkrval(  argv->list_node.list , NLNIL , (long) RREQ );
                    p1 = stkrval(  argv->list_node.list , NLNIL , (long) RREQ );

-                   sconv(p2type(p1), P2DOUBLE);
-                   putop( P2CALL , P2DOUBLE );
+                   sconv(p2type(p1), PCCT_DOUBLE);
+                   putop( PCC_CALL , PCCT_DOUBLE );

                    return nl + TDOUBLE;
            case O_EXPO:
                    if (isnta( p1 , "id" ) ) {
                            error("%s's argument must be integer or real, not %s", p->symbol, nameof(p1));
                            return NIL;
                    }
                    return nl + TDOUBLE;
            case O_EXPO:
                    if (isnta( p1 , "id" ) ) {
                            error("%s's argument must be integer or real, not %s", p->symbol, nameof(p1));
                            return NIL;
                    }

-                   putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_EXPO" );
+                   putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_EXPO" );

                    p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                    p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );

-                   sconv(p2type(p1), P2DOUBLE);
-                   putop( P2CALL , P2INT );
+                   sconv(p2type(p1), PCCT_DOUBLE);
+                   putop( PCC_CALL , PCCT_INT );

                    return ( nl + T4INT );
            case O_UNDEF:
                    if ( isnta( p1 , "id" ) ) {
                    return ( nl + T4INT );
            case O_UNDEF:
                    if ( isnta( p1 , "id" ) ) {


@@ -205,18 +205,18 @@ mathfunc:
                            return NLNIL;
                    }
                    p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                            return NLNIL;
                    }
                    p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );

-                   putleaf( P2ICON , 0 , 0 , P2CHAR , (char *) 0 );
-                   putop( P2COMOP , P2CHAR );
+                   putleaf( PCC_ICON , 0 , 0 , PCCT_CHAR , (char *) 0 );
+                   putop( PCC_COMOP , PCCT_CHAR );

                    return ( nl + TBOOL );
            case O_SEED:
                    if (isnta(p1, "i")) {
                            error("seed's argument must be an integer, not %s", nameof(p1));
                            return (NLNIL);
                    }
                    return ( nl + TBOOL );
            case O_SEED:
                    if (isnta(p1, "i")) {
                            error("seed's argument must be an integer, not %s", nameof(p1));
                            return (NLNIL);
                    }

-                   putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_SEED" );
+                   putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_SEED" );

                    p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                    p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );

-                   putop( P2CALL , P2INT );
+                   putop( PCC_CALL , PCCT_INT );

                    return nl + T4INT;
            case O_ROUND:
            case O_TRUNC:
                    return nl + T4INT;
            case O_ROUND:
            case O_TRUNC:


@@ -224,37 +224,37 @@ mathfunc:
                            error("%s's argument must be a real, not %s", p->symbol, nameof(p1));
                            return (NLNIL);
                    }
                            error("%s's argument must be a real, not %s", p->symbol, nameof(p1));
                            return (NLNIL);
                    }

-                   putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( P2FTN | P2INT , P2PTR )
+                   putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                            , op == O_ROUND ? "_ROUND" : "_TRUNC" );
                    p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                            , op == O_ROUND ? "_ROUND" : "_TRUNC" );
                    p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );

-                   putop( P2CALL , P2INT );
+                   putop( PCC_CALL , PCCT_INT );

                    return nl + T4INT;
            case O_ABS2:
                        if ( isa( p1 , "d" ) ) {
                    return nl + T4INT;
            case O_ABS2:
                        if ( isa( p1 , "d" ) ) {

-                           putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2DOUBLE , P2PTR )
+                           putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_DOUBLE , PCCTM_PTR )

                                , "_fabs" );
                            p1 = stkrval( argv->list_node.list , NLNIL ,(long) RREQ );
                                , "_fabs" );
                            p1 = stkrval( argv->list_node.list , NLNIL ,(long) RREQ );

-                           putop( P2CALL , P2DOUBLE );
+                           putop( PCC_CALL , PCCT_DOUBLE );

                            return nl + TDOUBLE;
                        }
                        if ( isa( p1 , "i" ) ) {
                            return nl + TDOUBLE;
                        }
                        if ( isa( p1 , "i" ) ) {

-                           putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_abs" );
+                           putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_abs" );

                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );

-                           putop( P2CALL , P2INT );
+                           putop( PCC_CALL , PCCT_INT );

                            return nl + T4INT;
                        }
                        error("%s's argument must be an integer or real, not %s", p->symbol, nameof(p1));
                        return NLNIL;
            case O_SQR2:
                        if ( isa( p1 , "d" ) ) {
                            return nl + T4INT;
                        }
                        error("%s's argument must be an integer or real, not %s", p->symbol, nameof(p1));
                        return NLNIL;
            case O_SQR2:
                        if ( isa( p1 , "d" ) ) {

-                           temptype = P2DOUBLE;
+                           temptype = PCCT_DOUBLE;

                            rettype = nl + TDOUBLE;
                            tempnlp = tmpalloc((long) (sizeof(double)), rettype, REGOK);
                        } else if ( isa( p1 , "i" ) ) {
                            rettype = nl + TDOUBLE;
                            tempnlp = tmpalloc((long) (sizeof(double)), rettype, REGOK);
                        } else if ( isa( p1 , "i" ) ) {

-                           temptype = P2INT;
+                           temptype = PCCT_INT;

                            rettype = nl + T4INT;
                            tempnlp = tmpalloc((long) (sizeof(long)), rettype, REGOK);
                        } else {
                            rettype = nl + T4INT;
                            tempnlp = tmpalloc((long) (sizeof(long)), rettype, REGOK);
                        } else {


@@ -265,13 +265,13 @@ mathfunc:
                                tempnlp -> extra_flags , (char) temptype  );
                        p1 = rvalue( argv->list_node.list , NLNIL , RREQ );
                        sconv(p2type(p1), (int) temptype);
                                tempnlp -> extra_flags , (char) temptype  );
                        p1 = rvalue( argv->list_node.list , NLNIL , RREQ );
                        sconv(p2type(p1), (int) temptype);

-                       putop( P2ASSIGN , (int) temptype );
+                       putop( PCC_ASSIGN , (int) temptype );

                        putRV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                                tempnlp -> extra_flags , (char) temptype );
                        putRV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                                tempnlp -> extra_flags , (char) temptype );
                        putRV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                                tempnlp -> extra_flags , (char) temptype );
                        putRV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                                tempnlp -> extra_flags , (char) temptype );

-                       putop( P2MUL , (int) temptype );
-                       putop( P2COMOP , (int) temptype );
+                       putop( PCC_MUL , (int) temptype );
+                       putop( PCC_COMOP , (int) temptype );

                        return rettype;
            case O_ORD2:
                        p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                        return rettype;
            case O_ORD2:
                        p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );


@@ -298,22 +298,22 @@ mathfunc:
                            return NLNIL;
                        }
                        if ( opt( 't' ) ) {
                            return NLNIL;
                        }
                        if ( opt( 't' ) ) {

-                           putleaf( P2ICON , 0 , 0
-                                   , ADDTYPE( P2FTN | P2INT , P2PTR )
+                           putleaf( PCC_ICON , 0 , 0
+                                   , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                    , op == O_SUCC2 ? "_SUCC" : "_PRED" );
                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                            tempnlp = p1 -> class == TYPE ? p1 -> type : p1;
                                    , op == O_SUCC2 ? "_SUCC" : "_PRED" );
                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                            tempnlp = p1 -> class == TYPE ? p1 -> type : p1;

-                           putleaf( P2ICON, (int) tempnlp -> range[0], 0, P2INT, (char *) 0 );
-                           putop( P2LISTOP , P2INT );
-                           putleaf( P2ICON, (int) tempnlp -> range[1], 0, P2INT, (char *) 0 );
-                           putop( P2LISTOP , P2INT );
-                           putop( P2CALL , P2INT );
-                           sconv(P2INT, p2type(p1));
+                           putleaf( PCC_ICON, (int) tempnlp -> range[0], 0, PCCT_INT, (char *) 0 );
+                           putop( PCC_CM , PCCT_INT );
+                           putleaf( PCC_ICON, (int) tempnlp -> range[1], 0, PCCT_INT, (char *) 0 );
+                           putop( PCC_CM , PCCT_INT );
+                           putop( PCC_CALL , PCCT_INT );
+                           sconv(PCCT_INT, p2type(p1));

                        } else {
                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                        } else {
                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );

-                           putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-                           putop( op == O_SUCC2 ? P2PLUS : P2MINUS , P2INT );
-                           sconv(P2INT, p2type(p1));
+                           putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+                           putop( op == O_SUCC2 ? PCC_PLUS : PCC_MINUS , PCCT_INT );
+                           sconv(PCCT_INT, p2type(p1));

                        }
                        if ( isa( p1 , "bcs" ) ) {
                            return p1;
                        }
                        if ( isa( p1 , "bcs" ) ) {
                            return p1;


@@ -329,9 +329,9 @@ mathfunc:
                            /*
                             *  THIS IS MACHINE-DEPENDENT!!!
                             */
                            /*
                             *  THIS IS MACHINE-DEPENDENT!!!
                             */

-                       putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-                       putop( P2AND , P2INT );
-                       sconv(P2INT, P2CHAR);
+                       putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_AND , PCCT_INT );
+                       sconv(PCCT_INT, PCCT_CHAR);

                        return nl + TBOOL;
            case O_CHR2:
                        if (isnta(p1, "i")) {
                        return nl + TBOOL;
            case O_CHR2:
                        if (isnta(p1, "i")) {


@@ -339,13 +339,13 @@ mathfunc:
                                return (NLNIL);
                        }
                        if (opt('t')) {
                                return (NLNIL);
                        }
                        if (opt('t')) {

-                           putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2CHAR , P2PTR ) , "_CHR" );
+                           putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_CHAR , PCCTM_PTR ) , "_CHR" );

                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );

-                           putop( P2CALL , P2CHAR );
+                           putop( PCC_CALL , PCCT_CHAR );

                        } else {
                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );
                        } else {
                            p1 = stkrval( argv->list_node.list , NLNIL , (long) RREQ );

-                           sconv(P2INT, P2CHAR);
+                           sconv(PCCT_INT, PCCT_CHAR);

                        }
                        return nl + TCHAR;
            case O_CARD:
                        }
                        return nl + TCHAR;
            case O_CARD:


@@ -353,34 +353,34 @@ mathfunc:
                            error("Argument to card must be a set, not %s", nameof(p1));
                            return (NLNIL);
                        }
                            error("Argument to card must be a set, not %s", nameof(p1));
                            return (NLNIL);
                        }

-                       putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_CARD" );
+                       putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_CARD" );

                        p1 = stkrval( argv->list_node.list , NLNIL , (long) LREQ );
                        p1 = stkrval( argv->list_node.list , NLNIL , (long) LREQ );

-                       putleaf( P2ICON , (int) lwidth( p1 ) , 0 , P2INT , (char *) 0 );
-                       putop( P2LISTOP , P2INT );
-                       putop( P2CALL , P2INT );
+                       putleaf( PCC_ICON , (int) lwidth( p1 ) , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CM , PCCT_INT );
+                       putop( PCC_CALL , PCCT_INT );

                        return nl + T4INT;
            case O_EOLN:
                        if (!text(p1)) {
                                error("Argument to eoln must be a text file, not %s", nameof(p1));
                                return (NLNIL);
                        }
                        return nl + T4INT;
            case O_EOLN:
                        if (!text(p1)) {
                                error("Argument to eoln must be a text file, not %s", nameof(p1));
                                return (NLNIL);
                        }

-                       putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_TEOLN" );
+                       putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_TEOLN" );

                        p1 = stklval( argv->list_node.list , NOFLAGS );
                        p1 = stklval( argv->list_node.list , NOFLAGS );

-                       putop( P2CALL , P2INT );
-                       sconv(P2INT, P2CHAR);
+                       putop( PCC_CALL , PCCT_INT );
+                       sconv(PCCT_INT, PCCT_CHAR);

                        return nl + TBOOL;
            case O_EOF:
                        if (p1->class != FILET) {
                                error("Argument to eof must be file, not %s", nameof(p1));
                                return (NLNIL);
                        }
                        return nl + TBOOL;
            case O_EOF:
                        if (p1->class != FILET) {
                                error("Argument to eof must be file, not %s", nameof(p1));
                                return (NLNIL);
                        }

-                       putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( P2FTN | P2INT , P2PTR ) , "_TEOF" );
+                       putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , "_TEOF" );

                        p1 = stklval( argv->list_node.list , NOFLAGS );
                        p1 = stklval( argv->list_node.list , NOFLAGS );

-                       putop( P2CALL , P2INT );
-                       sconv(P2INT, P2CHAR);
+                       putop( PCC_CALL , PCCT_INT );
+                       sconv(PCCT_INT, PCCT_CHAR);

                        return nl + TBOOL;
        }
 }
                        return nl + TBOOL;
        }
 }

diff --git a/usr/src/usr.bin/pascal/src/pclval.c b/usr/src/usr.bin/pascal/src/pclval.c
index d118324..91987a4 100644 (file)
--- a/usr/src/usr.bin/pascal/src/pclval.c
+++ b/usr/src/usr.bin/pascal/src/pclval.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)pclval.c 2.1 %G%";
+static char sccsid[] = "@(#)pclval.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -15,7 +15,7 @@ static        char sccsid[] = "@(#)pclval.c 2.1 %G%";
         *      and the rest of the file
         */
 #   include    "pc.h"
         *      and the rest of the file
         */
 #   include    "pc.h"

-#   include    "pcops.h"
+#   include    <pcc.h>

 
 extern int flagwas;
 /*
 
 extern int flagwas;
 /*


@@ -163,9 +163,9 @@ pclvalue( var , modflag , required )
                                        firstsymbol = 0;
                                } else {
                                        if (o) {
                                        firstsymbol = 0;
                                } else {
                                        if (o) {

-                                           putleaf( P2ICON , o , 0 , P2INT
+                                           putleaf( PCC_ICON , o , 0 , PCCT_INT

                                                    , (char *) 0 );
                                                    , (char *) 0 );

-                                           putop( P2PLUS , P2PTR | P2CHAR );
+                                           putop( PCC_PLUS , PCCTM_PTR | PCCT_CHAR );

                                        }
                                }
                                    /*
                                        }
                                }
                                    /*


@@ -188,12 +188,12 @@ pclvalue( var , modflag , required )
                                         * but i have to do this for
                                         * regular pointers.
                                         */
                                         * but i have to do this for
                                         * regular pointers.
                                         */

-                                   putop( P2UNARY P2MUL , p2type( p ) );
+                                   putop( PCCOM_UNARY PCC_MUL , p2type( p ) );

                                    if ( opt( 't' ) ) {
                                    if ( opt( 't' ) ) {

-                                       putop( P2CALL , P2INT );
+                                       putop( PCC_CALL , PCCT_INT );

                                    }
                                } else {
                                    }
                                } else {

-                                   putop( P2CALL , P2INT );
+                                   putop( PCC_CALL , PCCT_INT );

                                }
                                f = o = 0;
                                continue;
                                }
                                f = o = 0;
                                continue;


@@ -205,9 +205,9 @@ pclvalue( var , modflag , required )
                                        firstsymbol = 0;
                                } else {
                                        if (o) {
                                        firstsymbol = 0;
                                } else {
                                        if (o) {

-                                           putleaf( P2ICON , o , 0 , P2INT
+                                           putleaf( PCC_ICON , o , 0 , PCCT_INT

                                                    , (char *) 0 );
                                                    , (char *) 0 );

-                                           putop( P2PLUS , P2INT );
+                                           putop( PCC_PLUS , PCCT_INT );

                                        }
                                }
                                s = arycod( p , co->ary_node.expr_list, s);
                                        }
                                }
                                s = arycod( p , co->ary_node.expr_list, s);


@@ -246,11 +246,11 @@ pclvalue( var , modflag , required )
                }
        } else {
                if (o) {
                }
        } else {
                if (o) {

-                   putleaf( P2ICON , o , 0 , P2INT , (char *) 0 );
-                   putop( P2PLUS , P2INT );
+                   putleaf( PCC_ICON , o , 0 , PCCT_INT , (char *) 0 );
+                   putop( PCC_PLUS , PCCT_INT );

                }
                if ( required == RREQ ) {
                }
                if ( required == RREQ ) {

-                   putop( P2UNARY P2MUL , p2type( p -> type ) );
+                   putop( PCCOM_UNARY PCC_MUL , p2type( p -> type ) );

                }
        }
        return ( p -> type );
                }
        }
        return ( p -> type );


@@ -370,13 +370,13 @@ nilfnil( p , c , modflag , firstp , r2 )
        if ( co->tag == T_PTR ) {
            if ( p -> class == PTR ) {
                    if ( opt( 't' ) ) {
        if ( co->tag == T_PTR ) {
            if ( p -> class == PTR ) {
                    if ( opt( 't' ) ) {

-                       putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( P2FTN | P2INT , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                            , "_NIL" );
                    }
            } else {
                            , "_NIL" );
                    }
            } else {

-                   putleaf( P2ICON , 0 , 0
-                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                   putleaf( PCC_ICON , 0 , 0
+                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_FNIL" );
            }
        }
                        , "_FNIL" );
            }
        }

diff --git a/usr/src/usr.bin/pascal/src/pcproc.c b/usr/src/usr.bin/pascal/src/pcproc.c
index 89d4839..7262125 100644 (file)
--- a/usr/src/usr.bin/pascal/src/pcproc.c
+++ b/usr/src/usr.bin/pascal/src/pcproc.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)pcproc.c 2.1 %G%";
+static char sccsid[] = "@(#)pcproc.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -14,7 +14,7 @@ static        char sccsid[] = "@(#)pcproc.c 2.1 %G%";
 #include "objfmt.h"
 #include "opcode.h"
 #include "pc.h"
 #include "objfmt.h"
 #include "opcode.h"
 #include "pc.h"

-#include "pcops.h"
+#include <pcc.h>

 #include "tmps.h"
 #include "tree_ty.h"
 
 #include "tmps.h"
 #include "tree_ty.h"
 


@@ -139,8 +139,8 @@ pcproc(r)
 
        case O_FLUSH:
                if (argc == 0) {
 
        case O_FLUSH:
                if (argc == 0) {

-                       putleaf( P2ICON , 0 , 0 , P2INT , "_PFLUSH" );
-                       putop( P2UNARY P2CALL , P2INT );
+                       putleaf( PCC_ICON , 0 , 0 , PCCT_INT , "_PFLUSH" );
+                       putop( PCCOM_UNARY PCC_CALL , PCCT_INT );

                        putdot( filename , line );
                        return;
                }
                        putdot( filename , line );
                        return;
                }


@@ -148,8 +148,8 @@ pcproc(r)
                        error("flush takes at most one argument");
                        return;
                }
                        error("flush takes at most one argument");
                        return;
                }

-               putleaf( P2ICON , 0 , 0
-                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0
+                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_FLUSH" );
                ap = stklval(argv->list_node.list, NOFLAGS);
                if (ap == NLNIL)
                        , "_FLUSH" );
                ap = stklval(argv->list_node.list, NOFLAGS);
                if (ap == NLNIL)


@@ -158,7 +158,7 @@ pcproc(r)
                        error("flush's argument must be a file, not %s", nameof(ap));
                        return;
                }
                        error("flush's argument must be a file, not %s", nameof(ap));
                        return;
                }

-               putop( P2CALL , P2INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -182,13 +182,13 @@ pcproc(r)
                         * a character file.
                         * Thus "output" will suit us fine.
                         */
                         * a character file.
                         * Thus "output" will suit us fine.
                         */

-                       putleaf( P2ICON , 0 , 0 , P2INT , "_PFLUSH" );
-                       putop( P2UNARY P2CALL , P2INT );
+                       putleaf( PCC_ICON , 0 , 0 , PCCT_INT , "_PFLUSH" );
+                       putop( PCCOM_UNARY PCC_CALL , PCCT_INT );

                        putdot( filename , line );
                        putRV( (char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,
                        putdot( filename , line );
                        putRV( (char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,

-                               P2PTR|P2STRTY );
-                       putLV( "__err" , 0 , 0 , NGLOBAL , P2PTR|P2STRTY );
-                       putop( P2ASSIGN , P2PTR|P2STRTY );
+                               PCCTM_PTR|PCCT_STRTY );
+                       putLV( "__err" , 0 , 0 , NGLOBAL , PCCTM_PTR|PCCT_STRTY );
+                       putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                        putdot( filename , line );
                } else if (argv != TR_NIL && (al = argv->list_node.list)->tag !=
                                        T_WEXP) {
                        putdot( filename , line );
                } else if (argv != TR_NIL && (al = argv->list_node.list)->tag !=
                                        T_WEXP) {


@@ -211,15 +211,15 @@ pcproc(r)
                                 * arguments to write.
                                 */
                                putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,
                                 * arguments to write.
                                 */
                                putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,

-                                       P2PTR|P2STRTY );
-                               putleaf( P2ICON , 0 , 0
-                                   , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                       PCCTM_PTR|PCCT_STRTY );
+                               putleaf( PCC_ICON , 0 , 0
+                                   , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                    , "_UNIT" );
                                file = argv->list_node.list;
                                filetype = ap->type;
                                (void) stklval(argv->list_node.list, NOFLAGS);
                                    , "_UNIT" );
                                file = argv->list_node.list;
                                filetype = ap->type;
                                (void) stklval(argv->list_node.list, NOFLAGS);

-                               putop( P2CALL , P2INT );
-                               putop( P2ASSIGN , P2PTR|P2STRTY );
+                               putop( PCC_CALL , PCCT_INT );
+                               putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                                putdot( filename , line );
                                /*
                                 * Skip over the first argument
                                putdot( filename , line );
                                /*
                                 * Skip over the first argument


@@ -232,18 +232,18 @@ pcproc(r)
                                 * standard output.
                                 */
                                putRV((char *) 0, cbn , CURFILEOFFSET ,
                                 * standard output.
                                 */
                                putRV((char *) 0, cbn , CURFILEOFFSET ,

-                                       NLOCAL , P2PTR|P2STRTY );
+                                       NLOCAL , PCCTM_PTR|PCCT_STRTY );

                                putLV( "_output" , 0 , 0 , NGLOBAL ,
                                putLV( "_output" , 0 , 0 , NGLOBAL ,

-                                       P2PTR|P2STRTY );
-                               putop( P2ASSIGN , P2PTR|P2STRTY );
+                                       PCCTM_PTR|PCCT_STRTY );
+                               putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                                putdot( filename , line );
                                output->nl_flags |= NUSED;
                        }
                } else {
                        putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,
                                putdot( filename , line );
                                output->nl_flags |= NUSED;
                        }
                } else {
                        putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,

-                               P2PTR|P2STRTY );
-                       putLV( "_output" , 0 , 0 , NGLOBAL , P2PTR|P2STRTY );
-                       putop( P2ASSIGN , P2PTR|P2STRTY );
+                               PCCTM_PTR|PCCT_STRTY );
+                       putLV( "_output" , 0 , 0 , NGLOBAL , PCCTM_PTR|PCCT_STRTY );
+                       putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                        putdot( filename , line );
                        output->nl_flags |= NUSED;
                }
                        putdot( filename , line );
                        output->nl_flags |= NUSED;
                }


@@ -359,18 +359,18 @@ pcproc(r)
                                 * Generalized write, i.e.
                                 * to a non-textfile.
                                 */
                                 * Generalized write, i.e.
                                 * to a non-textfile.
                                 */

-                               putleaf( P2ICON , 0 , 0
-                                   , (int) (ADDTYPE(
-                                       ADDTYPE(
-                                           ADDTYPE( p2type( filetype )
-                                                   , P2PTR )
-                                           , P2FTN )
-                                       , P2PTR ))
+                               putleaf( PCC_ICON , 0 , 0
+                                   , (int) (PCCM_ADDTYPE(
+                                       PCCM_ADDTYPE(
+                                           PCCM_ADDTYPE( p2type( filetype )
+                                                   , PCCTM_PTR )
+                                           , PCCTM_FTN )
+                                       , PCCTM_PTR ))

                                    , "_FNIL" );
                                (void) stklval(file, NOFLAGS);
                                    , "_FNIL" );
                                (void) stklval(file, NOFLAGS);

-                               putop( P2CALL
-                                   , ADDTYPE( p2type( filetype ) , P2PTR ) );
-                               putop( P2UNARY P2MUL , p2type( filetype ) );
+                               putop( PCC_CALL
+                                   , PCCM_ADDTYPE( p2type( filetype ) , PCCTM_PTR ) );
+                               putop( PCCOM_UNARY PCC_MUL , p2type( filetype ) );

                                /*
                                 * file^ := ...
                                 */
                                /*
                                 * file^ := ...
                                 */


@@ -405,13 +405,13 @@ pcproc(r)
                                                /* and fall through */
                                    case TDOUBLE:
                                    case TPTR:
                                                /* and fall through */
                                    case TDOUBLE:
                                    case TPTR:

-                                           putop( P2ASSIGN , p2type( filetype ) );
+                                           putop( PCC_ASSIGN , p2type( filetype ) );

                                            putdot( filename , line );
                                            break;
                                    default:
                                            putdot( filename , line );
                                            break;
                                    default:

-                                           putstrop(P2STASG,
-                                                   ADDTYPE(p2type(filetype),
-                                                           P2PTR),
+                                           putstrop(PCC_STASG,
+                                                   PCCM_ADDTYPE(p2type(filetype),
+                                                           PCCTM_PTR),

                                                    (int) lwidth(filetype),
                                                    align(filetype));
                                            putdot( filename , line );
                                                    (int) lwidth(filetype),
                                                    align(filetype));
                                            putdot( filename , line );


@@ -420,12 +420,12 @@ pcproc(r)
                                /*
                                 * put(file)
                                 */
                                /*
                                 * put(file)
                                 */

-                               putleaf( P2ICON , 0 , 0
-                                   , ADDTYPE( P2FTN | P2INT , P2PTR )
+                               putleaf( PCC_ICON , 0 , 0
+                                   , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                    , "_PUT" );
                                putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,
                                    , "_PUT" );
                                putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,

-                                       P2PTR|P2STRTY );
-                               putop( P2CALL , P2INT );
+                                       PCCTM_PTR|PCCT_STRTY );
+                               putop( PCC_CALL , PCCT_INT );

                                putdot( filename , line );
                                continue;
                        }
                                putdot( filename , line );
                                continue;
                        }


@@ -564,28 +564,28 @@ pcproc(r)
                        case NIL:
                                if (fmt == 'c') {
                                        if ( opt( 't' ) ) {
                        case NIL:
                                if (fmt == 'c') {
                                        if ( opt( 't' ) ) {

-                                           putleaf( P2ICON , 0 , 0
-                                               , ADDTYPE( P2FTN|P2INT , P2PTR )
+                                           putleaf( PCC_ICON , 0 , 0
+                                               , PCCM_ADDTYPE( PCCTM_FTN|PCCT_INT , PCCTM_PTR )

                                                , "_WRITEC" );
                                            putRV((char *) 0 , cbn , CURFILEOFFSET ,
                                                , "_WRITEC" );
                                            putRV((char *) 0 , cbn , CURFILEOFFSET ,

-                                                   NLOCAL , P2PTR|P2STRTY );
+                                                   NLOCAL , PCCTM_PTR|PCCT_STRTY );

                                            (void) stkrval( alv , NLNIL , (long) RREQ );
                                            (void) stkrval( alv , NLNIL , (long) RREQ );

-                                           putop( P2LISTOP , P2INT );
+                                           putop( PCC_CM , PCCT_INT );

                                        } else {
                                        } else {

-                                           putleaf( P2ICON , 0 , 0
-                                               , ADDTYPE( P2FTN|P2INT , P2PTR )
+                                           putleaf( PCC_ICON , 0 , 0
+                                               , PCCM_ADDTYPE( PCCTM_FTN|PCCT_INT , PCCTM_PTR )

                                                , "_fputc" );
                                            (void) stkrval( alv , NLNIL ,
                                                        (long) RREQ );
                                        }
                                                , "_fputc" );
                                            (void) stkrval( alv , NLNIL ,
                                                        (long) RREQ );
                                        }

-                                       putleaf( P2ICON , 0 , 0
-                                           , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                       putleaf( PCC_ICON , 0 , 0
+                                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                            , "_ACTFILE" );
                                        putRV((char *) 0, cbn , CURFILEOFFSET ,
                                            , "_ACTFILE" );
                                        putRV((char *) 0, cbn , CURFILEOFFSET ,

-                                               NLOCAL , P2PTR|P2STRTY );
-                                       putop( P2CALL , P2INT );
-                                       putop( P2LISTOP , P2INT );
-                                       putop( P2CALL , P2INT );
+                                               NLOCAL , PCCTM_PTR|PCCT_STRTY );
+                                       putop( PCC_CALL , PCCT_INT );
+                                       putop( PCC_CM , PCCT_INT );
+                                       putop( PCC_CALL , PCCT_INT );

                                        putdot( filename , line );
                                } else  {
                                        sprintf(&format[1], "%%%c", fmt);
                                        putdot( filename , line );
                                } else  {
                                        sprintf(&format[1], "%%%c", fmt);


@@ -612,33 +612,33 @@ pcproc(r)
                                sprintf(&format[1], "%%*.*%c", fmt);
                        fmtgen:
                                if ( opt( 't' ) ) {
                                sprintf(&format[1], "%%*.*%c", fmt);
                        fmtgen:
                                if ( opt( 't' ) ) {

-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_WRITEF" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,
                                        , "_WRITEF" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,

-                                           NLOCAL , P2PTR|P2STRTY );
-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                           NLOCAL , PCCTM_PTR|PCCT_STRTY );
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_ACTFILE" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,
                                        , "_ACTFILE" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,

-                                           NLOCAL , P2PTR|P2STRTY );
-                                   putop( P2CALL , P2INT );
-                                   putop( P2LISTOP , P2INT );
+                                           NLOCAL , PCCTM_PTR|PCCT_STRTY );
+                                   putop( PCC_CALL , PCCT_INT );
+                                   putop( PCC_CM , PCCT_INT );

                                } else {
                                } else {

-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_fprintf" );
                                        , "_fprintf" );

-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_ACTFILE" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,
                                        , "_ACTFILE" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,

-                                           NLOCAL , P2PTR|P2STRTY );
-                                   putop( P2CALL , P2INT );
+                                           NLOCAL , PCCTM_PTR|PCCT_STRTY );
+                                   putop( PCC_CALL , PCCT_INT );

                                }
                                putCONG( &format[ fmtstart ]
                                        , strlen( &format[ fmtstart ] )
                                        , LREQ );
                                }
                                putCONG( &format[ fmtstart ]
                                        , strlen( &format[ fmtstart ] )
                                        , LREQ );

-                               putop( P2LISTOP , P2INT );
+                               putop( PCC_CM , PCCT_INT );

                                if ( fmtspec & VARWIDTH ) {
                                        /*
                                         * either
                                if ( fmtspec & VARWIDTH ) {
                                        /*
                                         * either


@@ -655,21 +655,21 @@ pcproc(r)
                                                nl+T4INT, REGOK);
                                        putRV((char *) 0 , cbn ,
                                            tempnlp -> value[ NL_OFFS ] ,
                                                nl+T4INT, REGOK);
                                        putRV((char *) 0 , cbn ,
                                            tempnlp -> value[ NL_OFFS ] ,

-                                           tempnlp -> extra_flags , P2INT );
+                                           tempnlp -> extra_flags , PCCT_INT );

                                        ap = stkrval( al->wexpr_node.expr2 ,
                                                NLNIL , (long) RREQ );
                                        ap = stkrval( al->wexpr_node.expr2 ,
                                                NLNIL , (long) RREQ );

-                                       putop( P2ASSIGN , P2INT );
-                                       putleaf( P2ICON , 0 , 0
-                                           , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                       putop( PCC_ASSIGN , PCCT_INT );
+                                       putleaf( PCC_ICON , 0 , 0
+                                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                            , "_MAX" );
                                        putRV((char *) 0 , cbn ,
                                            tempnlp -> value[ NL_OFFS ] ,
                                            , "_MAX" );
                                        putRV((char *) 0 , cbn ,
                                            tempnlp -> value[ NL_OFFS ] ,

-                                           tempnlp -> extra_flags , P2INT );
+                                           tempnlp -> extra_flags , PCCT_INT );

                                    } else {
                                        if (opt('t')
                                            || typ == TSTR || typ == TDOUBLE) {
                                    } else {
                                        if (opt('t')
                                            || typ == TSTR || typ == TDOUBLE) {

-                                           putleaf( P2ICON , 0 , 0
-                                               ,ADDTYPE( P2FTN | P2INT, P2PTR )
+                                           putleaf( PCC_ICON , 0 , 0
+                                               ,PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT, PCCTM_PTR )

                                                ,"_MAX" );
                                        }
                                        ap = stkrval( al->wexpr_node.expr2,
                                                ,"_MAX" );
                                        }
                                        ap = stkrval( al->wexpr_node.expr2,


@@ -683,53 +683,53 @@ pcproc(r)
                                    }
                                    switch ( typ ) {
                                    case TDOUBLE:
                                    }
                                    switch ( typ ) {
                                    case TDOUBLE:

-                                       putleaf( P2ICON , REALSPC , 0 , P2INT , (char *) 0 );
-                                       putop( P2LISTOP , P2INT );
-                                       putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-                                       putop( P2LISTOP , P2INT );
-                                       putop( P2CALL , P2INT );
+                                       putleaf( PCC_ICON , REALSPC , 0 , PCCT_INT , (char *) 0 );
+                                       putop( PCC_CM , PCCT_INT );
+                                       putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+                                       putop( PCC_CM , PCCT_INT );
+                                       putop( PCC_CALL , PCCT_INT );

                                        if ( al->wexpr_node.expr3 == TR_NIL ) {
                                                /*
                                                 * finish up the comma op
                                                 */
                                        if ( al->wexpr_node.expr3 == TR_NIL ) {
                                                /*
                                                 * finish up the comma op
                                                 */

-                                           putop( P2COMOP , P2INT );
+                                           putop( PCC_COMOP , PCCT_INT );

                                            fmtspec &= ~VARPREC;
                                            fmtspec &= ~VARPREC;

-                                           putop( P2LISTOP , P2INT );
-                                           putleaf( P2ICON , 0 , 0
-                                               , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                           putop( PCC_CM , PCCT_INT );
+                                           putleaf( PCC_ICON , 0 , 0
+                                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                                , "_MAX" );
                                            putRV((char *) 0 , cbn ,
                                                tempnlp -> value[ NL_OFFS ] ,
                                                tempnlp -> extra_flags ,
                                                , "_MAX" );
                                            putRV((char *) 0 , cbn ,
                                                tempnlp -> value[ NL_OFFS ] ,
                                                tempnlp -> extra_flags ,

-                                               P2INT );
-                                           putleaf( P2ICON ,
+                                               PCCT_INT );
+                                           putleaf( PCC_ICON ,

                                                5 + EXPOSIZE + REALSPC ,
                                                5 + EXPOSIZE + REALSPC ,

-                                               0 , P2INT , (char *) 0 );
-                                           putop( P2LISTOP , P2INT );
-                                           putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-                                           putop( P2LISTOP , P2INT );
-                                           putop( P2CALL , P2INT );
+                                               0 , PCCT_INT , (char *) 0 );
+                                           putop( PCC_CM , PCCT_INT );
+                                           putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+                                           putop( PCC_CM , PCCT_INT );
+                                           putop( PCC_CALL , PCCT_INT );

                                        }
                                        }

-                                       putop( P2LISTOP , P2INT );
+                                       putop( PCC_CM , PCCT_INT );

                                        break;
                                    case TSTR:
                                        break;
                                    case TSTR:

-                                       putleaf( P2ICON , strnglen , 0 , P2INT , (char *) 0 );
-                                       putop( P2LISTOP , P2INT );
-                                       putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
-                                       putop( P2LISTOP , P2INT );
-                                       putop( P2CALL , P2INT );
-                                       putop( P2COMOP , P2INT );
-                                       putop( P2LISTOP , P2INT );
+                                       putleaf( PCC_ICON , strnglen , 0 , PCCT_INT , (char *) 0 );
+                                       putop( PCC_CM , PCCT_INT );
+                                       putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );
+                                       putop( PCC_CM , PCCT_INT );
+                                       putop( PCC_CALL , PCCT_INT );
+                                       putop( PCC_COMOP , PCCT_INT );
+                                       putop( PCC_CM , PCCT_INT );

                                        break;
                                    default:
                                        if (opt('t')) {
                                        break;
                                    default:
                                        if (opt('t')) {

-                                           putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
-                                           putop( P2LISTOP , P2INT );
-                                           putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
-                                           putop( P2LISTOP , P2INT );
-                                           putop( P2CALL , P2INT );
+                                           putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );
+                                           putop( PCC_CM , PCCT_INT );
+                                           putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );
+                                           putop( PCC_CM , PCCT_INT );
+                                           putop( PCC_CALL , PCCT_INT );

                                        }
                                        }

-                                       putop( P2LISTOP , P2INT );
+                                       putop( PCC_CM , PCCT_INT );

                                        break;
                                    }
                                }
                                        break;
                                    }
                                }


@@ -739,8 +739,8 @@ pcproc(r)
                                 */
                                if (fmtspec & VARPREC) {
                                        if (opt('t')) {
                                 */
                                if (fmtspec & VARPREC) {
                                        if (opt('t')) {

-                                       putleaf( P2ICON , 0 , 0
-                                           , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                       putleaf( PCC_ICON , 0 , 0
+                                           , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                            , "_MAX" );
                                        }
                                        ap = stkrval( al->wexpr_node.expr3 ,
                                            , "_MAX" );
                                        }
                                        ap = stkrval( al->wexpr_node.expr3 ,


@@ -752,13 +752,13 @@ pcproc(r)
                                                continue;
                                        }
                                        if (opt('t')) {
                                                continue;
                                        }
                                        if (opt('t')) {

-                                           putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
-                                           putop( P2LISTOP , P2INT );
-                                           putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
-                                           putop( P2LISTOP , P2INT );
-                                           putop( P2CALL , P2INT );
+                                           putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );
+                                           putop( PCC_CM , PCCT_INT );
+                                           putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );
+                                           putop( PCC_CM , PCCT_INT );
+                                           putop( PCC_CALL , PCCT_INT );

                                        }
                                        }

-                                       putop( P2LISTOP , P2INT );
+                                       putop( PCC_CM , PCCT_INT );

                                }
                                /*
                                 * evaluate the thing we want printed.
                                }
                                /*
                                 * evaluate the thing we want printed.


@@ -768,38 +768,38 @@ pcproc(r)
                                case TCHAR:
                                case TINT:
                                    (void) stkrval( alv , NLNIL , (long) RREQ );
                                case TCHAR:
                                case TINT:
                                    (void) stkrval( alv , NLNIL , (long) RREQ );

-                                   putop( P2LISTOP , P2INT );
+                                   putop( PCC_CM , PCCT_INT );

                                    break;
                                case TDOUBLE:
                                    ap = stkrval( alv , NLNIL , (long) RREQ );
                                    if (isnta(ap, "d")) {
                                    break;
                                case TDOUBLE:
                                    ap = stkrval( alv , NLNIL , (long) RREQ );
                                    if (isnta(ap, "d")) {

-                                       sconv(p2type(ap), P2DOUBLE);
+                                       sconv(p2type(ap), PCCT_DOUBLE);

                                    }
                                    }

-                                   putop( P2LISTOP , P2INT );
+                                   putop( PCC_CM , PCCT_INT );

                                    break;
                                case TSCAL:
                                case TBOOL:
                                    break;
                                case TSCAL:
                                case TBOOL:

-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_NAM" );
                                    ap = stkrval( alv , NLNIL , (long) RREQ );
                                    sprintf( format , PREFIXFORMAT , LABELPREFIX
                                            , listnames( ap ) );
                                        , "_NAM" );
                                    ap = stkrval( alv , NLNIL , (long) RREQ );
                                    sprintf( format , PREFIXFORMAT , LABELPREFIX
                                            , listnames( ap ) );

-                                   putleaf( P2ICON , 0 , 0 ,
-                                       (int) (P2PTR | P2CHAR), format );
-                                   putop( P2LISTOP , P2INT );
-                                   putop( P2CALL , P2INT );
-                                   putop( P2LISTOP , P2INT );
+                                   putleaf( PCC_ICON , 0 , 0 ,
+                                       (int) (PCCTM_PTR | PCCT_CHAR), format );
+                                   putop( PCC_CM , PCCT_INT );
+                                   putop( PCC_CALL , PCCT_INT );
+                                   putop( PCC_CM , PCCT_INT );

                                    break;
                                case TSTR:
                                    putCONG( "" , 0 , LREQ );
                                    break;
                                case TSTR:
                                    putCONG( "" , 0 , LREQ );

-                                   putop( P2LISTOP , P2INT );
+                                   putop( PCC_CM , PCCT_INT );

                                    break;
                                default:
                                    panic("fmt3");
                                    break;
                                }
                                    break;
                                default:
                                    panic("fmt3");
                                    break;
                                }

-                               putop( P2CALL , P2INT );
+                               putop( PCC_CALL , PCCT_INT );

                                putdot( filename , line );
                        }
                        /*
                                putdot( filename , line );
                        }
                        /*


@@ -807,16 +807,16 @@ pcproc(r)
                         */
                        if (typ == TSTR ) {
                                if ( opt( 't' ) ) {
                         */
                        if (typ == TSTR ) {
                                if ( opt( 't' ) ) {

-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_WRITES" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,
                                        , "_WRITES" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,

-                                           NLOCAL , P2PTR|P2STRTY );
+                                           NLOCAL , PCCTM_PTR|PCCT_STRTY );

                                    ap = stkrval(alv, NLNIL , (long) RREQ );
                                    ap = stkrval(alv, NLNIL , (long) RREQ );

-                                   putop( P2LISTOP , P2INT );
+                                   putop( PCC_CM , PCCT_INT );

                                } else {
                                } else {

-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_fwrite" );
                                    ap = stkrval(alv, NLNIL , (long) RREQ );
                                }
                                        , "_fwrite" );
                                    ap = stkrval(alv, NLNIL , (long) RREQ );
                                }


@@ -827,33 +827,33 @@ pcproc(r)
                                             */
                                        putRV((char *) 0 , cbn ,
                                            tempnlp -> value[ NL_OFFS ] ,
                                             */
                                        putRV((char *) 0 , cbn ,
                                            tempnlp -> value[ NL_OFFS ] ,

-                                           tempnlp -> extra_flags , P2INT );
-                                       putleaf( P2ICON , strnglen , 0 , P2INT , (char *) 0 );
-                                       putop( P2LT , P2INT );
+                                           tempnlp -> extra_flags , PCCT_INT );
+                                       putleaf( PCC_ICON , strnglen , 0 , PCCT_INT , (char *) 0 );
+                                       putop( PCC_LT , PCCT_INT );

                                        putRV((char *) 0 , cbn ,
                                            tempnlp -> value[ NL_OFFS ] ,
                                        putRV((char *) 0 , cbn ,
                                            tempnlp -> value[ NL_OFFS ] ,

-                                           tempnlp -> extra_flags , P2INT );
-                                       putleaf( P2ICON , strnglen , 0 , P2INT , (char *) 0 );
-                                       putop( P2COLON , P2INT );
-                                       putop( P2QUEST , P2INT );
+                                           tempnlp -> extra_flags , PCCT_INT );
+                                       putleaf( PCC_ICON , strnglen , 0 , PCCT_INT , (char *) 0 );
+                                       putop( PCC_COLON , PCCT_INT );
+                                       putop( PCC_QUEST , PCCT_INT );

                                } else {
                                        if (   ( fmtspec & SKIP )
                                            && ( strfmt & CONWIDTH ) ) {
                                                strnglen = field;
                                        }
                                } else {
                                        if (   ( fmtspec & SKIP )
                                            && ( strfmt & CONWIDTH ) ) {
                                                strnglen = field;
                                        }

-                                       putleaf( P2ICON , strnglen , 0 , P2INT , (char *) 0 );
+                                       putleaf( PCC_ICON , strnglen , 0 , PCCT_INT , (char *) 0 );

                                }
                                }

-                               putop( P2LISTOP , P2INT );
-                               putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-                               putop( P2LISTOP , P2INT );
-                               putleaf( P2ICON , 0 , 0
-                                   , ADDTYPE( P2FTN | P2INT , P2PTR )
+                               putop( PCC_CM , PCCT_INT );
+                               putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+                               putop( PCC_CM , PCCT_INT );
+                               putleaf( PCC_ICON , 0 , 0
+                                   , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                    , "_ACTFILE" );
                                putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,
                                    , "_ACTFILE" );
                                putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,

-                                       P2PTR|P2STRTY );
-                               putop( P2CALL , P2INT );
-                               putop( P2LISTOP , P2INT );
-                               putop( P2CALL , P2INT );
+                                       PCCTM_PTR|PCCT_STRTY );
+                               putop( PCC_CALL , PCCT_INT );
+                               putop( PCC_CM , PCCT_INT );
+                               putop( PCC_CALL , PCCT_INT );

                                putdot( filename , line );
                        }
                        if (soffset_flag) {
                                putdot( filename , line );
                        }
                        if (soffset_flag) {


@@ -878,25 +878,25 @@ pcproc(r)
                                if (filetype != nl+T1CHAR)
                                        error("Can't 'writeln' a non text file");
                                if ( opt( 't' ) ) {
                                if (filetype != nl+T1CHAR)
                                        error("Can't 'writeln' a non text file");
                                if ( opt( 't' ) ) {

-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_WRITLN" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,
                                        , "_WRITLN" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,

-                                           NLOCAL , P2PTR|P2STRTY );
+                                           NLOCAL , PCCTM_PTR|PCCT_STRTY );

                                } else {
                                } else {

-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_fputc" );
                                        , "_fputc" );

-                                   putleaf( P2ICON , '\n' , 0 , (int) P2CHAR , (char *) 0 );
-                                   putleaf( P2ICON , 0 , 0
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                   putleaf( PCC_ICON , '\n' , 0 , (int) PCCT_CHAR , (char *) 0 );
+                                   putleaf( PCC_ICON , 0 , 0
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_ACTFILE" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,
                                        , "_ACTFILE" );
                                    putRV((char *) 0 , cbn , CURFILEOFFSET ,

-                                           NLOCAL , P2PTR|P2STRTY );
-                                   putop( P2CALL , P2INT );
-                                   putop( P2LISTOP , P2INT );
+                                           NLOCAL , PCCTM_PTR|PCCT_STRTY );
+                                   putop( PCC_CALL , PCCT_INT );
+                                   putop( PCC_CM , PCCT_INT );

                                }
                                }

-                               putop( P2CALL , P2INT );
+                               putop( PCC_CALL , PCCT_INT );

                                putdot( filename , line );
                                break;
                }
                                putdot( filename , line );
                                break;
                }


@@ -932,13 +932,13 @@ pcproc(r)
                                file = argv->list_node.list;
                                filetype = ap->type;
                                putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,
                                file = argv->list_node.list;
                                filetype = ap->type;
                                putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,

-                                       P2PTR|P2STRTY );
-                               putleaf( P2ICON , 0 , 0 
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                                       PCCTM_PTR|PCCT_STRTY );
+                               putleaf( PCC_ICON , 0 , 0 
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_UNIT" );
                                (void) stklval(argv->list_node.list, NOFLAGS);
                                        , "_UNIT" );
                                (void) stklval(argv->list_node.list, NOFLAGS);

-                               putop( P2CALL , P2INT );
-                               putop( P2ASSIGN , P2PTR|P2STRTY );
+                               putop( PCC_CALL , PCCT_INT );
+                               putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                                putdot( filename , line );
                                argv = argv->list_node.next;
                                argc--;
                                putdot( filename , line );
                                argv = argv->list_node.next;
                                argc--;


@@ -948,18 +948,18 @@ pcproc(r)
                                 * standard input.
                                 */
                                putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,
                                 * standard input.
                                 */
                                putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,

-                                       P2PTR|P2STRTY );
+                                       PCCTM_PTR|PCCT_STRTY );

                                putLV( "_input" , 0 , 0 , NGLOBAL ,
                                putLV( "_input" , 0 , 0 , NGLOBAL ,

-                                       P2PTR|P2STRTY );
-                               putop( P2ASSIGN , P2PTR|P2STRTY );
+                                       PCCTM_PTR|PCCT_STRTY );
+                               putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                                putdot( filename , line );
                                input->nl_flags |= NUSED;
                        }
                } else {
                        putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,
                                putdot( filename , line );
                                input->nl_flags |= NUSED;
                        }
                } else {
                        putRV((char *) 0, cbn , CURFILEOFFSET , NLOCAL ,

-                               P2PTR|P2STRTY );
-                       putLV( "_input" , 0 , 0 , NGLOBAL , P2PTR|P2STRTY );
-                       putop( P2ASSIGN , P2PTR|P2STRTY );
+                               PCCTM_PTR|PCCT_STRTY );
+                       putLV( "_input" , 0 , 0 , NGLOBAL , PCCTM_PTR|PCCT_STRTY );
+                       putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                        putdot( filename , line );
                        input->nl_flags |= NUSED;
                }
                        putdot( filename , line );
                        input->nl_flags |= NUSED;
                }


@@ -1000,20 +1000,20 @@ pcproc(r)
                                if ( isa( ap , "bsci" ) ) {
                                        precheck( ap , "_RANG4" , "_RSNG4" );
                                }
                                if ( isa( ap , "bsci" ) ) {
                                        precheck( ap , "_RANG4" , "_RSNG4" );
                                }

-                               putleaf( P2ICON , 0 , 0
-                                   , (int) (ADDTYPE(
-                                       ADDTYPE(
-                                           ADDTYPE(
-                                               p2type( filetype ) , P2PTR )
-                                           , P2FTN )
-                                       , P2PTR ))
+                               putleaf( PCC_ICON , 0 , 0
+                                   , (int) (PCCM_ADDTYPE(
+                                       PCCM_ADDTYPE(
+                                           PCCM_ADDTYPE(
+                                               p2type( filetype ) , PCCTM_PTR )
+                                           , PCCTM_FTN )
+                                       , PCCTM_PTR ))

                                    , "_FNIL" );
                                if (file != NIL)
                                        (void) stklval(file, NOFLAGS);
                                else /* Magic */
                                        putRV( "_input" , 0 , 0 , NGLOBAL ,
                                    , "_FNIL" );
                                if (file != NIL)
                                        (void) stklval(file, NOFLAGS);
                                else /* Magic */
                                        putRV( "_input" , 0 , 0 , NGLOBAL ,

-                                               P2PTR | P2STRTY );
-                               putop(P2CALL, ADDTYPE(p2type(filetype), P2PTR));
+                                               PCCTM_PTR | PCCT_STRTY );
+                               putop(PCC_CALL, PCCM_ADDTYPE(p2type(filetype), PCCTM_PTR));

                                switch ( classify( filetype ) ) {
                                    case TBOOL:
                                    case TCHAR:
                                switch ( classify( filetype ) ) {
                                    case TBOOL:
                                    case TCHAR:


@@ -1021,7 +1021,7 @@ pcproc(r)
                                    case TSCAL:
                                    case TDOUBLE:
                                    case TPTR:
                                    case TSCAL:
                                    case TDOUBLE:
                                    case TPTR:

-                                       putop( P2UNARY P2MUL
+                                       putop( PCCOM_UNARY PCC_MUL

                                                , p2type( filetype ) );
                                }
                                switch ( classify( filetype ) ) {
                                                , p2type( filetype ) );
                                }
                                switch ( classify( filetype ) ) {


@@ -1034,12 +1034,12 @@ pcproc(r)
                                                /* and fall through */
                                    case TDOUBLE:
                                    case TPTR:
                                                /* and fall through */
                                    case TDOUBLE:
                                    case TPTR:

-                                           putop( P2ASSIGN , p2type( ap ) );
+                                           putop( PCC_ASSIGN , p2type( ap ) );

                                            putdot( filename , line );
                                            break;
                                    default:
                                            putdot( filename , line );
                                            break;
                                    default:

-                                           putstrop(P2STASG,
-                                                   ADDTYPE(p2type(ap), P2PTR),
+                                           putstrop(PCC_STASG,
+                                                   PCCM_ADDTYPE(p2type(ap), PCCTM_PTR),

                                                    (int) lwidth(ap),
                                                    align(ap));
                                            putdot( filename , line );
                                                    (int) lwidth(ap),
                                                    align(ap));
                                            putdot( filename , line );


@@ -1048,12 +1048,12 @@ pcproc(r)
                                /*
                                 * get(file);
                                 */
                                /*
                                 * get(file);
                                 */

-                               putleaf( P2ICON , 0 , 0 
-                                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                               putleaf( PCC_ICON , 0 , 0 
+                                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                        , "_GET" );
                                putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,
                                        , "_GET" );
                                putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,

-                                       P2PTR|P2STRTY );
-                               putop( P2CALL , P2INT );
+                                       PCCTM_PTR|PCCT_STRTY );
+                               putop( PCC_CALL , PCCT_INT );

                                putdot( filename , line );
                                continue;
                        }
                                putdot( filename , line );
                                continue;
                        }


@@ -1081,44 +1081,44 @@ pcproc(r)
                        switch ( op ) {
                            case O_READC:
                                readname = "_READC";
                        switch ( op ) {
                            case O_READC:
                                readname = "_READC";

-                               readtype = P2INT;
+                               readtype = PCCT_INT;

                                break;
                            case O_READ4:
                                readname = "_READ4";
                                break;
                            case O_READ4:
                                readname = "_READ4";

-                               readtype = P2INT;
+                               readtype = PCCT_INT;

                                break;
                            case O_READ8:
                                readname = "_READ8";
                                break;
                            case O_READ8:
                                readname = "_READ8";

-                               readtype = P2DOUBLE;
+                               readtype = PCCT_DOUBLE;

                                break;
                            case O_READE:
                                readname = "_READE";
                                break;
                            case O_READE:
                                readname = "_READE";

-                               readtype = P2INT;
+                               readtype = PCCT_INT;

                                break;
                        }
                                break;
                        }

-                       putleaf( P2ICON , 0 , 0
-                               , (int) ADDTYPE( P2FTN | readtype , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0
+                               , (int) PCCM_ADDTYPE( PCCTM_FTN | readtype , PCCTM_PTR )

                                , readname );
                        putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,
                                , readname );
                        putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,

-                               P2PTR|P2STRTY );
+                               PCCTM_PTR|PCCT_STRTY );

                        if ( op == O_READE ) {
                                sprintf( format , PREFIXFORMAT , LABELPREFIX
                                        , listnames( ap ) );
                        if ( op == O_READE ) {
                                sprintf( format , PREFIXFORMAT , LABELPREFIX
                                        , listnames( ap ) );

-                               putleaf( P2ICON , 0, 0, (int) (P2PTR | P2CHAR),
+                               putleaf( PCC_ICON , 0, 0, (int) (PCCTM_PTR | PCCT_CHAR),

                                        format );
                                        format );

-                               putop( P2LISTOP , P2INT );
+                               putop( PCC_CM , PCCT_INT );

                                warning();
                                if (opt('s')) {
                                        standard();
                                }
                                error("Reading scalars from text files is non-standard");
                        }
                                warning();
                                if (opt('s')) {
                                        standard();
                                }
                                error("Reading scalars from text files is non-standard");
                        }

-                       putop( P2CALL , (int) readtype );
+                       putop( PCC_CALL , (int) readtype );

                        if ( isa( ap , "bcsi" ) ) {
                        if ( isa( ap , "bcsi" ) ) {

-                           postcheck(ap, readtype==P2INT?nl+T4INT:nl+TDOUBLE);
+                           postcheck(ap, readtype==PCCT_INT?nl+T4INT:nl+TDOUBLE);

                        }
                        sconv((int) readtype, p2type(ap));
                        }
                        sconv((int) readtype, p2type(ap));

-                       putop( P2ASSIGN , p2type( ap ) );
+                       putop( PCC_ASSIGN , p2type( ap ) );

                        putdot( filename , line );
                }
                /*
                        putdot( filename , line );
                }
                /*


@@ -1129,12 +1129,12 @@ pcproc(r)
                if (p->value[0] == O_READLN) {
                        if (filetype != nl+T1CHAR)
                                error("Can't 'readln' a non text file");
                if (p->value[0] == O_READLN) {
                        if (filetype != nl+T1CHAR)
                                error("Can't 'readln' a non text file");

-                       putleaf( P2ICON , 0 , 0 
-                               , (int) ADDTYPE( P2FTN | P2INT , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0 
+                               , (int) PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                , "_READLN" );
                        putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,
                                , "_READLN" );
                        putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL ,

-                               P2PTR|P2STRTY );
-                       putop( P2CALL , P2INT );
+                               PCCTM_PTR|PCCT_STRTY );
+                       putop( PCC_CALL , PCCT_INT );

                        putdot( filename , line );
                } else if (argc == 0)
                        error("read requires an argument");
                        putdot( filename , line );
                } else if (argc == 0)
                        error("read requires an argument");


@@ -1146,8 +1146,8 @@ pcproc(r)
                        error("%s expects one argument", p->symbol);
                        return;
                }
                        error("%s expects one argument", p->symbol);
                        return;
                }

-               putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , P2PTR|P2STRTY );
-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , PCCTM_PTR|PCCT_STRTY );
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_UNIT" );
                ap = stklval(argv->list_node.list, NOFLAGS);
                if (ap == NLNIL)
                        , "_UNIT" );
                ap = stklval(argv->list_node.list, NOFLAGS);
                if (ap == NLNIL)


@@ -1156,13 +1156,13 @@ pcproc(r)
                        error("Argument to %s must be a file, not %s", p->symbol, nameof(ap));
                        return;
                }
                        error("Argument to %s must be a file, not %s", p->symbol, nameof(ap));
                        return;
                }

-               putop( P2CALL , P2INT );
-               putop( P2ASSIGN , P2PTR|P2STRTY );
+               putop( PCC_CALL , PCCT_INT );
+               putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                putdot( filename , line );
                putdot( filename , line );

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , op == O_GET ? "_GET" : "_PUT" );
                        , op == O_GET ? "_GET" : "_PUT" );

-               putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , P2PTR|P2STRTY );
-               putop( P2CALL , P2INT );
+               putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , PCCTM_PTR|PCCT_STRTY );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -1176,7 +1176,7 @@ pcproc(r)
                        standard();
                        error("Two argument forms of reset and rewrite are non-standard");
                }
                        standard();
                        error("Two argument forms of reset and rewrite are non-standard");
                }

-               putleaf( P2ICON , 0 , 0 , P2INT
+               putleaf( PCC_ICON , 0 , 0 , PCCT_INT

                        , op == O_RESET ? "_RESET" : "_REWRITE" );
                ap = stklval(argv->list_node.list, MOD|NOUSE);
                if (ap == NLNIL)
                        , op == O_RESET ? "_RESET" : "_REWRITE" );
                ap = stklval(argv->list_node.list, MOD|NOUSE);
                if (ap == NLNIL)


@@ -1202,15 +1202,15 @@ pcproc(r)
                        }
                        strnglen = width((struct nl *) al);
                } else {
                        }
                        strnglen = width((struct nl *) al);
                } else {

-                       putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
+                       putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );

                        strnglen = 0;
                }
                        strnglen = 0;
                }

-               putop( P2LISTOP , P2INT );
-               putleaf( P2ICON , strnglen , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putleaf( P2ICON , text(ap) ? 0: width(ap->type) , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
+               putop( PCC_CM , PCCT_INT );
+               putleaf( PCC_ICON , strnglen , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putleaf( PCC_ICON , text(ap) ? 0: width(ap->type) , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -1240,7 +1240,7 @@ pcproc(r)
                                cmd = "_DFDISPOSE";
                        else
                                cmd = "_DISPOSE";
                                cmd = "_DFDISPOSE";
                        else
                                cmd = "_DISPOSE";

-               putleaf( P2ICON, 0, 0, ADDTYPE( P2FTN | P2INT , P2PTR ), cmd);
+               putleaf( PCC_ICON, 0, 0, PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ), cmd);

                (void) stklval(alv, op == O_NEW ? ( MOD | NOUSE ) : MOD );
                argv = argv->list_node.next;
                if (argv != TR_NIL) {
                (void) stklval(alv, op == O_NEW ? ( MOD | NOUSE ) : MOD );
                argv = argv->list_node.next;
                if (argv != TR_NIL) {


@@ -1274,17 +1274,17 @@ pcproc(r)
                                ap = ap->ptr[NL_VTOREC];
                        }
                }
                                ap = ap->ptr[NL_VTOREC];
                        }
                }

-               putleaf( P2ICON , width( ap ) , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
+               putleaf( PCC_ICON , width( ap ) , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                if (opt('t') && op == O_NEW) {
                putdot( filename , line );
                if (opt('t') && op == O_NEW) {

-                   putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+                   putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                            , "_blkclr" );
                    (void) stkrval(alv, NLNIL , (long) RREQ );
                            , "_blkclr" );
                    (void) stkrval(alv, NLNIL , (long) RREQ );

-                   putleaf( P2ICON , width( ap ) , 0 , P2INT , (char *) 0 );
-                   putop( P2LISTOP , P2INT );
-                   putop( P2CALL , P2INT );
+                   putleaf( PCC_ICON , width( ap ) , 0 , PCCT_INT , (char *) 0 );
+                   putop( PCC_CM , PCCT_INT );
+                   putop( PCC_CALL , PCCT_INT );

                    putdot( filename , line );
                }
                return;
                    putdot( filename , line );
                }
                return;


@@ -1295,7 +1295,7 @@ pcproc(r)
                        error("%s expects one argument", p->symbol);
                        return;
                }
                        error("%s expects one argument", p->symbol);
                        return;
                }

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , op == O_DATE ? "_DATE" : "_TIME" );
                ap = stklval(argv->list_node.list, MOD|NOUSE);
                if (ap == NIL)
                        , op == O_DATE ? "_DATE" : "_TIME" );
                ap = stklval(argv->list_node.list, MOD|NOUSE);
                if (ap == NIL)


@@ -1304,7 +1304,7 @@ pcproc(r)
                        error("Argument to %s must be a alfa, not %s", p->symbol, nameof(ap));
                        return;
                }
                        error("Argument to %s must be a alfa, not %s", p->symbol, nameof(ap));
                        return;
                }

-               putop( P2CALL , P2INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -1313,10 +1313,10 @@ pcproc(r)
                        error("halt takes no arguments");
                        return;
                }
                        error("halt takes no arguments");
                        return;
                }

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_HALT" );
 
                        , "_HALT" );
 

-               putop( P2UNARY P2CALL , P2INT );
+               putop( PCCOM_UNARY PCC_CALL , PCCT_INT );

                putdot( filename , line );
                noreach = TRUE;
                return;
                putdot( filename , line );
                noreach = TRUE;
                return;


@@ -1326,7 +1326,7 @@ pcproc(r)
                        error("argv takes two arguments");
                        return;
                }
                        error("argv takes two arguments");
                        return;
                }

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_ARGV" );
                ap = stkrval(argv->list_node.list, NLNIL , (long) RREQ );
                if (ap == NLNIL)
                        , "_ARGV" );
                ap = stkrval(argv->list_node.list, NLNIL , (long) RREQ );
                if (ap == NLNIL)


@@ -1343,10 +1343,10 @@ pcproc(r)
                        error("argv's second argument must be a string, not %s", nameof(ap));
                        return;
                }
                        error("argv's second argument must be a string, not %s", nameof(ap));
                        return;
                }

-               putop( P2LISTOP , P2INT );
-               putleaf( P2ICON , width( ap ) , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
+               putop( PCC_CM , PCCT_INT );
+               putleaf( PCC_ICON , width( ap ) , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -1355,7 +1355,7 @@ pcproc(r)
                        error("stlimit requires one argument");
                        return;
                }
                        error("stlimit requires one argument");
                        return;
                }

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_STLIM" );
                ap = stkrval(argv->list_node.list, NLNIL , (long) RREQ );
                if (ap == NLNIL)
                        , "_STLIM" );
                ap = stkrval(argv->list_node.list, NLNIL , (long) RREQ );
                if (ap == NLNIL)


@@ -1364,7 +1364,7 @@ pcproc(r)
                        error("stlimit's argument must be an integer, not %s", nameof(ap));
                        return;
                }
                        error("stlimit's argument must be an integer, not %s", nameof(ap));
                        return;
                }

-               putop( P2CALL , P2INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -1373,7 +1373,7 @@ pcproc(r)
                        error("remove expects one argument");
                        return;
                }
                        error("remove expects one argument");
                        return;
                }

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_REMOVE" );
                ap = stkrval(argv->list_node.list, NLNIL, (long) RREQ );
                if (ap == NLNIL)
                        , "_REMOVE" );
                ap = stkrval(argv->list_node.list, NLNIL, (long) RREQ );
                if (ap == NLNIL)


@@ -1382,9 +1382,9 @@ pcproc(r)
                        error("remove's argument must be a string, not %s", nameof(ap));
                        return;
                }
                        error("remove's argument must be a string, not %s", nameof(ap));
                        return;
                }

-               putleaf( P2ICON , width( ap ) , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
+               putleaf( PCC_ICON , width( ap ) , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -1393,7 +1393,7 @@ pcproc(r)
                        error("linelimit expects two arguments");
                        return;
                }
                        error("linelimit expects two arguments");
                        return;
                }

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_LLIMIT" );
                ap = stklval(argv->list_node.list, NOFLAGS|NOUSE);
                if (ap == NLNIL)
                        , "_LLIMIT" );
                ap = stklval(argv->list_node.list, NOFLAGS|NOUSE);
                if (ap == NLNIL)


@@ -1410,8 +1410,8 @@ pcproc(r)
                        error("linelimit's second argument must be an integer, not %s", nameof(ap));
                        return;
                }
                        error("linelimit's second argument must be an integer, not %s", nameof(ap));
                        return;
                }

-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
        case O_PAGE:
                putdot( filename , line );
                return;
        case O_PAGE:


@@ -1419,8 +1419,8 @@ pcproc(r)
                        error("page expects one argument");
                        return;
                }
                        error("page expects one argument");
                        return;
                }

-               putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , P2PTR|P2STRTY );
-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , PCCTM_PTR|PCCT_STRTY );
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_UNIT" );
                ap = stklval(argv->list_node.list, NOFLAGS);
                if (ap == NLNIL)
                        , "_UNIT" );
                ap = stklval(argv->list_node.list, NOFLAGS);
                if (ap == NLNIL)


@@ -1429,27 +1429,27 @@ pcproc(r)
                        error("Argument to page must be a text file, not %s", nameof(ap));
                        return;
                }
                        error("Argument to page must be a text file, not %s", nameof(ap));
                        return;
                }

-               putop( P2CALL , P2INT );
-               putop( P2ASSIGN , P2PTR|P2STRTY );
+               putop( PCC_CALL , PCCT_INT );
+               putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                putdot( filename , line );
                if ( opt( 't' ) ) {
                putdot( filename , line );
                if ( opt( 't' ) ) {

-                   putleaf( P2ICON , 0 , 0
-                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                   putleaf( PCC_ICON , 0 , 0
+                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_PAGE" );
                        , "_PAGE" );

-                   putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , P2PTR|P2STRTY );
+                   putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , PCCTM_PTR|PCCT_STRTY );

                } else {
                } else {

-                   putleaf( P2ICON , 0 , 0
-                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                   putleaf( PCC_ICON , 0 , 0
+                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_fputc" );
                        , "_fputc" );

-                   putleaf( P2ICON , '\f' , 0 , (int) P2CHAR , (char *) 0 );
-                   putleaf( P2ICON , 0 , 0
-                       , ADDTYPE( P2FTN | P2INT , P2PTR )
+                   putleaf( PCC_ICON , '\f' , 0 , (int) PCCT_CHAR , (char *) 0 );
+                   putleaf( PCC_ICON , 0 , 0
+                       , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_ACTFILE" );
                        , "_ACTFILE" );

-                   putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , P2PTR|P2STRTY );
-                   putop( P2CALL , P2INT );
-                   putop( P2LISTOP , P2INT );
+                   putRV((char *) 0 , cbn , CURFILEOFFSET , NLOCAL , PCCTM_PTR|PCCT_STRTY );
+                   putop( PCC_CALL , PCCT_INT );
+                   putop( PCC_CM , PCCT_INT );

                }
                }

-               putop( P2CALL , P2INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -1464,8 +1464,8 @@ pcproc(r)
                        cmd = "_ASRTS";
                else
                        cmd = "_ASRT";
                        cmd = "_ASRTS";
                else
                        cmd = "_ASRT";

-               putleaf( P2ICON , 0 , 0
-                   , ADDTYPE( P2FTN | P2INT , P2PTR ) , cmd );
+               putleaf( PCC_ICON , 0 , 0
+                   , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR ) , cmd );

                ap = stkrval(argv->list_node.list, NLNIL , (long) RREQ );
                if (ap == NLNIL)
                        return;
                ap = stkrval(argv->list_node.list, NLNIL , (long) RREQ );
                if (ap == NLNIL)
                        return;


@@ -1484,9 +1484,9 @@ pcproc(r)
                                error("Second argument to assert must be a string, not %s", nameof((struct nl *) al));
                                return;
                        }
                                error("Second argument to assert must be a string, not %s", nameof((struct nl *) al));
                                return;
                        }

-                       putop( P2LISTOP , P2INT );
+                       putop( PCC_CM , PCCT_INT );

                }
                }

-               putop( P2CALL , P2INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
 
                putdot( filename , line );
                return;
 


@@ -1495,7 +1495,7 @@ pcproc(r)
                        error("pack expects three arguments");
                        return;
                }
                        error("pack expects three arguments");
                        return;
                }

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_PACK" );
                pu = "pack(a,i,z)";
                pua = (al = argv)->list_node.list;
                        , "_PACK" );
                pu = "pack(a,i,z)";
                pua = (al = argv)->list_node.list;


@@ -1507,7 +1507,7 @@ pcproc(r)
                        error("unpack expects three arguments");
                        return;
                }
                        error("unpack expects three arguments");
                        return;
                }

-               putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+               putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                        , "_UNPACK" );
                pu = "unpack(z,a,i)";
                puz = (al = argv)->list_node.list;
                        , "_UNPACK" );
                pu = "unpack(z,a,i)";
                puz = (al = argv)->list_node.list;


@@ -1524,7 +1524,7 @@ packunp:
                        error("%s requires a to be an unpacked array, not %s", pu, nameof(ap));
                        return;
                }
                        error("%s requires a to be an unpacked array, not %s", pu, nameof(ap));
                        return;
                }

-               putop( P2LISTOP , P2INT );
+               putop( PCC_CM , PCCT_INT );

                al = (struct tnode *) stklval(puz, op == O_UNPACK ? NOFLAGS : MOD|NOUSE);
                if (((struct nl *) al)->class != ARRAY) {
                        error("%s requires z to be a packed array, not %s", pu, nameof(ap));
                al = (struct tnode *) stklval(puz, op == O_UNPACK ? NOFLAGS : MOD|NOUSE);
                if (((struct nl *) al)->class != ARRAY) {
                        error("%s requires z to be a packed array, not %s", pu, nameof(ap));


@@ -1537,7 +1537,7 @@ packunp:
                        error("%s requires a and z to be arrays of the same type", pu, nameof(ap));
                        return;
                }
                        error("%s requires a and z to be arrays of the same type", pu, nameof(ap));
                        return;
                }

-               putop( P2LISTOP , P2INT );
+               putop( PCC_CM , PCCT_INT );

                k = width((struct nl *) al);
                itemwidth = width(ap->type);
                ap = ap->chain;
                k = width((struct nl *) al);
                itemwidth = width(ap->type);
                ap = ap->chain;


@@ -1566,15 +1566,15 @@ packunp:
                 */
                i -= j;
                j = ap->range[0];
                 */
                i -= j;
                j = ap->range[0];

-               putleaf( P2ICON , itemwidth , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putleaf( P2ICON , j , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putleaf( P2ICON , i , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putleaf( P2ICON , k , 0 , P2INT , (char *) 0 );
-               putop( P2LISTOP , P2INT );
-               putop( P2CALL , P2INT );
+               putleaf( PCC_ICON , itemwidth , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putleaf( PCC_ICON , j , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putleaf( PCC_ICON , i , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putleaf( PCC_ICON , k , 0 , PCCT_INT , (char *) 0 );
+               putop( PCC_CM , PCCT_INT );
+               putop( PCC_CALL , PCCT_INT );

                putdot( filename , line );
                return;
        case 0:
                putdot( filename , line );
                return;
        case 0:

diff --git a/usr/src/usr.bin/pascal/src/rval.c b/usr/src/usr.bin/pascal/src/rval.c
index bab4b1a..3dee038 100644 (file)
--- a/usr/src/usr.bin/pascal/src/rval.c
+++ b/usr/src/usr.bin/pascal/src/rval.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)rval.c 2.2 %G%";
+static char sccsid[] = "@(#)rval.c 2.3 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -11,7 +11,7 @@ static char sccsid[] = "@(#)rval.c 2.2 %G%";
 #include "objfmt.h"
 #ifdef PC
 #   include    "pc.h"
 #include "objfmt.h"
 #ifdef PC
 #   include    "pc.h"

-#   include "pcops.h"
+#   include <pcc.h>

 #endif PC
 #include "tmps.h"
 #include "tree_ty.h"
 #endif PC
 #include "tmps.h"
 #include "tree_ty.h"


@@ -35,11 +35,11 @@ short nssetline = 0;
                                "_RELSLE" , "_RELSGE"
                            };
     long       relops[] =  {   
                                "_RELSLE" , "_RELSGE"
                            };
     long       relops[] =  {   

-                               P2EQ , P2NE ,
-                               P2LT , P2GT ,
-                               P2LE , P2GE 
+                               PCC_EQ , PCC_NE ,
+                               PCC_LT , PCC_GT ,
+                               PCC_LE , PCC_GE 

                            };
                            };

-    long       mathop[] =  {   P2MUL , P2PLUS , P2MINUS };
+    long       mathop[] =  {   PCC_MUL , PCC_PLUS , PCC_MINUS };

     char       *setop[] =  {   "_MULT" , "_ADDT" , "_SUBT" };
 #endif PC
 /*
     char       *setop[] =  {   "_MULT" , "_ADDT" , "_SUBT" };
 #endif PC
 /*


@@ -103,7 +103,7 @@ rvalue(r, contype , required )
                    (void) put(2, O_CON2, 0);
 #              endif OBJ
 #              ifdef PC
                    (void) put(2, O_CON2, 0);
 #              endif OBJ
 #              ifdef PC

-                   putleaf( P2ICON , 0 , 0 , P2PTR|P2UNDEF , (char *) 0 );
+                   putleaf( PCC_ICON , 0 , 0 , PCCTM_PTR|PCCT_UNDEF , (char *) 0 );

 #              endif PC
                return (nl+TNIL);
 
 #              endif PC
                return (nl+TNIL);
 


@@ -202,7 +202,7 @@ ind:
 #                          endif OBJ
 #                          ifdef PC
                                if ( required == RREQ ) {
 #                          endif OBJ
 #                          ifdef PC
                                if ( required == RREQ ) {

-                                   putop( P2UNARY P2MUL , p2type( q ) );
+                                   putop( PCCOM_UNARY PCC_MUL , p2type( q ) );

                                }
 #                          endif PC
                            return (q);
                                }
 #                          endif PC
                            return (q);


@@ -255,8 +255,8 @@ cstrng:
                                        (void) put(2, O_CONC, (int)p->value[0]);
 #                                  endif OBJ
 #                                  ifdef PC
                                        (void) put(2, O_CONC, (int)p->value[0]);
 #                                  endif OBJ
 #                                  ifdef PC

-                                       putleaf( P2ICON , p -> value[0] , 0
-                                               , P2CHAR , (char *) 0 );
+                                       putleaf( PCC_ICON , p -> value[0] , 0
+                                               , PCCT_CHAR , (char *) 0 );

 #                                  endif PC
                                    return (q);
                            }
 #                                  endif PC
                                    return (q);
                            }


@@ -292,8 +292,8 @@ cstrng:
                                        (void) put(2, O_CON4, p->range[0]);
 #                                  endif OBJ
 #                                  ifdef PC
                                        (void) put(2, O_CON4, p->range[0]);
 #                                  endif OBJ
 #                                  ifdef PC

-                                       putleaf( P2ICON , (int) p->range[0] , 0
-                                               , P2INT , (char *) 0 );
+                                       putleaf( PCC_ICON , (int) p->range[0] , 0
+                                               , PCCT_INT , (char *) 0 );

 #                                  endif PC
                                    break;
                            case 2:
 #                                  endif PC
                                    break;
                            case 2:


@@ -301,8 +301,8 @@ cstrng:
                                        (void) put(2, O_CON2, (short)p->range[0]);
 #                                  endif OBJ
 #                                  ifdef PC
                                        (void) put(2, O_CON2, (short)p->range[0]);
 #                                  endif OBJ
 #                                  ifdef PC

-                                       putleaf( P2ICON , (short) p -> range[0]
-                                               , 0 , P2SHORT , (char *) 0 );
+                                       putleaf( PCC_ICON , (short) p -> range[0]
+                                               , 0 , PCCT_SHORT , (char *) 0 );

 #                                  endif PC
                                    break;
                            case 1:
 #                                  endif PC
                                    break;
                            case 1:


@@ -310,8 +310,8 @@ cstrng:
                                        (void) put(2, O_CON1, p->value[0]);
 #                                  endif OBJ
 #                                  ifdef PC
                                        (void) put(2, O_CON1, p->value[0]);
 #                                  endif OBJ
 #                                  ifdef PC

-                                       putleaf( P2ICON , p -> value[0] , 0
-                                               , P2CHAR , (char *) 0 );
+                                       putleaf( PCC_ICON , p -> value[0] , 0
+                                               , PCCT_CHAR , (char *) 0 );

 #                                  endif PC
                                    break;
                            default:
 #                                  endif PC
                                    break;
                            default:


@@ -374,8 +374,8 @@ cstrng:
                        }
                        postcset( r , &csetd );
                    } else {
                        }
                        postcset( r , &csetd );
                    } else {

-                       putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2INT , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                , "_CTTOT" );
                        /*
                         *      allocate a temporary and use it
                                , "_CTTOT" );
                        /*
                         *      allocate a temporary and use it


@@ -383,14 +383,14 @@ cstrng:
                        tempnlp = tmpalloc(lwidth(csetd.csettype),
                                csetd.csettype, NOREG);
                        putLV( (char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                        tempnlp = tmpalloc(lwidth(csetd.csettype),
                                csetd.csettype, NOREG);
                        putLV( (char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,

-                               tempnlp -> extra_flags , P2PTR|P2STRTY );
+                               tempnlp -> extra_flags , PCCTM_PTR|PCCT_STRTY );

                        setran( ( csetd.csettype ) -> type );
                        setran( ( csetd.csettype ) -> type );

-                       putleaf( P2ICON , set.lwrb , 0 , P2INT , (char *) 0 );
-                       putop( P2LISTOP , P2INT );
-                       putleaf( P2ICON , set.uprbp , 0 , P2INT , (char *) 0 );
-                       putop( P2LISTOP , P2INT );
+                       putleaf( PCC_ICON , set.lwrb , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CM , PCCT_INT );
+                       putleaf( PCC_ICON , set.uprbp , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CM , PCCT_INT );

                        postcset( r , &csetd );
                        postcset( r , &csetd );

-                       putop( P2CALL , P2INT );
+                       putop( PCC_CALL , PCCT_INT );

                    }
                    return csetd.csettype;
 #              endif PC
                    }
                    return csetd.csettype;
 #              endif PC


@@ -414,11 +414,11 @@ cstrng:
 #                  endif OBJ
 #                  ifdef PC
                        if (isa(q, "i")) {
 #                  endif OBJ
 #                  ifdef PC
                        if (isa(q, "i")) {

-                           sconv(p2type(q), P2INT);
-                           putop( P2UNARY P2MINUS, P2INT);
+                           sconv(p2type(q), PCCT_INT);
+                           putop( PCCOM_UNARY PCC_MINUS, PCCT_INT);

                            return nl+T4INT;
                        }
                            return nl+T4INT;
                        }

-                       putop( P2UNARY P2MINUS, P2DOUBLE);
+                       putop( PCCOM_UNARY PCC_MINUS, PCCT_DOUBLE);

                        return nl+TDOUBLE;
 #                  endif PC
                }
                        return nl+TDOUBLE;
 #                  endif PC
                }


@@ -436,9 +436,9 @@ cstrng:
                    (void) put(1, O_NOT);
 #              endif OBJ
 #              ifdef PC
                    (void) put(1, O_NOT);
 #              endif OBJ
 #              ifdef PC

-                   sconv(p2type(q), P2INT);
-                   putop( P2NOT , P2INT);
-                   sconv(P2INT, p2type(q));
+                   sconv(p2type(q), PCCT_INT);
+                   putop( PCC_NOT , PCCT_INT);
+                   sconv(PCCT_INT, p2type(q));

 #              endif PC
                return (nl+T1BOOL);
 
 #              endif PC
                return (nl+T1BOOL);
 


@@ -446,11 +446,11 @@ cstrng:
        case T_OR:
                p = rvalue(r->expr_node.lhs, NLNIL , RREQ );
 #              ifdef PC
        case T_OR:
                p = rvalue(r->expr_node.lhs, NLNIL , RREQ );
 #              ifdef PC

-                   sconv(p2type(p),P2INT);
+                   sconv(p2type(p),PCCT_INT);

 #              endif PC
                p1 = rvalue(r->expr_node.rhs, NLNIL , RREQ );
 #              ifdef PC
 #              endif PC
                p1 = rvalue(r->expr_node.rhs, NLNIL , RREQ );
 #              ifdef PC

-                   sconv(p2type(p1),P2INT);
+                   sconv(p2type(p1),PCCT_INT);

 #              endif PC
                if (p == NLNIL || p1 == NLNIL)
                        return (NLNIL);
 #              endif PC
                if (p == NLNIL || p1 == NLNIL)
                        return (NLNIL);


@@ -470,8 +470,8 @@ cstrng:
                         * note the use of & and | rather than && and ||
                         * to force evaluation of all the expressions.
                         */
                         * note the use of & and | rather than && and ||
                         * to force evaluation of all the expressions.
                         */

-                   putop( r->tag == T_AND ? P2AND : P2OR , P2INT );
-                   sconv(P2INT, p2type(p));
+                   putop( r->tag == T_AND ? PCC_AND : PCC_OR , PCCT_INT );
+                   sconv(PCCT_INT, p2type(p));

 #              endif PC
                return (nl+T1BOOL);
 
 #              endif PC
                return (nl+T1BOOL);
 


@@ -485,9 +485,9 @@ cstrng:
                         *      force these to be doubles for the divide
                         */
                    p = rvalue( r->expr_node.lhs , NLNIL , RREQ );
                         *      force these to be doubles for the divide
                         */
                    p = rvalue( r->expr_node.lhs , NLNIL , RREQ );

-                   sconv(p2type(p), P2DOUBLE);
+                   sconv(p2type(p), PCCT_DOUBLE);

                    p1 = rvalue( r->expr_node.rhs , NLNIL , RREQ );
                    p1 = rvalue( r->expr_node.rhs , NLNIL , RREQ );

-                   sconv(p2type(p1), P2DOUBLE);
+                   sconv(p2type(p1), PCCT_DOUBLE);

 #              endif PC
                if (p == NLNIL || p1 == NLNIL)
                        return (NLNIL);
 #              endif PC
                if (p == NLNIL || p1 == NLNIL)
                        return (NLNIL);


@@ -503,7 +503,7 @@ cstrng:
                    return gen(NIL, r->tag, width(p), width(p1));
 #              endif OBJ
 #              ifdef PC
                    return gen(NIL, r->tag, width(p), width(p1));
 #              endif OBJ
 #              ifdef PC

-                   putop( P2DIV , P2DOUBLE );
+                   putop( PCC_DIV , PCCT_DOUBLE );

                    return nl + TDOUBLE;
 #              endif PC
 
                    return nl + TDOUBLE;
 #              endif PC
 


@@ -581,9 +581,9 @@ cstrng:
                        }
                    }
                    if ( isa( p1 , "t" ) ) {
                        }
                    }
                    if ( isa( p1 , "t" ) ) {

-                       putleaf( P2ICON , 0 , 0
-                           , ADDTYPE( ADDTYPE( P2PTR | P2STRTY , P2FTN )
-                                       , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0
+                           , PCCM_ADDTYPE( PCCM_ADDTYPE( PCCTM_PTR | PCCT_STRTY , PCCTM_FTN )
+                                       , PCCTM_PTR )

                            , setop[ r->tag - T_MULT ] );
                        codeoff();
                        contype = rvalue( r->expr_node.lhs, p1 , LREQ );
                            , setop[ r->tag - T_MULT ] );
                        codeoff();
                        contype = rvalue( r->expr_node.lhs, p1 , LREQ );


@@ -595,10 +595,10 @@ cstrng:
                             */
                        tempnlp = tmpalloc(lwidth(contype), contype, NOREG);
                        putLV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
                             */
                        tempnlp = tmpalloc(lwidth(contype), contype, NOREG);
                        putLV((char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,

-                               tempnlp -> extra_flags , P2PTR|P2STRTY );
+                               tempnlp -> extra_flags , PCCTM_PTR|PCCT_STRTY );

                        p = rvalue( r->expr_node.lhs , contype , LREQ );
                        if ( isa( p , "t" ) ) {
                        p = rvalue( r->expr_node.lhs , contype , LREQ );
                        if ( isa( p , "t" ) ) {

-                           putop( P2LISTOP , P2INT );
+                           putop( PCC_CM , PCCT_INT );

                            if ( p == NLNIL || p1 == NLNIL ) {
                                return NLNIL;
                            }
                            if ( p == NLNIL || p1 == NLNIL ) {
                                return NLNIL;
                            }


@@ -607,11 +607,11 @@ cstrng:
                                error("Set types of operands of %s must be identical", opname);
                                return NLNIL;
                            }
                                error("Set types of operands of %s must be identical", opname);
                                return NLNIL;
                            }

-                           putop( P2LISTOP , P2INT );
-                           putleaf( P2ICON , (int) (lwidth(p1)) / sizeof( long ) , 0
-                                   , P2INT , (char *) 0 );
-                           putop( P2LISTOP , P2INT );
-                           putop( P2CALL , P2PTR | P2STRTY );
+                           putop( PCC_CM , PCCT_INT );
+                           putleaf( PCC_ICON , (int) (lwidth(p1)) / sizeof( long ) , 0
+                                   , PCCT_INT , (char *) 0 );
+                           putop( PCC_CM , PCCT_INT );
+                           putop( PCC_CALL , PCCTM_PTR | PCCT_STRTY );

                            return p;
                        }
                    }
                            return p;
                        }
                    }


@@ -643,11 +643,11 @@ cstrng:
        case T_DIV:
                p = rvalue(r->expr_node.lhs, NLNIL , RREQ );
 #              ifdef PC
        case T_DIV:
                p = rvalue(r->expr_node.lhs, NLNIL , RREQ );
 #              ifdef PC

-                   sconv(p2type(p), P2INT);
+                   sconv(p2type(p), PCCT_INT);

 #              endif PC
                p1 = rvalue(r->expr_node.rhs, NLNIL , RREQ );
 #              ifdef PC
 #              endif PC
                p1 = rvalue(r->expr_node.rhs, NLNIL , RREQ );
 #              ifdef PC

-                   sconv(p2type(p1), P2INT);
+                   sconv(p2type(p1), PCCT_INT);

 #              endif PC
                if (p == NLNIL || p1 == NLNIL)
                        return (NLNIL);
 #              endif PC
                if (p == NLNIL || p1 == NLNIL)
                        return (NLNIL);


@@ -663,7 +663,7 @@ cstrng:
                    return (gen(NIL, r->tag, width(p), width(p1)));
 #              endif OBJ
 #              ifdef PC
                    return (gen(NIL, r->tag, width(p), width(p1)));
 #              endif OBJ
 #              ifdef PC

-                   putop( r->tag == T_DIV ? P2DIV : P2MOD , P2INT );
+                   putop( r->tag == T_DIV ? PCC_DIV : PCC_MOD , PCCT_INT );

                    return ( nl + T4INT );
 #              endif PC
 
                    return ( nl + T4INT );
 #              endif PC
 


@@ -729,8 +729,8 @@ cstrng:
 #              ifdef PC
                    c1 = classify( p1 );
                    if ( c1 == TSET || c1 == TSTR || c1 == TREC ) {
 #              ifdef PC
                    c1 = classify( p1 );
                    if ( c1 == TSET || c1 == TSTR || c1 == TREC ) {

-                       putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2INT , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                , c1 == TSET  ? relts[ r->tag - T_EQ ]
                                              : relss[ r->tag - T_EQ ] );
                            /*
                                , c1 == TSET  ? relts[ r->tag - T_EQ ]
                                              : relss[ r->tag - T_EQ ] );
                            /*


@@ -761,7 +761,7 @@ cstrng:
                            /*
                             *  put out the width of the comparison.
                             */
                            /*
                             *  put out the width of the comparison.
                             */

-                       putleaf(P2ICON, (int) lwidth(contype), 0, P2INT, (char *) 0);
+                       putleaf(PCC_ICON, (int) lwidth(contype), 0, PCCT_INT, (char *) 0);

                            /*
                             *  and the left hand side,
                             *  for sets, strings, records
                            /*
                             *  and the left hand side,
                             *  for sets, strings, records


@@ -770,13 +770,13 @@ cstrng:
                        if ( p == NLNIL ) {
                            return NLNIL;
                        }
                        if ( p == NLNIL ) {
                            return NLNIL;
                        }

-                       putop( P2LISTOP , P2INT );
+                       putop( PCC_CM , PCCT_INT );

                        p1 = rvalue( r->expr_node.rhs , p , LREQ );
                        if ( p1 == NLNIL ) {
                            return NLNIL;
                        }
                        p1 = rvalue( r->expr_node.rhs , p , LREQ );
                        if ( p1 == NLNIL ) {
                            return NLNIL;
                        }

-                       putop( P2LISTOP , P2INT );
-                       putop( P2CALL , P2INT );
+                       putop( PCC_CM , PCCT_INT );
+                       putop( PCC_CALL , PCCT_INT );

                    } else {
                            /*
                             *  the easy (scalar or error) case
                    } else {
                            /*
                             *  the easy (scalar or error) case


@@ -796,8 +796,8 @@ cstrng:
                            return NLNIL;
                        }
                        tuac(p1, p, &rettype, (int *) (&ctype));
                            return NLNIL;
                        }
                        tuac(p1, p, &rettype, (int *) (&ctype));

-                       putop((int) relops[ r->tag - T_EQ ] , P2INT );
-                       sconv(P2INT, P2CHAR);
+                       putop((int) relops[ r->tag - T_EQ ] , PCCT_INT );
+                       sconv(PCCT_INT, PCCT_CHAR);

                    }
 #              endif PC
                c = classify(p);
                    }
 #              endif PC
                c = classify(p);


@@ -910,20 +910,20 @@ nonident:
 #              ifdef PC
                    if (rt != TR_NIL && rt->tag == T_CSET) {
                        if ( precset( rt , NLNIL , &csetd ) ) {
 #              ifdef PC
                    if (rt != TR_NIL && rt->tag == T_CSET) {
                        if ( precset( rt , NLNIL , &csetd ) ) {

-                           putleaf( P2ICON , 0 , 0
-                                   , ADDTYPE( P2FTN | P2INT , P2PTR )
+                           putleaf( PCC_ICON , 0 , 0
+                                   , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                    , "_IN" );
                        } else {
                                    , "_IN" );
                        } else {

-                           putleaf( P2ICON , 0 , 0
-                                   , ADDTYPE( P2FTN | P2INT , P2PTR )
+                           putleaf( PCC_ICON , 0 , 0
+                                   , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                    , "_INCT" );
                        }
                        p1 = csetd.csettype;
                        if (p1 == NIL)
                            return NLNIL;
                    } else {
                                    , "_INCT" );
                        }
                        p1 = csetd.csettype;
                        if (p1 == NIL)
                            return NLNIL;
                    } else {

-                       putleaf( P2ICON , 0 , 0
-                               , ADDTYPE( P2FTN | P2INT , P2PTR )
+                       putleaf( PCC_ICON , 0 , 0
+                               , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                                , "_IN" );
                        codeoff();
                        p1 = rvalue(r->expr_node.rhs, NLNIL , LREQ );
                                , "_IN" );
                        codeoff();
                        p1 = rvalue(r->expr_node.rhs, NLNIL , LREQ );


@@ -951,27 +951,27 @@ nonident:
 #              endif OBJ
 #              ifdef PC
                    if ( rt == TR_NIL || rt->tag != T_CSET ) {
 #              endif OBJ
 #              ifdef PC
                    if ( rt == TR_NIL || rt->tag != T_CSET ) {

-                       putleaf( P2ICON , set.lwrb , 0 , P2INT , (char *) 0 );
-                       putop( P2LISTOP , P2INT );
-                       putleaf( P2ICON , set.uprbp , 0 , P2INT , (char *) 0 );
-                       putop( P2LISTOP , P2INT );
+                       putleaf( PCC_ICON , set.lwrb , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CM , PCCT_INT );
+                       putleaf( PCC_ICON , set.uprbp , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CM , PCCT_INT );

                        p1 = rvalue( r->expr_node.rhs , NLNIL , LREQ );
                        if ( p1 == NLNIL ) {
                            return NLNIL;
                        }
                        p1 = rvalue( r->expr_node.rhs , NLNIL , LREQ );
                        if ( p1 == NLNIL ) {
                            return NLNIL;
                        }

-                       putop( P2LISTOP , P2INT );
+                       putop( PCC_CM , PCCT_INT );

                    } else if ( csetd.comptime ) {
                    } else if ( csetd.comptime ) {

-                       putleaf( P2ICON , set.lwrb , 0 , P2INT , (char *) 0 );
-                       putop( P2LISTOP , P2INT );
-                       putleaf( P2ICON , set.uprbp , 0 , P2INT , (char *) 0 );
-                       putop( P2LISTOP , P2INT );
+                       putleaf( PCC_ICON , set.lwrb , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CM , PCCT_INT );
+                       putleaf( PCC_ICON , set.uprbp , 0 , PCCT_INT , (char *) 0 );
+                       putop( PCC_CM , PCCT_INT );

                        postcset( r->expr_node.rhs , &csetd );
                        postcset( r->expr_node.rhs , &csetd );

-                       putop( P2LISTOP , P2INT );
+                       putop( PCC_CM , PCCT_INT );

                    } else {
                        postcset( r->expr_node.rhs , &csetd );
                    }
                    } else {
                        postcset( r->expr_node.rhs , &csetd );
                    }

-                   putop( P2CALL , P2INT );
-                   sconv(P2INT, P2CHAR);
+                   putop( PCC_CALL , PCCT_INT );
+                   sconv(PCCT_INT, PCCT_CHAR);

 #              endif PC
                return (nl+T1BOOL);
        default:
 #              endif PC
                return (nl+T1BOOL);
        default:


@@ -1011,15 +1011,15 @@ conint:
 #                      ifdef PC
                            switch (bytes(l, l)) {
                                case 1:
 #                      ifdef PC
                            switch (bytes(l, l)) {
                                case 1:

-                                   putleaf(P2ICON, (int) l, 0, P2CHAR, 
+                                   putleaf(PCC_ICON, (int) l, 0, PCCT_CHAR, 

                                                (char *) 0);
                                    return nl+T1INT;
                                case 2:
                                                (char *) 0);
                                    return nl+T1INT;
                                case 2:

-                                   putleaf(P2ICON, (int) l, 0, P2SHORT, 
+                                   putleaf(PCC_ICON, (int) l, 0, PCCT_SHORT, 

                                                (char *) 0);
                                    return nl+T2INT;
                                case 4:
                                                (char *) 0);
                                    return nl+T2INT;
                                case 4:

-                                   putleaf(P2ICON, (int) l, 0, P2INT,
+                                   putleaf(PCC_ICON, (int) l, 0, PCCT_INT,

                                                (char *) 0);
                                    return nl+T4INT;
                            }
                                                (char *) 0);
                                    return nl+T4INT;
                            }


@@ -1049,7 +1049,7 @@ conint:
                                    (void) put(2, O_CONC, cp[0]);
 #                              endif OBJ
 #                              ifdef PC
                                    (void) put(2, O_CONC, cp[0]);
 #                              endif OBJ
 #                              ifdef PC

-                                   putleaf( P2ICON , cp[0] , 0 , P2CHAR ,
+                                   putleaf( PCC_ICON , cp[0] , 0 , PCCT_CHAR ,

                                                (char *) 0 );
 #                              endif PC
                                return (nl+T1CHAR);
                                                (char *) 0 );
 #                              endif PC
                                return (nl+T1CHAR);

diff --git a/usr/src/usr.bin/pascal/src/sconv.c b/usr/src/usr.bin/pascal/src/sconv.c
index 5673386..0ded63c 100644 (file)
--- a/usr/src/usr.bin/pascal/src/sconv.c
+++ b/usr/src/usr.bin/pascal/src/sconv.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1983 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1983 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)sconv.c 2.1 %G%";
+static char sccsid[] = "@(#)sconv.c 2.2 %G%";

 #endif
 
     /*
 #endif
 
     /*


@@ -13,7 +13,7 @@ static        char sccsid[] = "@(#)sconv.c 2.1 %G%";
 #include       "whoami.h"
 #ifdef PC
 #include       "0.h"
 #include       "whoami.h"
 #ifdef PC
 #include       "0.h"

-#include       "pcops.h"
+#include       <pcc.h>

 
     /*
      * this routine enforces ``the usual arithmetic conversions''
 
     /*
      * this routine enforces ``the usual arithmetic conversions''


@@ -39,12 +39,12 @@ tuac(thistype, thattype, resulttypep, resultp2typep)
     if (isnta(thistype,"sbcid") || isnta(thattype,"sbcid")) {
        return;
     }
     if (isnta(thistype,"sbcid") || isnta(thattype,"sbcid")) {
        return;
     }

-    if (thisp2type == P2CHAR || thisp2type == P2SHORT) {
-       *resultp2typep = P2INT;
+    if (thisp2type == PCCT_CHAR || thisp2type == PCCT_SHORT) {
+       *resultp2typep = PCCT_INT;

        *resulttypep = nl + T4INT;
     }
        *resulttypep = nl + T4INT;
     }

-    if (*resultp2typep == P2INT && thatp2type == P2DOUBLE) {
-       *resultp2typep = P2DOUBLE;
+    if (*resultp2typep == PCCT_INT && thatp2type == PCCT_DOUBLE) {
+       *resultp2typep = PCCT_DOUBLE;

        *resulttypep = nl + TDOUBLE;
     }
     sconv(thisp2type, *resultp2typep);
        *resulttypep = nl + TDOUBLE;
     }
     sconv(thisp2type, *resultp2typep);


@@ -65,26 +65,26 @@ sconv(fromp2type, top2type)
 {
 
     switch (top2type) {
 {
 
     switch (top2type) {

-       case P2CHAR:
-       case P2SHORT:
-       case P2INT:
+       case PCCT_CHAR:
+       case PCCT_SHORT:
+       case PCCT_INT:

            switch (fromp2type) {
            switch (fromp2type) {

-               case P2CHAR:
-               case P2SHORT:
-               case P2INT:
-               case P2DOUBLE:
+               case PCCT_CHAR:
+               case PCCT_SHORT:
+               case PCCT_INT:
+               case PCCT_DOUBLE:

                        return; /* pass1 knows how to do these */
                default:
                        return;
            }
                        return; /* pass1 knows how to do these */
                default:
                        return;
            }

-       case P2DOUBLE:
+       case PCCT_DOUBLE:

            switch (fromp2type) {
            switch (fromp2type) {

-               case P2CHAR:
-               case P2SHORT:
-               case P2INT:
-                       putop(P2SCONV, P2DOUBLE);
+               case PCCT_CHAR:
+               case PCCT_SHORT:
+               case PCCT_INT:
+                       putop(PCC_SCONV, PCCT_DOUBLE);

                        return;
                        return;

-               case P2DOUBLE:
+               case PCCT_DOUBLE:

                        return;
                default:
                        return;
                        return;
                default:
                        return;


@@ -105,50 +105,50 @@ sconv(fromp2type, top2type)
 {
 
     switch (top2type) {
 {
 
     switch (top2type) {

-       case P2CHAR:
+       case PCCT_CHAR:

            switch (fromp2type) {
            switch (fromp2type) {

-               case P2CHAR:
+               case PCCT_CHAR:

                        return;
                        return;

-               case P2SHORT:
-               case P2INT:
-               case P2DOUBLE:
-                       putop(P2SCONV, P2CHAR);
+               case PCCT_SHORT:
+               case PCCT_INT:
+               case PCCT_DOUBLE:
+                       putop(PCC_SCONV, PCCT_CHAR);

                        return;
                default:
                        return;
            }
                        return;
                default:
                        return;
            }

-       case P2SHORT:
+       case PCCT_SHORT:

            switch (fromp2type) {
            switch (fromp2type) {

-               case P2SHORT:
+               case PCCT_SHORT:

                        return;
                        return;

-               case P2CHAR:
-               case P2INT:
-               case P2DOUBLE:
-                       putop(P2SCONV, P2SHORT);
+               case PCCT_CHAR:
+               case PCCT_INT:
+               case PCCT_DOUBLE:
+                       putop(PCC_SCONV, PCCT_SHORT);

                        return;
                default:
                        return;
            }
                        return;
                default:
                        return;
            }

-       case P2INT:
+       case PCCT_INT:

            switch (fromp2type) {
            switch (fromp2type) {

-               case P2INT:
+               case PCCT_INT:

                        return;
                        return;

-               case P2CHAR:
-               case P2SHORT:
-               case P2DOUBLE:
-                       putop(P2SCONV, P2INT);
+               case PCCT_CHAR:
+               case PCCT_SHORT:
+               case PCCT_DOUBLE:
+                       putop(PCC_SCONV, PCCT_INT);

                        return;
                default:
                        return;
            }
                        return;
                default:
                        return;
            }

-       case P2DOUBLE:
+       case PCCT_DOUBLE:

            switch (fromp2type) {
            switch (fromp2type) {

-               case P2DOUBLE:
+               case PCCT_DOUBLE:

                        return;
                        return;

-               case P2CHAR:
-               case P2SHORT:
-               case P2INT:
-                       putop(P2SCONV, P2DOUBLE);
+               case PCCT_CHAR:
+               case PCCT_SHORT:
+               case PCCT_INT:
+                       putop(PCC_SCONV, PCCT_DOUBLE);

                        return;
                default:
                        return;
                        return;
                default:
                        return;

diff --git a/usr/src/usr.bin/pascal/src/stat.c b/usr/src/usr.bin/pascal/src/stat.c
index c53f246..0609cb0 100644 (file)
--- a/usr/src/usr.bin/pascal/src/stat.c
+++ b/usr/src/usr.bin/pascal/src/stat.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)stat.c 2.1 %G%";
+static char sccsid[] = "@(#)stat.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -9,7 +9,7 @@ static char sccsid[] = "@(#)stat.c 2.1 %G%";
 #include "tree.h"
 #include "objfmt.h"
 #ifdef PC
 #include "tree.h"
 #include "objfmt.h"
 #ifdef PC

-#   include "pcops.h"
+#   include <pcc.h>

 #   include "pc.h"
 #endif PC
 #include "tmps.h"
 #   include "pc.h"
 #endif PC
 #include "tmps.h"


@@ -177,9 +177,9 @@ inccnt( counter )
            (void) put(2, O_COUNT, counter );
 #      endif OBJ
 #      ifdef PC
            (void) put(2, O_COUNT, counter );
 #      endif OBJ
 #      ifdef PC

-           putRV( PCPCOUNT , 0 , counter * sizeof (long) , NGLOBAL , P2INT );
-           putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-           putop( P2ASG P2PLUS , P2INT );
+           putRV( PCPCOUNT , 0 , counter * sizeof (long) , NGLOBAL , PCCT_INT );
+           putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+           putop( PCCOM_ASG PCC_PLUS , PCCT_INT );

            putdot( filename , line );
 #      endif PC
     }
            putdot( filename , line );
 #      endif PC
     }


@@ -206,14 +206,14 @@ putline()
            }
            if ( opt( 'p' ) ) {
                if ( opt('t') ) {
            }
            if ( opt( 'p' ) ) {
                if ( opt('t') ) {

-                   putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR )
+                   putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR )

                            , "_LINO" );
                            , "_LINO" );

-                   putop( P2UNARY P2CALL , P2INT );
+                   putop( PCCOM_UNARY PCC_CALL , PCCT_INT );

                    putdot( filename , line );
                } else {
                    putdot( filename , line );
                } else {

-                   putRV( STMTCOUNT , 0 , 0 , NGLOBAL , P2INT );
-                   putleaf( P2ICON , 1 , 0 , P2INT , (char *) 0 );
-                   putop( P2ASG P2PLUS , P2INT );
+                   putRV( STMTCOUNT , 0 , 0 , NGLOBAL , PCCT_INT );
+                   putleaf( PCC_ICON , 1 , 0 , PCCT_INT , (char *) 0 );
+                   putop( PCCOM_ASG PCC_PLUS , PCCT_INT );

                    putdot( filename , line );
                }
            }
                    putdot( filename , line );
                }
            }


@@ -250,7 +250,7 @@ withop(s)
 #              endif OBJ
 #              ifdef PC
                    putRV( (char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,
 #              endif OBJ
 #              ifdef PC
                    putRV( (char *) 0 , cbn , tempnlp -> value[ NL_OFFS ] ,

-                           tempnlp -> extra_flags , P2PTR|P2STRTY );
+                           tempnlp -> extra_flags , PCCTM_PTR|PCCT_STRTY );

 #              endif PC
                r = lvalue(p->list_node.list, MOD , LREQ );
                if (r == NLNIL)
 #              endif PC
                r = lvalue(p->list_node.list, MOD , LREQ );
                if (r == NLNIL)


@@ -269,7 +269,7 @@ withop(s)
                    (void) put(1, PTR_AS);
 #              endif OBJ
 #              ifdef PC
                    (void) put(1, PTR_AS);
 #              endif OBJ
 #              ifdef PC

-                   putop( P2ASSIGN , P2PTR|P2STRTY );
+                   putop( PCC_ASSIGN , PCCTM_PTR|PCCT_STRTY );

                    putdot( filename , line );
 #              endif PC
        }
                    putdot( filename , line );
 #              endif PC
        }


@@ -477,20 +477,20 @@ asgnop1(r, p)
                    case TSCAL:
                            postcheck(p, p1);
                            sconv(p2type(p1), p2type(p));
                    case TSCAL:
                            postcheck(p, p1);
                            sconv(p2type(p1), p2type(p));

-                           putop( P2ASSIGN , p2type( p ) );
+                           putop( PCC_ASSIGN , p2type( p ) );

                            putdot( filename , line );
                            break;
                    case TPTR:
                            putdot( filename , line );
                            break;
                    case TPTR:

-                           putop( P2ASSIGN , p2type( p ) );
+                           putop( PCC_ASSIGN , p2type( p ) );

                            putdot( filename , line );
                            break;
                    case TDOUBLE:
                            sconv(p2type(p1), p2type(p));
                            putdot( filename , line );
                            break;
                    case TDOUBLE:
                            sconv(p2type(p1), p2type(p));

-                           putop( P2ASSIGN , p2type( p ) );
+                           putop( PCC_ASSIGN , p2type( p ) );

                            putdot( filename , line );
                            break;
                    default:
                            putdot( filename , line );
                            break;
                    default:

-                           putstrop(P2STASG, ADDTYPE(p2type(p), P2PTR),
+                           putstrop(PCC_STASG, PCCM_ADDTYPE(p2type(p), PCCTM_PTR),

                                        (int) lwidth(p), align(p));
                            putdot( filename , line );
                            break;
                                        (int) lwidth(p), align(p));
                            putdot( filename , line );
                            break;


@@ -514,14 +514,14 @@ pcasgconf(r, p)
 
        if (r == (ASG_NODE *) TR_NIL || p == NLNIL)
                return NLNIL;
 
        if (r == (ASG_NODE *) TR_NIL || p == NLNIL)
                return NLNIL;

-       putleaf( P2ICON , 0 , 0 , ADDTYPE( P2FTN | P2INT , P2PTR) , "_blkcpy" );
+       putleaf( PCC_ICON , 0 , 0 , PCCM_ADDTYPE( PCCTM_FTN | PCCT_INT , PCCTM_PTR) , "_blkcpy" );

        p1 = rvalue( r->rhs_expr , p , LREQ );
        if (p1 == NLNIL)
                return NLNIL;
        p = lvalue( r->lhs_var , MOD|ASGN|NOUSE , LREQ );
        if (p == NLNIL)
                return NLNIL;
        p1 = rvalue( r->rhs_expr , p , LREQ );
        if (p1 == NLNIL)
                return NLNIL;
        p = lvalue( r->lhs_var , MOD|ASGN|NOUSE , LREQ );
        if (p == NLNIL)
                return NLNIL;

-       putop(P2LISTOP, P2INT);
+       putop(PCC_CM, PCCT_INT);

                /* upper bound */
        p1 = p->chain->nptr[1];
        putRV(p1->symbol, (p1->nl_block & 037), p1->value[0],
                /* upper bound */
        p1 = p->chain->nptr[1];
        putRV(p1->symbol, (p1->nl_block & 037), p1->value[0],


@@ -530,17 +530,17 @@ pcasgconf(r, p)
        p1 = p->chain->nptr[0];
        putRV(p1->symbol, (p1->nl_block & 037), p1->value[0],
            p1->extra_flags, p2type( p1 ) );
        p1 = p->chain->nptr[0];
        putRV(p1->symbol, (p1->nl_block & 037), p1->value[0],
            p1->extra_flags, p2type( p1 ) );

-       putop( P2MINUS, P2INT );
+       putop( PCC_MINUS, PCCT_INT );

                /* add one */
                /* add one */

-       putleaf(P2ICON, 1, 0, P2INT, 0);
-       putop( P2PLUS, P2INT );
+       putleaf(PCC_ICON, 1, 0, PCCT_INT, 0);
+       putop( PCC_PLUS, PCCT_INT );

                /* and multiply by the width */
        p1 = p->chain->nptr[2];
        putRV(p1->symbol, (p1->nl_block & 037), p1->value[0],
            p1->extra_flags, p2type( p1 ) );
                /* and multiply by the width */
        p1 = p->chain->nptr[2];
        putRV(p1->symbol, (p1->nl_block & 037), p1->value[0],
            p1->extra_flags, p2type( p1 ) );

-       putop( P2MUL , P2INT );
-       putop(P2LISTOP, P2INT);
-       putop(P2CALL, P2INT);
+       putop( PCC_MUL , PCCT_INT );
+       putop(PCC_CM, PCCT_INT);
+       putop(PCC_CALL, PCCT_INT);

        putdot( filename , line);
        return p;
 }
        putdot( filename , line);
        return p;
 }


@@ -580,8 +580,8 @@ ifop(if_n)
 #      endif OBJ
 #      ifdef PC
            l1 = (int) getlab();
 #      endif OBJ
 #      ifdef PC
            l1 = (int) getlab();

-           putleaf( P2ICON , l1 , 0 , P2INT , (char *) 0 );
-           putop( P2CBRANCH , P2INT );
+           putleaf( PCC_ICON , l1 , 0 , PCCT_INT , (char *) 0 );
+           putop( PCC_CBRANCH , PCCT_INT );

            putdot( filename , line );
 #      endif PC
        putcnt();
            putdot( filename , line );
 #      endif PC
        putcnt();


@@ -644,8 +644,8 @@ whilop(w_node)
            (void) put(2, O_IF, l2);
 #      endif OBJ
 #      ifdef PC
            (void) put(2, O_IF, l2);
 #      endif OBJ
 #      ifdef PC

-           putleaf( P2ICON , (int) l2 , 0 , P2INT , (char *) 0 );
-           putop( P2CBRANCH , P2INT );
+           putleaf( PCC_ICON , (int) l2 , 0 , PCCT_INT , (char *) 0 );
+           putop( PCC_CBRANCH , PCCT_INT );

            putdot( filename , line );
 #      endif PC
        putcnt();
            putdot( filename , line );
 #      endif PC
        putcnt();


@@ -687,8 +687,8 @@ repop(r)
            (void) put(2, O_IF, l);
 #      endif OBJ
 #      ifdef PC
            (void) put(2, O_IF, l);
 #      endif OBJ
 #      ifdef PC

-           putleaf( P2ICON , l , 0 , P2INT , (char *) 0 );
-           putop( P2CBRANCH , P2INT );
+           putleaf( PCC_ICON , l , 0 , PCCT_INT , (char *) 0 );
+           putop( PCC_CBRANCH , PCCT_INT );

            putdot( filename , line );
 #      endif PC
        if (goc != gocnt)
            putdot( filename , line );
 #      endif PC
        if (goc != gocnt)

diff --git a/usr/src/usr.bin/pascal/src/stkrval.c b/usr/src/usr.bin/pascal/src/stkrval.c
index 79d5cf4..303f864 100644 (file)
--- a/usr/src/usr.bin/pascal/src/stkrval.c
+++ b/usr/src/usr.bin/pascal/src/stkrval.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)stkrval.c 2.1 %G%";
+static char sccsid[] = "@(#)stkrval.c 2.2 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -10,7 +10,7 @@ static char sccsid[] = "@(#)stkrval.c 2.1 %G%";
 #include "opcode.h"
 #include "objfmt.h"
 #ifdef PC
 #include "opcode.h"
 #include "objfmt.h"
 #ifdef PC

-#   include "pcops.h"
+#   include <pcc.h>

 #endif PC
 #include "tree_ty.h"
 
 #endif PC
 #include "tree_ty.h"
 


@@ -62,7 +62,7 @@ stkrval(r, contype , required )
                    (void) put(2, O_CON14, 0);
 #              endif OBJ
 #              ifdef PC
                    (void) put(2, O_CON14, 0);
 #              endif OBJ
 #              ifdef PC

-                   putleaf( P2ICON , 0 , 0 , P2INT , (char *) 0 );
+                   putleaf( PCC_ICON , 0 , 0 , PCCT_INT , (char *) 0 );

 #              endif PC
                return (nl+TNIL);
 
 #              endif PC
                return (nl+TNIL);
 


@@ -92,7 +92,7 @@ stkrval(r, contype , required )
 #                      ifdef PC
                            q = rvalue( r , contype , (int) required );
                            if (isa(q, "sbci")) {
 #                      ifdef PC
                            q = rvalue( r , contype , (int) required );
                            if (isa(q, "sbci")) {

-                               sconv(p2type(q),P2INT);
+                               sconv(p2type(q),PCCT_INT);

                            }
                            return q;
 #                      endif PC
                            }
                            return q;
 #                      endif PC


@@ -132,9 +132,9 @@ ind:
 #                      endif OBJ
 #                      ifdef PC
                            if ( required == RREQ ) {
 #                      endif OBJ
 #                      ifdef PC
                            if ( required == RREQ ) {

-                               putop( P2UNARY P2MUL , p2type( q ) );
+                               putop( PCCOM_UNARY PCC_MUL , p2type( q ) );

                                if (isa(q,"sbci")) {
                                if (isa(q,"sbci")) {

-                                   sconv(p2type(q),P2INT);
+                                   sconv(p2type(q),PCCT_INT);

                                }
                            }
                            return q;
                                }
                            }
                            return q;


@@ -188,7 +188,7 @@ cstrng:
                                (void) put(2, O_CONC4, (int)p->value[0]);
 #                          endif OBJ
 #                          ifdef PC
                                (void) put(2, O_CONC4, (int)p->value[0]);
 #                          endif OBJ
 #                          ifdef PC

-                               putleaf(P2ICON, p -> value[0], 0, P2INT, 
+                               putleaf(PCC_ICON, p -> value[0], 0, PCCT_INT, 

                                                (char *) 0);
 #                          endif PC
                            return(q);
                                                (char *) 0);
 #                          endif PC
                            return(q);


@@ -228,7 +228,7 @@ cstrng:
 #                      ifdef PC
                            q = rvalue( r , contype , (int) required );
                            if (isa(q,"sbci")) {
 #                      ifdef PC
                            q = rvalue( r , contype , (int) required );
                            if (isa(q,"sbci")) {

-                               sconv(p2type(q),P2INT);
+                               sconv(p2type(q),PCCT_INT);

                            }
                            return q;
 #                      endif PC
                            }
                            return q;
 #                      endif PC


@@ -267,7 +267,7 @@ cstrng:
 #                      ifdef PC
                            p = pcfunccod( r );
                            if (isa(p,"sbci")) {
 #                      ifdef PC
                            p = pcfunccod( r );
                            if (isa(p,"sbci")) {

-                               sconv(p2type(p),P2INT);
+                               sconv(p2type(p),PCCT_INT);

                            }
 #                      endif PC
                        return (p);
                            }
 #                      endif PC
                        return (p);


@@ -308,7 +308,7 @@ cstrng:
 #              endif OBJ
 #              ifdef PC
                    if (isa(p,"sbci")) {
 #              endif OBJ
 #              ifdef PC
                    if (isa(p,"sbci")) {

-                       sconv(p2type(p),P2INT);
+                       sconv(p2type(p),PCCT_INT);

                    }
 #              endif PC
                return (p);
                    }
 #              endif PC
                return (p);


@@ -345,7 +345,7 @@ conint:
                                (void) put(2, O_CON24, (short)l);
 #                          endif OBJ
 #                          ifdef PC
                                (void) put(2, O_CON24, (short)l);
 #                          endif OBJ
 #                          ifdef PC

-                               putleaf( P2ICON , (short) l , 0 , P2INT , 
+                               putleaf( PCC_ICON , (short) l , 0 , PCCT_INT , 

                                                (char *) 0 );
 #                          endif PC
                                return(nl+T4INT);
                                                (char *) 0 );
 #                          endif PC
                                return(nl+T4INT);


@@ -354,7 +354,7 @@ conint:
                            (void) put(2, O_CON4, l); 
 #                      endif OBJ
 #                      ifdef PC
                            (void) put(2, O_CON4, l); 
 #                      endif OBJ
 #                      ifdef PC

-                           putleaf( P2ICON , (int) l , 0 , P2INT , (char *) 0 );
+                           putleaf( PCC_ICON , (int) l , 0 , PCCT_INT , (char *) 0 );

 #                      endif PC
                        return (nl+T4INT);
        
 #                      endif PC
                        return (nl+T4INT);
        


@@ -382,7 +382,7 @@ conint:
                                    (void) put(2, O_CONC4, cp[0]);
 #                              endif OBJ
 #                              ifdef PC
                                    (void) put(2, O_CONC4, cp[0]);
 #                              endif OBJ
 #                              ifdef PC

-                                   putleaf( P2ICON , cp[0] , 0 , P2INT , 
+                                   putleaf( PCC_ICON , cp[0] , 0 , PCCT_INT , 

                                                (char *) 0 );
 #                              endif PC
                                return(nl+T1CHAR);
                                                (char *) 0 );
 #                              endif PC
                                return(nl+T1CHAR);

diff --git a/usr/src/usr.bin/pascal/src/var.c b/usr/src/usr.bin/pascal/src/var.c
index 5ace62d..a96ca9a 100644 (file)
--- a/usr/src/usr.bin/pascal/src/var.c
+++ b/usr/src/usr.bin/pascal/src/var.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)var.c 2.2 %G%";
+static char sccsid[] = "@(#)var.c 2.3 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -11,7 +11,6 @@ static char sccsid[] = "@(#)var.c 2.2 %G%";
 #include "iorec.h"
 #ifdef PC
 #   include    "pc.h"
 #include "iorec.h"
 #ifdef PC
 #   include    "pc.h"

-#   include    "pcops.h"

 #endif PC
 #include "tmps.h"
 #include "tree_ty.h"
 #endif PC
 #include "tmps.h"
 #include "tree_ty.h"