mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 11:28:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

memory: avoid a name clash with access macro

Browse source 
This avoids a name clash with the access macro on windows 64:

make
CHK version_gen.h
CC aarch64-softmmu/memory.o
/home/konrad/qemu/memory.c: In function 'access_with_adjusted_size':
/home/konrad/qemu/memory.c:591:73: error: macro "access" passed 7 arguments, \
but takes just 2
(size - access_size - i) * 8, access_mask, attrs);
^

Backports commit 05e015f73c3b5c50c237d3d8e555e25cfa543a5c from qemu
This commit is contained in:
KONRAD Frederic 2018-03-05 01:12:18 -05:00 committed by Lioncash
parent 4956effd11
commit 61ecdd1032
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
qemu/memory.c
View file

@ -521,13 +521,14 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
unsigned size, unsigned size,
unsigned access_size_min, unsigned access_size_min,
unsigned access_size_max, unsigned access_size_max,
MemTxResult (*access)(MemoryRegion *mr, MemTxResult (*access_fn)
hwaddr addr, (MemoryRegion *mr,
uint64_t *value, hwaddr addr,
unsigned size, uint64_t *value,
unsigned shift, unsigned size,
uint64_t mask, unsigned shift,
MemTxAttrs attrs), uint64_t mask,
MemTxAttrs attrs),
MemoryRegion *mr, MemoryRegion *mr,
MemTxAttrs attrs) MemTxAttrs attrs)
{ {
@ -548,13 +549,13 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
access_mask = (0-1ULL) >> (64 - access_size * 8); access_mask = (0-1ULL) >> (64 - access_size * 8);
if (memory_region_big_endian(mr)) { if (memory_region_big_endian(mr)) {
for (i = 0; i < size; i += access_size) { for (i = 0; i < size; i += access_size) {
r |= access(mr, addr + i, value, access_size, r |= access_fn(mr, addr + i, value, access_size,
(size - access_size - i) * 8, access_mask, attrs); (size - access_size - i) * 8, access_mask, attrs);
} }
} else { } else {
for (i = 0; i < size; i += access_size) { for (i = 0; i < size; i += access_size) {
r |= access(mr, addr + i, value, access_size, i * 8, r |= access_fn(mr, addr + i, value, access_size, i * 8,
access_mask, attrs); access_mask, attrs);
} }
} }
return r; return r;