Skip to content

Fixed a problem with Boolean in CFunction::Call. #419

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
merged 4 commits into from
Sep 25, 2021
Merged

Fixed a problem with Boolean in CFunction::Call. #419

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e79928c
Fixed a problem with Boolean in CFunction::Call.
CookStar Sep 23, 2021
353185c
Revert "Fixed a problem with Boolean in CFunction::Call."
CookStar Sep 24, 2021
8eb8e41
Merge branch 'master' into fix_bool_function_call
CookStar Sep 24, 2021
86826c1
Changed DynCall's DC_BOOL to bool instead of int.
CookStar Sep 24, 2021
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
Prev Previous commit
Next Next commit
Revert "Fixed a problem with Boolean in CFunction::Call." 
This reverts commit e79928c.
  • Loading branch information
@CookStar
CookStar committed Sep 24, 2021
commit 353185cb55901f91fa8adc39aadd0b59feaa0025
11 changes: 1 addition & 10 deletions src/core/modules/memory/memory_function.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,6 @@ void CallHelperVoid(DCCallVM* vm, unsigned long addr)
EXCEPT_SEGV()
}

bool CallHelperBool(DCCallVM* vm, unsigned long addr)
{
bool result;
TRY_SEGV()
result = dcCallBool(vm, addr) & 1;
EXCEPT_SEGV()
return result;
}

object CFunction::Call(tuple args, dict kw)
{
if (!IsCallable())
Expand Down Expand Up @@ -318,7 +309,7 @@ object CFunction::Call(tuple args, dict kw)
switch(m_eReturnType)
{
case DATA_TYPE_VOID: CallHelperVoid(g_pCallVM, m_ulAddr); break;
case DATA_TYPE_BOOL: return object(CallHelperBool(g_pCallVM, m_ulAddr));
case DATA_TYPE_BOOL: return object(CallHelper<bool>(dcCallBool, g_pCallVM, m_ulAddr));
case DATA_TYPE_CHAR: return object(CallHelper<char>(dcCallChar, g_pCallVM, m_ulAddr));
case DATA_TYPE_UCHAR: return object(CallHelper<unsigned char>(dcCallChar, g_pCallVM, m_ulAddr));
case DATA_TYPE_SHORT: return object(CallHelper<short>(dcCallShort, g_pCallVM, m_ulAddr));
Expand Down