Merges some of the macros roti now handles ROTR as well as ROTL. Removed some if XOP defines, since we now have the cmov instruction memicked in non XOP builds