Skip to content

Commit 19f2f67

Browse files
authored
[yaml2obj][obj2yaml][objdump] Handle MIPS COFF files (#112591)
- handle IMAGE_FILE_MACHINE_R4000 machine type - handle MIPS COFF relocations llvm-objdump can now parse MIPS COFF files.
1 parent 3494ee9 commit 19f2f67

File tree

5 files changed

+70
-0
lines changed

5 files changed

+70
-0
lines changed

llvm/include/llvm/Object/WindowsMachineFlag.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ template <typename T> Triple::ArchType getMachineArchType(T machine) {
4343
case COFF::IMAGE_FILE_MACHINE_ARM64EC:
4444
case COFF::IMAGE_FILE_MACHINE_ARM64X:
4545
return llvm::Triple::ArchType::aarch64;
46+
case COFF::IMAGE_FILE_MACHINE_R4000:
47+
return llvm::Triple::ArchType::mipsel;
4648
default:
4749
return llvm::Triple::ArchType::UnknownArch;
4850
}

llvm/include/llvm/ObjectYAML/COFFYAML.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ struct ScalarEnumerationTraits<COFF::RelocationTypeAMD64> {
179179
static void enumeration(IO &IO, COFF::RelocationTypeAMD64 &Value);
180180
};
181181

182+
template <> struct ScalarEnumerationTraits<COFF::RelocationTypesMips> {
183+
static void enumeration(IO &IO, COFF::RelocationTypesMips &Value);
184+
};
185+
182186
template <>
183187
struct ScalarEnumerationTraits<COFF::RelocationTypesARM> {
184188
static void enumeration(IO &IO, COFF::RelocationTypesARM &Value);

llvm/lib/Object/COFFObjectFile.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,6 +1132,8 @@ StringRef COFFObjectFile::getFileFormatName() const {
11321132
return "COFF-ARM64EC";
11331133
case COFF::IMAGE_FILE_MACHINE_ARM64X:
11341134
return "COFF-ARM64X";
1135+
case COFF::IMAGE_FILE_MACHINE_R4000:
1136+
return "COFF-MIPS";
11351137
default:
11361138
return "COFF-<unknown arch>";
11371139
}

llvm/lib/ObjectYAML/COFFYAML.cpp

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,25 @@ void ScalarEnumerationTraits<COFF::RelocationTypeAMD64>::enumeration(
183183
ECase(IMAGE_REL_AMD64_SSPAN32);
184184
}
185185

186+
void ScalarEnumerationTraits<COFF::RelocationTypesMips>::enumeration(
187+
IO &IO, COFF::RelocationTypesMips &Value) {
188+
ECase(IMAGE_REL_MIPS_ABSOLUTE);
189+
ECase(IMAGE_REL_MIPS_REFHALF);
190+
ECase(IMAGE_REL_MIPS_REFWORD);
191+
ECase(IMAGE_REL_MIPS_JMPADDR);
192+
ECase(IMAGE_REL_MIPS_REFHI);
193+
ECase(IMAGE_REL_MIPS_REFLO);
194+
ECase(IMAGE_REL_MIPS_GPREL);
195+
ECase(IMAGE_REL_MIPS_LITERAL);
196+
ECase(IMAGE_REL_MIPS_SECTION);
197+
ECase(IMAGE_REL_MIPS_SECREL);
198+
ECase(IMAGE_REL_MIPS_SECRELLO);
199+
ECase(IMAGE_REL_MIPS_SECRELHI);
200+
ECase(IMAGE_REL_MIPS_JMPADDR16);
201+
ECase(IMAGE_REL_MIPS_REFWORDNB);
202+
ECase(IMAGE_REL_MIPS_PAIR);
203+
}
204+
186205
void ScalarEnumerationTraits<COFF::RelocationTypesARM>::enumeration(
187206
IO &IO, COFF::RelocationTypesARM &Value) {
188207
ECase(IMAGE_REL_ARM_ABSOLUTE);
@@ -427,6 +446,10 @@ void MappingTraits<COFFYAML::Relocation>::mapping(IO &IO,
427446
MappingNormalization<NType<COFF::RelocationTypeAMD64>, uint16_t> NT(
428447
IO, Rel.Type);
429448
IO.mapRequired("Type", NT->Type);
449+
} else if (H.Machine == COFF::IMAGE_FILE_MACHINE_R4000) {
450+
MappingNormalization<NType<COFF::RelocationTypesMips>, uint16_t> NT(
451+
IO, Rel.Type);
452+
IO.mapRequired("Type", NT->Type);
430453
} else if (H.Machine == COFF::IMAGE_FILE_MACHINE_ARMNT) {
431454
MappingNormalization<NType<COFF::RelocationTypesARM>, uint16_t> NT(
432455
IO, Rel.Type);
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# RUN: yaml2obj %s -o %t
2+
# RUN: llvm-readobj --file-headers --relocs %t | FileCheck %s
3+
# RUN: obj2yaml %t | FileCheck %s --check-prefix=ROUNDTRIP
4+
5+
# CHECK: Format: COFF-MIPS
6+
# CHECK: Arch: mipsel
7+
# CHECK: Machine: IMAGE_FILE_MACHINE_R4000 (0x166)
8+
# CHECK: Relocations [
9+
# CHECK: Section (1) .text {
10+
# CHECK: 0x4 IMAGE_REL_MIPS_JMPADDR main (0)
11+
# CHECK: }
12+
# CHECK: ]
13+
14+
# ROUNDTRIP: Machine: IMAGE_FILE_MACHINE_R4000
15+
# ROUNDTRIP: Relocations:
16+
# ROUNDTRIP-NEXT: - VirtualAddress: 4
17+
# ROUNDTRIP-NEXT: SymbolName: main
18+
# ROUNDTRIP-NEXT: Type: IMAGE_REL_MIPS_JMPADDR
19+
20+
--- !COFF
21+
header:
22+
Machine: IMAGE_FILE_MACHINE_R4000
23+
sections:
24+
- Name: .text
25+
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
26+
VirtualSize: 12
27+
SectionData: 000000000000000C00000000
28+
Relocations:
29+
- VirtualAddress: 4
30+
SymbolName: main
31+
Type: IMAGE_REL_MIPS_JMPADDR
32+
symbols:
33+
- Name: main
34+
Value: 0
35+
SectionNumber: 1
36+
SimpleType: IMAGE_SYM_TYPE_NULL
37+
ComplexType: IMAGE_SYM_DTYPE_NULL
38+
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
39+
...

0 commit comments

Comments
 (0)