From patchwork Mon Jul 10 13:55:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 21505 Received: (qmail 37747 invoked by alias); 10 Jul 2017 13:56:17 -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 33421 invoked by uid 89); 10 Jul 2017 13:56:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-27.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-it0-f50.google.com Received: from mail-it0-f50.google.com (HELO mail-it0-f50.google.com) (209.85.214.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 10 Jul 2017 13:56:02 +0000 Received: by mail-it0-f50.google.com with SMTP id m84so39476050ita.0 for ; Mon, 10 Jul 2017 06:56:02 -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=e80undVnDdAlO1KeHGZBVcAbWhuKQCpF6uAiOiNqcC0=; b=e8DjIKi5thCqYXdRkuoXTDjsKONmcyZkFUtlCsWalaYssg8X+QHqqmIOK8t8Q+oeug Z4AbM0jziIJwoUgyis8BwOwyQRKha9K0+/YYfzhLAqN1G89iyPtx7SvROAtwqrkBw4Hf phu1wxpfBf0Pj1dFjA7lvBV797Q8tLuPFjQSwNwz4xLKJrmD9/F7mRp0390m8d+TddNB sYEfnxNWIOPjwPo1JOu+O1SG+3PJFZ4wJhMv05/lyftqECTMtbLOinkFcgT7KOfnB8gN GyiJz8I84keBy9ZM4usvhW4Dn/Uv8m8ryPxtpWq8uSQ/IN0aQbdWoLFjY8kQmE0/p2EA XwxQ== X-Gm-Message-State: AIVw113AqBmIWm9lxs+QHJRmqupir3U+XN8+4zSOZFoyNjVl1UVY2XD6 F53ocuC3TiRKq0Aq X-Received: by 10.36.51.132 with SMTP id k126mr2328503itk.77.1499694960771; Mon, 10 Jul 2017 06:56:00 -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 v96sm5973996ioi.50.2017.07.10.06.55.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jul 2017 06:56:00 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 14/26] [GDBserver] unit test to i386_tdesc Date: Mon, 10 Jul 2017 14:55:28 +0100 Message-Id: <1499694940-23564-15-git-send-email-yao.qi@linaro.org> In-Reply-To: <1499694940-23564-1-git-send-email-yao.qi@linaro.org> References: <1499694940-23564-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 these pre-generated ones. gdb/gdbserver: 2017-07-07 Yao Qi * linux-x86-tdesc.c: Include selftest.h. (i386_tdesc_test): New function. (initialize_low_tdesc): Call register_self_test. * tdesc.h: Include regdef.h. (target_desc): Override operator == and !=. gdb: 2017-07-07 Yao Qi * regformats/regdef.h (struct reg): Override operator == and !=. --- gdb/gdbserver/linux-x86-tdesc.c | 37 ++++++++++++++++++++++++++++++++++++ gdb/gdbserver/tdesc.h | 42 ++++++++++++++++++++++++++++++++++++++++- gdb/regformats/regdef.h | 12 ++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c index 0d0be83..65ab0e3 100644 --- a/gdb/gdbserver/linux-x86-tdesc.c +++ b/gdb/gdbserver/linux-x86-tdesc.c @@ -63,6 +63,39 @@ extern const struct target_desc *tdesc_i386_mpx_linux; static struct target_desc *i386_tdescs[X86_TDESC_LAST] = { }; +#if defined GDB_SELF_TEST && !defined IN_PROCESS_AGENT +#include "selftest.h" + +namespace selftests { +namespace tdesc { +static void +i386_tdesc_test () +{ + struct + { + unsigned int mask; + const target_desc *tdesc; + } tdesc_tests[] = { + { X86_XSTATE_X87, tdesc_i386_mmx_linux }, + { X86_XSTATE_SSE_MASK, tdesc_i386_linux }, + { X86_XSTATE_AVX_MASK, tdesc_i386_avx_linux }, + { X86_XSTATE_MPX_MASK, tdesc_i386_mpx_linux }, + { X86_XSTATE_AVX_MPX_MASK, tdesc_i386_avx_mpx_linux }, + { X86_XSTATE_AVX_AVX512_MASK, tdesc_i386_avx_avx512_linux }, + { X86_XSTATE_AVX_MPX_AVX512_PKU_MASK, tdesc_i386_avx_mpx_avx512_pku_linux } + }; + + for (auto &elem : tdesc_tests) + { + const target_desc *tdesc = i386_linux_read_description (elem.mask); + + SELF_CHECK (*tdesc == *elem.tdesc); + } +} +} +} // namespace selftests +#endif /* GDB_SELF_TEST */ + void initialize_low_tdesc () { @@ -74,6 +107,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 && !defined IN_PROCESS_AGENT + register_self_test (selftests::tdesc::i386_tdesc_test); +#endif #endif } diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h index 50d0364..49c82c6 100644 --- a/gdb/gdbserver/tdesc.h +++ b/gdb/gdbserver/tdesc.h @@ -21,7 +21,7 @@ #include "arch/tdesc.h" -struct reg; +#include "regdef.h" typedef struct reg *tdesc_reg_p; DEF_VEC_P(tdesc_reg_p); @@ -66,6 +66,46 @@ 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 false; + + 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 false; + } + + /* Compare expedite_regs. */ + int i = 0; + for (; expedite_regs[i] != NULL; i++) + { + if (strcmp (expedite_regs[i], other.expedite_regs[i]) != 0) + return false; + } + if (other.expedite_regs[i] != NULL) + return false; + + if (strcmp (xmltarget, other.xmltarget) != 0) + return false; + + return true; + } + + 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 */