RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 18:42:46 +02:00
Code Issues Projects Releases Wiki Activity

MCDwarf: Delete uneeded parameter

Browse Source 
And change signature
This commit is contained in:
Fangrui Song 2021-01-21 00:55:07 -08:00
parent e9ef9e434c
commit 260c3e1d18
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/MC/MCDwarf.h
View File

@ -25,6 +25,7 @@
#include <cassert>
#include <cstdint>
#include <string>
#include <tuple>
#include <utility>
#include <vector>
@ -387,11 +388,11 @@ public:
int64_t LineDelta, uint64_t AddrDelta, raw_ostream &OS);
/// Utility function to encode a Dwarf pair of LineDelta and AddrDeltas using
/// fixed length operands.
static bool FixedEncode(MCContext &Context,
MCDwarfLineTableParams Params,
int64_t LineDelta, uint64_t AddrDelta,
raw_ostream &OS, uint32_t *Offset, uint32_t *Size);
/// fixed length operands. Returns (Offset, Size, SetDelta).
static std::tuple<uint32_t, uint32_t, bool> fixedEncode(MCContext &Context,
int64_t LineDelta,
uint64_t AddrDelta,
raw_ostream &OS);
/// Utility function to emit the encoding to a streamer.
static void Emit(MCStreamer *MCOS, MCDwarfLineTableParams Params,

7
lib/MC/MCAssembler.cpp
View File

@ -1119,10 +1119,9 @@ bool MCAssembler::relaxDwarfLineAddr(MCAsmLayout &Layout,
} else {
uint32_t Offset;
uint32_t Size;
bool SetDelta = MCDwarfLineAddr::FixedEncode(Context,
getDWARFLinetableParams(),
LineDelta, AddrDelta,
OSE, &Offset, &Size);
bool SetDelta;
std::tie(Offset, Size, SetDelta) =
MCDwarfLineAddr::fixedEncode(Context, LineDelta, AddrDelta, OSE);
// Add Fixups for address delta or new address.
const MCExpr *FixupExpr;
if (SetDelta) {

19
lib/MC/MCDwarf.cpp
View File

@ -766,11 +766,10 @@ void MCDwarfLineAddr::Encode(MCContext &Context, MCDwarfLineTableParams Params,
}
}
bool MCDwarfLineAddr::FixedEncode(MCContext &Context,
MCDwarfLineTableParams Params,
int64_t LineDelta, uint64_t AddrDelta,
raw_ostream &OS,
uint32_t *Offset, uint32_t *Size) {
std::tuple<uint32_t, uint32_t, bool>
MCDwarfLineAddr::fixedEncode(MCContext &Context, int64_t LineDelta,
uint64_t AddrDelta, raw_ostream &OS) {
uint32_t Offset, Size;
if (LineDelta != INT64_MAX) {
OS << char(dwarf::DW_LNS_advance_line);
encodeSLEB128(LineDelta, OS);
@ -790,15 +789,15 @@ bool MCDwarfLineAddr::FixedEncode(MCContext &Context,
encodeULEB128(1 + AddrSize, OS);
OS << char(dwarf::DW_LNE_set_address);
// Generate fixup for the address.
*Offset = OS.tell();
*Size = AddrSize;
Offset = OS.tell();
Size = AddrSize;
SetDelta = false;
OS.write_zeros(AddrSize);
} else {
OS << char(dwarf::DW_LNS_fixed_advance_pc);
// Generate fixup for 2-bytes address delta.
*Offset = OS.tell();
*Size = 2;
Offset = OS.tell();
Size = 2;
SetDelta = true;
OS << char(0);
OS << char(0);
@ -812,7 +811,7 @@ bool MCDwarfLineAddr::FixedEncode(MCContext &Context,
OS << char(dwarf::DW_LNS_copy);
}
return SetDelta;
return {Offset, Size, SetDelta};
}
// Utility function to write a tuple for .debug_abbrev.