From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 2A3DE388F057 for ; Tue, 2 Jun 2020 13:32:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2A3DE388F057 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x42c.google.com with SMTP id x14so3463510wrp.2 for ; Tue, 02 Jun 2020 06:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rCv+RxLuCeCEfcnH6Oagr4ZyWYLYCFOpKs3ggpT5cRw=; b=An5HuvAJgceoSUkGFCVFhE3wtjlLgubyqkdY+QYNB5PWmWtOhK++v96qNqhBklAORK JQY7tsrmDBY1VB5vPkD2c5j5EVkNW2UKyyZQa1YsznNELSDsO2IStQryHEYaRazxGUdz pOkphkedirPlWAEAcmokbuKWcZsqVoM25w8PmnPeKC278EUp1QwMpil5Tz2PYI1BQQHc srETf+Li+InEX7Lh+aIU+ArGwoBacPIBD7iR528Vz+Hb+0CGqiRKvOPYcBeNbR4g3Axd XHLpsULQQByyjXMJY6YmEbl+GaW6X1I5SNYyrrsxPpQyHrDkPV5xUKLmsDPCB0EA6Ve/ jJKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rCv+RxLuCeCEfcnH6Oagr4ZyWYLYCFOpKs3ggpT5cRw=; b=qLZSA2GP80yiuaNjEGadZgDwgr/M1hdwecrsu9dwIppM43qnABHtIvRWDTFt9xI7S1 YO4Au/bdEOCOq82r5HbIHDarMnTbERUEal5BwfnZ9pN9MDqhUI0FqjvDfG2zWf9jULZ0 jyQPkXK+y74N5VqVqgKDuyaXeVXYNA59+UtuU0gIg+GLg+xDvKiZXWsBFTdfDGRn/lup xJKASAyIZ6U0g56BST5vc5kGWIoooo7TXvbsHQqwQS5QPiQF82W2rzBeQDU5G+T5bS6X PJJ/6ywisMmGXjMG9LIt5PSkXqL/36aXrwqZWw8HXTIJzG21SBhTqZXREnlaFlYLREOY C6Kg== X-Gm-Message-State: AOAM532zBuu/lq9M5i4xnqVBoW/2tgtiYIwh+EGoQuzsWoOnZ0eOf8ei uadK/XlyoofPG74KJuT12d9IoHYv5N0= X-Google-Smtp-Source: ABdhPJxAJ6Sr85Zre+j7u52X4qaVHlWfit8cgKXtf5ow6j8gosVU5xYLp1py6qlE9uXxDFlaPPcZWA== X-Received: by 2002:adf:9c12:: with SMTP id f18mr10437869wrc.105.1591104766364; Tue, 02 Jun 2020 06:32:46 -0700 (PDT) Received: from localhost (host86-128-12-16.range86-128.btcentralplus.com. [86.128.12.16]) by smtp.gmail.com with ESMTPSA id b8sm3852946wrm.35.2020.06.02.06.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 06:32:45 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH 8/9] gdb: Convert language la_value_print_inner field to a method Date: Tue, 2 Jun 2020 14:32:26 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_STOCKGEN, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 13:32:50 -0000 This commit changes the language_data::la_value_print_inner function pointer member variable into a member function of language_defn. There should be no user visible changes after this commit. gdb/ChangeLog: * ada-lang.c (ada_language_data): Delete la_value_print_inner initializer. (ada_language::value_print_inner): New member function. * c-lang.c (c_language_data): Delete la_value_print_inner initializer. (cplus_language_data): Likewise. (asm_language_data): Likewise. (minimal_language_data): Likewise. * d-lang.c (d_language_data): Likewise. (d_language::value_print_inner): New member function. * f-lang.c (f_language_data): Delete la_value_print_inner initializer. (f_language::value_print_inner): New member function. * f-lang.h (f_value_print_innner): Rename to... (f_value_print_inner): ...this (note spelling of 'inner'). * f-valprint.c (f_value_print_innner): Rename to... (f_value_print_inner): ...this (note spelling of 'inner'). * go-lang.c (go_language_data): Delete la_value_print_inner initializer. (go_language::value_print_inner): New member function. * language.c (language_defn::value_print_inner): Define new member function. (unk_lang_value_print_inner): Delete. (unknown_language_data): Delete la_value_print_inner initializer. (unknown_language::value_print_inner): New member function. (auto_language_data): Delete la_value_print_inner initializer. (auto_language::value_print_inner): New member function. * language.h (language_data): Delete la_value_print_inner field. (language_defn::value_print_inner): Delcare new member function. * m2-lang.c (m2_language_data): Delete la_value_print_inner initializer. (m2_language::value_print_inner): New member function. * objc-lang.c (objc_language_data): Delete la_value_print_inner initializer. * opencl-lang.c (opencl_language_data): Likewise. * p-lang.c (pascal_language_data): Likewise. (pascal_language::value_print_inner): New member function. * rust-lang.c (rust_language_data): Delete la_value_print_inner initializer. (rust_language::value_print_inner): New member function. * valprint.c (do_val_print): Update call to value_print_inner. --- gdb/ChangeLog | 44 ++++++++++++++++++++++++++++++++++++++++++++ gdb/ada-lang.c | 10 +++++++++- gdb/c-lang.c | 4 ---- gdb/d-lang.c | 10 +++++++++- gdb/f-lang.c | 11 ++++++++++- gdb/f-lang.h | 2 +- gdb/f-valprint.c | 2 +- gdb/go-lang.c | 10 +++++++++- gdb/language.c | 39 ++++++++++++++++++++++++++++----------- gdb/language.h | 13 ++++++------- gdb/m2-lang.c | 10 +++++++++- gdb/objc-lang.c | 1 - gdb/opencl-lang.c | 1 - gdb/p-lang.c | 10 +++++++++- gdb/rust-lang.c | 10 +++++++++- gdb/valprint.c | 2 +- 16 files changed, 145 insertions(+), 34 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index af08f023aca..90a444b6064 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13775,7 +13775,6 @@ extern const struct language_data ada_language_data = ada_printstr, /* Function to print string constant */ emit_char, /* Function to print single char (not used) */ ada_print_typedef, /* Print a typedef using appropriate syntax */ - ada_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ ada_lookup_symbol_nonlocal, /* Looking up non-local symbols. */ @@ -14119,6 +14118,15 @@ class ada_language : public language_defn return ada_value_print (val, stream, options); } + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return ada_value_print_inner (val, stream, recurse, options); + } + protected: /* See language.h. */ diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 9096e7b15eb..3ba9c7dffce 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -895,7 +895,6 @@ extern const struct language_data c_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -1005,7 +1004,6 @@ extern const struct language_data cplus_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ "this", /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ cp_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -1203,7 +1201,6 @@ extern const struct language_data asm_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -1268,7 +1265,6 @@ extern const struct language_data minimal_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ diff --git a/gdb/d-lang.c b/gdb/d-lang.c index 553b38de81e..dff9d470bc9 100644 --- a/gdb/d-lang.c +++ b/gdb/d-lang.c @@ -149,7 +149,6 @@ extern const struct language_data d_language_data = c_emit_char, /* Print a single char. */ c_print_typedef, /* Print a typedef using appropriate syntax. */ - d_value_print_inner, /* la_value_print_inner */ "this", false, /* la_store_sym_names_in_linkage_form_p */ d_lookup_symbol_nonlocal, @@ -257,6 +256,15 @@ class d_language : public language_defn { c_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return d_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the D language class. */ diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 3e2c97c0619..d5b2bf286da 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -570,7 +570,6 @@ extern const struct language_data f_language_data = f_printstr, /* function to print string constant */ f_emit_char, /* Function to print a single character */ f_print_typedef, /* Print a typedef using appropriate syntax */ - f_value_print_innner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ cp_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -697,6 +696,16 @@ class f_language : public language_defn code); } + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return f_value_print_inner (val, stream, recurse, options); + } + + protected: /* See language.h. */ diff --git a/gdb/f-lang.h b/gdb/f-lang.h index 84a63a8a410..4710b14aa62 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -38,7 +38,7 @@ extern void f_print_type (struct type *, const char *, struct ui_file *, int, /* Implement la_value_print_inner for Fortran. */ -extern void f_value_print_innner (struct value *val, struct ui_file *stream, +extern void f_value_print_inner (struct value *val, struct ui_file *stream, int recurse, const struct value_print_options *options); diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index bd16a4348d3..387d8c19d5b 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -211,7 +211,7 @@ static const struct generic_val_print_decorations f_decorations = /* See f-lang.h. */ void -f_value_print_innner (struct value *val, struct ui_file *stream, int recurse, +f_value_print_inner (struct value *val, struct ui_file *stream, int recurse, const struct value_print_options *options) { struct type *type = check_typedef (value_type (val)); diff --git a/gdb/go-lang.c b/gdb/go-lang.c index e38156d7096..fabe1309314 100644 --- a/gdb/go-lang.c +++ b/gdb/go-lang.c @@ -534,7 +534,6 @@ extern const struct language_data go_language_data = c_emit_char, /* Print a single char. */ c_print_typedef, /* Print a typedef using appropriate syntax. */ - go_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, @@ -631,6 +630,15 @@ class go_language : public language_defn { go_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return go_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the Go language class. */ diff --git a/gdb/language.c b/gdb/language.c index 5b47a4956ed..d93b4756707 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -641,6 +641,16 @@ language_defn::value_print (struct value *val, struct ui_file *stream, return c_value_print (val, stream, options); } +/* See language.h. */ + +void +language_defn::value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const +{ + return c_value_print_inner (val, stream, recurse, options); +} + /* The default implementation of the get_symbol_name_matcher_inner method from the language_defn class. Matches with strncmp_iw. */ @@ -739,15 +749,6 @@ unk_lang_printstr (struct ui_file *stream, struct type *type, "function unk_lang_printstr called.")); } -static void -unk_lang_value_print_inner (struct value *val, - struct ui_file *stream, int recurse, - const struct value_print_options *options) -{ - error (_("internal error - unimplemented " - "function unk_lang_value_print_inner called.")); -} - static const struct op_print unk_op_print_tab[] = { {NULL, OP_NULL, PREC_NULL, 0} @@ -782,7 +783,6 @@ extern const struct language_data unknown_language_data = unk_lang_printstr, unk_lang_emit_char, default_print_typedef, /* Print a typedef using appropriate syntax */ - unk_lang_value_print_inner, /* la_value_print_inner */ "this", /* name_of_this */ true, /* store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -834,6 +834,15 @@ class unknown_language : public language_defn { error (_("unimplemented unknown_language::value_print called")); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + error (_("unimplemented unknown_language::value_print_inner called")); + } }; /* Single instance of the unknown language class. */ @@ -859,7 +868,6 @@ extern const struct language_data auto_language_data = unk_lang_printstr, unk_lang_emit_char, default_print_typedef, /* Print a typedef using appropriate syntax */ - unk_lang_value_print_inner, /* la_value_print_inner */ "this", /* name_of_this */ false, /* store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -911,6 +919,15 @@ class auto_language : public language_defn { error (_("unimplemented auto_language::value_print called")); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + error (_("unimplemented auto_language::value_print_inner called")); + } }; /* Single instance of the fake "auto" language. */ diff --git a/gdb/language.h b/gdb/language.h index 4b27c010b0e..06978d7067f 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -258,13 +258,6 @@ struct language_data void (*la_print_typedef) (struct type *type, struct symbol *new_symbol, struct ui_file *stream); - /* Print a value using syntax appropriate for this language. - RECURSE is the recursion depth. It is zero-based. */ - - void (*la_value_print_inner) (struct value *, struct ui_file *, - int recurse, - const struct value_print_options *); - /* Now come some hooks for lookup_symbol. */ /* If this is non-NULL, specifies the name that of the implicit @@ -542,6 +535,12 @@ struct language_defn : language_data virtual void value_print (struct value *val, struct ui_file *stream, const struct value_print_options *options) const; + /* Print a value using syntax appropriate for this language. RECURSE is + the recursion depth. It is zero-based. */ + virtual void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const; + protected: /* This is the overridable part of the GET_SYMBOL_NAME_MATCHER method. diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index 9bb4af18b29..cc565fc5610 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -368,7 +368,6 @@ extern const struct language_data m2_language_data = m2_printstr, /* function to print string constant */ m2_emit_char, /* Function to print a single character */ m2_print_typedef, /* Print a typedef using appropriate syntax */ - m2_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -423,6 +422,15 @@ class m2_language : public language_defn { m2_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return m2_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the M2 language. */ diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index aa9d1a9312c..387c6ba7e11 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -343,7 +343,6 @@ extern const struct language_data objc_language_data = c_printstr, /* Function to print string constant */ c_emit_char, c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ "self", /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index 1b7553dde6e..5cb98390009 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -1022,7 +1022,6 @@ extern const struct language_data opencl_language_data = c_printstr, /* Function to print string constant */ c_emit_char, /* Print a single char */ c_print_typedef, /* Print a typedef using appropriate syntax */ - c_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ diff --git a/gdb/p-lang.c b/gdb/p-lang.c index d7ddb7b9069..db8d81b0bf6 100644 --- a/gdb/p-lang.c +++ b/gdb/p-lang.c @@ -399,7 +399,6 @@ extern const struct language_data pascal_language_data = pascal_printstr, /* Function to print string constant */ pascal_emit_char, /* Print a single char */ pascal_print_typedef, /* Print a typedef using appropriate syntax */ - pascal_value_print_inner, /* la_value_print_inner */ "this", /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -485,6 +484,15 @@ class pascal_language : public language_defn { return pascal_value_print (val, stream, options); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return pascal_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the Pascal language class. */ diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 7b03c3898d2..92ff1bdfdfe 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -2040,7 +2040,6 @@ extern const struct language_data rust_language_data = rust_printstr, /* Function to print string constant */ rust_emitchar, /* Print a single char */ rust_print_typedef, /* Print a typedef using appropriate syntax */ - rust_value_print_inner, /* la_value_print_inner */ NULL, /* name_of_this */ false, /* la_store_sym_names_in_linkage_form_p */ rust_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ @@ -2139,6 +2138,15 @@ class rust_language : public language_defn (xstrprintf ("*(%s as *mut %s)", core_addr_to_string (addr), name.c_str ())); } + + /* See language.h. */ + + void value_print_inner + (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) const override + { + return rust_value_print_inner (val, stream, recurse, options); + } }; /* Single instance of the Rust language class. */ diff --git a/gdb/valprint.c b/gdb/valprint.c index d678ad3091a..fd053d623cd 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -984,7 +984,7 @@ do_val_print (struct value *value, struct ui_file *stream, int recurse, try { - language->la_value_print_inner (value, stream, recurse, &local_opts); + language->value_print_inner (value, stream, recurse, &local_opts); } catch (const gdb_exception_error &except) { -- 2.25.4