Don't use "m" or memory_operand any more; instead explicitly match with mem:SI.