Merge pull request #3353 from Sonicadvance1/public_interface_cleaning

FEXCore interface cleaning
FEX-Emu · Jan 3, 2024 · 04a88ed · 04a88ed
2 parents 9da08b4 + b115c14
commit 04a88ed
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 66 deletions.
diff --git a/FEXCore/Source/CMakeLists.txt b/FEXCore/Source/CMakeLists.txt
@@ -149,7 +149,6 @@ set (SRCS
   Interface/IR/Passes/DeadStoreElimination.cpp
   Interface/IR/Passes/RegisterAllocationPass.cpp
   Interface/IR/Passes/InlineCallOptimization.cpp
-  Utils/NetStream.cpp
   Utils/Telemetry.cpp
   Utils/Threads.cpp
   Utils/Profiler.cpp

diff --git a/FEXCore/Source/Common/SoftFloat.h b/FEXCore/Source/Common/SoftFloat.h
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 
-#include <FEXCore/Utils/BitUtils.h>
 #include <FEXCore/Utils/LogManager.h>
 #include <FEXCore/fextl/sstream.h>
 #include <FEXCore/fextl/string.h>
+#include <FEXHeaderUtils/BitUtils.h>
 
 #include <cmath>
 #include <cstring>

diff --git a/FEXCore/Source/Interface/Context/Context.cpp b/FEXCore/Source/Interface/Context/Context.cpp
@@ -12,10 +12,6 @@
 #include <string.h>
 #include <utility>
 
-namespace FEXCore::HLE {
-  class SyscallVisitor;
-}
-
 namespace FEXCore::Context {
   void InitializeStaticTables(OperatingMode Mode) {
     X86Tables::InitializeInfoTables(Mode);

diff --git a/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.cpp b/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.cpp
@@ -9,10 +9,11 @@
 #include "Interface/HLE/Thunks/Thunks.h"
 
 #include <FEXCore/Core/CoreState.h>
-#include <FEXCore/Utils/BitUtils.h>
 #include <FEXCore/Utils/LogManager.h>
 #include <FEXCore/Utils/MathUtils.h>
 
+#include <FEXHeaderUtils/BitUtils.h>
+
 #include <aarch64/cpu-aarch64.h>
 #include <aarch64/instructions-aarch64.h>
 #include <cpu-features.h>

diff --git a/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Emitter.h b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Emitter.h
@@ -4,13 +4,14 @@
 #include "Interface/Core/ArchHelpers/CodeEmitter/Buffer.h"
 #include "Interface/Core/ArchHelpers/CodeEmitter/Registers.h"
 
-#include <FEXCore/Utils/BitUtils.h>
 #include <FEXCore/Utils/CompilerDefs.h>
 #include <FEXCore/Utils/EnumUtils.h>
 #include <FEXCore/Utils/LogManager.h>
 #include <FEXCore/Utils/MathUtils.h>
 #include <FEXCore/fextl/vector.h>
 
+#include <FEXHeaderUtils/BitUtils.h>
+
 #include <aarch64/assembler-aarch64.h>
 
 #include <array>

diff --git a/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
@@ -6,7 +6,6 @@ desc: Handles x86/64 ops to IR, no-pf opt, local-flags opt
 $end_info$
 */
 
-#include "FEXCore/Utils/BitUtils.h"
 #include "FEXCore/Utils/Telemetry.h"
 #include "Interface/Context/Context.h"
 #include "Interface/Core/OpcodeDispatcher.h"
@@ -23,6 +22,8 @@ desc: Handles x86/64 ops to IR, no-pf opt, local-flags opt
 #include <FEXCore/Utils/EnumUtils.h>
 #include <FEXCore/Utils/LogManager.h>
 
+#include <FEXHeaderUtils/BitUtils.h>
+
 #include <algorithm>
 #include <array>
 #include <bit>

diff --git a/FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.cpp b/FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.cpp
@@ -5,6 +5,8 @@ tags: ir|opts
 $end_info$
 */
 
+#include "Utils/BucketList.h"
+
 #include "Interface/IR/Passes/RegisterAllocationPass.h"
 #include "FEXCore/Core/X86Enums.h"
 #include "Interface/IR/IREmitter.h"
@@ -13,8 +15,6 @@ tags: ir|opts
 #include <FEXCore/IR/IR.h>
 #include <FEXCore/IR/IntrusiveIRList.h>
 #include <FEXCore/IR/RegisterAllocationData.h>
-#include <FEXCore/Utils/BitUtils.h>
-#include <FEXCore/Utils/BucketList.h>
 #include <FEXCore/Utils/LogManager.h>
 #include <FEXCore/Utils/MathUtils.h>
 #include <FEXCore/Utils/Profiler.h>
@@ -24,6 +24,7 @@ tags: ir|opts
 #include <FEXCore/fextl/unordered_set.h>
 #include <FEXCore/fextl/vector.h>
 
+#include <FEXHeaderUtils/BitUtils.h>
 #include <FEXHeaderUtils/TypeDefines.h>
 
 #include <algorithm>

diff --git a/FEXCore/include/FEXCore/Utils/BucketList.h → FEXCore/Source/Utils/BucketList.h b/FEXCore/include/FEXCore/Utils/BucketList.h → FEXCore/Source/Utils/BucketList.h
diff --git a/FEXCore/include/FEXCore/Core/Context.h b/FEXCore/include/FEXCore/Core/Context.h
@@ -33,7 +33,6 @@ namespace FEXCore::CPU {
 
 namespace FEXCore::HLE {
   struct SyscallArguments;
-  class SyscallVisitor;
   class SyscallHandler;
 }
 

diff --git a/FEXCore/include/FEXCore/HLE/SyscallVisitor.h b/FEXCore/include/FEXCore/HLE/SyscallVisitor.h
diff --git a/FEXCore/include/FEXCore/Utils/BitUtils.h → FEXHeaderUtils/FEXHeaderUtils/BitUtils.h b/FEXCore/include/FEXCore/Utils/BitUtils.h → FEXHeaderUtils/FEXHeaderUtils/BitUtils.h
diff --git a/Source/Common/FEXServerClient.cpp b/Source/Common/FEXServerClient.cpp
@@ -5,7 +5,6 @@
 #include <FEXCore/Utils/CompilerDefs.h>
 #include <FEXCore/Utils/FileLoading.h>
 #include <FEXCore/Utils/LogManager.h>
-#include <FEXCore/Utils/NetStream.h>
 #include <FEXCore/fextl/fmt.h>
 #include <FEXCore/fextl/string.h>
 #include <FEXCore/fextl/vector.h>

diff --git a/Source/Tools/CommonTools/HarnessHelpers.h b/Source/Tools/CommonTools/HarnessHelpers.h
@@ -13,7 +13,6 @@
 #include <FEXCore/Core/CoreState.h>
 #include <FEXCore/Core/X86Enums.h>
 #include <FEXCore/Utils/Allocator.h>
-#include <FEXCore/Utils/BitUtils.h>
 #include <FEXCore/Utils/CompilerDefs.h>
 #include <FEXCore/Utils/FileLoading.h>
 #include <FEXCore/Utils/LogManager.h>
@@ -22,6 +21,7 @@
 #include <FEXCore/fextl/map.h>
 #include <FEXCore/fextl/string.h>
 #include <FEXCore/fextl/vector.h>
+#include <FEXHeaderUtils/BitUtils.h>
 #include <FEXHeaderUtils/Syscalls.h>
 #include <FEXHeaderUtils/TypeDefines.h>
 #include <unistd.h>

diff --git a/Source/Tools/LinuxEmulation/CMakeLists.txt b/Source/Tools/LinuxEmulation/CMakeLists.txt
@@ -6,6 +6,7 @@ set (SRCS
   LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp
   LinuxSyscalls/FileManagement.cpp
   LinuxSyscalls/LinuxAllocator.cpp
+  LinuxSyscalls/NetStream.cpp
   LinuxSyscalls/SignalDelegator.cpp
   LinuxSyscalls/Syscalls.cpp
   LinuxSyscalls/SyscallsSMCTracking.cpp

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/GdbServer.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/GdbServer.cpp
@@ -6,6 +6,8 @@ desc: Provides a gdb interface to the guest state
 $end_info$
 */
 
+#include "LinuxSyscalls/NetStream.h"
+
 #include <cstdlib>
 #include <cstdio>
 #include <iomanip>
@@ -24,7 +26,6 @@ desc: Provides a gdb interface to the guest state
 #include <FEXCore/HLE/SyscallHandler.h>
 #include <FEXCore/Utils/CompilerDefs.h>
 #include <FEXCore/Utils/FileLoading.h>
-#include <FEXCore/Utils/NetStream.h>
 #include <FEXCore/Utils/LogManager.h>
 #include <FEXCore/Utils/StringUtils.h>
 #include <FEXCore/Utils/Threads.h>

diff --git a/FEXCore/Source/Utils/NetStream.cpp → ...inuxEmulation/LinuxSyscalls/NetStream.cpp b/FEXCore/Source/Utils/NetStream.cpp → ...inuxEmulation/LinuxSyscalls/NetStream.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
+#include "LinuxSyscalls/NetStream.h"
+
 #include <FEXCore/Utils/Allocator.h>
 #include <FEXCore/Utils/LogManager.h>
-#include <FEXCore/Utils/NetStream.h>
 
 #include <array>
 #include <cstring>

diff --git a/FEXCore/include/FEXCore/Utils/NetStream.h → .../LinuxEmulation/LinuxSyscalls/NetStream.h b/FEXCore/include/FEXCore/Utils/NetStream.h → .../LinuxEmulation/LinuxSyscalls/NetStream.h