X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/2b84abb596f52ab2068d52108adc96838ad4340a..31cef89cb428866f787983e68246030321893df4:/usr/src/cmd/lisp/fex3.c

diff --git a/usr/src/cmd/lisp/fex3.c b/usr/src/cmd/lisp/fex3.c
index d620883204..b01f7b33fa 100644
--- a/usr/src/cmd/lisp/fex3.c
+++ b/usr/src/cmd/lisp/fex3.c
@@ -1,11 +1,18 @@
+static char *sccsid = "@(#)fex3.c	34.2 10/13/80";
+
 #include "global.h"
+#include <vadvise.h>
 
 /* chkarg ***************************************************************/
 /* This insures that there are at least expnum arguments passed to the	*/
 /* BCD function that calls this.  If there are fewer, nil arguments	*/
 /* are pushed onto the name stack and np adjusted accordingly.		*/
-chkarg(expnum)
+#ifdef chkarg
+#undef chkarg
+#endif
+chkarg(expnum,string)
 int	expnum;			/* expected number of args	*/
+char string[];
 {
 	register struct argent *work;
 	register r10,r9,r8;
@@ -14,14 +21,13 @@ int	expnum;			/* expected number of args	*/
 
 	for(work = np,np = lbot + expnum; work < np; )
 		work++->val = nil;
-		
 }
 
 
 /*
  *Ndumplisp -- create executable version of current state of this lisp.
  */
-#include <a.out.h>
+#include "a.out.h"
 
 asm("	.globl	Dlast")
 lispval
@@ -33,11 +39,17 @@ Ndumplisp()
 	extern lispval reborn;
 	struct exec work, old;
 	extern etext;
-	extern int dmpmode;
+	extern int dmpmode,holend,curhbeg,usehole;
+	extern int end;
 	int descrip, des2, count, ax,mode;
 	char tbuf[BUFSIZ];
 	snpand(4);
 
