lkml.org 
[lkml]   [2023]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 08/33] x86/objtool: teach objtool about ERETU and ERETS
    Date
    From: "H. Peter Anvin (Intel)" <hpa@zytor.com>

    Update the objtool decoder to know about the ERETU and ERETS
    instructions (type INSN_CONTEXT_SWITCH.)

    Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
    Tested-by: Shan Kang <shan.kang@intel.com>
    Signed-off-by: Xin Li <xin3.li@intel.com>
    ---
    tools/objtool/arch/x86/decode.c | 19 ++++++++++++++-----
    1 file changed, 14 insertions(+), 5 deletions(-)

    diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
    index 9ef024fd648c..8e9c802f78ec 100644
    --- a/tools/objtool/arch/x86/decode.c
    +++ b/tools/objtool/arch/x86/decode.c
    @@ -509,11 +509,20 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec

    if (op2 == 0x01) {

    - if (modrm == 0xca)
    - insn->type = INSN_CLAC;
    - else if (modrm == 0xcb)
    - insn->type = INSN_STAC;
    -
    + switch (insn_last_prefix_id(&ins)) {
    + case INAT_PFX_REPE:
    + case INAT_PFX_REPNE:
    + if (modrm == 0xca)
    + /* eretu/erets */
    + insn->type = INSN_CONTEXT_SWITCH;
    + break;
    + default:
    + if (modrm == 0xca)
    + insn->type = INSN_CLAC;
    + else if (modrm == 0xcb)
    + insn->type = INSN_STAC;
    + break;
    + }
    } else if (op2 >= 0x80 && op2 <= 0x8f) {

    insn->type = INSN_JUMP_CONDITIONAL;
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-03-27 10:26    [W:6.856 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site