fixup commit for branch 'hs'

now also takes an argument instead of stdin.
EM_BSIZE is now compulsory again.
Constants EM_?SIZE are passed on to cg with a T prepended (T for target)

first/local.h.src

@@ -1,7 +0,0 @@
-/* collection of options, selected by including or excluding 'defines' */
-
-/* Version number of the EM object code */
-#	define	VERSION		3	/* 16 bits number */
-
-/* The default machine used by ack, acc, apc */
-#	define	ACKM		"pdp"

mach/m68k2/cg/mach.c

@@ -1,274 +0,0 @@
-#ifndef NORCSID
-static char rcsid[] = "$Header$";
-#endif
-
-/*
- * (c) copyright 1983 by the Vrije Universiteit, Amsterdam, The Netherlands.
- *
- *          This product is part of the Amsterdam Compiler Kit.
- *
- * Permission to use, sell, duplicate or disclose this software must be
- * obtained in writing. Requests for such permissions may be sent to
- *
- *      Dr. Andrew S. Tanenbaum
- *      Wiskundig Seminarium
- *      Vrije Universiteit
- *      Postbox 7161
- *      1007 MC Amsterdam
- *      The Netherlands
- *
- */
-
-/*
- * machine dependent back end routines for the Motorola 68000
- */
-
-con_part(sz,w) register sz; word w; {
-
-	while (part_size % sz)
-		part_size++;
-	if (part_size == TEM_WSIZE)
-		part_flush();
-	if (sz == 1) {
-		w &= 0xFF;
-		if (part_size == 0)
-			w <<= 8;
-		part_word |= w;
-	} else {
-		assert(sz == 2);
-		part_word = w;
-	}
-	part_size += sz;
-}
-
-con_mult(sz) word sz; {
-
-	if (sz != 4)
-		fatal("bad icon/ucon size");
-	fprintf(codefile,".long %s\n",str);
-}
-
-con_float() {
-
-static int been_here;
-	if (argval != 4 && argval != 8)
-		fatal("bad fcon size");
-	fprintf(codefile,".long\t");
-	if (argval == 8)
-		fprintf(codefile,"F_DUM,");
-	fprintf(codefile,"F_DUM\n");
-	if ( !been_here++)
-	{
-	fprintf(stderr,"Warning : dummy float-constant(s)\n");
-	}
-}
-
-#ifdef REGVARS
-
-
-regscore(off,size,typ,score,totyp)
-	long off;
-{
-	if (score == 0) return -1;
-	switch(typ) {
-		case reg_float:
-			return -1;
-		case reg_pointer:
-			if (size != 4 || totyp != reg_pointer) return -1;
-			score *= 2;
-			break;
-		case reg_loop:
-			score += 5;
-			/* fall through .. */
-		case reg_any:
-			if (size != 2 || totyp == reg_pointer) return -1;
-			break;
-	}
-	if (off >= 0) {
-		/* parameters must be initialised with an instruction
-		 * like "move.w 4(a6),d0", which costs 2 words.
-		 */
-		score -= 2;
-	}
-	score -= 1; /* take save/restore into account */
-	return score;
-}
-
-
-struct regsav_t {
-	char	*rs_reg;	/* e.g. "a3" or "d5" */
-	long	rs_off;		/* offset of variable */
-	int	rs_size;	/* 2 or 4 bytes */
-} regsav[9];
-
-
-int regnr;
-int nr_a_regs,nr_d_regs;
-int TEM_BSIZE;
-static long nlocals;
-
-prolog(n)
-{	nlocals = n; }
-
-
-i_regsave()
-{
-	regnr = 0;
-	nr_a_regs = 0;
-	nr_d_regs = 0;
-	TEM_BSIZE = 0;
-}
-
-#define MOVEM_LIMIT	2
-/* If #registers to be saved exceeds MOVEM_LIMIT, we
-* use the movem instruction to save registers; else
-* we simply use several move.l's.
-*/
-
-
-save()
-{
-	register struct regsav_t *p;
-	int i;
-
-	if (regnr > MOVEM_LIMIT) {
-		fprintf(codefile,"movem.l ");
-		for (p = regsav; ;) {
-			fprintf(codefile,"%s",p->rs_reg);
-			if (++p == &regsav[regnr]) break;
-			putc('/',codefile);
-		}
-		fprintf(codefile,",-(sp)\n");
-	} else {
-		/* Note that the order in which the registers are saved
-		 * is important; it is used by gto.s.
-		 */
-		for (i = 0; i < nr_a_regs; i++) {
-			fprintf(codefile,"move.l a%d,-(sp)\n",5-i);
-		}
-		for (i = 0; i < nr_d_regs; i++) {
-			fprintf(codefile,"move.l d%d,-(sp)\n",7-i);
-		}
-	}
-	/* Push a mask that indicates which registers were saved */
-	assert(nr_d_regs < 8 && nr_a_regs < 8);
-	if (nr_d_regs == 0 && nr_a_regs == 0) {
-		fprintf(codefile,"clr.w -(sp)\n");
-	} else {
-		fprintf(codefile,"move.w #%d,-(sp)\n",
-			nr_d_regs + (nr_a_regs<<3));
-	}
-
-	/* Compute AB - LB */
-	TEM_BSIZE = 4 * (nr_d_regs + nr_a_regs) + 10;
-
-	/* allocate space for local variables */
-	fprintf(codefile,"tst.b -%D(sp)\nlink\ta6,#-%D\n",nlocals+40,nlocals);
-
-	/* initialise register-parameters */
-	for (p = regsav; p < &regsav[regnr]; p++) {
-		if (p->rs_off >= 0) {
-			fprintf(codefile,"move.%c %ld(a6),%s\n",
-				(p->rs_size == 4 ? 'l' : 'w'),
-				p->rs_off + TEM_BSIZE,
-				p->rs_reg);
-		}
-	}
-}
-
-restr()
-{
-	register struct regsav_t *p;
-	int i;
-
-	fprintf(codefile,"unlk a6\n");
-	fprintf(codefile,"add.l #2,sp\n"); /* pop mask */
-	if (regnr > MOVEM_LIMIT)  {
-		fprintf(codefile,"movem.l (sp)+,");
-		for (p = regsav; ;) {
-			fprintf(codefile,"%s",p->rs_reg);
-			if (++p == &regsav[regnr]) break;
-			putc('/',codefile);
-		}
-		putc('\n',codefile);
-	} else {
-		for (i = nr_d_regs - 1; i >= 0; i--) {
-			fprintf(codefile,"move.l (sp)+,d%d\n",7-i);
-		}
-		for (i = nr_a_regs - 1; i >= 0; i--) {
-			fprintf(codefile,"move.l (sp)+,a%d\n",5-i);
-		}
-	}
-	fprintf(codefile,"rts\n");
-}
-
-
-f_regsave()
-{
-	save();
-}
-
-regsave(str,off,size)
-	char *str;
-	long off;
-{
-	assert (regnr < 9);
-	regsav[regnr].rs_reg = str;
-	if (str[0] == 'a') {
-		nr_a_regs++;
-	} else {
-		assert(str[0] == 'd');
-		nr_d_regs++;
-	}
-	regsav[regnr].rs_off = off;
-	regsav[regnr++].rs_size = size;
-	fprintf(codefile, "!Local %ld into %s\n",off,str);
-}
-
-regreturn()
-{
-	restr();
-}
-
-#endif
-
-#ifndef REGVARS
-
-prolog(nlocals) full nlocals; {
-
-	fprintf(codefile,"tst.b -%D(sp)\nlink\ta6,#-%D\n",nlocals+40,nlocals);
-}
-
-#endif
-
-
-
-mes(type) word type ; {
-	int argt ;
-
-	switch ( (int)type ) {
-	case ms_ext :
-		for (;;) {
-			switch ( argt=getarg(
-			    ptyp(sp_cend)|ptyp(sp_pnam)|sym_ptyp) ) {
-			case sp_cend :
-				return ;
-			default:
-				strarg(argt) ;
-				fprintf(codefile,".define %s\n",argstr) ;
-				break ;
-			}
-		}
-	default :
-		while ( getarg(any_ptyp) != sp_cend ) ;
-		break ;
-	}
-}
-
-
-char    *segname[] = {
-	".text",        /* SEGTXT */
-	".data",        /* SEGCON */
-	".data",        /* SEGROM */
-	".bss"          /* SEGBSS */
-};

