Skip to content

Adds workaround for ARM macs #403

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
StephenNneji merged 2 commits into from
Jul 23, 2025
Merged

Adds workaround for ARM macs #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03ed762
Adds workaround for ARM macs
StephenNneji Jul 17, 2025
6c36896
Addresses review comment
StephenNneji Jul 23, 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
4 changes: 2 additions & 2 deletions compile/customWrapper/classHandle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ template<class base> inline std::string convertPtr2String(base *ptr)
return std::to_string(handle);
}

template<class base> inline ClassHandle<base> *convertString2HandlePtr(const char* in)
template<class base> inline ClassHandle<base> *convertString2HandlePtr(const char* in, int size)
{
uint64_t value = stoull(std::string(in));
uint64_t value = stoull(std::string(in).substr(0, size));
ClassHandle<base> *ptr = reinterpret_cast<ClassHandle<base> *>(value);
if (!ptr->isValid())
throw std::invalid_argument("callback handle is not valid");
Expand Down
7 changes: 4 additions & 3 deletions compile/customWrapper/wrapperMex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ template<class base> inline mxArray *convertPtr2Mat(base *ptr)
return mxCreateString(convertPtr2String<base>(ptr).c_str());
}

template<class base> inline void destroyObject(const char* in)
template<class base> inline void destroyObject(const char* in, size_t size)
{
delete convertString2HandlePtr<base>(in);
delete convertString2HandlePtr<base>(in, size);
mexUnlock();
}

Expand Down Expand Up @@ -51,7 +51,8 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
if (!strcmp("delete", cmd)) {
if (nrhs != 2)
mexErrMsgTxt("Second input for delete command should be a class instance handle.");
destroyObject<CallbackInterface>(getStringFromMxArray(prhs[1], "class instance handle should a row vector char array"));
size_t size = mxGetNumberOfElements(prhs[1]);
destroyObject<CallbackInterface>(getStringFromMxArray(prhs[1], "class instance handle should be a row vector char array"), size);
if (nlhs != 0 || nrhs != 2)
mexWarnMsgTxt("Delete: Unexpected arguments ignored.");
return;
Expand Down
2 changes: 1 addition & 1 deletion targetFunctions/common/customModelFunctions/callCppFunction.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
coder.cinclude('classHandle.hpp')

callbackHandle = coder.opaque('ClassHandle<CallbackInterface> *','NULL');
callbackHandle = coder.ceval('convertString2HandlePtr<CallbackInterface>', pointer);
callbackHandle = coder.ceval('convertString2HandlePtr<CallbackInterface>', pointer, numel(pointer));

callback = coder.opaque('CallbackInterface *','NULL');
callback = coder.ceval('std::mem_fn(&ClassHandle<CallbackInterface>::ptr)', callbackHandle);
Expand Down