diff options
| author | Peter Maydell | 2016-09-22 11:10:06 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-09-22 11:10:06 +0200 |
| commit | b98bbea2d94dc5902acaa3a5dd7f9057cc82cdb1 (patch) | |
| tree | 0cd18f9f9cdc417c213401b7ed5e2d5dd7e1c937 | |
| parent | build-sys: fix make install regression (diff) | |
| parent | tcg/i386: Extend TARGET_PAGE_MASK to the proper type (diff) | |
| download | qemu-b98bbea2d94dc5902acaa3a5dd7f9057cc82cdb1.tar.gz qemu-b98bbea2d94dc5902acaa3a5dd7f9057cc82cdb1.tar.xz qemu-b98bbea2d94dc5902acaa3a5dd7f9057cc82cdb1.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20160920' into staging
tcg updates for 20 Sep
# gpg: Signature made Tue 20 Sep 2016 19:48:04 BST
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-tcg-20160920:
tcg/i386: Extend TARGET_PAGE_MASK to the proper type
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tcg/i386/tcg-target.inc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index cf7536bd52..eeb1777bbb 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -1243,7 +1243,7 @@ static inline void tcg_out_tlb_load(TCGContext *s, TCGReg addrlo, TCGReg addrhi, } else { tcg_out_modrm_offset(s, OPC_LEA + trexw, r1, addrlo, s_mask - a_mask); } - tlb_mask = TARGET_PAGE_MASK | a_mask; + tlb_mask = (target_ulong)TARGET_PAGE_MASK | a_mask; tcg_out_shifti(s, SHIFT_SHR + tlbrexw, r0, TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS); |