[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/12] target-arm: A64: Avoid left shifting negative
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 11/12] target-arm: A64: Avoid left shifting negative integers in disas_pc_rel_addr |
Date: |
Fri, 13 Feb 2015 05:54:44 +0000 |
Shifting a negative integer left is undefined behaviour in C.
Avoid it by assembling and shifting the offset fields as
unsigned values and then sign extending as the final action.
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
---
target-arm/translate-a64.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c
index 94b3bf4..68c5b23 100644
--- a/target-arm/translate-a64.c
+++ b/target-arm/translate-a64.c
@@ -2662,11 +2662,12 @@ static void disas_pc_rel_adr(DisasContext *s, uint32_t
insn)
{
unsigned int page, rd;
uint64_t base;
- int64_t offset;
+ uint64_t offset;
page = extract32(insn, 31, 1);
/* SignExtend(immhi:immlo) -> offset */
- offset = ((int64_t)sextract32(insn, 5, 19) << 2) | extract32(insn, 29, 2);
+ offset = sextract64(insn, 5, 19);
+ offset = offset << 2 | extract32(insn, 29, 2);
rd = extract32(insn, 0, 5);
base = s->pc - 4;
--
1.9.1
- [Qemu-devel] [PULL 00/12] target-arm queue, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 09/12] target-arm: A64: Fix shifts into sign bit, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 11/12] target-arm: A64: Avoid left shifting negative integers in disas_pc_rel_addr,
Peter Maydell <=
- [Qemu-devel] [PULL 10/12] target-arm: A64: Fix handling of rotate in logic_imm_decode_wmask, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 08/12] target-arm: Add AArch32 guest support to KVM64, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 05/12] target-arm: Add CPU property to disable AArch64, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 04/12] pci: Move PCI VGA to pci.mak, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 01/12] pci: Allocate PCIe host bridge PCI ID, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 03/12] arm: Add PCIe host bridge in virt machine, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 02/12] pci: Add generic PCIe host bridge, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 12/12] target-arm: A64: Avoid signed shifts in disas_ldst_pair(), Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 06/12] target-arm: Add feature parsing to virt, Peter Maydell, 2015/02/13
- [Qemu-devel] [PULL 07/12] target-arm: Add 32/64-bit register sync, Peter Maydell, 2015/02/13