mach/m68k4/libem/dvi.s

@@ -1,42 +0,0 @@
-.define .dvi
-
- ! signed long divide
-	.text
-.dvi:
-	movem.l	d0/d2,.savdvi
-	move.l	(sp)+,.retdvi
-	move.l	(sp)+,d0
-	move.l	(sp)+,d1
-	clr.l	d4
-	tst.l	d0	! divisor
-	bpl	1f
-	neg.l	d0
-	not	d4
-1:
-	tst.l	d1	! dividend
-	bpl	2f
-	neg.l	d1
-	not	d4
-	swap	d4
-	not	d4
-	swap	d4
-2:
-	move.l	d1,-(sp)
-	move.l	d0,-(sp)
-	jsr	.dvu
-	tst	d4
-	beq	5f
-	neg.l	d1	! quotient
-5:
-	tst.l	d4
-	bpl	6f
-	neg.l	d3	! remainder
-6:
-	movem.l .savdvi,d0/d2
-	move.l	.retdvi,-(sp)
-	rts
-.data
-.savdvi:	.space 8
-.retdvi:	.long 0
-.text
-.align 2

mach/pdp/cg/mach.c

@@ -0,0 +1,256 @@
+#ifndef NORCSID
+static char rcsid[] = "$Header$";
+#endif
+
+/*
+ * (c) copyright 1983 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ *
+ *          This product is part of the Amsterdam Compiler Kit.
+ *
+ * Permission to use, sell, duplicate or disclose this software must be
+ * obtained in writing. Requests for such permissions may be sent to
+ *
+ *      Dr. Andrew S. Tanenbaum
+ *      Wiskundig Seminarium
+ *      Vrije Universiteit
+ *      Postbox 7161
+ *      1007 MC Amsterdam
+ *      The Netherlands
+ *
+ * Author: Hans van Staveren
+ */
+
+/*
+ * machine dependent back end routines for the PDP-11
+ */
+
+static char procnam[40] ;
+
+/* #define REGPATCH		/* save all registers in markblock */
+
+con_part(sz,w) register sz; word w; {
+
+	while (part_size % sz)
+		part_size++;
+	if (part_size == TEM_WSIZE)
+		part_flush();
+	if (sz == 1) {
+		w &= 0xFF;
+		if (part_size)
+			w <<= 8;
+		part_word |= w;
+	} else {
+		assert(sz == 2);
+		part_word = w;
+	}
+	part_size += sz;
+}
+
+con_mult(sz) word sz; {
+	long l;
+
+	if (sz != 4)
+		fatal("bad icon/ucon size");
+#ifdef ACK_ASS
+	fprintf(codefile,".long %s\n",str);
+#else
+	l = atol(str);
+	fprintf(codefile,"\t%o;%o\n",(int)(l>>16),(int)l);
+#endif
+}
+
+/*
+ * The next function is difficult to do when not running on a PDP 11 or VAX
+ * The strategy followed is to assume the code generator is running on a PDP 11
+ * unless the ACK_ASS define  is on.
+ * In the last case floating point constants are simply not handled
+ */
+
+con_float() {
+#ifdef ACK_ASS
+	static int been_here;
+
+	if (argval != 4 && argval != 8)
+		fatal("bad fcon size");
+	fprintf(codefile,".long\t");
+	if (argval == 8)
+		fprintf(codefile,"F_DUM,");
+	fprintf(codefile,"F_DUM\n");
+	if ( !been_here++)
+		fprintf(stderr,"Warning : dummy float-constant(s)\n");
+#else
+	double f;
+	register short *p,i;
+
+	if (argval != 4 && argval != 8)
+		fatal("bad fcon size");
+	f = atof(str);
+	p = (short *) &f;
+	i = *p++;
+	if (argval == 8) {
+		fprintf(codefile,"\t%o;%o;",i,*p++);
+		i = *p++;
+	}
+	fprintf(codefile,"\t%o;%o\n",i,*p++);
+#endif
+}
+
+#ifdef REGVARS
+
+char Rstring[10];
+full lbytes;
+struct regadm {
+	char *ra_str;
+	long  ra_off;
+} regadm[2];
+int n_regvars;
+
+regscore(off,size,typ,score,totyp) long off; {
+
+	if (size != 2)
+		return(-1);
+	score -= 1;	/* allow for save/restore */
+	if (off>=0)
+		score -= 2;
+	if (typ==reg_pointer)
+		score *= 17;
+	else if (typ==reg_loop)
+		score = 10*score+50;	/* Guestimate */
+	else
+		score *= 10;
+	return(score);	/* estimated # of words of profit */
+}
+
+i_regsave() {
+
+	Rstring[0] = 0;
+	n_regvars=0;
+}
+
+f_regsave() {
+	register i;
+
+	if (n_regvars==0 || lbytes==0) {
+#ifdef REGPATCH
+		fprintf(codefile,"mov r2,-(sp)\nmov r4,-(sp)\n");
+#endif
+		fprintf(codefile,"mov r5,-(sp)\nmov sp,r5\n");
+		if (lbytes == 2)
+			fprintf(codefile,"tst -(sp)\n");
+		else if (lbytes!=0)
+			fprintf(codefile,"sub $0%o,sp\n",lbytes);
+		for (i=0;i<n_regvars;i++)
+			fprintf(codefile,"mov %s,-(sp)\n",regadm[i].ra_str);
+	} else {
+		if (lbytes>6) {
+			fprintf(codefile,"mov $0%o,r0\n",lbytes);
+			fprintf(codefile,"jsr r5,PR%s\n",Rstring);
+		} else {
+			fprintf(codefile,"jsr r5,PR%d%s\n",lbytes,Rstring);
+		}
+	}
+	for (i=0;i<n_regvars;i++) {
+		if (regadm[i].ra_off>=0)
+			fprintf(codefile,"mov 0%lo(r5),%s\n",regadm[i].ra_off,
+						regadm[i].ra_str);
+		/* generate equates for access to registers */
+		fprintf(codefile,"~%s%s=%ld.\n",regadm[i].ra_str+1, procnam,
+				 regadm[i].ra_off) ;
+	}
+}
+
+regsave(regstr,off,size) char *regstr; long off; {
+
+	fprintf(codefile,"%c Local %ld into %s\n",COMMENTCHAR,off,regstr);
+/* commented away 
+#ifndef REGPATCH
+	fprintf(codefile,"mov %s,-(sp)\n",regstr);
+#endif
+	strcat(Rstring,regstr);
+	if (off>=0)
+		fprintf(codefile,"mov 0%lo(r5),%s\n",off,regstr);
+end of commented away */
+
+	strcat(Rstring,regstr);
+	regadm[n_regvars].ra_str = regstr;
+	regadm[n_regvars].ra_off = off;
+	n_regvars++;
+}
+
+regreturn() {
+
+#ifdef REGPATCH
+	fprintf(codefile,"jmp eret\n");
+#else
+	fprintf(codefile,"jmp RT%s\n",Rstring);
+#endif
+}
+
+#endif
+
+doplb(name) char *name ; {
+	register char *p, *q ;
+	p=procnam, q=name ;
+	while ( *p++ = *q++ ) ;
+	fprintf(codefile,"%s:\n",name) ;
+}
+
+prolog(nlocals) full nlocals; {
+
+#ifndef REGVARS
+#ifdef REGPATCH
+	fprintf(codefile,"mov r2,-(sp)\nmov r4,-(sp)\n");
+#endif
+	fprintf(codefile,"mov r5,-(sp)\nmov sp,r5\n");
+	if (nlocals == 0)
+		return;
+	if (nlocals == 2)
+		fprintf(codefile,"tst -(sp)\n");
+	else
+		fprintf(codefile,"sub $0%o,sp\n",nlocals);
+#else
+	lbytes = nlocals;
+#endif
+}
+
+dlbdlb(as,ls) string as,ls; {
+
+	if (strlen(as)+strlen(ls)+2<sizeof(labstr)) {
+		strcat(ls,":");
+		strcat(ls,as);
+	} else
+		fatal("too many consecutive labels");
+}
+
+mes(type) word type; {
+	int argt ;
+
+	switch ( (int)type ) {
+	case ms_ext :
+		for (;;) {
+			switch ( argt=getarg(
+			    ptyp(sp_cend)|ptyp(sp_pnam)|sym_ptyp) ) {
+			case sp_cend :
+				return ;
+			default:
+				strarg(argt) ;
+#ifdef ACK_ASS
+				fprintf(codefile,".define %s\n",argstr) ;
+#else
+				fprintf(codefile,".globl %s\n",argstr) ;
+#endif
+				break ;
+			}
+		}
+	default :
+		while ( getarg(any_ptyp) != sp_cend ) ;
+		break ;
+	}
+}
+
+char    *segname[] = {
+	".text",        /* SEGTXT */
+	".data",        /* SEGCON */
+	".data",        /* SEGROM */
+	".bss"          /* SEGBSS */
+};

