target/arm: Fix ubfx et al for aarch64
authorRichard Henderson <rth@twiddle.net>
Fri, 13 Jan 2017 17:48:20 +0000 (09:48 -0800)
committerRichard Henderson <rth@twiddle.net>
Fri, 13 Jan 2017 17:48:20 +0000 (09:48 -0800)
commit86c9ab277615af4e0389eb80a83073873ff96c86
treeecc3296283a035e0b27a130bd4c94ec208ea6ffa
parenta32b6ae8976ca78483001e98cedea2329076055f
target/arm: Fix ubfx et al for aarch64

The patch in 59a71b4c5b4e suffered from a merge failure
when compared to the original patch in

  http://lists.nongnu.org/archive/html/qemu-devel/2016-12/msg00137.html

Signed-off-by: Richard Henderson <rth@twiddle.net>
target/arm/translate-a64.c