cputlb: prepare private memory API for public consumption
Fold is_ram_rom and is_ram_rom_romd() into callers. Change is_romd() and section_addr() to take MemoryRegion instead of MemoryRegionSection for consistency and use memory_region_ prefix. Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
0cac1b66c8
commit
cc5bea608d
12
cputlb.c
12
cputlb.c
|
@ -260,13 +260,15 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
address = vaddr;
|
address = vaddr;
|
||||||
if (!is_ram_rom_romd(section)) {
|
if (!(memory_region_is_ram(section->mr) ||
|
||||||
|
memory_region_is_romd(section->mr))) {
|
||||||
/* IO memory case (romd handled later) */
|
/* IO memory case (romd handled later) */
|
||||||
address |= TLB_MMIO;
|
address |= TLB_MMIO;
|
||||||
}
|
}
|
||||||
if (is_ram_rom_romd(section)) {
|
if (memory_region_is_ram(section->mr) ||
|
||||||
|
memory_region_is_romd(section->mr)) {
|
||||||
addend = (uintptr_t)memory_region_get_ram_ptr(section->mr)
|
addend = (uintptr_t)memory_region_get_ram_ptr(section->mr)
|
||||||
+ section_addr(section, paddr);
|
+ memory_region_section_addr(section, paddr);
|
||||||
} else {
|
} else {
|
||||||
addend = 0;
|
addend = 0;
|
||||||
}
|
}
|
||||||
|
@ -292,13 +294,13 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr,
|
||||||
}
|
}
|
||||||
if (prot & PAGE_WRITE) {
|
if (prot & PAGE_WRITE) {
|
||||||
if ((memory_region_is_ram(section->mr) && section->readonly)
|
if ((memory_region_is_ram(section->mr) && section->readonly)
|
||||||
|| is_romd(section)) {
|
|| memory_region_is_romd(section->mr)) {
|
||||||
/* Write access calls the I/O callback. */
|
/* Write access calls the I/O callback. */
|
||||||
te->addr_write = address | TLB_MMIO;
|
te->addr_write = address | TLB_MMIO;
|
||||||
} else if (memory_region_is_ram(section->mr)
|
} else if (memory_region_is_ram(section->mr)
|
||||||
&& !cpu_physical_memory_is_dirty(
|
&& !cpu_physical_memory_is_dirty(
|
||||||
section->mr->ram_addr
|
section->mr->ram_addr
|
||||||
+ section_addr(section, paddr))) {
|
+ memory_region_section_addr(section, paddr))) {
|
||||||
te->addr_write = address | TLB_NOTDIRTY;
|
te->addr_write = address | TLB_NOTDIRTY;
|
||||||
} else {
|
} else {
|
||||||
te->addr_write = address;
|
te->addr_write = address;
|
||||||
|
|
18
cputlb.h
18
cputlb.h
|
@ -32,8 +32,8 @@ void tlb_set_dirty(CPUArchState *env, target_ulong vaddr);
|
||||||
extern int tlb_flush_count;
|
extern int tlb_flush_count;
|
||||||
|
|
||||||
/* exec.c */
|
/* exec.c */
|
||||||
target_phys_addr_t section_addr(MemoryRegionSection *section,
|
target_phys_addr_t memory_region_section_addr(MemoryRegionSection *section,
|
||||||
target_phys_addr_t addr);
|
target_phys_addr_t addr);
|
||||||
void tb_flush_jmp_cache(CPUArchState *env, target_ulong addr);
|
void tb_flush_jmp_cache(CPUArchState *env, target_ulong addr);
|
||||||
target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env,
|
target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env,
|
||||||
MemoryRegionSection *section,
|
MemoryRegionSection *section,
|
||||||
|
@ -43,21 +43,9 @@ target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env,
|
||||||
target_ulong *address);
|
target_ulong *address);
|
||||||
bool memory_region_is_unassigned(MemoryRegion *mr);
|
bool memory_region_is_unassigned(MemoryRegion *mr);
|
||||||
|
|
||||||
static inline bool is_ram_rom(MemoryRegionSection *s)
|
static inline bool memory_region_is_romd(MemoryRegion *mr)
|
||||||
{
|
{
|
||||||
return memory_region_is_ram(s->mr);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool is_romd(MemoryRegionSection *s)
|
|
||||||
{
|
|
||||||
MemoryRegion *mr = s->mr;
|
|
||||||
|
|
||||||
return mr->rom_device && mr->readable;
|
return mr->rom_device && mr->readable;
|
||||||
}
|
}
|
||||||
static inline bool is_ram_rom_romd(MemoryRegionSection *s)
|
|
||||||
{
|
|
||||||
return is_ram_rom(s) || is_romd(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
68
exec.c
68
exec.c
|
@ -503,8 +503,8 @@ bool memory_region_is_unassigned(MemoryRegion *mr)
|
||||||
&& mr != &io_mem_watch;
|
&& mr != &io_mem_watch;
|
||||||
}
|
}
|
||||||
|
|
||||||
target_phys_addr_t section_addr(MemoryRegionSection *section,
|
target_phys_addr_t memory_region_section_addr(MemoryRegionSection *section,
|
||||||
target_phys_addr_t addr)
|
target_phys_addr_t addr)
|
||||||
{
|
{
|
||||||
addr -= section->offset_within_address_space;
|
addr -= section->offset_within_address_space;
|
||||||
addr += section->offset_within_region;
|
addr += section->offset_within_region;
|
||||||
|
@ -1477,7 +1477,7 @@ void tb_invalidate_phys_addr(target_phys_addr_t addr)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ram_addr = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)
|
ram_addr = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, addr);
|
+ memory_region_section_addr(section, addr);
|
||||||
tb_invalidate_phys_page_range(ram_addr, ram_addr + 1, 0);
|
tb_invalidate_phys_page_range(ram_addr, ram_addr + 1, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1977,10 +1977,10 @@ target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env,
|
||||||
target_phys_addr_t iotlb;
|
target_phys_addr_t iotlb;
|
||||||
CPUWatchpoint *wp;
|
CPUWatchpoint *wp;
|
||||||
|
|
||||||
if (is_ram_rom(section)) {
|
if (memory_region_is_ram(section->mr)) {
|
||||||
/* Normal RAM. */
|
/* Normal RAM. */
|
||||||
iotlb = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)
|
iotlb = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, paddr);
|
+ memory_region_section_addr(section, paddr);
|
||||||
if (!section->readonly) {
|
if (!section->readonly) {
|
||||||
iotlb |= phys_section_notdirty;
|
iotlb |= phys_section_notdirty;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1994,7 +1994,7 @@ target_phys_addr_t memory_region_section_get_iotlb(CPUArchState *env,
|
||||||
We can't use the high bits of pd for this because
|
We can't use the high bits of pd for this because
|
||||||
IO_MEM_ROMD uses these as a ram address. */
|
IO_MEM_ROMD uses these as a ram address. */
|
||||||
iotlb = section - phys_sections;
|
iotlb = section - phys_sections;
|
||||||
iotlb += section_addr(section, paddr);
|
iotlb += memory_region_section_addr(section, paddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make accesses to pages with watchpoints go via the
|
/* Make accesses to pages with watchpoints go via the
|
||||||
|
@ -3517,7 +3517,7 @@ void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
|
||||||
if (is_write) {
|
if (is_write) {
|
||||||
if (!memory_region_is_ram(section->mr)) {
|
if (!memory_region_is_ram(section->mr)) {
|
||||||
target_phys_addr_t addr1;
|
target_phys_addr_t addr1;
|
||||||
addr1 = section_addr(section, addr);
|
addr1 = memory_region_section_addr(section, addr);
|
||||||
/* XXX: could force cpu_single_env to NULL to avoid
|
/* XXX: could force cpu_single_env to NULL to avoid
|
||||||
potential bugs */
|
potential bugs */
|
||||||
if (l >= 4 && ((addr1 & 3) == 0)) {
|
if (l >= 4 && ((addr1 & 3) == 0)) {
|
||||||
|
@ -3539,7 +3539,7 @@ void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
|
||||||
} else if (!section->readonly) {
|
} else if (!section->readonly) {
|
||||||
ram_addr_t addr1;
|
ram_addr_t addr1;
|
||||||
addr1 = memory_region_get_ram_addr(section->mr)
|
addr1 = memory_region_get_ram_addr(section->mr)
|
||||||
+ section_addr(section, addr);
|
+ memory_region_section_addr(section, addr);
|
||||||
/* RAM case */
|
/* RAM case */
|
||||||
ptr = qemu_get_ram_ptr(addr1);
|
ptr = qemu_get_ram_ptr(addr1);
|
||||||
memcpy(ptr, buf, l);
|
memcpy(ptr, buf, l);
|
||||||
|
@ -3553,10 +3553,11 @@ void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
|
||||||
qemu_put_ram_ptr(ptr);
|
qemu_put_ram_ptr(ptr);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!is_ram_rom_romd(section)) {
|
if (!(memory_region_is_ram(section->mr) ||
|
||||||
|
memory_region_is_romd(section->mr))) {
|
||||||
target_phys_addr_t addr1;
|
target_phys_addr_t addr1;
|
||||||
/* I/O case */
|
/* I/O case */
|
||||||
addr1 = section_addr(section, addr);
|
addr1 = memory_region_section_addr(section, addr);
|
||||||
if (l >= 4 && ((addr1 & 3) == 0)) {
|
if (l >= 4 && ((addr1 & 3) == 0)) {
|
||||||
/* 32 bit read access */
|
/* 32 bit read access */
|
||||||
val = io_mem_read(section->mr, addr1, 4);
|
val = io_mem_read(section->mr, addr1, 4);
|
||||||
|
@ -3576,7 +3577,8 @@ void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
|
||||||
} else {
|
} else {
|
||||||
/* RAM case */
|
/* RAM case */
|
||||||
ptr = qemu_get_ram_ptr(section->mr->ram_addr
|
ptr = qemu_get_ram_ptr(section->mr->ram_addr
|
||||||
+ section_addr(section, addr));
|
+ memory_region_section_addr(section,
|
||||||
|
addr));
|
||||||
memcpy(buf, ptr, l);
|
memcpy(buf, ptr, l);
|
||||||
qemu_put_ram_ptr(ptr);
|
qemu_put_ram_ptr(ptr);
|
||||||
}
|
}
|
||||||
|
@ -3603,12 +3605,13 @@ void cpu_physical_memory_write_rom(target_phys_addr_t addr,
|
||||||
l = len;
|
l = len;
|
||||||
section = phys_page_find(page >> TARGET_PAGE_BITS);
|
section = phys_page_find(page >> TARGET_PAGE_BITS);
|
||||||
|
|
||||||
if (!is_ram_rom_romd(section)) {
|
if (!(memory_region_is_ram(section->mr) ||
|
||||||
|
memory_region_is_romd(section->mr))) {
|
||||||
/* do nothing */
|
/* do nothing */
|
||||||
} else {
|
} else {
|
||||||
unsigned long addr1;
|
unsigned long addr1;
|
||||||
addr1 = memory_region_get_ram_addr(section->mr)
|
addr1 = memory_region_get_ram_addr(section->mr)
|
||||||
+ section_addr(section, addr);
|
+ memory_region_section_addr(section, addr);
|
||||||
/* ROM/RAM case */
|
/* ROM/RAM case */
|
||||||
ptr = qemu_get_ram_ptr(addr1);
|
ptr = qemu_get_ram_ptr(addr1);
|
||||||
memcpy(ptr, buf, l);
|
memcpy(ptr, buf, l);
|
||||||
|
@ -3709,7 +3712,7 @@ void *cpu_physical_memory_map(target_phys_addr_t addr,
|
||||||
}
|
}
|
||||||
if (!todo) {
|
if (!todo) {
|
||||||
raddr = memory_region_get_ram_addr(section->mr)
|
raddr = memory_region_get_ram_addr(section->mr)
|
||||||
+ section_addr(section, addr);
|
+ memory_region_section_addr(section, addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
len -= l;
|
len -= l;
|
||||||
|
@ -3771,9 +3774,10 @@ static inline uint32_t ldl_phys_internal(target_phys_addr_t addr,
|
||||||
|
|
||||||
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
||||||
|
|
||||||
if (!is_ram_rom_romd(section)) {
|
if (!(memory_region_is_ram(section->mr) ||
|
||||||
|
memory_region_is_romd(section->mr))) {
|
||||||
/* I/O case */
|
/* I/O case */
|
||||||
addr = section_addr(section, addr);
|
addr = memory_region_section_addr(section, addr);
|
||||||
val = io_mem_read(section->mr, addr, 4);
|
val = io_mem_read(section->mr, addr, 4);
|
||||||
#if defined(TARGET_WORDS_BIGENDIAN)
|
#if defined(TARGET_WORDS_BIGENDIAN)
|
||||||
if (endian == DEVICE_LITTLE_ENDIAN) {
|
if (endian == DEVICE_LITTLE_ENDIAN) {
|
||||||
|
@ -3788,7 +3792,7 @@ static inline uint32_t ldl_phys_internal(target_phys_addr_t addr,
|
||||||
/* RAM case */
|
/* RAM case */
|
||||||
ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr)
|
ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr)
|
||||||
& TARGET_PAGE_MASK)
|
& TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, addr));
|
+ memory_region_section_addr(section, addr));
|
||||||
switch (endian) {
|
switch (endian) {
|
||||||
case DEVICE_LITTLE_ENDIAN:
|
case DEVICE_LITTLE_ENDIAN:
|
||||||
val = ldl_le_p(ptr);
|
val = ldl_le_p(ptr);
|
||||||
|
@ -3829,9 +3833,10 @@ static inline uint64_t ldq_phys_internal(target_phys_addr_t addr,
|
||||||
|
|
||||||
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
||||||
|
|
||||||
if (!is_ram_rom_romd(section)) {
|
if (!(memory_region_is_ram(section->mr) ||
|
||||||
|
memory_region_is_romd(section->mr))) {
|
||||||
/* I/O case */
|
/* I/O case */
|
||||||
addr = section_addr(section, addr);
|
addr = memory_region_section_addr(section, addr);
|
||||||
|
|
||||||
/* XXX This is broken when device endian != cpu endian.
|
/* XXX This is broken when device endian != cpu endian.
|
||||||
Fix and add "endian" variable check */
|
Fix and add "endian" variable check */
|
||||||
|
@ -3846,7 +3851,7 @@ static inline uint64_t ldq_phys_internal(target_phys_addr_t addr,
|
||||||
/* RAM case */
|
/* RAM case */
|
||||||
ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr)
|
ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr)
|
||||||
& TARGET_PAGE_MASK)
|
& TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, addr));
|
+ memory_region_section_addr(section, addr));
|
||||||
switch (endian) {
|
switch (endian) {
|
||||||
case DEVICE_LITTLE_ENDIAN:
|
case DEVICE_LITTLE_ENDIAN:
|
||||||
val = ldq_le_p(ptr);
|
val = ldq_le_p(ptr);
|
||||||
|
@ -3895,9 +3900,10 @@ static inline uint32_t lduw_phys_internal(target_phys_addr_t addr,
|
||||||
|
|
||||||
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
||||||
|
|
||||||
if (!is_ram_rom_romd(section)) {
|
if (!(memory_region_is_ram(section->mr) ||
|
||||||
|
memory_region_is_romd(section->mr))) {
|
||||||
/* I/O case */
|
/* I/O case */
|
||||||
addr = section_addr(section, addr);
|
addr = memory_region_section_addr(section, addr);
|
||||||
val = io_mem_read(section->mr, addr, 2);
|
val = io_mem_read(section->mr, addr, 2);
|
||||||
#if defined(TARGET_WORDS_BIGENDIAN)
|
#if defined(TARGET_WORDS_BIGENDIAN)
|
||||||
if (endian == DEVICE_LITTLE_ENDIAN) {
|
if (endian == DEVICE_LITTLE_ENDIAN) {
|
||||||
|
@ -3912,7 +3918,7 @@ static inline uint32_t lduw_phys_internal(target_phys_addr_t addr,
|
||||||
/* RAM case */
|
/* RAM case */
|
||||||
ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr)
|
ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr)
|
||||||
& TARGET_PAGE_MASK)
|
& TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, addr));
|
+ memory_region_section_addr(section, addr));
|
||||||
switch (endian) {
|
switch (endian) {
|
||||||
case DEVICE_LITTLE_ENDIAN:
|
case DEVICE_LITTLE_ENDIAN:
|
||||||
val = lduw_le_p(ptr);
|
val = lduw_le_p(ptr);
|
||||||
|
@ -3954,7 +3960,7 @@ void stl_phys_notdirty(target_phys_addr_t addr, uint32_t val)
|
||||||
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
||||||
|
|
||||||
if (!memory_region_is_ram(section->mr) || section->readonly) {
|
if (!memory_region_is_ram(section->mr) || section->readonly) {
|
||||||
addr = section_addr(section, addr);
|
addr = memory_region_section_addr(section, addr);
|
||||||
if (memory_region_is_ram(section->mr)) {
|
if (memory_region_is_ram(section->mr)) {
|
||||||
section = &phys_sections[phys_section_rom];
|
section = &phys_sections[phys_section_rom];
|
||||||
}
|
}
|
||||||
|
@ -3962,7 +3968,7 @@ void stl_phys_notdirty(target_phys_addr_t addr, uint32_t val)
|
||||||
} else {
|
} else {
|
||||||
unsigned long addr1 = (memory_region_get_ram_addr(section->mr)
|
unsigned long addr1 = (memory_region_get_ram_addr(section->mr)
|
||||||
& TARGET_PAGE_MASK)
|
& TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, addr);
|
+ memory_region_section_addr(section, addr);
|
||||||
ptr = qemu_get_ram_ptr(addr1);
|
ptr = qemu_get_ram_ptr(addr1);
|
||||||
stl_p(ptr, val);
|
stl_p(ptr, val);
|
||||||
|
|
||||||
|
@ -3986,7 +3992,7 @@ void stq_phys_notdirty(target_phys_addr_t addr, uint64_t val)
|
||||||
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
||||||
|
|
||||||
if (!memory_region_is_ram(section->mr) || section->readonly) {
|
if (!memory_region_is_ram(section->mr) || section->readonly) {
|
||||||
addr = section_addr(section, addr);
|
addr = memory_region_section_addr(section, addr);
|
||||||
if (memory_region_is_ram(section->mr)) {
|
if (memory_region_is_ram(section->mr)) {
|
||||||
section = &phys_sections[phys_section_rom];
|
section = &phys_sections[phys_section_rom];
|
||||||
}
|
}
|
||||||
|
@ -4000,7 +4006,7 @@ void stq_phys_notdirty(target_phys_addr_t addr, uint64_t val)
|
||||||
} else {
|
} else {
|
||||||
ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr)
|
ptr = qemu_get_ram_ptr((memory_region_get_ram_addr(section->mr)
|
||||||
& TARGET_PAGE_MASK)
|
& TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, addr));
|
+ memory_region_section_addr(section, addr));
|
||||||
stq_p(ptr, val);
|
stq_p(ptr, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4015,7 +4021,7 @@ static inline void stl_phys_internal(target_phys_addr_t addr, uint32_t val,
|
||||||
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
||||||
|
|
||||||
if (!memory_region_is_ram(section->mr) || section->readonly) {
|
if (!memory_region_is_ram(section->mr) || section->readonly) {
|
||||||
addr = section_addr(section, addr);
|
addr = memory_region_section_addr(section, addr);
|
||||||
if (memory_region_is_ram(section->mr)) {
|
if (memory_region_is_ram(section->mr)) {
|
||||||
section = &phys_sections[phys_section_rom];
|
section = &phys_sections[phys_section_rom];
|
||||||
}
|
}
|
||||||
|
@ -4032,7 +4038,7 @@ static inline void stl_phys_internal(target_phys_addr_t addr, uint32_t val,
|
||||||
} else {
|
} else {
|
||||||
unsigned long addr1;
|
unsigned long addr1;
|
||||||
addr1 = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)
|
addr1 = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, addr);
|
+ memory_region_section_addr(section, addr);
|
||||||
/* RAM case */
|
/* RAM case */
|
||||||
ptr = qemu_get_ram_ptr(addr1);
|
ptr = qemu_get_ram_ptr(addr1);
|
||||||
switch (endian) {
|
switch (endian) {
|
||||||
|
@ -4088,7 +4094,7 @@ static inline void stw_phys_internal(target_phys_addr_t addr, uint32_t val,
|
||||||
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
section = phys_page_find(addr >> TARGET_PAGE_BITS);
|
||||||
|
|
||||||
if (!memory_region_is_ram(section->mr) || section->readonly) {
|
if (!memory_region_is_ram(section->mr) || section->readonly) {
|
||||||
addr = section_addr(section, addr);
|
addr = memory_region_section_addr(section, addr);
|
||||||
if (memory_region_is_ram(section->mr)) {
|
if (memory_region_is_ram(section->mr)) {
|
||||||
section = &phys_sections[phys_section_rom];
|
section = &phys_sections[phys_section_rom];
|
||||||
}
|
}
|
||||||
|
@ -4105,7 +4111,7 @@ static inline void stw_phys_internal(target_phys_addr_t addr, uint32_t val,
|
||||||
} else {
|
} else {
|
||||||
unsigned long addr1;
|
unsigned long addr1;
|
||||||
addr1 = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)
|
addr1 = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)
|
||||||
+ section_addr(section, addr);
|
+ memory_region_section_addr(section, addr);
|
||||||
/* RAM case */
|
/* RAM case */
|
||||||
ptr = qemu_get_ram_ptr(addr1);
|
ptr = qemu_get_ram_ptr(addr1);
|
||||||
switch (endian) {
|
switch (endian) {
|
||||||
|
|
Loading…
Reference in a new issue