diff options
| author | kobalicek <kobalicek.petr@gmail.com> | 2017-02-26 14:33:05 +0300 |
|---|---|---|
| committer | kobalicek <kobalicek.petr@gmail.com> | 2017-02-26 14:33:05 +0300 |
| commit | a808b44359f0423219e029c69910d0decc91ebdb (patch) | |
| tree | 926496aab9eadf30ed3c5f69ab843b2955ed510d | |
| parent | 4a94223ebda87b5fa125666e86bb66057e578a5d (diff) | |
Minor logging changes
| -rw-r--r-- | src/asmjit/x86/x86logging.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/asmjit/x86/x86logging.cpp b/src/asmjit/x86/x86logging.cpp index 7fba65c..301efb3 100644 --- a/src/asmjit/x86/x86logging.cpp +++ b/src/asmjit/x86/x86logging.cpp @@ -589,22 +589,18 @@ ASMJIT_FAVOR_SIZE Error X86Logging::formatInstruction( if (instId < X86Inst::_kIdCount) { const X86Inst& instInfo = X86Inst::getInst(instId); - // SHORT/LONG forms. + // SHORT|LONG options. if (options & X86Inst::kOptionShortForm) ASMJIT_PROPAGATE(sb.appendString("short ")); if (options & X86Inst::kOptionLongForm) ASMJIT_PROPAGATE(sb.appendString("long ")); - // LOCK/XACQUIRE/XRELEASE option. + // LOCK|XACQUIRE|XRELEASE options. if (options & X86Inst::kOptionXAcquire) ASMJIT_PROPAGATE(sb.appendString("xacquire ")); if (options & X86Inst::kOptionXRelease) ASMJIT_PROPAGATE(sb.appendString("xrelease ")); if (options & X86Inst::kOptionLock) ASMJIT_PROPAGATE(sb.appendString("lock ")); - // REP options. + // REP|REPNZ options. if (options & (X86Inst::kOptionRep | X86Inst::kOptionRepnz)) { - const char* rep = "repnz "; - if ((options & (X86Inst::kOptionRep | X86Inst::kOptionRepnz)) == X86Inst::kOptionRep) - rep = instInfo.hasFlag(X86Inst::kFlagRepnz) ? "repz " : "rep "; - - sb.appendString(rep); + sb.appendString((options & X86Inst::kOptionRep) ? "rep " : "repnz "); if (!extraOp.isNone()) { ASMJIT_PROPAGATE(sb.appendChar('{')); ASMJIT_PROPAGATE(formatOperand(sb, logOptions, emitter, archType, extraOp)); @@ -631,9 +627,9 @@ ASMJIT_FAVOR_SIZE Error X86Logging::formatInstruction( } } - // VEX options. - if (options & X86Inst::kOptionVex3) - ASMJIT_PROPAGATE(sb.appendString("vex3 ")); + // VEX|EVEX options. + if (options & X86Inst::kOptionVex3) ASMJIT_PROPAGATE(sb.appendString("vex3 ")); + if (options & X86Inst::kOptionEvex) ASMJIT_PROPAGATE(sb.appendString("evex ")); ASMJIT_PROPAGATE(sb.appendString(instInfo.getName())); } |