nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 06:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better comment handling

Browse Source
This commit is contained in:
bjorn3 2018-07-20 13:51:34 +02:00
parent 2b5e55fb17
commit a3b53eb451
4 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/abi.rs
View File

@ -149,7 +149,7 @@ pub fn codegen_call<'a, 'tcx: 'a>(
func: &Operand<'tcx>,
args: &[Operand<'tcx>],
destination: &Option<(Place<'tcx>, BasicBlock)>,
) -> Inst {
) {
let func = ::base::trans_operand(fx, func);
let return_place = if let Some((place, _)) = destination {
::base::trans_place(fx, place).expect_addr()
@ -170,22 +170,21 @@ pub fn codegen_call<'a, 'tcx: 'a>(
}
})
).collect::<Vec<_>>();
let inst = match func {
match func {
CValue::Func(func, _) => {
fx.bcx.ins().call(func, &args)
fx.bcx.ins().call(func, &args);
}
func => {
let func_ty = func.layout().ty;
let func = func.load_value(fx);
let sig = fx.bcx.import_signature(cton_sig_from_fn_ty(fx.tcx, func_ty));
fx.bcx.ins().call_indirect(sig, func, &args)
fx.bcx.ins().call_indirect(sig, func, &args);
}
};
}
if let Some((_, dest)) = *destination {
let ret_ebb = fx.get_ebb(dest);
fx.bcx.ins().jump(ret_ebb, &[]);
} else {
fx.bcx.ins().trap(TrapCode::User(!0));
}
inst
}

50
src/base.rs
View File

@ -106,28 +106,33 @@ pub fn trans_fn<'a, 'tcx: 'a>(cx: &mut CodegenCx<'a, 'tcx, CurrentBackend>, f: &
let ebb = fx.get_ebb(bb);
fx.bcx.switch_to_block(ebb);
fx.bcx.ins().nop();
for stmt in &bb_data.statements {
trans_stmt(fx, stmt)?;
trans_stmt(fx, ebb, stmt)?;
}
let inst = match &bb_data.terminator().kind {
let mut terminator_head = "\n".to_string();
bb_data.terminator().kind.fmt_head(&mut terminator_head).unwrap();
let inst = fx.bcx.func.layout.last_inst(ebb).unwrap();
fx.add_comment(inst, terminator_head);
match &bb_data.terminator().kind {
TerminatorKind::Goto { target } => {
let ebb = fx.get_ebb(*target);
fx.bcx.ins().jump(ebb, &[])
fx.bcx.ins().jump(ebb, &[]);
}
TerminatorKind::Return => {
fx.bcx.ins().return_(&[])
fx.bcx.ins().return_(&[]);
}
TerminatorKind::Assert { cond, expected, msg: _, target, cleanup: _ } => {
let cond = trans_operand(fx, cond).load_value(fx);
let target = fx.get_ebb(*target);
let inst = if *expected {
fx.bcx.ins().brz(cond, target, &[])
if *expected {
fx.bcx.ins().brz(cond, target, &[]);
} else {
fx.bcx.ins().brnz(cond, target, &[])
fx.bcx.ins().brnz(cond, target, &[]);
};
fx.bcx.ins().trap(TrapCode::User(!0));
inst
}
TerminatorKind::SwitchInt { discr, switch_ty: _, values, targets } => {
@ -138,16 +143,15 @@ pub fn trans_fn<'a, 'tcx: 'a>(cx: &mut CodegenCx<'a, 'tcx, CurrentBackend>, f: &
jt_data.set_entry(*value as usize, ebb);
}
let mut jump_table = fx.bcx.create_jump_table(jt_data);
let inst = fx.bcx.ins().br_table(discr, jump_table);
fx.bcx.ins().br_table(discr, jump_table);
let otherwise_ebb = fx.get_ebb(targets[targets.len() - 1]);
fx.bcx.ins().jump(otherwise_ebb, &[]);
inst
}
TerminatorKind::Call { func, args, destination, cleanup: _ } => {
::abi::codegen_call(fx, func, args, destination)
::abi::codegen_call(fx, func, args, destination);
}
TerminatorKind::Resume | TerminatorKind::Abort | TerminatorKind::Unreachable => {
fx.bcx.ins().trap(TrapCode::User(!0))
fx.bcx.ins().trap(TrapCode::User(!0));
}
TerminatorKind::Yield { .. } |
TerminatorKind::FalseEdges { .. } |
@ -158,16 +162,12 @@ pub fn trans_fn<'a, 'tcx: 'a>(cx: &mut CodegenCx<'a, 'tcx, CurrentBackend>, f: &
// TODO call drop impl
// unimplemented!("terminator {:?}", bb_data.terminator());
let target_ebb = fx.get_ebb(*target);
fx.bcx.ins().jump(target_ebb, &[])
fx.bcx.ins().jump(target_ebb, &[]);
}
TerminatorKind::GeneratorDrop => {
unimplemented!("terminator GeneratorDrop");
}
};
let mut terminator_head = "\n".to_string();
bb_data.terminator().kind.fmt_head(&mut terminator_head).unwrap();
fx.add_comment(inst, terminator_head);
}
fx.bcx.seal_all_blocks();
@ -176,10 +176,11 @@ pub fn trans_fn<'a, 'tcx: 'a>(cx: &mut CodegenCx<'a, 'tcx, CurrentBackend>, f: &
Ok(fx.comments.clone())
}
fn trans_stmt<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx>, stmt: &Statement<'tcx>) -> Result<(), String> {
fn trans_stmt<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx>, cur_ebb: Ebb, stmt: &Statement<'tcx>) -> Result<(), String> {
fx.tcx.sess.warn(&format!("stmt {:?}", stmt));
let nop_inst = fx.bcx.ins().nop();
let inst = fx.bcx.func.layout.last_inst(cur_ebb).unwrap();
fx.add_comment(inst, format!("{:?}", stmt));
match &stmt.kind {
StatementKind::SetDiscriminant { place, variant_index } => {
@ -191,7 +192,6 @@ fn trans_stmt<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx>, stmt: &Statement<'tcx
match layout.variants {
layout::Variants::Single { index } => {
assert_eq!(index, *variant_index);
fx.bcx.ins().nop();
}
layout::Variants::Tagged { .. } => {
let ptr = place.place_field(fx, mir::Field::new(0));
@ -219,8 +219,6 @@ fn trans_stmt<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx>, stmt: &Statement<'tcx
CValue::const_val(fx, niche.layout().ty, niche_value as u64 as i64)
};
niche.write_cvalue(fx, niche_llval);
} else {
fx.bcx.ins().nop();
}
}
}
@ -393,16 +391,10 @@ fn trans_stmt<'a, 'tcx: 'a>(fx: &mut FunctionCx<'a, 'tcx>, stmt: &Statement<'tcx
Rvalue::Aggregate(_, _) => bug!("shouldn't exist at trans {:?}", rval),
}
}
StatementKind::StorageLive(_) | StatementKind::StorageDead(_) | StatementKind::Nop | StatementKind::ReadForMatch(_) | StatementKind::Validate(_, _) | StatementKind::EndRegion(_) | StatementKind::UserAssertTy(_, _) => {
fx.bcx.ins().nop();
}
StatementKind::StorageLive(_) | StatementKind::StorageDead(_) | StatementKind::Nop | StatementKind::ReadForMatch(_) | StatementKind::Validate(_, _) | StatementKind::EndRegion(_) | StatementKind::UserAssertTy(_, _) => {}
StatementKind::InlineAsm { .. } => fx.tcx.sess.fatal("Inline assembly is not supported"),
}
let inst = fx.bcx.func.layout.next_inst(nop_inst).unwrap();
fx.bcx.func.layout.remove_inst(nop_inst);
fx.add_comment(inst, format!("{:?}", stmt));
Ok(())
}

