A few more fixes to get test-stage2 working with nasm

It seems that nasm confuses references to an extern named "wait"
with the wait instruction (at least in some contexts) so add a
workaround for that for now (compiled by host compiler). Posted
to nasm-devel, but I'm not sure about a patch to nasm yet.

Additionally fix an error in common symbols (two statics named
output_file, oops!) and few more att<->nasm syntax changes and
now test-stage2 is all working.

Author: sgraham

Makefile

@@ -1,6 +1,6 @@
 CFLAGS=-std=c11 -g -fno-common -Wall -Wno-switch
 
-SRCS=$(wildcard *.c)
+SRCS=codegen.c hashmap.c main.c parse.c preprocess.c strings.c tokenize.c type.c unicode.c
 OBJS=$(SRCS:.c=.o)
 
 TEST_SRCS=$(wildcard test/*.c)
@@ -9,13 +9,13 @@ TESTS=$(TEST_SRCS:.c=.exe)
 # Stage 1
 
 chibicc: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $^ wait_hack.c $(LDFLAGS)
 
 $(OBJS): chibicc.h
 
 test/%.exe: chibicc test/%.c
 	./chibicc -Iinclude -Itest -c -o test/$*.o test/$*.c
-	$(CC) -pthread -o $@ test/$*.o -xc test/common
+	$(CC) -pthread -o $@ test/$*.o wait_hack.c -xc test/common
 
 test: $(TESTS)
 	for i in $^; do echo $$i; ./$$i || exit 1; echo; done
@@ -26,7 +26,7 @@ test-all: test test-stage2
 # Stage 2
 
 stage2/chibicc: $(OBJS:%=stage2/%)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ wait_hack.c $^ $(LDFLAGS)
 
 stage2/%.o: chibicc %.c
 	mkdir -p stage2/test

codegen.c

@@ -390,7 +390,7 @@ static char f80i32[] = FROM_F80_1 "fistp dword" FROM_F80_2 "mov eax, [rsp-24]";
 static char f80u32[] = FROM_F80_1 "fistp dword" FROM_F80_2 "mov eax, [rsp-24]";
 static char f80i64[] = FROM_F80_1 "fistp qword" FROM_F80_2 "mov rax, [rsp-24]";
 static char f80u64[] = FROM_F80_1 "fistp qword" FROM_F80_2 "mov rax, [rsp-24]";
-static char f80f32[] = "fstps [rsp-8]\n movss xmm0, [rsp-8]";
+static char f80f32[] = "fstp dword [rsp-8]\n movss xmm0, [rsp-8]";
 static char f80f64[] = "fstp qword [rsp-8]\n movsd xmm0, [rsp-8]";
 
 static char *cast_table[][11] = {
@@ -1425,36 +1425,35 @@ static void emit_data(Obj *prog) {
       continue;
     }
 
-    if (!(opt_fcommon && var->is_tentative)) {
-      if (var->is_static)
-        println("  static %s:data", var->name);
-      else
-        println("  global %s:data", var->name);
-    }
+    if (var->is_static)
+      println("  static %s:data", var->name);
+    else if (!(opt_fcommon && var->is_tentative))
+      println("  global %s:data", var->name);
 
     int align = (var->ty->kind == TY_ARRAY && var->ty->size >= 16)
-      ? MAX(16, var->align) : var->align;
+                    ? MAX(16, var->align)
+                    : var->align;
 
     // Common symbol
-    if (opt_fcommon && var->is_tentative) {
+    if (opt_fcommon && var->is_tentative && !var->is_static) {
       println("  common %s %d:%d", var->name, var->ty->size, align);
       continue;
     }
 
     // .data or .tdata
     if (var->init_data) {
       if (var->is_tls)
-        println("  section .tdata"); // TODO: ,\"awT\",@progbits");
+        println("  section .tdata");  // TODO: ,\"awT\",@progbits");
       else
-        println("  section .data");
+        println("  section .data align=%d", align);
 
-      //TODO: necessary?
-      //println("  .type %s, @object", var->name);
-      //println("  .size %s, %d", var->name, var->ty->size);
-      println("  align %d", align);
+      // TODO: necessary?
+      // println("  .type %s, @object", var->name);
+      // println("  .size %s, %d", var->name, var->ty->size);
+      // println("  align %d", align);
       println("%s:", var->name);
 
-      Relocation *rel = var->rel;
+      Relocation* rel = var->rel;
       int pos = 0;
       while (pos < var->ty->size) {
         if (rel && rel->offset == pos) {
@@ -1472,9 +1471,9 @@ static void emit_data(Obj *prog) {
     if (var->is_tls)
       println("  section .tbss");  // TODO: ,\"awT\",@nobits");
     else
-      println("  section .bss");
+      println("  section .bss align=%d", align);
 
-    println("  align %d", align);
+    // println("  align %d", align);
     println("%s:", var->name);
     println("  resb %d", var->ty->size);
   }
@@ -1498,7 +1497,7 @@ static void store_gp(int r, int offset, int sz) {
     println("  mov [rbp+%d], %s", offset, argreg8[r]);
     return;
   case 2:
-    println("  mov [rbp+%d], %s", offset,  argreg16[r]);
+    println("  mov [rbp+%d], %s", offset, argreg16[r]);
     return;
   case 4:
     println("  mov [rbp+%d], %s", offset, argreg32[r]);
@@ -1516,7 +1515,7 @@ static void store_gp(int r, int offset, int sz) {
 }
 
 static void emit_text(Obj *prog) {
-  for (Obj *fn = prog; fn; fn = fn->next) {
+  for (Obj* fn = prog; fn; fn = fn->next) {
     if (!fn->is_function)
       continue;
 
@@ -1536,8 +1535,8 @@ static void emit_text(Obj *prog) {
       println("  global %s:function", fn->name);
 
     println("  section .text");
-    //TODO: necessary?
-    //println("  .type %s, @function", fn->name);
+    // TODO: necessary?
+    // println("  .type %s, @function", fn->name);
     println("%s:", fn->name);
     current_fn = fn;
 
@@ -1550,7 +1549,7 @@ static void emit_text(Obj *prog) {
     // Save arg registers if function is variadic
     if (fn->va_area) {
       int gp = 0, fp = 0;
-      for (Obj *var = fn->params; var; var = var->next) {
+      for (Obj* var = fn->params; var; var = var->next) {
         if (is_flonum(var->ty))
           fp++;
         else
@@ -1560,8 +1559,8 @@ static void emit_text(Obj *prog) {
       int off = fn->va_area->offset;
 
       // va_elem
-      println("  mov dword [rbp+%d], %d", off, gp * 8);            // gp_offset
-      println("  mov dword [rbp+%d], %d", off + 4, fp * 8 + 48);   // fp_offset
+      println("  mov dword [rbp+%d], %d", off, gp * 8);           // gp_offset
+      println("  mov dword [rbp+%d], %d", off + 4, fp * 8 + 48);  // fp_offset
       println("  mov [rbp+%d], rbp", off + 8);  // overflow_arg_area
       println("  add qword [rbp+%d], 16", off + 8);
       println("  mov [rbp+%d], rbp", off + 16);  // reg_save_area

main.c

@@ -100,6 +100,9 @@ int main(int argc, char **argv) {
 #include <sys/wait.h>
 #include <unistd.h>
 
+// Workaround for nasm issue referring to "wait".
+pid_t MYwait(int *wstatus);
+
 typedef enum {
   FILE_NONE, FILE_C, FILE_ASM, FILE_OBJ, FILE_AR, FILE_DSO,
 } FileType;
@@ -506,7 +509,7 @@ static void run_subprocess(char **argv) {
 
   // Wait for the child process to finish.
   int status;
-  while (wait(&status) > 0);
+  while (MYwait(&status) > 0);
   if (status != 0)
     exit(1);
 }

wait_hack.c

@@ -0,0 +1,5 @@
+#include <sys/wait.h>
+
+pid_t MYwait(int *wstatus) {
+  return wait(wstatus);
+}