From: "Keith Packard" <keithp@keithp.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "QEMU Developers" <qemu-devel@nongnu.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
qemu-arm <qemu-arm@nongnu.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Alistair Francis" <Alistair.Francis@wdc.com>,
"Sagar Karandikar" <sagark@eecs.berkeley.edu>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"open list:RISC-V" <qemu-riscv@nongnu.org>
Subject: Re: [PATCH 1/4] semihosting: Move ARM semihosting code to shared directories
Date: Tue, 27 Oct 2020 18:33:37 -0700 [thread overview]
Message-ID: <87k0vbdthq.fsf@keithp.com> (raw)
In-Reply-To: <CAFEAcA8Sha5QYbO25dtzBZHoXUeiGVv8aojPFTMrst8nbVDAdg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]
Peter Maydell <peter.maydell@linaro.org> writes:
>> arm_ss.add(when: 'CONFIG_TCG', if_true: files ('common-semi.c'))
>> riscv_ss.add(files('common-semi.c'))
>>
>> This appears to work in my testing (building arm, risc-v and x86_64
>> configs).
>
> I'm not a kconfig expert but it might be preferable to have
> a new CONFIG_ for arm-semihosting-ABI which the relevant
> targets enable. Somebody else may be able to advise.
The change above makes this do exactly what the old code did -- add this
file to the arm_ss sourceset whenever CONFIG_TCG is true. arm_ss is
only used to build ARM targets, so this file gets added only for those
targets. Here's what the patch to target/arm/meson.build and
hw/semihosting/meson.build looks like now.
diff --git a/target/arm/meson.build b/target/arm/meson.build
index f5de2a77b8..15b936c101 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -32,8 +32,6 @@ arm_ss.add(files(
))
arm_ss.add(zlib)
-arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c'))
-
arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c'))
arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
diff --git a/hw/semihosting/meson.build b/hw/semihosting/meson.build
index f40ac574c4..26538e81e7 100644
--- a/hw/semihosting/meson.build
+++ b/hw/semihosting/meson.build
@@ -2,3 +2,5 @@ specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
'config.c',
'console.c',
))
+
+arm_ss.add(when: 'CONFIG_TCG', if_true: files ('common-semi.c'))
--
-keith
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: "Keith Packard" via <qemu-devel@nongnu.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "QEMU Developers" <qemu-devel@nongnu.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
qemu-arm <qemu-arm@nongnu.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Alistair Francis" <Alistair.Francis@wdc.com>,
"Sagar Karandikar" <sagark@eecs.berkeley.edu>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"open list:RISC-V" <qemu-riscv@nongnu.org>
Subject: Re: [PATCH 1/4] semihosting: Move ARM semihosting code to shared directories
Date: Tue, 27 Oct 2020 18:33:37 -0700 [thread overview]
Message-ID: <87k0vbdthq.fsf@keithp.com> (raw)
In-Reply-To: <CAFEAcA8Sha5QYbO25dtzBZHoXUeiGVv8aojPFTMrst8nbVDAdg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]
Peter Maydell <peter.maydell@linaro.org> writes:
>> arm_ss.add(when: 'CONFIG_TCG', if_true: files ('common-semi.c'))
>> riscv_ss.add(files('common-semi.c'))
>>
>> This appears to work in my testing (building arm, risc-v and x86_64
>> configs).
>
> I'm not a kconfig expert but it might be preferable to have
> a new CONFIG_ for arm-semihosting-ABI which the relevant
> targets enable. Somebody else may be able to advise.
The change above makes this do exactly what the old code did -- add this
file to the arm_ss sourceset whenever CONFIG_TCG is true. arm_ss is
only used to build ARM targets, so this file gets added only for those
targets. Here's what the patch to target/arm/meson.build and
hw/semihosting/meson.build looks like now.
diff --git a/target/arm/meson.build b/target/arm/meson.build
index f5de2a77b8..15b936c101 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -32,8 +32,6 @@ arm_ss.add(files(
))
arm_ss.add(zlib)
-arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c'))
-
arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c'))
arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
diff --git a/hw/semihosting/meson.build b/hw/semihosting/meson.build
index f40ac574c4..26538e81e7 100644
--- a/hw/semihosting/meson.build
+++ b/hw/semihosting/meson.build
@@ -2,3 +2,5 @@ specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
'config.c',
'console.c',
))
+
+arm_ss.add(when: 'CONFIG_TCG', if_true: files ('common-semi.c'))
--
-keith
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2020-10-28 1:33 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 21:28 [PATCH 0/4] riscv: Add semihosting support [v10] Keith Packard
2020-10-26 21:28 ` Keith Packard via
2020-10-26 21:28 ` [PATCH 1/4] semihosting: Move ARM semihosting code to shared directories Keith Packard
2020-10-26 21:28 ` Keith Packard via
2020-10-27 20:32 ` Alistair Francis
2020-10-27 20:32 ` Alistair Francis
2020-10-27 21:20 ` Peter Maydell
2020-10-27 21:20 ` Peter Maydell
2020-10-27 21:56 ` Keith Packard
2020-10-27 21:56 ` Keith Packard via
2020-10-27 23:38 ` Peter Maydell
2020-10-27 23:38 ` Peter Maydell
2020-10-28 1:33 ` Keith Packard [this message]
2020-10-28 1:33 ` Keith Packard via
2020-10-28 11:16 ` Alex Bennée
2020-10-28 15:37 ` Keith Packard
2020-10-28 15:37 ` Keith Packard via
2020-10-28 19:14 ` Keith Packard
2020-10-28 19:14 ` Keith Packard via
2020-10-26 21:28 ` [PATCH 2/4] semihosting: Change common-semi API to be architecture-independent Keith Packard
2020-10-26 21:28 ` Keith Packard via
2020-10-26 21:28 ` [PATCH 3/4] semihosting: Change internal common-semi interfaces to use CPUState * Keith Packard
2020-10-26 21:28 ` Keith Packard via
2020-10-26 21:28 ` [PATCH 4/4] riscv: Add semihosting support [v10] Keith Packard
2020-10-26 21:28 ` Keith Packard via
2020-10-26 21:42 ` [PATCH 0/4] " no-reply
2020-10-26 21:42 ` no-reply
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=87k0vbdthq.fsf@keithp.com \
--to=keithp@keithp.com \
--cc=Alistair.Francis@wdc.com \
--cc=alex.bennee@linaro.org \
--cc=kbastian@mail.uni-paderborn.de \
--cc=laurent@vivier.eu \
--cc=palmer@dabbelt.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sagark@eecs.berkeley.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.