From patchwork Thu Jan 21 12:00:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 10500 Received: (qmail 94850 invoked by alias); 21 Jan 2016 12:00:34 -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 94833 invoked by uid 89); 21 Jan 2016 12:00:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=xfree, Small, Hx-languages-length:1744 X-HELO: mail-wm0-f45.google.com Received: from mail-wm0-f45.google.com (HELO mail-wm0-f45.google.com) (74.125.82.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 21 Jan 2016 12:00:27 +0000 Received: by mail-wm0-f45.google.com with SMTP id n5so76851079wmn.0 for ; Thu, 21 Jan 2016 04:00:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/hMBZy1s8AZUiZin20IhOmMlI5lcHp1grixbqllezg0=; b=Zc1em6qgj+zAiopsKay7O+nZXHKRnWKRJJlAlu7Y3L0ARsMVPTkWblqOas5gH1bxsI 4Ls8VzeLf1LlpQjMhMrSdQa45B+zyxOr8q66MMJKPC75d54h6gjijquSEvCahrMnF4IQ ohCuNACvduXT98Guwndysjya50pMRlLcC5HPj23Jw0rKccf8v+8E+Ka+b201jFNzCbCV d0etJceI4rVecv66Uqb5yPdP96O0X9aI/faNZ5TQEqG7FSCK1+ma+NqLh+8xobcOIRAe pZrMH4CMZSTaMhm4MeADBCJ1hfizSZhoEkoXIJcWM50ieBdc0tCAPRSjNwceu0/mYsiC 7qUA== X-Gm-Message-State: ALoCoQnKb0LnaMs7jFG4hQ2Z5B1GekHEWJPSfz/W6PsABbvMAZ+61/Z/nk3G/VDapIanHOPA6oHF8C60NFg3VZoz61qY/wQcdg== X-Received: by 10.195.18.100 with SMTP id gl4mr40161555wjd.177.1453377624519; Thu, 21 Jan 2016 04:00:24 -0800 (PST) Received: from localhost (TK158115.telekabel.at. [195.34.158.115]) by smtp.gmail.com with ESMTPSA id u69sm2623185wmu.20.2016.01.21.04.00.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jan 2016 04:00:23 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH][PUSHED/OBV] gdb: Small cleanup to disasm.c:maybe_add_dis_line_entry Date: Thu, 21 Jan 2016 13:00:16 +0100 Message-Id: <4a099de2e7e5374d633ba0eab4273b6f5c81ba74.1453377545.git.andrew.burgess@embecosm.com> X-IsSubscribed: yes Give the function a better name (drop "maybe_") and update the header comment. gdb/ChangeLog: * disasm.c (maybe_add_dis_line_entry): Rename to... (add_dis_line_entry): ...this, and update header comment. (do_mixed_source_and_assembly): Now use add_dis_line_entry. --- gdb/ChangeLog | 6 ++++++ gdb/disasm.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 68d10ad..45d8ef9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-01-21 Andrew Burgess + + * disasm.c (maybe_add_dis_line_entry): Rename to... + (add_dis_line_entry): ...this, and update header comment. + (do_mixed_source_and_assembly): Now use add_dis_line_entry. + 2016-01-21 Pedro Alves * Makefile.in (COMPILER_CFLAGS): New. diff --git a/gdb/disasm.c b/gdb/disasm.c index 9405928..1cf0901 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -86,11 +86,10 @@ allocate_dis_line_table (void) xfree, xcalloc, xfree); } -/* Add DLE to TABLE. - Returns 1 if added, 0 if already present. */ +/* Add a new dis_line_entry containing SYMTAB and LINE to TABLE. */ static void -maybe_add_dis_line_entry (htab_t table, struct symtab *symtab, int line) +add_dis_line_entry (htab_t table, struct symtab *symtab, int line) { void **slot; struct dis_line_entry dle, *dlep; @@ -552,7 +551,7 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, struct ui_out *uiout, pc += length; if (sal.symtab != NULL) - maybe_add_dis_line_entry (dis_line_table, sal.symtab, sal.line); + add_dis_line_entry (dis_line_table, sal.symtab, sal.line); } /* Second pass: print the disassembly.