--- a/lwasm/main.c	Tue Apr 06 21:03:19 2010 -0600
+++ b/lwasm/main.c	Tue Apr 06 21:35:09 2010 -0600
@@ -166,11 +166,26 @@
 */
 extern void do_pass1(asmstate_t *as);
 extern void do_pass2(asmstate_t *as);
+extern void do_pass3(asmstate_t *as);
 extern lw_expr_t lwasm_evaluate_special(int t, void *ptr, void *priv);
 extern lw_expr_t lwasm_evaluate_var(char *var, void *priv);
 extern lw_expr_t lwasm_parse_term(char **p, void *priv);
+
+struct passlist_s
+{
+	char *passname;
+	void (*fn)(asmstate_t *as);
+} passlist[] = {
+	{ "parse", do_pass1 },
+	{ "symcheck", do_pass2 },
+	{ "resolve1", do_pass3 },
+	{ NULL, NULL }
+};
+
 int main(int argc, char **argv)
 {
+	int passnum;
+
 	/* assembler state */
 	asmstate_t asmstate = { 0 };
 	program_name = argv[0];
@@ -193,13 +208,15 @@
 
 	input_init(&asmstate);
 
-	do_pass1(&asmstate);
-	if (asmstate.errorcount > 0)
+	for (passnum = 0; passlist[passnum].fn; passnum++)
 	{
-		lwasm_show_errors(&asmstate);
-		exit(1);
+		fprintf(stderr, "Doing pass %d (%s)\n", passnum, passlist[passnum].passname);
+		(passlist[passnum].fn)(&asmstate);
+		
+		if (asmstate.errorcount > 0)
+		{
+			lwasm_show_errors(&asmstate);
+			exit(1);
+		}
 	}
-	do_pass2(&asmstate);
-	
-	exit(0);
 }