[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 02/22] exec: Make iotlb_to_region input an AS
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PATCH v4 02/22] exec: Make iotlb_to_region input an AS |
Date: |
Mon, 3 Feb 2014 19:44:30 +1000 |
From: "Edgar E. Iglesias" <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
cputlb.c | 2 +-
exec.c | 5 ++---
include/exec/exec-all.h | 2 +-
include/exec/softmmu_template.h | 5 +++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cputlb.c b/cputlb.c
index b533f3f..71cf64f 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -313,7 +313,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1,
target_ulong addr)
cpu_ldub_code(env1, addr);
}
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)) {
CPUState *cpu = ENV_GET_CPU(env1);
CPUClass *cc = CPU_GET_CLASS(cpu);
diff --git a/exec.c b/exec.c
index fc8ae65..8a90867 100644
--- a/exec.c
+++ b/exec.c
@@ -1731,10 +1731,9 @@ static uint16_t dummy_section(PhysPageMap *map,
MemoryRegion *mr)
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[
- index & ~TARGET_PAGE_MASK].mr;
+ return as->dispatch->map.sections[index & ~TARGET_PAGE_MASK].mr;
}
static void io_mem_init(void)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 9d6c36b..75fd1da 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -325,7 +325,7 @@ extern uintptr_t tci_tb_ptr;
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,
uint64_t *pvalue, unsigned size);
bool io_mem_write(struct MemoryRegion *mr, hwaddr addr,
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h
index c6a5440..69d856a 100644
--- a/include/exec/softmmu_template.h
+++ b/include/exec/softmmu_template.h
@@ -22,6 +22,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/timer.h"
+#include "exec/address-spaces.h"
#include "exec/memory.h"
#define DATA_SIZE (1 << SHIFT)
@@ -118,7 +119,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState
*env,
uintptr_t retaddr)
{
uint64_t val;
- MemoryRegion *mr = iotlb_to_region(physaddr);
+ MemoryRegion *mr = iotlb_to_region(&address_space_memory, physaddr);
physaddr = (physaddr & TARGET_PAGE_MASK) + addr;
env->mem_io_pc = retaddr;
@@ -324,7 +325,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env,
target_ulong addr,
uintptr_t retaddr)
{
- MemoryRegion *mr = iotlb_to_region(physaddr);
+ MemoryRegion *mr = iotlb_to_region(&address_space_memory, physaddr);
physaddr = (physaddr & TARGET_PAGE_MASK) + addr;
if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) {
--
1.8.1.2
- [Qemu-devel] [PATCH v4 00/22] Steps towards per CPU address-spaces, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 01/22] exec: Make tb_invalidate_phys_addr input an AS, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 02/22] exec: Make iotlb_to_region input an AS,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v4 03/22] exec: Always initialize MemorySection address spaces, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 04/22] exec: Make memory_region_section_get_iotlb use section AS, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 05/22] memory: Add MemoryListener to typedefs.h, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 06/22] cpu: Add per-cpu address space, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 07/22] exec: On AS changes, only flush affected CPU TLBs, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 08/22] exec: Make ldl_*_phys input an AddressSpace, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 09/22] exec: Make ldq/ldub_*_phys input an AddressSpace, Edgar E. Iglesias, 2014/02/03
- [Qemu-devel] [PATCH v4 10/22] exec: Make lduw_*_phys input an AddressSpace, Edgar E. Iglesias, 2014/02/03