feat(libc): windows native module support #490
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| /* example of JS module importing a C module */ | ||
| import * as os from "os"; | ||
|
|
||
| const isWin = os.platform === 'win32'; | ||
| const { fib } = await import(`./fib.${isWin ? 'dll' : 'so'}`); | ||
|
|
||
| console.log("Hello World"); | ||
| console.log("fib(10)=", fib(10)); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,6 +96,14 @@ extern char **environ; | |
|
|
||
| #define MAX_SAFE_INTEGER (((int64_t) 1 << 53) - 1) | ||
|
|
||
| #ifndef QJS_NATIVE_MODULE_SUFFIX | ||
| #ifdef _WIN32 | ||
| #define QJS_NATIVE_MODULE_SUFFIX ".dll" | ||
| #else | ||
| #define QJS_NATIVE_MODULE_SUFFIX ".so" | ||
zeromake marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| #endif | ||
| #endif | ||
|
|
||
| /* TODO: | ||
| - add socket calls | ||
| */ | ||
|
|
@@ -482,7 +490,53 @@ typedef JSModuleDef *(JSInitModuleFunc)(JSContext *ctx, | |
| const char *module_name); | ||
|
|
||
|
|
||
| #if defined(_WIN32) | ||
| static JSModuleDef *js_module_loader_so(JSContext *ctx, | ||
| const char *module_name) | ||
| { | ||
| JSModuleDef *m; | ||
| HINSTANCE hd; | ||
| JSInitModuleFunc *init; | ||
| char *filename = NULL; | ||
| size_t len = strlen(module_name); | ||
| JS_BOOL is_absolute = len > 2 && ((module_name[0] >= 'A' && module_name[0] <= 'Z') || | ||
| (module_name[0] >= 'a' && module_name[0] <= 'z')) && module_name[1] == ':'; | ||
| JS_BOOL is_relative = len > 2 && module_name[0] == '.' && (module_name[1] == '/' || module_name[1] == '\\'); | ||
| if (is_absolute || is_relative) { | ||
| filename = (char *)module_name; | ||
| } else { | ||
| filename = js_malloc(ctx, len + 2 + 1); | ||
| if (!filename) | ||
| return NULL; | ||
| strcpy(filename, "./"); | ||
| strcpy(filename + 2, module_name); | ||
| } | ||
| hd = LoadLibraryA(filename); | ||
| if (filename != module_name) | ||
| js_free(ctx, filename); | ||
| if (hd == NULL) { | ||
zeromake marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| JS_ThrowReferenceError(ctx, "js_load_module '%s' error: %lu", | ||
| module_name, GetLastError()); | ||
| goto fail; | ||
| } | ||
| init = (JSInitModuleFunc *)(uintptr_t)GetProcAddress(hd, "js_init_module"); | ||
| if (!init) { | ||
| JS_ThrowReferenceError(ctx, "js_init_module '%s' not found: %lu", | ||
| module_name, GetLastError()); | ||
|
There was a problem hiding this comment. It'd be nicer to use FormatMessageA() to get a human-readable error message (example) There was a problem hiding this comment. @bnoordhuis struct JSContext {
char* errmsg;
}
static int js_error(JSContext *ctx) {
if (ctx->errmsg) {
LocalFree(ctx->errmsg);
ctx->errmsg = NULL;
}
// FormatMessageA ……
}There was a problem hiding this comment. @bnoordhuis Doing it The Right Way (TM) seems a bit involved: https://github.com/libuv/libuv/blob/0a00e80c3686b93eccb9a801954e86bd7d7fe6ab/src/win/dl.c#L92 perhaps we can simplify here? |
||
| goto fail; | ||
| } | ||
| m = init(ctx, module_name); | ||
| if (!m) { | ||
| JS_ThrowReferenceError(ctx, "js_call_module '%s' initialization error", | ||
| module_name); | ||
| fail: | ||
| if (hd != NULL) | ||
| FreeLibrary(hd); | ||
| return NULL; | ||
| } | ||
| return m; | ||
| } | ||
| #elif defined(__wasi__) | ||
| static JSModuleDef *js_module_loader_so(JSContext *ctx, | ||
| const char *module_name) | ||
| { | ||
|
|
@@ -598,7 +652,7 @@ JSModuleDef *js_module_loader(JSContext *ctx, | |
| { | ||
| JSModuleDef *m; | ||
|
|
||
| if (has_suffix(module_name, QJS_NATIVE_MODULE_SUFFIX)) { | ||
| m = js_module_loader_so(ctx, module_name); | ||
| } else { | ||
| size_t buf_len; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.