Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 115386f8 authored Feb 18, 2015 by Robin Murphy Committed by Will Deacon Feb 23, 2015

arm64: insn: fix compare-and-branch encodings



Fix cbz/cbnz having the mask offset by a bit, and add encodings for
tbz/tbnz so that all branch forms are represented.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Zi Shen Lim <zlim.lnx@gmail.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent d0d62230

arch/arm64/include/asm/insn.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -264,8 +264,10 @@ __AARCH64_INSN_FUNCS(ands, 0x7F200000, 0x6A000000)
		__AARCH64_INSN_FUNCS(bics, 0x7F200000, 0x6A200000)
		__AARCH64_INSN_FUNCS(b, 0xFC000000, 0x14000000)
		__AARCH64_INSN_FUNCS(bl, 0xFC000000, 0x94000000)
		__AARCH64_INSN_FUNCS(cbz, 0xFE000000, 0x34000000)
		__AARCH64_INSN_FUNCS(cbnz, 0xFE000000, 0x35000000)
		__AARCH64_INSN_FUNCS(cbz, 0x7F000000, 0x34000000)
		__AARCH64_INSN_FUNCS(cbnz, 0x7F000000, 0x35000000)
		__AARCH64_INSN_FUNCS(tbz, 0x7F000000, 0x36000000)
		__AARCH64_INSN_FUNCS(tbnz, 0x7F000000, 0x37000000)
		__AARCH64_INSN_FUNCS(bcond, 0xFF000010, 0x54000000)
		__AARCH64_INSN_FUNCS(svc, 0xFFE0001F, 0xD4000001)
		__AARCH64_INSN_FUNCS(hvc, 0xFFE0001F, 0xD4000002)