rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-09-20 17:39:56 +03:00
Code Issues Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Rui Ueyama 2021-12-03 15:54:18 +09:00
parent fa8d5d97d0
commit d23183ed31
2 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
macho/mold.h
View File

@ -553,14 +553,12 @@ public:
this->hdr.p2align = __builtin_ctz(2);
this->hdr.type = S_SYMBOL_STUBS;
this->hdr.attr = S_ATTR_SOME_INSTRUCTIONS | S_ATTR_PURE_INSTRUCTIONS;
this->hdr.reserved2 = ENTRY_SIZE;
this->hdr.reserved2 = E::stub_size;
}
void add(Context<E> &ctx, Symbol<E> *sym);
void copy_buf(Context<E> &ctx) override;
static constexpr i64 ENTRY_SIZE = 6;
std::vector<Symbol<E> *> syms;
std::vector<u32> bind_offsets;
};
@ -575,9 +573,6 @@ public:
}
void copy_buf(Context<E> &ctx) override;
static constexpr i64 HEADER_SIZE = 16;
static constexpr i64 ENTRY_SIZE = 10;
};
template <typename E>
@ -620,8 +615,6 @@ public:
void copy_buf(Context<E> &ctx) override;
std::vector<Symbol<E> *> syms;
static constexpr i64 ENTRY_SIZE = 8;
};
template <typename E>
@ -634,8 +627,6 @@ public:
}
void copy_buf(Context<E> &ctx) override;
static constexpr i64 ENTRY_SIZE = 8;
};
template <typename E>
@ -651,8 +642,6 @@ public:
void copy_buf(Context<E> &ctx) override;
std::vector<Symbol<E> *> syms;
static constexpr i64 ENTRY_SIZE = 8;
};
//
@ -879,20 +868,20 @@ u64 Symbol<E>::get_addr(Context<E> &ctx) const {
if (subsec)
return subsec->get_addr(ctx) + value;
if (stub_idx != -1)
return ctx.stubs.hdr.addr + stub_idx * StubsSection<E>::ENTRY_SIZE;
return ctx.stubs.hdr.addr + stub_idx * E::stub_size;
return value;
}
template <typename E>
u64 Symbol<E>::get_got_addr(Context<E> &ctx) const {
assert(got_idx != -1);
return ctx.got.hdr.addr + got_idx * GotSection<E>::ENTRY_SIZE;
return ctx.got.hdr.addr + got_idx * E::wordsize;
}
template <typename E>
u64 Symbol<E>::get_tlv_addr(Context<E> &ctx) const {
assert(tlv_idx != -1);
return ctx.thread_ptrs.hdr.addr + tlv_idx * ThreadPtrsSection<E>::ENTRY_SIZE;
return ctx.thread_ptrs.hdr.addr + tlv_idx * E::wordsize;
}
template <typename E>

29
macho/output-chunks.cc
View File

