diff options
| author | Sergey Fedorov <serge.fdrv@gmail.com> | 2015-06-15 18:06:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-15 18:06:07 +0100 |
| commit | 4e42a6ca37e39e56725518851f4388e46bd91129 (patch) | |
| tree | e39a671f72070bb0fb663a0f189c80cd98c65d64 | |
| parent | fc1891c74ae122a9dc7854f38bae7db03cd911e6 (diff) | |
| download | qemu-4e42a6ca37e39e56725518851f4388e46bd91129.zip | |
target-arm: use extended address bits from supersection short descriptor
Since ARMv7 with LPAE support, a supersection short translation table
descriptor has had extended base address fields which hold bits 39:32 of
translated address. These fields are IMPDEF in ARMv6 and ARMv7 without
LPAE support.
Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
Message-id: 1433235718-30485-1-git-send-email-serge.fdrv@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target-arm/helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index 3ed2fc3fa2..611b0e7cdc 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5397,6 +5397,8 @@ static int get_phys_addr_v6(CPUARMState *env, uint32_t address, int access_type, if (desc & (1 << 18)) { /* Supersection. */ phys_addr = (desc & 0xff000000) | (address & 0x00ffffff); + phys_addr |= (uint64_t)extract32(desc, 20, 4) << 32; + phys_addr |= (uint64_t)extract32(desc, 5, 4) << 36; *page_size = 0x1000000; } else { /* Section. */ |