4.4BSD snapshot (revision 8.1); add 1993 to copyright

[unix-history] / usr / src / usr.bin / pascal / pdx / process / pxinfo.h

diff --git a/usr/src/usr.bin/pascal/pdx/process/pxinfo.h b/usr/src/usr.bin/pascal/pdx/process/pxinfo.h
index b84b615..46b6b3a 100644 (file)
--- a/usr/src/usr.bin/pascal/pdx/process/pxinfo.h
+++ b/usr/src/usr.bin/pascal/pdx/process/pxinfo.h
@@ -1,6 +1,11 @@
-/* Copyright (c) 1982 Regents of the University of California */
-
-/* static char sccsid[] = "@(#)pxinfo.h 1.2 %G%"; */
+/*-
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)pxinfo.h    8.1 (Berkeley) %G%
+ */

 
 /*
  * This is the information we get after the initial trap that px does.
 
 /*
  * This is the information we get after the initial trap that px does.


@@ -11,24 +16,40 @@
  *     address of the display pointer
  *     address of the beginning of the object code
  *
  *     address of the display pointer
  *     address of the beginning of the object code
  *

- *     the address of a variable containing the address of the first local
- *             variable in the interpreter procedure
- *             (this is used to find the frame where the pc is)
- *     the address of the main interpreter loop
+ *     the address of the program counter used in the interpreter procedure
+ *             (px actually keeps the pc in a register if it can, but stores
+ *              it in this location each time around the interpreter loop.)
+ *     the address of the main interpreter loop (past the store of pc)

  */
 
  */
 

+#ifdef tahoe
+typedef struct {
+       short trp_savemask;
+       short trp_removed;
+       int trp_oldfp;
+       ADDRESS *disp;
+       ADDRESS *dp;
+       ADDRESS objstart;
+       ADDRESS pcaddr;
+       ADDRESS loopaddr;
+} TRAPARGS;
+#else

 typedef struct {
        int nargs;
        ADDRESS *disp;
        ADDRESS *dp;
        ADDRESS objstart;
 typedef struct {
        int nargs;
        ADDRESS *disp;
        ADDRESS *dp;
        ADDRESS objstart;

-       ADDRESS pcaddrp;
+       ADDRESS pcaddr;

        ADDRESS loopaddr;
 } TRAPARGS;
        ADDRESS loopaddr;
 } TRAPARGS;

+#endif

 
 ADDRESS *DISPLAY;
 ADDRESS *DP;
 ADDRESS ENDOFF;
 
 ADDRESS *DISPLAY;
 ADDRESS *DP;
 ADDRESS ENDOFF;

-ADDRESS PCADDRP;
+ADDRESS PCADDR;

 ADDRESS LOOPADDR;
 ADDRESS LOOPADDR;

-ADDRESS *pcframe;
+#ifdef tahoe
+ADDRESS RETLOC;
+ADDRESS INTFP;
+#endif