Merge "Fix x64's cmpw."