From a7bb4ec4b1b4fd77c312d2b5ce2bc0f8d4569a0d Mon Sep 17 00:00:00 2001
From: George Koehler <xkernigh@netscape.net>
Date: Thu, 1 Mar 2018 13:19:38 -0500
Subject: [PATCH] Fixes for compiling ego with -DTRACE

 - In share/debug.c, undo my mistake in commit 9037d13 by changing
   vfprintf back to fprintf in OUTTRACE.

 - In ud/ud.c, move the trace output from stdout to stderr, because
   stdout has ego's output file, which becomes opt2's input file.  If
   trace output goes to stdout, it gets prepended to the output file,
   and opt2 errors with "wrong input file".

I also edit both build.lua files so ego depends on its header files;
this part isn't needed for -DTRACE.

One can now use -DTRACE by adding it to the cflags in both build.lua
files.
---
 util/ego/build.lua       |  1 +
 util/ego/share/build.lua |  3 +--
 util/ego/share/debug.c   |  2 +-
 util/ego/ud/ud.c         | 41 ++++++++++++++++++++--------------------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/util/ego/build.lua b/util/ego/build.lua
index 864447550..78895f508 100644
--- a/util/ego/build.lua
+++ b/util/ego/build.lua
@@ -3,6 +3,7 @@ local function build_ego(name)
 		name = name,
 		srcs = { "./"..name.."/*.c" },
 		deps = {
+			"./"..name.."/*.h",
 			"util/ego/share+lib",
 			"modules/src/em_data+lib",
 			"h+emheaders",
diff --git a/util/ego/share/build.lua b/util/ego/share/build.lua
index ab1068d2c..5ca714897 100644
--- a/util/ego/share/build.lua
+++ b/util/ego/share/build.lua
@@ -48,6 +48,7 @@ clibrary {
 		"./init_glob.c",
 	},
 	deps = {
+		"./*.h",
 		"+classdefs_h",
 		"+pop_push_h",
 		"h+emheaders",
@@ -57,5 +58,3 @@ clibrary {
 		["+cflags"] = {"-DVERBOSE", "-DNOTCOMPACT"}
 	}
 }
-
-
diff --git a/util/ego/share/debug.c b/util/ego/share/debug.c
index 81080f7cf..56514d149 100644
--- a/util/ego/share/debug.c
+++ b/util/ego/share/debug.c
@@ -45,7 +45,7 @@ void error(const char *s, ...)
 void OUTTRACE(const char *s, int n)
 {
 	fprintf(stderr,"> ");
-	vfprintf(stderr,s,n);
+	fprintf(stderr,s,n);
 	fprintf(stderr,"\n");
 }
 #endif
diff --git a/util/ego/ud/ud.c b/util/ego/ud/ud.c
index c0fe613fd..087337144 100644
--- a/util/ego/ud/ud.c
+++ b/util/ego/ud/ud.c
@@ -269,13 +269,13 @@ pr_localtab() {
 	short i;
 	local_p lc;
 
-	printf("LOCAL-TABLE (%d)\n\n",nrlocals);
+	fprintf(stderr,"LOCAL-TABLE (%d)\n\n",nrlocals);
 	for (i = 1; i <= nrlocals; i++) {
 		lc = locals[i];
-		printf("LOCAL %d\n",i);
-		printf("	offset= %ld\n",lc->lc_off);
-		printf("	size=   %d\n",lc->lc_size);
-		printf("	flags=  %d\n",lc->lc_flags);
+		fprintf(stderr,"LOCAL %d\n",i);
+		fprintf(stderr,"\toffset= %ld\n",lc->lc_off);
+		fprintf(stderr,"\tsize=   %d\n",lc->lc_size);
+		fprintf(stderr,"\tflags=  %d\n",lc->lc_flags);
 	}
 }
 
@@ -284,12 +284,13 @@ pr_globals()
 	dblock_p d;
 	obj_p obj;
 
-	printf("GLOBALS (%d)\n\n",nrglobals);
-	printf("ID	GLOBNR\n");
+	fprintf(stderr,"GLOBALS (%d)\n\n",nrglobals);
+	fprintf(stderr,"ID\tGLOBNR\n");
 	for (d = fdblock; d != (dblock_p) 0; d = d->d_next) {
 		for (obj = d->d_objlist; obj != (obj_p) 0; obj = obj->o_next) {
 			if (obj->o_globnr != 0) {
-			   printf("%d	%d\n", obj->o_id,obj->o_globnr);
+				fprintf(stderr,"%d\t%d\n",
+				    obj->o_id,obj->o_globnr);
 			}
 		}
 	}
@@ -302,20 +303,20 @@ pr_defs()
 	short i;
 	line_p l;
 
-	printf("DEF TABLE\n\n");
+	fprintf(stderr,"DEF TABLE\n\n");
 	for (i = 1; i <= nrexpldefs; i++) {
 		l = defs[i];
-		printf("%d	%s ",EXPL_TO_DEFNR(i),
+		fprintf(stderr,"%d\t%s ",EXPL_TO_DEFNR(i),
 			&em_mnem[(INSTR(l)-sp_fmnem)*4]);
 		switch(TYPE(l)) {
 			case OPSHORT:
-				printf("%d\n",SHORT(l));
+				fprintf(stderr,"%d\n",SHORT(l));
 				break;
 			case OPOFFSET:
-				printf("%ld\n",OFFSET(l));
+				fprintf(stderr,"%ld\n",OFFSET(l));
 				break;
 			case OPOBJECT:
-				printf("%d\n",OBJ(l)->o_id);
+				fprintf(stderr,"%d\n",OBJ(l)->o_id);
 				break;
 			default:
 				assert(FALSE);
@@ -331,13 +332,13 @@ pr_set(name,k,s,n)
 {
 	short i;
 
-	printf("%s(%d) =	{",name,k);
+	fprintf(stderr,"%s(%d) =\t{",name,k);
 	for (i = 1; i <= n; i++) {
 		if (Cis_elem(i,s)) {
-			printf("%d ",i);
+			fprintf(stderr,"%d ",i);
 		}
 	}
-	printf ("}\n");
+	fprintf(stderr,"}\n");
 }
 
 pr_blocks(p)
@@ -347,7 +348,7 @@ pr_blocks(p)
 	short n;
 
 	for (b = p->p_start; b != 0; b = b->b_next) {
-		printf ("\n");
+		fprintf(stderr,"\n");
 		n = b->b_id;
 		pr_set("GEN",n,GEN(b),nrdefs);
 		pr_set("KILL",n,KILL(b),nrdefs);
@@ -361,10 +362,10 @@ pr_copies()
 {
 	short i;
 
-	printf("\nCOPY TABLE\n\n");
+	fprintf(stderr,"\nCOPY TABLE\n\n");
 	for (i = 1; i <= nrdefs; i++) {
 		if (def_to_copynr[i] != 0) {
-			printf("%d	%d\n",i,def_to_copynr[i]);
+			fprintf(stderr,"%d\t%d\n",i,def_to_copynr[i]);
 		}
 	}
 }
@@ -376,7 +377,7 @@ pr_cblocks(p)
 	short n;
 
 	for (b = p->p_start; b != 0; b = b->b_next) {
-		printf ("\n");
+		fprintf(stderr,"\n");
 		n = b->b_id;
 		pr_set("CGEN",n,C_GEN(b),nrcopies);
 		pr_set("CKILL",n,C_KILL(b),nrcopies);