+
+#ifndef UNIXTS
+	vadvise(VA_ANOM);
+#endif
+
 	/* dump mode is kept in decimal (which looks like octal in dmpmode)
 	   and is changeable via (sstatus dumpmode n) where n is 413 or 410
 	   base 10		
@@ -47,8 +59,15 @@ Ndumplisp()
 
 	workp = &work;
 	workp->a_magic	= mode;
-	workp->a_text	= ((((unsigned) (&etext)) - 1) & (~PAGRND)) + PAGSIZ;
+	if(usehole)
+		workp->a_text = curhbeg & (~PAGRND);
+	else
+	workp->a_text	= ((((unsigned) (&holend)) - 1) & (~PAGRND)) + PAGSIZ;
+#ifndef VMS
 	workp->a_data	= (unsigned) sbrk(0) - workp->a_text;
+#else
+	workp->a_data   = ((int)&end) - workp->a_text;
+#endif
 	workp->a_bss	= 0;
 	workp->a_syms	= 0;
 	workp->a_entry	= (unsigned) gstart();
@@ -59,9 +78,9 @@ Ndumplisp()
 	reborn = CNIL;
 	argptr = lbot->val;
 	if (argptr != nil) {
-		temp = argptr->car;
+		temp = argptr->d.car;
 		if((TYPE(temp))==ATOM)
-			fname = temp->pname;
+			fname = temp->a.pname;
 	}
 	des2 = open(gstab(),0);
 	if(des2 >= 0) {
@@ -101,6 +120,114 @@ Ndumplisp()
 	close(descrip);
 	if(des2>0) close(des2);
 	reborn = 0;
+
+#ifndef UNIXTS
+	vadvise(VA_NORM);
+#endif
+	return(nil);
+}
+
+lispval
+Nndumplisp()
+{
+	register struct exec *workp;
+	register lispval argptr, temp;
+	register char *fname;
+	extern lispval reborn;
+	struct exec work, old;
+	extern etext;
+	extern int dmpmode,holend,curhbeg,usehole;
+	int descrip, des2, count, ax,mode;
+	char tbuf[BUFSIZ];
+	snpand(4);
+
+
+#ifndef UNIXTS
+	vadvise(VA_ANOM);
+#endif
+
+	/* dump mode is kept in decimal (which looks like octal in dmpmode)
+	   and is changeable via (sstatus dumpmode n) where n is 413 or 410
+	   base 10		
+	*/
+	if(dmpmode == 413) mode = 0413;
+	else mode = 0410;
+
+	workp = &work;
+	workp->a_magic	= mode;
+	if(usehole)
+		workp->a_text = curhbeg & (~PAGRND);
+	else
+	workp->a_text	= ((((unsigned) (&holend)) - 1) & (~PAGRND)) + PAGSIZ;
+	workp->a_data	= (unsigned) sbrk(0) - workp->a_text;
+	workp->a_bss	= 0;
+	workp->a_syms	= 0;
+	workp->a_entry	= (unsigned) gstart();
+	workp->a_trsize	= 0;
+	workp->a_drsize	= 0;
+
+	fname = "savedlisp"; /*set defaults*/
+	reborn = CNIL;
+	argptr = lbot->val;
+	if (argptr != nil) {
+		temp = argptr->d.car;
+		if((TYPE(temp))==ATOM)
+			fname = temp->a.pname;
+	}
+	des2 = open(gstab(),0);
+	if(des2 >= 0) {
+		if(read(des2,&old,sizeof(old))>=0)
+			work.a_syms = old.a_syms;
+	}
+	descrip=creat(fname,0777); /*doit!*/
+	if(-1==write(descrip,workp,sizeof(work)))
+	{
+		close(descrip);
+		error("Dumplisp failed",FALSE);
+	}
+	if(mode == 0413) lseek(descrip,PAGSIZ,0); 
+	if( -1==write(descrip,0,workp->a_text)    ||
+	    -1==write(descrip,workp->a_text,workp->a_data) ) {
+		close(descrip);
+		error("Dumplisp failed",FALSE);
+	}
+	if(des2>0  && work.a_syms) {
+		count = old.a_text + old.a_data + (old.a_magic == 0413 ? PAGSIZ 
+							       : sizeof(old));
+		if(-1==lseek(des2,count,0))
+			error("Could not seek to stab",FALSE);
+		for(count = old.a_syms;count > 0; count -=BUFSIZ) {
+			ax = read(des2,tbuf,(count < BUFSIZ ? count : BUFSIZ));
+			if(ax==0) {
+				printf("Unexpected end of syms",count);
+				fflush(stdout);
+				break;
+			} else if(ax >  0)
+				write(descrip,tbuf,ax);
+			else 
+				error("Failure to write dumplisp stab",FALSE);
+		}
+		if(-1 == lseek(des2,
+			(old.a_magic == 0413 ? PAGSIZ : sizeof(old))
+			+ old.a_text + old.a_data
+				+ old.a_trsize + old.a_drsize + old.a_syms,
+			       0))
+			error(" Could not seek to string table ",FALSE);
+		for( ax = 1 ; ax > 0;) {
+		     ax = read(des2,tbuf,BUFSIZ);
+		     if(ax > 0)
+			 write(descrip,tbuf,ax);
+		     else if (ax < 0)
+			 error("Error in string table read ",FALSE);
+		}
+	}
+	close(descrip);
+	if(des2>0) close(des2);
+	reborn = 0;
+
+#ifndef UNIXTS
+	vadvise(VA_NORM);
+#endif
 	return(nil);
 }
 lispval
@@ -119,9 +246,9 @@ Nfunction()
 	register lispval handy;
 
 	snpand(1);
-	handy = lbot->val->car;
-	if(TYPE(handy)==ATOM && handy->fnbnd!=nil)
-		return(handy->fnbnd);
+	handy = lbot->val->d.car;
+	if(TYPE(handy)==ATOM && handy->a.fnbnd!=nil)
+		return(handy->a.fnbnd);
 	else
 		return(handy);
 }