OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tcg updates for 20 Sep 

-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJX4YRkAAoJEK0ScMxN0Cebdt8H/A8t8mIXp6OcRDcewVzIPEyn
 iF+yHj/6Ejp5+B8N/NfnSfko27/J40jy5IodO74jZmof1YUXZW1uU3vcT8VGd72R
 3526ZvenJBZ+CcF5uUYdST0f3qbobdya0flpgsa7dtLGGq6dGUtJnAxgRzTraBD1
 Hqh37NusD5x+T8GhFo9Oc9mgbuV022wrHW9QeWuR0i34JXsjSJjK9EnEiCgUcr2C
 fwNbPPe2znLjPWHazeUT6p7d7NDdOsdwzFFT788I0yZ3Pvn4eUxs4ff0/D+oPHHU
 liPq/f/FztqnUL6YIzN5kdCRTZ4dvG+LZGmpSx46oA29S3hVtKABU/pcxxIqjNY=
 =xS7N
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2016-09-22 10:10:06 +01:00
parent a008535b9f ebb90a005d
commit b98bbea2d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tcg/i386/tcg-target.inc.c
View File

@ -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);