haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

exec: Rename ram_ptr variable

Browse source 
As we are going to use a different 'ptr' variable, rename the 'ram
pointer' variable.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-02-19 18:01:32 +01:00
parent 18610bfd3e
commit 208046768d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
exec.c
View file

@ -3151,7 +3151,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr,
hwaddr len, hwaddr addr1, hwaddr len, hwaddr addr1,
hwaddr l, MemoryRegion *mr) hwaddr l, MemoryRegion *mr)
{ {
uint8_t *ptr; uint8_t *ram_ptr;
uint64_t val; uint64_t val;
MemTxResult result = MEMTX_OK; MemTxResult result = MEMTX_OK;
bool release_lock = false; bool release_lock = false;
@ -3167,8 +3167,8 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr,
size_memop(l), attrs); size_memop(l), attrs);
} else { } else {
/* RAM case */ /* RAM case */
ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); ram_ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false);
memcpy(ptr, buf, l); memcpy(ram_ptr, buf, l);
invalidate_and_set_dirty(mr, addr1, l); invalidate_and_set_dirty(mr, addr1, l);
} }
@ -3215,7 +3215,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,
hwaddr len, hwaddr addr1, hwaddr l, hwaddr len, hwaddr addr1, hwaddr l,
MemoryRegion *mr) MemoryRegion *mr)
{ {
uint8_t *ptr; uint8_t *ram_ptr;
uint64_t val; uint64_t val;
MemTxResult result = MEMTX_OK; MemTxResult result = MEMTX_OK;
bool release_lock = false; bool release_lock = false;
@ -3230,8 +3230,8 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,
stn_he_p(buf, l, val); stn_he_p(buf, l, val);
} else { } else {
/* RAM case */ /* RAM case */
ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); ram_ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false);
memcpy(buf, ptr, l); memcpy(buf, ram_ptr, l);
} }
if (release_lock) { if (release_lock) {
@ -3329,7 +3329,7 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as,
enum write_rom_type type) enum write_rom_type type)
{ {
hwaddr l; hwaddr l;
uint8_t *ptr; uint8_t *ram_ptr;
hwaddr addr1; hwaddr addr1;
MemoryRegion *mr; MemoryRegion *mr;
@ -3343,14 +3343,14 @@ static inline MemTxResult address_space_write_rom_internal(AddressSpace *as,
l = memory_access_size(mr, l, addr1); l = memory_access_size(mr, l, addr1);
} else { } else {
/* ROM/RAM case */ /* ROM/RAM case */
ptr = qemu_map_ram_ptr(mr->ram_block, addr1); ram_ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
switch (type) { switch (type) {
case WRITE_DATA: case WRITE_DATA:
memcpy(ptr, buf, l); memcpy(ram_ptr, buf, l);
invalidate_and_set_dirty(mr, addr1, l); invalidate_and_set_dirty(mr, addr1, l);
break; break;
case FLUSH_CACHE: case FLUSH_CACHE:
flush_icache_range((uintptr_t)ptr, (uintptr_t)ptr + l); flush_icache_range((uintptr_t)ram_ptr, (uintptr_t)ram_ptr + l);
break; break;
} }
} }