From 5905538d4aaa362155464f8984a04fc30fc57b02 Mon Sep 17 00:00:00 2001
From: Evan Martin <evan.martin@gmail.com>
Date: Tue, 15 Oct 2024 13:42:09 -0700
Subject: [PATCH] x86: derive Default for CPU

---
 x86/src/registers.rs |  1 +
 x86/src/x86.rs       | 15 +++------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/x86/src/registers.rs b/x86/src/registers.rs
index d67b85b7..2c80a219 100644
--- a/x86/src/registers.rs
+++ b/x86/src/registers.rs
@@ -2,6 +2,7 @@ use bitflags::bitflags;
 use iced_x86::Register::{self, *};
 
 bitflags! {
+    #[derive(Default)]
     pub struct Flags: u32 {
         /// carry
         const CF = 1 << 0;
diff --git a/x86/src/x86.rs b/x86/src/x86.rs
index 714bf8ee..c15369a6 100644
--- a/x86/src/x86.rs
+++ b/x86/src/x86.rs
@@ -35,6 +35,7 @@ const MAGIC_ADDR: u32 = 0xFFFF_FFF0;
 // Similar to futures::future::BoxFuture, but 'static + !Send.
 pub type BoxFuture<T> = Pin<Box<dyn Future<Output = T>>>;
 
+#[derive(Default)]
 pub struct CPU {
     pub regs: Registers,
     // Flags are in principle a register but we moved it outside of regs for lifetime reasons,
@@ -51,16 +52,6 @@ pub struct CPU {
 }
 
 impl CPU {
-    pub fn new() -> Self {
-        CPU {
-            regs: Registers::default(),
-            flags: Flags::empty(),
-            fpu: FPU::default(),
-            state: Default::default(),
-            futures: Default::default(),
-        }
-    }
-
     pub fn err(&mut self, msg: String) {
         self.state = CPUState::Error(msg);
     }
@@ -219,7 +210,7 @@ pub struct X86 {
 impl X86 {
     pub fn new() -> Self {
         X86 {
-            cpus: vec![Box::pin(CPU::new())],
+            cpus: vec![Box::pin(CPU::default())],
             cur_cpu: 0,
             instr_count: 0,
             icache: InstrCache::default(),
@@ -235,7 +226,7 @@ impl X86 {
     }
 
     pub fn new_cpu(&mut self) -> &mut CPU {
-        self.cpus.push(Box::pin(CPU::new()));
+        self.cpus.push(Box::pin(CPU::default()));
         self.cpus.last_mut().unwrap()
     }