osdbg: implement thread info api

libraries/libstratosphere/include/stratosphere.hpp

@@ -71,6 +71,7 @@
 #include <stratosphere/nim.hpp>
 #include <stratosphere/ns.hpp>
 #include <stratosphere/nsd.hpp>
+#include <stratosphere/osdbg.hpp>
 #include <stratosphere/patcher.hpp>
 #include <stratosphere/pcv.hpp>
 #include <stratosphere/pgl.hpp>

libraries/libstratosphere/include/stratosphere/os/os_thread_types.hpp

@@ -36,6 +36,8 @@ namespace ams::os {
     using ThreadImpl = ::Thread;
 
     struct ThreadType {
+        static constexpr u16 Magic = 0xF5A5;
+
         enum State {
             State_NotInitialized         = 0,
             State_Initialized            = 1,
@@ -49,7 +51,9 @@ namespace ams::os {
         uintptr_t reserved[4];
         u8 state;
         u8 suspend_count;
-        s32 base_priority;
+        u16 magic;
+        s16 base_priority;
+        u16 version;
         char name_buffer[ThreadNameLengthMax];
         const char *name_pointer;
         ThreadId thread_id;

libraries/libstratosphere/include/stratosphere/osdbg.hpp

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stratosphere/osdbg/osdbg_thread.hpp>

libraries/libstratosphere/include/stratosphere/osdbg/osdbg_thread.hpp

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <stratosphere/osdbg/osdbg_thread_types.hpp>
+#include <stratosphere/osdbg/osdbg_thread_api.hpp>

libraries/libstratosphere/include/stratosphere/osdbg/osdbg_thread_api.hpp

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <vapours.hpp>
+#include <stratosphere/osdbg/osdbg_thread_api_impl.hpp>
+
+namespace ams::osdbg {
+
+    struct ThreadInfo;
+
+    Result InitializeThreadInfo(ThreadInfo *thread_info, svc::Handle debug_handle, const svc::DebugInfoCreateProcess *create_process, const svc::DebugInfoCreateThread *create_thread);
+    Result UpdateThreadInfo(ThreadInfo *thread_info);
+
+    Result GetThreadName(char *dst, const ThreadInfo *thread_info);
+
+}

libraries/libstratosphere/include/stratosphere/osdbg/osdbg_thread_api_impl.hpp

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <vapours.hpp>
+#include <stratosphere/osdbg/osdbg_thread_types.hpp>
+
+namespace ams::osdbg {
+
+    constexpr inline s32 GetThreadPriority(const ThreadInfo *thread_info) {
+        return thread_info->_base_priority;
+    }
+
+    constexpr inline s32 GetThreadCurrentPriority(const ThreadInfo *thread_info) {
+        return thread_info->_current_priority;
+    }
+
+    constexpr inline size_t GetThreadStackSize(const ThreadInfo *thread_info) {
+        return thread_info->_stack_size;
+    }
+
+    constexpr inline uintptr_t GetThreadStackAddress(const ThreadInfo *thread_info) {
+        return thread_info->_stack;
+    }
+
+    constexpr inline uintptr_t GetThreadFunction(const ThreadInfo *thread_info) {
+        return thread_info->_function;
+    }
+
+    constexpr inline uintptr_t GetThreadFunctionArgument(const ThreadInfo *thread_info) {
+        return thread_info->_argument;
+    }
+
+    constexpr inline uintptr_t GetThreadNamePointer(const ThreadInfo *thread_info) {
+        return thread_info->_name_pointer;
+    }
+
+}

libraries/libstratosphere/include/stratosphere/osdbg/osdbg_thread_types.hpp

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <vapours.hpp>
+
+namespace ams::osdbg {
+
+    namespace impl {
+
+        union ThreadTypeCommon;
+
+    }
+
+    enum ThreadTypeType : u8 {
+        ThreadTypeType_Unknown = 0,
+        ThreadTypeType_Nintendo,
+        ThreadTypeType_Stratosphere,
+        ThreadTypeType_Libnx,
+    };
+
+    struct ThreadInfo {
+        s32 _base_priority;
+        s32 _current_priority;
+        size_t _stack_size;
+        uintptr_t _stack;
+        uintptr_t _argument;
+        uintptr_t _function;
+        uintptr_t _name_pointer;
+        impl::ThreadTypeCommon *_thread_type;
+        svc::Handle _debug_handle;
+        ThreadTypeType _thread_type_type;
+        svc::DebugInfoCreateProcess _debug_info_create_process;
+        svc::DebugInfoCreateThread _debug_info_create_thread;
+    };
+
+}