mach/pdp/cg/mach.h

@@ -0,0 +1,46 @@
+/* $Header$ */
+
+/* The next define switches between codegeneration for an ACK assembler
+ * or for the standard UNIX V7 assembler.
+ * If on code is generated for the ACK assembler.
+ */
+/* #define ACK_ASS	/* code for ACK assembler */
+
+#ifdef ACK_ASS
+#define COMMENTCHAR '!'
+#define ex_ap(y)	fprintf(codefile,".extern %s\n",y)
+#else
+#define COMMENTCHAR '/'
+#define ex_ap(y)	fprintf(codefile,".globl %s\n",y)
+#endif
+#define in_ap(y)	/* nothing */
+
+#define newplb(x)	doplb(x)
+#define newilb(x)	fprintf(codefile,"%s:\n",x)
+#define newdlb(x)	fprintf(codefile,"%s:\n",x)
+#ifdef ACK_ASS
+#define newlbss(l,x)	fprintf(codefile,"%s:.space 0%o\n",l,x);
+#else
+#define newlbss(l,x)	fprintf(codefile,"%s:.=.+0%o\n",l,x);
+#endif
+
+#define cst_fmt		"$0%o"
+#define off_fmt		"0%o"
+#define ilb_fmt		"I%03x%x"
+#define dlb_fmt		"_%d"
+#define	hol_fmt		"hol%d"
+
+#define hol_off		"0%o+hol%d"
+
+#ifdef ACK_ASS
+#define con_cst(x)	fprintf(codefile,".short 0%o\n",x)
+#define con_ilb(x)	fprintf(codefile,".short %s\n",x)
+#define con_dlb(x)	fprintf(codefile,".short %s\n",x)
+#else
+#define con_cst(x)	fprintf(codefile,"0%o\n",x)
+#define con_ilb(x)	fprintf(codefile,"%s\n",x)
+#define con_dlb(x)	fprintf(codefile,"%s\n",x)
+#endif
+
+#define id_first	'_'
+#define BSS_INIT	0

