diff mbox series

[22/37] semihosting: Move user-only implementation out-of-line

Message ID 20250313034524.3069690-23-richard.henderson@linaro.org
State New
Headers show
Series accel/tcg, codebase: Build once patches | expand

Commit Message

Richard Henderson March 13, 2025, 3:45 a.m. UTC 
Avoid testing CONFIG_USER_ONLY in semihost.h.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/semihosting/semihost.h | 29 ++---------------------------
 semihosting/user.c             | 30 ++++++++++++++++++++++++++++++
 semihosting/meson.build        |  2 ++
 3 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 semihosting/user.c

Comments

Philippe Mathieu-Daudé March 13, 2025, 10:04 a.m. UTC | #1 
On 13/3/25 04:45, Richard Henderson wrote:
> Avoid testing CONFIG_USER_ONLY in semihost.h.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   include/semihosting/semihost.h | 29 ++---------------------------
>   semihosting/user.c             | 30 ++++++++++++++++++++++++++++++
>   semihosting/meson.build        |  2 ++
>   3 files changed, 34 insertions(+), 27 deletions(-)
>   create mode 100644 semihosting/user.c
> 
> diff --git a/include/semihosting/semihost.h b/include/semihosting/semihost.h
> index 97d2a2ba99..b03e637578 100644
> --- a/include/semihosting/semihost.h
> +++ b/include/semihosting/semihost.h
> @@ -26,32 +26,6 @@ typedef enum SemihostingTarget {
>       SEMIHOSTING_TARGET_GDB
>   } SemihostingTarget;
>   
> -#ifdef CONFIG_USER_ONLY
> -static inline bool semihosting_enabled(bool is_user)
> -{
> -    return true;
> -}
> -
> -static inline SemihostingTarget semihosting_get_target(void)
> -{
> -    return SEMIHOSTING_TARGET_AUTO;
> -}
> -
> -static inline const char *semihosting_get_arg(int i)
> -{
> -    return NULL;
> -}
> -
> -static inline int semihosting_get_argc(void)
> -{
> -    return 0;
> -}
> -
> -static inline const char *semihosting_get_cmdline(void)
> -{
> -    return NULL;
> -}
> -#else /* !CONFIG_USER_ONLY */
>   /**
>    * semihosting_enabled:
>    * @is_user: true if guest code is in usermode (i.e. not privileged)
> @@ -59,17 +33,18 @@ static inline const char *semihosting_get_cmdline(void)
>    * Return true if guest code is allowed to make semihosting calls.
>    */
>   bool semihosting_enabled(bool is_user);
> +
>   SemihostingTarget semihosting_get_target(void);
>   const char *semihosting_get_arg(int i);
>   int semihosting_get_argc(void);
>   const char *semihosting_get_cmdline(void);
>   void semihosting_arg_fallback(const char *file, const char *cmd);
> +
>   /* for vl.c hooks */
>   void qemu_semihosting_enable(void);
>   int qemu_semihosting_config_options(const char *optstr);
>   void qemu_semihosting_chardev_init(void);
>   void qemu_semihosting_console_init(Chardev *);
> -#endif /* CONFIG_USER_ONLY */
>   void qemu_semihosting_guestfd_init(void);
>   
>   #endif /* SEMIHOST_H */
> diff --git a/semihosting/user.c b/semihosting/user.c
> new file mode 100644
> index 0000000000..f5b500493b
> --- /dev/null
> +++ b/semihosting/user.c
> @@ -0,0 +1,30 @@
> +/*
> + * Semihosting for user emulation
> + *
> + * Copyright (c) 2019 Linaro Ltd
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +#include "semihosting/semihost.h"
> +
> +bool semihosting_enabled(bool is_user)
> +{
> +    return true;
> +}
> +
> +const char *semihosting_get_arg(int i)
> +{
> +    return NULL;
> +}
> +
> +int semihosting_get_argc(void)
> +{
> +    return 0;
> +}
> +
> +const char *semihosting_get_cmdline(void)
> +{
> +    return NULL;
> +}

Do we really need the symbols, can't they be elided now?
Philippe Mathieu-Daudé March 13, 2025, 10:28 a.m. UTC | #2 
On 13/3/25 11:04, Philippe Mathieu-Daudé wrote:
> On 13/3/25 04:45, Richard Henderson wrote:
>> Avoid testing CONFIG_USER_ONLY in semihost.h.
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>   include/semihosting/semihost.h | 29 ++---------------------------
>>   semihosting/user.c             | 30 ++++++++++++++++++++++++++++++
>>   semihosting/meson.build        |  2 ++
>>   3 files changed, 34 insertions(+), 27 deletions(-)
>>   create mode 100644 semihosting/user.c
>>
>> diff --git a/include/semihosting/semihost.h b/include/semihosting/ 
>> semihost.h
>> index 97d2a2ba99..b03e637578 100644
>> --- a/include/semihosting/semihost.h
>> +++ b/include/semihosting/semihost.h
>> @@ -26,32 +26,6 @@ typedef enum SemihostingTarget {
>>       SEMIHOSTING_TARGET_GDB
>>   } SemihostingTarget;
>> -#ifdef CONFIG_USER_ONLY
>> -static inline bool semihosting_enabled(bool is_user)
>> -{
>> -    return true;
>> -}
>> -
>> -static inline SemihostingTarget semihosting_get_target(void)
>> -{
>> -    return SEMIHOSTING_TARGET_AUTO;
>> -}
>> -
>> -static inline const char *semihosting_get_arg(int i)
>> -{
>> -    return NULL;
>> -}
>> -
>> -static inline int semihosting_get_argc(void)
>> -{
>> -    return 0;
>> -}
>> -
>> -static inline const char *semihosting_get_cmdline(void)
>> -{
>> -    return NULL;
>> -}
>> -#else /* !CONFIG_USER_ONLY */
>>   /**
>>    * semihosting_enabled:
>>    * @is_user: true if guest code is in usermode (i.e. not privileged)
>> @@ -59,17 +33,18 @@ static inline const char 
>> *semihosting_get_cmdline(void)
>>    * Return true if guest code is allowed to make semihosting calls.
>>    */
>>   bool semihosting_enabled(bool is_user);
>> +
>>   SemihostingTarget semihosting_get_target(void);
>>   const char *semihosting_get_arg(int i);
>>   int semihosting_get_argc(void);
>>   const char *semihosting_get_cmdline(void);
>>   void semihosting_arg_fallback(const char *file, const char *cmd);
>> +
>>   /* for vl.c hooks */
>>   void qemu_semihosting_enable(void);
>>   int qemu_semihosting_config_options(const char *optstr);
>>   void qemu_semihosting_chardev_init(void);
>>   void qemu_semihosting_console_init(Chardev *);
>> -#endif /* CONFIG_USER_ONLY */
>>   void qemu_semihosting_guestfd_init(void);
>>   #endif /* SEMIHOST_H */
>> diff --git a/semihosting/user.c b/semihosting/user.c
>> new file mode 100644
>> index 0000000000..f5b500493b
>> --- /dev/null
>> +++ b/semihosting/user.c
>> @@ -0,0 +1,30 @@
>> +/*
>> + * Semihosting for user emulation
>> + *
>> + * Copyright (c) 2019 Linaro Ltd
>> + *
>> + * SPDX-License-Identifier: GPL-2.0-or-later
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +#include "semihosting/semihost.h"
>> +
>> +bool semihosting_enabled(bool is_user)
>> +{
>> +    return true;
>> +}
>> +
>> +const char *semihosting_get_arg(int i)
>> +{
>> +    return NULL;
>> +}
>> +
>> +int semihosting_get_argc(void)
>> +{
>> +    return 0;
>> +}
>> +
>> +const char *semihosting_get_cmdline(void)
>> +{
>> +    return NULL;
>> +}
> 
> Do we really need the symbols, can't they be elided now?

Apparently we only need semihosting_enabled().
diff mbox series

Patch

diff --git a/include/semihosting/semihost.h b/include/semihosting/semihost.h
index 97d2a2ba99..b03e637578 100644
--- a/include/semihosting/semihost.h
+++ b/include/semihosting/semihost.h
@@ -26,32 +26,6 @@  typedef enum SemihostingTarget {
     SEMIHOSTING_TARGET_GDB
 } SemihostingTarget;
 
-#ifdef CONFIG_USER_ONLY
-static inline bool semihosting_enabled(bool is_user)
-{
-    return true;
-}
-
-static inline SemihostingTarget semihosting_get_target(void)
-{
-    return SEMIHOSTING_TARGET_AUTO;
-}
-
-static inline const char *semihosting_get_arg(int i)
-{
-    return NULL;
-}
-
-static inline int semihosting_get_argc(void)
-{
-    return 0;
-}
-
-static inline const char *semihosting_get_cmdline(void)
-{
-    return NULL;
-}
-#else /* !CONFIG_USER_ONLY */
 /**
  * semihosting_enabled:
  * @is_user: true if guest code is in usermode (i.e. not privileged)
@@ -59,17 +33,18 @@  static inline const char *semihosting_get_cmdline(void)
  * Return true if guest code is allowed to make semihosting calls.
  */
 bool semihosting_enabled(bool is_user);
