From patchwork Thu Nov 17 19:36:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 17553 Received: (qmail 91019 invoked by alias); 17 Nov 2016 19:36:12 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 90289 invoked by uid 89); 17 Nov 2016 19:36:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=1string, 2.3.0 X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0b-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 17 Nov 2016 19:36:10 +0000 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uAHJYOax135040 for ; Thu, 17 Nov 2016 14:36:09 -0500 Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110]) by mx0b-001b2d01.pphosted.com with ESMTP id 26sh1j5bj5-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 17 Nov 2016 14:36:08 -0500 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Nov 2016 19:36:07 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 17 Nov 2016 19:36:05 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 646C22190056 for ; Thu, 17 Nov 2016 19:35:18 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id uAHJa5JU28835844 for ; Thu, 17 Nov 2016 19:36:05 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id uAHJa4UD025835 for ; Thu, 17 Nov 2016 12:36:05 -0700 Received: from oc1027705133.ibm.com (dyn-9-152-212-182.boeblingen.de.ibm.com [9.152.212.182]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id uAHJa0J4025763 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 17 Nov 2016 12:36:04 -0700 From: Andreas Arnez To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: [PATCH 2/3] Fix copy_bitwise() References: <1479135786-31150-1-git-send-email-arnez@linux.vnet.ibm.com> <1479135786-31150-3-git-send-email-arnez@linux.vnet.ibm.com> <6032efa2-828d-7423-4720-6925a9b4ea4b@redhat.com> Date: Thu, 17 Nov 2016 20:36:00 +0100 In-Reply-To: <6032efa2-828d-7423-4720-6925a9b4ea4b@redhat.com> (Pedro Alves's message of "Tue, 15 Nov 2016 19:42:34 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16111719-0016-0000-0000-00000266C96E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16111719-0017-0000-0000-000023D84DA6 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-11-17_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1611170338 X-IsSubscribed: yes On Tue, Nov 15 2016, Pedro Alves wrote: > Looks like the sort of function that should be possible to > cover all sorts of inputs/outputs with unit tests. Aligned, misaligned, > big/little endian, etc., that sort of thing. That'd help > a lot with ensuring rewrites behave as intended. Would you feel like > including some? Sure. See the patch below, which I'd insert after the one that fixes copy_bitwise. With that added, is the series OK to apply? --- Andreas -- >8 -- Subject: [PATCH] Add unit test for copy_bitwise This adds a unit test for the copy_bitwise function in dwarf2loc.c. With the old (broken) version of copy_bitwise this test would generate the following failure message: (gdb) maintenance selftest Self test failed: copy_bitwise 1101110111010110 != 1101110110010110 (0+9 -> 1) Ran 3 unit tests, 1 failed gdb/ChangeLog: * dwarf2loc.c (bits_to_str, check_copy_bitwise) (copy_bitwise_tests): New functions. (_initialize_dwarf2loc): Register the new function copy_bitwise_tests as a unit test. * selftest.c (run_self_tests): Improve the failure message's wording and formatting. --- gdb/dwarf2loc.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gdb/selftest.c | 3 +- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index b238133..b0cab4b 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -38,6 +38,7 @@ #include "dwarf2loc.h" #include "dwarf2-frame.h" #include "compile/compile.h" +#include "selftest.h" #include #include @@ -1567,6 +1568,86 @@ copy_bitwise (gdb_byte *dest, ULONGEST dest_offset, } } +#if GDB_SELF_TEST + +/* Helper function for the unit test of copy_bitwise. Convert NBITS bits + out of BITS, starting at OFFS, to the respective '0'/'1'-string. MSB0 + specifies whether to assume big endian bit numbering. Store the + resulting (not null-terminated) string at STR. */ + +static void +bits_to_str (char *str, const gdb_byte *bits, ULONGEST offs, + ULONGEST nbits, int msb0) +{ + unsigned int j; + size_t i; + + for (i = offs / 8, j = offs % 8; nbits; i++, j = 0) + { + unsigned int ch = bits[i]; + for (; j < 8 && nbits; j++, nbits--) + *str++ = (ch & (msb0 ? (1 << (7 - j)) : (1 << j))) ? '1' : '0'; + } +} + +/* Check one invocation of copy_bitwise with the given parameters. */ + +static void +check_copy_bitwise (const gdb_byte *dest, unsigned int dest_offset, + const gdb_byte *source, unsigned int source_offset, + unsigned int nbits, int msb0) +{ + size_t len = (dest_offset + nbits + 7) / 8 * 8; + char *a = (char *) alloca (len + 1); + char *b = (char *) alloca (len + 1); + gdb_byte *buf = (gdb_byte *) alloca (len / 8); + + bits_to_str (a, dest, 0, len, msb0); + bits_to_str (a + dest_offset, source, source_offset, nbits, msb0); + + memcpy (buf, dest, len / 8); + copy_bitwise (buf, dest_offset, source, source_offset, nbits, msb0); + bits_to_str (b, buf, 0, len, msb0); + + a[len] = b[len] = '\0'; + if (strcmp (a, b)) + error (_("copy_bitwise %s != %s (%u+%u -> %u)"), + a, b, source_offset, nbits, dest_offset); +} + +/* Unit test for copy_bitwise. */ + +static void +copy_bitwise_tests (void) +{ + static const gdb_byte data1[] = + { 0xdd, 0x85, 0x51, 0x93, 0xb3, 0xc0, 0x62, 0xd4, + 0xa6, 0x4b, 0x0a, 0xde, 0x36, 0x35, 0x1a, 0x66 }; + + static const gdb_byte data2[] = + { 0x47, 0x6a, 0x65, 0x61, 0xab, 0xed, 0xb6, 0xa9, + 0xbf, 0x67, 0xb2, 0xeb, 0x86, 0x45, 0xfe, 0x09 }; + + enum { max_nbits = 24, max_offs = 8 }; + unsigned int from_offs, nbits, to_offs; + int msb0; + + for (msb0 = 0; msb0 < 2; msb0++) + { + for (from_offs = 0; from_offs <= max_offs; from_offs++) + { + for (nbits = 1; nbits < max_nbits; nbits++) + { + for (to_offs = 0; to_offs <= max_offs; to_offs++) + check_copy_bitwise (data2, to_offs, data1, from_offs, + nbits, msb0); + } + } + } +} + +#endif /* GDB_SELF_TEST */ + static void read_pieced_value (struct value *v) { @@ -4527,4 +4608,8 @@ _initialize_dwarf2loc (void) NULL, show_entry_values_debug, &setdebuglist, &showdebuglist); + +#if GDB_SELF_TEST + register_self_test (copy_bitwise_tests); +#endif } diff --git a/gdb/selftest.c b/gdb/selftest.c index 110b9e5..f771e57 100644 --- a/gdb/selftest.c +++ b/gdb/selftest.c @@ -50,8 +50,7 @@ run_self_tests (void) CATCH (ex, RETURN_MASK_ERROR) { ++failed; - exception_fprintf (gdb_stderr, ex, - _("Self test threw exception")); + exception_fprintf (gdb_stderr, ex, _("Self test failed: ")); } END_CATCH }