Merge pull request 'feat: writer' (#2) from dev into master

Reviewed-on: https://git.tinysec.net/tinysec/jswd/pulls/2
tinysec · Jun 27, 2023 · 42896d1 · 42896d1
2 parents 9f79d33 + 758c7bc
commit 42896d1
Show file tree

Hide file tree

Showing 19 changed files with 991 additions and 167 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,4 @@ _deps
 /.idea
 /bin
 /.vs
+/out
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,7 +65,7 @@ else ()
 
     FetchContent_Declare(jsex
             GIT_REPOSITORY ${GIT_REPO}
-            GIT_TAG autotag-20230616-092319
+            GIT_TAG autotag-20230627-075036
             )
 
     FetchContent_MakeAvailable(jsex)
@@ -189,6 +189,13 @@ bin2h(
         VARIABLE_NAME "JSWD_BUILTIN_SCRIPT_PHYSICAL"
 )
 
+bin2h(
+        SOURCE_FILE "src/script/jswd/processor.js"
+        HEADER_FILE "${PROJECT_BINARY_DIR}/gen/script/processor.js.h"
+        VARIABLE_NAME "JSWD_BUILTIN_SCRIPT_PROCESSOR"
+)
+
+
 bin2h(
         SOURCE_FILE "src/script/jswd/reader.js"
         HEADER_FILE "${PROJECT_BINARY_DIR}/gen/script/reader.js.h"
@@ -201,6 +208,12 @@ bin2h(
         VARIABLE_NAME "JSWD_BUILTIN_SCRIPT_REGISTER"
 )
 
+bin2h(
+        SOURCE_FILE "src/script/jswd/segment.js"
+        HEADER_FILE "${PROJECT_BINARY_DIR}/gen/script/segment.js.h"
+        VARIABLE_NAME "JSWD_BUILTIN_SCRIPT_SEGMENT"
+)
+
 
 bin2h(
         SOURCE_FILE "src/script/jswd/symbol.js"
@@ -215,6 +228,12 @@ bin2h(
         VARIABLE_NAME "JSWD_BUILTIN_SCRIPT_VIRTUAL"
 )
 
+bin2h(
+        SOURCE_FILE "src/script/jswd/writer.js"
+        HEADER_FILE "${PROJECT_BINARY_DIR}/gen/script/writer.js.h"
+        VARIABLE_NAME "JSWD_BUILTIN_SCRIPT_WRITER"
+)
+
 
 # ===============================================================================================
 # test

diff --git a/jstests/test.js b/jstests/test.js
@@ -1,22 +1,18 @@
-const fmt = require("fmt");
+
+const assert = require("assert");
 
 const jswd = require("jswd");
 
-const _ = require('underscore');
+const dbgeng = require("dbgeng");
 
-let int = require('integer').Uint64;
+const fmt = require("fmt");
 
-/**
- *
- * @param {Array<String>} argv
- */
-function main(argv)
-{
-    fmt.printf("argv[0] is %s\n", argv[0]);
+const typing = require("typing");
 
-    fmt.printf( 'sizeof(nt!_UNICODE_STRING): %d\n' , jswd.sizeof('nt!_UNICODE_STRING') );
 
-    fmt.printf( 'fieldOffset(nt!_UNICODE_STRING , Buffer): %d\n' , jswd.fieldOffset('nt!_UNICODE_STRING' , 'Buffer') );
+function main(argv)
+{
+    fmt.printf( jswd.fieldOffset('_UNICODE_STRING' , 'Buffer') );
 
 
     return 0;

diff --git a/src/binding/dbgeng/binding_data_spaces.cpp b/src/binding/dbgeng/binding_data_spaces.cpp
@@ -425,7 +425,7 @@ _Ret_maybenull_ JsValueRef CALLBACK BindingDbgEng::ReadMsr(
         hr = pthis->m_debugDataSpaces->ReadMsr(arg1Address , &value);
         if  ( !SUCCEEDED(hr) )
         {
-            JsExThrowError("ReadMsr fail 0x%08X" , hr);
+            JsExThrowError("ReadMsr 0x%08X fail 0x%08X" , arg1Address , hr);
             break ;
         }
 
@@ -671,7 +671,7 @@ _Ret_maybenull_ JsValueRef CALLBACK BindingDbgEng::ReadVirtual(
 
         if  ( !SUCCEEDED(hr) )
         {
-            JsExThrowError("ReadVirtual fail 0x%08X" , hr);
+            JsExThrowError("ReadVirtual 0x%X fail 0x%08X" , arg1Offset ,  hr);
             break ;
         }
 

diff --git a/src/binding/dbgeng/binding_dbgeng.cpp b/src/binding/dbgeng/binding_dbgeng.cpp
@@ -512,6 +512,12 @@ JsErrorCode BindingDbgEng::bindDebugDataSpaces()
             break;
         }
 
+        errorCode = this->bindRoutine("writePhysical", BindingDbgEng::WritePhysical);
+        if (JsNoError != errorCode)
+        {
+            break;
+        }
+
         errorCode = this->bindRoutine("writeVirtual", BindingDbgEng::WriteVirtual);
         if (JsNoError != errorCode)
         {

diff --git a/src/binding/dbgeng/binding_system_objects.cpp b/src/binding/dbgeng/binding_system_objects.cpp
@@ -350,6 +350,12 @@ _Ret_maybenull_ JsValueRef CALLBACK BindingDbgEng::GetThreadIdByProcessor(
 
     do
     {
+        if ( argumentCount < 2 )
+        {
+            JsExThrowError("invalid argument cound %d" , argumentCount);
+            break;
+        }
+
          errorCode = JsExAssumeUint32( arguments[1] , &arg1Processor );
         if ( JsNoError != errorCode )
         {
@@ -399,6 +405,12 @@ _Ret_maybenull_ JsValueRef CALLBACK BindingDbgEng::SetCurrentThreadId(
 
     do
     {
+        if ( argumentCount < 2 )
+        {
+            JsExThrowError("invalid argument cound %d" , argumentCount);
+            break;
+        }
+
          errorCode = JsExAssumeUint64( arguments[1] , &arg1Id );
         if ( JsNoError != errorCode )
         {

diff --git a/src/binding/dbgeng/binding_system_objects2.cpp b/src/binding/dbgeng/binding_system_objects2.cpp
@@ -115,6 +115,12 @@ _Ret_maybenull_ JsValueRef CALLBACK BindingDbgEng::SetImplicitProcessDataOffset(
 
     do
     {
+        if ( argumentCount < 2 )
+        {
+            JsExThrowError("invalid argument cound %d" , argumentCount);
+            break;
+        }
+
         errorCode = JsExAssumeUint64( arguments[1] , &arg1Offset );
         if ( JsNoError != errorCode )
         {
@@ -164,6 +170,12 @@ _Ret_maybenull_ JsValueRef CALLBACK BindingDbgEng::SetImplicitThreadDataOffset(
 
     do
     {
+        if ( argumentCount < 2 )
+        {
+            JsExThrowError("invalid argument cound %d" , argumentCount);
+            break;
+        }
+
         errorCode = JsExAssumeUint64( arguments[1] , &arg1Offset );
         if ( JsNoError != errorCode )
         {

diff --git a/src/core/js_pod.cpp b/src/core/js_pod.cpp
@@ -15,15 +15,22 @@
 
 #include <gen/script/module.js.h>
 
+
+#include <gen/script/physical.js.h>
+
+#include <gen/script/processor.js.h>
+
 #include <gen/script/reader.js.h>
 
 #include <gen/script/register.js.h>
 
+#include <gen/script/segment.js.h>
+
 #include <gen/script/symbol.js.h>
 
 #include <gen/script/virtual.js.h>
 
-#include <gen/script/physical.js.h>
+#include <gen/script/writer.js.h>
 
 #include "js_pod.h"
 
@@ -132,6 +139,15 @@ HRESULT JSPod::Initialize()
             break ;
         }
 
+        errorCode = this->m_builtin->RegisterSource(
+            "jswd/processor" ,
+            std::string( (const char*)JSWD_BUILTIN_SCRIPT_PROCESSOR , SIZEOF_JSWD_BUILTIN_SCRIPT_PROCESSOR )
+        );
+        if ( JsNoError != errorCode )
+        {
+            break ;
+        }
+
         errorCode = this->m_builtin->RegisterSource(
             "jswd/reader" ,
             std::string( (const char*)JSWD_BUILTIN_SCRIPT_READER , SIZEOF_JSWD_BUILTIN_SCRIPT_READER )
@@ -146,6 +162,15 @@ HRESULT JSPod::Initialize()
             std::string( (const char*)JSWD_BUILTIN_SCRIPT_REGISTER , SIZEOF_JSWD_BUILTIN_SCRIPT_REGISTER )
         );
         if ( JsNoError != errorCode )
+        {
+            break ;
+        }
+
+         errorCode = this->m_builtin->RegisterSource(
+            "jswd/segment" ,
+            std::string( (const char*)JSWD_BUILTIN_SCRIPT_SEGMENT , SIZEOF_JSWD_BUILTIN_SCRIPT_SEGMENT )
+        );
+        if ( JsNoError != errorCode )
         {
             break ;
         }
@@ -159,6 +184,7 @@ HRESULT JSPod::Initialize()
             break ;
         }
 
+
          errorCode = this->m_builtin->RegisterSource(
             "jswd/virtual" ,
             std::string( (const char*)JSWD_BUILTIN_SCRIPT_VIRTUAL , SIZEOF_JSWD_BUILTIN_SCRIPT_VIRTUAL )
@@ -168,6 +194,14 @@ HRESULT JSPod::Initialize()
             break ;
         }
 
+        errorCode = this->m_builtin->RegisterSource(
+            "jswd/writer" ,
+            std::string( (const char*)JSWD_BUILTIN_SCRIPT_WRITER , SIZEOF_JSWD_BUILTIN_SCRIPT_WRITER )
+        );
+        if ( JsNoError != errorCode )
+        {
+            break ;
+        }
 
         errorCode = this->m_builtin->RegisterSource(
             "jswd" ,
@@ -210,7 +244,11 @@ HRESULT JSPod::InitializeJSRT()
 
     do
     {
+#ifdef _DEBUG
+        this->m_runtime = JsExCreateRuntime(true);
+#else
         this->m_runtime = JsExCreateRuntime(false);
+#endif //#ifdef _DEBUG
         if (nullptr == this->m_runtime)
         {
             break;
@@ -230,6 +268,8 @@ HRESULT JSPod::InitializeJSRT()
             break;
         }
 
+
+
         this->m_binding = NativeBinding::Create();
         if (nullptr == this->m_binding)
         {
@@ -260,6 +300,14 @@ HRESULT JSPod::InitializeJSRT()
             break;
         }
 
+        #ifdef _DEBUG
+            errorCode = JsExEnableDebug();
+            if (JsNoError != errorCode)
+            {
+                break;
+            }
+        #endif // #ifdef _DEBUG
+
         result = S_OK;
     } while (false);