@ -563,7 +563,7 @@ void OutputRebaseSection<E>::compute_size(Context<E> &ctx) {
for (i64 i = 0; i < ctx.stubs.syms.size(); i++)
enc.add(ctx.data_seg->seg_idx,
ctx.lazy_symbol_ptr.hdr.addr + i * LazySymbolPtrSection<E>::ENTRY_SIZE -
ctx.lazy_symbol_ptr.hdr.addr + i * E::wordsize -
ctx.data_seg->cmd.vmaddr);
for (Symbol<E> *sym : ctx.got.syms)
@ -686,8 +686,7 @@ void OutputLazyBindSection<E>::add(Context<E> &ctx, Symbol<E> &sym, i64 flags) {
i64 seg_idx = ctx.data_seg->seg_idx;
emit(BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB | seg_idx);
i64 offset = ctx.lazy_symbol_ptr.hdr.addr +
sym.stub_idx * LazySymbolPtrSection<E>::ENTRY_SIZE -
i64 offset = ctx.lazy_symbol_ptr.hdr.addr + sym.stub_idx * E::wordsize -
ctx.data_seg->cmd.vmaddr;
encode_uleb(contents, offset);
@ -1065,11 +1064,11 @@ void StubsSection<E>::add(Context<E> &ctx, Symbol<E> *sym) {
syms.push_back(sym);
i64 nsyms = syms.size();
this->hdr.size = nsyms * ENTRY_SIZE;
this->hdr.size = nsyms * E::stub_size;
ctx.stub_helper.hdr.size =
StubHelperSection<E>::HEADER_SIZE + nsyms * StubHelperSection<E>::ENTRY_SIZE;
ctx.lazy_symbol_ptr.hdr.size = nsyms * LazySymbolPtrSection<E>::ENTRY_SIZE;
E::stub_helper_hdr_size + nsyms * E::stub_helper_size;
ctx.lazy_symbol_ptr.hdr.size = nsyms * E::wordsize;
}
template <>
@ -1080,12 +1079,11 @@ void StubsSection<ARM64>::copy_buf(Context<ARM64> &ctx) {
// `ff 25 xx xx xx xx` is a RIP-relative indirect jump instruction,
// i.e., `jmp *IMM(%rip)`. It loads an address from la_symbol_ptr
// and jump there.
assert(ENTRY_SIZE == 6);
assert(ARM64::stub_size == 6);
buf[i * 6] = 0xff;
buf[i * 6 + 1] = 0x25;
*(u32 *)(buf + i * 6 + 2) =
ctx.lazy_symbol_ptr.hdr.addr +
i * LazySymbolPtrSection<ARM64>::ENTRY_SIZE -
ctx.lazy_symbol_ptr.hdr.addr + i * ARM64::wordsize -
(this->hdr.addr + i * 6 + 6);
}
}
@ -1098,12 +1096,11 @@ void StubsSection<X86_64>::copy_buf(Context<X86_64> &ctx) {
// `ff 25 xx xx xx xx` is a RIP-relative indirect jump instruction,
// i.e., `jmp *IMM(%rip)`. It loads an address from la_symbol_ptr
// and jump there.
assert(ENTRY_SIZE == 6);
assert(X86_64::stub_size == 6);
buf[i * 6] = 0xff;
buf[i * 6 + 1] = 0x25;
*(u32 *)(buf + i * 6 + 2) =
ctx.lazy_symbol_ptr.hdr.addr +
i * LazySymbolPtrSection<X86_64>::ENTRY_SIZE -
ctx.lazy_symbol_ptr.hdr.addr + i * X86_64::wordsize -
(this->hdr.addr + i * 6 + 6);
}
}
@ -1337,7 +1334,7 @@ void GotSection<E>::add(Context<E> &ctx, Symbol<E> *sym) {
assert(sym->got_idx == -1);
sym->got_idx = syms.size();
syms.push_back(sym);
this->hdr.size = syms.size() * ENTRY_SIZE;
this->hdr.size = syms.size() * E::wordsize;
}
template <typename E>
@ -1353,8 +1350,8 @@ void LazySymbolPtrSection<E>::copy_buf(Context<E> &ctx) {
u64 *buf = (u64 *)(ctx.buf + this->hdr.offset);
for (i64 i = 0; i < ctx.stubs.syms.size(); i++)
buf[i] = ctx.stub_helper.hdr.addr + StubHelperSection<E>::HEADER_SIZE +
i * StubHelperSection<E>::ENTRY_SIZE;
buf[i] = ctx.stub_helper.hdr.addr + E::stub_helper_hdr_size +
i * E::stub_helper_size;
}
template <typename E>
@ -1362,7 +1359,7 @@ void ThreadPtrsSection<E>::add(Context<E> &ctx, Symbol<E> *sym) {
assert(sym->tlv_idx == -1);
sym->tlv_idx = syms.size();
syms.push_back(sym);
this->hdr.size = syms.size() * ENTRY_SIZE;
this->hdr.size = syms.size() * E::wordsize;
}
template <typename E>