ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/s390x: Use void* for haddr in S390Access 

The interface from probe_access_flags is void*, and matching
that will be helpful.  We already rely on the gcc extension
for byte arithmetic on void*.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20230109201856.3916639-4-richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Richard Henderson 2023-01-09 12:18:52 -08:00 committed by Thomas Huth
parent 7ba5da818a
commit bebc8ade70
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/s390x/tcg/mem_helper.c
View File

@ -114,8 +114,8 @@ static inline void cpu_stsize_data_ra(CPUS390XState *env, uint64_t addr,
typedef struct S390Access {
target_ulong vaddr1;
target_ulong vaddr2;
char *haddr1;
char *haddr2;
void *haddr1;
void *haddr2;
uint16_t size1;
uint16_t size2;
/*
@ -268,8 +268,9 @@ static void access_memset(CPUS390XState *env, S390Access *desta,
desta->mmu_idx, ra);
}
static uint8_t do_access_get_byte(CPUS390XState *env, vaddr vaddr, char **haddr,
int offset, int mmu_idx, uintptr_t ra)
static uint8_t do_access_get_byte(CPUS390XState *env, vaddr vaddr,
void **haddr, int offset,
int mmu_idx, uintptr_t ra)
{
#ifdef CONFIG_USER_ONLY
return ldub_p(*haddr + offset);
@ -301,7 +302,7 @@ static uint8_t access_get_byte(CPUS390XState *env, S390Access *access,
offset - access->size1, access->mmu_idx, ra);
}
static void do_access_set_byte(CPUS390XState *env, vaddr vaddr, char **haddr,
static void do_access_set_byte(CPUS390XState *env, vaddr vaddr, void **haddr,
int offset, uint8_t byte, int mmu_idx,
uintptr_t ra)
{