C-generator: use c2 types in C code generated

* no longer use `int32_t` etc. in generated C code to avoid naming conflicts.
  Use `i8`, u8`, `i16`, `u16`, `int`, `u32`, `i64`, `u64`,
  `ssize_t`, `size_t`, `float` and `double` instead.
* use explicit `signed int` for bitfields to avoid implementation defined
  behavior on `int` bitfields

Author: chqrlie

generator/c/c_generator.c2

@@ -239,22 +239,22 @@ fn void Generator.emitEnumType(Generator* gen, string_buffer.Buf* out, Decl* d)
 
 const char*[BuiltinKind] builtinType_cnames = {
     "char",
-    "int8_t",
-    "int16_t",
-    "int32_t",
-    "int64_t",
-    "uint8_t",
-    "uint16_t",
-    "uint32_t",
-    "uint64_t",
+    "i8",
+    "i16",
+    "int",
+    "i64",
+    "u8",
+    "u16",
+    "u32",
+    "u64",
     "float",
     "double",
     "ssize_t",
     "size_t",
     "bool",
 }
 
-fn void Generator.emitTypePre(Generator* gen, string_buffer.Buf* out, QualType qt) {
+fn void Generator.emitTypePre(Generator* gen, string_buffer.Buf* out, QualType qt, bool bitfield = false) {
     Decl* decl = nil;
 
     if (qt.isConst()) out.add("const ");
@@ -263,6 +263,8 @@ fn void Generator.emitTypePre(Generator* gen, string_buffer.Buf* out, QualType q
     switch (qt.getKind()) {
     case Builtin:
         BuiltinType* bt = (BuiltinType*)qt.getType();
+        // special case to ensure signed behavior
+        if (bitfield && bt.getKind() == Int32) out.add("signed  ");
         out.add(builtinType_cnames[bt.getKind()]);
         return;
     case Pointer:
@@ -385,13 +387,14 @@ fn void Generator.emitStructMember(Generator* gen, string_buffer.Buf* out, Decl*
         }
         gen.genTypeIfNeeded(qt, true);
 
-        gen.emitTypePre(out, qt);
+        VarDecl* vd = (VarDecl*)d;
+        Expr* bitfield = vd.getBitfield();
+
+        gen.emitTypePre(out, qt, bitfield != nil);
         out.space();
         if (d.getNameIdx()) out.add(d.getName());
         gen.emitTypePost(out, qt);
 
-        VarDecl* vd = (VarDecl*)d;
-        Expr* bitfield = vd.getBitfield();
         if (bitfield) {
             out.add(" : ");
             // C does not allow using constants here, so generate CTV Value
@@ -861,7 +864,7 @@ fn void Generator.gen_func_proto(Generator* gen, FunctionDecl* fd, string_buffer
     }
 
     if (d == gen.mainFunc) {
-        out.add("int32_t main");
+        out.add("int main");
     } else {
         // 2 options:
         // - external .c2i files
@@ -1435,12 +1438,11 @@ const char[] C_types =
     #define true 1
     #define false 0
     #endif
-    typedef signed char int8_t;
-    typedef unsigned char uint8_t;
-    typedef signed short int16_t;
-    typedef unsigned short uint16_t;
-    typedef signed int int32_t;
-    typedef unsigned int uint32_t;
+    typedef signed char i8;
+    typedef unsigned char u8;
+    typedef signed short i16;
+    typedef unsigned short u16;
+    typedef unsigned int u32;
     ```;
 const char[] C_defines =
     ```c
@@ -1493,24 +1495,24 @@ fn void Generator.emit_external_header(Generator* gen, bool enable_asserts, cons
     if (ast.getWordSize() == 4) {
         // ILP32 (32-bit int, long and pointers)
         out.add(```c
-                typedef signed long long int64_t;
-                typedef unsigned long long uint64_t;
+                typedef signed long long i64;
+                typedef unsigned long long u64;
                 typedef signed long ssize_t;
                 typedef unsigned long size_t;
                 ```);
     } else {
         // LP64 (64-bit long and pointers)
         out.add(```c
-                typedef signed long int64_t;
-                typedef unsigned long uint64_t;
+                typedef signed long i64;
+                typedef unsigned long u64;
                 typedef signed long ssize_t;
                 typedef unsigned long size_t;
                 ```);
 #if 0
         // TODO support LLP64 (64-bit long long and pointers, but 32-bit long)
         out.add(```c
