onyx optimizations

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

diff --git a/usr/src/usr.bin/pascal/px/interp.c b/usr/src/usr.bin/pascal/px/interp.c
index 91ee708..76932f0 100644 (file)
--- a/usr/src/usr.bin/pascal/px/interp.c
+++ b/usr/src/usr.bin/pascal/px/interp.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)interp.c 1.9 %G%";
+static char sccsid[] = "@(#)interp.c 1.10 %G%";

 
 #include <math.h>
 #include "whoami.h"
 
 #include <math.h>
 #include "whoami.h"


@@ -1292,47 +1292,31 @@ interpreter(base)
                        push2((short)(TEOLN(popaddr())));
                        continue;
                case O_WRITEC:
                        push2((short)(TEOLN(popaddr())));
                        continue;
                case O_WRITEC:

-                       pc.cp++;

                        if (_runtst) {
                                WRITEC(curfile);
                        if (_runtst) {
                                WRITEC(curfile);

-                               popsp((long)(sizeof(long)+sizeof(FILE *)));
+                               popsp((long)(*pc.cp++));

                                continue;
                        }
                                continue;
                        }

-#ifdef VAX

                        fputc();
                        fputc();

-#else
-                       WRITEC(curfile);
-#endif VAX
-                       popsp((long)(sizeof(long)+sizeof(FILE *)));
+                       popsp((long)(*pc.cp++));

                        continue;
                case O_WRITES:
                        continue;
                case O_WRITES:

-                       pc.cp++;

                        if (_runtst) {
                                WRITES(curfile);
                        if (_runtst) {
                                WRITES(curfile);

-                               popsp((long)(2*sizeof(char *)+2*sizeof(long)));
+                               popsp((long)(*pc.cp++));

                                continue;
                        }
                                continue;
                        }

-#ifdef VAX

                        fwrite();
                        fwrite();

-#else
-                       WRITES(curfile);
-#endif VAX
-                       popsp((long)(2*sizeof(char *)+2*sizeof(long)));
+                       popsp((long)(*pc.cp++));

                        continue;
                case O_WRITEF:
                        if (_runtst) {
                                WRITEF(curfile);
                        continue;
                case O_WRITEF:
                        if (_runtst) {
                                WRITEF(curfile);

-                               popsp((long)(((*pc.cp++ - 2) * sizeof(long)) +
-                                       2 * sizeof(char *)));
+                               popsp((long)(*pc.cp++));

                                continue;
                        }
                                continue;
                        }

-#ifdef VAX

                        fprintf();
                        fprintf();

-#else
-                       WRITEF(curfile);
-#endif VAX
-                       popsp((long)(((*pc.cp++ - 2) * sizeof(long)) +
-                               2 * sizeof(char *)));
+                       popsp((long)(*pc.cp++));

                        continue;
                case O_WRITLN:
                        pc.cp++;
                        continue;
                case O_WRITLN:
                        pc.cp++;