From patchwork Fri Sep 10 20:59:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 64469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E5DDFB6F07 for ; Sat, 11 Sep 2010 07:22:48 +1000 (EST) Received: from localhost ([127.0.0.1]:36066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuArb-0005yN-3d for incoming@patchwork.ozlabs.org; Fri, 10 Sep 2010 17:10:27 -0400 Received: from [140.186.70.92] (port=47790 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuAgt-0001JG-7C for qemu-devel@nongnu.org; Fri, 10 Sep 2010 16:59:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OuAgr-0001YL-JK for qemu-devel@nongnu.org; Fri, 10 Sep 2010 16:59:22 -0400 Received: from mail-qy0-f173.google.com ([209.85.216.173]:54913) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OuAgr-0001NG-Gz for qemu-devel@nongnu.org; Fri, 10 Sep 2010 16:59:21 -0400 Received: by mail-qy0-f173.google.com with SMTP id 34so8208462qyk.4 for ; Fri, 10 Sep 2010 13:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=jSNMEiDJcQfICgjAzyAhPof/Ic/ypZb7IKtHBPxDIkQ=; b=kls4phEt27yg/o1V0EpJA0rE1cLqVNeZq0KqhVxiQIGZTAeC5DnvfvSmXHIgidrWQQ FDe6vogHmWVgB1YVJKK1ae4xAm6R4XFpcc+K5+p1WX0sp5lXllU+e+V9UGdWtMODHmeY dNChDhVk1tl1r6uaivsjrErkq9xEkSTxyE/cs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=cdZjWapbmMlhgggrzrjy7aMxjwYzoogqEjiV8paY4KOCRQmioUaqvk5t7zDvMNOcr6 IfawEv5qpH7zVtlZj5vO+KK7uOq/LynRmcQOh/0OA4/5YMA9xLYL/azK/FbWDuFqPyUs lVWShio91hnc1b5SREZ0kAY2MyzcubLOyxqMc= Received: by 10.229.141.65 with SMTP id l1mr705785qcu.166.1284152361222; Fri, 10 Sep 2010 13:59:21 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.240.135 with HTTP; Fri, 10 Sep 2010 13:59:01 -0700 (PDT) From: Blue Swirl Date: Fri, 10 Sep 2010 20:59:01 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 06/15] Use range_covers_byte X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use range_covers_byte() instead of comparisons. This avoids some warnings with GCC flag -Wtype-limits. Signed-off-by: Blue Swirl --- hw/omap1.c | 14 ++++++++------ hw/sm501.c | 5 +++-- 2 files changed, 11 insertions(+), 8 deletions(-) @@ -828,7 +829,7 @@ static void sm501_palette_write(void *opaque, /* TODO : consider BYTE/WORD access */ /* TODO : consider endian */ - assert(0 <= addr && addr < 0x400 * 3); + assert(range_covers_byte(0, 0x400 * 3, addr)); *(uint32_t*)&s->dc_palette[addr] = value; } diff --git a/hw/omap1.c b/hw/omap1.c index 1ee5514..f4966f7 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -26,6 +26,7 @@ /* We use pc-style serial ports. */ #include "pc.h" #include "blockdev.h" +#include "range.h" /* Should signal the TCMI/GPMC */ uint32_t omap_badwidth_read8(void *opaque, target_phys_addr_t addr) @@ -3669,37 +3670,38 @@ static const struct dma_irq_map omap1_dma_irq_map[] = { static int omap_validate_emiff_addr(struct omap_mpu_state_s *s, target_phys_addr_t addr) { - return addr >= OMAP_EMIFF_BASE && addr < OMAP_EMIFF_BASE + s->sdram_size; + return range_covers_byte(OMAP_EMIFF_BASE, s->sdram_size, addr); } static int omap_validate_emifs_addr(struct omap_mpu_state_s *s, target_phys_addr_t addr) { - return addr >= OMAP_EMIFS_BASE && addr < OMAP_EMIFF_BASE; + return range_covers_byte(OMAP_EMIFS_BASE, OMAP_EMIFF_BASE - OMAP_EMIFS_BASE, + addr); } static int omap_validate_imif_addr(struct omap_mpu_state_s *s, target_phys_addr_t addr) { - return addr >= OMAP_IMIF_BASE && addr < OMAP_IMIF_BASE + s->sram_size; + return range_covers_byte(OMAP_IMIF_BASE, s->sram_size, addr); } static int omap_validate_tipb_addr(struct omap_mpu_state_s *s, target_phys_addr_t addr) { - return addr >= 0xfffb0000 && addr < 0xffff0000; + return range_covers_byte(0xfffb0000, 0xffff0000 - 0xfffb0000, addr); } static int omap_validate_local_addr(struct omap_mpu_state_s *s, target_phys_addr_t addr) { - return addr >= OMAP_LOCALBUS_BASE && addr < OMAP_LOCALBUS_BASE + 0x1000000; + return range_covers_byte(OMAP_LOCALBUS_BASE, 0x1000000, addr); } static int omap_validate_tipb_mpui_addr(struct omap_mpu_state_s *s, target_phys_addr_t addr) { - return addr >= 0xe1010000 && addr < 0xe1020004; + return range_covers_byte(0xe1010000, 0xe1020004 - 0xe1010000, addr); } struct omap_mpu_state_s *omap310_mpu_init(unsigned long sdram_size, diff --git a/hw/sm501.c b/hw/sm501.c index 8e6932d..705e0a5 100644 --- a/hw/sm501.c +++ b/hw/sm501.c @@ -29,6 +29,7 @@ #include "devices.h" #include "sysbus.h" #include "qdev-addr.h" +#include "range.h" /* * Status: 2010/05/07 @@ -814,7 +815,7 @@ static uint32_t sm501_palette_read(void *opaque, target_phys_addr_t addr) /* TODO : consider BYTE/WORD access */ /* TODO : consider endian */ - assert(0 <= addr && addr < 0x400 * 3); + assert(range_covers_byte(0, 0x400 * 3, addr)); return *(uint32_t*)&s->dc_palette[addr]; }