factor macros out and generalise them

This commit is contained in:
edef 2014-12-24 06:22:49 +01:00
parent 791173fd97
commit 5a06b04a6a
3 changed files with 33 additions and 31 deletions

View File

@ -50,36 +50,6 @@ impl Registers {
} }
} }
macro_rules! into_regs_ {
($regs:ident { $reg:ident } <- $iter:ident) => {
match $iter.next() {
Some(value) => {
$regs.$reg = *value;
Some($iter)
}
None => None
}
};
($regs:ident { $reg:ident, $($regs_rest:ident),* } <- $iter:ident) => {
match $iter.next() {
Some(value) => {
$regs.$reg = *value;
into_regs_!($regs { $($regs_rest),* } <- $iter)
}
None => None
}
};
}
macro_rules! into_regs {
($regs:ident { $($regs_rest:ident),* } <- $iter:expr) => {
{
let mut iter = $iter;
into_regs_!($regs { $($regs_rest),* } <- iter)
}
}
}
pub fn initialise_call_frame(stack: &mut Stack, init: uintptr_t, args: &[uintptr_t]) -> Registers { pub fn initialise_call_frame(stack: &mut Stack, init: uintptr_t, args: &[uintptr_t]) -> Registers {
let sp = stack.top() as *mut uintptr_t; let sp = stack.top() as *mut uintptr_t;
let sp = align_down_mut(sp, 16); let sp = align_down_mut(sp, 16);
@ -96,7 +66,7 @@ pub fn initialise_call_frame(stack: &mut Stack, init: uintptr_t, args: &[uintptr
.. Registers::new() .. Registers::new()
}; };
match into_regs!(regs { rdi, r13, r14, r15 } <- args.iter()) { match into_fields!(regs { rdi, r13, r14, r15 } <- args.iter()) {
Some(mut args) => if args.next().is_some() { Some(mut args) => if args.next().is_some() {
panic!("too many arguments") panic!("too many arguments")
}, },

View File

@ -4,6 +4,9 @@ extern crate fn_box;
pub use context::Context; pub use context::Context;
#[macro_escape]
mod macros;
mod context; mod context;
mod stack; mod stack;

29
src/macros.rs Normal file
View File

@ -0,0 +1,29 @@
macro_rules! __into_fields {
($x:ident { $field:ident } <- $iter:ident) => {
match $iter.next() {
Some(value) => {
$x.$field = *value;
Some($iter)
}
None => None
}
};
($x:ident { $field:ident, $($fields_rest:ident),* } <- $iter:ident) => {
match $iter.next() {
Some(value) => {
$x.$field = *value;
__into_fields!($x { $($fields_rest),* } <- $iter)
}
None => None
}
};
}
macro_rules! into_fields {
($x:ident { $($fields_rest:ident),* } <- $iter:expr) => {
{
let mut iter = $iter;
__into_fields!($x { $($fields_rest),* } <- iter)
}
}
}