util/ass/Makefile

@@ -1,78 +0,0 @@
-d=../..
-l=$d/mach/m68k2/lib
-h=$d/h
-ASS_PATH=$l/em_ass
-CC=pmds
-
-SEP_OPT=-n
-
-CFLAGS=-O -.c
-
-all:            ass$(SEP_OPT)
-
-clean:
-		-rm -f ass-i ass-n *.o maktab *.old asstb.c
-
-install :       all
-		cp ass$(SEP_OPT) $(ASS_PATH)
-
-cmp :           all
-		cmp ass$(SEP_OPT) $(ASS_PATH)
-
-lint:           ass00.c ass30.c ass40.c ass50.c ass60.c ass70.c \
-			ass80.c assci.c assda.c assrl.c asstb.c asscm.c
-		lint -hpvbx \
-			ass00.c ass30.c ass40.c ass50.c ass60.c ass70.c \
-			ass80.c assci.c assda.c assrl.c asstb.c asscm.c
-
-
-ass-n:       ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
-			ass80.o assci.o assda.o assrl.o asstb.o asscm.o \
-			$l/em_data.a
-		$(CC) $(CFLAGS) -s -o ass-n \
-			ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
-			ass80.o assci.o assda.o assrl.o asstb.o asscm.o \
-			$l/em_data.a >ass.symb
-
-ass-i:       ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
-			ass80.o assci.o assda.o assrl.o asstb.o asscm.o \
-			$l/em_data.a
-		$(CC) -i $(CFLAGS) -o ass-i \
-			ass00.o ass30.o ass40.o ass50.o ass60.o ass70.o \
-			ass80.o assci.o assda.o assrl.o asstb.o asscm.o \
-			$l/em_data.a
-
-ass00.o ass40.o ass60.o ass70.o ass80.o assrl.o: \
-		$h/local.h $h/em_spec.h $h/as_spec.h \
-		$h/em_flag.h $h/arch.h ass00.h assex.h
-
-assci.o:        $h/local.h $h/em_spec.h $h/as_spec.h \
-		$h/em_flag.h $h/em_mes.h $h/em_pseu.h \
-		$h/em_ptyp.h $h/arch.h ass00.h assex.h
-
-ass30.o ass50.o : \
-		$h/local.h $h/em_spec.h $h/as_spec.h \
-		$h/em_flag.h ip_spec.h ass00.h assex.h
-
-ass80.o:        $h/em_path.h
-
-assda.o:        $h/local.h $h/em_spec.h $h/as_spec.h \
-		$h/em_flag.h $h/arch.h ass00.h
-
-asscm.o:        ass00.h
-
-asstb.o:        asstb.c
-
-asstb.c:        maktab ip_spec.t
-		maktab ip_spec.t asstb.c
-
-maktab:         maktab.c $h/em_spec.h ip_spec.h $h/em_flag.h \
-		$l/em_data.a
-		$(CC) -O -o maktab maktab.c $l/em_data.a
-
-opr:
-		make pr ^ opr
-
-pr:
-		@(pr ass00.h assex.h ip_spec.h ass?0.c ass[rcd]?.c \
-		maktab.c ; pr -3 ip_spec.t)