Skip to content
This repository was archived by the owner on Jul 6, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ioreg/builder/accessors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ pub struct BuildAccessors<'a, 'b, 'c> {
impl<'a, 'b, 'c> node::RegVisitor for BuildAccessors<'a, 'b, 'c> {
fn visit_prim_reg(&mut self, path: &Vec<String>, reg: &node::Reg,
_width: node::RegWidth, fields: &Vec<node::Field>) {
let item = build_get_fn(self.cx, path, reg);
self.builder.push_item(item);
if fields.iter().any(|f| f.access != node::WriteOnly) {
let item = build_get_fn(self.cx, path, reg);
self.builder.push_item(item);
}

for field in fields.iter() {
match build_field_accessors(self.cx, path, reg, field) {
Expand Down
11 changes: 10 additions & 1 deletion ioreg/builder/setter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,23 @@ fn build_drop<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
}
}

// no need to read write-only registers
let wo_reg: bool = fields.iter().all(|f| f.access == node::WriteOnly);
let initial_value =
if wo_reg {
quote_expr!(cx, 0)
} else {
quote_expr!(cx, self.reg.value.get())
};

let item = quote_item!(cx,
#[unsafe_destructor]
#[doc = "This performs the register update"]
impl Drop for $setter_ty {
fn drop(&mut self) {
let clear_mask: $unpacked_ty = $clear as $unpacked_ty;
if self.mask != 0 {
let v: $unpacked_ty = self.reg.value.get() & ! clear_mask & ! self.mask;
let v: $unpacked_ty = $initial_value & ! clear_mask & ! self.mask;
self.reg.value.set(self.value | v);
}
}
Expand Down