From d5447c288e6560f28cf19fda489f2494624256df Mon Sep 17 00:00:00 2001
From: Alex <enderice2@users.noreply.github.com>
Date: Mon, 17 Oct 2022 18:09:21 +0300
Subject: [PATCH] Optimize CPU functions

---
 Core/CPU.cpp    | 32 -------------------------------
 include/cpu.hpp | 51 +++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/Core/CPU.cpp b/Core/CPU.cpp
index d852669..f630b2c 100644
--- a/Core/CPU.cpp
+++ b/Core/CPU.cpp
@@ -96,38 +96,6 @@ namespace CPU
 		return Hypervisor;
 	}
 
-	void Pause()
-	{
-#if defined(__amd64__) || defined(__i386__)
-		asmv("pause");
-#elif defined(__aarch64__)
-		asmv("yield");
-#endif
-	}
-
-	void Stop()
-	{
-		while (1)
-		{
-#if defined(__amd64__) || defined(__i386__)
-			asmv("cli");
-			asmv("hlt");
-#elif defined(__aarch64__)
-			asmv("msr daifset, #2");
-			asmv("wfe");
-#endif
-		}
-	}
-
-	void Halt()
-	{
-#if defined(__amd64__) || defined(__i386__)
-		asmv("hlt");
-#elif defined(__aarch64__)
-		asmv("wfe");
-#endif
-	}
-
 	bool Interrupts(InterruptsType Type)
 	{
 		switch (Type)
diff --git a/include/cpu.hpp b/include/cpu.hpp
index 9063c2d..7c122af 100644
--- a/include/cpu.hpp
+++ b/include/cpu.hpp
@@ -136,17 +136,48 @@ namespace CPU
     /**
      * @brief Pause the CPU
      */
-    void Pause();
+    static inline void Pause()
+    {
+#if defined(__amd64__) || defined(__i386__)
+        asmv("pause");
+#elif defined(__aarch64__)
+        asmv("yield");
+#endif
+    }
 
     /**
      * @brief Stop the CPU (infinite loop)
      */
-    void Stop();
+    static inline void Stop()
+    {
+        while (1)
+        {
+#if defined(__amd64__) || defined(__i386__)
+            asmv("CPUStopLoop:\n"
+                 "cli\n"
+                 "hlt\n"
+                 "jmp CPUStopLoop");
+#elif defined(__aarch64__)
+            while (1)
+            {
+                asmv("msr daifset, #2");
+                asmv("wfe");
+            }
+#endif
+        }
+    }
 
     /**
      * @brief Halt the CPU
      */
-    void Halt();
+    static inline void Halt()
+    {
+#if defined(__amd64__) || defined(__i386__)
+        asmv("hlt");
+#elif defined(__aarch64__)
+        asmv("wfe");
+#endif
+    }
 
     /**
      * @brief Check if interrupts are enabled
@@ -1034,13 +1065,13 @@ namespace CPU
             uint64_t rbx; // Base
             uint64_t rax; // Accumulator
 
-            uint64_t InterruptNumber;    // Interrupt Number
-            uint64_t ErrorCode; // Error code
-            uint64_t rip;        // Instruction Pointer
-            uint64_t cs;         // Code Segment
-            RFLAGS rflags;       // Register Flags
-            uint64_t rsp;        // Stack Pointer
-            uint64_t ss;         // Stack Segment
+            uint64_t InterruptNumber; // Interrupt Number
+            uint64_t ErrorCode;       // Error code
+            uint64_t rip;             // Instruction Pointer
+            uint64_t cs;              // Code Segment
+            RFLAGS rflags;            // Register Flags
+            uint64_t rsp;             // Stack Pointer
+            uint64_t ss;              // Stack Segment
         } TrapFrame;
 
         typedef union CR0