From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH 8/8] x86emul: rename the no_writeback label
Date: Fri, 13 Jan 2017 08:35:06 -0700 [thread overview]
Message-ID: <587901BA020000780012FF67@prv-mh.provo.novell.com> (raw)
In-Reply-To: <5878FC41020000780012FF02@prv-mh.provo.novell.com>
[-- Attachment #1: Type: text/plain, Size: 4088 bytes --]
This is to bring its name in line with what actually happens there.
Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -986,7 +986,7 @@ static inline void put_loop_count(
if ( using_si ) _regs.r(si) = _regs._esi; \
if ( using_di ) _regs.r(di) = _regs._edi; \
} \
- goto no_writeback; \
+ goto complete_insn; \
} \
if ( max_reps > 1 && (_regs._eflags & EFLG_TF) && \
!is_branch_step(ctxt, ops) ) \
@@ -1015,7 +1015,7 @@ static void __put_rep_prefix(
{ \
__put_rep_prefix(&_regs, ctxt->regs, ad_bytes, reps_completed); \
if ( unlikely(rc == X86EMUL_EXCEPTION) ) \
- goto no_writeback; \
+ goto complete_insn; \
} \
})
@@ -2661,7 +2661,7 @@ x86_emulate(
state.caller = NULL;
#endif
if ( rc == X86EMUL_DONE )
- goto no_writeback;
+ goto complete_insn;
if ( rc != X86EMUL_OKAY )
return rc;
}
@@ -4281,7 +4281,7 @@ x86_emulate(
if ( rc != 0 )
{
if ( rc == X86EMUL_DONE )
- goto no_writeback;
+ goto complete_insn;
goto done;
}
break;
@@ -4657,7 +4657,7 @@ x86_emulate(
_regs._eflags &= ~EFLG_AC;
if ( modrm == 0xcb )
_regs._eflags |= EFLG_AC;
- goto no_writeback;
+ goto complete_insn;
#ifdef __XEN__
case 0xd1: /* xsetbv */
@@ -4669,7 +4669,7 @@ x86_emulate(
handle_xsetbv(_regs._ecx,
_regs._eax | (_regs.rdx << 32)),
EXC_GP, 0);
- goto no_writeback;
+ goto complete_insn;
#endif
case 0xd4: /* vmfunc */
@@ -4678,7 +4678,7 @@ x86_emulate(
fail_if(!ops->vmfunc);
if ( (rc = ops->vmfunc(ctxt)) != X86EMUL_OKAY )
goto done;
- goto no_writeback;
+ goto complete_insn;
case 0xd5: /* xend */
generate_exception_if(vex.pfx, EXC_UD);
@@ -4692,7 +4692,7 @@ x86_emulate(
EXC_UD);
/* Neither HLE nor RTM can be active when we get here. */
_regs._eflags |= EFLG_ZF;
- goto no_writeback;
+ goto complete_insn;
case 0xdf: /* invlpga */
generate_exception_if(!in_protmode(ctxt, ops), EXC_UD);
@@ -4701,7 +4701,7 @@ x86_emulate(
if ( (rc = ops->invlpg(x86_seg_none, truncate_ea(_regs.r(ax)),
ctxt)) )
goto done;
- goto no_writeback;
+ goto complete_insn;
case 0xf9: /* rdtscp */
{
@@ -4749,7 +4749,7 @@ x86_emulate(
base += sizeof(zero);
limit -= sizeof(zero);
}
- goto no_writeback;
+ goto complete_insn;
}
}
@@ -6219,8 +6219,7 @@ x86_emulate(
break;
}
- no_writeback: /* Commit shadow register state. */
-
+ complete_insn: /* Commit shadow register state. */
/* Zero the upper 32 bits of %rip if not in 64-bit mode. */
if ( !mode_64bit() )
_regs.r(ip) = _regs._eip;
[-- Attachment #2: x86emul-writeback-label.patch --]
[-- Type: text/plain, Size: 4124 bytes --]
x86emul: rename the no_writeback label
This is to bring its name in line with what actually happens there.
Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -986,7 +986,7 @@ static inline void put_loop_count(
if ( using_si ) _regs.r(si) = _regs._esi; \
if ( using_di ) _regs.r(di) = _regs._edi; \
} \
- goto no_writeback; \
+ goto complete_insn; \
} \
if ( max_reps > 1 && (_regs._eflags & EFLG_TF) && \
!is_branch_step(ctxt, ops) ) \
@@ -1015,7 +1015,7 @@ static void __put_rep_prefix(
{ \
__put_rep_prefix(&_regs, ctxt->regs, ad_bytes, reps_completed); \
if ( unlikely(rc == X86EMUL_EXCEPTION) ) \
- goto no_writeback; \
+ goto complete_insn; \
} \
})
@@ -2661,7 +2661,7 @@ x86_emulate(
state.caller = NULL;
#endif
if ( rc == X86EMUL_DONE )
- goto no_writeback;
+ goto complete_insn;
if ( rc != X86EMUL_OKAY )
return rc;
}
@@ -4281,7 +4281,7 @@ x86_emulate(
if ( rc != 0 )
{
if ( rc == X86EMUL_DONE )
- goto no_writeback;
+ goto complete_insn;
goto done;
}
break;
@@ -4657,7 +4657,7 @@ x86_emulate(
_regs._eflags &= ~EFLG_AC;
if ( modrm == 0xcb )
_regs._eflags |= EFLG_AC;
- goto no_writeback;
+ goto complete_insn;
#ifdef __XEN__
case 0xd1: /* xsetbv */
@@ -4669,7 +4669,7 @@ x86_emulate(
handle_xsetbv(_regs._ecx,
_regs._eax | (_regs.rdx << 32)),
EXC_GP, 0);
- goto no_writeback;
+ goto complete_insn;
#endif
case 0xd4: /* vmfunc */
@@ -4678,7 +4678,7 @@ x86_emulate(
fail_if(!ops->vmfunc);
if ( (rc = ops->vmfunc(ctxt)) != X86EMUL_OKAY )
goto done;
- goto no_writeback;
+ goto complete_insn;
case 0xd5: /* xend */
generate_exception_if(vex.pfx, EXC_UD);
@@ -4692,7 +4692,7 @@ x86_emulate(
EXC_UD);
/* Neither HLE nor RTM can be active when we get here. */
_regs._eflags |= EFLG_ZF;
- goto no_writeback;
+ goto complete_insn;
case 0xdf: /* invlpga */
generate_exception_if(!in_protmode(ctxt, ops), EXC_UD);
@@ -4701,7 +4701,7 @@ x86_emulate(
if ( (rc = ops->invlpg(x86_seg_none, truncate_ea(_regs.r(ax)),
ctxt)) )
goto done;
- goto no_writeback;
+ goto complete_insn;
case 0xf9: /* rdtscp */
{
@@ -4749,7 +4749,7 @@ x86_emulate(
base += sizeof(zero);
limit -= sizeof(zero);
}
- goto no_writeback;
+ goto complete_insn;
}
}
@@ -6219,8 +6219,7 @@ x86_emulate(
break;
}
- no_writeback: /* Commit shadow register state. */
-
+ complete_insn: /* Commit shadow register state. */
/* Zero the upper 32 bits of %rip if not in 64-bit mode. */
if ( !mode_64bit() )
_regs.r(ip) = _regs._eip;
[-- Attachment #3: Type: text/plain, Size: 127 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-01-13 15:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-13 15:11 [PATCH 0/8] x86emul: support various ISA extensions Jan Beulich
2017-01-13 15:30 ` [PATCH 1/8] x86emul: support POPCNT Jan Beulich
2017-01-13 16:31 ` Andrew Cooper
2017-01-13 15:31 ` [PATCH 2/8] x86emul: support ADCX/ADOX Jan Beulich
2017-01-13 16:34 ` Andrew Cooper
2017-01-13 15:31 ` [PATCH 3/8] x86emul: support BMI1 insns Jan Beulich
2017-01-13 17:40 ` Andrew Cooper
2017-01-16 11:19 ` Jan Beulich
2017-01-16 11:59 ` Andrew Cooper
2017-01-16 12:43 ` Jan Beulich
2017-01-16 12:57 ` Jan Beulich
2017-01-16 13:51 ` Andrew Cooper
2017-01-16 13:58 ` Jan Beulich
2017-01-16 14:17 ` Andrew Cooper
2017-01-16 15:43 ` Jan Beulich
2017-01-13 15:32 ` [PATCH 4/8] x86emul: support BMI2 insns Jan Beulich
2017-01-13 18:20 ` Andrew Cooper
2017-01-16 11:32 ` Jan Beulich
2017-01-13 15:32 ` [PATCH 5/8] x86emul: support TBM insns Jan Beulich
2017-01-13 18:48 ` Andrew Cooper
2017-01-16 11:36 ` Jan Beulich
2017-01-16 14:52 ` Andrew Cooper
2017-01-16 15:45 ` Jan Beulich
2017-01-13 15:34 ` [PATCH 6/8] x86emul: support RDRAND/RDSEED Jan Beulich
2017-01-13 18:55 ` Andrew Cooper
2017-01-13 15:34 ` [PATCH 7/8] x86emul: support RDPID Jan Beulich
2017-01-13 19:00 ` Andrew Cooper
2017-01-13 15:35 ` Jan Beulich [this message]
2017-01-13 19:01 ` [PATCH 8/8] x86emul: rename the no_writeback label Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=587901BA020000780012FF67@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.