Skip to content

Commit

Permalink
Revert "[llvm-objdump][macho] Add support for ObjC relative method li…
Browse files Browse the repository at this point in the history 
…sts (#84250)"

This reverts #84250, commit aa61006.

See build failures:
https://lab.llvm.org/buildbot/#/builders/178/builds/7028
https://lab.llvm.org/buildbot/#/builders/182/builds/9282
https://lab.llvm.org/buildbot/#/builders/186/builds/15299
https://lab.llvm.org/buildbot/#/builders/187/builds/14564
  • Loading branch information
@kyulee-com
kyulee-com committed Mar 15, 2024
1 parent 63e70c0 commit 36fd0e7
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 197 deletions.
Binary file removed llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/rel-method-lists-arm64.dylib
View file
Binary file not shown.
Binary file removed llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/rel-method-lists-arm64_32.dylib
View file
Binary file not shown.
87 changes: 0 additions & 87 deletions llvm/test/tools/llvm-objdump/MachO/AArch64/macho-relative-method-lists.test
View file

This file was deleted.

112 changes: 2 additions & 110 deletions llvm/tools/llvm-objdump/MachODump.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3661,10 +3661,6 @@ struct class_ro32_t {
#define RO_ROOT (1 << 1)
#define RO_HAS_CXX_STRUCTORS (1 << 2)

/* Values for method_list{64,32}_t->entsize */
#define ML_HAS_RELATIVE_PTRS (1 << 31)
#define ML_ENTSIZE_MASK 0xFFFF

struct method_list64_t {
uint32_t entsize;
uint32_t count;
Expand All @@ -3689,12 +3685,6 @@ struct method32_t {
uint32_t imp; /* IMP (32-bit pointer) */
};

struct method_relative_t {
int32_t name; /* SEL (32-bit relative) */
int32_t types; /* const char * (32-bit relative) */
int32_t imp; /* IMP (32-bit relative) */
};

struct protocol_list64_t {
uint64_t count; /* uintptr_t (a 64-bit value) */
/* struct protocol64_t * list[0]; These pointers follow inline */
Expand Down Expand Up @@ -3996,12 +3986,6 @@ inline void swapStruct(struct method32_t &m) {
sys::swapByteOrder(m.imp);
}

inline void swapStruct(struct method_relative_t &m) {
sys::swapByteOrder(m.name);
sys::swapByteOrder(m.types);
sys::swapByteOrder(m.imp);
}

inline void swapStruct(struct protocol_list64_t &pl) {
sys::swapByteOrder(pl.count);
}
Expand Down Expand Up @@ -4456,84 +4440,6 @@ static void print_layout_map32(uint32_t p, struct DisassembleInfo *info) {
print_layout_map(layout_map, left);
}

static void print_relative_method_list(uint32_t structSizeAndFlags,
uint32_t structCount, uint64_t p,
struct DisassembleInfo *info,
const char *indent,
uint32_t pointerBits) {
struct method_relative_t m;
const char *r, *name;
uint32_t offset, xoffset, left, i;
SectionRef S, xS;

assert(((structSizeAndFlags & ML_HAS_RELATIVE_PTRS) != 0) &&
"expected structSizeAndFlags to have ML_HAS_RELATIVE_PTRS flag");

outs() << indent << "\t\t entsize "
<< (structSizeAndFlags & ML_ENTSIZE_MASK) << " (relative) \n";
outs() << indent << "\t\t count " << structCount << "\n";

for (i = 0; i < structCount; i++) {
r = get_pointer_64(p, offset, left, S, info);
memset(&m, '\0', sizeof(struct method_relative_t));
if (left < sizeof(struct method_relative_t)) {
memcpy(&m, r, left);
outs() << indent << " (method_t extends past the end of the section)\n";
} else
memcpy(&m, r, sizeof(struct method_relative_t));
if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
swapStruct(m);

outs() << indent << "\t\t name " << format("0x%" PRIx32, m.name);
uint64_t relNameRefVA = p + offsetof(struct method_relative_t, name);
uint64_t absNameRefVA = relNameRefVA + m.name;
outs() << " (" << format("0x%" PRIx32, absNameRefVA) << ")";

// since this is a relative list, absNameRefVA is the address of the
// __objc_selrefs entry, so a pointer, not the actual name
const char *nameRefPtr =
get_pointer_64(absNameRefVA, xoffset, left, xS, info);
if (nameRefPtr) {
uint32_t pointerSize = pointerBits / CHAR_BIT;
if (left < pointerSize)
outs() << indent << " (nameRefPtr extends past the end of the section)";
else {
if (pointerSize == 64) {
name = get_pointer_64(*reinterpret_cast<const uint64_t *>(nameRefPtr),
xoffset, left, xS, info);
} else {
name = get_pointer_32(*reinterpret_cast<const uint32_t *>(nameRefPtr),
xoffset, left, xS, info);
}
if (name != nullptr)
outs() << format(" %.*s", left, name);
}
}
outs() << "\n";

outs() << indent << "\t\t types " << format("0x%" PRIx32, m.types);
uint64_t relTypesVA = p + offsetof(struct method_relative_t, types);
uint64_t absTypesVA = relTypesVA + m.types;
outs() << " (" << format("0x%" PRIx32, absTypesVA) << ")";
name = get_pointer_32(absTypesVA, xoffset, left, xS, info);
if (name != nullptr)
outs() << format(" %.*s", left, name);
outs() << "\n";

outs() << indent << "\t\t imp " << format("0x%" PRIx32, m.imp);
uint64_t relImpVA = p + offsetof(struct method_relative_t, imp);
uint64_t absImpVA = relImpVA + m.imp;
outs() << " (" << format("0x%" PRIx32, absImpVA) << ")";
name = GuessSymbolName(absImpVA, info->AddrMap);
if (name != nullptr)
outs() << " " << name;
outs() << "\n";

p += sizeof(struct method_relative_t);
offset += sizeof(struct method_relative_t);
}
}

static void print_method_list64_t(uint64_t p, struct DisassembleInfo *info,
const char *indent) {
struct method_list64_t ml;
Expand All @@ -4555,17 +4461,10 @@ static void print_method_list64_t(uint64_t p, struct DisassembleInfo *info,
memcpy(&ml, r, sizeof(struct method_list64_t));
if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
swapStruct(ml);
p += sizeof(struct method_list64_t);

if ((ml.entsize & ML_HAS_RELATIVE_PTRS) != 0) {
print_relative_method_list(ml.entsize, ml.count, p, info, indent,
/*pointerBits=*/64);
return;
}

outs() << indent << "\t\t entsize " << ml.entsize << "\n";
outs() << indent << "\t\t count " << ml.count << "\n";

p += sizeof(struct method_list64_t);
offset += sizeof(struct method_list64_t);
for (i = 0; i < ml.count; i++) {
r = get_pointer_64(p, offset, left, S, info);
Expand Down Expand Up @@ -4653,17 +4552,10 @@ static void print_method_list32_t(uint64_t p, struct DisassembleInfo *info,
memcpy(&ml, r, sizeof(struct method_list32_t));
if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
swapStruct(ml);
p += sizeof(struct method_list32_t);

if ((ml.entsize & ML_HAS_RELATIVE_PTRS) != 0) {
print_relative_method_list(ml.entsize, ml.count, p, info, indent,
/*pointerBits=*/32);
return;
}

outs() << indent << "\t\t entsize " << ml.entsize << "\n";
outs() << indent << "\t\t count " << ml.count << "\n";

p += sizeof(struct method_list32_t);
offset += sizeof(struct method_list32_t);
for (i = 0; i < ml.count; i++) {
r = get_pointer_32(p, offset, left, S, info);
Expand Down

0 comments on commit 36fd0e7

Please sign in to comment.