[Qemu-devel] [PULL] Fix broken x86 host

[Qemu-devel] [PULL] Fix broken x86 host

[Richard Henderson]

I broke x86 on mainline yesterday for big-endian targets.  Sorry for the
incomplete testing after the rebase.  Please pull.


r~


The following changes since commit cd2b9b86803e46a09cf239afc44413884efa53f4:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20140512' into staging (2014-05-13 13:16:37 +0100)

are available in the git repository at:


  git://github.com/rth7680/qemu.git fix-i386

for you to fetch changes up to cb3d83bc49e823b5fe43cf4f17eac60f24c6805c:

  exec-all.h: Use stl_le_p instead of stl_p patching x86 (2014-05-13 10:16:07 -0700)

----------------------------------------------------------------
Richard Henderson (1):
      exec-all.h: Use stl_le_p instead of stl_p patching x86

 include/exec/exec-all.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL] exec-all.h: Use stl_le_p instead of stl_p patching x86

[Richard Henderson]

We got the wrong version of stl_p, the one that bswaps as appropriate
for the target.  Since x86 is always little-endian, the "_le_" routine
will resolve to what we want.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 include/exec/exec-all.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 0766e24..444b4d9 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -229,7 +229,7 @@ void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr);
 static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr)
 {
     /* patch the branch destination */
-    stl_p((void*)jmp_addr, addr - (jmp_addr + 4));
+    stl_le_p((void*)jmp_addr, addr - (jmp_addr + 4));
     /* no need to flush icache explicitly */
 }
 #elif defined(__aarch64__)
-- 
1.9.0

Re: [Qemu-devel] [PULL] Fix broken x86 host

[Peter Maydell]

On 13 May 2014 18:21, Richard Henderson <rth@twiddle.net> wrote:
> I broke x86 on mainline yesterday for big-endian targets.  Sorry for the
> incomplete testing after the rebase.  Please pull.
>
>
> r~
>
>
> The following changes since commit cd2b9b86803e46a09cf239afc44413884efa53f4:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20140512' into staging (2014-05-13 13:16:37 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/rth7680/qemu.git fix-i386
>
> for you to fetch changes up to cb3d83bc49e823b5fe43cf4f17eac60f24c6805c:
>
>   exec-all.h: Use stl_le_p instead of stl_p patching x86 (2014-05-13 10:16:07 -0700)

Applied, thanks.

-- PMM