| Index: courgette/disassembler_elf_32_x86.cc
|
| diff --git a/courgette/disassembler_elf_32_x86.cc b/courgette/disassembler_elf_32_x86.cc
|
| index fc3c98c4bc8f899aa11aa0b88b16c07da9f79d57..a14475fc5b4019c7026932c067e595817611d68e 100644
|
| --- a/courgette/disassembler_elf_32_x86.cc
|
| +++ b/courgette/disassembler_elf_32_x86.cc
|
| @@ -21,9 +21,9 @@ CheckBool DisassemblerElf32X86::TypedRVAX86::ComputeRelativeTarget(
|
| }
|
|
|
| CheckBool DisassemblerElf32X86::TypedRVAX86::EmitInstruction(
|
| - AssemblyProgram* program,
|
| - Label* label) {
|
| - return program->EmitRel32(label);
|
| + Label* label,
|
| + InstructionReceptor* receptor) {
|
| + return receptor->EmitRel32(label);
|
| }
|
|
|
| uint16_t DisassemblerElf32X86::TypedRVAX86::op_size() const {
|
| @@ -72,7 +72,7 @@ CheckBool DisassemblerElf32X86::RelToRVA(Elf32_Rel rel, RVA* result) const {
|
|
|
| CheckBool DisassemblerElf32X86::ParseRelocationSection(
|
| const Elf32_Shdr* section_header,
|
| - AssemblyProgram* program) {
|
| + InstructionReceptor* receptor) const {
|
| // We can reproduce the R_386_RELATIVE entries in one of the relocation table
|
| // based on other information in the patch, given these conditions:
|
| //
|
| @@ -119,12 +119,12 @@ CheckBool DisassemblerElf32X86::ParseRelocationSection(
|
|
|
| if (match) {
|
| // Skip over relocation tables.
|
| - if (!program->EmitElfRelocationInstruction())
|
| + if (!receptor->EmitElfRelocation())
|
| return false;
|
| file_offset += sizeof(Elf32_Rel) * abs32_locations_.size();
|
| }
|
|
|
| - return ParseSimpleRegion(file_offset, section_end, program);
|
| + return ParseSimpleRegion(file_offset, section_end, receptor);
|
| }
|
|
|
| CheckBool DisassemblerElf32X86::ParseRel32RelocsFromSection(
|
|
|