yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-09-13 15:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: Access MemoryRegion with MemOp

Browse source 
Convert memory_region_dispatch_{read|write} operand "unsigned size"
into a "MemOp op".

Backports commit e67c904668d82ca4416cd91d37d9f5abcceef747 from qemu
This commit is contained in:
Tony Nguyen 2020-01-07 18:29:25 -05:00 committed by Lioncash
parent 3b777a2332
commit 435d2e5c67
3 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
qemu/include/exec/memop.h
View file

@ -12,6 +12,8 @@
#ifndef MEMOP_H #ifndef MEMOP_H
#define MEMOP_H #define MEMOP_H
#include "qemu/host-utils.h"
typedef enum MemOp { typedef enum MemOp {
MO_8 = 0, MO_8 = 0,
MO_16 = 1, MO_16 = 1,
@ -107,14 +109,20 @@ typedef enum MemOp {
MO_SSIZE = MO_SIZE | MO_SIGN, MO_SSIZE = MO_SIZE | MO_SIGN,
} MemOp; } MemOp;
/* Size in bytes to MemOp. */ /* MemOp to size in bytes. */
static inline unsigned size_memop(unsigned size) static inline unsigned memop_size(MemOp op)
{ {
/* return 1 << (op & MO_SIZE);
* FIXME: No-op to aid conversion of memory_region_dispatch_{read|write} }
* "unsigned size" operand into a "MemOp op".
*/ /* Size in bytes to MemOp. */
return size; static inline MemOp size_memop(unsigned size)
{
#ifdef CONFIG_DEBUG_TCG
/* Power of 2 up to 8. */
assert((size & (size - 1)) == 0 && size >= 1 && size <= 8);
#endif
return ctz32(size);
} }
#endif #endif

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

@ -20,6 +20,7 @@
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#include "exec/memattrs.h" #include "exec/memattrs.h"
#include "exec/memop.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu/int128.h" #include "qemu/int128.h"
#include "qapi/error.h" #include "qapi/error.h"
@ -985,13 +986,13 @@ void memory_listener_unregister(struct uc_struct* uc, MemoryListener *listener);
* @mr: #MemoryRegion to access * @mr: #MemoryRegion to access
* @addr: address within that region * @addr: address within that region
* @pval: pointer to uint64_t which the data is written to * @pval: pointer to uint64_t which the data is written to
* @size: size of the access in bytes * @op: size, sign, and endianness of the memory operation
* @attrs: memory transaction attributes to use for the access * @attrs: memory transaction attributes to use for the access
*/ */
MemTxResult memory_region_dispatch_read(MemoryRegion *mr, MemTxResult memory_region_dispatch_read(MemoryRegion *mr,
hwaddr addr, hwaddr addr,
uint64_t *pval, uint64_t *pval,
unsigned size, MemOp op,
MemTxAttrs attrs); MemTxAttrs attrs);
/** /**
* memory_region_dispatch_write: perform a write directly to the specified * memory_region_dispatch_write: perform a write directly to the specified
@ -1000,13 +1001,13 @@ MemTxResult memory_region_dispatch_read(MemoryRegion *mr,
* @mr: #MemoryRegion to access * @mr: #MemoryRegion to access
* @addr: address within that region * @addr: address within that region
* @data: data to write * @data: data to write
* @size: size of the access in bytes * @op: size, sign, and endianness of the memory operation
* @attrs: memory transaction attributes to use for the access * @attrs: memory transaction attributes to use for the access
*/ */
MemTxResult memory_region_dispatch_write(MemoryRegion *mr, MemTxResult memory_region_dispatch_write(MemoryRegion *mr,
hwaddr addr, hwaddr addr,
uint64_t data, uint64_t data,
unsigned size, MemOp op,
MemTxAttrs attrs); MemTxAttrs attrs);
/** /**

7
qemu/memory.c
View file

@ -1307,9 +1307,10 @@ static MemTxResult memory_region_dispatch_read1(MemoryRegion *mr,
MemTxResult memory_region_dispatch_read(MemoryRegion *mr, MemTxResult memory_region_dispatch_read(MemoryRegion *mr,
hwaddr addr, hwaddr addr,
uint64_t *pval, uint64_t *pval,
unsigned size, MemOp op,
MemTxAttrs attrs) MemTxAttrs attrs)
{ {
unsigned size = memop_size(op);
MemTxResult r; MemTxResult r;
if (!memory_region_access_valid(mr, addr, size, false)) { if (!memory_region_access_valid(mr, addr, size, false)) {
@ -1325,9 +1326,11 @@ MemTxResult memory_region_dispatch_read(MemoryRegion *mr,
MemTxResult memory_region_dispatch_write(MemoryRegion *mr, MemTxResult memory_region_dispatch_write(MemoryRegion *mr,
hwaddr addr, hwaddr addr,
uint64_t data, uint64_t data,
unsigned size, MemOp op,
MemTxAttrs attrs) MemTxAttrs attrs)
{ {
unsigned size = memop_size(op);
if (!memory_region_access_valid(mr, addr, size, true)) { if (!memory_region_access_valid(mr, addr, size, true)) {
unassigned_mem_write(mr->uc, addr, data, size); unassigned_mem_write(mr->uc, addr, data, size);
return MEMTX_DECODE_ERROR; return MEMTX_DECODE_ERROR;