Skip to content

Fixed missing type info in object register when returning from sys call #24

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

Open
bluecataudio wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed missing type info in object register when returning from sys call #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c9604a
Fixed missing type info in object register when returning from sys call
bluecataudio Apr 3, 2017
f064eb7
Fixing indent in previous commit
bluecataudio Apr 3, 2017
f6f3ab9
Fixing issues with angelscript 2.33.0
bluecataudio Sep 6, 2018
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
39 changes: 24 additions & 15 deletions as_jit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1706,13 +1706,14 @@ int asCJITCompiler::CompileFunction(asIScriptFunction *function, asJITFunction *
esi += sizeof(void*);
break;
//case asBC_PshRPtr: //All pushes are handled above, near asBC_PshC4
case asBC_STR:
/* deprecated with Angelscript 2.32
case asBC_STR:
{
const asCString &str = ((asCScriptEngine*)function->GetEngine())->GetConstantString(asBC_WORDARG0(pOp));
esi -= sizeof(void*) + sizeof(asDWORD);
as<void*>(*esi + sizeof(asDWORD)) = (void*)str.AddressOf();
as<asDWORD>(*esi) = (asDWORD)str.GetLength();
} break;
} break;*/
case asBC_CALLSYS:
case asBC_Thiscall1:
{
Expand Down Expand Up @@ -1977,24 +1978,29 @@ int asCJITCompiler::CompileFunction(asIScriptFunction *function, asJITFunction *

//Add reference to object 1, if not null
arg1 &= arg1;
auto prev = cpu.prep_long_jump(Zero);
{
asCScriptFunction* func = (asCScriptFunction*)function->GetEngine()->GetFunctionById(beh->addref);
sysCall.callSystemFunction(func, &arg1, callFlags);
}
cpu.end_long_jump(prev);
if (beh->addref)
{
auto prev = cpu.prep_long_jump(Zero);
{
asCScriptFunction* func = (asCScriptFunction*)function->GetEngine()->GetFunctionById(beh->addref);
sysCall.callSystemFunction(func, &arg1, callFlags);
}
cpu.end_long_jump(prev);
}

//Release reference from object 2, if not null
arg1 = as<void*>(*esp+local::object2);
arg1 = as<void*>(*arg1);
arg1 &= arg1;
auto dest = cpu.prep_long_jump(Zero);
{
asCScriptFunction* func = (asCScriptFunction*)function->GetEngine()->GetFunctionById(beh->release);
sysCall.callSystemFunction(func, &arg1, callFlags);
}
cpu.end_long_jump(dest);

if (beh->release)
{
auto dest = cpu.prep_long_jump(Zero);
{
asCScriptFunction* func = (asCScriptFunction*)function->GetEngine()->GetFunctionById(beh->release);
sysCall.callSystemFunction(func, &arg1, callFlags);
}
cpu.end_long_jump(dest);
}
pax = as<void*>(*esp + local::object1);
pdx = as<void*>(*esp + local::object2);
as<void*>(*pdx) = pax;
Expand Down Expand Up @@ -3829,6 +3835,7 @@ void SystemCall::call_64conv(asSSystemFunctionInterface* func,
if(sFunc->returnType.IsObjectHandle()) {
Register ret = as<void*>(cpu.intReturn64());
as<void*>(*ebp + offsetof(asSVMRegisters,objectRegister)) = ret;
as<void*>(*ebp + offsetof(asSVMRegisters,objectType)) = sFunc->returnType.GetTypeInfo();

//Add reference for returned auto handle
if(func->returnAutoHandle) {
Expand Down Expand Up @@ -3959,6 +3966,7 @@ void SystemCall::call_getReturn(asSSystemFunctionInterface* func, asCScriptFunct
}

as<void*>(*ebp + offsetof(asSVMRegisters,objectRegister)) = eax;
as<void*>(*ebp + offsetof(asSVMRegisters,objectType)) = sFunc->returnType.GetTypeInfo();

//Add reference for returned auto handle
if(func->returnAutoHandle) {
Expand Down Expand Up @@ -4015,6 +4023,7 @@ void SystemCall::call_getReturn(asSSystemFunctionInterface* func, asCScriptFunct
else {
//Store object pointer
as<void*>(*ebp + offsetof(asSVMRegisters,objectRegister)) = ecx;
as<void*>(*ebp + offsetof(asSVMRegisters,objectType)) = sFunc->returnType.GetTypeInfo();
}
}
}
Expand Down