[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 56/70] target/s390x: fix adj_len_to_page
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL v2 56/70] target/s390x: fix adj_len_to_page |
Date: |
Tue, 6 Jun 2017 17:31:05 -0700 |
From: Aurelien Jarno <address@hidden>
adj_len_to_page doesn't return the correct result when the address
is already page aligned and the length is bigger than a page. Fix that.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 4ed0b65..2326f0b 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -61,7 +61,7 @@ static inline uint32_t adj_len_to_page(uint32_t len, uint64_t
addr)
{
#ifndef CONFIG_USER_ONLY
if ((addr & ~TARGET_PAGE_MASK) + len - 1 >= TARGET_PAGE_SIZE) {
- return -addr & ~TARGET_PAGE_MASK;
+ return -(addr | TARGET_PAGE_MASK);
}
#endif
return len;
--
2.9.4
- [Qemu-devel] [PULL v2 46/70] target/s390x: implement COMPARE AND SIGNAL, (continued)
- [Qemu-devel] [PULL v2 46/70] target/s390x: implement COMPARE AND SIGNAL, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 48/70] target/s390x: implement MOVE NUMERICS, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 47/70] target/s390x: implement MOVE INVERSE, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 49/70] target/s390x: implement MOVE WITH OFFSET, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 50/70] target/s390x: implement MOVE ZONES, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 51/70] target/s390x: improve 24-bit and 31-bit addresses read, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 54/70] target/s390x: fix COMPARE LOGICAL LONG EXTENDED, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 52/70] target/s390x: improve 24-bit and 31-bit addresses write, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 53/70] target/s390x: improve 24-bit and 31-bit lengths read/write, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 55/70] target/s390x: implement COMPARE LOGICAL LONG, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 56/70] target/s390x: fix adj_len_to_page,
Richard Henderson <=
- [Qemu-devel] [PULL v2 59/70] target/s390x: implement MOVE LONG UNICODE, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 58/70] target/s390x: implement COMPARE LOGICAL LONG UNICODE, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 57/70] target/s390x: improve MOVE LONG and MOVE LONG EXTENDED, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 60/70] target/s390x: implement PACK ASCII, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 61/70] target/s390x: implement PACK UNICODE, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 62/70] target/s390x: implement UNPACK ASCII, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 64/70] target/s390x: implement TEST DECIMAL, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 63/70] target/s390x: implement UNPACK UNICODE, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 65/70] target/s390x: implement TRANSLATE ONE/TWO TO ONE/TWO, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 66/70] target/s390x: implement LOAD PAIR FROM QUADWORD, Richard Henderson, 2017/06/06