zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 04:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix string return value

Browse source
This commit is contained in:
Magnus Norddahl 2020-06-12 01:21:29 +02:00
parent 96d1e2be50
commit 1e82cf877d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/scripting/jit/jit.cpp
View file

@ -27,7 +27,7 @@ JitFuncPtr JitCompile(VMScriptFunction* sfunc)
JitCompiler compiler(&context, sfunc);
IRFunction* func = compiler.Codegen();
jit->add(&context);
std::string text = context.getFunctionAssembly(func);
//std::string text = context.getFunctionAssembly(func);
return reinterpret_cast<JitFuncPtr>(jit->getPointerToFunction(func->name));
}
catch (...)

2
src/common/scripting/jit/jit_flow.cpp
View file

@ -129,7 +129,7 @@ void JitCompiler::EmitRET()
break;
case REGT_STRING:
{
cc.CreateCall(setReturnString, { location, (regtype & REGT_KONST) ? ConstS(regnum) : LoadS(regnum) });
cc.CreateCall(setReturnString, { OffsetPtr(ret, retnum * sizeof(VMReturn)), (regtype & REGT_KONST) ? ConstS(regnum) : LoadS(regnum) });
break;
}
case REGT_POINTER: