What about ROL r/m16, 8?

This would indeed work (and is likely the better solution), but in opposite to BSWAP and XCHG, it also changes flags.