yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-04-17 23:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: Access MemoryRegion with endianness

Browse source 
Preparation for collapsing the two byte swaps adjust_endianness and
handle_bswap into the former.

Call memory_region_dispatch_{read|write} with endianness encoded into
the "MemOp op" operand.

This patch does not change any behaviour as
memory_region_dispatch_{read|write} is yet to handle the endianness.

Once it does handle endianness, callers with byte swaps can collapse
them into adjust_endianness.

Backports commit d5d680cacc66ef7e3c02c81dc8f3a34eabce6dfe from qemu
This commit is contained in:
Tony Nguyen 2020-01-07 18:52:02 -05:00 committed by Lioncash
parent b335c4756a
commit da98d0da4e
21 changed files with 71 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qemu/aarch64.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_aarch64
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_aarch64
#define deregister_tm_clones deregister_tm_clones_aarch64
#define devend_memop devend_memop_aarch64
#define device_class_base_init device_class_base_init_aarch64
#define device_class_init device_class_init_aarch64
#define device_finalize device_finalize_aarch64

1
qemu/aarch64eb.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_aarch64eb
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_aarch64eb
#define deregister_tm_clones deregister_tm_clones_aarch64eb
#define devend_memop devend_memop_aarch64eb
#define device_class_base_init device_class_base_init_aarch64eb
#define device_class_init device_class_init_aarch64eb
#define device_finalize device_finalize_aarch64eb

8
qemu/accel/tcg/cputlb.c
View file

@ -605,7 +605,8 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry,
cpu->mem_io_vaddr = addr;
cpu->mem_io_access_type = access_type;
r = memory_region_dispatch_read(mr, mr_offset, &val, size_memop(size),
r = memory_region_dispatch_read(mr, mr_offset, &val,
size_memop(size) | MO_TE,
iotlbentry->attrs);
if (r != MEMTX_OK) {
hwaddr physaddr = mr_offset +
@ -636,7 +637,8 @@ static void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry,
}
cpu->mem_io_vaddr = addr;
cpu->mem_io_pc = retaddr;
r = memory_region_dispatch_write(mr, mr_offset, val, size_memop(size),
r = memory_region_dispatch_write(mr, mr_offset, val,
size_memop(size) | MO_TE,
iotlbentry->attrs);
if (r != MEMTX_OK) {
hwaddr physaddr = mr_offset +
@ -1045,6 +1047,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
}
}
/* TODO: Merge bswap into io_readx -> memory_region_dispatch_read. */
res = io_readx(env, &env->iotlb[mmu_idx][index], mmu_idx, addr,
retaddr, access_type, size);
return handle_bswap(res, size, big_endian);
@ -1367,6 +1370,7 @@ store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
}
}
/* TODO: Merge bswap into io_writex -> memory_region_dispatch_write. */
io_writex(env, &env->iotlb[mmu_idx][index], mmu_idx,
handle_bswap(val, size, big_endian),
addr, retaddr, size);

1
qemu/arm.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_arm
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_arm
#define deregister_tm_clones deregister_tm_clones_arm
#define devend_memop devend_memop_arm
#define device_class_base_init device_class_base_init_arm
#define device_class_init device_class_init_arm
#define device_finalize device_finalize_arm

1
qemu/armeb.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_armeb
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_armeb
#define deregister_tm_clones deregister_tm_clones_armeb
#define devend_memop devend_memop_armeb
#define device_class_base_init device_class_base_init_armeb
#define device_class_init device_class_init_armeb
#define device_finalize device_finalize_armeb

13
qemu/exec.c
View file

