From b115c144fb8288ff9dee969091c8f48cff4b79c2 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Mon, 25 Dec 2023 07:07:17 -0800
Subject: [PATCH] FEXCore: Removes NetStream from public API

Only used by GDBServer.
NFC.
---
 FEXCore/Source/CMakeLists.txt                                  | 1 -
 Source/Common/FEXServerClient.cpp                              | 1 -
 Source/Tools/LinuxEmulation/CMakeLists.txt                     | 1 +
 Source/Tools/LinuxEmulation/LinuxSyscalls/GdbServer.cpp        | 3 ++-
 .../Tools/LinuxEmulation/LinuxSyscalls}/NetStream.cpp          | 3 ++-
 .../Tools/LinuxEmulation/LinuxSyscalls}/NetStream.h            | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename {FEXCore/Source/Utils => Source/Tools/LinuxEmulation/LinuxSyscalls}/NetStream.cpp (98%)
 rename {FEXCore/include/FEXCore/Utils => Source/Tools/LinuxEmulation/LinuxSyscalls}/NetStream.h (100%)

diff --git a/FEXCore/Source/CMakeLists.txt b/FEXCore/Source/CMakeLists.txt
index 1f4ed43f8..36b820dc2 100644
--- 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/Source/Common/FEXServerClient.cpp b/Source/Common/FEXServerClient.cpp
index 5fe651c46..6717c9cc3 100644
--- 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/LinuxEmulation/CMakeLists.txt b/Source/Tools/LinuxEmulation/CMakeLists.txt
index 66e5fb771..780c824c9 100644
--- 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
index 4304e1581..521af25f4 100644
--- 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 @@ $end_info$
 #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 b/Source/Tools/LinuxEmulation/LinuxSyscalls/NetStream.cpp
similarity index 98%
rename from FEXCore/Source/Utils/NetStream.cpp
rename to Source/Tools/LinuxEmulation/LinuxSyscalls/NetStream.cpp
index 932ba5607..7e8d3735f 100644
--- a/FEXCore/Source/Utils/NetStream.cpp
+++ b/Source/Tools/LinuxEmulation/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 b/Source/Tools/LinuxEmulation/LinuxSyscalls/NetStream.h
similarity index 100%
rename from FEXCore/include/FEXCore/Utils/NetStream.h
rename to Source/Tools/LinuxEmulation/LinuxSyscalls/NetStream.h