authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-05-29 17:14:34-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-05-29 17:14:34-04:00
log6dbaae4c461ed4e8d6b087366b6069ba8dba628f
treea8f243036d9ab2699351c561ca0f83b2c9c471fc
parent7017388e9ea9a5b144780c0a5c090bb7a221c9b6
parent3819654c3931b762b0d3dac3b79d58eb791a646d
signaturelock-open Commit is signed but in an unrecognized format.

Merge branch 'emekoi-builtin-subsystem'

6 files changed, 74 insertions(+), 12 deletions(-)

src/all_types.hpp+1-1
......@@ -1857,7 +1857,7 @@ struct CodeGen {
18571857 BuildMode build_mode;
18581858 OutType out_type;
18591859 const ZigTarget *zig_target;
1860 TargetSubsystem subsystem;
1860 TargetSubsystem subsystem; // careful using this directly; see detect_subsystem
18611861 ValgrindSupport valgrind_support;
18621862 bool strip_debug_symbols;
18631863 bool is_test_build;
src/analyze.cpp-3
......@@ -2722,12 +2722,10 @@ void add_fn_export(CodeGen *g, ZigFn *fn_table_entry, Buf *symbol_name, GlobalLi
27222722 if (ccc) {
27232723 if (buf_eql_str(symbol_name, "main") && g->libc_link_lib != nullptr) {
27242724 g->have_c_main = true;
2725 g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem;
27262725 } else if (buf_eql_str(symbol_name, "WinMain") &&
27272726 g->zig_target->os == OsWindows)
27282727 {
27292728 g->have_winmain = true;
2730 g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemWindows : g->subsystem;
27312729 } else if (buf_eql_str(symbol_name, "WinMainCRTStartup") &&
27322730 g->zig_target->os == OsWindows)
27332731 {
......@@ -3966,7 +3964,6 @@ ZigType *add_source_file(CodeGen *g, ZigPackage *package, Buf *resolved_path, Bu
39663964 if (is_pub) {
39673965 if (buf_eql_str(proto_name, "main")) {
39683966 g->have_pub_main = true;
3969 g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem;
39703967 } else if (buf_eql_str(proto_name, "panic")) {
39713968 g->have_pub_panic = true;
39723969 }
src/codegen.cpp+64-5
......@@ -100,6 +100,7 @@ CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget
100100
101101 codegen_add_time_event(g, "Initialize");
102102
103 g->subsystem = TargetSubsystemAuto;
103104 g->libc = libc;
104105 g->zig_target = target;
105106 g->cache_dir = cache_dir;
......@@ -7417,6 +7418,21 @@ static const char *build_mode_to_str(BuildMode build_mode) {
74177418 zig_unreachable();
74187419}
74197420
7421static const char *subsystem_to_str(TargetSubsystem subsystem) {
7422 switch (subsystem) {
7423 case TargetSubsystemConsole: return "Console";
7424 case TargetSubsystemWindows: return "Windows";
7425 case TargetSubsystemPosix: return "Posix";
7426 case TargetSubsystemNative: return "Native";
7427 case TargetSubsystemEfiApplication: return "EfiApplication";
7428 case TargetSubsystemEfiBootServiceDriver: return "EfiBootServiceDriver";
7429 case TargetSubsystemEfiRom: return "EfiRom";
7430 case TargetSubsystemEfiRuntimeDriver: return "EfiRuntimeDriver";
7431 case TargetSubsystemAuto: zig_unreachable();
7432 }
7433 zig_unreachable();
7434}
7435
74207436static bool detect_dynamic_link(CodeGen *g) {
74217437 if (g->is_dynamic)
74227438 return true;
......@@ -7462,6 +7478,23 @@ static bool detect_stack_probing(CodeGen *g) {
74627478 zig_unreachable();
74637479}
74647480
7481// Returns TargetSubsystemAuto to mean "no subsystem"
7482TargetSubsystem detect_subsystem(CodeGen *g) {
7483 if (g->subsystem != TargetSubsystemAuto)
7484 return g->subsystem;
7485 if (g->zig_target->os == OsWindows) {
7486 if (g->have_dllmain_crt_startup || (g->out_type == OutTypeLib && g->is_dynamic))
7487 return TargetSubsystemAuto;
7488 if (g->have_c_main || g->have_pub_main || g->is_test_build)
7489 return TargetSubsystemConsole;
7490 if (g->have_winmain || g->have_winmain_crt_startup)
7491 return TargetSubsystemWindows;
7492 } else if (g->zig_target->os == OsUefi) {
7493 return TargetSubsystemEfiApplication;
7494 }
7495 return TargetSubsystemAuto;
7496}
7497
74657498static bool detect_single_threaded(CodeGen *g) {
74667499 if (g->want_single_threaded)
74677500 return true;
......@@ -7869,6 +7902,28 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
78697902 //assert(EndianBig == 0);
78707903 //assert(EndianLittle == 1);
78717904 }
7905 {
7906 buf_appendf(contents,
7907 "pub const SubSystem = enum {\n"
7908 " Console,\n"
7909 " Windows,\n"
7910 " Posix,\n"
7911 " Native,\n"
7912 " EfiApplication,\n"
7913 " EfiBootServiceDriver,\n"
7914 " EfiRom,\n"
7915 " EfiRuntimeDriver,\n"
7916 "};\n\n");
7917
7918 assert(TargetSubsystemConsole == 0);
7919 assert(TargetSubsystemWindows == 1);
7920 assert(TargetSubsystemPosix == 2);
7921 assert(TargetSubsystemNative == 3);
7922 assert(TargetSubsystemEfiApplication == 4);
7923 assert(TargetSubsystemEfiBootServiceDriver == 5);
7924 assert(TargetSubsystemEfiRom == 6);
7925 assert(TargetSubsystemEfiRuntimeDriver == 7);
7926 }
78727927 {
78737928 const char *endian_str = g->is_big_endian ? "Endian.Big" : "Endian.Little";
78747929 buf_appendf(contents, "pub const endian = %s;\n", endian_str);
......@@ -7885,6 +7940,13 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
78857940 buf_appendf(contents, "pub const valgrind_support = %s;\n", bool_to_str(want_valgrind_support(g)));
78867941 buf_appendf(contents, "pub const position_independent_code = %s;\n", bool_to_str(g->have_pic));
78877942
7943 {
7944 TargetSubsystem detected_subsystem = detect_subsystem(g);
7945 if (detected_subsystem != TargetSubsystemAuto) {
7946 buf_appendf(contents, "pub const subsystem = SubSystem.%s;\n", subsystem_to_str(detected_subsystem));
7947 }
7948 }
7949
78887950 if (g->is_test_build) {
78897951 buf_appendf(contents,
78907952 "const TestFn = struct {\n"
......@@ -7928,6 +7990,7 @@ static Error define_builtin_compile_vars(CodeGen *g) {
79287990 cache_bool(&cache_hash, g->have_err_ret_tracing);
79297991 cache_bool(&cache_hash, g->libc_link_lib != nullptr);
79307992 cache_bool(&cache_hash, g->valgrind_support);
7993 cache_int(&cache_hash, detect_subsystem(g));
79317994
79327995 Buf digest = BUF_INIT;
79337996 buf_resize(&digest, 0);
......@@ -7995,10 +8058,6 @@ static void init(CodeGen *g) {
79958058 g->is_single_threaded = true;
79968059 }
79978060
7998 if (g->is_test_build) {
7999 g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem;
8000 }
8001
80028061 assert(g->root_out_name);
80038062 g->module = LLVMModuleCreateWithName(buf_ptr(g->root_out_name));
80048063
......@@ -9352,7 +9411,7 @@ static Error check_cache(CodeGen *g, Buf *manifest_dir, Buf *digest) {
93529411 cache_int(ch, g->zig_target->vendor);
93539412 cache_int(ch, g->zig_target->os);
93549413 cache_int(ch, g->zig_target->abi);
9355 cache_int(ch, g->subsystem);
9414 cache_int(ch, detect_subsystem(g));
93569415 cache_bool(ch, g->strip_debug_symbols);
93579416 cache_bool(ch, g->is_test_build);
93589417 if (g->is_test_build) {
src/codegen.hpp+2
......@@ -56,4 +56,6 @@ void codegen_translate_c(CodeGen *g, Buf *full_path, FILE *out_file, bool use_us
5656
5757Buf *codegen_generate_builtin_source(CodeGen *g);
5858
59TargetSubsystem detect_subsystem(CodeGen *g);
60
5961#endif
src/link.cpp+2-2
......@@ -1225,7 +1225,7 @@ static void add_mingw_link_args(LinkJob *lj, bool is_library) {
12251225 lj->args.append(get_libc_file(g->libc, "libmingwex.a"));
12261226 lj->args.append(get_libc_file(g->libc, "libmsvcrt.a"));
12271227
1228 if (g->subsystem == TargetSubsystemWindows) {
1228 if (detect_subsystem(g) == TargetSubsystemWindows) {
12291229 lj->args.append(get_libc_file(g->libc, "libgdi32.a"));
12301230 lj->args.append(get_libc_file(g->libc, "libcomdlg32.a"));
12311231 }
......@@ -1307,7 +1307,7 @@ static void construct_linker_job_coff(LinkJob *lj) {
13071307 lj->args.append((const char *)buf_ptr(g->link_objects.at(i)));
13081308 }
13091309
1310 switch (g->subsystem) {
1310 switch (detect_subsystem(g)) {
13111311 case TargetSubsystemAuto:
13121312 if (g->zig_target->os == OsUefi) {
13131313 add_uefi_link_args(lj);
src/target.hpp+5-1
......@@ -62,7 +62,6 @@ enum SubArchList {
6262};
6363
6464enum TargetSubsystem {
65 TargetSubsystemAuto, // Zig should infer the subsystem
6665 TargetSubsystemConsole,
6766 TargetSubsystemWindows,
6867 TargetSubsystemPosix,
......@@ -71,6 +70,11 @@ enum TargetSubsystem {
7170 TargetSubsystemEfiBootServiceDriver,
7271 TargetSubsystemEfiRom,
7372 TargetSubsystemEfiRuntimeDriver,
73
74 // This means Zig should infer the subsystem.
75 // It's last so that the indexes of other items can line up
76 // with the enum in builtin.zig.
77 TargetSubsystemAuto
7478};
7579
7680struct ZigTarget {