Change ncgg so it puts output files where it's told rather than the

current directory.

Author: davidgiven

util/ncgg/build.py

@@ -39,9 +39,7 @@ def ncgg(self, name, srcs: Targets = [], deps: Targets = [], cflags=[]):
         ins=["util/ncgg", cpptable],
         outs=["=tables.c", "=tables.h"],
         commands=[
-            "$[ins]",
-            "mv tables.h $[dir]/tables.h",
-            "mv tables.c $[dir]/tables.c",
+            "$[ins[0]] -o $[dir] $[ins[1:]]"
         ],
         label="NCGG",
     )

util/ncgg/extern.h

@@ -2,7 +2,6 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-/* $Id$ */
 
 extern int wordsize;
 extern int pointersize;
@@ -31,7 +30,7 @@ extern int allsetno;
 extern int inproc;
 extern int callproc;
 extern int procarg[];
-extern int fc1,fc2,fc3,fc4;
+extern int fc1, fc2, fc3, fc4;
 extern int maxmembers;
 extern int regclass;
 extern int maxtokensize;
@@ -48,7 +47,7 @@ extern void initemhash(void);
 /* error.c */
 extern void fatal(const char* s, ...);
 extern void error(const char* s, ...);
-extern int tabovf(char *string);
+extern int tabovf(char* string);
 
 /* output.c */
 extern void errorexit(void);
@@ -57,4 +56,11 @@ extern void finishio(void);
 extern void statistics(void);
 
 /* strlookup.c */
-extern int strlookup(char *str);
+extern int strlookup(char* str);
+
+/* Global parameters */
+extern int nerrors;
+extern int code_in_c;
+extern int tabledebug;
+extern int verbose;
+extern const char* outputdir;

util/ncgg/main.c

@@ -2,27 +2,18 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-#ifndef NORCSID
-static char rcsid[] = "$Id$";
-#endif
 
 #include <stdlib.h>
 #include <stdio.h>
 #include "param.h"
 #include "hall.h"
 #include "expr.h"
 #include "extern.h"
-#include "lookup.h"
 
-char *filename;
+char* filename;
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-	extern int nerrors;
-	extern int code_in_c;
-	extern int tabledebug;
-	extern int verbose;
-
 	while (argc > 1 && argv[1][0] == '-')
 	{
 		switch (argv[1][1])
@@ -36,6 +27,11 @@ int main(int argc, char **argv)
 			case 'v':
 				verbose++;
 				break;
+			case 'o':
+				outputdir = argv[2];
+				argv++;
+				argc--;
+				break;
 			default:
 				error("Unknown flag -%c", argv[1][1]);
 		}

util/ncgg/ncgg.6

@@ -5,7 +5,7 @@
 cgg \- Code table translating utility
 .SH SYNOPSIS
 .B ~em/lib.bin/cgg
-[-c] [-d] [-v] table
+[-c] [-d] [-v] [-o outputdir] table
 .SH DESCRIPTION
 cgg translates a machine description table into the internal
 structures needed by em_cg.
@@ -25,6 +25,8 @@ bittable described under the -u option of em_ncg(6).
 Give statistics about table usage at end of program.
 Normally only the tables that have been used more than 75%
 are reported.
+.IP -o outputdir
+Write the output files to the specified directory.
 .SH FILES
 tables.h, tables.c
 .br

util/ncgg/output.c

@@ -2,27 +2,14 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
-/* #define CODEDEBUG 	*//* print readable code */
-#ifdef CODEDEBUG
-int code_in_c=0; /* put readable code in "code" */
-int tabledebug=1; /* generate code for table debugging */
-#else
-int code_in_c = 1; /* put code in "tables.c" */
-int tabledebug = 0; /* do not generate code for table debugging */
-#endif
-int verbose = 0; /* print all statistics */
-int use_tes; /* use top element size information */
-char *c_file = "tables.c";
-char *h_file = "tables.h";
-char *cd_file = "code";
-
-#ifndef NORCSID
-static char rcsid[] = "$Id$";
-#endif
+/* #define CODEDEBUG 	*/ /* print readable code */
 
+#include <errno.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <unistd.h>
 #include "varinfo.h"
 #include "param.h"
 #include "reg.h"
@@ -36,7 +23,21 @@ static char rcsid[] = "$Id$";
 #include "pseudo.h"
 #include "regvar.h"
 #include "extern.h"
+#include "subr.h"
 
