[Qemu-devel] [PATCH] tcg update

[Qemu-devel] [PATCH] tcg update

[Richard Henderson]

Annoying that a bug that Peter reported for aarch64 is also
visible on x86_64.  Reported for a ppc64 target, it takes
a while to trigger the bug.


r~



The following changes since commit a008535b9fa396226ff9cf78b8ac5f3584bda58e:

  build-sys: fix make install regression (2016-09-20 11:32:43 +0100)

are available in the git repository at:

  git://github.com/rth7680/qemu.git tags/pull-tcg-20160920

for you to fetch changes up to ebb90a005da67147245cd38fb04a965a87a961b7:

  tcg/i386: Extend TARGET_PAGE_MASK to the proper type (2016-09-20 11:45:30 -0700)

----------------------------------------------------------------
tcg updates for 20 Sep

----------------------------------------------------------------
Richard Henderson (1):
      tcg/i386: Extend TARGET_PAGE_MASK to the proper type

 tcg/i386/tcg-target.inc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PATCH] tcg/i386: Extend TARGET_PAGE_MASK to the proper type

[Richard Henderson]

TARGET_PAGE_MASK, as defined, has type "int".  We need to extend
that to the proper target width before oring in an "unsigned".

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/i386/tcg-target.inc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
index cf7536b..eeb1777 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);
-- 
2.7.4

Re: [Qemu-devel] [PATCH] tcg update

[Peter Maydell]

On 20 September 2016 at 19:57, Richard Henderson <rth@twiddle.net> wrote:
> Annoying that a bug that Peter reported for aarch64 is also
> visible on x86_64.  Reported for a ppc64 target, it takes
> a while to trigger the bug.
>
>
> r~
>
>
>
> The following changes since commit a008535b9fa396226ff9cf78b8ac5f3584bda58e:
>
>   build-sys: fix make install regression (2016-09-20 11:32:43 +0100)
>
> are available in the git repository at:
>
>   git://github.com/rth7680/qemu.git tags/pull-tcg-20160920
>
> for you to fetch changes up to ebb90a005da67147245cd38fb04a965a87a961b7:
>
>   tcg/i386: Extend TARGET_PAGE_MASK to the proper type (2016-09-20 11:45:30 -0700)
>
> ----------------------------------------------------------------
> tcg updates for 20 Sep
>
> ----------------------------------------------------------------
> Richard Henderson (1):
>       tcg/i386: Extend TARGET_PAGE_MASK to the proper type
>
>  tcg/i386/tcg-target.inc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- PMM