diff --git a/common/build_target.c2 b/common/build_target.c2 index b0de1ae0c..228c3112c 100644 --- a/common/build_target.c2 +++ b/common/build_target.c2 @@ -105,6 +105,7 @@ public type Target struct @(opaque) { Kind kind; bool disable_asserts; + bool force_initializers; bool no_libc; BackEndKind backend; bool backend_no_build; @@ -176,6 +177,10 @@ public fn bool Target.hasAsserts(const Target* t) { return !t.disable_asserts; } public type Visitor fn void (void* arg, u32 name, Kind kind); +public fn void Target.enableForceInitializers(Target* t) { t.force_initializers = true; } + +public fn bool Target.hasForceInitializers(const Target* t) { return t.force_initializers; } + public fn void Target.visitLibs(const Target* t, Visitor visitor, void* arg) { t.libs.visit(visitor, arg); } diff --git a/compiler/c2recipe_parser.c2 b/compiler/c2recipe_parser.c2 index 8c7c98cfc..e87f5e0a6 100644 --- a/compiler/c2recipe_parser.c2 +++ b/compiler/c2recipe_parser.c2 @@ -44,6 +44,7 @@ type Kind enum u8 (const char* const name @(unused)) { Warnings : { "$warnings" }, Backend : { "$backend" }, DisableAsserts : { "$disable-asserts" }, + ForceInitializers : { "$force-initializers" }, NoLibc : { "$nolibc" }, Config : { "$config" }, Export : { "$export" }, @@ -159,7 +160,6 @@ fn void Parser.error(Parser* p, const char* format @(printf_format), ...) @(nore char[256] locstr; p.sm.loc2str(p.token.loc, locstr, elemsof(locstr)); - if (color.useColor()) { fprintf(stderr, "%s: %serror:%s %s\n", locstr, color.Red.str(), color.Normal.str(), msg); } else { @@ -395,6 +395,9 @@ fn void Parser.lex_option(Parser* p, Token* result) { case "disable-asserts": result.kind = DisableAsserts; break; + case "force-initializers": + result.kind = Kind.ForceInitializers; + break; case "nolibc": result.kind = NoLibc; break; @@ -457,6 +460,7 @@ fn void Parser.parseTop(Parser* p) { case Warnings: case Backend: case DisableAsserts: + case ForceInitializers: case NoLibc: p.error("must be inside target"); break; @@ -713,6 +717,11 @@ fn void Parser.parseTarget(Parser* p) { p.consumeToken(); p.target.disableAsserts(); break; + case ForceInitializers: + if (files_started) p.error("$force-initializers must come before files"); + p.consumeToken(); + p.target.enableForceInitializers(); + break; case NoLibc: if (files_started) p.error("$nolibc must come before files"); p.consumeToken(); diff --git a/compiler/compiler_generate.c2 b/compiler/compiler_generate.c2 index a144a45ae..9d9605b80 100644 --- a/compiler/compiler_generate.c2 +++ b/compiler/compiler_generate.c2 @@ -82,6 +82,7 @@ fn void Compiler.generate(Compiler* c, const char* target_name, const char* outp c.mainFunc, &asm_files, c.target.hasAsserts(), + c.target.hasForceInitializers(), c.target.getFastBuild() | c.opts.fast_build, c.opts.asan, c.opts.msan, c.opts.ubsan, c.opts.test_mode, c.opts.trace_calls); diff --git a/generator/c/c_generator.c2 b/generator/c/c_generator.c2 index 8fbc34826..c59d69d78 100644 --- a/generator/c/c_generator.c2 +++ b/generator/c/c_generator.c2 @@ -75,6 +75,7 @@ type Generator struct { const build_file.Info* build_info; const target_info.Info* targetInfo; bool enable_asserts; + bool force_initializers; bool fast_build; bool asan; bool msan; @@ -654,13 +655,16 @@ fn bool Generator.emitGlobalVarDecl(Generator* gen, string_buffer.Buf* out, Decl // generate definition to c file if (!d.isExported() && !emit_header) out.add("static "); gen.emitGlobalVarDeclCommon(out, d); - out.add(" = "); Expr* ie = vd.getInit(); if (ie) { + out.add(" = "); gen.emitConstExpr(out, ie, Assignment); } else { // auto-initialize (only required for embedded targets) - gen.emitAutoInit(out, d.getType()); + if (gen.force_initializers) { + out.add(" = "); + gen.emitAutoInit(out, d.getType()); + } } out.add(";\n"); } @@ -1283,6 +1287,7 @@ public fn void generate(string_pool.Pool* astPool, Decl* mainFunc, string_list.List* asm_files, bool enable_asserts, + bool force_initializers, bool fast_build, bool asan, bool msan, bool ubsan, bool test_mode, bool trace_calls) { @@ -1296,6 +1301,7 @@ public fn void generate(string_pool.Pool* astPool, Generator gen.init(astPool, target, kind, output_dir, dir, diags, sm, build_info, mainFunc); gen.auxPool = auxPool; gen.enable_asserts = enable_asserts; + gen.force_initializers = force_initializers; gen.fast_build = fast_build; gen.asan = asan; gen.msan = msan; diff --git a/test/c_generator/attributes/exported_not_static.c2t b/test/c_generator/attributes/exported_not_static.c2t index 1d32d32a8..34f31fbb9 100644 --- a/test/c_generator/attributes/exported_not_static.c2t +++ b/test/c_generator/attributes/exported_not_static.c2t @@ -20,9 +20,9 @@ public fn i32 main(i32 argc, const i8** argv) // @expect{atleast, cgen/build.c} -static int file1_a = 0; -int file1_b = 0; -static int file1_c = 0; +static int file1_a; +int file1_b; +static int file1_c; static void file1_f(void); void file1_g(void); diff --git a/test/c_generator/constants/string_literals.c2t b/test/c_generator/constants/string_literals.c2t index fa4fdf689..53da10a54 100644 --- a/test/c_generator/constants/string_literals.c2t +++ b/test/c_generator/constants/string_literals.c2t @@ -35,7 +35,7 @@ static const char test1_BBB[4] = "bbb"; static char test1_ddd[4] = "ddd"; static char test1_eee[4] = "eee"; static const char* test1_fff = "fff"; -static const char* test1_ggg = NULL; -static char test1_hhh[3] = { }; -static char* test1_iii = NULL; +static const char* test1_ggg; +static char test1_hhh[3]; +static char* test1_iii; diff --git a/test/c_generator/functions/struct_functions/global.c2t b/test/c_generator/functions/struct_functions/global.c2t index 427fa301e..5639a523d 100644 --- a/test/c_generator/functions/struct_functions/global.c2t +++ b/test/c_generator/functions/struct_functions/global.c2t @@ -25,7 +25,7 @@ struct test_Type_ { int member; }; -static test_Type test_t = { }; +static test_Type test_t; static void test_Type_init(test_Type* _arg0) { diff --git a/test/c_generator/module/static_single_module.c2t b/test/c_generator/module/static_single_module.c2t index 1bed81a14..3456e3113 100644 --- a/test/c_generator/module/static_single_module.c2t +++ b/test/c_generator/module/static_single_module.c2t @@ -17,8 +17,8 @@ public i32 y2; // @expect{atleast, cgen/build.c} -static int test1_x1 = 0; -int test1_y1 = 0; +static int test1_x1; +int test1_y1; // test2 symbols are not generated, because they are unused diff --git a/test/c_generator/module/variable_fast_build.c2t b/test/c_generator/module/variable_fast_build.c2t index 60a6ee000..af4277509 100644 --- a/test/c_generator/module/variable_fast_build.c2t +++ b/test/c_generator/module/variable_fast_build.c2t @@ -13,8 +13,8 @@ public char[] y2 = { 1, 2, 3, 4 } // @expect{atleast, cgen/test1.c} #include "test1.h" -static int test1_x1 = 0; -int test1_y1 = 0; +static int test1_x1; +int test1_y1; char test1_y2[4] = { 1, 2, 3, 4 }; // @expect{atleast, cgen/test1.h} diff --git a/test/c_generator/stmts/local_array_decl.c2t b/test/c_generator/stmts/local_array_decl.c2t index d8c43522d..6695b3b8c 100644 --- a/test/c_generator/stmts/local_array_decl.c2t +++ b/test/c_generator/stmts/local_array_decl.c2t @@ -20,7 +20,7 @@ public fn i32 main() { #define test_Size 20 -static int test_board[20][20] = { }; +static int test_board[20][20]; static void test_func1(void); diff --git a/test/c_generator/types/const_pointer_type.c2t b/test/c_generator/types/const_pointer_type.c2t index 0c45439dd..3bc749720 100644 --- a/test/c_generator/types/const_pointer_type.c2t +++ b/test/c_generator/types/const_pointer_type.c2t @@ -13,5 +13,5 @@ const Struct* p; // @expect{atleast, cgen/build.c} -static const test_Struct* test_p = NULL; +static const test_Struct* test_p; diff --git a/test/c_generator/types/qualifiers.c2t b/test/c_generator/types/qualifiers.c2t index b846c3bfe..0533a3c15 100644 --- a/test/c_generator/types/qualifiers.c2t +++ b/test/c_generator/types/qualifiers.c2t @@ -12,6 +12,6 @@ const volatile u32 C = 2; // @expect{atleast, cgen/build.c} #define test_A 1 -static volatile u16 test_b = 0; +static volatile u16 test_b; static const volatile u32 test_C = 2; diff --git a/test/c_generator/variables/initialize_2d_array.c2t b/test/c_generator/variables/initialize_2d_array.c2t index ed53018b8..6f60c79e8 100644 --- a/test/c_generator/variables/initialize_2d_array.c2t +++ b/test/c_generator/variables/initialize_2d_array.c2t @@ -8,5 +8,5 @@ module test; i32[3][2] a; // @expect{atleast, cgen/build.c} -static int test_a[3][2] = { }; +static int test_a[3][2]; diff --git a/test/c_generator/variables/should_initalize_globals.c2t b/test/c_generator/variables/should_initalize_globals.c2t index 2d2bf1502..99b19c94c 100644 --- a/test/c_generator/variables/should_initalize_globals.c2t +++ b/test/c_generator/variables/should_initalize_globals.c2t @@ -27,11 +27,11 @@ struct test_Foo_ { bool b; }; -static test_Foo test_f = { }; +static test_Foo test_f; -static int test_i = 0; +static int test_i; -static test_Foo test_fs[2] = { }; +static test_Foo test_fs[2]; -static int test_is[2] = { }; +static int test_is[2];