From patchwork Sat Dec 24 03:59:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 708563 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tls6b2SJwz9t0X for ; Sat, 24 Dec 2016 15:02:39 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="thmMJSsA"; dkim-atps=neutral Received: from localhost ([::1]:41859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKdXW-00080c-Au for incoming@patchwork.ozlabs.org; Fri, 23 Dec 2016 23:02:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKdVn-0006PV-Gp for qemu-devel@nongnu.org; Fri, 23 Dec 2016 23:00:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cKdVm-0005Og-NB for qemu-devel@nongnu.org; Fri, 23 Dec 2016 23:00:47 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:35987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cKdVm-0005O4-Iv for qemu-devel@nongnu.org; Fri, 23 Dec 2016 23:00:46 -0500 Received: by mail-pf0-x244.google.com with SMTP id c4so14580001pfb.3 for ; Fri, 23 Dec 2016 20:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JJvDcKB+irciVNEp45KezxHQB9+EBk1lUpZONrN6ZFg=; b=thmMJSsANlJIzEANvXAFab/K7Sv41ujFC0GcYX4YhuNPJerm2pl79Qh74CH+scR2i6 0fg4lLESkhSEGqIQdbpz16aLOPSZvZFkP+Mv4bSmZl1pEZQkx0HNupyrHykJrghB1wZD I4sJbLgIS9FGBP6TlcCfrDkUH583nfhFEpw3gKSq0YOE9lwtNAEGLkAKaDw4unLNFJkF t+i+cmn1JEI3kF3J0C6wpzZbpP9G78KPsebPgy8cXHpOK/Ae4vjS8el8eviRoOjnqSZU C2R0E7m93U71C6fhmWJuCDl42rLZUgdn44SYp87UBwd9vGLGjcUOfknublgEDpaLAoka 0CqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JJvDcKB+irciVNEp45KezxHQB9+EBk1lUpZONrN6ZFg=; b=jdPMt9nbOW3oppgJdV2Iutu04wZSN4POqhhc8v10egG3Hwi8Ko9Rsl6Ll03WEtLUp/ EyEY2NmiKMxsDrUTa+lUfxWOjjRaFj7wdrDJfI1so0x1kxSzaKLhfA9FLoTR3Q+gyNkg lpUe71GJYnFHOJrQYwOfkacBSjY7zjwXvUmLbRkBCcwkX9FhrzlmAfe3P83byVv8cgAW 1sPrkyWDICPqkyJ3EmMe2je33b8I4X/WZB49OtfmvQteem49V97mNUcKWSLDZqQtl098 Ok7IwlKup/EGl4QOyBfGQmnKC1/e/XvtAxgZrfhYE/2y/dNEgXbazffkG8Juawf8R6gx 2i2Q== X-Gm-Message-State: AIkVDXK8w4541/ngb1/bkTaGrVVzvyIi/hEkUQQwg1BAm/tBiEHlOHfa6m9hiVbGEHVpzw== X-Received: by 10.99.158.18 with SMTP id s18mr31603275pgd.88.1482552045431; Fri, 23 Dec 2016 20:00:45 -0800 (PST) Received: from bigtime.domain ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id n25sm65339316pfi.33.2016.12.23.20.00.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2016 20:00:44 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 23 Dec 2016 19:59:39 -0800 Message-Id: <20161224040042.12654-3-rth@twiddle.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161224040042.12654-1-rth@twiddle.net> References: <20161224040042.12654-1-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH 02/65] tcg: Minor adjustments to deposit expanders X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" Assert that len is not 0. Since we have asserted that ofs + len <= N, a later check for len == N implies that ofs == 0. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/tcg-op.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index c185b9c..b17f03f 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -533,10 +533,11 @@ void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2, TCGv_i32 t1; tcg_debug_assert(ofs < 32); + tcg_debug_assert(len > 0); tcg_debug_assert(len <= 32); tcg_debug_assert(ofs + len <= 32); - if (ofs == 0 && len == 32) { + if (len == 32) { tcg_gen_mov_i32(ret, arg2); return; } @@ -1718,10 +1719,11 @@ void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2, TCGv_i64 t1; tcg_debug_assert(ofs < 64); + tcg_debug_assert(len > 0); tcg_debug_assert(len <= 64); tcg_debug_assert(ofs + len <= 64); - if (ofs == 0 && len == 64) { + if (len == 64) { tcg_gen_mov_i64(ret, arg2); return; }