* [Qemu-devel] [PATCH] tcg-s390: Fix movi
@ 2013-03-26 0:11 Richard Henderson
2013-03-26 23:00 ` Alexander Graf
0 siblings, 1 reply; 2+ messages in thread
From: Richard Henderson @ 2013-03-26 0:11 UTC (permalink / raw)
To: qemu-devel; +Cc: Alexander Graf
The code to load the high 64 bits assumed that the insn used to
load the low 64 bits zero-extended. Enforce that.
Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
tcg/s390/tcg-target.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
index e12a152..0132010 100644
--- a/tcg/s390/tcg-target.c
+++ b/tcg/s390/tcg-target.c
@@ -770,7 +770,7 @@ static void tcg_out_movi(TCGContext *s, TCGType type,
/* If we get here, both the high and low parts have non-zero bits. */
/* Recurse to load the lower 32-bits. */
- tcg_out_movi(s, TCG_TYPE_I32, ret, sval);
+ tcg_out_movi(s, TCG_TYPE_I64, ret, uval & 0xffffffff);
/* Insert data into the high 32-bits. */
uval = uval >> 31 >> 1;
--
1.8.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] tcg-s390: Fix movi
2013-03-26 0:11 [Qemu-devel] [PATCH] tcg-s390: Fix movi Richard Henderson
@ 2013-03-26 23:00 ` Alexander Graf
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Graf @ 2013-03-26 23:00 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel
On 26.03.2013, at 01:11, Richard Henderson wrote:
> The code to load the high 64 bits assumed that the insn used to
> load the low 64 bits zero-extended. Enforce that.
>
> Cc: Alexander Graf <agraf@suse.de>
> Signed-off-by: Richard Henderson <rth@twiddle.net>
Tested-by: Alexander Graf <agraf@suse.de>
Though running an s390x guest on an s390x host gives me this happy error when it wants to enter user space:
Inconsistency detected by ld.so: rtld.c: 1091: dl_main: Assertion `main_map != ((void *)0)' failed!
The very same s390x guest kernel+initrd run fine on an x86_64 host.
Alex
> ---
> tcg/s390/tcg-target.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
> index e12a152..0132010 100644
> --- a/tcg/s390/tcg-target.c
> +++ b/tcg/s390/tcg-target.c
> @@ -770,7 +770,7 @@ static void tcg_out_movi(TCGContext *s, TCGType type,
> /* If we get here, both the high and low parts have non-zero bits. */
>
> /* Recurse to load the lower 32-bits. */
> - tcg_out_movi(s, TCG_TYPE_I32, ret, sval);
> + tcg_out_movi(s, TCG_TYPE_I64, ret, uval & 0xffffffff);
>
> /* Insert data into the high 32-bits. */
> uval = uval >> 31 >> 1;
> --
> 1.8.1.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-26 23:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-26 0:11 [Qemu-devel] [PATCH] tcg-s390: Fix movi Richard Henderson
2013-03-26 23:00 ` Alexander Graf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).