Rename branch.

--HG-- branch : unlabeled-1.1.1-branch
Bug fixed for pattern 'sti $1 > 4' (ADDREG -> ADDSCR)
2015-06-18 23:39:28 +02:00 · 1985-04-16 15:12:16 +00:00 · 1984-07-19 09:37:25 +00:00
6 changed files with 315 additions and 477 deletions
--- a/first/local.h.src
+++ b/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"
--- a/mach/m68k2/cg/mach.c
+++ b/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 */
-};
--- a/mach/m68k2/cg/table
+++ b/mach/m68k2/cg/table
@@ -1,4 +1,3 @@
-"$Header$"
 /*
 * (c) copyright 1983 by the Vrije Universiteit, Amsterdam, The Netherlands.
 *
@@ -113,8 +112,6 @@ ABS		= {STRING addr;}	2 cost=(3,5)  "%[addr]"
 ABS1		= {STRING addr;}	2 cost=(3,5)  "%[addr]"
 IMMEDIATE	= {INT cc;}		2 cost=(1,2) "#%[cc]"
 LOCAL_ADDR	= {INT off;}		4 /* not really addressable */
-REGOFF_ADDR	= {REGISTER reg;
-		   INT off;}		4 /* not really addressable */
 EXTERNAL_ADDR	= {STRING off;}		4 cost=(4,4)  "#%[off]"
 INDEX_ADDR	= {REGISTER reg,ireg;
 		   INT di;}		4
@@ -155,7 +152,7 @@ ALT_MEM		=  ALTERABLE * MEMORY
 DATASCR		=  DATAREG * SCRATCH
 ADDSCR		=  ADDREG  * SCRATCH
 MEM_ALL		=  ALL - DATAREG - DATAREG4 - ADDREG - IMMEDIATE - IMMEDIATE4
-		   - LOCAL_ADDR -REGOFF_ADDR - EXTERNAL_ADDR - DOUBLE - DOUBLEZERO
+		   - LOCAL_ADDR - EXTERNAL_ADDR - DOUBLE - DOUBLEZERO
 ALL_ACCESSIBLE	=  IADDREG + IADDREG4 + IADDREG1 + INDEXED + INDEXED4

 ANY1		=  DISPL1 + ABS1 + IADDREG1
@@ -207,18 +204,13 @@ lil | |  allocate(ADDREG = {DISPL4,LB,$1})| {IADDREG,%[a]} | |
 lof | ADDREG | | {DISPL,%[1],$1} | |
 ... | nocoercions: EXTERNAL_ADDR | | {ABS,%[1.off]+"+"+tostring($1)} | |
 ... | nocoercions: LOCAL_ADDR    | | {DISPL,LB,%[1.off]+$1} | |
-... | nocoercions: REGOFF_ADDR    | | {DISPL,%[1.reg],%[1.off]+$1} | |
 ldf | ADDREG | | {DISPL4,%[1],$1} | |
 ... | nocoercions: EXTERNAL_ADDR | | {ABS4,%[1.off]+"+"+tostring($1)} | |
 ... | nocoercions: LOCAL_ADDR    | | {DISPL4,LB,%[1.off]+$1} | |
-... | nocoercions: REGOFF_ADDR    | | {DISPL4,%[1.reg],%[1.off]+$1} | |
 lal | | | {LOCAL_ADDR,$1} | |
 | LOCAL_ADDR |	allocate(ADDREG)
 		"lea %[1.off](a6),%[a]"
 		samecc		| %[a] | |
-| REGOFF_ADDR |	allocate(ADDREG)
-		"lea %[1.off](%[1.reg]),%[a]"
-		samecc		| %[a] | |
 lae | | | {EXTERNAL_ADDR,$1} | |
 | EXTERNAL_ADDR |	allocate(ADDREG)
 			"lea %[1.off],%[a]"
@@ -238,7 +230,6 @@ lxa | STACK |		"move.w #$1,-(sp)"
 			"jsr .lxa"	| A0	| |
 loi $1 == 1 | ADDREG | | {IADDREG1, %[1]} | |
 ...	    | nocoercions: LOCAL_ADDR | | {DISPL1,LB,%[1.off]} | |
