From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK4u1-0007km-UA for qemu-devel@nongnu.org; Thu, 12 Sep 2013 07:17:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VK4tw-0004zV-Em for qemu-devel@nongnu.org; Thu, 12 Sep 2013 07:17:37 -0400 Received: from mail-ea0-x232.google.com ([2a00:1450:4013:c01::232]:46021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK4tw-0004zD-6f for qemu-devel@nongnu.org; Thu, 12 Sep 2013 07:17:32 -0400 Received: by mail-ea0-f178.google.com with SMTP id a15so5275976eae.37 for ; Thu, 12 Sep 2013 04:17:31 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 12 Sep 2013 13:17:09 +0200 Message-Id: <1378984634-765-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1378984634-765-1-git-send-email-pbonzini@redhat.com> References: <1378984634-765-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 06/11] hw/scsi/lsi53c895a: Use deposit32 rather than handcoded shift/mask List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell From: Peter Maydell Use deposit32() rather than handcoded shifts/masks to update the scratch registers. This is cleaner and incidentally avoids a clang sanitizer complaint ("runtime error: left shift of 255 by 24 places cannot be represented in type 'int'"). Signed-off-by: Peter Maydell Signed-off-by: Paolo Bonzini --- hw/scsi/lsi53c895a.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index a26b20b..5affc82 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -1870,8 +1870,7 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) int shift; n = (offset - 0x58) >> 2; shift = (offset & 3) * 8; - s->scratch[n] &= ~(0xff << shift); - s->scratch[n] |= (val & 0xff) << shift; + s->scratch[n] = deposit32(s->scratch[n], shift, 8, val); } else { BADF("Unhandled writeb 0x%x = 0x%x\n", offset, val); } -- 1.8.3.1