exec: Make iotlb_to_region input an AS
Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
This commit is contained in:
parent
29d8ec7bee
commit
777170946f
2
cputlb.c
2
cputlb.c
|
@ -313,7 +313,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr)
|
||||||
cpu_ldub_code(env1, addr);
|
cpu_ldub_code(env1, addr);
|
||||||
}
|
}
|
||||||
pd = env1->iotlb[mmu_idx][page_index] & ~TARGET_PAGE_MASK;
|
pd = env1->iotlb[mmu_idx][page_index] & ~TARGET_PAGE_MASK;
|
||||||
mr = iotlb_to_region(pd);
|
mr = iotlb_to_region(&address_space_memory, pd);
|
||||||
if (memory_region_is_unassigned(mr)) {
|
if (memory_region_is_unassigned(mr)) {
|
||||||
CPUState *cpu = ENV_GET_CPU(env1);
|
CPUState *cpu = ENV_GET_CPU(env1);
|
||||||
CPUClass *cc = CPU_GET_CLASS(cpu);
|
CPUClass *cc = CPU_GET_CLASS(cpu);
|
||||||
|
|
5
exec.c
5
exec.c
|
@ -1746,10 +1746,9 @@ static uint16_t dummy_section(PhysPageMap *map, MemoryRegion *mr)
|
||||||
return phys_section_add(map, §ion);
|
return phys_section_add(map, §ion);
|
||||||
}
|
}
|
||||||
|
|
||||||
MemoryRegion *iotlb_to_region(hwaddr index)
|
MemoryRegion *iotlb_to_region(AddressSpace *as, hwaddr index)
|
||||||
{
|
{
|
||||||
return address_space_memory.dispatch->map.sections[
|
return as->dispatch->map.sections[index & ~TARGET_PAGE_MASK].mr;
|
||||||
index & ~TARGET_PAGE_MASK].mr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void io_mem_init(void)
|
static void io_mem_init(void)
|
||||||
|
|
|
@ -325,7 +325,7 @@ extern uintptr_t tci_tb_ptr;
|
||||||
|
|
||||||
void phys_mem_set_alloc(void *(*alloc)(size_t));
|
void phys_mem_set_alloc(void *(*alloc)(size_t));
|
||||||
|
|
||||||
struct MemoryRegion *iotlb_to_region(hwaddr index);
|
struct MemoryRegion *iotlb_to_region(AddressSpace *as, hwaddr index);
|
||||||
bool io_mem_read(struct MemoryRegion *mr, hwaddr addr,
|
bool io_mem_read(struct MemoryRegion *mr, hwaddr addr,
|
||||||
uint64_t *pvalue, unsigned size);
|
uint64_t *pvalue, unsigned size);
|
||||||
bool io_mem_write(struct MemoryRegion *mr, hwaddr addr,
|
bool io_mem_write(struct MemoryRegion *mr, hwaddr addr,
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
|
#include "exec/address-spaces.h"
|
||||||
#include "exec/memory.h"
|
#include "exec/memory.h"
|
||||||
|
|
||||||
#define DATA_SIZE (1 << SHIFT)
|
#define DATA_SIZE (1 << SHIFT)
|
||||||
|
@ -121,7 +122,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env,
|
||||||
uintptr_t retaddr)
|
uintptr_t retaddr)
|
||||||
{
|
{
|
||||||
uint64_t val;
|
uint64_t val;
|
||||||
MemoryRegion *mr = iotlb_to_region(physaddr);
|
MemoryRegion *mr = iotlb_to_region(&address_space_memory, physaddr);
|
||||||
|
|
||||||
physaddr = (physaddr & TARGET_PAGE_MASK) + addr;
|
physaddr = (physaddr & TARGET_PAGE_MASK) + addr;
|
||||||
env->mem_io_pc = retaddr;
|
env->mem_io_pc = retaddr;
|
||||||
|
@ -327,7 +328,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env,
|
||||||
target_ulong addr,
|
target_ulong addr,
|
||||||
uintptr_t retaddr)
|
uintptr_t retaddr)
|
||||||
{
|
{
|
||||||
MemoryRegion *mr = iotlb_to_region(physaddr);
|
MemoryRegion *mr = iotlb_to_region(&address_space_memory, physaddr);
|
||||||
|
|
||||||
physaddr = (physaddr & TARGET_PAGE_MASK) + addr;
|
physaddr = (physaddr & TARGET_PAGE_MASK) + addr;
|
||||||
if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) {
|
if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) {
|
||||||
|
|
Loading…
Reference in a new issue