BSD 3 development

[unix-history] / usr / src / cmd / f77 / put.c

diff --git a/usr/src/cmd/f77/put.c b/usr/src/cmd/f77/put.c
index bb92269..00d91fb 100644 (file)
--- a/usr/src/cmd/f77/put.c
+++ b/usr/src/cmd/f77/put.c
@@ -5,8 +5,8 @@
 
 #include "defs"
 
 
 #include "defs"
 

-#if FAMILY == SCJ
-#      include "scjdefs"
+#if FAMILY == PCC
+#      include "pccdefs"

 #else
 #      include "dmrdefs"
 #endif
 #else
 #      include "dmrdefs"
 #endif


@@ -52,6 +52,8 @@ int types2 [ ] =
 setlog()
 {
 types2[TYLOGICAL] = types2[tylogical];
 setlog()
 {
 types2[TYLOGICAL] = types2[tylogical];

+typesize[TYLOGICAL] = typesize[tylogical];
+typealign[TYLOGICAL] = typealign[tylogical];

 }
 
 
 }
 
 


@@ -97,10 +99,10 @@ putx( fixexpr( mkexpr(OPSTAREQ, cpexpr(a), cpexpr(b)) ));
 
 
 
 
 
 

-struct addrblock *realpart(p)
-register struct addrblock *p;
+struct Addrblock *realpart(p)
+register struct Addrblock *p;

 {
 {

-register struct addrblock *q;
+register struct Addrblock *q;

 
 q = cpexpr(p);
 if( ISCOMPLEX(p->vtype) )
 
 q = cpexpr(p);
 if( ISCOMPLEX(p->vtype) )


@@ -111,11 +113,11 @@ return(q);
 
 
 
 
 
 

-struct addrblock *imagpart(p)
-register struct addrblock *p;
+struct Addrblock *imagpart(p)
+register struct Addrblock *p;

 {
 {

-register struct addrblock *q;
-struct constblock *mkrealcon();
+register struct Addrblock *q;
+struct Constblock *mkrealcon();

 
 if( ISCOMPLEX(p->vtype) )
        {
 
 if( ISCOMPLEX(p->vtype) )
        {


@@ -128,18 +130,18 @@ else
 return(q);
 }
 \f
 return(q);
 }
 \f

-struct addrblock *putconst(p)
-register struct constblock *p;
+struct Addrblock *putconst(p)
+register struct Constblock *p;

 {
 {

-register struct addrblock *q;
-struct literal *litp, *lastlit;
+register struct Addrblock *q;
+struct Literal *litp, *lastlit;

 int i, k, type;
 int litflavor;
 
 int i, k, type;
 int litflavor;
 

-if( ! ISCONST(p) )
-       fatal1("putconst: bad tag %d", p->tag);
+if( p->tag != TCONST )
+       fatali("putconst: bad tag %d", p->tag);

 
 

-q = ALLOC(addrblock);
+q = ALLOC(Addrblock);

 q->tag = TADDR;
 type = p->vtype;
 q->vtype = ( type==TYADDR ? TYINT : type );
 q->tag = TADDR;
 type = p->vtype;
 q->vtype = ( type==TYADDR ? TYINT : type );


@@ -153,7 +155,7 @@ q->memoffset = ICON(0);
 switch(type = p->vtype)
        {
        case TYCHAR:
 switch(type = p->vtype)
        {
        case TYCHAR:

-               if(p->vleng->const.ci > XL)
+               if(p->vleng->constblock.const.ci > XL)

                        break;  /* too long for literal table */
                litflavor = 1;
                goto loop;
                        break;  /* too long for literal table */
                litflavor = 1;
                goto loop;


@@ -175,9 +177,9 @@ switch(type = p->vtype)
                        if(type == litp->littype) switch(litflavor)
                                {
                        case 1:
                        if(type == litp->littype) switch(litflavor)
                                {
                        case 1:

-                               if(p->vleng->const.ci != litp->litval.litcval.litclen)
+                               if(p->vleng->constblock.const.ci != litp->litval.litcval.litclen)

                                        break;
                                        break;

-                               if(! eqn( (int) p->vleng->const.ci, p->const.ccp,
+                               if(! eqn( (int) p->vleng->constblock.const.ci, p->const.ccp,

                                        litp->litval.litcval.litcstr) )
                                                break;
 
                                        litp->litval.litcval.litcstr) )
                                                break;
 


@@ -204,7 +206,8 @@ switch(type = p->vtype)
                        switch(litflavor)
                                {
                                case 1:
                        switch(litflavor)
                                {
                                case 1:

-                                       litp->litval.litcval.litclen = p->vleng->const.ci;
+                                       litp->litval.litcval.litclen =
+                                               p->vleng->constblock.const.ci;

                                        cpn( (int) litp->litval.litcval.litclen,
                                                p->const.ccp,
                                                litp->litval.litcval.litcstr);
                                        cpn( (int) litp->litval.litcval.litclen,
                                                p->const.ccp,
                                                litp->litval.litcval.litcstr);


@@ -252,7 +255,7 @@ switch(type)
                break;
 
        case TYCHAR:
                break;
 
        case TYCHAR:

-               putstr(asmfile, p->const.ccp, p->vleng->const.ci);
+               putstr(asmfile, p->const.ccp, p->vleng->constblock.const.ci);

                break;
 
        case TYADDR:
                break;
 
        case TYADDR:


@@ -260,7 +263,7 @@ switch(type)
                break;
 
        default:
                break;
 
        default:

-               fatal1("putconst: bad type %d", p->vtype);
+               fatali("putconst: bad type %d", p->vtype);

        }
 
 frexpr(p);
        }
 
 frexpr(p);