From patchwork Wed Dec 13 13:26:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 24914 Received: (qmail 19653 invoked by alias); 13 Dec 2017 13:27:11 -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 19622 invoked by uid 89); 13 Dec 2017 13:27:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 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, SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:sk:mail-pl, Hx-spam-relays-external:sk:mail-pl, HX-HELO:sk:mail-pl, H*RU:sk:mail-pl X-HELO: mail-pl0-f52.google.com Received: from mail-pl0-f52.google.com (HELO mail-pl0-f52.google.com) (209.85.160.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 13 Dec 2017 13:27:09 +0000 Received: by mail-pl0-f52.google.com with SMTP id z5so991230plo.10 for ; Wed, 13 Dec 2017 05:27:09 -0800 (PST) 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; bh=16AQAs2mKZ+TBMmmn4fLLGYnWfMCr99zJlGAZaF0t7I=; b=PFV7Lu8yqnoHFpnjzDBViNRh7dSdMZcKcu1/BdDe+xDX68la86ATmxHpoPrc0hc+Y9 nhBTcsorkq1GjPOZixwW2KgxxOhAwMohrFeRUzwiAPtGPIpCyVZkUkPCwiuIG6/n9BGx QAYTpdXgZXBWR0CYh23WfSZT8LE5Vdaffw0QnGDlWcA7CWSNVJhSWaviRLl0P7u3Yk4n W1I8jKcz+2u9yKk58C14yZyFwe+W3ZfVy/SAi8+vgkSxjpyfK4e603f2GWt3KH1O5+rc pXJjSJKJ+BDPRKikB+RhMWhwNT0Z7n3suIR1upAn9pTiENkwfm430iUnHJbPlkzwHrpZ 8M8A== X-Gm-Message-State: AKGB3mJXFwBaKZpzzNhkbF+h7o5DpkYNjULGPkSpVZQNgvnp1MHHCRPF vT4GAzPtTxyl90x0z8AYdrSM1phU X-Google-Smtp-Source: ACJfBotDf/1PElcsGDf0gRa2YobU6pHZuh+o5iDKoNQ+Yc6Gf2y2V3dN1m1Tt04BPY3OaX5/A1zbtw== X-Received: by 10.159.245.145 with SMTP id a17mr5979427pls.276.1513171627702; Wed, 13 Dec 2017 05:27:07 -0800 (PST) Received: from localhost (g122.61-45-82.ppp.wakwak.ne.jp. [61.45.82.122]) by smtp.gmail.com with ESMTPSA id f3sm3272423pgt.15.2017.12.13.05.27.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Dec 2017 05:27:07 -0800 (PST) From: Stafford Horne To: GDB patches Cc: Stafford Horne Subject: [PATCH] gdb: Fix ARI warnings in or1k-tdep.c Date: Wed, 13 Dec 2017 22:26:54 +0900 Message-Id: <20171213132654.19739-1-shorne@gmail.com> X-IsSubscribed: yes Fix a few issues not using the gettext _() wrapper and issues where we are using %p directly instead of the dedicated host/target functions. gdb/ChangeLog: yyyy-mm-dd Stafford Horne * or1k-tdep.c (or1k_analyse_inst): Use _() wrapper for message strings. (or1k_unwind_pc): Use paddress() instead of %p. (or1k_unwind_sp ): Likewise. (or1k_frame_cache): Use host_address_to_string()/paddress() instead of %p and use _() wrapper for message strings. --- gdb/or1k-tdep.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c index 54b365e958..06ee53e83c 100644 --- a/gdb/or1k-tdep.c +++ b/gdb/or1k-tdep.c @@ -132,7 +132,7 @@ or1k_analyse_inst (uint32_t inst, const char *format, ...) /* Check we got something, and if so skip on. */ if (start_ptr == end_ptr) - error ("bitstring \"%s\" at offset %d has no length field.\n", + error (_("bitstring \"%s\" at offset %d has no length field."), format, i); i += end_ptr - start_ptr; @@ -141,7 +141,7 @@ or1k_analyse_inst (uint32_t inst, const char *format, ...) still give a fatal error, because these are fixed strings that just should not be wrong. */ if ('b' != format[i++]) - error ("bitstring \"%s\" at offset %d has no terminating 'b'.\n", + error (_("bitstring \"%s\" at offset %d has no terminating 'b'."), format, i); /* Break out the field. There is a special case with a bit width @@ -158,7 +158,7 @@ or1k_analyse_inst (uint32_t inst, const char *format, ...) break; default: - error ("invalid character in bitstring \"%s\" at offset %d.\n", + error (_("invalid character in bitstring \"%s\" at offset %d."), format, i); break; } @@ -541,8 +541,8 @@ or1k_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) pc = frame_unwind_register_unsigned (next_frame, OR1K_NPC_REGNUM); if (or1k_debug) - fprintf_unfiltered (gdb_stdlog, "or1k_unwind_pc, pc=0x%p\n", - (void *) pc); + fprintf_unfiltered (gdb_stdlog, "or1k_unwind_pc, pc=%s\n", + paddress (gdbarch, pc)); return pc; } @@ -561,8 +561,8 @@ or1k_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) sp = frame_unwind_register_unsigned (next_frame, OR1K_SP_REGNUM); if (or1k_debug) - fprintf_unfiltered (gdb_stdlog, "or1k_unwind_sp, sp=0x%p\n", - (void *) sp); + fprintf_unfiltered (gdb_stdlog, "or1k_unwind_sp, sp=%s\n", + paddress (gdbarch, sp)); return sp; } @@ -882,8 +882,8 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache) if (or1k_debug) fprintf_unfiltered (gdb_stdlog, - "or1k_frame_cache, prologue_cache = 0x%p\n", - *prologue_cache); + "or1k_frame_cache, prologue_cache = %s\n", + host_address_to_string (*prologue_cache)); /* Nothing to do if we already have this info. */ if (NULL != *prologue_cache) @@ -942,7 +942,7 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache) have executed the code. Check we have a sane prologue size, and if zero we are frameless and can give up here. */ if (end_addr < start_addr) - error ("end addr 0x%08x is less than start addr 0x%08x\n", + error (_("end addr 0x%08x is less than start addr 0x%08x"), (unsigned int) end_addr, (unsigned int) start_addr); if (end_addr == start_addr) @@ -1068,10 +1068,10 @@ or1k_frame_cache (struct frame_info *this_frame, void **prologue_cache) if (or1k_debug) { - fprintf_unfiltered (gdb_stdlog, " this_sp_for_id = 0x%p\n", - (void *) this_sp_for_id); - fprintf_unfiltered (gdb_stdlog, " start_addr = 0x%p\n", - (void *) start_addr); + fprintf_unfiltered (gdb_stdlog, " this_sp_for_id = %s\n", + paddress (gdbarch, this_sp_for_id)); + fprintf_unfiltered (gdb_stdlog, " start_addr = %s\n", + paddress (gdbarch, start_addr)); } return info;