From patchwork Thu Feb 14 01:47:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 220317 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AAD172C0085 for ; Thu, 14 Feb 2013 13:02:54 +1100 (EST) Received: from localhost ([::1]:50072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5nvz-0007gM-SC for incoming@patchwork.ozlabs.org; Wed, 13 Feb 2013 20:48:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5nvf-0007Ew-BX for qemu-devel@nongnu.org; Wed, 13 Feb 2013 20:48:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5nvZ-0006L9-SE for qemu-devel@nongnu.org; Wed, 13 Feb 2013 20:48:03 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:57402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5nvZ-0006L0-KV for qemu-devel@nongnu.org; Wed, 13 Feb 2013 20:47:57 -0500 Received: by mail-pa0-f47.google.com with SMTP id bj3so1045282pad.6 for ; Wed, 13 Feb 2013 17:47:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=l6YHbecy8YBxYye2rH6umqJ6TwQjf/OIZIA0okW42DA=; b=PCgXt8Itoq52MqbUHGd6DeqsZQzWhkrAQszOGvfOstbGeboIAdpuDD5eUZao73wtzB 1+JyIy18pL0Vr3o+XmTBarEkwwL8BMkvp2u1BzV59wYNtg9bWDoF/u6nCBD7MXp8aSe1 Lwwm0ghiXif/ycmVBzOT56o9o2PttSqj9pzoUrpDm8CCmqizdXLJPXV76WKA/hmTbTEZ 4Y8cUsiw7vqimGQIn0WAgg1oi+3MOulxtOmopCfKVMeCd4lz9LodQjo+TIFn5Hu42GVQ kkIiV1k66oBMga55fWgKjUtnoY/YyDBPNGpEbbZdKowwSvbKkjjO6vccu8Jdvp2XpqhM mu1w== X-Received: by 10.66.79.195 with SMTP id l3mr68877380pax.82.1360806476700; Wed, 13 Feb 2013 17:47:56 -0800 (PST) Received: from pebble.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id c3sm44029148pax.9.2013.02.13.17.47.55 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 13 Feb 2013 17:47:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 13 Feb 2013 17:47:38 -0800 Message-Id: <1360806463-23632-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360806463-23632-1-git-send-email-rth@twiddle.net> References: <1360806463-23632-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.47 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH 05/10] memory: Use non-bitops ctzl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org A memory size of zero is invalid, and so that edge condition does not occur. Signed-off-by: Richard Henderson --- memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/memory.c b/memory.c index cd7d5e0..92a2196 100644 --- a/memory.c +++ b/memory.c @@ -855,7 +855,7 @@ static uint64_t memory_region_dispatch_read1(MemoryRegion *mr, } if (!mr->ops->read) { - return mr->ops->old_mmio.read[bitops_ctzl(size)](mr->opaque, addr); + return mr->ops->old_mmio.read[ctz32(size)](mr->opaque, addr); } /* FIXME: support unaligned access */ @@ -908,7 +908,7 @@ static void memory_region_dispatch_write(MemoryRegion *mr, adjust_endianness(mr, &data, size); if (!mr->ops->write) { - mr->ops->old_mmio.write[bitops_ctzl(size)](mr->opaque, addr, data); + mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, data); return; }