better

Author: aleksisch

CMakeLists.txt

@@ -646,9 +646,7 @@ SET(RUNTIME_DEFAULT_MODULES
     src/builtin/module_builtin_array.cpp
     src/builtin/module_builtin_ast_serialize.cpp
     src/builtin/module_builtin_dasbind.cpp
-    src/builtin/module_builtin_debugger.cpp
     src/builtin/module_builtin_fio.cpp
-    src/builtin/module_builtin_jobque.cpp
     src/builtin/module_builtin_math.cpp
     src/builtin/module_builtin_misc_types.cpp
     src/builtin/module_builtin_runtime.cpp
@@ -659,7 +657,6 @@ SET(RUNTIME_DEFAULT_MODULES
     src/builtin/module_builtin_vector.cpp
     src/builtin/module_builtin_vector_ctor.cpp
     src/builtin/module_file_access.cpp
-    src/builtin/module_jit.cpp
 )
 LIST(APPEND RUNTIME_MODULES ${RUNTIME_DEFAULT_MODULES})
 
@@ -678,8 +675,11 @@ src/builtin/module_builtin_ast_annotations_2.cpp
 src/builtin/module_builtin_ast_annotations_3.cpp
 src/builtin/module_builtin_ast_adapters.cpp
 src/builtin/module_builtin_ast.h
+src/builtin/module_builtin_debugger.cpp
+src/builtin/module_builtin_jobque.cpp
 src/builtin/module_builtin_uriparser.h
 src/builtin/module_builtin_network.cpp
+src/builtin/module_jit.cpp
 )
 list(SORT BUILTIN_SRC)
 SOURCE_GROUP_FILES("module builtin" BUILTIN_SRC)
@@ -702,6 +702,7 @@ src/simulate/simulate_exceptions.cpp
 src/simulate/simulate_instrument.cpp
 
 src/runtime/context.cpp
+src/runtime/jit_runtime.cpp
 src/simulate/json_scan.cpp
 src/simulate/json_print.cpp
 

doc/source/stdlib/handmade/function-fio-for_each_registered_dynamic_module-0xd2869eeda9404b7d.rst

@@ -0,0 +1 @@
+Iterates over all registered dynamic modules, invoking the block with the shared library path, C++ module name, and daslang module name for each entry.

doc/source/stdlib/handmade/function-fio-for_each_registered_native_path-0x739bf6ab4c1fa7e4.rst

@@ -0,0 +1 @@
+Iterates over all registered native path prefix mappings, invoking the block with the module name, source prefix, and destination prefix for each entry.

include/daScript/ast/ast.h

@@ -1249,6 +1249,7 @@ namespace das
         das_hash_map<string,Type>                   options;            // options
         uint64_t                                    cumulativeHash = 0; // hash of all mangled names in this module (for builtin modules)
         string                                      name;
+        string                                      cppClassName;       // C++ class name (e.g. "Module_Math"), set by REGISTER_MODULE
         uint64_t                                    nameHash = 0;
         string                                      fileName;           // where the module was found, if not built-in
         union {
@@ -1268,15 +1269,21 @@ namespace das
         };
     private:
         Module * next = nullptr;
+        friend bool appendBuiltinModuleContent ( Module* mod, const string & modName, const unsigned char * const str, unsigned int str_len );
         unique_ptr<FileInfo>    ownFileInfo;
         FileAccessPtr           promotedAccess;
     };
+    bool appendBuiltinModuleContent ( Module* mod, const string & modName, const unsigned char * const str, unsigned int str_len );
 
     #define REGISTER_MODULE(ClassName) \
         DAS_EXPORT_DLL das::Module * register_##ClassName () { \
             das::daScriptEnvironment::ensure(); \
             ClassName * module_##ClassName = new ClassName(); \
+            module_##ClassName->cppClassName = #ClassName; \
             return module_##ClassName; \
+        } \
+        extern "C" DAS_EXPORT_DLL das::Module * jit_register_##ClassName () { \
+            return register_##ClassName(); \
         }
 
     #if DAS_ENABLE_DLL
@@ -1286,6 +1293,7 @@ namespace das
                 if ( buildId != DAS_BUILD_ID ) return nullptr; \
                 das::daScriptEnvironment::ensure(); \
                 ClassName * module_##ClassName = new ClassName(); \
+                module_##ClassName->cppClassName = #ClassName; \
                 return module_##ClassName; \
             } \
         }
@@ -1301,7 +1309,11 @@ namespace das
         DAS_EXPORT_DLL das::Module * register_##ClassName () { \
             das::daScriptEnvironment::ensure(); \
             Namespace::ClassName * module_##ClassName = new Namespace::ClassName(); \
+            module_##ClassName->cppClassName = #ClassName; \
             return module_##ClassName; \
+        } \
+        extern "C" DAS_EXPORT_DLL das::Module * jit_register_##ClassName () { \
+            return register_##ClassName(); \
         }
 
     using module_pull_t = das::Module*(*)();

