Merge pull request #12 from nekernel-org/devv0.0.5-release

 v0.0.5 (Arlington)

2 files changed, 51 insertions, 7 deletions

diff --git a/dev/DebuggerKit/src/NeKernelContract.cc b/dev/DebuggerKit/src/NeKernelContract.cc
index a071431..53017d6 100644
--- a/dev/DebuggerKit/src/NeKernelContract.cc
+++ b/dev/DebuggerKit/src/NeKernelContract.cc
@@ -16,6 +16,7 @@
 #include <ThirdParty/Dialogs.h>
 
 using namespace DebuggerKit::NeKernel;
+using namespace DebuggerKit::NeKernel::Detail;
 
 NeKernelContract::NeKernelContract() = default;
 
@@ -24,23 +25,67 @@ NeKernelContract::~NeKernelContract() = default;
 BOOL NeKernelContract::Attach(CompilerKit::STLString path, CompilerKit::STLString argv,
                               ProcessID& pid) noexcept {
   if (path.empty() || argv.empty()) return NO;
-  return NO;
+
+  m_socket = ::socket(AF_INET, SOCK_STREAM, 0);
+
+  if (m_socket == -1) return NO;
+
+  struct sockaddr_in server_addr;
+
+  server_addr.sin_family = AF_INET;
+  server_addr.sin_port   = htons(kDebugPort);
+
+  if (::inet_pton(AF_INET, argv.c_str(), &server_addr.sin_addr) <= 0) return NO;
+
+  auto ret = (::connect(m_socket, (struct sockaddr*) &server_addr, sizeof(server_addr)) == -1);
+
+  if (ret) return NO;
+
+  CompilerKit::STLString pkt = Detail::kDebugMagic;
+  pkt += ";\r";
+
+  ret = ::send(m_socket, pkt.data(), pkt.size(), 0) > 0;
+  return ret;
 }
 
 BOOL NeKernelContract::BreakAt(CompilerKit::STLString symbol) noexcept {
-  return NO;
+  CompilerKit::STLString pkt = Detail::kDebugMagic;
+  pkt += ";SYM=";
+  pkt += symbol;
+  pkt += ";\r";
+
+  if (pkt.size() > kDebugCmdLen) return NO;
+
+  auto ret = ::send(m_socket, pkt.data(), pkt.size(), 0) > 0;
+  return ret;
 }
 
 BOOL NeKernelContract::Break() noexcept {
-  return NO;
+  CompilerKit::STLString pkt = Detail::kDebugMagic;
+  pkt += ";BRK=1;\r";
+
+  auto ret = ::send(m_socket, pkt.data(), pkt.size(), 0) > 0;
+  return ret;
 }
 
 BOOL NeKernelContract::Continue() noexcept {
+  CompilerKit::STLString pkt = Detail::kDebugMagic;
+  pkt += ";CONT=1;\r";
+
+  auto ret = ::send(m_socket, pkt.data(), pkt.size(), 0) > 0;
+  return ret;
   return NO;
 }
 
 BOOL NeKernelContract::Detach() noexcept {
-  return NO;
+  CompilerKit::STLString pkt = Detail::kDebugMagic;
+  pkt += ";DTCH=1;\r";
+
+  auto ret = ::send(m_socket, pkt.data(), pkt.size(), 0) > 0;
+
+  if (ret) ::close(m_socket);
+
+  return ret;
 }
 
 #endif  // DK_NEKERNEL_DEBUGGER
diff --git a/dev/DebuggerKit/src/NeKernelContractCLI.cc b/dev/DebuggerKit/src/NeKernelContractCLI.cc
index 0eb04d3..7fea90e 100644
--- a/dev/DebuggerKit/src/NeKernelContractCLI.cc
+++ b/dev/DebuggerKit/src/NeKernelContractCLI.cc
@@ -43,8 +43,7 @@ NECTI_MODULE(DebuggerNeKernel) {
 
     CompilerKit::install_signal(SIGINT, dbgi_ctrlc_handler);
 
-    kKernelDebugger.Attach(kPath, "", kPID);
-    kKernelDebugger.BreakAt("$HANDOVER_START");
+    kKernelDebugger.Attach(kPath, argv[4], kPID);
 
     while (YES) {
       if (kKeepRunning) {
@@ -99,4 +98,4 @@ NECTI_MODULE(DebuggerNeKernel) {
   return EXIT_FAILURE;
 }
 
-#endif  // DK_NEKERNEL_DEBUGGER
\ No newline at end of file
+#endif  // DK_NEKERNEL_DEBUGGER