From patchwork Mon Jun 12 08:41:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 20927 Received: (qmail 71433 invoked by alias); 12 Jun 2017 08:42:22 -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 71018 invoked by uid 89); 12 Jun 2017 08:42:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:sk:static. X-HELO: mail-it0-f48.google.com Received: from mail-it0-f48.google.com (HELO mail-it0-f48.google.com) (209.85.214.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 12 Jun 2017 08:42:13 +0000 Received: by mail-it0-f48.google.com with SMTP id m47so17653256iti.0 for ; Mon, 12 Jun 2017 01:42:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=2g0D2ZqsU+kCQce01zuJ1hlDrd2u1CkYW1Z3FilXAbM=; b=LxVbsw31MpiN/WRXfQSnlqUs72Ps5qIDzbu/Nn98ukWo5KMYIUdpjAzzg94B9FX6rg IIWw89+ML4aDEIVNKMx7c1gwrf9RIAuGCDma0iCF9e53NaAuNa+XC7QArfSzhzIWW6vm pN3OiHUMsoNHVKqhkaO9j1YfrMLoPl15BPpGGJ9NKd+ewxwj5C8YCNEKGwWElRVPfz6O Xn2aYUHfVuVtCYT4yjvAnlBQ+rqxX8vmSJ37hhwasn8oYcMXoyL954T+s5sGu4hMU1CQ 6cazcvlNriMVIp0Cdf4h6q57TXyffFuttbFpaH2551v4Nh+qw19pMZOpJH3h8PYbdkoX jboQ== X-Gm-Message-State: AODbwcBtSAwxYU+d4B/EOWMH5UXhrHC1amnqIC+tdq2G6jQd/bP+D9nS ItIxTMCVnT9usnm1 X-Received: by 10.36.51.82 with SMTP id k79mr11114282itk.32.1497256936006; Mon, 12 Jun 2017 01:42:16 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (static.42.136.251.148.clients.your-server.de. [148.251.136.42]) by smtp.gmail.com with ESMTPSA id u4sm5280289itu.1.2017.06.12.01.42.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Jun 2017 01:42:15 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 15/25] [RFC] GDBserver unit test to i386_tdesc Date: Mon, 12 Jun 2017 09:41:46 +0100 Message-Id: <1497256916-4958-16-git-send-email-yao.qi@linaro.org> In-Reply-To: <1497256916-4958-1-git-send-email-yao.qi@linaro.org> References: <1497256916-4958-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes This patch adds a unit test in GDBserver to test dynamically created target descriptions equal to these pre-generated ones. gdb/gdbserver: 2017-06-06 Yao Qi * linux-x86-tdesc.c (i386_tdesc_test): New function. (initialize_low_tdesc): Call register_self_test. * tdesc.h: TODO. --- gdb/gdbserver/linux-x86-tdesc.c | 45 +++++++++++++++++++++++++++++++++++++++++ gdb/gdbserver/tdesc.h | 42 +++++++++++++++++++++++++++++++++++++- gdb/regformats/regdef.h | 12 +++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c index f247a3c..06e5bf9 100644 --- a/gdb/gdbserver/linux-x86-tdesc.c +++ b/gdb/gdbserver/linux-x86-tdesc.c @@ -61,6 +61,47 @@ extern const struct target_desc *tdesc_i386_mpx_linux; static const struct target_desc *i386_tdescs[X86_TDESC_LAST] = { }; +#if defined GDB_SELF_TEST && !defined IN_PROCESS_AGENT +#include "selftest.h" + +namespace selftests { +namespace gdbserver { +static void +i386_tdesc_test () +{ + const struct target_desc *tdesc = i386_get_ipa_tdesc (X86_TDESC_MMX); + + SELF_CHECK (*tdesc == *tdesc_i386_mmx_linux); + delete tdesc; + + tdesc = i386_get_ipa_tdesc (X86_TDESC_SSE); + SELF_CHECK (*tdesc == *tdesc_i386_linux); + delete tdesc; + + tdesc = i386_get_ipa_tdesc (X86_TDESC_AVX); + SELF_CHECK (*tdesc == *tdesc_i386_avx_linux); + delete tdesc; + + tdesc = i386_get_ipa_tdesc (X86_TDESC_MPX); + SELF_CHECK (*tdesc == *tdesc_i386_mpx_linux); + delete tdesc; + + tdesc = i386_get_ipa_tdesc (X86_TDESC_AVX_MPX); + SELF_CHECK (*tdesc == *tdesc_i386_avx_mpx_linux); + delete tdesc; + + tdesc = i386_get_ipa_tdesc (X86_TDESC_AVX_AVX512); + SELF_CHECK (*tdesc == *tdesc_i386_avx_avx512_linux); + delete tdesc; + + tdesc = i386_get_ipa_tdesc (X86_TDESC_AVX_MPX_AVX512_PKU); + SELF_CHECK (*tdesc == *tdesc_i386_avx_mpx_avx512_pku_linux); + delete tdesc; +} +} +} // namespace selftests +#endif /* GDB_SELF_TEST */ + void initialize_low_tdesc () { @@ -72,6 +113,10 @@ initialize_low_tdesc () init_registers_i386_avx_mpx_linux (); init_registers_i386_avx_avx512_linux (); init_registers_i386_avx_mpx_avx512_pku_linux (); + +#if GDB_SELF_TEST + register_self_test (selftests::gdbserver::i386_tdesc_test); +#endif #endif } diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h index 2d4cbfa..e64f0b3 100644 --- a/gdb/gdbserver/tdesc.h +++ b/gdb/gdbserver/tdesc.h @@ -19,7 +19,8 @@ #ifndef TDESC_H #define TDESC_H -struct reg; +#include "regdef.h" +#include typedef struct reg *tdesc_reg_p; DEF_VEC_P(tdesc_reg_p); @@ -60,6 +61,45 @@ public: xfree (reg); VEC_free (tdesc_reg_p, reg_defs); } + bool operator!= (const target_desc &other) const + { + if (VEC_length (tdesc_reg_p, reg_defs) + != VEC_length (tdesc_reg_p, other.reg_defs)) + return true; + + struct reg *reg; + + for (int ix = 0; + VEC_iterate (tdesc_reg_p, reg_defs, ix, reg); + ix++) + { + struct reg *reg2 + = VEC_index (tdesc_reg_p, other.reg_defs, ix); + + if (reg != reg2 && *reg != *reg2) + return true; + } + + /* Compare expedite_regs. */ + int i = 0; + for (; expedite_regs[i] != NULL; i++) + { + if (strcmp (expedite_regs[i], other.expedite_regs[i]) != 0) + return true; + } + if (other.expedite_regs[i] != NULL) + return true; + + if (strcmp (xmltarget, other.xmltarget) != 0) + return true; + + return false; + } + + bool operator== (const target_desc &other) const + { + return !(*this != other); + } #endif }; diff --git a/gdb/regformats/regdef.h b/gdb/regformats/regdef.h index de7a010..ff1d40b 100644 --- a/gdb/regformats/regdef.h +++ b/gdb/regformats/regdef.h @@ -34,6 +34,18 @@ struct reg /* The size (in bits) of the value of this register, as transmitted. */ int size; + + bool operator== (const reg &other) const + { + return (strcmp (name, other.name) == 0 + && offset == other.offset + && size == other.size); + } + + bool operator!= (const reg &other) const + { + return !(*this == other); + } }; #endif /* REGDEF_H */