cleanup wdis code
add architecture specific macros