[v3] target/arm: Allow compilation without CONFIG_ARM_V7M

[PATCH v3 0/3] target/arm: Allow compilation without CONFIG_ARM_V7M

Thomas Huth posted 3 patches 1 month, 2 weeks ago

Diff against v1 v2
Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240308141051.536599-1-thuth@redhat.com

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>

target/arm/tcg/cpu-v7m.c   | 290 +++++++++++++++++++++++++++++++++++++
target/arm/tcg/cpu32.c     | 261 ---------------------------------
target/arm/tcg/m_helper.c  |  93 ++++++++----
target/arm/Kconfig         |   4 -
target/arm/meson.build     |   3 +
target/arm/tcg/meson.build |   3 +
6 files changed, 357 insertions(+), 297 deletions(-)
create mode 100644 target/arm/tcg/cpu-v7m.c

Expand all Fold all

[PATCH v3 0/3] target/arm: Allow compilation without CONFIG_ARM_V7M

Posted by Thomas Huth 1 month, 2 weeks ago

We've got a switch to disable v7m code since a long time - but it
currently cannot be disabled since linking then fails due to missing
functions. But thanks to the clean-ups that have been done during the
past years, it's not that difficult anymore to finally make it possible
to disable CONFIG_ARM_V7M: We just have to move some v7m-related code
out of cpu32.c to a separate file (that we only compile if the switch
CONFIG_ARM_V7M is enabled) and make sure to use the stub functions in
m_helper.c if it is disabled. Then we can finally remove the hard-coded
"select ARM_V7M" from the Kconfig file.

v3:
- Rebase to current master branch
- Make sure that the stubs use g_assert_not_reached() in the second patch

v2:
- Updated a comment
- Avoid #ifdef in cpu-v7m.c, handle it via meson.build instead

Thomas Huth (3):
  target/arm: Move v7m-related code from cpu32.c into a separate file
  target/arm/tcg/m_helper.c: Include the full helpers only with
    CONFIG_ARM_V7M
  target/arm/Kconfig: Stop requiring CONFIG_ARM_V7M

 target/arm/tcg/cpu-v7m.c   | 290 +++++++++++++++++++++++++++++++++++++
 target/arm/tcg/cpu32.c     | 261 ---------------------------------
 target/arm/tcg/m_helper.c  |  93 ++++++++----
 target/arm/Kconfig         |   4 -
 target/arm/meson.build     |   3 +
 target/arm/tcg/meson.build |   3 +
 6 files changed, 357 insertions(+), 297 deletions(-)
 create mode 100644 target/arm/tcg/cpu-v7m.c

-- 
2.44.0

Re: [PATCH v3 0/3] target/arm: Allow compilation without CONFIG_ARM_V7M

Posted by Peter Maydell 1 month, 2 weeks ago

On Fri, 8 Mar 2024 at 14:11, Thomas Huth <thuth@redhat.com> wrote:
>
> We've got a switch to disable v7m code since a long time - but it
> currently cannot be disabled since linking then fails due to missing
> functions. But thanks to the clean-ups that have been done during the
> past years, it's not that difficult anymore to finally make it possible
> to disable CONFIG_ARM_V7M: We just have to move some v7m-related code
> out of cpu32.c to a separate file (that we only compile if the switch
> CONFIG_ARM_V7M is enabled) and make sure to use the stub functions in
> m_helper.c if it is disabled. Then we can finally remove the hard-coded
> "select ARM_V7M" from the Kconfig file.

I've applied patch 1 to target-arm.next; thanks.

-- PMM