shithub: scc

Download patch

ref: c2c0b221ecefcdb7e97e675767c1ffad562016b8
parent: 94a509a154147d355d23b9d8ec0df9f523ae0b58
author: Quentin Rameau <[email protected]>
date: Tue Jun 7 09:37:24 EDT 2016 

[driver] use pointers in tools lookup table


--- a/driver/posix/scc.c
+++ b/driver/posix/scc.c
@@ -26,7 +26,8 @@
 	NR_TOOLS,
 };
 
-static struct tool {
+typedef struct tool Tool;
+struct tool {
 	char  cmd[PATH_MAX];
 	char *args[NARGS];
 	char  bin[16];
@@ -33,15 +34,17 @@
 	char *outfile;
 	int   nargs, in, out;
 	pid_t pid;
-} tools[NR_TOOLS] = {
-	[CC1] = { .bin = "cc1", .cmd = PREFIX "/libexec/scc/", },
-	[CC2] = { .bin = "cc2", .cmd = PREFIX "/libexec/scc/", },
-	[QBE] = { .bin = "qbe", .cmd = "qbe", },
-	[AS]  = { .bin = "as",  .cmd = "as", },
-	[LD]  = { .bin = "gcc", .cmd = "gcc", }, /* TODO replace with ld */
-	[TEE] = { .bin = "tee", .cmd = "tee", },
 };
 
+static Tool *tools[] = {
+	[CC1] = &(Tool){ .bin = "cc1", .cmd = PREFIX "/libexec/scc/", },
+	[CC2] = &(Tool){ .bin = "cc2", .cmd = PREFIX "/libexec/scc/", },
+	[QBE] = &(Tool){ .bin = "qbe", .cmd = "qbe", },
+	[AS]  = &(Tool){ .bin = "as",  .cmd = "as", },
+	[LD]  = &(Tool){ .bin = "gcc", .cmd = "gcc", }, /* TODO replace with ld */
+	[TEE] = &(Tool){ .bin = "tee", .cmd = "tee", },
+};
+
 char *argv0;
 static char *arch;
 static char *tmpobjs[NARGS - 2];
@@ -52,11 +55,11 @@
 static void
 terminate(void)
 {
-	struct tool *t;
+	Tool *t;
 	int i;
 
 	for (i = 0; i < NR_TOOLS; ++i) {
-		t = &tools[i];
+		t = tools[i];
 		if (t->pid)
 			kill(t->pid, SIGTERM);
 		if (i >= failedtool && t->outfile)
@@ -67,7 +70,7 @@
 static int
 inittool(int tool)
 {
-	struct tool *t = &tools[tool];
+	Tool *t = tools[tool];
 	size_t binln;
 	int n;
 
@@ -138,7 +141,7 @@
 
 static void
 addarg(int tool, char *arg) {
-	struct tool *t = &tools[tool];
+	Tool *t = tools[tool];
 
 	if (!(t->nargs < NARGS - 2)) /* 2: argv0, NULL terminator */
 		die("scc: too many parameters given");
@@ -149,7 +152,7 @@
 static int
 settool(int tool, char *input, int nexttool)
 {
-	struct tool *t = &tools[tool];
+	Tool *t = tools[tool];
 	int fds[2], proxiedtool;
 	char *ext;
 	static int fdin;
@@ -177,8 +180,8 @@
 			proxiedtool = CC2;
 			ext = "as"; break;
 		}
-		tools[proxiedtool].outfile = outfilename(input, ext);
-		t->args[1] = tools[proxiedtool].outfile;
+		tools[proxiedtool]->outfile = outfilename(input, ext);
+		t->args[1] = tools[proxiedtool]->outfile;
 		break;
 	default:
 		break;
@@ -204,7 +207,7 @@
 static void
 spawn(int t)
 {
-	struct tool *tool = &tools[t];
+	Tool *tool = tools[t];
 
 	switch (tool->pid = fork()) {
 	case -1:
@@ -248,7 +251,7 @@
 static void
 checktool(int tool)
 {
-	struct tool *t = &tools[tool];
+	Tool *t = tools[tool];
 	int st;
 
 	if (!t->pid)
@@ -319,7 +322,7 @@
 			break;
 		case LD:
 			if (backtool == AS)
-				tmpobjs[nobjs++] = xstrdup(tools[AS].outfile);
+				tmpobjs[nobjs++] = xstrdup(tools[AS]->outfile);
 			else
 				addarg(LD, file);
 			nexttool = NR_TOOLS;
@@ -344,8 +347,8 @@
 
 	for (i = 0; i < NR_TOOLS; ++i) {
 		if (i != LD) {
-			free(tools[i].outfile);
-			tools[i].outfile = NULL;
+			free(tools[i]->outfile);
+			tools[i]->outfile = NULL;
 		}
 	}
 }
@@ -387,7 +390,7 @@
 		arch = EARGF(usage());
 		break;
 	case 'o':
-		tools[LD].outfile = EARGF(usage());
+		tools[LD]->outfile = EARGF(usage());
 		break;
 	case 'w':
 		addarg(CC1, "-w");