[PULL 0/2] target-arm queue

[PULL 0/2] target-arm queue

[Peter Maydell]

Hi; here's an arm pullreq for whichever rc we're up to now :-)
One easy bugfix for an assertion, and one docs-only change to
update a URL.

thanks
-- PMM

The following changes since commit 9ef49528b5286f078061b52ac41e0ca19fa10e36:

  Merge tag 'hw-misc-20251125' of https://github.com/philmd/qemu into staging (2025-11-25 14:22:39 -0800)

are available in the Git repository at:

  https://gitlab.com/pm215/qemu.git tags/pull-target-arm-20251201

for you to fetch changes up to ebb625262c7f9837d6c7b9d8a0c1349fe8a8f4ff:

  docs/devel: Update URL for make-pullreq script (2025-12-01 09:39:46 +0000)

----------------------------------------------------------------
target-arm queue:
 * fix assertion in translation of BRA
 * update soon-to-break URL in docs

----------------------------------------------------------------
Harald van Dijk (1):
      target/arm: Fix assert on BRA.

Peter Maydell (1):
      docs/devel: Update URL for make-pullreq script

 docs/devel/submitting-a-pull-request.rst | 2 +-
 target/arm/tcg/translate-a64.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[PULL 1/2] target/arm: Fix assert on BRA.

[Peter Maydell]

From: Harald van Dijk <hdijk@accesssoftek.com>

trans_BRA does

    gen_a64_set_pc(s, dst);
    set_btype_for_br(s, a->rn);

gen_a64_set_pc does

    s->pc_save = -1;

set_btype_for_br (if aa64_bti is enabled and the register is not x16 or
x17) does

    gen_pc_plus_diff(s, pc, 0);

gen_pc_plus_diff does

    assert(s->pc_save != -1);

Hence, this assert is getting hit. We need to call set_btype_for_br
before gen_a64_set_pc, and there is nothing in set_btype_for_br that
depends on gen_a64_set_pc having already been called, so this commit
simply swaps the calls.

(The commit message for 64678fc45d8f6 says that set_brtype_for_br()
must be "moved after" get_a64_set_pc(), but this is a mistake in
the commit message -- the actual changes in that commit move
set_brtype_for_br() *before* get_a64_set_pc() and this is necessary
to avoid the assert.)

Cc: qemu-stable@nongnu.org
Fixes: 64678fc45d8f6 ("target/arm: Fix BTI versus CF_PCREL")
Signed-off-by: Harald van Dijk <hdijk@accesssoftek.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: d2265ebb-84bc-41b7-a2d7-05dc9a5a2055@accesssoftek.com
[PMM: added note about 64678fc45d8f6 to commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/arm/tcg/translate-a64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c
index 08b21d7dbfa..cde22a5cca7 100644
--- a/target/arm/tcg/translate-a64.c
+++ b/target/arm/tcg/translate-a64.c
@@ -1916,8 +1916,8 @@ static bool trans_BRA(DisasContext *s, arg_bra *a)
         return false;
     }
     dst = auth_branch_target(s, cpu_reg(s,a->rn), cpu_reg_sp(s, a->rm), !a->m);
-    gen_a64_set_pc(s, dst);
     set_btype_for_br(s, a->rn);
+    gen_a64_set_pc(s, dst);
     s->base.is_jmp = DISAS_JUMP;
     return true;
 }
-- 
2.43.0

[PULL 2/2] docs/devel: Update URL for make-pullreq script

[Peter Maydell]

In the submitting-a-pull-request docs, we have a link to the
make-pullreq script which might be useful for maintainers.  The
canonical git repo for this script has moved; update the link.

Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20251125164511.255550-1-peter.maydell@linaro.org
---
 docs/devel/submitting-a-pull-request.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/devel/submitting-a-pull-request.rst b/docs/devel/submitting-a-pull-request.rst
index a4cd7ebbb6a..e7d00808782 100644
--- a/docs/devel/submitting-a-pull-request.rst
+++ b/docs/devel/submitting-a-pull-request.rst
@@ -67,7 +67,7 @@ subject tag is "PULL SUBSYSTEM s390/block/whatever" rather than just
 pull requests that should be applied to master.
 
 You might be interested in the `make-pullreq
-<https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/make-pullreq>`__
+<https://gitlab.com/pm215/misc-scripts/-/blob/master/make-pullreq>`__
 script which automates some of this process for you and includes a few
 sanity checks. Note that you must edit it to configure it suitably for
 your local situation!
-- 
2.43.0

Re: [PULL 0/2] target-arm queue

[Richard Henderson]

On 12/1/25 08:09, Peter Maydell wrote:
> Hi; here's an arm pullreq for whichever rc we're up to now :-)
> One easy bugfix for an assertion, and one docs-only change to
> update a URL.
> 
> thanks
> -- PMM
> 
> The following changes since commit 9ef49528b5286f078061b52ac41e0ca19fa10e36:
> 
>    Merge tag 'hw-misc-20251125' ofhttps://github.com/philmd/qemu into staging (2025-11-25 14:22:39 -0800)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/pm215/qemu.git tags/pull-target-arm-20251201
> 
> for you to fetch changes up to ebb625262c7f9837d6c7b9d8a0c1349fe8a8f4ff:
> 
>    docs/devel: Update URL for make-pullreq script (2025-12-01 09:39:46 +0000)
> 
> ----------------------------------------------------------------
> target-arm queue:
>   * fix assertion in translation of BRA
>   * update soon-to-break URL in docs

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/10.2 as appropriate.

r~