diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs index b810676..64093ef 100644 --- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs +++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Thread.cs | |||
@@ -25,15 +25,9 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using OpenSim.Region.Environment.Scenes; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; | 29 | using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; |
32 | using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes; | 30 | using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes; |
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Interfaces; | ||
35 | using OpenSim.Region.Environment.Scenes; | ||
36 | using OpenSim.Region.ExtensionsScriptModule; | ||
37 | 31 | ||
38 | namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM | 32 | namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM |
39 | { | 33 | { |
@@ -55,8 +49,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM | |||
55 | 49 | ||
56 | public Thread() | 50 | public Thread() |
57 | { | 51 | { |
58 | this.m_Interpreter = new Interpreter(this); | 52 | m_Interpreter = new Interpreter(this); |
59 | this.stack = new Stack(); | 53 | stack = new Stack(); |
60 | } | 54 | } |
61 | 55 | ||
62 | public void SetPC(int methodpointer) | 56 | public void SetPC(int methodpointer) |
@@ -68,15 +62,15 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM | |||
68 | public void StartMethod(ClassRecord rec, string methName) | 62 | public void StartMethod(ClassRecord rec, string methName) |
69 | { | 63 | { |
70 | m_currentFrame = new StackFrame(); | 64 | m_currentFrame = new StackFrame(); |
71 | this.stack.StackFrames.Push(m_currentFrame); | 65 | stack.StackFrames.Push(m_currentFrame); |
72 | this.currentClass = rec; | 66 | currentClass = rec; |
73 | currentClass.StartMethod(this, methName); | 67 | currentClass.StartMethod(this, methName); |
74 | } | 68 | } |
75 | 69 | ||
76 | public void StartMethod( string methName) | 70 | public void StartMethod(string methName) |
77 | { | 71 | { |
78 | m_currentFrame = new StackFrame(); | 72 | m_currentFrame = new StackFrame(); |
79 | this.stack.StackFrames.Push(m_currentFrame); | 73 | stack.StackFrames.Push(m_currentFrame); |
80 | currentClass.StartMethod(this, methName); | 74 | currentClass.StartMethod(this, methName); |
81 | } | 75 | } |
82 | 76 | ||
@@ -84,7 +78,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM | |||
84 | { | 78 | { |
85 | m_currentFrame = new StackFrame(); | 79 | m_currentFrame = new StackFrame(); |
86 | m_currentFrame.ReturnPC = returnPC; | 80 | m_currentFrame.ReturnPC = returnPC; |
87 | this.stack.StackFrames.Push(m_currentFrame); | 81 | stack.StackFrames.Push(m_currentFrame); |
88 | currentClass.StartMethod(this, methName); | 82 | currentClass.StartMethod(this, methName); |
89 | } | 83 | } |
90 | 84 | ||
@@ -95,25 +89,23 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM | |||
95 | BaseType bs1 = m_currentFrame.OpStack.Pop(); | 89 | BaseType bs1 = m_currentFrame.OpStack.Pop(); |
96 | m_currentFrame = new StackFrame(); | 90 | m_currentFrame = new StackFrame(); |
97 | m_currentFrame.ReturnPC = returnPC; | 91 | m_currentFrame.ReturnPC = returnPC; |
98 | this.stack.StackFrames.Push(m_currentFrame); | 92 | stack.StackFrames.Push(m_currentFrame); |
99 | m_currentFrame.LocalVariables[0] = ((Int)bs1); | 93 | m_currentFrame.LocalVariables[0] = ((Int) bs1); |
100 | currentClass.StartMethod(this, methName); | 94 | currentClass.StartMethod(this, methName); |
101 | } | 95 | } |
102 | if (param == "F") | 96 | if (param == "F") |
103 | { | 97 | { |
104 | |||
105 | } | 98 | } |
106 | } | 99 | } |
107 | 100 | ||
108 | public void JumpToClassStaticVoidMethod(string className, string methName, int returnPC) | 101 | public void JumpToClassStaticVoidMethod(string className, string methName, int returnPC) |
109 | { | 102 | { |
110 | |||
111 | } | 103 | } |
112 | 104 | ||
113 | public bool Excute() | 105 | public bool Excute() |
114 | { | 106 | { |
115 | excutionCounter++; | 107 | excutionCounter++; |
116 | return this.m_Interpreter.Excute(); | 108 | return m_Interpreter.Excute(); |
117 | } | 109 | } |
118 | } | 110 | } |
119 | } | 111 | } \ No newline at end of file |