mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rustfmt debuginfo

Browse Source
This commit is contained in:
bjorn3 2019-11-12 21:13:15 +01:00
parent c5c6ce87d2
commit d8e9148c2e
2 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/debuginfo/line_info.rs
View File

@ -5,8 +5,7 @@
use cranelift::codegen::binemit::CodeOffset;
use gimli::write::{
Address, AttributeValue, FileId, LineProgram, LineString,
LineStringTable, Range, UnitEntryId,
Address, AttributeValue, FileId, LineProgram, LineString, LineStringTable, Range, UnitEntryId,
};
fn line_program_add_file(
@ -131,11 +130,15 @@ pub(crate) fn create_debug_lines(
let entry = self.debug_context.dwarf.unit.get_mut(self.entry_id);
entry.set(
gimli::DW_AT_low_pc,
AttributeValue::Address(Address::Symbol { symbol: self.symbol, addend: 0 }),
AttributeValue::Address(Address::Symbol {
symbol: self.symbol,
addend: 0,
}),
);
entry.set(gimli::DW_AT_high_pc, AttributeValue::Udata(end as u64));
self.debug_context.emit_location(self.entry_id, self.mir.span);
self.debug_context
.emit_location(self.entry_id, self.mir.span);
end
}

85
src/debuginfo/mod.rs
View File

@ -7,8 +7,8 @@
use cranelift::codegen::isa::RegUnit;
use gimli::write::{
self, Address, AttributeValue, DwarfUnit, Expression, LineProgram, LineString,
Location, LocationList, Range, RangeList, UnitEntryId, Writer,
self, Address, AttributeValue, DwarfUnit, Expression, LineProgram, LineString, Location,
LocationList, Range, RangeList, UnitEntryId, Writer,
};
use gimli::{Encoding, Format, LineEncoding, Register, RunTimeEndian, X86_64};
@ -105,9 +105,7 @@ fn dwarf_ty(&mut self, ty: Ty<'tcx>) -> UnitEntryId {
return *type_id;
}
let new_entry = |dwarf: &mut DwarfUnit, tag| {
dwarf.unit.add(dwarf.unit.root(), tag)
};
let new_entry = |dwarf: &mut DwarfUnit, tag| dwarf.unit.add(dwarf.unit.root(), tag);
let primtive = |dwarf: &mut DwarfUnit, ate| {
let type_id = new_entry(dwarf, gimli::DW_TAG_base_type);
@ -122,7 +120,11 @@ fn dwarf_ty(&mut self, ty: Ty<'tcx>) -> UnitEntryId {
ty::Uint(_) => primtive(&mut self.dwarf, gimli::DW_ATE_unsigned),
ty::Int(_) => primtive(&mut self.dwarf, gimli::DW_ATE_signed),
ty::Float(_) => primtive(&mut self.dwarf, gimli::DW_ATE_float),
ty::Ref(_, pointee_ty, mutbl) | ty::RawPtr(ty::TypeAndMut { ty: pointee_ty, mutbl }) => {
ty::Ref(_, pointee_ty, mutbl)
| ty::RawPtr(ty::TypeAndMut {
ty: pointee_ty,
mutbl,
}) => {
let type_id = new_entry(&mut self.dwarf, gimli::DW_TAG_pointer_type);
// Ensure that type is inserted before recursing to avoid duplicates
@ -145,7 +147,10 @@ fn dwarf_ty(&mut self, ty: Ty<'tcx>) -> UnitEntryId {
let type_entry = self.dwarf.unit.get_mut(type_id);
type_entry.set(gimli::DW_AT_name, AttributeValue::String(name.into_bytes()));
type_entry.set(gimli::DW_AT_byte_size, AttributeValue::Udata(layout.size.bytes()));
type_entry.set(
gimli::DW_AT_byte_size,
AttributeValue::Udata(layout.size.bytes()),
);
self.types.insert(ty, type_id);
@ -219,14 +224,8 @@ fn define_local(&mut self, local: mir::Local) -> UnitEntryId {
.add(self.entry_id, gimli::DW_TAG_variable);
let var_entry = self.debug_context.dwarf.unit.get_mut(var_id);
var_entry.set(
gimli::DW_AT_name,
AttributeValue::String(name.into_bytes()),
);
var_entry.set(
gimli::DW_AT_type,
AttributeValue::ThisUnitEntryRef(dw_ty),
);
var_entry.set(gimli::DW_AT_name, AttributeValue::String(name.into_bytes()));
var_entry.set(gimli::DW_AT_type, AttributeValue::ThisUnitEntryRef(dw_ty));
var_id
}
@ -250,38 +249,36 @@ pub fn define(
length: end as u64,
});
{
let value_labels_ranges = context.build_value_labels_ranges(isa).unwrap();
let value_labels_ranges = context.build_value_labels_ranges(isa).unwrap();
for (value_label, value_loc_ranges) in value_labels_ranges.iter() {
let var_id = self.define_local(mir::Local::from_u32(value_label.as_u32()));
for (value_label, value_loc_ranges) in value_labels_ranges.iter() {
let var_id = self.define_local(mir::Local::from_u32(value_label.as_u32()));
let loc_list = LocationList(
value_loc_ranges
.iter()
.map(|value_loc_range| {
Location::StartEnd {
begin: Address::Symbol {
symbol: self.symbol,
addend: i64::from(value_loc_range.start),
},
end: Address::Symbol {
symbol: self.symbol,
addend: i64::from(value_loc_range.end),
},
data: Expression(translate_loc(value_loc_range.loc, &context.func.stack_slots).unwrap()),
}
})
.collect(),
);
let loc_list_id = self.debug_context.dwarf.unit.locations.add(loc_list);
let loc_list = LocationList(
value_loc_ranges
.iter()
.map(|value_loc_range| Location::StartEnd {
begin: Address::Symbol {
symbol: self.symbol,
addend: i64::from(value_loc_range.start),
},
end: Address::Symbol {
symbol: self.symbol,
addend: i64::from(value_loc_range.end),
},
data: Expression(
translate_loc(value_loc_range.loc, &context.func.stack_slots).unwrap(),
),
})
.collect(),
);
let loc_list_id = self.debug_context.dwarf.unit.locations.add(loc_list);
let var_entry = self.debug_context.dwarf.unit.get_mut(var_id);
var_entry.set(
gimli::DW_AT_location,
AttributeValue::LocationListRef(loc_list_id),
);
}
let var_entry = self.debug_context.dwarf.unit.get_mut(var_id);
var_entry.set(
gimli::DW_AT_location,
AttributeValue::LocationListRef(loc_list_id),
);
}
}
}