diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-01-09 12:18:52 -0800 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-02-27 09:15:39 +0100 |
| commit | bebc8ade7014ca1f8afbc9d1bd297460f2e88461 (patch) | |
| tree | 3149cfded60725dd59aeffac26eba3a1857b2ece /target/s390x | |
| parent | 7ba5da818a73048a9a2e4949bb971708b2f4259c (diff) | |
| download | qemu-bebc8ade7014ca1f8afbc9d1bd297460f2e88461.zip qemu-bebc8ade7014ca1f8afbc9d1bd297460f2e88461.tar.gz qemu-bebc8ade7014ca1f8afbc9d1bd297460f2e88461.tar.bz2 | |
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>
Diffstat (limited to 'target/s390x')
| -rw-r--r-- | target/s390x/tcg/mem_helper.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 28bf3bd..4d157ba 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -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) { |