@ -1960,8 +1960,13 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr,
/* XXX: could force current_cpu to NULL to avoid
potential bugs */
val = ldn_p(buf, l);
/*
* TODO: Merge bswap from ldn_p into memory_region_dispatch_write
* by using ldn_he_p and dropping MO_TE to get a host-endian value.
*/
result |= memory_region_dispatch_write(mr, addr1, val,
size_memop(l), attrs);
size_memop(l) | MO_TE,
attrs);
} else {
/* RAM case */
ptr = qemu_map_ram_ptr(mr->uc, mr->ram_block, addr1);
@ -2037,8 +2042,12 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,
// Unicorn: commented out
//release_lock |= prepare_mmio_access(mr);
l = memory_access_size(mr, l, addr1);
/*
* TODO: Merge bswap from stn_p into memory_region_dispatch_read
* by using stn_he_p and dropping MO_TE to get a host-endian value.
*/
result |= memory_region_dispatch_read(mr, addr1, &val,
size_memop(l), attrs);
size_memop(l) | MO_TE, attrs);
stn_p(buf, l, val);
} else {
/* RAM case */

1
qemu/header_gen.py
View file

@ -361,6 +361,7 @@ symbols = (
'define_one_arm_cp_reg',
'define_one_arm_cp_reg_with_opaque',
'deregister_tm_clones',
'devend_memop',
'device_class_base_init',
'device_class_init',
'device_finalize',

3
qemu/include/exec/memory.h
View file

@ -1434,6 +1434,9 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr,
void unicorn_free_empty_flat_view(struct uc_struct *uc);
/* enum device_endian to MemOp. */
MemOp devend_memop(enum device_endian end);
#endif
#endif

1
qemu/m68k.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_m68k
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_m68k
#define deregister_tm_clones deregister_tm_clones_m68k
#define devend_memop devend_memop_m68k
#define device_class_base_init device_class_base_init_m68k
#define device_class_init device_class_init_m68k
#define device_finalize device_finalize_m68k

17
qemu/memory.c
View file

@ -2044,3 +2044,20 @@ void memory_register_types(struct uc_struct *uc)
type_register_static(uc, &memory_region_info);
}
MemOp devend_memop(enum device_endian end)
{
static MemOp conv[] = {
[DEVICE_LITTLE_ENDIAN] = MO_LE,
[DEVICE_BIG_ENDIAN] = MO_BE,
[DEVICE_NATIVE_ENDIAN] = MO_TE,
[DEVICE_HOST_ENDIAN] = 0,
};
switch (end) {
case DEVICE_LITTLE_ENDIAN:
case DEVICE_BIG_ENDIAN:
case DEVICE_NATIVE_ENDIAN:
return conv[end];
default:
g_assert_not_reached();
}
}

24
qemu/memory_ldst.inc.c
View file

@ -42,7 +42,9 @@ static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL,
//release_lock |= prepare_mmio_access(mr);
/* I/O case */
r = memory_region_dispatch_read(mr, addr1, &val, MO_32, attrs);
/* TODO: Merge bswap32 into memory_region_dispatch_read. */
r = memory_region_dispatch_read(mr, addr1, &val,
MO_32 | devend_memop(endian), attrs);
#if defined(TARGET_WORDS_BIGENDIAN)
if (endian == DEVICE_LITTLE_ENDIAN) {
val = bswap32(val);
@ -142,7 +144,9 @@ static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL,
//release_lock |= prepare_mmio_access(mr);
/* I/O case */
r = memory_region_dispatch_read(mr, addr1, &val, MO_64, attrs);
/* TODO: Merge bswap64 into memory_region_dispatch_read. */
r = memory_region_dispatch_read(mr, addr1, &val,
MO_64 | devend_memop(endian), attrs);
#if defined(TARGET_WORDS_BIGENDIAN)
if (endian == DEVICE_LITTLE_ENDIAN) {
val = bswap64(val);
@ -288,7 +292,9 @@ static inline uint32_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
//release_lock |= prepare_mmio_access(mr);
/* I/O case */
r = memory_region_dispatch_read(mr, addr1, &val, MO_16, attrs);
/* TODO: Merge bswap16 into memory_region_dispatch_read. */
r = memory_region_dispatch_read(mr, addr1, &val,
MO_16 | devend_memop(endian), attrs);
#if defined(TARGET_WORDS_BIGENDIAN)
if (endian == DEVICE_LITTLE_ENDIAN) {
val = bswap16(val);
@ -440,7 +446,9 @@ static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL,
val = bswap32(val);
}
#endif
r = memory_region_dispatch_write(mr, addr1, val, MO_32, attrs);
/* TODO: Merge bswap32 into memory_region_dispatch_write. */
r = memory_region_dispatch_write(mr, addr1, val,
MO_32 | devend_memop(endian), attrs);
} else {
/* RAM case */
ptr = qemu_map_ram_ptr(mr->uc, mr->ram_block, addr1);
@ -581,7 +589,9 @@ static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL,
val = bswap16(val);
}
#endif
r = memory_region_dispatch_write(mr, addr1, val, MO_16, attrs);
/* TODO: Merge bswap16 into memory_region_dispatch_write. */
r = memory_region_dispatch_write(mr, addr1, val,
MO_16 | devend_memop(endian), attrs);
} else {
/* RAM case */
ptr = qemu_map_ram_ptr(mr->uc, mr->ram_block, addr1);
@ -678,7 +688,9 @@ static void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL,
val = bswap64(val);
}
#endif
r = memory_region_dispatch_write(mr, addr1, val, MO_64, attrs);
/* TODO: Merge bswap64 into memory_region_dispatch_write. */
r = memory_region_dispatch_write(mr, addr1, val,
MO_64 | devend_memop(endian), attrs);
} else {
/* RAM case */
ptr = qemu_map_ram_ptr(mr->uc, mr->ram_block, addr1);

1
qemu/mips.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_mips
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_mips
#define deregister_tm_clones deregister_tm_clones_mips
#define devend_memop devend_memop_mips
#define device_class_base_init device_class_base_init_mips
#define device_class_init device_class_init_mips
#define device_finalize device_finalize_mips

1
qemu/mips64.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_mips64
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_mips64
#define deregister_tm_clones deregister_tm_clones_mips64
#define devend_memop devend_memop_mips64
#define device_class_base_init device_class_base_init_mips64
#define device_class_init device_class_init_mips64
#define device_finalize device_finalize_mips64

1
qemu/mips64el.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_mips64el
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_mips64el
#define deregister_tm_clones deregister_tm_clones_mips64el
#define devend_memop devend_memop_mips64el
#define device_class_base_init device_class_base_init_mips64el
#define device_class_init device_class_init_mips64el
#define device_finalize device_finalize_mips64el

1
qemu/mipsel.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_mipsel
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_mipsel
#define deregister_tm_clones deregister_tm_clones_mipsel
#define devend_memop devend_memop_mipsel
#define device_class_base_init device_class_base_init_mipsel
#define device_class_init device_class_init_mipsel
#define device_finalize device_finalize_mipsel

1
qemu/powerpc.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_powerpc
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_powerpc
#define deregister_tm_clones deregister_tm_clones_powerpc
#define devend_memop devend_memop_powerpc
#define device_class_base_init device_class_base_init_powerpc
#define device_class_init device_class_init_powerpc
#define device_finalize device_finalize_powerpc

1
qemu/riscv32.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_riscv32
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_riscv32
#define deregister_tm_clones deregister_tm_clones_riscv32
#define devend_memop devend_memop_riscv32
#define device_class_base_init device_class_base_init_riscv32
#define device_class_init device_class_init_riscv32
#define device_finalize device_finalize_riscv32

1
qemu/riscv64.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_riscv64
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_riscv64
#define deregister_tm_clones deregister_tm_clones_riscv64
#define devend_memop devend_memop_riscv64
#define device_class_base_init device_class_base_init_riscv64
#define device_class_init device_class_init_riscv64
#define device_finalize device_finalize_riscv64

1
qemu/sparc.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_sparc
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_sparc
#define deregister_tm_clones deregister_tm_clones_sparc
#define devend_memop devend_memop_sparc
#define device_class_base_init device_class_base_init_sparc
#define device_class_init device_class_init_sparc
#define device_finalize device_finalize_sparc

1
qemu/sparc64.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_sparc64
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_sparc64
#define deregister_tm_clones deregister_tm_clones_sparc64
#define devend_memop devend_memop_sparc64
#define device_class_base_init device_class_base_init_sparc64
#define device_class_init device_class_init_sparc64
#define device_finalize device_finalize_sparc64

1
qemu/x86_64.h
View file

@ -355,6 +355,7 @@
#define define_one_arm_cp_reg define_one_arm_cp_reg_x86_64
#define define_one_arm_cp_reg_with_opaque define_one_arm_cp_reg_with_opaque_x86_64
#define deregister_tm_clones deregister_tm_clones_x86_64
#define devend_memop devend_memop_x86_64
#define device_class_base_init device_class_base_init_x86_64
#define device_class_init device_class_init_x86_64
#define device_finalize device_finalize_x86_64