lkml.org 
[lkml]   [2021]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 19/21] tools/perf: Convert to insn_decode()
    Date
    From: Borislav Petkov <bp@suse.de>

    Simplify code, no functional changes.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/arch/x86/tests/insn-x86.c | 9 ++++-----
    tools/perf/arch/x86/util/archinsn.c | 9 +++++----
    .../intel-pt-decoder/intel-pt-insn-decoder.c | 17 ++++++++++-------
    3 files changed, 19 insertions(+), 16 deletions(-)

    diff --git a/tools/perf/arch/x86/tests/insn-x86.c b/tools/perf/arch/x86/tests/insn-x86.c
    index 745f29adb14b..6c7970b3acb6 100644
    --- a/tools/perf/arch/x86/tests/insn-x86.c
    +++ b/tools/perf/arch/x86/tests/insn-x86.c
    @@ -95,13 +95,12 @@ static int get_branch(const char *branch_str)
    static int test_data_item(struct test_data *dat, int x86_64)
    {
    struct intel_pt_insn intel_pt_insn;
    + int op, branch, ret;
    struct insn insn;
    - int op, branch;

    - insn_init(&insn, dat->data, MAX_INSN_SIZE, x86_64);
    - insn_get_length(&insn);
    -
    - if (!insn_complete(&insn)) {
    + ret = insn_decode(&insn, dat->data, MAX_INSN_SIZE,
    + x86_64 ? INSN_MODE_64 : INSN_MODE_32);
    + if (ret < 0) {
    pr_debug("Failed to decode: %s\n", dat->asm_rep);
    return -1;
    }
    diff --git a/tools/perf/arch/x86/util/archinsn.c b/tools/perf/arch/x86/util/archinsn.c
    index 3e6791531ca5..9fb12e8e67eb 100644
    --- a/tools/perf/arch/x86/util/archinsn.c
    +++ b/tools/perf/arch/x86/util/archinsn.c
    @@ -11,7 +11,7 @@ void arch_fetch_insn(struct perf_sample *sample,
    struct machine *machine)
    {
    struct insn insn;
    - int len;
    + int len, ret;
    bool is64bit = false;

    if (!sample->ip)
    @@ -19,8 +19,9 @@ void arch_fetch_insn(struct perf_sample *sample,
    len = thread__memcpy(thread, machine, sample->insn, sample->ip, sizeof(sample->insn), &is64bit);
    if (len <= 0)
    return;
    - insn_init(&insn, sample->insn, len, is64bit);
    - insn_get_length(&insn);
    - if (insn_complete(&insn) && insn.length <= len)
    +
    + ret = insn_decode(&insn, sample->insn, len,
    + is64bit ? INSN_MODE_64 : INSN_MODE_32);
    + if (ret >= 0 && insn.length <= len)
    sample->insn_len = insn.length;
    }
    diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
    index fb8a3558d3d5..56b42545946e 100644
    --- a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
    +++ b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
    @@ -158,11 +158,13 @@ int intel_pt_get_insn(const unsigned char *buf, size_t len, int x86_64,
    struct intel_pt_insn *intel_pt_insn)
    {
    struct insn insn;
    + int ret;

    - insn_init(&insn, buf, len, x86_64);
    - insn_get_length(&insn);
    - if (!insn_complete(&insn) || insn.length > len)
    + ret = insn_decode(&insn, buf, len,
    + x86_64 ? INSN_MODE_64 : INSN_MODE_32);
    + if (ret < 0 || insn.length > len)
    return -1;
    +
    intel_pt_insn_decoder(&insn, intel_pt_insn);
    if (insn.length < INTEL_PT_INSN_BUF_SZ)
    memcpy(intel_pt_insn->buf, buf, insn.length);
    @@ -183,12 +185,13 @@ const char *dump_insn(struct perf_insn *x, uint64_t ip __maybe_unused,
    u8 *inbuf, int inlen, int *lenp)
    {
    struct insn insn;
    - int n, i;
    + int n, i, ret;
    int left;

    - insn_init(&insn, inbuf, inlen, x->is64bit);
    - insn_get_length(&insn);
    - if (!insn_complete(&insn) || insn.length > inlen)
    + ret = insn_decode(&insn, inbuf, inlen,
    + x->is64bit ? INSN_MODE_64 : INSN_MODE_32);
    +
    + if (ret < 0 || insn.length > inlen)
    return "<bad>";
    if (lenp)
    *lenp = insn.length;
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-02-24 12:13    [W:4.451 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site