From: Thomas Huth <thuth@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, Ilya Leoshkevich <iii@linux.ibm.com>
Subject: Re: [PATCH v4 27/27] target/s390x: Enable TARGET_TB_PCREL
Date: Mon, 27 Feb 2023 12:41:36 +0100 [thread overview]
Message-ID: <6840da18-ca5f-db7c-a60a-1f2fb45d806d@redhat.com> (raw)
In-Reply-To: <0a437546-3b18-3a3a-6ffb-afa93a93c170@redhat.com>
On 21/02/2023 15.35, Thomas Huth wrote:
> On 20/02/2023 19.40, Richard Henderson wrote:
>> Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>> target/s390x/cpu-param.h | 4 ++
>> target/s390x/cpu.c | 12 +++++
>> target/s390x/tcg/translate.c | 86 +++++++++++++++++++++++-------------
>> 3 files changed, 71 insertions(+), 31 deletions(-)
>>
>> diff --git a/target/s390x/cpu-param.h b/target/s390x/cpu-param.h
>> index bf951a002e..52bb95de57 100644
>> --- a/target/s390x/cpu-param.h
>> +++ b/target/s390x/cpu-param.h
>> @@ -14,4 +14,8 @@
>> #define TARGET_VIRT_ADDR_SPACE_BITS 64
>> #define NB_MMU_MODES 4
>> +#ifndef CONFIG_USER_ONLY
>> +# define TARGET_TB_PCREL 1
>> +#endif
>> +
>> #endif
>> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
>> index b10a8541ff..933ff06395 100644
>> --- a/target/s390x/cpu.c
>> +++ b/target/s390x/cpu.c
>> @@ -37,6 +37,7 @@
>> #ifndef CONFIG_USER_ONLY
>> #include "sysemu/reset.h"
>> #endif
>> +#include "exec/exec-all.h"
>> #define CR0_RESET 0xE0UL
>> #define CR14_RESET 0xC2000000UL;
>> @@ -83,6 +84,16 @@ uint64_t s390_cpu_get_psw_mask(CPUS390XState *env)
>> return r;
>> }
>> +static void s390_cpu_synchronize_from_tb(CPUState *cs,
>> + const TranslationBlock *tb)
>> +{
>> + /* The program counter is always up to date with TARGET_TB_PCREL. */
>> + if (!TARGET_TB_PCREL) {
>> + S390CPU *cpu = S390_CPU(cs);
>> + cpu->env.psw.addr = tb_pc(tb);
>> + }
>> +}
>
> FYI, this causes a build failure with --disable-tcg:
>
> https://gitlab.com/thuth/qemu/-/jobs/3806828645#L1885
>
> I'll add this to fix it, no need to respin:
FYI, I've unqueued this series from my current pull request again since it's
causing trouble with the avocado-system-centos and avocado-system-opensuse
CI jobs ... I'll try to pin-point the failing patch later, but since the
rest of my current queue is quite long already, I really want to get that
big queue merged first.
Thomas
next prev parent reply other threads:[~2023-02-27 11:42 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 18:40 [PATCH v4 00/27] target/s390x: pc-relative translation blocks Richard Henderson
2023-02-20 18:40 ` [PATCH v4 01/27] target/s390x: Use tcg_constant_* in local contexts Richard Henderson
2023-02-20 18:40 ` [PATCH v4 02/27] target/s390x: Use tcg_constant_* for DisasCompare Richard Henderson
2023-02-20 18:40 ` [PATCH v4 03/27] target/s390x: Use tcg_constant_i32 for fpinst_extract_m34 Richard Henderson
2023-02-20 18:40 ` [PATCH v4 04/27] target/s390x: Use tcg_constant_* in translate_vx.c.inc Richard Henderson
2023-02-20 18:40 ` [PATCH v4 05/27] tests/tcg/s390x: Add bal.S Richard Henderson
2023-02-20 18:40 ` [PATCH v4 06/27] tests/tcg/s390x: Add sam.S Richard Henderson
2023-02-20 18:40 ` [PATCH v4 07/27] target/s390x: Change help_goto_direct to work on displacements Richard Henderson
2023-02-20 18:40 ` [PATCH v4 08/27] target/s390x: Introduce gen_psw_addr_disp Richard Henderson
2023-02-20 18:40 ` [PATCH v4 09/27] target/s390x: Remove pc argument to pc_to_link_into Richard Henderson
2023-02-20 18:40 ` [PATCH v4 10/27] target/s390x: Use gen_psw_addr_disp in pc_to_link_info Richard Henderson
2023-02-20 18:40 ` [PATCH v4 11/27] target/s390x: Use gen_psw_addr_disp in save_link_info Richard Henderson
2023-02-20 18:40 ` [PATCH v4 12/27] target/s390x: Use gen_psw_addr_disp in op_sam Richard Henderson
2023-02-20 18:40 ` [PATCH v4 13/27] target/s390x: Use ilen instead in branches Richard Henderson
2023-02-20 18:40 ` [PATCH v4 14/27] target/s390x: Assert masking of psw.addr in cpu_get_tb_cpu_state Richard Henderson
2023-02-20 18:40 ` [PATCH v4 15/27] target/s390x: Add disp argument to update_psw_addr Richard Henderson
2023-02-20 18:40 ` [PATCH v4 16/27] target/s390x: Don't set gbea for user-only Richard Henderson
2023-02-20 18:40 ` [PATCH v4 17/27] target/s390x: Introduce per_enabled Richard Henderson
2023-02-20 18:40 ` [PATCH v4 18/27] target/s390x: Disable conditional branch-to-next for PER Richard Henderson
2023-02-20 18:40 ` [PATCH v4 19/27] target/s390x: Introduce help_goto_indirect Richard Henderson
2023-02-20 18:40 ` [PATCH v4 20/27] target/s390x: Split per_branch Richard Henderson
2023-02-20 18:40 ` [PATCH v4 21/27] target/s390x: Simplify help_branch Richard Henderson
2023-02-20 18:40 ` [PATCH v4 22/27] target/s390x: Split per_breaking_event from per_branch_* Richard Henderson
2023-02-20 18:40 ` [PATCH v4 23/27] target/s390x: Remove PER check from use_goto_tb Richard Henderson
2023-02-20 18:40 ` [PATCH v4 24/27] target/s390x: Fix successful-branch PER events Richard Henderson
2023-02-20 18:40 ` [PATCH v4 25/27] tests/tcg/s390x: Add per.S Richard Henderson
2023-02-20 18:40 ` [PATCH v4 26/27] target/s390x: Pass original r2 register to BCR Richard Henderson
2023-02-20 18:40 ` [PATCH v4 27/27] target/s390x: Enable TARGET_TB_PCREL Richard Henderson
2023-02-21 14:35 ` Thomas Huth
2023-02-21 15:53 ` Richard Henderson
2023-02-27 11:41 ` Thomas Huth [this message]
2023-03-02 13:03 ` Thomas Huth
2023-03-02 18:05 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6840da18-ca5f-db7c-a60a-1f2fb45d806d@redhat.com \
--to=thuth@redhat.com \
--cc=iii@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).