diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-03 16:29:47 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-03 16:29:47 +0000 |
| commit | 8b0de438d4c814fc2d7d1330a146a2e1cb8877b2 (patch) | |
| tree | 0f98cb4428b341cb77adc77c0701213cfcfd10c0 | |
| parent | 825bb581b447831b6bbc21981b1eb8ad27df119d (diff) | |
| download | qemu-8b0de438d4c814fc2d7d1330a146a2e1cb8877b2.tar.gz | |
More consistent PAGE_xxx defines, avoid conflicting with system PAGE_xxx
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5863 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/iommu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/iommu.c b/hw/iommu.c index b56cd7e280..ee9b78c87b 100644 --- a/hw/iommu.c +++ b/hw/iommu.c @@ -109,9 +109,9 @@ do { printf("IOMMU: " fmt , ##args); } while (0) #define IOPTE_VALID 0x00000002 /* IOPTE is valid */ #define IOPTE_WAZ 0x00000001 /* Write as zeros */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1 << PAGE_SHIFT) -#define PAGE_MASK (PAGE_SIZE - 1) +#define IOMMU_PAGE_SHIFT 12 +#define IOMMU_PAGE_SIZE (1 << IOMMU_PAGE_SHIFT) +#define IOMMU_PAGE_MASK ~(IOMMU_PAGE_SIZE - 1) typedef struct IOMMUState { uint32_t regs[IOMMU_NREGS]; @@ -242,7 +242,7 @@ static uint32_t iommu_page_get_flags(IOMMUState *s, target_phys_addr_t addr) iopte = s->regs[IOMMU_BASE] << 4; addr &= ~s->iostart; - iopte += (addr >> (PAGE_SHIFT - 2)) & ~3; + iopte += (addr >> (IOMMU_PAGE_SHIFT - 2)) & ~3; cpu_physical_memory_read(iopte, (uint8_t *)&ret, 4); tswap32s(&ret); DPRINTF("get flags addr " TARGET_FMT_plx " => pte " TARGET_FMT_plx @@ -258,7 +258,7 @@ static target_phys_addr_t iommu_translate_pa(target_phys_addr_t addr, target_phys_addr_t pa; tmppte = pte; - pa = ((pte & IOPTE_PAGE) << 4) + (addr & PAGE_MASK); + pa = ((pte & IOPTE_PAGE) << 4) + (addr & ~IOMMU_PAGE_MASK); DPRINTF("xlate dva " TARGET_FMT_plx " => pa " TARGET_FMT_plx " (iopte = %x)\n", addr, pa, tmppte); @@ -285,8 +285,8 @@ void sparc_iommu_memory_rw(void *opaque, target_phys_addr_t addr, target_phys_addr_t page, phys_addr; while (len > 0) { - page = addr & TARGET_PAGE_MASK; - l = (page + TARGET_PAGE_SIZE) - addr; + page = addr & IOMMU_PAGE_MASK; + l = (page + IOMMU_PAGE_SIZE) - addr; if (l > len) l = len; flags = iommu_page_get_flags(opaque, page); |