15
src/common.rs
View File

@ -1,4 +1,3 @@
use std::borrow::Cow;
use std::fmt;
use syntax::ast::{IntTy, UintTy};
@ -259,7 +258,6 @@ impl<'a, 'tcx: 'a> CPlace<'tcx> {
let field_offset = fx.bcx.ins().iconst(types::I64, field_offset.bytes() as i64);
CPlace::Addr(fx.bcx.ins().iadd(base, field_offset), field_ty)
} else {
fx.bcx.ins().nop();
CPlace::Addr(base, field_ty)
}
}
@ -376,17 +374,4 @@ impl<'a, 'tcx: 'a> FunctionCx<'a, 'tcx> {
pub fn get_local_place(&mut self, local: Local) -> CPlace<'tcx> {
*self.local_map.get(&local).unwrap()
}
pub fn add_comment<'s, S: Into<Cow<'s, str>>>(&mut self, inst: Inst, comment: S) {
use std::collections::hash_map::Entry;
match self.comments.entry(inst) {
Entry::Occupied(mut occ) => {
occ.get_mut().push('\n');
occ.get_mut().push_str(comment.into().as_ref());
}
Entry::Vacant(vac) => {
vac.insert(comment.into().into_owned());
}
}
}
}

27
src/pretty_clif.rs
View File

@ -1,11 +1,10 @@
use std::borrow::Cow;
use std::collections::HashMap;
use std::fmt;
use cranelift::codegen::{
ir::{Function, Inst},
write::{FuncWriter, PlainWriter},
};
use cranelift::prelude::*;
use cranelift::codegen::write::{FuncWriter, PlainWriter};
use prelude::*;
pub struct CommentWriter(pub HashMap<Inst, String>);
@ -18,10 +17,11 @@ impl FuncWriter for CommentWriter {
inst: Inst,
indent: usize,
) -> fmt::Result {
PlainWriter.write_instruction(w, func, isa, inst, indent)?;
if let Some(comment) = self.0.get(&inst) {
writeln!(w, "; {}", comment.replace('\n', "\n; "))?;
}
PlainWriter.write_instruction(w, func, isa, inst, indent)
Ok(())
}
fn write_preamble(
@ -33,3 +33,18 @@ impl FuncWriter for CommentWriter {
PlainWriter.write_preamble(w, func, reg_info)
}
}
impl<'a, 'tcx: 'a> FunctionCx<'a, 'tcx> {
pub fn add_comment<'s, S: Into<Cow<'s, str>>>(&mut self, inst: Inst, comment: S) {
use std::collections::hash_map::Entry;
match self.comments.entry(inst) {
Entry::Occupied(mut occ) => {
occ.get_mut().push('\n');
occ.get_mut().push_str(comment.into().as_ref());
}
Entry::Vacant(vac) => {
vac.insert(comment.into().into_owned());
}
}
}
}