+#ifdef CODEDEBUG
+int code_in_c=0; /* put readable code in "code" */
+int tabledebug=1; /* generate code for table debugging */
+#else
+int code_in_c = 1; /* put code in "tables.c" */
+int tabledebug = 0; /* do not generate code for table debugging */
+#endif
+int verbose = 0; /* print all statistics */
+int use_tes; /* use top element size information */
+char *c_file = "tables.c";
+char *h_file = "tables.h";
+char *cd_file = "code";
+const char* outputdir = ".";
 #define BMASK 0xFF
 #define BSHIFT 8
 
@@ -105,6 +106,12 @@ void unlfile(FILE *f, char *s)
 
 void initio(void)
 {
+	char* oldcwd = mygetcwd();
+
+	errno = 0;
+	chdir(outputdir);
+	if (errno)
+		perror("output directory inaccessible");
 
 	opnfile(&ctable, c_file);
 	opnfile(&htable, h_file);
@@ -114,7 +121,10 @@ void initio(void)
 		opnfile(&code, cd_file);
 	patbyte(0);
 	if (tabledebug)
-		lineset = (short *) myalloc(SZOFSET(MAXSOURCELINES) * sizeof(short));
+		lineset = (short*)myalloc(SZOFSET(MAXSOURCELINES) * sizeof(short));
+
+	chdir(oldcwd);
+	free(oldcwd);
 }
 
 void finishcode(void)

util/ncgg/subr.c

@@ -2,6 +2,8 @@
  * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
+#include <errno.h>
+#include <unistd.h>
 #ifndef NORCSID
 static char rcsid[] = "$Id$";
 #endif
@@ -515,3 +517,20 @@ int vilength(struct varinfo *vip)
 	}
 	return (l);
 }
+
+char* mygetcwd(void)
+{
+	size_t size = 100;
+
+	while (1)
+	{
+		char* buffer = malloc(size);
+		if (getcwd(buffer, size) == buffer)
+			return buffer;
+		free(buffer);
+		if (errno != ERANGE)
+			return NULL;
+		size *= 2;
+	}
+}
+

util/ncgg/subr.h

@@ -1,9 +1,9 @@
 /*  Copyright (c) 2019 ACK Project.
- *  See the copyright notice in the ACK home directory, 
+ *  See the copyright notice in the ACK home directory,
  *  in the file "Copyright".
  *
  *  Created on: 2019-05-02
- *  
+ *
  */
 #ifndef SUBR_H_
 #define SUBR_H_
@@ -12,31 +12,31 @@
 
 struct varinfo;
 
-
-void n_proc(char *name);
-struct varinfo * make_erase(char *name);
-void n_instr(char *name, char *asname, operand *oplist, struct varinfo *eraselist,
-		  struct varinfo *cost);
-void n_set(char *name, int number);
-void n_tok(char *name, struct varinfo *atts, int size,
-		 struct varinfo *cost, struct varinfo *format);
-void checkprintformat(int n);
-void n_prop(char *name, int size);
-void prophall(int n);
-int n_reg(char *name, char *printstring, int nmemb, int member1, int member2);
-void make_const(void);
-int cmustbeset(char *ident);
-void n_const(char *ident, int val);
-void n_sconst(char *ident, char *val);
-void regline(struct varinfo *rl, struct varinfo *pl, int rv);
-void check_reglap(void);
-void setallreg(struct varinfo *vi);
-void freevi(struct varinfo *vip);
-int myatoi(char *s);
-char *mystrcpy(char *s);
-char *myalloc(int n);
-int chkincl(int value, int lwb, int upb);
-int subset(short *sp1, short *sp2, int setsize);
-int vilength(struct varinfo *vip);
+extern void n_proc(char* name);
+extern struct varinfo* make_erase(char* name);
+extern void
+n_instr(char* name, char* asname, operand* oplist, struct varinfo* eraselist, struct varinfo* cost);
+extern void n_set(char* name, int number);
+extern void
+n_tok(char* name, struct varinfo* atts, int size, struct varinfo* cost, struct varinfo* format);
+extern void checkprintformat(int n);
+extern void n_prop(char* name, int size);
+extern void prophall(int n);
+extern int n_reg(char* name, char* printstring, int nmemb, int member1, int member2);
+extern void make_const(void);
+extern int cmustbeset(char* ident);
+extern void n_const(char* ident, int val);
+extern void n_sconst(char* ident, char* val);
+extern void regline(struct varinfo* rl, struct varinfo* pl, int rv);
+extern void check_reglap(void);
+extern void setallreg(struct varinfo* vi);
+extern void freevi(struct varinfo* vip);
+extern int myatoi(char* s);
+extern char* mystrcpy(char* s);
+extern char* myalloc(int n);
+extern int chkincl(int value, int lwb, int upb);
+extern int subset(short* sp1, short* sp2, int setsize);
+extern int vilength(struct varinfo* vip);
+extern char* mygetcwd(void);
 
 #endif /* SUBR_H_ */