mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
x86/emulate: Remove HAVE_AS_RDRAND and HAVE_AS_RDSEED
The new toolchain baseline knows the RDRAND and RDSEED instructions; no need to carry the workaround in the code. Fix up arch_get_random() too. No functional change. Resolves: https://gitlab.com/xen-project/xen/-/work_items/208 Signed-off-by: Denis Mukhin <dmukhin@ford.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
Denis Mukhin authored and Andrew Cooper committed
1 parent
8754143983
commit
05bf9f1f0f
3 files changed
+6
-13
No files matched your search
@@ -10,8 +10,6 @@ CFLAGS += -msoft-float
|
||||
|
||||
$(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
|
||||
$(call cc-option-add,CFLAGS,CC,-Wnested-externs)
|
||||
$(call as-option-add,CFLAGS,CC,"rdrand %eax",-DHAVE_AS_RDRAND)
|
||||
$(call as-option-add,CFLAGS,CC,"rdseed %eax",-DHAVE_AS_RDSEED)
|
||||
$(call as-option-add,CFLAGS,CC,".equ \"x\"$(comma)1",-DHAVE_AS_QUOTED_SYM)
|
||||
$(call as-option-add,CFLAGS,CC,"movdiri %rax$(comma)(%rax)",-DHAVE_AS_MOVDIR)
|
||||
$(call as-option-add,CFLAGS,CC,"enqcmd (%rax)$(comma)%rax",-DHAVE_AS_ENQCMD)
|
||||
|
||||
@@ -8,7 +8,7 @@ static inline unsigned int arch_get_random(void)
|
||||
unsigned int val = 0;
|
||||
|
||||
if ( cpu_has(¤t_cpu_data, X86_FEATURE_RDRAND) )
|
||||
asm volatile ( ".byte 0x0f,0xc7,0xf0" : "+a" (val) );
|
||||
asm volatile ( "rdrand %0" : "=r" (val) );
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
@@ -32,7 +32,6 @@ int x86emul_0fc7(struct x86_emulate_state *s,
|
||||
return X86EMUL_UNRECOGNIZED;
|
||||
|
||||
case 6: /* rdrand */
|
||||
#ifdef HAVE_AS_RDRAND
|
||||
generate_exception_if(s->vex.pfx >= vex_f3, X86_EXC_UD);
|
||||
host_and_vcpu_must_have(rdrand);
|
||||
*dst = s->ea;
|
||||
@@ -43,12 +42,12 @@ int x86emul_0fc7(struct x86_emulate_state *s,
|
||||
: "=r" (dst->val), ASM_FLAG_OUT("=@ccc", "=qm") (carry) );
|
||||
break;
|
||||
default:
|
||||
# ifdef __x86_64__
|
||||
#ifdef __x86_64__
|
||||
asm ( "rdrand %k0" ASM_FLAG_OUT(, "; setc %1")
|
||||
: "=r" (dst->val), ASM_FLAG_OUT("=@ccc", "=qm") (carry) );
|
||||
break;
|
||||
case 8:
|
||||
# endif
|
||||
#endif
|
||||
asm ( "rdrand %0" ASM_FLAG_OUT(, "; setc %1")
|
||||
: "=r" (dst->val), ASM_FLAG_OUT("=@ccc", "=qm") (carry) );
|
||||
break;
|
||||
@@ -57,9 +56,6 @@ int x86emul_0fc7(struct x86_emulate_state *s,
|
||||
if ( carry )
|
||||
regs->eflags |= X86_EFLAGS_CF;
|
||||
break;
|
||||
#else
|
||||
return X86EMUL_UNIMPLEMENTED;
|
||||
#endif
|
||||
|
||||
case 7: /* rdseed / rdpid */
|
||||
if ( s->vex.pfx == vex_f3 ) /* rdpid */
|
||||
@@ -77,7 +73,7 @@ int x86emul_0fc7(struct x86_emulate_state *s,
|
||||
dst->bytes = 4;
|
||||
break;
|
||||
}
|
||||
#ifdef HAVE_AS_RDSEED
|
||||
|
||||
generate_exception_if(s->vex.pfx >= vex_f3, X86_EXC_UD);
|
||||
host_and_vcpu_must_have(rdseed);
|
||||
*dst = s->ea;
|
||||
@@ -88,12 +84,12 @@ int x86emul_0fc7(struct x86_emulate_state *s,
|
||||
: "=r" (dst->val), ASM_FLAG_OUT("=@ccc", "=qm") (carry) );
|
||||
break;
|
||||
default:
|
||||
# ifdef __x86_64__
|
||||
#ifdef __x86_64__
|
||||
asm ( "rdseed %k0" ASM_FLAG_OUT(, "; setc %1")
|
||||
: "=r" (dst->val), ASM_FLAG_OUT("=@ccc", "=qm") (carry) );
|
||||
break;
|
||||
case 8:
|
||||
# endif
|
||||
#endif
|
||||
asm ( "rdseed %0" ASM_FLAG_OUT(, "; setc %1")
|
||||
: "=r" (dst->val), ASM_FLAG_OUT("=@ccc", "=qm") (carry) );
|
||||
break;
|
||||
@@ -102,7 +98,6 @@ int x86emul_0fc7(struct x86_emulate_state *s,
|
||||
if ( carry )
|
||||
regs->eflags |= X86_EFLAGS_CF;
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||