From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by sourceware.org (Postfix) with ESMTPS id CD5AD386F01F for ; Thu, 17 Sep 2020 02:14:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CD5AD386F01F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=csie.io Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=demonic@csie.io Received: by mail-lj1-x241.google.com with SMTP id a15so630931ljk.2 for ; Wed, 16 Sep 2020 19:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=csie-io.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=6GLcdYkM2OFIjqjXZsK1Y/T3PhPYXwdPlOuB6w7w0nQ=; b=li173oskldSdI9FQ7bv8vtp0GS9hrlqUfAG/NzhvC4TSGPBW0hCaHcbTvPT3ZLu5Im 2zgJu0KioCHsurVfiz7brSWmkAsmM4kmnJbKMQwNWme5GCc7PMBzjiEi6XBn9f/wv4Tm onvMDx5s4tyN3lmBqqsCdUi/jXBMuzjgIPm2QyD6TisXTrbpKedzdxd+SLAM8bsswOvK Trnent9Xn6CJfEC7xW3CMxG0kNCzIFdwULvwyiZ1NNZB42YU05AU6qUWNLfpK9d8BUD+ aWofJx0/CqSeqOCqep6mnzgABAVx4x8QXMciPa7ljCB4zoDdugO1xAt+z42pe7UNMKF6 rpyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=6GLcdYkM2OFIjqjXZsK1Y/T3PhPYXwdPlOuB6w7w0nQ=; b=nbZNJjAPQrolIsK49bs1UCwLsILdaitcppIkHlylWDNuhf4gRT5S/quCjSrqJ3T9A0 jKprCFBGBWGuhA443uJAI+motGP6r0x2CC11RiJuTYyKEcNUr9Pv3c2c6KPdfKbRWV6t GXLuLrvkq5p2GxU3bgEtV934K10lYO8hBIrNfCdFit4QxH1OmI8oNYuSZ7lBywqm5zK5 2xWqvuHAPf1nxE9ihEZAtOJ83xVHVyeaa/VvijUTmPHmxxePEXgAed8kUdSNRDTkLVar Lw3aYHHk2p4acXgVmpmt0zjq7LJLghsE1VobXOC+eaDSW9HvvnYeqvUK5rQWI1mX8Sh6 Dw/A== X-Gm-Message-State: AOAM530lYLnYmZQczSyHXn2QeSO5FV1FSPrn8kUpdklWAIaA2x7QZYuz vt9vThemFPRtjyFQEkVA2sU1yJcxxCwbJBKUoqjDT/ylgmcZ9A== X-Google-Smtp-Source: ABdhPJyz+9GKNcJK2mjNR4HQ+vagfscX6cozrZZ2qi1DIZ5GgbvOQ5Ekwc0izMmFgBdapLYEX5OQMpNLqNAGPgS9PZo= X-Received: by 2002:a2e:8983:: with SMTP id c3mr9721194lji.171.1600308882118; Wed, 16 Sep 2020 19:14:42 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?B?57SA6YeN56aV?= Date: Thu, 17 Sep 2020 10:14:05 +0800 Message-ID: Subject: [PATCH] gdb/riscv: fix recorded insn type To: gdb-patches@sourceware.org Content-Type: multipart/mixed; boundary="000000000000734b7905af78f288" X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, HTML_MESSAGE, 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-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Thu, 17 Sep 2020 02:14:46 -0000 --000000000000734b7905af78f288 Content-Type: text/plain; charset="UTF-8" Hi, I fixed the instruction type in the decoding method. --- gdb/ChangeLog | 3 +++ gdb/riscv-tdep.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 84ee292750..5bf0c8ff14 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,6 @@ +2020-09-17 Chungyi Chi + * riscv-tdep.c (riscv-insn::decode): Fix recorded insn type. + 2020-09-16 Simon Marchi * breakpoint.h (init_catchpoint): Change int parameter to bool. diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index a7c25642d0..ac4ac1b6fd 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -1472,7 +1472,7 @@ riscv_insn::decode (struct gdbarch *gdbarch, CORE_ADDR pc) else if (is_c_swsp_insn (ival)) decode_css_type_insn (SW, ival, EXTRACT_RVC_SWSP_IMM (ival)); else if (xlen != 4 && is_c_sdsp_insn (ival)) - decode_css_type_insn (SW, ival, EXTRACT_RVC_SDSP_IMM (ival)); + decode_css_type_insn (SD, ival, EXTRACT_RVC_SDSP_IMM (ival)); /* C_JR and C_MV have the same opcode. If RS2 is 0, then this is a C_JR. So must try to match C_JR first as it ahs more bits in mask. */ else if (is_c_jr_insn (ival)) -- 2.25.0 --000000000000734b7905af78f288 Content-Type: application/octet-stream; name="0001-gdb-riscv-fix-recorded-insn-type.patch" Content-Disposition: attachment; filename="0001-gdb-riscv-fix-recorded-insn-type.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kf66fpb00 RnJvbSA0NTllZGM3Y2RkMzlhOGRmNTc3NDc5NjZhZjc1NTc0NGZkMTdmYWFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaHVuZ3lpIENoaSA8ZGVtb25pY0Bjc2llLmlvPgpEYXRlOiBU aHUsIDE3IFNlcCAyMDIwIDAxOjU5OjI2ICswMDAwClN1YmplY3Q6IFtQQVRDSF0gZ2RiL3Jpc2N2 OiBmaXggcmVjb3JkZWQgaW5zbiB0eXBlCgotLS0KIGdkYi9DaGFuZ2VMb2cgICAgfCAzICsrKwog Z2RiL3Jpc2N2LXRkZXAuYyB8IDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCsp LCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZ2RiL0NoYW5nZUxvZyBiL2dkYi9DaGFuZ2VM b2cKaW5kZXggODRlZTI5Mjc1MC4uNWJmMGM4ZmYxNCAxMDA2NDQKLS0tIGEvZ2RiL0NoYW5nZUxv ZworKysgYi9nZGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNiBAQAorMjAyMC0wOS0xNyAgQ2h1bmd5 aSBDaGkgIDxkZW1vbmljQGNzaWUuaW8+CisJKiByaXNjdi10ZGVwLmMgKHJpc2N2LWluc246OmRl Y29kZSk6IEZpeCByZWNvcmRlZCBpbnNuIHR5cGUuCisKIDIwMjAtMDktMTYgIFNpbW9uIE1hcmNo aSAgPHNpbW9uLm1hcmNoaUBlZmZpY2lvcy5jb20+CiAKIAkqIGJyZWFrcG9pbnQuaCAoaW5pdF9j YXRjaHBvaW50KTogQ2hhbmdlIGludCBwYXJhbWV0ZXIgdG8gYm9vbC4KZGlmZiAtLWdpdCBhL2dk Yi9yaXNjdi10ZGVwLmMgYi9nZGIvcmlzY3YtdGRlcC5jCmluZGV4IGE3YzI1NjQyZDAuLmFjNGFj MWI2ZmQgMTAwNjQ0Ci0tLSBhL2dkYi9yaXNjdi10ZGVwLmMKKysrIGIvZ2RiL3Jpc2N2LXRkZXAu YwpAQCAtMTQ3Miw3ICsxNDcyLDcgQEAgcmlzY3ZfaW5zbjo6ZGVjb2RlIChzdHJ1Y3QgZ2RiYXJj aCAqZ2RiYXJjaCwgQ09SRV9BRERSIHBjKQogICAgICAgZWxzZSBpZiAoaXNfY19zd3NwX2luc24g KGl2YWwpKQogCWRlY29kZV9jc3NfdHlwZV9pbnNuIChTVywgaXZhbCwgRVhUUkFDVF9SVkNfU1dT UF9JTU0gKGl2YWwpKTsKICAgICAgIGVsc2UgaWYgKHhsZW4gIT0gNCAmJiBpc19jX3Nkc3BfaW5z biAoaXZhbCkpCi0JZGVjb2RlX2Nzc190eXBlX2luc24gKFNXLCBpdmFsLCBFWFRSQUNUX1JWQ19T RFNQX0lNTSAoaXZhbCkpOworCWRlY29kZV9jc3NfdHlwZV9pbnNuIChTRCwgaXZhbCwgRVhUUkFD VF9SVkNfU0RTUF9JTU0gKGl2YWwpKTsKICAgICAgIC8qIENfSlIgYW5kIENfTVYgaGF2ZSB0aGUg c2FtZSBvcGNvZGUuICBJZiBSUzIgaXMgMCwgdGhlbiB0aGlzIGlzIGEgQ19KUi4KIAkgU28gbXVz dCB0cnkgdG8gbWF0Y2ggQ19KUiBmaXJzdCBhcyBpdCBhaHMgbW9yZSBiaXRzIGluIG1hc2suICAq LwogICAgICAgZWxzZSBpZiAoaXNfY19qcl9pbnNuIChpdmFsKSkKLS0gCjIuMjUuMAoK --000000000000734b7905af78f288--