a sort of initial skeleton for cpuid.

Author: francis-starlab

mythril/src/emulate/cpuid.rs

@@ -192,30 +192,3 @@ fn cpuid_name(vcpu: &VCpu, actual: CpuIdResult) -> CpuIdResult {
     }
     actual
 }
-
-pub fn emulate_cpuid(
-    vcpu: &mut vcpu::VCpu,
-    guest_cpu: &mut vmexit::GuestCpuState,
-) -> Result<()> {
-    let eax = guest_cpu.rax as u32;
-
-    let ecx = guest_cpu.rcx as u32;
-    let mut res = get_cpu_id_result(vcpu, eax, ecx);
-
-    //todo move this into get_cpu_id_result
-    if guest_cpu.rax as u32 == 1 {
-        // Hide hypervisor feature
-        res.ecx &= !(1 << 31);
-
-        // Hide TSC deadline timer
-        res.ecx &= !(1 << 24);
-    } else if guest_cpu.rax as u32 == 0x0b {
-        res.edx = crate::percore::read_core_id().raw as u32;
-    }
-
-    guest_cpu.rax = res.eax as u64 | (guest_cpu.rax & 0xffffffff00000000);
-    guest_cpu.rbx = res.ebx as u64 | (guest_cpu.rbx & 0xffffffff00000000);
-    guest_cpu.rcx = res.ecx as u64 | (guest_cpu.rcx & 0xffffffff00000000);
-    guest_cpu.rdx = res.edx as u64 | (guest_cpu.rdx & 0xffffffff00000000);
-    Ok(())
-}

mythril/src/vm.rs

@@ -349,6 +349,7 @@ pub struct HostPhysicalDevices {
 
 /// A configuration for a `VirtualMachine`
 pub struct VirtualMachineConfig {
+<<<<<<< HEAD
     /// The cores assigned as part of this configuration
     pub cpus: ArrayVec<[percore::CoreId; MAX_PER_VM_CORE_COUNT]>,
 
@@ -365,6 +366,13 @@ pub struct VirtualMachineConfig {
 
     /// The size of this machines physical address space in MiB
     pub memory: u64,
+=======
+    cpus: ArrayVec<[percore::CoreId; MAX_PER_VM_CORE_COUNT]>,
+    images: Vec<(String, GuestPhysAddr)>,
+    virtual_devices: DeviceMap,
+    physical_devices: PhysicalDeviceConfig,
+    memory: u64, // in MB
+>>>>>>> a sort of initial skeleton for cpuid.
     override_cpu_name: bool
 }
 
@@ -404,6 +412,39 @@ impl VirtualMachineConfig {
         self.images.push((image, addr));
         Ok(())
     }
+<<<<<<< HEAD
+=======
+
+    /// Access the configurations virtual `DeviceMap`
+    pub fn virtual_devices(&self) -> &DeviceMap {
+        &self.virtual_devices
+    }
+
+    /// Access the configurations virtual `DeviceMap` mutably
+    pub fn virtual_devices_mut(&mut self) -> &mut DeviceMap {
+        &mut self.virtual_devices
+    }
+
+    /// Access the configurations physical hardware
+    pub fn physical_devices(&self) -> &PhysicalDeviceConfig {
+        &self.physical_devices
+    }
+
+    /// Get the list of CoreIds assicated with this VM
+    pub fn cpus(&self) -> &ArrayVec<[percore::CoreId; MAX_PER_VM_CORE_COUNT]> {
+        &self.cpus
+    }
+
+    /// Get the CoreId of the BSP for this VM
+    pub fn bsp_id(&self) -> percore::CoreId {
+        self.cpus[0]
+    }
+
+
+    pub fn override_cpu_name(&self) -> bool {
+        self.override_cpu_name
+    }
+>>>>>>> a sort of initial skeleton for cpuid.
 }
 
 /// A virtual machine