Skip to content

[pull] master from GaijinEntertainment:master #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Dec 1, 2025
Merged

[pull] master from GaijinEntertainment:master #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3a8359
wrap mat ctors in jit
aleksisch Nov 30, 2025
d735544
make jit work on mac
aleksisch Nov 30, 2025
d5a0617
Merge pull request #1948 from aleksisch/feature/support-jit-mac
borisbat Dec 1, 2025
8b8a055
up2date
borisbat Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/dasLLVM
Open in desktop
Submodule dasLLVM updated from b1df7a to 6e0c2f
5 changes: 4 additions & 1 deletion src/builtin/module_builtin_math.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,10 @@ namespace das {
memset(&res, 0, sizeof(RetT));
return res;
}
virtual void * getBuiltinAddress() const override { return (void *) &ctorFn; }
virtual void * getBuiltinAddress() const override {
constexpr bool IS_CMRES = true;
return ImplWrapCall<IS_CMRES, NeedVectorWrap<RetT(*)()>::value, RetT(*)(), &ctorFn>::get_builtin_address();
}
};

class Module_Math : public Module {
Expand Down
2 changes: 1 addition & 1 deletion src/builtin/module_jit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ extern "C" {
#if defined(_WIN32) || defined(_WIN64)
auto result = fmt::format_to(cmd, FMT_STRING("clang-cl {} {} msvcrt.lib -link -DLL -OUT:{} 2>&1"), objFilePath, jitModuleObj, libraryName);
#elif defined(__APPLE__)
auto result = fmt::format_to(cmd, FMT_STRING("clang -shared -o {} {} 2>&1"), libraryName, objFilePath);
auto result = fmt::format_to(cmd, FMT_STRING("clang -shared -o {} {} {} 2>&1"), libraryName, jitModuleObj, objFilePath);
#else
auto result = fmt::format_to(cmd, FMT_STRING("gcc -shared -o {} {} 2>&1"), libraryName, objFilePath);
#endif
Expand Down
11 changes: 9 additions & 2 deletions src/misc/sysos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,15 @@
return dlopen(lib,RTLD_LAZY);
}
string normalizeFileName ( const char * fileName ) {
// TODO: implement
return "";
char buffer[PATH_MAX];

// Use realpath to resolve the absolute path and normalize it
if (realpath(fileName, buffer) != nullptr) {
return buffer;
} else {
// If realpath fails (e.g., file doesn't exist), fallback
return fileName ? fileName : "";
}
}
bool closeLibrary ( void * module ) {
return dlclose(module) == 0;
Expand Down