[Qemu-devel] [5863] More consistent PAGE_xxx defines, avoid conflicting with system PAGE_xxx

[Blue Swirl]

Revision: 5863
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5863
Author:   blueswir1
Date:     2008-12-03 16:29:47 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
More consistent PAGE_xxx defines, avoid conflicting with system PAGE_xxx

Modified Paths:
--------------
    trunk/hw/iommu.c

Modified: trunk/hw/iommu.c
===================================================================
--- trunk/hw/iommu.c    2008-12-02 23:53:50 UTC (rev 5862)
+++ trunk/hw/iommu.c    2008-12-03 16:29:47 UTC (rev 5863)
@@ -109,9 +109,9 @@
 #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 @@
 
     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 @@
     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 @@
     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);