+
 SemihostingTarget semihosting_get_target(void);
 const char *semihosting_get_arg(int i);
 int semihosting_get_argc(void);
 const char *semihosting_get_cmdline(void);
 void semihosting_arg_fallback(const char *file, const char *cmd);
+
 /* for vl.c hooks */
 void qemu_semihosting_enable(void);
 int qemu_semihosting_config_options(const char *optstr);
 void qemu_semihosting_chardev_init(void);
 void qemu_semihosting_console_init(Chardev *);
-#endif /* CONFIG_USER_ONLY */
 void qemu_semihosting_guestfd_init(void);
 
 #endif /* SEMIHOST_H */
diff --git a/semihosting/user.c b/semihosting/user.c
new file mode 100644
index 0000000000..f5b500493b
--- /dev/null
+++ b/semihosting/user.c
@@ -0,0 +1,30 @@ 
+/*
+ * Semihosting for user emulation
+ *
+ * Copyright (c) 2019 Linaro Ltd
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "semihosting/semihost.h"
+
+bool semihosting_enabled(bool is_user)
+{
+    return true;
+}
+
+const char *semihosting_get_arg(int i)
+{
+    return NULL;
+}
+
+int semihosting_get_argc(void)
+{
+    return 0;
+}
+
+const char *semihosting_get_cmdline(void)
+{
+    return NULL;
+}
diff --git a/semihosting/meson.build b/semihosting/meson.build
index 86f5004bed..ab67f87e4f 100644
--- a/semihosting/meson.build
+++ b/semihosting/meson.build
@@ -15,5 +15,7 @@  system_ss.add(when: ['CONFIG_SEMIHOSTING'], if_true: files(
   'stubs-system.c',
 ))
 
+user_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files('user.c'))
+
 specific_ss.add(when: ['CONFIG_ARM_COMPATIBLE_SEMIHOSTING'],
 		if_true: files('arm-compat-semi.c'))