td-shim,tdx-tdcall: gate asm_td_call and asm_td_vmcall

Signed-off-by: Stanislaw Grams <[email protected]>

Author: sgrams

td-shim/src/bin/td-shim/asm/mod.rs

@@ -5,15 +5,15 @@ use core::arch::global_asm;
 
 global_asm!(include_str!("msr64.asm"));
 
-#[cfg(not(feature = "tdvmcall"))]
+#[cfg(feature = "tdvmcall")]
 global_asm!(include_str!("exception.asm"));
 #[cfg(not(feature = "tdvmcall"))]
-global_asm!(include_str!("ap_loop_notdvmcall.asm"));
-
-#[cfg(feature = "tdvmcall")]
 global_asm!(include_str!("exception_notdvmcall.asm"));
+
 #[cfg(feature = "tdvmcall")]
 global_asm!(include_str!("ap_loop.asm"));
+#[cfg(not(feature = "tdvmcall"))]
+global_asm!(include_str!("ap_loop_notdvmcall.asm"));
 
 extern "C" {
     fn ap_relocated_func();

tdx-tdcall/src/asm/mod.rs

@@ -4,19 +4,21 @@
 use core::arch::global_asm;
 use core::ffi::c_void;
 
-#[cfg(feature = "use_tdx_emulation")]
+#[cfg(all(feature = "use_tdx_emulation", feature = "tdcall"))]
 global_asm!(include_str!("tdcall_emu.asm"));
 
-#[cfg(feature = "use_tdx_emulation")]
+#[cfg(all(feature = "use_tdx_emulation", feature = "tdvmcall"))]
 global_asm!(include_str!("tdvmcall_emu.asm"));
 
-#[cfg(not(feature = "use_tdx_emulation"))]
+#[cfg(all(not(feature = "use_tdx_emulation"), feature = "tdcall"))]
 global_asm!(include_str!("tdcall.asm"));
 
-#[cfg(not(feature = "use_tdx_emulation"))]
+#[cfg(all(not(feature = "use_tdx_emulation"), feature = "tdvmcall"))]
 global_asm!(include_str!("tdvmcall.asm"));
 
 extern "win64" {
+    #[cfg(feature = "tdcall")]
     pub(crate) fn asm_td_call(args: *mut c_void) -> u64;
+    #[cfg(feature = "tdvmcall")]
     pub(crate) fn asm_td_vmcall(args: *mut c_void, do_sti: u64) -> u64;
 }