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

Yengine: change filename extentions on scripts state (better delete contents of bin/scriptengines/yengine .. btw bin/scriptdata is not used anymore )

httptests
UbitUmarov 2018-02-25 00:49:44 +00:00
parent 85b973ce1d
commit 5ff57f01b7
6 changed files with 375 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
private static readonly bool DEBUG_STACKCAPRES = false; private static readonly bool DEBUG_STACKCAPRES = false;
private static readonly bool DEBUG_TRYSTMT = false; private static readonly bool DEBUG_TRYSTMT = false;
public static readonly string OBJECT_CODE_MAGIC = "XMRObjectCode"; 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 = -1; // decremented when compiler or object file changes public static int COMPILED_VERSION_VALUE = -1; // decremented when compiler or object file changes

6
OpenSim/Region/ScriptEngine/YEngine/MMRScriptCompile.cs
View File

@ -48,8 +48,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
string sourceHash = null; string sourceHash = null;
TextWriter saveSource = null; TextWriter saveSource = null;
string objFileName = GetScriptFileName (m_ScriptObjCodeKey + ".xmrobj"); string objFileName = GetScriptFileName (m_ScriptObjCodeKey + ".yobj");
string tmpFileName = GetScriptFileName (m_ScriptObjCodeKey + ".xmrtmp"); string tmpFileName = GetScriptFileName (m_ScriptObjCodeKey + ".ytmp");
// If we already have an object file, don't bother compiling. // If we already have an object file, don't bother compiling.
if (!m_ForceRecomp && File.Exists(objFileName)) if (!m_ForceRecomp && File.Exists(objFileName))
@ -139,7 +139,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// Since we just wrote the .xmrobj file, maybe save disassembly. // Since we just wrote the .xmrobj file, maybe save disassembly.
if (m_Engine.m_ScriptDebugSaveIL) if (m_Engine.m_ScriptDebugSaveIL)
{ {
string asmFileName = GetScriptFileName (m_ScriptObjCodeKey + ".xmrasm"); string asmFileName = GetScriptFileName (m_ScriptObjCodeKey + ".yasm");
// m_log.Debug ("[YEngine]: MMRScriptCompileSaveILGen: saving to " + asmFileName); // m_log.Debug ("[YEngine]: MMRScriptCompileSaveILGen: saving to " + asmFileName);
asmFileWriter = File.CreateText (asmFileName); asmFileWriter = File.CreateText (asmFileName);
} }

2
OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs
View File

@ -90,7 +90,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// Check version number to make sure we know how to process file contents. // Check version number to make sure we know how to process file contents.
char[] ocm = objFileReader.ReadChars(ScriptCodeGen.OBJECT_CODE_MAGIC.Length); char[] ocm = objFileReader.ReadChars(ScriptCodeGen.OBJECT_CODE_MAGIC.Length);
if(new String(ocm) != ScriptCodeGen.OBJECT_CODE_MAGIC) if(new String(ocm) != ScriptCodeGen.OBJECT_CODE_MAGIC)
throw new Exception("not an XMR object file (bad magic)"); throw new Exception("not an Yengine object file (bad magic)");
int cvv = objFileReader.ReadInt32(); int cvv = objFileReader.ReadInt32();
if(cvv != ScriptCodeGen.COMPILED_VERSION_VALUE) if(cvv != ScriptCodeGen.COMPILED_VERSION_VALUE)

1
OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs
View File

@ -412,7 +412,6 @@ namespace OpenSim.Region.ScriptEngine.Yengine
zeroDetectParams)); zeroDetectParams));
break; break;
case StateSource.Teleporting: case StateSource.Teleporting:
PostEvent(new EventParams("changed", PostEvent(new EventParams("changed",
sbcCR, sbcCR,

3
OpenSim/Region/ScriptEngine/YEngine/XMRObjectTokens.cs
View File

@ -42,13 +42,12 @@ using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
/** /**
* Contains classes that disassemble or decompile an xmrobj file. * Contains classes that disassemble or decompile an yobj file.
* See xmrengcomp.cx utility program. * See xmrengcomp.cx utility program.
*/ */
namespace OpenSim.Region.ScriptEngine.Yengine namespace OpenSim.Region.ScriptEngine.Yengine
{ {
/* /*
* Encapsulate object code for a method. * Encapsulate object code for a method.
*/ */