-...	    | nocoercions: REGOFF_ADDR | | {DISPL1,%[1.reg],%[1.off]} | |
 ...	    | nocoercions: EXTERNAL_ADDR | | {ABS1,%[1.off]} | |
 loi $1 == 2 | ADDREG | | {IADDREG,%[1]} | |
 loi $1 == 4 | ADDREG | | {IADDREG4,%[1]} | |
@@ -254,9 +245,7 @@ lae loi $2 == 6 | |	remove(ALL)
 lae loi $2 == 8 | |	remove(ALL)
 			"move.l $1+4,-(sp)"
 			"move.l $1,-(sp)"	| | |
-loi $1 == 6 | ADDREG |	|  {DISPL,%[1],4} {IADDREG4,%[1]} | |
-loi $1 == 8 | ADDREG |	|  {DISPL4,%[1],4} {IADDREG4,%[1]} | |
-loi $1 > 8  | ADDSCR | remove(ALL)
+loi $1 > 4  | ADDSCR | remove(ALL)
 		       allocate(DATAREG4= {IMMEDIATE4,$1/2-1})
 		       "add.l #$1,%[1]"
 		       "1:"
@@ -310,12 +299,10 @@ lpi | | | {EXTERNAL_ADDR,$1} | |


 #ifdef REGVARS
-stl inreg($1)==2 | nocoercions: ANY | remove(regvar($1))
+stl inreg($1)==2 | ANY | remove(regvar($1))
 			 move(%[1],regvar($1))	| | |
-...		 | STACK |
-			 "move.w (sp)+,%(regvar($1)%)"	 | | |
 #endif
