Network code basics (#6)

* temp

* Some new ideas

* packet framework + reorganize some files

temp

Some new ideas

packet framework + reorganize some files

Text display work

Author: kiwi515

include/revolution/SO/SOCommon.h

@@ -72,8 +72,8 @@ typedef enum {
 
 typedef enum {
     SO_SO_REUSEADDR = 0x0004,
-    SO_SO_SNDBUF = 0x1002,
-    SO_SO_RCVBUF = 0x1003,
+    SO_SO_SNDBUF = 0x1001,
+    SO_SO_RCVBUF = 0x1002,
 } SOSockOpt;
 
 typedef enum { SO_SHUT_RD, SO_SHUT_WR, SO_SHUT_RDWR } SOShutdownType;

lib/libkiwi/core/kiwiJSON.cpp

@@ -143,7 +143,7 @@ void Reader::DecodeImpl() {
         ParseEncoding(pos);
     }
 
-    // TODO: Implement UTF-16 parsing
+    // TODO(kiwi) Implement UTF-16 parsing
     K_ASSERT_EX(mEncoding == EEncoding_UTF8,
                 "UTF-16 encoding is not yet supported");
 
@@ -1231,7 +1231,7 @@ void PrintVisitor::Visit(const Element& rElement) {
                  it != rElement.Get<Object>().End(); ++it, i++) {
                 Print('\"' + (it->key + "\": "));
 
-                // TODO: Fix this somehow?
+                // TODO(kiwi) Fix this somehow?
                 Visit(it->value);
 
                 // Values are comma separated

lib/libkiwi/core/kiwiJSON.h

@@ -153,7 +153,7 @@ class Element {
         K_ASSERT(mType == EType_Object);
         const Element* pElement = Get<Object>().Find(rKey);
 
-        // TODO: Better way to return a dummy element?
+        // TODO(kiwi) Better way to return a dummy element?
         if (pElement == nullptr) {
             static const Element undefined;
             return undefined;

lib/libkiwi/core/kiwiJSONImpl.hpp

@@ -139,7 +139,7 @@ template <> K_INLINE void Element::Set<Object>(const Object& rValue) {
 /**@{*/
 template <> K_INLINE Null_t& Element::Get<Null_t>() {
     K_ASSERT(mType == EType_Null);
-    // TODO: Better way to solve this problem?
+    // TODO(kiwi) Better way to solve this problem?
     return const_cast<Null_t&>(json::null);
 }
 template <> K_INLINE const Null_t& Element::Get<Null_t>() const {

lib/libkiwi/core/kiwiMemStream.cpp

@@ -157,11 +157,11 @@ s32 MemStream::PeekImpl(void* pDst, u32 size) {
 
 /**
  * @brief Reads a C-style string from this stream
- * @note String size limited to 0x400 (1024) bytes
+ * @note String size limited to 0x400 (1024) characters
  */
 String MemStream::Read_string() {
     static int sTextBufferPos = 0;
-    static char sTextBuffer[0x400];
+    static char sTextBuffer[1024 / sizeof(char)];
 
     // Form string in work buffer
     while (sTextBufferPos < K_LENGTHOF(sTextBuffer)) {
@@ -204,4 +204,53 @@ String MemStream::Peek_string() {
     return str;
 }
 
+/**
+ * @brief Reads a C-style widechar string from this stream
+ * @note String size limited to 0x200 (512) characters
+ */
+WString MemStream::Read_wstring() {
+    static int sTextBufferPos = 0;
+    static wchar_t sTextBuffer[1024 / sizeof(wchar_t)];
+
+    // Form string in work buffer
+    while (sTextBufferPos < K_LENGTHOF(sTextBuffer)) {
+        wchar_t ch = Read_u16();
+        sTextBuffer[sTextBufferPos++] = ch;
+
+        // Null terminator
+        if (ch == L'\0') {
+            break;
+        }
+
+        // End-of-file
+        if (IsEOF()) {
+            break;
+        }
+    }
+
+    // No matter what happened, null terminator should be at the end
+    sTextBuffer[sTextBufferPos] = L'\0';
+    return WString(sTextBuffer);
+}
+
+/**
+ * @brief Writes a C-style widechar string to this stream
+ *
+ * @param rStr String
+ */
+void MemStream::Write_wstring(const WString& rStr) {
+    Write(rStr.CStr(), rStr.Length() * sizeof(wchar_t));
+    Write_u16(0x0000);
+}
+
+/**
+ * @brief Reads a C-style widechar string from this stream without advancing
+ * the stream's position
+ */
+WString MemStream::Peek_wstring() {
+    WString str = Read_wstring();
+    Seek(ESeekDir_Current, -((str.Length() + 1) * sizeof(wchar_t)));
+    return str;
+}
+
 } // namespace kiwi

lib/libkiwi/core/kiwiMemStream.h

@@ -160,7 +160,7 @@ class MemStream : public FileStream {
 
     /**
      * @brief Reads a C-style string from this stream
-     * @note String size limited to 0x400 (1024) bytes
+     * @note String size limited to 0x400 (1024) characters
      */
     String Read_string();
     /**
@@ -175,6 +175,23 @@ class MemStream : public FileStream {
      */
     String Peek_string();
 
+    /**
+     * @brief Reads a C-style widechar string from this stream
+     * @note String size limited to 0x200 (512) characters
+     */
+    WString Read_wstring();
+    /**
+     * @brief Writes a C-style widechar string to this stream
+     *
+     * @param rStr String
+     */
+    void Write_wstring(const WString& rStr);
+    /**
+     * @brief Reads a C-style widechar string from this stream without advancing
+     * the stream's position
+     */
+    WString Peek_wstring();
+
 private:
     /**
      * @brief Advances this stream's position (internal implementation)

lib/libkiwi/core/kiwiMemoryMgr.h

@@ -82,7 +82,7 @@ class MemoryMgr : public StaticSingleton<MemoryMgr> {
     EGG::Heap* GetHeap(EMemory memory) const;
 
 private:
-// TODO: How to get more MEM1 memory from WS2?
+// TODO(kiwi) How to get more MEM1 memory from WS2?
 #if defined(PACK_SPORTS) || defined(PACK_PLAY)
     //! Initial size for each heap
     static const u32 HEAP_SIZE = OS_MEM_KB_TO_B(1024);

lib/libkiwi/core/kiwiThread.cpp lib/libkiwi/core/kiwiStdThread.cpplib/libkiwi/core/kiwiThread.cpp renamed to lib/libkiwi/core/kiwiStdThread.cpp

@@ -1,5 +1,3 @@
-#include <libkiwi/prim/kiwiBitCast.h>
-
 #include <libkiwi.h>
 
 namespace kiwi {
@@ -8,37 +6,38 @@ namespace detail {
 /**
  * @brief Constructor
  */
-ThreadImpl::ThreadImpl() : mpOSThread(nullptr), mpThreadStack(nullptr) {
+StdThreadImpl::StdThreadImpl() : mpOSThread(nullptr), mpThreadStack(nullptr) {
     // Thread & stack aligned to 32
     mpOSThread = new (32) OSThread();
     K_ASSERT_PTR(mpOSThread);
     mpThreadStack = new (32) u8[scStackSize];
     K_ASSERT_PTR(mpThreadStack);
 
-    BOOL success =
-        OSCreateThread(mpOSThread, nullptr, nullptr,
-                       mpThreadStack + scStackSize, scStackSize, scPriority, 0);
+    BOOL success = OSCreateThread(mpOSThread, nullptr, nullptr,
+                                  mpThreadStack + scStackSize, scStackSize,
+                                  OS_PRIORITY_MAX - 1, 0);
+
     K_ASSERT(success);
 }
 
 /**
  * @brief Destructor
  */
-ThreadImpl::~ThreadImpl() {
+StdThreadImpl::~StdThreadImpl() {
     K_ASSERT_PTR(mpOSThread);
     K_ASSERT_EX(*mpOSThread->stackEnd == OS_THREAD_STACK_MAGIC,
                 "Thread stack overflow!!!");
 
     OSDetachThread(mpOSThread);
 
     delete mpOSThread;
-    delete mpThreadStack;
+    delete[] mpThreadStack;
 }
 
 /**
  * @brief Begins execution on this thread
  */
-void ThreadImpl::Start() {
+void StdThreadImpl::Start() {
     K_ASSERT_PTR(mpOSThread);
     K_ASSERT(mpOSThread->state == OS_THREAD_STATE_READY);
     K_ASSERT_EX(mpOSThread->context.srr0 != 0, "No function to call");
@@ -51,7 +50,7 @@ void ThreadImpl::Start() {
 /**
  * @brief Waits for this thread to finish executing
  */
-void ThreadImpl::Join() {
+void StdThreadImpl::Join() {
     K_ASSERT_PTR(mpOSThread);
 
     BOOL success = OSJoinThread(mpOSThread, nullptr);
@@ -63,7 +62,7 @@ void ThreadImpl::Join() {
  *
  * @param addr Function address (new SRR0 value)
  */
-void ThreadImpl::SetFunction(const void* addr) {
+void StdThreadImpl::SetFunction(const void* addr) {
     K_ASSERT_PTR(mpOSThread);
     K_ASSERT(addr != 0);
     mpOSThread->context.srr0 = BitCast<u32>(addr);
@@ -75,7 +74,7 @@ void ThreadImpl::SetFunction(const void* addr) {
  * @param i GPR number
  * @param value New value
  */
-void ThreadImpl::SetGPR(u32 idx, u32 value) {
+void StdThreadImpl::SetGPR(u32 idx, u32 value) {
     K_ASSERT_PTR(mpOSThread);
     K_ASSERT(idx >= 0 && idx < K_LENGTHOF(mpOSThread->context.gprs));
     mpOSThread->context.gprs[idx] = value;

lib/libkiwi/core/kiwiThread.h lib/libkiwi/core/kiwiStdThread.hlib/libkiwi/core/kiwiThread.h renamed to lib/libkiwi/core/kiwiStdThread.h

@@ -1,5 +1,5 @@
-#ifndef LIBKIWI_CORE_THREAD_H
-#define LIBKIWI_CORE_THREAD_H
+#ifndef LIBKIWI_CORE_STD_THREAD_H
+#define LIBKIWI_CORE_STD_THREAD_H
 #include <libkiwi/debug/kiwiAssert.h>
 #include <libkiwi/k_types.h>
 
@@ -16,7 +16,7 @@ namespace detail {
 /**
  * @brief Common thread implementation
  */
-class ThreadImpl {
+class StdThreadImpl {
 public:
     /**
      * @brief Waits for this thread to finish executing
@@ -27,11 +27,11 @@ class ThreadImpl {
     /**
      * @brief Constructor
      */
-    ThreadImpl();
+    StdThreadImpl();
     /**
      * @brief Destructor
      */
-    ~ThreadImpl();
+    ~StdThreadImpl();
 
     /**
      * @brief Begins execution on this thread
@@ -77,7 +77,7 @@ class ThreadImpl {
  * @details Similar to std::thread.
  * @note Only allows GPR arguments
  */
-class Thread : public detail::ThreadImpl {
+class StdThread : public detail::StdThreadImpl {
 public:
     // Thread function parameter
     typedef void* Param;
@@ -92,14 +92,14 @@ class Thread : public detail::ThreadImpl {
      *
      * @param pFunc Static, no-parameter function
      */
-    template <typename TRet> Thread(TRet (*pFunc)());
+    template <typename TRet> StdThread(TRet (*pFunc)());
     /**
      * @brief Constructor
      *
      * @param pFunc Static, single-parameter function
      * @param pArg Function argument
      */
-    template <typename TRet> Thread(TRet (*pFunc)(Param), Param pArg);
+    template <typename TRet> StdThread(TRet (*pFunc)(Param), Param pArg);
     /**@}*/
 
     /**
@@ -113,7 +113,7 @@ class Thread : public detail::ThreadImpl {
      * @param rObj Class instance
      */
     template <typename TRet, typename TClass>
-    Thread(TRet (TClass::*pFunc)(), TClass& rObj);
+    StdThread(TRet (TClass::*pFunc)(), TClass& rObj);
     /**
      * @brief Constructor
      *
@@ -122,7 +122,7 @@ class Thread : public detail::ThreadImpl {
      * @param pArg Function argument
      */
     template <typename TRet, typename TClass>
-    Thread(TRet (TClass::*pFunc)(Param), TClass& rObj, Param pArg);
+    StdThread(TRet (TClass::*pFunc)(Param), TClass& rObj, Param pArg);
     /**@}*/
 
     /**
@@ -136,7 +136,7 @@ class Thread : public detail::ThreadImpl {
      * @param rObj Class instance
      */
     template <typename TRet, typename TClass>
-    Thread(TRet (TClass::*pFunc)() const, const TClass& rObj);
+    StdThread(TRet (TClass::*pFunc)() const, const TClass& rObj);
     /**
      * @brief Constructor
      *
@@ -145,7 +145,8 @@ class Thread : public detail::ThreadImpl {
      * @param pArg Function argument
      */
     template <typename TRet, typename TClass>
-    Thread(TRet (TClass::*pFunc)(Param) const, const TClass& rObj, Param pArg);
+    StdThread(TRet (TClass::*pFunc)(Param) const, const TClass& rObj,
+              Param pArg);
     /**@}*/
 };
 
@@ -154,7 +155,7 @@ class Thread : public detail::ThreadImpl {
 
 // Implementation header
 #ifndef LIBKIWI_CORE_THREAD_IMPL_HPP
-#include <libkiwi/core/kiwiThreadImpl.hpp>
+#include <libkiwi/core/kiwiStdThreadImpl.hpp>
 #endif
 
 #endif