import updated compilers from sources

3 files changed, 48 insertions, 16 deletions

diff --git a/sys/src/cmd/5l/asm.c b/sys/src/cmd/5l/asm.c
index 5aa051a80..1316dd909 100644
--- a/sys/src/cmd/5l/asm.c
+++ b/sys/src/cmd/5l/asm.c
@@ -77,11 +77,6 @@ asmb(void)
 	curtext = P;
 	switch(HEADTYPE) {
 	case 0:
-		if(debug['P']){
-			OFFSET = rnd(textsize, INITRND);
-			seek(cout, OFFSET, 0);
-			break;
-		}
 	case 1:
 	case 2:
 	case 5:
@@ -89,6 +84,7 @@ asmb(void)
 		seek(cout, OFFSET, 0);
 		break;
 	case 3:
+	case 6:	/* no header, padded segments */
 		OFFSET = rnd(HEADR+textsize, 4096);
 		seek(cout, OFFSET, 0);
 		break;
@@ -124,6 +120,7 @@ asmb(void)
 			seek(cout, OFFSET, 0);
 			break;
 		case 3:
+		case 6:	/* no header, padded segments */
 			OFFSET += rnd(datsize, 4096);
 			seek(cout, OFFSET, 0);
 			break;
@@ -152,6 +149,7 @@ asmb(void)
 	seek(cout, OFFSET, 0);
 	switch(HEADTYPE) {
 	case 0:	/* no header */
+	case 6:	/* no header, padded segments */
 		break;
 	case 1:	/* aif for risc os */
 		lputl(0xe1a00000);		/* NOP - decompress code */
diff --git a/sys/src/cmd/5l/mkfile b/sys/src/cmd/5l/mkfile
index 507e52a4a..829dd12a2 100644
--- a/sys/src/cmd/5l/mkfile
+++ b/sys/src/cmd/5l/mkfile
@@ -19,6 +19,9 @@ HFILES=\
 BIN=/$objtype/bin
 </sys/src/cmd/mkone
 
+../5c/enam.c: ../5c/5.out.h
+	@ { cd ../5c; mk enam.c }
+
 enam.$O:	../5c/enam.c
 	$CC $CFLAGS ../5c/enam.c
 
diff --git a/sys/src/cmd/5l/obj.c b/sys/src/cmd/5l/obj.c
index 5b6712175..162012842 100644
--- a/sys/src/cmd/5l/obj.c
+++ b/sys/src/cmd/5l/obj.c
@@ -12,11 +12,13 @@ char	thechar		= '5';
 char	*thestring 	= "arm";
 
 /*
+ *	-H0				no header
  *	-H1 -T0x10005000 -R4		is aif for risc os
  *	-H2 -T4128 -R4096		is plan9 format
  *	-H3 -T0xF0000020 -R4		is NetBSD format
  *	-H4				is IXP1200 (raw)
  *	-H5 -T0xC0008010 -R1024		is ipaq
+ *	-H6 -R4096			no header with segments padded to pages
  */
 
 static int
@@ -127,6 +129,7 @@ main(int argc, char *argv[])
 		diag("unknown -H option");
 		errorexit();
 	case 0:	/* no header */
+	case 6:	/* no header, padded segments */
 		HEADR = 0L;
 		if(INITTEXT == -1)
 			INITTEXT = 0;
@@ -1226,6 +1229,8 @@ doprof1(void)
 	s->value = n*4;
 }
 
+static int brcond[] = {ABEQ, ABNE, ABCS, ABCC, ABMI, ABPL, ABVS, ABVC, ABHI, ABLS, ABGE, ABLT, ABGT, ABLE};
+
 void
 doprof2(void)
 {
@@ -1280,7 +1285,7 @@ doprof2(void)
 			}
 
 			/*
-			 * BL	profin, R2
+			 * BL	profin
 			 */
 			q = prg();
 			q->line = p->line;
@@ -1320,6 +1325,7 @@ doprof2(void)
 				p->link = q;
 				p = q;
 			}
+
 			/*
 			 * RET
 			 */
@@ -1327,21 +1333,46 @@ doprof2(void)
 			q->as = ARET;
 			q->from = p->from;
 			q->to = p->to;
+			q->cond = p->cond;
 			q->link = p->link;
+			q->reg = p->reg;
 			p->link = q;
 
-			/*
-			 * BL	profout
-			 */
-			p->as = ABL;
-			p->from = zprg.from;
-			p->to = zprg.to;
-			p->to.type = D_BRANCH;
-			p->cond = ps4;
-			p->to.sym = s4;
+			if(p->scond != 14) {
+				q = prg();
+				q->as = ABL;
+				q->from = zprg.from;
+				q->to = zprg.to;
+				q->to.type = D_BRANCH;
+				q->cond = ps4;
+				q->to.sym = s4;
+				q->link = p->link;
+				p->link = q;
 
-			p = q;
+				p->as = brcond[p->scond^1];	/* complement */
+				p->scond = 14;
+				p->from = zprg.from;
+				p->to = zprg.to;
+				p->to.type = D_BRANCH;
+				p->cond = q->link->link;	/* successor of RET */
+				p->to.offset = q->link->link->pc;
+
+				p = q->link->link;
+			} else {
+
+				/*
+				 * BL	profout
+				 */
+				p->as = ABL;
+				p->from = zprg.from;
+				p->to = zprg.to;
+				p->to.type = D_BRANCH;
+				p->cond = ps4;
+				p->to.sym = s4;
+				p->scond = 14;
 
+				p = q;
+			}
 			continue;
 		}
 	}