include/daScript/simulate/aot_builtin_jit.h

@@ -3,9 +3,43 @@
 #include "daScript/misc/vectypes.h"
 #include "daScript/misc/arraytype.h"
 #include "daScript/misc/smart_ptr.h"
+#include "daScript/simulate/simulate.h"
 
 namespace das {
 
+
+    typedef vec4f ( * JitFunction ) ( Context * , vec4f *, void * );
+
+    struct SimNode_Jit : SimNode {
+        SimNode_Jit ( const LineInfo & at, JitFunction eval )
+            : SimNode(at), func(eval) {}
+        virtual SimNode * visit ( SimVisitor & vis ) override;
+        DAS_EVAL_ABI virtual vec4f eval ( Context & context ) override;
+        virtual bool rtti_node_isJit() const override { return true; }
+        JitFunction func = nullptr;
+        // saved original node
+        SimNode * saved_code = nullptr;
+        bool saved_aot = false;
+        void * saved_aot_function = nullptr;
+    };
+
+    struct SimNode_JitBlock;
+
+    struct JitBlock : Block {
+        vec4f   node[10];
+    };
+
+    struct SimNode_JitBlock : SimNode_ClosureBlock {
+        SimNode_JitBlock ( const LineInfo & at, JitBlockFunction eval, Block * bptr, uint64_t ad )
+            : SimNode_ClosureBlock(at,false,false,ad), func(eval), blockPtr(bptr) {}
+        virtual SimNode * visit ( SimVisitor & vis ) override;
+        DAS_EVAL_ABI virtual vec4f eval ( Context & context ) override;
+        JitBlockFunction func = nullptr;
+        Block * blockPtr = nullptr;
+    };
+    static_assert(sizeof(SimNode_JitBlock)<=sizeof(JitBlock().node),"jit block node must fit under node size");
+
+
     class Context;
     struct LineInfo;
     struct LineInfoArg;

modules/dasAudio/CMakeLists.txt

@@ -52,6 +52,8 @@ IF ((NOT DAS_AUDIO_INCLUDED) AND ((NOT ${DAS_AUDIO_DISABLED}) OR (NOT DEFINED DA
 
 	SETUP_AUDIO(libDasModuleAudio)
 	SETUP_AUDIO(dasModuleAudio)
+	# audio depends on rtti module => required libDaScriptDyn.
+	TARGET_LINK_LIBRARIES(dasModuleAudio PRIVATE libDaScriptDyn)
 
 	# HRTF FFT convolution — compile minfft.c directly (avoids cross-DLL static lib issues on Windows)
 	SET(DAS_MINFFT_INCLUDE ${PROJECT_SOURCE_DIR}/modules/dasMinfft/minfft)

modules/dasHV/CMakeLists.txt

@@ -104,6 +104,7 @@ IF ((NOT DAS_HV_INCLUDED) AND ((NOT ${DAS_HV_DISABLED}) OR (NOT DEFINED DAS_HV_D
 
 	ADD_MODULE_CPP(HV)
 	ADD_MODULE_LIB(libDasModuleHV dasModuleHV ${DAS_HV_MODULE_SRC} ${DAS_HV_MODULE_PLATFORM_SRC})
+	TARGET_LINK_LIBRARIES(dasModuleHV PRIVATE libDaScriptDyn)
 	MACRO(SETUP_HV lib)
 		TARGET_INCLUDE_DIRECTORIES(${lib} PRIVATE "${DAS_HV_DIR}/hv/include")
 		TARGET_LINK_LIBRARIES(${lib} PRIVATE ${HV_LIBRARIES} ${OPENSSL_LIBRARIES_FILES})

modules/dasHV/src/dasHV.cpp

@@ -1,4 +1,5 @@
 #include "daScript/misc/platform.h"
+#include "daScript/daScriptModule.h"
 
 #include <future>
 
@@ -15,6 +16,12 @@ IMPLEMENT_EXTERNAL_TYPE_FACTORY(HttpResponse,HttpResponse)
 IMPLEMENT_EXTERNAL_TYPE_FACTORY(HttpContext,hv::HttpContext)
 IMPLEMENT_EXTERNAL_TYPE_FACTORY(HttpResponseWriter,hv::HttpResponseWriter)
 
+void addDependencies() {
+    if (!das::Module::require("rtti_core")) {
+        NEED_MODULE(Module_Rtti);
+    }
+}
+
 namespace das {
 
 class Enumeration_ws_opcode : public das::Enumeration {
@@ -1125,6 +1132,7 @@ class Module_HV : public Module {
         ModuleLibrary lib;
         lib.addModule(this);
         lib.addBuiltInModule();
+        addDependencies();
         lib.addModule(Module::require("rtti_core"));
         addEnumeration(make_smart<Enumeration_ws_opcode>());
         addEnumeration(make_smart<Enumeration_ws_session_type>());