Skip to content

Commit 3cec629

Browse files
NikitaSmith057NikitaSmith057
committed
pipe obj directives through config path
1 parent 076aa0a commit 3cec629

8 files changed

+899
-847
lines changed

‎src/linker/lnk.c

+17-2
Original file line numberDiff line numberDiff line change
@@ -2895,7 +2895,7 @@ lnk_init_merge_directive_list(Arena *arena, LNK_ObjList obj_list)
28952895
// collect merge directives from objs
28962896
for (LNK_ObjNode *obj_node = obj_list.first; obj_node != 0; obj_node = obj_node->next) {
28972897
LNK_Obj *obj = &obj_node->data;
2898-
for (LNK_Directive *dir = obj->directive_info.v[LNK_Directive_Merge].first; dir != 0; dir = dir->next) {
2898+
for (LNK_Directive *dir = obj->directive_info.v[LNK_CmdSwitch_Merge].first; dir != 0; dir = dir->next) {
28992899
for (String8Node *value_node = dir->value_list.first; value_node != 0; value_node = value_node->next) {
29002900
LNK_MergeDirective merge_dir;
29012901
if (lnk_parse_merge_directive(value_node->string, &merge_dir)) { lnk_merge_directive_list_push(arena, &result, merge_dir);
@@ -3569,11 +3569,26 @@ lnk_run(int argc, char **argv)
35693569
ProfBegin("Collect Directives");
35703570
for (U64 i = 0; i < obj_node_arr.count; ++i) {
35713571
LNK_Obj *obj = &obj_node_arr.v[i].data;
3572+
35723573
str8_list_concat_in_place(&include_symbol_list, &obj->include_symbol_list);
3574+
35733575
lnk_alt_name_list_concat_in_place(&alt_name_list, &obj->alt_name_list);
3574-
for (LNK_Directive *dir = obj->directive_info.v[LNK_Directive_DisallowLib].first; dir != 0; dir = dir->next) {
3576+
3577+
for (LNK_Directive *dir = obj->directive_info.v[LNK_CmdSwitch_DisallowLib].first; dir != 0; dir = dir->next) {
35753578
str8_list_concat_in_place(&input_disallow_lib_list, &dir->value_list);
35763579
}
3580+
3581+
for (LNK_Directive *dir = obj->directive_info.v[LNK_CmdSwitch_Entry].first; dir != 0; dir = dir->next) {
3582+
lnk_apply_cmd_option_to_config(scratch.arena, config, dir->id, dir->value_list, obj->path, obj->lib_path);
3583+
}
3584+
3585+
for (LNK_Directive *dir = obj->directive_info.v[LNK_CmdSwitch_SubSystem].first; dir != 0; dir = dir->next) {
3586+
lnk_apply_cmd_option_to_config(scratch.arena, config, dir->id, dir->value_list, obj->path, obj->lib_path);
3587+
}
3588+
3589+
for (LNK_Directive *dir = obj->directive_info.v[LNK_CmdSwitch_Stack].first; dir != 0; dir = dir->next) {
3590+
lnk_apply_cmd_option_to_config(scratch.arena, config, dir->id, dir->value_list, obj->path, obj->lib_path);
3591+
}
35773592
}
35783593
ProfEnd();
35793594

‎src/linker/lnk_config.c

+773-748
Large diffs are not rendered by default.

‎src/linker/lnk_config.h

+24-17
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ typedef enum
4040
LNK_CmdSwitch_ManifestFile,
4141
LNK_CmdSwitch_ManifestInput,
4242
LNK_CmdSwitch_ManifestUac,
43+
LNK_CmdSwitch_Merge,
4344
LNK_CmdSwitch_Natvis,
4445
LNK_CmdSwitch_NoDefaultLib,
4546
LNK_CmdSwitch_NoExp,
@@ -73,18 +74,23 @@ typedef enum
7374
LNK_CmdSwitch_DependentLoadFlag,
7475
LNK_CmdSwitch_Driver,
7576
LNK_CmdSwitch_DisallowLib,
77+
LNK_CmdSwitch_EditAndContinue,
7678
LNK_CmdSwitch_EmitVolatileMetadata,
7779
LNK_CmdSwitch_ErrorReport,
7880
LNK_CmdSwitch_Export,
7981
LNK_CmdSwitch_ExportAdmin,
8082
LNK_CmdSwitch_FastGenProfile,
83+
LNK_CmdSwitch_FailIfMismatch,
8184
LNK_CmdSwitch_Force,
8285
LNK_CmdSwitch_Guard,
86+
LNK_CmdSwitch_GuardSym,
8387
LNK_CmdSwitch_GenProfile,
8488
LNK_CmdSwitch_IdlOut,
8589
LNK_CmdSwitch_IgnoreIdl,
8690
LNK_CmdSwitch_Ilk,
8791
LNK_CmdSwitch_IntegrityCheck,
92+
LNK_CmdSwitch_InferAsanLibs,
93+
LNK_CmdSwitch_InferAsanLibsNo,
8894
LNK_CmdSwitch_Kernel,
8995
LNK_CmdSwitch_KeyContainer,
9096
LNK_CmdSwitch_KeyFile,
@@ -94,7 +100,6 @@ typedef enum
94100
LNK_CmdSwitch_LtcgOut,
95101
LNK_CmdSwitch_Map,
96102
LNK_CmdSwitch_MapInfo,
97-
LNK_CmdSwitch_Merge,
98103
LNK_CmdSwitch_Midl,
99104
LNK_CmdSwitch_NoAssembly,
100105
LNK_CmdSwitch_NoEntry,
@@ -108,6 +113,7 @@ typedef enum
108113
LNK_CmdSwitch_Stub,
109114
LNK_CmdSwitch_SwapRun,
110115
LNK_CmdSwitch_TlbId,
116+
LNK_CmdSwitch_ThrowingNew,
111117
LNK_CmdSwitch_UserProfile,
112118
LNK_CmdSwitch_Verbose,
113119
LNK_CmdSwitch_Version,
@@ -281,7 +287,6 @@ typedef struct LNK_Config
281287
Version subsystem_ver;
282288
PE_ImageFileCharacteristics file_characteristics;
283289
PE_DllCharacteristics dll_characteristics;
284-
String8 user_entry_point_name;
285290
String8 entry_point_name;
286291
String8List lib_dir_list;
287292
PathStyle path_style;
@@ -471,9 +476,9 @@ internal B32 lnk_cmd_line_has_switch(LNK_CmdLine cmd_line, LNK_CmdSw
471476
////////////////////////////////
472477
// Errors
473478

474-
internal void lnk_error_cmd_switch(LNK_ErrorCode code, LNK_CmdSwitchType cmd_switch, char *fmt, ...);
475-
internal void lnk_error_cmd_switch_invalid_param_count(LNK_ErrorCode code, LNK_CmdSwitchType cmd_switch);
476-
internal void lnk_error_cmd_switch_invalid_param(LNK_ErrorCode code, LNK_CmdSwitchType cmd_switch, String8 param);
479+
internal void lnk_error_cmd_switch(LNK_ErrorCode code, String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, char *fmt, ...);
480+
internal void lnk_error_cmd_switch_invalid_param_count(LNK_ErrorCode code, String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch);
481+
internal void lnk_error_cmd_switch_invalid_param(LNK_ErrorCode code, String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8 param);
477482

478483
////////////////////////////////
479484
// Getters
@@ -488,24 +493,26 @@ internal B32 lnk_do_debug_info(LNK_Config *config);
488493
////////////////////////////////
489494
// Specialized Parsers
490495

491-
internal B32 lnk_cmd_switch_parse_version(String8List value_strings, LNK_CmdSwitchType cmd_switch, Version *ver_out);
492-
internal B32 lnk_cmd_switch_parse_tuple(String8List value_strings, LNK_CmdSwitchType cmd_switch, Rng1U64 *tuple_out);
493-
internal B32 lnk_cmd_switch_parse_u64(String8List value_strings, LNK_CmdSwitchType cmd_switch, U64 *value_out, LNK_ParseU64Flags flags);
494-
internal B32 lnk_cmd_switch_parse_u32(String8List value_strings, LNK_CmdSwitchType cmd_switch, U32 *value_out, LNK_ParseU64Flags flags);
495-
internal B32 lnk_cmd_switch_parse_flag(String8List value_strings, LNK_CmdSwitchType cmd_switch, LNK_SwitchState *value_out);
496-
internal void lnk_cmd_switch_set_flag_inv_16(String8List value_strings, LNK_CmdSwitchType cmd_switch, U16 *flags, U16 bits);
497-
internal void lnk_cmd_switch_set_flag_inv_64(String8List value_strings, LNK_CmdSwitchType cmd_switch, U64 *flags, U64 bits);
498-
internal void lnk_cmd_switch_set_flag_16(String8List value_strings, LNK_CmdSwitchType cmd_switch, U16 *flags, U16 bits);
499-
internal void lnk_cmd_switch_set_flag_32(String8List value_strings, LNK_CmdSwitchType cmd_switch, U32 *flags, U32 bits);
500-
internal void lnk_cmd_switch_set_flag_64(String8List value_strings, LNK_CmdSwitchType cmd_switch, U64 *flags, U64 bits);
501-
internal B32 lnk_cmd_switch_parse_string(String8List value_strings, LNK_CmdSwitchType cmd_switch, String8 *string_out);
502-
internal void lnk_cmd_switch_parse_string_copy(Arena *arena, String8List value_strings, LNK_CmdSwitchType cmd_switch, String8 *string_out);
496+
internal B32 lnk_cmd_switch_parse_version(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, Version *ver_out);
497+
internal B32 lnk_cmd_switch_parse_tuple(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, Rng1U64 *tuple_out);
498+
internal B32 lnk_cmd_switch_parse_u64(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, U64 *value_out, LNK_ParseU64Flags flags);
499+
internal B32 lnk_cmd_switch_parse_u32(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, U32 *value_out, LNK_ParseU64Flags flags);
500+
internal B32 lnk_cmd_switch_parse_flag(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, LNK_SwitchState *value_out);
501+
internal void lnk_cmd_switch_set_flag_inv_16(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, U16 *flags, U16 bits);
502+
internal void lnk_cmd_switch_set_flag_inv_64(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, U64 *flags, U64 bits);
503+
internal void lnk_cmd_switch_set_flag_16(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, U16 *flags, U16 bits);
504+
internal void lnk_cmd_switch_set_flag_32(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, U32 *flags, U32 bits);
505+
internal void lnk_cmd_switch_set_flag_64(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, U64 *flags, U64 bits);
506+
internal B32 lnk_cmd_switch_parse_string(String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, String8 *string_out);
507+
internal void lnk_cmd_switch_parse_string_copy(Arena *arena, String8 obj_path, String8 lib_path, LNK_CmdSwitchType cmd_switch, String8List value_strings, String8 *string_out);
503508

504509
internal B32 lnk_parse_alt_name_directive(Arena *arena, String8 input, LNK_AltNameList *list_out);
505510
internal String8 * lnk_parse_alt_name_directive_list(Arena *arena, String8List list, LNK_AltNameList *list_out);
506511

507512
////////////////////////////////
508513

514+
internal void lnk_apply_cmd_option_to_config(Arena *arena, LNK_Config *config, String8 name, String8List value_list, String8 obj_path, String8 lib_path);
515+
509516
internal LNK_Config * lnk_config_from_raw_cmd_line(Arena *arena, String8List raw_cmd_line);
510517
internal LNK_Config * lnk_build_config(Arena *arena, int argc, char **argv);
511518

‎src/linker/lnk_directive.c

+50-44
Original file line numberDiff line numberDiff line change
@@ -23,69 +23,76 @@ lnk_merge_directive_list_push(Arena *arena, LNK_MergeDirectiveList *list, LNK_Me
2323

2424
////////////////////////////////
2525

26+
internal B32
27+
lnk_is_directive_legal(LNK_CmdSwitchType type)
28+
{
29+
static B32 init_table = 1;
30+
static B8 is_legal[LNK_CmdSwitch_Count];
31+
if (init_table) {
32+
init_table = 0;
33+
is_legal[LNK_CmdSwitch_AlternateName] = 1;
34+
is_legal[LNK_CmdSwitch_DefaultLib] = 1;
35+
is_legal[LNK_CmdSwitch_DisallowLib] = 1;
36+
is_legal[LNK_CmdSwitch_EditAndContinue] = 1;
37+
is_legal[LNK_CmdSwitch_Entry] = 1;
38+
is_legal[LNK_CmdSwitch_Export] = 1;
39+
is_legal[LNK_CmdSwitch_FailIfMismatch] = 1;
40+
is_legal[LNK_CmdSwitch_GuardSym] = 1;
41+
is_legal[LNK_CmdSwitch_Include] = 1;
42+
is_legal[LNK_CmdSwitch_InferAsanLibs] = 1;
43+
is_legal[LNK_CmdSwitch_InferAsanLibsNo] = 1;
44+
is_legal[LNK_CmdSwitch_ManifestDependency] = 1;
45+
is_legal[LNK_CmdSwitch_Merge] = 1;
46+
is_legal[LNK_CmdSwitch_NoDefaultLib] = 1;
47+
is_legal[LNK_CmdSwitch_Release] = 1;
48+
is_legal[LNK_CmdSwitch_Section] = 1;
49+
is_legal[LNK_CmdSwitch_Stack] = 1;
50+
is_legal[LNK_CmdSwitch_SubSystem] = 1;
51+
is_legal[LNK_CmdSwitch_ThrowingNew] = 1;
52+
}
53+
return is_legal[type];
54+
}
55+
2656
internal void
2757
lnk_parse_directives(Arena *arena, LNK_DirectiveInfo *directive_info, String8 buffer, String8 obj_path)
2858
{
2959
Temp scratch = scratch_begin(&arena, 1);
3060

31-
String8 unparsed_directives = buffer;
61+
String8 to_parse;
3262
{
33-
static const U8 BOM_SIG[] = { 0xEF, 0xBB, 0xBF };
34-
B32 is_bom = MemoryMatch(buffer.str, &BOM_SIG[0], sizeof(BOM_SIG));
35-
if (is_bom) {
36-
unparsed_directives = str8_zero();
63+
local_persist const U8 bom_sig[] = { 0xEF, 0xBB, 0xBF };
64+
local_persist const U8 ascii_sig[] = { 0x20, 0x20, 0x20 };
65+
if (MemoryMatch(buffer.str, &bom_sig[0], sizeof(bom_sig))) {
66+
to_parse = str8_zero();
3767
lnk_not_implemented("TODO: support for BOM encoding");
38-
}
39-
static const U8 ASCII_SIG[] = { 0x20, 0x20, 0x20 };
40-
B32 is_ascii = MemoryMatch(buffer.str, &ASCII_SIG[0], sizeof(ASCII_SIG));
41-
if (is_ascii) {
42-
unparsed_directives = str8_skip(buffer, sizeof(ASCII_SIG));
68+
} else if (MemoryMatch(buffer.str, &ascii_sig[0], sizeof(ascii_sig))) {
69+
to_parse = str8_skip(buffer, sizeof(ascii_sig));
70+
} else {
71+
to_parse = buffer;
4372
}
4473
}
4574

46-
String8List arg_list = lnk_arg_list_parse_windows_rules(scratch.arena, unparsed_directives);
75+
String8List arg_list = lnk_arg_list_parse_windows_rules(scratch.arena, to_parse);
4776
LNK_CmdLine cmd_line = lnk_cmd_line_parse_windows_rules(scratch.arena, arg_list);
4877

4978
for (LNK_CmdOption *opt = cmd_line.first_option; opt != 0; opt = opt->next) {
50-
static struct {
51-
LNK_DirectiveKind kind;
52-
String8 name;
53-
} directive_table[LNK_Directive_Count] = {
54-
{ LNK_Directive_Null, str8_lit_comp("") },
55-
{ LNK_Directive_DefaultLib, str8_lit_comp("defaultlib") },
56-
{ LNK_Directive_Export, str8_lit_comp("export" ) },
57-
{ LNK_Directive_Include, str8_lit_comp("include") },
58-
{ LNK_Directive_ManifestDependency, str8_lit_comp("manifestdependency") },
59-
{ LNK_Directive_Merge, str8_lit_comp("merge") },
60-
{ LNK_Directive_Section, str8_lit_comp("section") },
61-
{ LNK_Directive_AlternateName, str8_lit_comp("alternatename") },
62-
{ LNK_Directive_GuardSym, str8_lit_comp("guardsym") },
63-
{ LNK_Directive_DisallowLib, str8_lit_comp("disallowlib") },
64-
{ LNK_Directive_FailIfMismatch, str8_lit_comp("failifmismatch") },
65-
{ LNK_Directive_EditAndContinue, str8_lit_comp("editandcontinue") },
66-
{ LNK_Directive_ThrowingNew, str8_lit_comp("throwingnew") },
67-
};
79+
LNK_CmdSwitchType type = lnk_cmd_switch_type_from_string(opt->string);
6880

69-
LNK_DirectiveKind kind = LNK_Directive_Null;
70-
for (U64 i = 0; i < ArrayCount(directive_table); ++i) {
71-
if (str8_match(directive_table[i].name, opt->string, StringMatchFlag_CaseInsensitive)) {
72-
kind = directive_table[i].kind;
73-
if (kind == LNK_Directive_Merge) {
74-
String8 v = str8_list_join(scratch.arena, &opt->value_strings, &(StringJoin){ .sep = str8_lit_comp(" ")});
75-
}
76-
break;
77-
}
78-
}
79-
if (kind == LNK_Directive_Null) {
81+
if (type == LNK_CmdSwitch_Null) {
8082
lnk_error(LNK_Warning_UnknownDirective, "%S: unknown directive \"%S\"", obj_path, opt->string);
83+
continue;
84+
}
85+
if (!lnk_is_directive_legal(type)) {
86+
lnk_error(LNK_Warning_IllegalDirective, "%S: illegal directive \"%S\"", obj_path, opt->string);
87+
continue;
8188
}
82-
89+
8390
LNK_Directive *directive = push_array_no_zero(arena, LNK_Directive, 1);
8491
directive->next = 0;
8592
directive->id = push_str8_copy(arena, opt->string);
8693
directive->value_list = str8_list_copy(arena, &opt->value_strings);
87-
88-
LNK_DirectiveList *directive_list = &directive_info->v[kind];
94+
95+
LNK_DirectiveList *directive_list = &directive_info->v[type];
8996
SLLQueuePush(directive_list->first, directive_list->last, directive);
9097
++directive_list->count;
9198
}
@@ -110,7 +117,6 @@ lnk_parse_default_lib_directive(Arena *arena, LNK_DirectiveList *dir_list)
110117
} else {
111118
lib_path = push_str8_copy(arena, lib_path);
112119
}
113-
114120

115121
str8_list_push(arena, &default_libs, lib_path);
116122
}

‎src/linker/lnk_directive.h

+1-19
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,9 @@ typedef struct LNK_MergeDirectiveList
5151
LNK_MergeDirectiveNode *last;
5252
} LNK_MergeDirectiveList;
5353

54-
typedef enum
55-
{
56-
LNK_Directive_Null,
57-
LNK_Directive_DefaultLib,
58-
LNK_Directive_Export,
59-
LNK_Directive_Include,
60-
LNK_Directive_ManifestDependency,
61-
LNK_Directive_Merge,
62-
LNK_Directive_Section,
63-
LNK_Directive_AlternateName,
64-
LNK_Directive_GuardSym,
65-
LNK_Directive_DisallowLib,
66-
LNK_Directive_FailIfMismatch,
67-
LNK_Directive_EditAndContinue,
68-
LNK_Directive_ThrowingNew,
69-
LNK_Directive_Count
70-
} LNK_DirectiveKind;
71-
7254
typedef struct LNK_DirectiveInfo
7355
{
74-
LNK_DirectiveList v[LNK_Directive_Count];
56+
LNK_DirectiveList v[LNK_CmdSwitch_Count];
7557
} LNK_DirectiveInfo;
7658

7759
////////////////////////////////

‎src/linker/lnk_error.c

+25
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,31 @@ lnk_error(LNK_ErrorCode code, char *fmt, ...)
6767
va_end(args);
6868
}
6969

70+
internal void
71+
lnk_error_with_loc_fv(LNK_ErrorCode code, String8 obj_path, String8 lib_path, char *fmt, va_list args)
72+
{
73+
Temp scratch = scratch_begin(0, 0);
74+
String8 text = push_str8fv(scratch.arena, fmt, args);
75+
if (obj_path.size) {
76+
if (lib_path.size) {
77+
lnk_error(code, "%S(%S): %S", lib_path, obj_path, text);
78+
} else {
79+
lnk_error(code, "%S: %S", obj_path, text);
80+
}
81+
} else {
82+
lnk_error(code, "%S", text);
83+
}
84+
scratch_end(scratch);
85+
}
86+
87+
internal void
88+
lnk_error_with_loc(LNK_ErrorCode code, String8 obj_path, String8 lib_path, char *fmt, ...)
89+
{
90+
va_list args; va_start(args, fmt);
91+
lnk_error_with_loc_fv(code, obj_path, lib_path, fmt, args);
92+
va_end(args);
93+
}
94+
7095
internal void
7196
lnk_supplement_error(char *fmt, ...)
7297
{

‎src/linker/lnk_error.h

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ typedef enum
7474
LNK_Warning_SectionFlagsConflict,
7575
LNK_Warning_Subsystem,
7676
LNK_Warning_UnknownDirective,
77+
LNK_Warning_IllegalDirective,
7778
LNK_Warning_UnresolvedComdat,
7879
LNK_Warning_UnusedDelayLoadDll,
7980
LNK_Warning_LongSectionName,
@@ -110,6 +111,7 @@ typedef enum
110111
internal void lnk_init_error_handler(void);
111112
internal void lnk_errorfv(LNK_ErrorCode code, char *fmt, va_list args);
112113
internal void lnk_error(LNK_ErrorCode code, char *fmt, ...);
114+
internal void lnk_error_with_loc(LNK_ErrorCode code, String8 obj_path, String8 lib_path, char *fmt, ...);
113115
internal void lnk_supplement_error(char *fmt, ...);
114116
internal void lnk_supplement_error_list(String8List list);
115117
internal void lnk_suppress_error(LNK_ErrorCode code);

0 commit comments

Comments
 (0)