From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,T_DKIMWL_WL_HIGH shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 87D541F403 for ; Fri, 15 Jun 2018 14:30:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965762AbeFOOak (ORCPT ); Fri, 15 Jun 2018 10:30:40 -0400 Received: from mail-eopbgr710137.outbound.protection.outlook.com ([40.107.71.137]:6417 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965737AbeFOOah (ORCPT ); Fri, 15 Jun 2018 10:30:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KZGARI9D1996vrLXVnXKZTG9KvaneGgFuPN8fFmbnyQ=; b=miIbh3lQ7Qy0oWfdwGMoK5qCCJkk+z/+knJCUHCrPGZHXm4KBw3tNf5/52X63Is+EfNdFkALwm9mvqdGNHHYgFoYGyMqyW+0N55Ayy5N2VOSZEG0Cn+qfgwqC5p+ZphUZ0HEks8I30XzTkYARKHQQmFVFSf70+xsPRhBzZn43Go= Received: from BL0PR2101MB1011.namprd21.prod.outlook.com (52.132.24.10) by BL0PR2101MB1011.namprd21.prod.outlook.com (52.132.24.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.9; Fri, 15 Jun 2018 14:30:36 +0000 Received: from BL0PR2101MB1011.namprd21.prod.outlook.com ([fe80::d1f2:1d69:2567:e0a9]) by BL0PR2101MB1011.namprd21.prod.outlook.com ([fe80::d1f2:1d69:2567:e0a9%2]) with mapi id 15.20.0884.004; Fri, 15 Jun 2018 14:30:35 +0000 From: Derrick Stolee To: "git@vger.kernel.org" CC: "ramsay@ramsayjones.plus.com" , "peff@peff.next" , Derrick Stolee Subject: [PATCH 4/8] ewah_bitmap: delete unused 'ewah_and_not()' Thread-Topic: [PATCH 4/8] ewah_bitmap: delete unused 'ewah_and_not()' Thread-Index: AQHUBLVsKVWDcRQNuEKhTf99CUELYQ== Date: Fri, 15 Jun 2018 14:30:35 +0000 Message-ID: <20180615143018.170686-5-dstolee@microsoft.com> References: <20180615143018.170686-1-dstolee@microsoft.com> In-Reply-To: <20180615143018.170686-1-dstolee@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BN6PR08CA0062.namprd08.prod.outlook.com (2603:10b6:404:b9::24) To BL0PR2101MB1011.namprd21.prod.outlook.com (2603:10b6:207:37::10) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [2001:4898:8010:0:eb4a:5dff:fe0f:730f] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BL0PR2101MB1011;7:y6gSp3OoIo4sDxuSfygWQrCQ6G6L5WrVfeOx+nTtGrdsLlP0KNHXHb6xPcpyR6b2FSrxf3NXulmdHX0x7plPhx6MaFYCj2AW49fWMxo4PgeHJvBzKl1FLMgZ7lvg8LRuS2AMfZFFGwodvXWoUwLlDh+X3i9rJXQPVSyZUJVIjaCYAL0ceLjGOf7IbvvZ15NMy9h6eK2HfnycD/9v5G9sZaV9ByZWpoytt5VUx0ftbK9wQQopE+yLWJxreOWuSCRO x-ms-office365-filtering-correlation-id: 77c6c3f2-fc07-4ed0-7cfc-08d5d2cc8eaf x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7193020);SRVR:BL0PR2101MB1011; x-ms-traffictypediagnostic: BL0PR2101MB1011: authentication-results: spf=none (sender IP is ) smtp.mailfrom=dstolee@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231254)(2018427008)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011)(7699016);SRVR:BL0PR2101MB1011;BCL:0;PCL:0;RULEID:;SRVR:BL0PR2101MB1011; x-forefront-prvs: 0704670F76 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(376002)(39380400002)(396003)(366004)(199004)(189003)(305945005)(3660700001)(446003)(386003)(68736007)(76176011)(52116002)(6486002)(54906003)(476003)(8936002)(6436002)(53936002)(3280700002)(316002)(22452003)(5660300001)(5640700003)(102836004)(2616005)(2351001)(25786009)(2906002)(99286004)(8676002)(1730700003)(46003)(86362001)(81156014)(11346002)(81166006)(6512007)(86612001)(6506007)(107886003)(97736004)(1076002)(105586002)(6916009)(4326008)(486006)(36756003)(10290500003)(478600001)(106356001)(186003)(6116002)(5250100002)(14454004)(7736002)(2501003)(2900100001)(10090500001)(22906009);DIR:OUT;SFP:1102;SCL:1;SRVR:BL0PR2101MB1011;H:BL0PR2101MB1011.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: +p0P/LmUdcRxTbGzJQsUJ4997KKvwCdV2Hh0SZIgflAdYg2zD/i0emGMLIcnmvP4wp9uf6dE2uSBjT1co1FzhUjyqS31GAIuehTJV6dBmI32OLSVH/xpOdlVA1ZqGAksD0eRfWHCaV6PnB46TQrUObK7uaPuqya/T77GH/6/atZIN/POTQKqqQ1gTrlb/uXw spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77c6c3f2-fc07-4ed0-7cfc-08d5d2cc8eaf X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jun 2018 14:30:35.7774 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB1011 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Reported-by: Ramsay Jones Signed-off-by: Derrick Stolee --- ewah/ewah_bitmap.c | 73 ---------------------------------------------- ewah/ewok.h | 5 ---- 2 files changed, 78 deletions(-) diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c index 5a4d3a6eb6..559adde37c 100644 --- a/ewah/ewah_bitmap.c +++ b/ewah/ewah_bitmap.c @@ -459,79 +459,6 @@ void ewah_xor( out->bit_size =3D max_size(ewah_i->bit_size, ewah_j->bit_size); } =20 -void ewah_and_not( - struct ewah_bitmap *ewah_i, - struct ewah_bitmap *ewah_j, - struct ewah_bitmap *out) -{ - struct rlw_iterator rlw_i; - struct rlw_iterator rlw_j; - size_t literals; - - rlwit_init(&rlw_i, ewah_i); - rlwit_init(&rlw_j, ewah_j); - - while (rlwit_word_size(&rlw_i) > 0 && rlwit_word_size(&rlw_j) > 0) { - while (rlw_i.rlw.running_len > 0 || rlw_j.rlw.running_len > 0) { - struct rlw_iterator *prey, *predator; - - if (rlw_i.rlw.running_len < rlw_j.rlw.running_len) { - prey =3D &rlw_i; - predator =3D &rlw_j; - } else { - prey =3D &rlw_j; - predator =3D &rlw_i; - } - - if ((predator->rlw.running_bit && prey =3D=3D &rlw_i) || - (!predator->rlw.running_bit && prey !=3D &rlw_i)) { - ewah_add_empty_words(out, 0, - predator->rlw.running_len); - rlwit_discard_first_words(prey, - predator->rlw.running_len); - rlwit_discard_first_words(predator, - predator->rlw.running_len); - } else { - size_t index; - int negate_words; - - negate_words =3D (&rlw_i !=3D prey); - index =3D rlwit_discharge(prey, out, - predator->rlw.running_len, negate_words); - ewah_add_empty_words(out, negate_words, - predator->rlw.running_len - index); - rlwit_discard_first_words(predator, - predator->rlw.running_len); - } - } - - literals =3D min_size( - rlw_i.rlw.literal_words, - rlw_j.rlw.literal_words); - - if (literals) { - size_t k; - - for (k =3D 0; k < literals; ++k) { - ewah_add(out, - rlw_i.buffer[rlw_i.literal_word_start + k] & - ~(rlw_j.buffer[rlw_j.literal_word_start + k]) - ); - } - - rlwit_discard_first_words(&rlw_i, literals); - rlwit_discard_first_words(&rlw_j, literals); - } - } - - if (rlwit_word_size(&rlw_i) > 0) - rlwit_discharge(&rlw_i, out, ~0, 0); - else - rlwit_discharge_empty(&rlw_j, out); - - out->bit_size =3D max_size(ewah_i->bit_size, ewah_j->bit_size); -} - void ewah_or( struct ewah_bitmap *ewah_i, struct ewah_bitmap *ewah_j, diff --git a/ewah/ewok.h b/ewah/ewok.h index 5841c83507..21c420770e 100644 --- a/ewah/ewok.h +++ b/ewah/ewok.h @@ -169,11 +169,6 @@ void ewah_or( struct ewah_bitmap *ewah_j, struct ewah_bitmap *out); =20 -void ewah_and_not( - struct ewah_bitmap *ewah_i, - struct ewah_bitmap *ewah_j, - struct ewah_bitmap *out); - void ewah_xor( struct ewah_bitmap *ewah_i, struct ewah_bitmap *ewah_j, --=20 2.18.0.rc1