rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-12-28 19:04:27 +03:00
Code Issues Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Rui Ueyama 2021-03-29 13:02:32 +09:00
parent 79acda2880
commit 48759ed6b5
2 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
linker_script.cc
View File

@ -130,14 +130,14 @@ read_output_format(std::span<std::string_view> tok) {
return tok.subspan(1);
}
static MemoryMappedFile *resolve_path(std::string_view tok, ReadContext &ctx) {
static MemoryMappedFile *resolve_path(std::string_view tok, ReadContext &rctx) {
std::string str(unquote(tok));
if (str.starts_with("/"))
return MemoryMappedFile::must_open(config.sysroot + str);
if (str.starts_with("-l"))
return find_library(str.substr(2), config.library_paths, ctx);
return find_library(str.substr(2), config.library_paths, rctx);
if (std::string path = path_dirname(current_file->name) + "/";
MemoryMappedFile *mb = MemoryMappedFile::open(path + str))
@ -157,20 +157,20 @@ static MemoryMappedFile *resolve_path(std::string_view tok, ReadContext &ctx) {
}
static std::span<std::string_view>
read_group(std::span<std::string_view> tok, ReadContext &ctx) {
read_group(std::span<std::string_view> tok, ReadContext &rctx) {
tok = skip(tok, "(");
while (!tok.empty() && tok[0] != ")") {
if (tok[0] == "AS_NEEDED") {
bool orig = ctx.as_needed;
ctx.as_needed = true;
tok = read_group(tok.subspan(1), ctx);
ctx.as_needed = orig;
bool orig = rctx.as_needed;
rctx.as_needed = true;
tok = read_group(tok.subspan(1), rctx);
rctx.as_needed = orig;
continue;
}
MemoryMappedFile *mb = resolve_path(tok[0], ctx);
read_file(mb, ctx);
MemoryMappedFile *mb = resolve_path(tok[0], rctx);
read_file(mb, rctx);
tok = tok.subspan(1);
}
@ -179,7 +179,7 @@ read_group(std::span<std::string_view> tok, ReadContext &ctx) {
return tok.subspan(1);
}
void parse_linker_script(MemoryMappedFile *mb, ReadContext &ctx) {
void parse_linker_script(MemoryMappedFile *mb, ReadContext &rctx) {
current_file = mb;
std::vector<std::string_view> vec = tokenize(mb->get_contents());
@ -189,7 +189,7 @@ void parse_linker_script(MemoryMappedFile *mb, ReadContext &ctx) {
if (tok[0] == "OUTPUT_FORMAT")
tok = read_output_format(tok.subspan(1));
else if (tok[0] == "INPUT" || tok[0] == "GROUP")
tok = read_group(tok.subspan(1), ctx);
tok = read_group(tok.subspan(1), rctx);
else
SyntaxError(tok[0]) << "unknown token";
}

84
main.cc
View File

@ -53,21 +53,21 @@ static FileType get_file_type(MemoryMappedFile *mb) {
static ObjectFile *new_object_file(MemoryMappedFile *mb,
std::string archive_name,
ReadContext &ctx) {
ReadContext &rctx) {
static Counter count("parsed_objs");
count++;
bool in_lib = (!archive_name.empty() && !ctx.whole_archive);
bool in_lib = (!archive_name.empty() && !rctx.whole_archive);
ObjectFile *file = new ObjectFile(mb, archive_name, in_lib);
ctx.tg.run([=]() { file->parse(); });
rctx.tg.run([=]() { file->parse(); });
if (config.trace)
SyncOut() << "trace: " << *file;
return file;
}
static SharedFile *new_shared_file(MemoryMappedFile *mb, ReadContext &ctx) {
SharedFile *file = new SharedFile(mb, ctx.as_needed);
ctx.tg.run([=]() { file->parse(); });
static SharedFile *new_shared_file(MemoryMappedFile *mb, ReadContext &rctx) {
SharedFile *file = new SharedFile(mb, rctx.as_needed);
rctx.tg.run([=]() { file->parse(); });
if (config.trace)
SyncOut() << "trace: " << *file;
return file;
@ -98,33 +98,33 @@ private:
std::map<Key, std::vector<T *>> cache;
};
void read_file(MemoryMappedFile *mb, ReadContext &ctx) {
if (ctx.visited.contains(mb->name))
void read_file(MemoryMappedFile *mb, ReadContext &rctx) {
if (rctx.visited.contains(mb->name))
return;
static FileCache<ObjectFile> obj_cache;
static FileCache<SharedFile> dso_cache;
if (ctx.is_preloading) {
if (rctx.is_preloading) {
switch (get_file_type(mb)) {
case FileType::OBJ:
obj_cache.store(mb, new_object_file(mb, "", ctx));
obj_cache.store(mb, new_object_file(mb, "", rctx));
return;
case FileType::DSO:
dso_cache.store(mb, new_shared_file(mb, ctx));
dso_cache.store(mb, new_shared_file(mb, rctx));
return;
case FileType::AR:
for (MemoryMappedFile *child : read_fat_archive_members(mb))
if (get_file_type(child) == FileType::OBJ)
obj_cache.store(mb, new_object_file(child, mb->name, ctx));
obj_cache.store(mb, new_object_file(child, mb->name, rctx));
return;
case FileType::THIN_AR:
for (MemoryMappedFile *child : read_thin_archive_members(mb))
if (get_file_type(child) == FileType::OBJ)
obj_cache.store(child, new_object_file(child, mb->name, ctx));
obj_cache.store(child, new_object_file(child, mb->name, rctx));
return;
case FileType::TEXT:
parse_linker_script(mb, ctx);
parse_linker_script(mb, rctx);
return;
}
Fatal() << mb->name << ": unknown file type";
@ -135,14 +135,14 @@ void read_file(MemoryMappedFile *mb, ReadContext &ctx) {
if (ObjectFile *obj = obj_cache.get_one(mb))
out::objs.push_back(obj);
else
out::objs.push_back(new_object_file(mb, "", ctx));
out::objs.push_back(new_object_file(mb, "", rctx));
return;
case FileType::DSO:
if (SharedFile *obj = dso_cache.get_one(mb))
out::dsos.push_back(obj);
else
out::dsos.push_back(new_shared_file(mb, ctx));
ctx.visited.insert(mb->name);
out::dsos.push_back(new_shared_file(mb, rctx));
rctx.visited.insert(mb->name);
return;
case FileType::AR:
if (std::vector<ObjectFile *> objs = obj_cache.get(mb); !objs.empty()) {
@ -150,21 +150,21 @@ void read_file(MemoryMappedFile *mb, ReadContext &ctx) {
} else {
for (MemoryMappedFile *child : read_fat_archive_members(mb))
if (get_file_type(child) == FileType::OBJ)
out::objs.push_back(new_object_file(child, mb->name, ctx));
out::objs.push_back(new_object_file(child, mb->name, rctx));
}
ctx.visited.insert(mb->name);
rctx.visited.insert(mb->name);
return;
case FileType::THIN_AR:
for (MemoryMappedFile *child : read_thin_archive_members(mb)) {
if (ObjectFile *obj = obj_cache.get_one(child))
out::objs.push_back(obj);
else if (get_file_type(child) == FileType::OBJ)
out::objs.push_back(new_object_file(child, mb->name, ctx));
out::objs.push_back(new_object_file(child, mb->name, rctx));
}
ctx.visited.insert(mb->name);
rctx.visited.insert(mb->name);
return;
case FileType::TEXT:
parse_linker_script(mb, ctx);
parse_linker_script(mb, rctx);
return;
}
Fatal() << mb->name << ": unknown file type";
@ -1036,7 +1036,7 @@ static void signal_handler(int) {
MemoryMappedFile *find_library(std::string name,
std::span<std::string_view> lib_paths,
ReadContext &ctx) {
ReadContext &rctx) {
if (name.starts_with(':')) {
for (std::string_view dir : lib_paths) {
std::string root = dir.starts_with("/") ? config.sysroot : "";
@ -1050,7 +1050,7 @@ MemoryMappedFile *find_library(std::string name,
for (std::string_view dir : lib_paths) {
std::string root = dir.starts_with("/") ? config.sysroot : "";
std::string stem = root + std::string(dir) + "/lib" + name;
if (!ctx.is_static)
if (!rctx.is_static)
if (MemoryMappedFile *mb = MemoryMappedFile::open(stem + ".so"))
return mb;
if (MemoryMappedFile *mb = MemoryMappedFile::open(stem + ".a"))
@ -1060,37 +1060,37 @@ MemoryMappedFile *find_library(std::string name,
}
static void read_input_files(std::span<std::string_view> args,
ReadContext &ctx) {
ReadContext &rctx) {
std::vector<std::tuple<bool, bool, bool>> state;
while (!args.empty()) {
std::string_view arg;
if (read_flag(args, "as-needed")) {
ctx.as_needed = true;
rctx.as_needed = true;
} else if (read_flag(args, "no-as-needed")) {
ctx.as_needed = false;
rctx.as_needed = false;
} else if (read_flag(args, "whole-archive")) {
ctx.whole_archive = true;
rctx.whole_archive = true;
} else if (read_flag(args, "no-whole-archive")) {
ctx.whole_archive = false;
rctx.whole_archive = false;
} else if (read_flag(args, "Bstatic")) {
ctx.is_static = true;
rctx.is_static = true;
} else if (read_flag(args, "Bdynamic")) {
ctx.is_static = false;
rctx.is_static = false;
} else if (read_flag(args, "push-state")) {
state.push_back({ctx.as_needed, ctx.whole_archive, ctx.is_static});
state.push_back({rctx.as_needed, rctx.whole_archive, rctx.is_static});
} else if (read_flag(args, "pop-state")) {
if (state.empty())
Fatal() << "no state pushed before popping";
std::tie(ctx.as_needed, ctx.whole_archive, ctx.is_static) = state.back();
std::tie(rctx.as_needed, rctx.whole_archive, rctx.is_static) = state.back();
state.pop_back();
} else if (read_arg(args, arg, "l")) {
MemoryMappedFile *mb =
find_library(std::string(arg), config.library_paths, ctx);
read_file(mb, ctx);
find_library(std::string(arg), config.library_paths, rctx);
read_file(mb, rctx);
} else {
read_file(MemoryMappedFile::must_open(std::string(args[0])), ctx);
read_file(MemoryMappedFile::must_open(std::string(args[0])), rctx);
args = args.subspan(1);
}
}
@ -1147,9 +1147,9 @@ int main(int argc, char **argv) {
std::function<void()> wait_for_client;
daemonize(argv, &wait_for_client, &on_complete);
ReadContext ctx(true);
read_input_files(file_args, ctx);
ctx.tg.wait();
ReadContext rctx(true);
read_input_files(file_args, rctx);
rctx.tg.wait();
t.stop();
Timer t2("wait_for_client");
@ -1164,9 +1164,9 @@ int main(int argc, char **argv) {
// Parse input files
{
Timer t("parse");
ReadContext ctx(false);
read_input_files(file_args, ctx);
ctx.tg.wait();
ReadContext rctx(false);
read_input_files(file_args, rctx);
rctx.tg.wait();
}
// Uniquify shared object files with soname