Added the possibility to have a varying EM_BSIZE

as a tempoarary measure, to be deleted as soon as the m68k2
back-end is tested again.

mach/pdp/cg/mach.c

@@ -1,256 +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
- *
- * 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

@@ -1,46 +0,0 @@
-/* $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

mach/proto/cg/regvar.c

@@ -0,0 +1,155 @@
+#include "assert.h"
+#include "param.h"
+#include "tables.h"
+
+#ifdef REGVARS
+
+#ifndef NORCSID
+static char rcsid[] = "$Header$";
+#endif
+
+#include "types.h"
+#include <cg_pattern.h>
+#include "data.h"
+#include "regvar.h"
+#include <em_reg.h>
+#include "result.h"
+#include "extern.h"
+
+/*
+ * (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
+ */
+extern string myalloc();
+struct regvar *rvlist;
+
+struct regvar *
+linkreg(of,sz,tp,sc) long of; {
+	struct regvar *rvlp;
+
+	rvlp= (struct regvar *) myalloc(sizeof *rvlp);
+	rvlp->rv_next = rvlist;
+	rvlist=rvlp;
+	rvlp->rv_off	= of;
+	rvlp->rv_size	= sz;
+	rvlp->rv_type	= tp;
+	rvlp->rv_score	= sc;
+	rvlp->rv_reg	= 0;	/* no register assigned yet */
+	return(rvlp);
+}
+
+tryreg(rvlp,typ) struct regvar *rvlp; {
+	int score;
+	register i;
+	struct regassigned *ra;
+	struct regvar *save;
+
+	if (typ != reg_any && nregvar[typ]!=0) {
+		if (machregs[rvnumbers[typ][0]].r_size!=rvlp->rv_size)
+			score = -1;
+		else
+			score = regscore(rvlp->rv_off,
+					 rvlp->rv_size,
+					 rvlp->rv_type,
+					 rvlp->rv_score,
+					 typ);	/* machine dependent */
+		ra = regassigned[typ];
+		if (score>ra[nregvar[typ]-1].ra_score) {
+			save = ra[nregvar[typ]-1].ra_rv;
+			for (i=nregvar[typ]-1;i>0 && ra[i-1].ra_score<score;i--)
+				ra[i] = ra[i-1];
+			ra[i].ra_rv = rvlp;
+			ra[i].ra_score = score;
+			if((rvlp=save)==0)
+				return;
+		}
+	}
+	if (nregvar[reg_any]==0)
+		return;
+	if (machregs[rvnumbers[reg_any][0]].r_size!=rvlp->rv_size)
+		score = -1;
+	else
+		score = regscore(rvlp->rv_off,
+				 rvlp->rv_size,
+				 rvlp->rv_type,
+				 rvlp->rv_score,
+				 reg_any);	/* machine dependent */
+	ra = regassigned[reg_any];
+	if (score>ra[nregvar[reg_any]-1].ra_score) {
+		for (i=nregvar[reg_any]-1;i>0 && ra[i-1].ra_score<score;i--)
+			ra[i] = ra[i-1];
+		ra[i].ra_rv = rvlp;
+		ra[i].ra_score = score;
+	}
+}
+
+fixregvars(saveall) {
+	register struct regvar *rv;
+	register rvtyp,i;
+	
+	swtxt();
+	i_regsave();	/* machine dependent initialization */
+	for (rvtyp=reg_any;rvtyp<=reg_float;rvtyp++) {
+	    for(i=0;i<nregvar[rvtyp];i++)
+		if (saveall) {
+			struct reginfo *rp;
+			rp= &machregs[rvnumbers[rvtyp][i]];
+			regsave(codestrings[rp->r_repr],(long)-TEM_WSIZE,rp->r_size);
+		} else if(regassigned[rvtyp][i].ra_score>0) {
+			rv=regassigned[rvtyp][i].ra_rv;
+			rv->rv_reg=rvnumbers[rvtyp][i];
+			regsave(codestrings[machregs[rv->rv_reg].r_repr],
+				    rv->rv_off,rv->rv_size);
+		}
+	}
+	f_regsave();
+#ifndef TEM_BSIZE
+	for(rv=rvlist;rv!=0;rv=rv->rv_next)
+		if (rv->rv_off >= 0) rv->rv_off += TEM_BSIZE;
+#endif
+}
+
+isregvar(off) long off; {
+	register struct regvar *rvlp;
+
+	for(rvlp=rvlist;rvlp!=0;rvlp=rvlp->rv_next)
+		if(rvlp->rv_off == off)
+			return(rvlp->rv_reg);
+	return(-1);
+}
+
+unlinkregs() {
+	register struct regvar *rvlp,*t;
+	register struct regassigned *ra;
+	int rvtyp,i;
+
+	for(rvlp=rvlist;rvlp!=0;rvlp=t) {
+		t=rvlp->rv_next;
+		myfree(rvlp);
+	}
+	rvlist=0;
+	for (rvtyp=reg_any;rvtyp<=reg_float;rvtyp++) {
+	    for(i=0;i<nregvar[rvtyp];i++) {
+		ra= &regassigned[rvtyp][i];
+		ra->ra_rv = 0;
+		ra->ra_score = 0;
+	    }
+	}
+}
+
+#endif REGVARS
+
+/* nothing after this */