From patchwork Sun Mar 26 13:29:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 19731 Received: (qmail 129947 invoked by alias); 26 Mar 2017 13:29:54 -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 129896 invoked by uid 89); 26 Mar 2017 13:29:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=classification, moduletype, watch X-HELO: mail-vk0-f46.google.com Received: from mail-vk0-f46.google.com (HELO mail-vk0-f46.google.com) (209.85.213.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 26 Mar 2017 13:29:50 +0000 Received: by mail-vk0-f46.google.com with SMTP id s68so27786826vke.3 for ; Sun, 26 Mar 2017 06:29:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=92DiPLcQ9kOSxL3UiOrpLAFt0BpDWBtXNobqGNqzmuo=; b=i4+Ncp4IX+V5O4fNsQ5O5ou0p8/q6zMQfgu0odztT0002oxv44qz87rsui/6bo5YY+ Ur37nWRxgTQpHwp8BDAwNl9nFo4BCUuJmfeU02HC5MUrU80cewGrUzpjhP2DmKMYEpX9 /QTlxB9e/dLNA0c52VL6w8tCnUF7kIVL+usMPbdXEw4wGXJuXcJxuWkwwNwqHQCPfN9Z lv+ccsvM4p2D2GkgwawZeXY5KRMdQuHMnVbJwrgkyIGLCBsrjNLcwWGuDLfcJgJUHX/E cRL3tO3LSd4XQyPm0z3mbm21H8Dv4HtW+lPN6wwsE5uW7kvxV+22LaBTPFHqZcwV3ZwG 2JSw== X-Gm-Message-State: AFeK/H1p7UHp6JwyjVJQcBzMY7gnZpiO+w41IoJZmdtSzLwkuB+FEVeEzt4Fwk7K3ff153MX4JwLIfZaYfpwyw== X-Received: by 10.31.148.71 with SMTP id w68mr6467563vkd.87.1490534989682; Sun, 26 Mar 2017 06:29:49 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.41.81 with HTTP; Sun, 26 Mar 2017 06:29:48 -0700 (PDT) In-Reply-To: <86h92tmhdr.fsf@gmail.com> References: <86h92tmhdr.fsf@gmail.com> From: Iain Buclaw Date: Sun, 26 Mar 2017 15:29:48 +0200 Message-ID: Subject: Re: [PING] [PATCH] D: Fix classification of module.type in lexer To: Yao Qi Cc: GDB Patches X-IsSubscribed: yes On 16 March 2017 at 15:21, Yao Qi wrote: > Iain Buclaw writes: > >> + subprogram { >> + {name "D main"} >> + {linkage_name "_Dmain"} >> + {external 1 flag_present} >> + {low_pc dmain_start addr} >> + {high_pc dmain_end addr} > > Can you use MACRO_AT_func so that you don't need "dmain_start" and > "dmain_end" in gdb.dlang/watch-loc.c. > Yes, I can, thanks. Iain. --- diff --git a/gdb/d-exp.y b/gdb/d-exp.y index b526575..8625e41 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -648,6 +648,7 @@ type_aggregate_p (struct type *type) { return (TYPE_CODE (type) == TYPE_CODE_STRUCT || TYPE_CODE (type) == TYPE_CODE_UNION + || TYPE_CODE (type) == TYPE_CODE_MODULE || (TYPE_CODE (type) == TYPE_CODE_ENUM && TYPE_DECLARED_CLASS (type))); } diff --git a/gdb/testsuite/gdb.dlang/watch-loc.c b/gdb/testsuite/gdb.dlang/watch-loc.c new file mode 100644 index 0000000..0ffc377 --- /dev/null +++ b/gdb/testsuite/gdb.dlang/watch-loc.c @@ -0,0 +1,36 @@ +/* Copyright 2017 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + + +/* DWARF will describe these contents as being inside a D module. */ + +typedef struct tstruct +{ +} tstruct; + +tstruct my_data; + +int _Dmain (void) +{ + asm ("_Dmain_label: .globl _Dmain_label"); + return 0; +} + +int +main (void) +{ + return _Dmain (); +} + diff --git a/gdb/testsuite/gdb.dlang/watch-loc.exp b/gdb/testsuite/gdb.dlang/watch-loc.exp new file mode 100644 index 0000000..5130d6a --- /dev/null +++ b/gdb/testsuite/gdb.dlang/watch-loc.exp @@ -0,0 +1,83 @@ +# Copyright (C) 2017 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test symbol lookup when there are multiple circular imports. + +load_lib "d-support.exp" +load_lib "dwarf.exp" + +if { [skip_d_tests] } { return -1 } + +# This test can only be run on targets which support DWARF-2 and use gas. +if {![dwarf2_support]} { + return 0 +} + +standard_testfile watch-loc.c watch-loc-dw.S + +# Make some DWARF for the test. +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcdir subdir srcfile + + cu {} { + compile_unit { + {language @DW_LANG_D} + } { + declare_labels watch_module_label watch_struct_label + + watch_module_label: module { + {name watch} + } { + watch_struct_label: structure_type { + {name tstruct} + {byte_size 1 data1} + } + + tag_variable { + {name my_data} + {type :$watch_struct_label} + {location { + addr [gdb_target_symbol my_data] + } SPECIAL_expr} + {external 1 flag} + } + + subprogram { + {MACRO_AT_func { "_Dmain" "${srcdir}/${subdir}/${srcfile}" }} + {external 1 flag_present} + } + } + } + } +} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}] } { + return -1 +} + +gdb_test_no_output "set language d" + +if {![runto "_Dmain"]} { + return -1 +} + +# watch -l will rewrite the expression to "*(watch.tstruct *) 0x12345", +# this should not cause syntax error in the cast expression. +gdb_test "watch -l my_data" ".*atchpoint \[0-9\]+: -location my_data" + +# Same test as above, but done explicitly. +gdb_test "print *(watch.tstruct *) &my_data" "{}"