semihosting/arm-compat-semi: replace target_ulong

Replace with vaddr or uint64_t where appropriate.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-ID: <20250822150058.18692-10-pierrick.bouvier@linaro.org>
[AJB: tweak commit message]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-ID: <20250922093711.2768983-13-alex.bennee@linaro.org>
This commit is contained in:
Pierrick Bouvier
2025-09-26 10:05:48 +01:00
committed by Alex Bennée
parent feb49fa79b
commit 6dfbf9b6cf
+11 -11
View File
@@ -123,7 +123,7 @@ static GuestFD console_out_gf;
*/
typedef struct LayoutInfo {
target_ulong rambase;
vaddr rambase;
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);