Reorganization of x86_64 aesni code