OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mantis 8717: fix local heap use account (will automatlic recompile scripts)

master
UbitUmarov 2020-06-27 13:33:11 +01:00
parent d7089bcff2
commit 16cfb3deab
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
{ {
public static readonly string OBJECT_CODE_MAGIC = "YObjectCode"; public static readonly string OBJECT_CODE_MAGIC = "YObjectCode";
// reserve positive version values for original xmr // reserve positive version values for original xmr
public static int COMPILED_VERSION_VALUE = -6; // decremented when compiler or object file changes public static int COMPILED_VERSION_VALUE = -7; // decremented when compiler or object file changes
public static readonly int CALL_FRAME_MEMUSE = 64; public static readonly int CALL_FRAME_MEMUSE = 64;
public static readonly int STRING_LEN_TO_MEMUSE = 2; public static readonly int STRING_LEN_TO_MEMUSE = 2;
@ -1384,13 +1384,14 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// Output code body. // Output code body.
GenerateStmtBlock(curDeclFunc.body); GenerateStmtBlock(curDeclFunc.body);
/*
if (doheap) if (doheap)
{ {
PushXMRInst(); PushXMRInst();
ilGen.Emit(curDeclFunc, OpCodes.Ldloc, curHeapSize); ilGen.Emit(curDeclFunc, OpCodes.Ldloc, curHeapSize);
ilGen.Emit(curDeclFunc, OpCodes.Stfld, heapUsedFieldInfo); ilGen.Emit(curDeclFunc, OpCodes.Stfld, heapUsedFieldInfo);
} }
*/
// If code falls through to this point, means they are missing // If code falls through to this point, means they are missing
// a return statement. And that is legal only if the function // a return statement. And that is legal only if the function
// returns 'void'. // returns 'void'.
@ -1468,6 +1469,14 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// Output the 'real' return opcode. // Output the 'real' return opcode.
// push return value // push return value
ilGen.MarkLabel(retLabel); ilGen.MarkLabel(retLabel);
if (doheap)
{
PushXMRInst();
ilGen.Emit(curDeclFunc, OpCodes.Ldloc, curHeapSize);
ilGen.Emit(curDeclFunc, OpCodes.Stfld, heapUsedFieldInfo);
}
if (!(curDeclFunc.retType is TokenTypeVoid)) if (!(curDeclFunc.retType is TokenTypeVoid))
{ {
ilGen.Emit(curDeclFunc, OpCodes.Ldloc, retValue); ilGen.Emit(curDeclFunc, OpCodes.Ldloc, retValue);