-stl | nocoercions: ANY | remove(DISPL,%[reg] == LB && %[dis] == $1)
+stl | ANY | remove(DISPL,%[reg] == LB && %[dis] == $1)
 	    remove(DISPL4,%[reg] == LB && (%[dis] == $1-2 ||
 					   %[dis] == $1))
 	    remove(DISPL1,%[reg] == LB && (%[dis] == $1 ||
@@ -325,8 +312,6 @@ stl | nocoercions: ANY | remove(DISPL,%[reg] == LB && %[dis] == $1)
 	    remove(DISPL1,%[reg] != LB)
 	    remove(ALL_ACCESSIBLE)
 	    move(%[1],{DISPL,LB,$1})	| | |
-...		 | STACK |
-			 "move.w (sp)+,$1(a6)" | | |
 ste | ANY |
 				remove(ABS)
 				remove(ABS4)
@@ -393,29 +378,6 @@ sti $1 == 1
 ...	| nocoercions: LOCAL_ADDR ANY1 |
 		remove(MEM_ALL)
 		move(%[2],{DISPL1,LB,%[1.off]}) | | |
-...	| nocoercions: REGOFF_ADDR DATAREG |
-		remove(MEM_ALL)
-		move(%[2], {DISPL1,%[1.reg],%[1.off]}) | | |
-...	| nocoercions: REGOFF_ADDR IADDREG |
-		remove(MEM_ALL)
-		move({DISPL,%[2.reg],1}, {DISPL1,%[1.reg],%[1.off]}) | | |
-...	| nocoercions: REGOFF_ADDR DISPL |
-		remove(MEM_ALL)
-		move({DISPL,%[2.reg],%[2.dis]+1}, {DISPL1,%[1.reg],%[1.off]}) | | |
-...	| nocoercions: REGOFF_ADDR INDEXED |
-		remove(MEM_ALL)
-		move({INDEXED,%[2.reg],%[2.ireg],%[2.di]+1},
-			{DISPL1,%[1.reg],%[1.off]}) | | |
-...	| nocoercions: REGOFF_ADDR ABS |
-		remove(MEM_ALL)
-		move({ABS,%[2.addr]+"+1"}, {DISPL1,%[1.reg],%[1.off]}) | | |
-...	| nocoercions: REGOFF_ADDR IMMEDIATE |
-		remove(MEM_ALL)
-		move({IMMEDIATE,(%[2.cc]-((%[2.cc]>>8)<<8)+128)%256-128},
-		     {DISPL1,%[1.reg],%[1.off]}) | | |
-...	| nocoercions: REGOFF_ADDR ANY1 |
-		remove(MEM_ALL)
-		move(%[2],{DISPL1,%[1.reg],%[1.off]}) | | |
 ...	| nocoercions: EXTERNAL_ADDR DATAREG |
 		remove(MEM_ALL)
 		move(%[2], {ABS1,%[1.off]}) | | |
@@ -453,13 +415,10 @@ sts $1 == 2 | |			remove(ALL)
 				"jsr .sts"
 							| | |
 #ifdef REGVARS
-sdl inreg($1)==2 | nocoercions: ANY4 |	remove(regvar($1))
+sdl inreg($1)==2 | ANY4 |	remove(regvar($1))
 				move (%[1],regvar($1))	| | |
-...		 | STACK |
-			 "move.l (sp)+,%(regvar($1)%)"	 | | |
 #endif
-sdl | nocoercions: ANY4 | 
-		remove(DISPL,%[reg] == LB && (%[dis] == $1 || %[dis] == $1+2))
+sdl | ANY4 |	remove(DISPL,%[reg] == LB && (%[dis] == $1 || %[dis] == $1+2))
 		remove(DISPL4,%[reg] == LB && (%[dis] >= $1-2 &&
 						%[dis] <= $1+2))
 		remove(DISPL1,%[reg] == LB && (%[dis] >= $1 &&
@@ -469,8 +428,6 @@ sdl | nocoercions: ANY4 |
 		remove(DISPL1,%[reg] != LB)
 		remove(ALL_ACCESSIBLE)
 		move(%[1],{DISPL4,LB,$1})		| | |
-...		 | STACK |
-			 "move.l (sp)+,$1(a6)" | | |
 sde | ANY4 |
 				remove(ABS)
 				remove(ABS4)
@@ -598,10 +555,6 @@ ldl ldl adp sdl $1 == $2 && $2 == $4 && inreg($1)==2 | |
 ldl adp sdl $1 == $3  && inreg($1)==2 | |	remove(regvar($1))
 				"add.l #$2,%(regvar($1)%)"	
 				erase(regvar($1))	| | | 
-ldl loi ldl loi adp ldl sti $2==4&&$4==4&&$7==4&&$1==$3&&$1==$6&&inreg($1)==2
-			| |	remove(MEM_ALL)
-				allocate(ADDREG = {IADDREG4,regvar($1)})
-				"add.l #$5,(%(regvar($1)%))"	| %[a] | |
 loc ldl ads sdl $2 == $4 && $3 == 2  && inreg($2)==2 | |
 				remove(regvar($2))
 				"add.l #$1,%(regvar($2)%)"	
@@ -616,12 +569,10 @@ ldc ldl ads sdl $2 == $4 && $3 == 4  && inreg($2)==2 | |
 				erase(regvar($2))	| | |	
 lil inc sil $1==$3  && inreg($1)==2 | |	
 			remove(MEM_ALL)
-			"add.w #1,(%(regvar($1)%))"
-			setcc({IADDREG,regvar($1)})	| | |
+			"add.w #1,(%(regvar($1)%))"	| | |
 lil dec sil $1==$3  && inreg($1)==2 | |	
 			remove(MEM_ALL)
-			"sub.w #1,(%(regvar($1)%))"
-			setcc({IADDREG,regvar($1)})	| | |
+			"sub.w #1,(%(regvar($1)%))"	| | |
 lol and stl $1 == $3 && $2 == 2  && inreg($1)==2 | ANY |
 				remove(regvar($1))
 				"and.w %[1],%(regvar($1)%)"	
@@ -977,24 +928,12 @@ slu | | | | sli $1 |

 /* G R O U P  VI :   P O I N T E R  A R I T H M E T I C  */

-adp $1 >= 1 && $1 <= 8
-	| nocoercions: EXTERNAL_ADDR | | {EXTERNAL_ADDR,%[1.off] + "+" 
-						+ tostring($1)} | |
-...	| nocoercions: LOCAL_ADDR | | {LOCAL_ADDR,%[1.off]+$1} | |
-...	| nocoercions: REGOFF_ADDR | | {REGOFF_ADDR,%[1.reg],%[1.off]+$1}  | |
-...	| nocoercions: ADDREG | | {REGOFF_ADDR,%[1],$1} | |
-...	| ADDSCR |	"add.l #$1,%[1]"
+adp $1 >= 1 && $1 <= 8	| ADDSCR |	"add.l #$1,%[1]"
 			erase(%[1])
 			setcc(%[1])			| %[1] | |
-adp	| nocoercions: EXTERNAL_ADDR | | {EXTERNAL_ADDR,%[1.off] + "+"
-						+ tostring($1)} | |
-...	| nocoercions: LOCAL_ADDR | | {LOCAL_ADDR,%[1.off]+$1} | |
-...	| nocoercions: REGOFF_ADDR | | {REGOFF_ADDR,%[1.reg],%[1.off]+$1}  | |
-...	| nocoercions: ADDREG | | {REGOFF_ADDR,%[1],$1} | |
-...	| ADDSCR |	"lea $1(%[1]),%[1]"
+adp  			| ADDSCR |	"lea $1(%[1]),%[1]"
 			erase(%[1])
 			setcc(%[1])			| %[1] | |
-			
 /* The next patterns are for efficient translation of "*p++" in C */
 ldl ldl adp sdl $1 == $2 && $2 == $4 | |
 		allocate(ADDREG={DISPL4,LB,$1})
@@ -1063,12 +1002,10 @@ inc | DATASCR |	"add.w #1,%[1]"
 #ifdef REGVARS
 lil inc sil $1==$3 && inreg($1) == 2 | |
 			remove(MEM_ALL)
-			"add.w #1,(%(regvar($1)%))"
-			setcc({IADDREG,regvar($1)})	| | |
+			"add.w #1,(%(regvar($1)%))"	| | |
 lil dec sil $1==$3 && inreg($1) == 2 | |
 			remove(MEM_ALL)
-			"sub.w #1,(%(regvar($1)%))"
-			setcc({IADDREG,regvar($1)})	| | |
+			"sub.w #1,(%(regvar($1)%))"	| | |
 #endif
 lil inc sil $1==$3 | |	allocate(ADDREG={DISPL4,LB,$1})
 			remove(MEM_ALL)
@@ -2643,7 +2580,6 @@ STACKS:
 (ANY, , "move.w %[1],-(sp)" setcc(%[1]), (2,4) + %[1])
 (EXTERNAL_ADDR, , "pea %[1.off]" nocc)
 (LOCAL_ADDR, , "pea %[1.off](a6)" nocc)
-(REGOFF_ADDR, , "pea %[1.off](%[1.reg])" nocc)
 (INDEX_ADDR, , "pea %[1.di](%[1.reg],%[1.ireg].w)" nocc)
 (IMMEDIATE4 %[cc] == 0, , "clr.l -(sp)")
 (IMMEDIATE4, , "pea %[1.cc]" nocc)
--- a/mach/m68k4/libem/dvi.s
+++ b/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
--- a/util/ack/rmach.c
+++ b/util/ack/rmach.c
@@ -0,0 +1,303 @@
+/*
+ * (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
+ *
+ */
+
+#include "ack.h"
+#include "../../h/em_path.h"
+#include "list.h"
+#include "trans.h"
+#include "grows.h"
+#include "dmach.h"
+#include "data.h"
+#include <stdio.h>
+
+/************************************************************************/
+/*                                                                      */
+/*           Read machine definitions and transformations               */
+/*                                                                      */
+/************************************************************************/
+
+#define COMMENT '#'
+
+#define VAR     "var"
+#define PASS    "name"
+#define IN      "from"
+#define OUT     "to"
+#define PROG    "program"
+#define MAPF    "mapflag"
+#define ARGS    "args"
+#define PROP    "prop"
+#define RUNT    "rts"
+#define NEEDT	"need"
+#define END     "end"
+
+extern growstring scanb();
+extern growstring scanvars();
+
+int getline() ;
+int getinchar() ;
+static char *ty_name ;
+static char *bol ;
+
+
+static char *inname ;
+
+setlist(name) char *name ; {
+	/* Name is sought in the internal tables,
+	   if not present, the a file of that name is sought
+	   in first the current and then the EM Lib directory
+	*/
+
+	inname=name ;
+	open_in(name) ;
+	while ( getline() ) {
+		if ( strcmp(VAR,ty_name)==0 ) {
+			doassign(bol,(char *)0,0) ;
+		} else
+		if ( strcmp(PASS,ty_name)==0 ) {
+			intrf() ;
+		} else
+			error("unknown keyword %s",ty_name) ;
+	}
+	close_in();
+#ifdef DEBUG
+	if ( debug>=3 ) vprint("End %s\n",name) ;
+#endif
+}
+
+intrf() {
+	register trf *new ;
+	register char *ptr ;
+	growstring bline, vline ;
+	int twice ;
+
+	new= (trf *)getcore(sizeof *new) ;
+	new->t_name= keeps(bol) ;
+	for (;;) {
+		if ( !getline() ) {
+			fuerror("unexpected EOF on %s",inname) ;
+		}
+		twice= NO ;
+		if ( strcmp(ty_name,IN)==0 ) {
+			if ( new->t_in ) twice=YES ;
+			new->t_in= keeps(bol);
+		} else
+		if ( strcmp(ty_name,OUT)==0 ) {
+			if ( new->t_out ) twice=YES ;
+			new->t_out= keeps(bol);
+		} else
+		if ( strcmp(ty_name,PROG)==0 ) {
+			if ( new->t_prog ) twice=YES ;
+			bline= scanb(bol);                /* Scan for \ */
+			vline= scanvars(gr_start(bline)); /* Scan for {} */
+			gr_throw(&bline);
+			new->t_prog= gr_final(&vline);
+			clr_noscan(new->t_prog);
+		} else
+		if ( strcmp(ty_name,MAPF)==0 ) {
+			/* First read the mapflags line
+				and scan for backslashes */
+			bline= scanb(bol) ;
+			l_add(&new->t_mapf,gr_final(&bline)) ;
+		} else
+		if ( strcmp(ty_name,ARGS)==0 ) {
+			if ( new->t_argd ) twice=YES ;
+			bline= scanb(bol) ;
+			new->t_argd= keeps(gr_start(bline)) ;
+			gr_throw(&bline) ;
+		} else
+		if ( strcmp(ty_name,PROP)==0 ) {
+			for ( ptr=bol ; *ptr ; ptr++ ) {
+				switch( *ptr ) {
+				case C_IN: new->t_stdin= YES ; break ;
+				case C_OUT: new->t_stdout= YES ; break ;
+				case 'P': new->t_isprep= YES ; break ;
+				case 'p': new->t_prep= YES ; break ;
+				case 'm': new->t_prep= MAYBE ; break ;
+				case 'O': new->t_optim= YES ; break ;
+				case 'C': new->t_combine= YES ; break ;
+				default :
+				  error("Unkown option %c in %s for %s",
+					*ptr,new->t_name,inname) ;
+				  break ;
+				}
+			}
+		} else
+		if ( strcmp(ty_name,RUNT)==0 ) {
+			if ( new->t_rts ) twice=YES ;
+			new->t_rts= keeps(bol) ;
+		} else
+		if ( strcmp(ty_name,NEEDT)==0 ) {
+			if ( new->t_needed ) twice=YES ;
+			new->t_needed= keeps(bol) ;
+		} else
+		if ( strcmp(ty_name,END)==0 ) {
+			break ;
+		} else {
+			fuerror("illegal keyword %s %s",ty_name,bol);
+		}
+		if ( twice ) {
+			werror("%s: specified twice for %s",
+				ty_name, new->t_name) ;
+		}
+	}
+	if ( ! ( new->t_name && new->t_out && new->t_prog ) ) {
+		fuerror("insufficient specification for %s in %s",
+			new->t_name,inname) ;
+	}
+	if ( ! new->t_argd ) new->t_argd="" ;
+#ifdef DEBUG
+	if ( debug>=3 ) {
+		register list_elem *elem ;
+		vprint("%s: from %s to %s '%s'\n",
+			new->t_name,new->t_in,new->t_out,new->t_prog) ;
+		vprint("\targs: ") ; prns(new->t_argd) ;
+		scanlist( l_first(new->t_mapf), elem ) {
+			vprint("\t%s\n",l_content(*elem)) ;
+		}
+		if ( new->t_rts ) vprint("\trts: %s\n",new->t_rts) ;
+		if ( new->t_needed ) vprint("\tneeded: %s\n",new->t_needed) ;
+	}
+#endif
+	l_add(&tr_list,(char *)new) ;
+}
+
+/************************** IO from core or file *******************/
+
+static  int             incore ;
+static  growstring      rline ;
+static  FILE            *infile ;
+static  char            *inptr ;
+
+open_in(name) register char *name ; {
+	register dmach *cmac ;
+
+	gr_init(&rline) ;
+	for ( cmac= massoc ; cmac->ma_index!= -1 ; cmac++ ) {
+		if ( strcmp(name,cmac->ma_name)==0 ) {
+			incore=YES ;
+			inptr= &intable[cmac->ma_index] ;
+			return ;
+		}
+	}
+	/* Not in core */
+	incore= NO ;
+#ifdef NEW
+	gr_cat(&rline,EM_DIR) ;
+	gr_cat(&rline,"/lib/n_ack/") ;
+#else
+	gr_cat(&rline,ACK_DIR); gr_cat(&rline,"/") ;
+#endif
+	gr_cat(&rline,name) ;
+	infile= fopen(gr_start(rline),"r") ;
+#ifdef NEW
+	if ( !infile ) {
+		/* Try to read EM_DIR/lib/MACH/plan */
+		gr_throw(&rline) ;
+		gr_cat(&rline,EM_DIR) ;
+		gr_cat(&rline,"/lib/") ; gr_cat(&rline,name) ;
+		gr_cat(&rline,"/plan") ;
+		infile= fopen(gr_start(rline),"r") ;
+	}
+#endif
+	if ( !infile ) {
+		infile= fopen(name,"r") ;
+	}
+	if ( infile==NULL ) {
+		fuerror("Cannot find description for %s",name) ;
+	}
+}
+
+close_in() {
+	if ( !incore ) fclose(infile) ;
+	gr_throw(&rline) ;
+}
+
+char *readline() {
+	/* Get a line from the input,
+	   return 0 if at end,
+	   The line is stored in a volatile buffer,
+	   a pointer to the line is returned.
+	*/
+	register int nchar ;
+	enum { BOL, ESCAPE, SKIPPING, MOL } state = BOL ;
+
+	gr_throw(&rline) ;
+	for (;;) {
+		nchar= getinchar() ;
+		if ( nchar==EOF ) {
+			if ( state!=BOL ) {
+				werror("incomplete line in %s", inname) ;
+			}
+			return 0 ;
+		}
+		if ( state==SKIPPING ) {
+			if ( nchar=='\n' ) {
+				state= MOL ;
+			} else {
+				continue ;
+			}
+		}
+		if ( state==ESCAPE ) {
+			switch( nchar ) {
+			case '\n' :
+				break ;
+			default :
+				gr_add(&rline,BSLASH) ;
+			case COMMENT :
+			case BSLASH :
+				gr_add(&rline,nchar) ;
+				break ;
+			}
+			state= MOL ;
+			continue ;
+		}
+		switch ( nchar ) {
+		case '\n' :     gr_add(&rline,0) ;
+				return gr_start(rline) ;
+		case COMMENT :  state= SKIPPING ;
+				break ;
+		case BSLASH :   state= ESCAPE ;
+				break ;
+		default :       gr_add(&rline,nchar) ;
+				state= MOL ;
+		}
+	}
+}
+
+int getinchar() {
+	if ( incore ) {
+		if ( *inptr==0 ) return EOF ;
+		return *inptr++ ;
+	}
+	return getc(infile) ;
+}
+
+int getline() {
+	register char *c_ptr ;
+
+	do {
+		if ( (c_ptr=readline())==(char *)0 ) return 0 ;
+		ty_name= skipblank(c_ptr) ;
+	} while ( *ty_name==0 ) ;
+	c_ptr= firstblank(ty_name) ;
+	if ( *c_ptr ) {
+		*c_ptr++ =0 ;
+		c_ptr= skipblank(c_ptr) ;
+	}
+	bol= c_ptr ;
+	return 1 ;
+}
--- a/util/ass/Makefile
+++ b/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)
Author	SHA1	Message	Date
David Given	b6ff056a52	Rename branch. --HG-- branch : unlabeled-1.1.1-branch	2015-06-18 23:39:28 +02:00
bal	39bc2f6d36	Bug fixed for pattern 'sti $1 > 4' (ADDREG -> ADDSCR) --HG-- branch : unlabeled-1.1.1	1985-04-16 15:12:16 +00:00
cvs2hg	313b739836	fixup commit for branch 'unlabeled-1.1.1' --HG-- branch : unlabeled-1.1.1	1984-07-19 09:37:25 +00:00