From d56dd6cf031075bef985c831146691fdeec8af5c Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 2 Jul 2009 19:32:07 +0900 Subject: [PATCH] use constant IOPORTS_MASK instead of 0xffff. Signed-off-by: Isaku Yamahata Signed-off-by: Anthony Liguori --- hw/apb_pci.c | 12 ++++++------ hw/isa_mmio.c | 12 ++++++------ ioport.c | 4 ++-- ioport.h | 1 + monitor.c | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 5c8ffee..5f411aa 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -148,26 +148,26 @@ static CPUReadMemoryFunc *pci_apb_read[] = { static void pci_apb_iowriteb (void *opaque, target_phys_addr_t addr, uint32_t val) { - cpu_outb(NULL, addr & 0xffff, val); + cpu_outb(NULL, addr & IOPORTS_MASK, val); } static void pci_apb_iowritew (void *opaque, target_phys_addr_t addr, uint32_t val) { - cpu_outw(NULL, addr & 0xffff, val); + cpu_outw(NULL, addr & IOPORTS_MASK, val); } static void pci_apb_iowritel (void *opaque, target_phys_addr_t addr, uint32_t val) { - cpu_outl(NULL, addr & 0xffff, val); + cpu_outl(NULL, addr & IOPORTS_MASK, val); } static uint32_t pci_apb_ioreadb (void *opaque, target_phys_addr_t addr) { uint32_t val; - val = cpu_inb(NULL, addr & 0xffff); + val = cpu_inb(NULL, addr & IOPORTS_MASK); return val; } @@ -175,7 +175,7 @@ static uint32_t pci_apb_ioreadw (void *opaque, target_phys_addr_t addr) { uint32_t val; - val = cpu_inw(NULL, addr & 0xffff); + val = cpu_inw(NULL, addr & IOPORTS_MASK); return val; } @@ -183,7 +183,7 @@ static uint32_t pci_apb_ioreadl (void *opaque, target_phys_addr_t addr) { uint32_t val; - val = cpu_inl(NULL, addr & 0xffff); + val = cpu_inl(NULL, addr & IOPORTS_MASK); return val; } diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c index 1d5e8dc..868c7b0 100644 --- a/hw/isa_mmio.c +++ b/hw/isa_mmio.c @@ -28,7 +28,7 @@ static void isa_mmio_writeb (void *opaque, target_phys_addr_t addr, uint32_t val) { - cpu_outb(NULL, addr & 0xffff, val); + cpu_outb(NULL, addr & IOPORTS_MASK, val); } static void isa_mmio_writew (void *opaque, target_phys_addr_t addr, @@ -37,7 +37,7 @@ static void isa_mmio_writew (void *opaque, target_phys_addr_t addr, #ifdef TARGET_WORDS_BIGENDIAN val = bswap16(val); #endif - cpu_outw(NULL, addr & 0xffff, val); + cpu_outw(NULL, addr & IOPORTS_MASK, val); } static void isa_mmio_writel (void *opaque, target_phys_addr_t addr, @@ -46,14 +46,14 @@ static void isa_mmio_writel (void *opaque, target_phys_addr_t addr, #ifdef TARGET_WORDS_BIGENDIAN val = bswap32(val); #endif - cpu_outl(NULL, addr & 0xffff, val); + cpu_outl(NULL, addr & IOPORTS_MASK, val); } static uint32_t isa_mmio_readb (void *opaque, target_phys_addr_t addr) { uint32_t val; - val = cpu_inb(NULL, addr & 0xffff); + val = cpu_inb(NULL, addr & IOPORTS_MASK); return val; } @@ -61,7 +61,7 @@ static uint32_t isa_mmio_readw (void *opaque, target_phys_addr_t addr) { uint32_t val; - val = cpu_inw(NULL, addr & 0xffff); + val = cpu_inw(NULL, addr & IOPORTS_MASK); #ifdef TARGET_WORDS_BIGENDIAN val = bswap16(val); #endif @@ -72,7 +72,7 @@ static uint32_t isa_mmio_readl (void *opaque, target_phys_addr_t addr) { uint32_t val; - val = cpu_inl(NULL, addr & 0xffff); + val = cpu_inl(NULL, addr & IOPORTS_MASK); #ifdef TARGET_WORDS_BIGENDIAN val = bswap32(val); #endif diff --git a/ioport.c b/ioport.c index d875209..04bffc4 100644 --- a/ioport.c +++ b/ioport.c @@ -94,7 +94,7 @@ static uint32_t default_ioport_readw(void *opaque, uint32_t address) { uint32_t data; data = ioport_read(0, address); - address = (address + 1) & (MAX_IOPORTS - 1); + address = (address + 1) & IOPORTS_MASK; data |= ioport_read(0, address) << 8; return data; } @@ -102,7 +102,7 @@ static uint32_t default_ioport_readw(void *opaque, uint32_t address) static void default_ioport_writew(void *opaque, uint32_t address, uint32_t data) { ioport_write(0, address, data & 0xff); - address = (address + 1) & (MAX_IOPORTS - 1); + address = (address + 1) & IOPORTS_MASK; ioport_write(0, address, (data >> 8) & 0xff); } diff --git a/ioport.h b/ioport.h index 309a402..4cb59e9 100644 --- a/ioport.h +++ b/ioport.h @@ -28,6 +28,7 @@ #include "qemu-common.h" #define MAX_IOPORTS (64 * 1024) +#define IOPORTS_MASK (MAX_IOPORTS - 1) /* These should really be in isa.h, but are here to make pc.h happy. */ typedef void (IOPortWriteFunc)(void *opaque, uint32_t address, uint32_t data); diff --git a/monitor.c b/monitor.c index 301bde0..342af32 100644 --- a/monitor.c +++ b/monitor.c @@ -1161,7 +1161,7 @@ static void do_ioport_read(Monitor *mon, int count, int format, int size, int suffix; if (has_index) { - cpu_outb(NULL, addr & 0xffff, index & 0xff); + cpu_outb(NULL, addr & IOPORTS_MASK, index & 0xff); addr++; } addr &= 0xffff; -- 2.7.4