From patchwork Thu Jan 12 09:42:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 18860 Received: (qmail 103904 invoked by alias); 12 Jan 2017 09:43:41 -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 103882 invoked by uid 89); 12 Jan 2017 09:43:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.9 required=5.0 tests=AWL, BAYES_50, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=H*r:AES128-SHA, UD:disassemble_info.memory_error_func, UD:memory_error_func, sk:print_a X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-wj0-f194.google.com Received: from mail-wj0-f194.google.com (HELO mail-wj0-f194.google.com) (209.85.210.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Jan 2017 09:43:30 +0000 Received: by mail-wj0-f194.google.com with SMTP id kp2so1256114wjc.0; Thu, 12 Jan 2017 01:43:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=uupXuyOzGzCsL4jOh6FlOHy+Oi3iU88kIWsOhMx9elY=; b=p5gt+W9TMLMYRIYYdwVc4J1Qh0U3nuwzLWtsL7VwDSBHU/qdaqtr9hm+bLKM7YjGy6 nFhfoFiE69Msh1qUvj2YGlnYZyRqzlRTb9BKbB8iR1v+r5FZ/K6l1G7z3jjguoHwD0rV XXwrFtzzGVx2nCNhge2y0ulWS+GMVJFGtspfl8TPfuiLMpA0lBIKQjoJfeMsF9H5uim5 XpCpyLgAxEOM0E/XJai2UdfJkC4905QoOaFq83p0wqbCjEdnnQzN+Otwl9/XEptEd/+q GrziQktGHaHj68qnXwyc90vEAcikueB57QhIVCws1J7435pBgDQPZoQENoJed7UsoGS8 rXZg== X-Gm-Message-State: AIkVDXK0ATmpLOPsDwaXAt3iZhsvIJ9cTmpyW/SwszkgkpfRbg1VN98qNS1Z1o0yeuXmCg== X-Received: by 10.194.31.227 with SMTP id d3mr7961423wji.203.1484214208144; Thu, 12 Jan 2017 01:43:28 -0800 (PST) Received: from E107787-LIN (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id s20sm2238385wmb.9.2017.01.12.01.43.25 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 12 Jan 2017 01:43:27 -0800 (PST) Date: Thu, 12 Jan 2017 09:42:56 +0000 From: Yao Qi To: Alan Modra Cc: binutils@sourceware.org, gdb-patches@sourceware.org Subject: Re: [PATCH 4/8] Return -1 on memory error in print_insn_msp430 Message-ID: <20170112094256.GA31406@E107787-LIN> References: <1484051178-16013-1-git-send-email-yao.qi@linaro.org> <1484051178-16013-5-git-send-email-yao.qi@linaro.org> <20170111215446.GG32333@bubble.grove.modra.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170111215446.GG32333@bubble.grove.modra.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes On 17-01-12 08:24:46, Alan Modra wrote: > On Tue, Jan 10, 2017 at 12:26:14PM +0000, Yao Qi wrote: > > * msp430-dis.c (msp430_singleoperand): Return -1 if > > msp430dis_opcode_signed returns false. > > (msp430_doubleoperand): Likewise. > > (msp430_branchinstr): Return -1 if > > msp430dis_opcode_unsigned returns false. > > (msp430x_calla_instr): Likewise. > > (print_insn_msp430): Likewise. > > You missed nine msp430dis_opcode_signed calls. OK with those done too. > Looks cscope missed some "Functions calling this function: msp430dis_opcode_signed" but "C symbol: msp430dis_opcode_signed" can capture all of them. Fixed. Patch below is what I pushed in. diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 8494c51..5d670f6 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,13 @@ +2017-01-12 Yao Qi + + * msp430-dis.c (msp430_singleoperand): Return -1 if + msp430dis_opcode_signed returns false. + (msp430_doubleoperand): Likewise. + (msp430_branchinstr): Return -1 if + msp430dis_opcode_unsigned returns false. + (msp430x_calla_instr): Likewise. + (print_insn_msp430): Likewise. + 2017-01-05 Nick Clifton PR 20946 diff --git a/opcodes/msp430-dis.c b/opcodes/msp430-dis.c index 9c62193..58d31df 100644 --- a/opcodes/msp430-dis.c +++ b/opcodes/msp430-dis.c @@ -270,6 +270,8 @@ msp430_singleoperand (disassemble_info *info, (long)((addr + 2 + dst) & 0xfffff)); } } + else + return -1; } else if (regd == 2) { @@ -285,6 +287,8 @@ msp430_singleoperand (disassemble_info *info, sprintf (op, "&0x%05x", dst & 0xfffff); } } + else + return -1; } else { @@ -300,6 +304,8 @@ msp430_singleoperand (disassemble_info *info, } sprintf (op, "%d(r%d)", dst, regd); } + else + return -1; } } break; @@ -346,6 +352,8 @@ msp430_singleoperand (disassemble_info *info, sprintf (comm, "#0x%05x", dst); } } + else + return -1; } else * cycles = print_as3_reg_name (regd, op, comm, 1, 1, 3); @@ -370,6 +378,8 @@ msp430_singleoperand (disassemble_info *info, (long)((addr + 2 + dst) & 0xfffff)); } } + else + return -1; } else if (regd == 2) { @@ -384,6 +394,8 @@ msp430_singleoperand (disassemble_info *info, sprintf (op, "&0x%05x", dst & 0xfffff); } } + else + return -1; } else if (regd == 3) { @@ -407,6 +419,8 @@ msp430_singleoperand (disassemble_info *info, if (dst > 9 || dst < 0) sprintf (comm, "%05x", dst); } + else + return -1; } } break; @@ -511,6 +525,8 @@ msp430_doubleoperand (disassemble_info *info, (long)((addr + 2 + dst) & 0xfffff)); } } + else + return -1; } else if (regd == 2) { @@ -526,6 +542,8 @@ msp430_doubleoperand (disassemble_info *info, if (src != dst) return 0; } + else + return -1; cmd_len += 4; *cycles = 6; sprintf (op1, "&0x%04x", PS (dst)); @@ -535,6 +553,8 @@ msp430_doubleoperand (disassemble_info *info, sprintf (op1, "&0x%05x", dst & 0xfffff); } } + else + return -1; } else { @@ -553,6 +573,8 @@ msp430_doubleoperand (disassemble_info *info, if (dst > 9 || dst < -9) sprintf (comm1, "#0x%05x", dst); } + else + return -1; } } @@ -613,6 +635,8 @@ msp430_doubleoperand (disassemble_info *info, sprintf (comm1, "0x%05x", dst & 0xfffff); } } + else + return -1; } else * cycles = print_as3_reg_name (regs, op1, comm1, 1, 1, 2); @@ -640,6 +664,8 @@ msp430_doubleoperand (disassemble_info *info, (long) ((addr + 2 + dst) & 0xfffff)); } } + else + return -1; } else if (regs == 2) { @@ -658,6 +684,8 @@ msp430_doubleoperand (disassemble_info *info, * comm1 = 0; } } + else + return -1; } else if (regs == 3) { @@ -683,6 +711,8 @@ msp430_doubleoperand (disassemble_info *info, if (dst > 9 || dst < -9) sprintf (comm1, "0x%05x", dst); } + else + return -1; } } @@ -728,6 +758,8 @@ msp430_doubleoperand (disassemble_info *info, (long)((addr + cmd_len + dst) & 0xfffff)); } } + else + return -1; cmd_len += 2; } else if (regd == 2) @@ -743,6 +775,8 @@ msp430_doubleoperand (disassemble_info *info, sprintf (op2, "&0x%05x", dst & 0xfffff); } } + else + return -1; } else { @@ -761,6 +795,8 @@ msp430_doubleoperand (disassemble_info *info, } sprintf (op2, "%d(r%d)", dst, regd); } + else + return -1; } } @@ -821,6 +857,8 @@ msp430_branchinstr (disassemble_info *info, cmd_len += 2; sprintf (op1, "#0x%04x", PS (udst)); } + else + return -1; } else * cycles = print_as3_reg_name (regs, op1, comm1, 1, 1, 2); @@ -840,6 +878,8 @@ msp430_branchinstr (disassemble_info *info, sprintf (comm1, "PC rel. 0x%04x", PS ((short) addr + 2 + dst)); } + else + return -1; } else if (regs == 2) { @@ -849,6 +889,8 @@ msp430_branchinstr (disassemble_info *info, cmd_len += 2; sprintf (op1, "&0x%04x", PS (udst)); } + else + return -1; } else if (regs == 3) { @@ -864,6 +906,8 @@ msp430_branchinstr (disassemble_info *info, cmd_len += 2; sprintf (op1, "%d(r%d)", dst, regs); } + else + return -1; } } @@ -903,6 +947,8 @@ msp430x_calla_instr (disassemble_info * info, else sprintf (comm1, "0x%05x", dst); } + else + return -1; break; case 6: /* CALLA @Rdst */ @@ -923,6 +969,8 @@ msp430x_calla_instr (disassemble_info * info, sprintf (op1, "&%d", (ureg << 16) + udst); sprintf (comm1, "0x%05x", (ureg << 16) + udst); } + else + return -1; break; case 9: /* CALLA pcrel-sym */ @@ -934,6 +982,8 @@ msp430x_calla_instr (disassemble_info * info, sprintf (comm1, "PC rel. 0x%05lx", (long) (addr + 2 + dst + (reg << 16))); } + else + return -1; break; case 11: /* CALLA #imm20 */ @@ -944,6 +994,8 @@ msp430x_calla_instr (disassemble_info * info, sprintf (op1, "#%d", (ureg << 16) + udst); sprintf (comm1, "0x%05x", (ureg << 16) + udst); } + else + return -1; break; default: @@ -969,10 +1021,7 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) unsigned short bits; if (! msp430dis_opcode_unsigned (addr, info, &insn, NULL)) - { - prin (stream, ".word 0xffff; ????"); - return 2; - } + return -1; if (((int) addr & 0xffff) > 0xffdf) { @@ -989,11 +1038,7 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) extension_word = insn; addr += 2; if (! msp430dis_opcode_unsigned (addr, info, &insn, NULL)) - { - prin (stream, ".word 0x%04x, 0xffff; ????", - extension_word); - return 4; - } + return -1; } for (opcode = msp430_opcodes; opcode->name; opcode++) @@ -1011,9 +1056,13 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) && (insn & 0x000f) == 0 && (insn & 0x0080) == 0) { - cmd_len += + int ret = msp430_branchinstr (info, opcode, addr, insn, op1, comm1, &cycles); + + if (ret == -1) + return -1; + cmd_len += ret; if (cmd_len) break; } @@ -1022,10 +1071,14 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) { int n; int reg; + int ret; case 4: - cmd_len += msp430x_calla_instr (info, addr, insn, - op1, comm1, & cycles); + ret = msp430x_calla_instr (info, addr, insn, + op1, comm1, & cycles); + if (ret == -1) + return -1; + cmd_len += ret; break; case 5: /* PUSHM/POPM */ @@ -1080,6 +1133,8 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) if (n > 9 || n < 0) sprintf (comm1, "0x%05x", n); } + else + return -1; cmd_len = 4; } sprintf (op2, "r%d", reg); @@ -1120,6 +1175,8 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) if (strcmp (opcode->name, "bra") != 0) sprintf (op2, "r%d", reg); } + else + return -1; break; case 3: /* MOVA x(Rsrc), Rdst */ @@ -1139,6 +1196,8 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) sprintf (comm1, "0x%05x", n); } } + else + return -1; break; case 6: /* MOVA Rsrc, &abs20 */ @@ -1152,6 +1211,8 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) if (reg > 9 || reg < 0) sprintf (comm2, "0x%05x", reg); } + else + return -1; break; case 7: /* MOVA Rsrc, x(Rdst) */ @@ -1169,6 +1230,8 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) sprintf (comm2, "0x%05x", n); } } + else + return -1; break; case 8: /* MOVA #imm20, Rdst */ @@ -1185,6 +1248,8 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) if (strcmp (opcode->name, "bra") != 0) sprintf (op2, "r%d", reg); } + else + return -1; break; case 12: /* MOVA Rsrc, Rdst */ @@ -1206,15 +1271,21 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) switch (opcode->insn_opnumb) { + int ret; + case 0: cmd_len += msp430_nooperands (opcode, addr, insn, comm1, &cycles); break; case 2: - cmd_len += + ret = msp430_doubleoperand (info, opcode, addr, insn, op1, op2, comm1, comm2, extension_word, &cycles); + + if (ret == -1) + return -1; + cmd_len += ret; if (insn & BYTE_OPERATION) { if (extension_word != 0 && ((extension_word & BYTE_OPERATION) == 0)) @@ -1235,10 +1306,14 @@ print_insn_msp430 (bfd_vma addr, disassemble_info *info) break; case 1: - cmd_len += + ret = msp430_singleoperand (info, opcode, addr, insn, op1, comm1, extension_word, &cycles); + + if (ret == -1) + return -1; + cmd_len += ret; if (extension_word && (strcmp (opcode->name, "swpb") == 0 || strcmp (opcode->name, "sxt") == 0))