BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / pascal / src / call.c

diff --git a/usr/src/usr.bin/pascal/src/call.c b/usr/src/usr.bin/pascal/src/call.c
index 9f917ec..cde1355 100644 (file)
--- a/usr/src/usr.bin/pascal/src/call.c
+++ b/usr/src/usr.bin/pascal/src/call.c
@@ -1,18 +1,46 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1980 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)call.c     5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)call.c     5.4 (Berkeley) 4/16/91";
+#endif /* not lint */

 
 #include "whoami.h"
 #include "0.h"
 #include "tree.h"
 #include "opcode.h"
 #include "objfmt.h"
 
 #include "whoami.h"
 #include "0.h"
 #include "tree.h"
 #include "opcode.h"
 #include "objfmt.h"

+#include "align.h"

 #ifdef PC
 #   include "pc.h"
 #   include <pcc.h>
 #ifdef PC
 #   include "pc.h"
 #   include <pcc.h>


@@ -99,7 +127,8 @@ call(p, argv_node, porf, psbn)
                     * Push some space
                     * for the function return type
                     */
                     * Push some space
                     * for the function return type
                     */

-                   (void) put(2, O_PUSH, leven(-lwidth(p->type)));
+                   (void) put(2, O_PUSH,
+                       -roundup(lwidth(p->type), (long) A_STACK));

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


@@ -447,7 +476,7 @@ conf_err:                       if (p1->chain->type->class == CRANGE) {
                (void) put(2, O_LV | cbn << 8 + INDX ,
                        (int) savedispnp -> value[ NL_OFFS ] );
                (void) put(1, O_FCALL);
                (void) put(2, O_LV | cbn << 8 + INDX ,
                        (int) savedispnp -> value[ NL_OFFS ] );
                (void) put(1, O_FCALL);

-               (void) put(2, O_FRTN, even(width(p->type)));
+               (void) put(2, O_FRTN, roundup(width(p->type), (long) A_STACK));

            } else {
                (void) put(2, O_CALL | psbn << 8, (long)p->value[NL_ENTLOC]);
            }
            } else {
                (void) put(2, O_CALL | psbn << 8, (long)p->value[NL_ENTLOC]);
            }