-                typedef signed long long int64_t;
-                typedef unsigned long long uint64_t;
+                typedef signed long long i64;
+                typedef unsigned long long u64;
                 typedef signed long long ssize_t;
                 typedef unsigned long long size_t;
                 ```);

generator/c/c_generator_special.c2

@@ -290,14 +290,14 @@ const char[] C2_types_header =
     #define to_container(type, member, ptr) ((type *)((char *)(ptr)-offsetof(type, member)))
 
     // NOTE: 64-bit only for now
-    typedef signed char int8_t;
-    typedef unsigned char uint8_t;
-    typedef signed short int int16_t;
-    typedef unsigned short int uint16_t;
-    typedef signed int int32_t;
-    typedef unsigned int uint32_t;
-    typedef signed long int64_t;
-    typedef unsigned long uint64_t;
+    typedef signed char i8;
+    typedef unsigned char u8;
+    typedef signed short int i16;
+    typedef unsigned short int u16;
+    typedef signed int i32;
+    typedef unsigned int u32;
+    typedef signed long i64;
+    typedef unsigned long u64;
 
     #ifdef __cplusplus
     }

generator/c/c_generator_stmt.c2

@@ -471,10 +471,7 @@ fn void Generator.emitCase(Generator* gen, SwitchCase* c, u32 indent, u32 *lab)
     }
 
     const u32 num_stmts = c.getNumStmts();
-    if (num_stmts == 0) {
-        //out.indent(indent+1);
-        //out.add("fallthrough;\n");
-    } else {
+    if (num_stmts > 0) {
         Stmt** stmts = c.getStmts();
         for (u32 i=0; i<num_stmts; i++) {
             gen.emitStmt(stmts[i], indent+1, true);

generator/c/c_generator_trace.c2

@@ -193,10 +193,10 @@ fn void Generator.writeCalls(Generator* gen, string_buffer.Buf* out) {
     }
     out.add("};\n\n");
 
-    out.add("uint32_t c2_trace_length = sizeof(c2_trace_data) / sizeof(c2_trace_data[0]);\n"
-            "uint32_t c2_trace_counts[sizeof(c2_trace_data) / sizeof(c2_trace_data[0])];\n\n");
+    out.add("u32 c2_trace_length = sizeof(c2_trace_data) / sizeof(c2_trace_data[0]);\n"
+            "u32 c2_trace_counts[sizeof(c2_trace_data) / sizeof(c2_trace_data[0])];\n\n");
 }
 
 fn void Generator.writeCallExterns(Generator* gen, string_buffer.Buf* out) {
-    out.add("extern uint32_t c2_trace_counts[];\n");
+    out.add("extern u32 c2_trace_counts[];\n");
 }

libs/io_uring/io_uring.c2i

@@ -694,7 +694,7 @@ static inline bool io_uring_cq_eventfd_enabled(const struct io_uring *ring)
 static inline int io_uring_cq_eventfd_toggle(struct io_uring *ring,
 					     bool enabled)
 {
-	uint32_t flags;
+	u32 flags;
 
 	if (!!enabled == io_uring_cq_eventfd_enabled(ring))
 		return 0;

test/auto_args/auto_arg_callback_ok.c2t

@@ -27,13 +27,13 @@ public fn i32 main() {
 
 // @expect{atleast, cgen/build.c}
 
-typedef void (*test_Func)(const char* file, uint32_t line);
+typedef void (*test_Func)(const char* file, u32 line);
 
-static void test_impl(const char* file, uint32_t line);
+static void test_impl(const char* file, u32 line);
 static void test_test1(test_Func f);
 static void test_test2(void);
 
-static void test_impl(const char* file, uint32_t line)
+static void test_impl(const char* file, u32 line)
 {
 }
 

test/auto_args/auto_file_ok.c2t

@@ -18,13 +18,13 @@ public fn i32 main() {
 
 // @expect{atleast, cgen/build.c}
 
-static void test_test2(const char* file, uint32_t line);
+static void test_test2(const char* file, u32 line);
 
-static void test_test2(const char* file, uint32_t line)
+static void test_test2(const char* file, u32 line)
 {
 }
 
-int32_t main(void)
+int main(void)
 {
    test_test2("file1.c2", 7);
    test_test2("file1.c2", 8);

test/auto_args/multi_file.c2t

@@ -25,7 +25,7 @@ public fn i32 main() {
 
 // @expect{atleast, cgen/test.c}
 
-int32_t main(void)
+int main(void)
 {
    foo_Foo* f = NULL;
    foo_Foo_test(f, "file2.c2", 7, NULL);

test/auto_args/static_lib.c2t

@@ -19,6 +19,6 @@ fn void Foo.test(Foo* f, const char* file @(auto_file), u32 line @(auto_line), v
 
 // @expect{atleast, foo.h}
 
-void foo_Foo_test(foo_Foo* f, const char* file, uint32_t line, void* p);
+void foo_Foo_test(foo_Foo* f, const char* file, u32 line, void* p);
 
 

test/auto_args/struct_function_before_self.c2t

@@ -19,13 +19,13 @@ public fn i32 main() {
 }
 
 // @expect{atleast, cgen/build.c}
-static void test_Foo_test(const char* file, uint32_t line, test_Foo* f, void* p);
-int32_t main(void);
-static void test_Foo_test(const char* file, uint32_t line, test_Foo* f, void* p)
+static void test_Foo_test(const char* file, u32 line, test_Foo* f, void* p);
+int main(void);
+static void test_Foo_test(const char* file, u32 line, test_Foo* f, void* p)
 {
 }
 
-int32_t main(void)
+int main(void)
 {
    test_Foo f;
    test_Foo_test("file1.c2", 11, &f, NULL);