From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.51.202]) by sourceware.org (Postfix) with ESMTPS id 24426396AC04 for ; Sat, 20 Feb 2021 20:16:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 24426396AC04 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway24.websitewelcome.com (Postfix) with ESMTP id B6111D778 for ; Sat, 20 Feb 2021 14:16:52 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYgOlzWORiQiZDYgOlHHAc; Sat, 20 Feb 2021 14:16:52 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=PaYt4zI7nzAwoJ1wDQhXu4UJUBYzep1EpirnjtcxzXs=; b=dy+0oWtb+DdyO6J07ML2/4kUoq OSYmhnCR1cD7Amj1swzLdS9luqqIXqD+OX3lxq8oVJxu4Vr8wzKp1FIwvrn4RdkbXba/GdS77QZI8 5F4oYuRcHttGoNZKT+7vpDDtm; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52708 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lDYgO-000Gtl-Hu for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:52 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 185/206] Convert m2-exp.y to use operations Date: Sat, 20 Feb 2021 13:15:48 -0700 Message-Id: <20210220201609.838264-186-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.70.152 X-Source-L: No X-Exim-ID: 1lDYgO-000Gtl-Hu X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52708 X-Source-Auth: tom+tromey.com X-Email-Count: 186 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3032.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, 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: Sat, 20 Feb 2021 20:17:14 -0000 This converts the Modula-2 parser to generate operations rather than exp_elements. gdb/ChangeLog 2021-02-20 Tom Tromey * m2-exp.y: Create operations. (m2_language::parser): Update. --- gdb/ChangeLog | 5 ++ gdb/m2-exp.y | 234 ++++++++++++++++++++++++-------------------------- 2 files changed, 117 insertions(+), 122 deletions(-) diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y index 68bae48feb6..273270a85ce 100644 --- a/gdb/m2-exp.y +++ b/gdb/m2-exp.y @@ -47,6 +47,7 @@ #include "symfile.h" /* Required by objfiles.h. */ #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */ #include "block.h" +#include "m2-exp.h" #define parse_type(ps) builtin_type (ps->gdbarch ()) #define parse_m2_type(ps) builtin_m2_type (ps->gdbarch ()) @@ -72,6 +73,7 @@ static int parse_number (int); /* The sign of the number being parsed. */ static int number_sign = 1; +using namespace expr; %} /* Although the yacc "value" of an expression is not used, @@ -153,31 +155,28 @@ start : exp ; type_exp: type - { write_exp_elt_opcode (pstate, OP_TYPE); - write_exp_elt_type (pstate, $1); - write_exp_elt_opcode (pstate, OP_TYPE); - } + { pstate->push_new ($1); } ; /* Expressions */ exp : exp '^' %prec UNARY - { write_exp_elt_opcode (pstate, UNOP_IND); } + { pstate->wrap (); } ; exp : '-' { number_sign = -1; } exp %prec UNARY { number_sign = 1; - write_exp_elt_opcode (pstate, UNOP_NEG); } + pstate->wrap (); } ; exp : '+' exp %prec UNARY - { write_exp_elt_opcode (pstate, UNOP_PLUS); } + { pstate->wrap (); } ; exp : not_exp exp %prec UNARY - { write_exp_elt_opcode (pstate, UNOP_LOGICAL_NOT); } + { pstate->wrap (); } ; not_exp : NOT @@ -185,91 +184,90 @@ not_exp : NOT ; exp : CAP '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_CAP); } + { error (_("CAP function is not implemented")); } ; exp : ORD '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_ORD); } + { error (_("ORD function is not implemented")); } ; exp : ABS '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_ABS); } + { error (_("ABS function is not implemented")); } ; exp : HIGH '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_HIGH); } + { pstate->wrap (); } ; exp : MIN_FUNC '(' type ')' - { write_exp_elt_opcode (pstate, UNOP_MIN); - write_exp_elt_type (pstate, $3); - write_exp_elt_opcode (pstate, UNOP_MIN); } + { error (_("MIN function is not implemented")); } ; exp : MAX_FUNC '(' type ')' - { write_exp_elt_opcode (pstate, UNOP_MAX); - write_exp_elt_type (pstate, $3); - write_exp_elt_opcode (pstate, UNOP_MAX); } + { error (_("MAX function is not implemented")); } ; exp : FLOAT_FUNC '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_FLOAT); } + { error (_("FLOAT function is not implemented")); } ; exp : VAL '(' type ',' exp ')' - { write_exp_elt_opcode (pstate, BINOP_VAL); - write_exp_elt_type (pstate, $3); - write_exp_elt_opcode (pstate, BINOP_VAL); } + { error (_("VAL function is not implemented")); } ; exp : CHR '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_CHR); } + { error (_("CHR function is not implemented")); } ; exp : ODD '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_ODD); } + { error (_("ODD function is not implemented")); } ; exp : TRUNC '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_TRUNC); } + { error (_("TRUNC function is not implemented")); } ; exp : TSIZE '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_SIZEOF); } + { pstate->wrap (); } ; exp : SIZE exp %prec UNARY - { write_exp_elt_opcode (pstate, UNOP_SIZEOF); } + { pstate->wrap (); } ; exp : INC '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_PREINCREMENT); } + { pstate->wrap (); } ; exp : INC '(' exp ',' exp ')' - { write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY); - write_exp_elt_opcode (pstate, BINOP_ADD); - write_exp_elt_opcode (pstate, - BINOP_ASSIGN_MODIFY); } + { + operation_up rhs = pstate->pop (); + operation_up lhs = pstate->pop (); + pstate->push_new + (BINOP_ADD, std::move (lhs), std::move (rhs)); + } ; exp : DEC '(' exp ')' - { write_exp_elt_opcode (pstate, UNOP_PREDECREMENT);} + { pstate->wrap (); } ; exp : DEC '(' exp ',' exp ')' - { write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY); - write_exp_elt_opcode (pstate, BINOP_SUB); - write_exp_elt_opcode (pstate, - BINOP_ASSIGN_MODIFY); } + { + operation_up rhs = pstate->pop (); + operation_up lhs = pstate->pop (); + pstate->push_new + (BINOP_SUB, std::move (lhs), std::move (rhs)); + } ; exp : exp DOT NAME - { write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); - write_exp_string (pstate, $3); - write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); } - ; + { + pstate->push_new + (pstate->pop (), copy_name ($3)); + } +; exp : set ; @@ -302,10 +300,10 @@ exp : exp '[' non_empty_arglist ']' %prec DOT { gdb_assert (pstate->arglist_len > 0); - write_exp_elt_opcode (pstate, MULTI_SUBSCRIPT); - write_exp_elt_longcst (pstate, - pstate->end_arglist()); - write_exp_elt_opcode (pstate, MULTI_SUBSCRIPT); + std::vector args + = pstate->pop_vector (pstate->end_arglist ()); + pstate->push_new + (pstate->pop (), std::move (args)); } ; @@ -314,10 +312,12 @@ exp : exp '(' being accumulated by an outer function call. */ { pstate->start_arglist (); } arglist ')' %prec DOT - { write_exp_elt_opcode (pstate, OP_FUNCALL); - write_exp_elt_longcst (pstate, - pstate->end_arglist ()); - write_exp_elt_opcode (pstate, OP_FUNCALL); } + { + std::vector args + = pstate->pop_vector (pstate->end_arglist ()); + pstate->push_new + (pstate->pop (), std::move (args)); + } ; arglist : @@ -343,15 +343,17 @@ non_empty_arglist /* GDB construct */ exp : '{' type '}' exp %prec UNARY - { write_exp_elt_opcode (pstate, UNOP_MEMVAL); - write_exp_elt_type (pstate, $2); - write_exp_elt_opcode (pstate, UNOP_MEMVAL); } + { + pstate->push_new + (pstate->pop (), $2); + } ; exp : type '(' exp ')' %prec UNARY - { write_exp_elt_opcode (pstate, UNOP_CAST); - write_exp_elt_type (pstate, $1); - write_exp_elt_opcode (pstate, UNOP_CAST); } + { + pstate->push_new + (pstate->pop (), $1); + } ; exp : '(' exp ')' @@ -363,140 +365,127 @@ exp : '(' exp ')' /* GDB construct */ exp : exp '@' exp - { write_exp_elt_opcode (pstate, BINOP_REPEAT); } + { pstate->wrap2 (); } ; exp : exp '*' exp - { write_exp_elt_opcode (pstate, BINOP_MUL); } + { pstate->wrap2 (); } ; exp : exp '/' exp - { write_exp_elt_opcode (pstate, BINOP_DIV); } + { pstate->wrap2 (); } ; exp : exp DIV exp - { write_exp_elt_opcode (pstate, BINOP_INTDIV); } + { pstate->wrap2 (); } ; exp : exp MOD exp - { write_exp_elt_opcode (pstate, BINOP_REM); } + { pstate->wrap2 (); } ; exp : exp '+' exp - { write_exp_elt_opcode (pstate, BINOP_ADD); } + { pstate->wrap2 (); } ; exp : exp '-' exp - { write_exp_elt_opcode (pstate, BINOP_SUB); } + { pstate->wrap2 (); } ; exp : exp '=' exp - { write_exp_elt_opcode (pstate, BINOP_EQUAL); } + { pstate->wrap2 (); } ; exp : exp NOTEQUAL exp - { write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); } + { pstate->wrap2 (); } | exp '#' exp - { write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); } + { pstate->wrap2 (); } ; exp : exp LEQ exp - { write_exp_elt_opcode (pstate, BINOP_LEQ); } + { pstate->wrap2 (); } ; exp : exp GEQ exp - { write_exp_elt_opcode (pstate, BINOP_GEQ); } + { pstate->wrap2 (); } ; exp : exp '<' exp - { write_exp_elt_opcode (pstate, BINOP_LESS); } + { pstate->wrap2 (); } ; exp : exp '>' exp - { write_exp_elt_opcode (pstate, BINOP_GTR); } + { pstate->wrap2 (); } ; exp : exp LOGICAL_AND exp - { write_exp_elt_opcode (pstate, BINOP_LOGICAL_AND); } + { pstate->wrap2 (); } ; exp : exp OROR exp - { write_exp_elt_opcode (pstate, BINOP_LOGICAL_OR); } + { pstate->wrap2 (); } ; exp : exp ASSIGN exp - { write_exp_elt_opcode (pstate, BINOP_ASSIGN); } + { pstate->wrap2 (); } ; /* Constants */ exp : M2_TRUE - { write_exp_elt_opcode (pstate, OP_BOOL); - write_exp_elt_longcst (pstate, (LONGEST) $1); - write_exp_elt_opcode (pstate, OP_BOOL); } + { pstate->push_new ($1); } ; exp : M2_FALSE - { write_exp_elt_opcode (pstate, OP_BOOL); - write_exp_elt_longcst (pstate, (LONGEST) $1); - write_exp_elt_opcode (pstate, OP_BOOL); } + { pstate->push_new ($1); } ; exp : INT - { write_exp_elt_opcode (pstate, OP_LONG); - write_exp_elt_type (pstate, - parse_m2_type (pstate)->builtin_int); - write_exp_elt_longcst (pstate, (LONGEST) $1); - write_exp_elt_opcode (pstate, OP_LONG); } + { + pstate->push_new + (parse_m2_type (pstate)->builtin_int, $1); + } ; exp : UINT { - write_exp_elt_opcode (pstate, OP_LONG); - write_exp_elt_type (pstate, - parse_m2_type (pstate) - ->builtin_card); - write_exp_elt_longcst (pstate, (LONGEST) $1); - write_exp_elt_opcode (pstate, OP_LONG); + pstate->push_new + (parse_m2_type (pstate)->builtin_card, $1); } ; exp : CHAR - { write_exp_elt_opcode (pstate, OP_LONG); - write_exp_elt_type (pstate, - parse_m2_type (pstate) - ->builtin_char); - write_exp_elt_longcst (pstate, (LONGEST) $1); - write_exp_elt_opcode (pstate, OP_LONG); } + { + pstate->push_new + (parse_m2_type (pstate)->builtin_char, $1); + } ; exp : FLOAT - { write_exp_elt_opcode (pstate, OP_FLOAT); - write_exp_elt_type (pstate, - parse_m2_type (pstate) - ->builtin_real); - write_exp_elt_floatcst (pstate, $1); - write_exp_elt_opcode (pstate, OP_FLOAT); } + { + float_data data; + std::copy (std::begin ($1), std::end ($1), + std::begin (data)); + pstate->push_new + (parse_m2_type (pstate)->builtin_real, data); + } ; exp : variable ; exp : SIZE '(' type ')' %prec UNARY - { write_exp_elt_opcode (pstate, OP_LONG); - write_exp_elt_type (pstate, - parse_type (pstate)->builtin_int); - write_exp_elt_longcst (pstate, - (LONGEST) TYPE_LENGTH ($3)); - write_exp_elt_opcode (pstate, OP_LONG); } + { + pstate->push_new + (parse_m2_type (pstate)->builtin_int, + TYPE_LENGTH ($3)); + } ; exp : STRING - { write_exp_elt_opcode (pstate, OP_M2_STRING); - write_exp_string (pstate, $1); - write_exp_elt_opcode (pstate, OP_M2_STRING); } + { error (_("strings are not implemented")); } ; /* This will be used for extensions later. Like adding modules. */ @@ -527,15 +516,15 @@ fblock : block COLONCOLON BLOCKNAME /* Useful for assigning to PROCEDURE variables */ variable: fblock - { write_exp_elt_opcode (pstate, OP_VAR_VALUE); - write_exp_elt_block (pstate, NULL); - write_exp_elt_sym (pstate, $1); - write_exp_elt_opcode (pstate, OP_VAR_VALUE); } + { + pstate->push_new + ($1, nullptr); + } ; /* GDB internal ($foo) variable */ variable: DOLLAR_VARIABLE - { write_dollar_variable (pstate, $1); } + { pstate->push_dollar ($1); } ; /* GDB scope operator */ @@ -550,10 +539,9 @@ variable: block COLONCOLON NAME if (symbol_read_needs_frame (sym.symbol)) pstate->block_tracker->update (sym); - write_exp_elt_opcode (pstate, OP_VAR_VALUE); - write_exp_elt_block (pstate, sym.block); - write_exp_elt_sym (pstate, sym.symbol); - write_exp_elt_opcode (pstate, OP_VAR_VALUE); } + pstate->push_new + (sym.symbol, sym.block); + } ; /* Base case for variables. */ @@ -568,8 +556,7 @@ variable: NAME VAR_DOMAIN, &is_a_field_of_this); - write_exp_symbol_reference (pstate, name.c_str (), - sym); + pstate->push_symbol (name.c_str (), sym); } ; @@ -1015,7 +1002,10 @@ m2_language::parser (struct parser_state *par_state) const pstate = par_state; paren_depth = 0; - return yyparse (); + int result = yyparse (); + if (!result) + pstate->set_operation (pstate->pop ()); + return result; } static void -- 2.26.2