Re: [PATCH 12/25] semihosting/arm-compat-semi: replace target_ulong with vaddr

[Philippe Mathieu-Daudé]

On 22/9/25 11:36, Alex Bennée wrote:

From: Pierrick Bouvier <pierrick.bouv...@linaro.org>

Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouv...@linaro.org>
Message-ID: <20250822150058.18692-10-pierrick.bouv...@linaro.org>
Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
  semihosting/arm-compat-semi.c | 22 +++++++++++-----------
  1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 6725dcf4ba7..29cdab66f73 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -123,7 +123,7 @@ static GuestFD console_out_gf;
   */

typedef struct LayoutInfo {

-    target_ulong rambase;
+    vaddr rambase;

This is what the subject describes. Most of the other changes aren't.

      size_t ramsize;
      hwaddr heapbase;
      hwaddr heaplimit;
@@ -214,7 +214,7 @@ static LayoutInfo common_semi_find_bases(CPUState *cs)
   * global, and we assume that the guest takes care of avoiding any races.
   */
  #ifndef CONFIG_USER_ONLY
-static target_ulong syscall_err;
+static uint64_t syscall_err;

#include "semihosting/uaccess.h"

  #endif
@@ -260,8 +260,8 @@ static void common_semi_rw_cb(CPUState *cs, uint64_t ret, 
int err)
  {
      /* Recover the original length from the third argument. */
      CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
-    target_ulong args = common_semi_arg(cs, 1);
-    target_ulong arg2;
+    uint64_t args = common_semi_arg(cs, 1);
+    uint64_t arg2;
      GET_ARG(2);

if (err) {

@@ -300,9 +300,9 @@ static void common_semi_seek_cb(CPUState *cs, uint64_t ret, 
int err)
   * is defined by GDB's remote protocol and is not target-specific.)
   * We put this on the guest's stack just below SP.
   */
-static target_ulong common_semi_flen_buf(CPUState *cs)
+static uint64_t common_semi_flen_buf(CPUState *cs)
  {
-    target_ulong sp = common_semi_stack_bottom(cs);
+    vaddr sp = common_semi_stack_bottom(cs);
      return sp - 64;
  }

@@ -389,9 +389,9 @@ void semihosting_arm_compatible_init(void)

  void do_common_semihosting(CPUState *cs)
  {
      CPUArchState *env = cpu_env(cs);
-    target_ulong args;
-    target_ulong arg0, arg1, arg2, arg3;
-    target_ulong ul_ret;
+    uint64_t args;
+    uint64_t arg0, arg1, arg2, arg3;
+    uint64_t ul_ret;
      char * s;
      int nr;
      int64_t elapsed;
@@ -462,7 +462,7 @@ void do_common_semihosting(CPUState *cs)

case TARGET_SYS_WRITEC:

          /*
-         * FIXME: the byte to be written is in a target_ulong slot,
+         * FIXME: the byte to be written is in a uint64_t slot,
           * which means this is wrong for a big-endian guest.
           */
          semihost_sys_write_gf(cs, common_semi_dead_cb,
@@ -688,7 +688,7 @@ void do_common_semihosting(CPUState *cs)

case TARGET_SYS_HEAPINFO:

          {
-            target_ulong retvals[4];
+            uint64_t retvals[4];
              int i;
  #ifdef CONFIG_USER_ONLY
              TaskState *ts = get_task_state(cs);