mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
x86/regs: Fold x86_64/regs.h into it's single includer
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Andrew Cooper committed
1 parent
f1f351df03
commit
267c7fe241
2 files changed
+23
-29
No files matched your search
@@ -2,7 +2,29 @@
|
||||
#ifndef __X86_REGS_H__
|
||||
#define __X86_REGS_H__
|
||||
|
||||
#include <asm/x86_64/regs.h>
|
||||
#include <xen/types.h>
|
||||
#include <public/xen.h>
|
||||
|
||||
#define ring_0(r) (((r)->cs & 3) == 0)
|
||||
#define ring_1(r) (((r)->cs & 3) == 1)
|
||||
#define ring_2(r) (((r)->cs & 3) == 2)
|
||||
#define ring_3(r) (((r)->cs & 3) == 3)
|
||||
|
||||
#define guest_kernel_mode(v, r) \
|
||||
(!is_pv_32bit_vcpu(v) ? \
|
||||
(ring_3(r) && ((v)->arch.flags & TF_kernel_mode)) : \
|
||||
(ring_1(r)))
|
||||
|
||||
#define permit_softint(dpl, v, r) \
|
||||
((dpl) >= (guest_kernel_mode(v, r) ? 1 : 3))
|
||||
|
||||
/* Check for null trap callback handler: Is the EIP null? */
|
||||
#define null_trap_bounce(v, tb) \
|
||||
(!is_pv_32bit_vcpu(v) ? ((tb)->eip == 0) : (((tb)->cs & ~3) == 0))
|
||||
|
||||
/* Number of bytes of on-stack execution state to be context-switched. */
|
||||
/* NB. Segment registers and bases are not saved/restored on x86/64 stack. */
|
||||
#define CTXT_SWITCH_STACK_BYTES (offsetof(struct cpu_user_regs, es))
|
||||
|
||||
#define guest_mode(r) \
|
||||
({ \
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
#ifndef _X86_64_REGS_H
|
||||
#define _X86_64_REGS_H
|
||||
|
||||
#include <xen/types.h>
|
||||
#include <public/xen.h>
|
||||
|
||||
#define ring_0(r) (((r)->cs & 3) == 0)
|
||||
#define ring_1(r) (((r)->cs & 3) == 1)
|
||||
#define ring_2(r) (((r)->cs & 3) == 2)
|
||||
#define ring_3(r) (((r)->cs & 3) == 3)
|
||||
|
||||
#define guest_kernel_mode(v, r) \
|
||||
(!is_pv_32bit_vcpu(v) ? \
|
||||
(ring_3(r) && ((v)->arch.flags & TF_kernel_mode)) : \
|
||||
(ring_1(r)))
|
||||
|
||||
#define permit_softint(dpl, v, r) \
|
||||
((dpl) >= (guest_kernel_mode(v, r) ? 1 : 3))
|
||||
|
||||
/* Check for null trap callback handler: Is the EIP null? */
|
||||
#define null_trap_bounce(v, tb) \
|
||||
(!is_pv_32bit_vcpu(v) ? ((tb)->eip == 0) : (((tb)->cs & ~3) == 0))
|
||||
|
||||
/* Number of bytes of on-stack execution state to be context-switched. */
|
||||
/* NB. Segment registers and bases are not saved/restored on x86/64 stack. */
|
||||
#define CTXT_SWITCH_STACK_BYTES (offsetof(struct cpu_user_regs, es))
|
||||
|
||||
#endif
|
||||