diff options
author | lbsa71 | 2007-08-06 12:54:13 +0000 |
---|---|---|
committer | lbsa71 | 2007-08-06 12:54:13 +0000 |
commit | 74cd26b7228f20bcd9fb2503a81045a36d80a63a (patch) | |
tree | 77770b931db549155b9340fb6f8d60fa8d601287 /OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine | |
parent | * Now we have boxes. Yay! (diff) | |
download | opensim-SC-74cd26b7228f20bcd9fb2503a81045a36d80a63a.zip opensim-SC-74cd26b7228f20bcd9fb2503a81045a36d80a63a.tar.gz opensim-SC-74cd26b7228f20bcd9fb2503a81045a36d80a63a.tar.bz2 opensim-SC-74cd26b7228f20bcd9fb2503a81045a36d80a63a.tar.xz |
Part 1 of a two-part commit to change caps of 'scripting' dir...
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine')
23 files changed, 0 insertions, 2232 deletions
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassInstance.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassInstance.cs deleted file mode 100644 index 4b734a3..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassInstance.cs +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.Scripting.EmbeddedJVM.Types; | ||
32 | |||
33 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
34 | { | ||
35 | public class ClassInstance : Object | ||
36 | { | ||
37 | public int Size; | ||
38 | public ClassRecord ClassRec; | ||
39 | public Dictionary<string, BaseType> Fields = new Dictionary<string, BaseType>(); | ||
40 | |||
41 | public ClassInstance() | ||
42 | { | ||
43 | |||
44 | } | ||
45 | } | ||
46 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassRecord.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassRecord.cs deleted file mode 100644 index 4b2aec3..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassRecord.cs +++ /dev/null | |||
@@ -1,640 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | using OpenSim.Region.Scripting.EmbeddedJVM.Types; | ||
33 | using OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes; | ||
34 | |||
35 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
36 | { | ||
37 | public class ClassRecord | ||
38 | { | ||
39 | private ushort m_majorVersion; | ||
40 | private ushort m_minorVersion; | ||
41 | private ushort m_constantPoolCount; | ||
42 | private ushort m_accessFlags; | ||
43 | private ushort m_thisClass; | ||
44 | private ushort m_supperClass; | ||
45 | private ushort m_interfaceCount; | ||
46 | private ushort m_fieldCount; | ||
47 | private ushort m_methodCount; | ||
48 | //private ushort _attributeCount; | ||
49 | //private string _name; | ||
50 | public Dictionary<string, BaseType> StaticFields = new Dictionary<string, BaseType>(); | ||
51 | public PoolClass MClass; | ||
52 | |||
53 | public List<PoolItem> m_constantsPool = new List<PoolItem>(); | ||
54 | private List<MethodInfo> m_methodsList = new List<MethodInfo>(); | ||
55 | private List<FieldInfo> m_fieldList = new List<FieldInfo>(); | ||
56 | |||
57 | public ClassRecord() | ||
58 | { | ||
59 | |||
60 | } | ||
61 | |||
62 | public ClassInstance CreateNewInstance() | ||
63 | { | ||
64 | ClassInstance classInst = new ClassInstance(); | ||
65 | classInst.ClassRec = this; | ||
66 | //TODO: set fields | ||
67 | |||
68 | return classInst; | ||
69 | } | ||
70 | |||
71 | public void LoadClassFromFile(string fileName) | ||
72 | { | ||
73 | Console.WriteLine("loading script " + fileName); | ||
74 | FileStream fs = File.OpenRead(fileName); | ||
75 | this.LoadClassFromBytes(ReadFully(fs)); | ||
76 | fs.Close(); | ||
77 | } | ||
78 | |||
79 | public void LoadClassFromBytes(byte[] data) | ||
80 | { | ||
81 | int i = 0; | ||
82 | i += 4; | ||
83 | m_minorVersion = (ushort)((data[i++] << 8) + data[i++]); | ||
84 | m_majorVersion = (ushort)((data[i++] << 8) + data[i++]); | ||
85 | m_constantPoolCount = (ushort)((data[i++] << 8) + data[i++]); | ||
86 | Console.WriteLine("there should be " + m_constantPoolCount + " items in the pool"); | ||
87 | for (int count = 0; count < (m_constantPoolCount - 1); count++) | ||
88 | { | ||
89 | //read in the constant pool | ||
90 | byte pooltype = data[i++]; | ||
91 | Console.WriteLine("#" + count + ": new constant type = " + pooltype); | ||
92 | //Console.WriteLine("start position is: " + i); | ||
93 | switch (pooltype) | ||
94 | { | ||
95 | case 1: //Utf8 | ||
96 | ushort uLength = (ushort)((data[i++] << 8) + data[i++]); | ||
97 | |||
98 | // Console.WriteLine("new utf8 type, length is " + uLength); | ||
99 | PoolUtf8 utf8 = new PoolUtf8(); | ||
100 | utf8.readValue(data, ref i, uLength); | ||
101 | this.m_constantsPool.Add(utf8); | ||
102 | break; | ||
103 | case 3: //Int | ||
104 | break; | ||
105 | case 4: //Float | ||
106 | break; | ||
107 | case 7: //Class | ||
108 | PoolClass pClass = new PoolClass(this); | ||
109 | pClass.readValue(data, ref i); | ||
110 | this.m_constantsPool.Add(pClass); | ||
111 | break; | ||
112 | case 9: //FieldRef | ||
113 | PoolFieldRef pField = new PoolFieldRef(this); | ||
114 | pField.readValue(data, ref i); | ||
115 | this.m_constantsPool.Add(pField); | ||
116 | break; | ||
117 | case 10: //Method | ||
118 | PoolMethodRef pMeth = new PoolMethodRef(this); | ||
119 | pMeth.readValue(data, ref i); | ||
120 | this.m_constantsPool.Add(pMeth); | ||
121 | break; | ||
122 | case 12: //NamedType | ||
123 | PoolNamedType pNamed = new PoolNamedType(this); | ||
124 | pNamed.readValue(data, ref i); | ||
125 | this.m_constantsPool.Add(pNamed); | ||
126 | break; | ||
127 | } | ||
128 | } | ||
129 | |||
130 | m_accessFlags = (ushort)((data[i++] << 8) + data[i++]); | ||
131 | m_thisClass = (ushort)((data[i++] << 8) + data[i++]); | ||
132 | m_supperClass = (ushort)((data[i++] << 8) + data[i++]); | ||
133 | |||
134 | if (this.m_constantsPool[this.m_thisClass - 1] is PoolClass) | ||
135 | { | ||
136 | this.MClass = ((PoolClass)this.m_constantsPool[this.m_thisClass - 1]); | ||
137 | } | ||
138 | |||
139 | m_interfaceCount = (ushort)((data[i++] << 8) + data[i++]); | ||
140 | //should now read in the info for each interface | ||
141 | |||
142 | m_fieldCount = (ushort)((data[i++] << 8) + data[i++]); | ||
143 | //should now read in the info for each field | ||
144 | for (int count = 0; count < m_fieldCount; count++) | ||
145 | { | ||
146 | FieldInfo fieldInf = new FieldInfo(this); | ||
147 | fieldInf.ReadData(data, ref i); | ||
148 | this.m_fieldList.Add(fieldInf); | ||
149 | } | ||
150 | |||
151 | m_methodCount = (ushort)((data[i++] << 8) + data[i++]); | ||
152 | for (int count = 0; count < m_methodCount; count++) | ||
153 | { | ||
154 | MethodInfo methInf = new MethodInfo(this); | ||
155 | methInf.ReadData(data, ref i); | ||
156 | this.m_methodsList.Add(methInf); | ||
157 | } | ||
158 | } | ||
159 | |||
160 | public void AddMethodsToMemory(MethodMemory memory) | ||
161 | { | ||
162 | for (int count = 0; count < m_methodCount; count++) | ||
163 | { | ||
164 | this.m_methodsList[count].AddMethodCode(memory); | ||
165 | } | ||
166 | } | ||
167 | |||
168 | public bool StartMethod(Thread thread, string methodName) | ||
169 | { | ||
170 | for (int count = 0; count < m_methodCount; count++) | ||
171 | { | ||
172 | if (this.m_constantsPool[this.m_methodsList[count].NameIndex - 1] is PoolUtf8) | ||
173 | { | ||
174 | if (((PoolUtf8)this.m_constantsPool[this.m_methodsList[count].NameIndex - 1]).Value == methodName) | ||
175 | { | ||
176 | //Console.WriteLine("found method: " + ((PoolUtf8)this._constantsPool[this._methodsList[count].NameIndex - 1]).Value); | ||
177 | thread.SetPC(this.m_methodsList[count].CodePointer); | ||
178 | return true; | ||
179 | } | ||
180 | } | ||
181 | } | ||
182 | return false; | ||
183 | } | ||
184 | |||
185 | public void PrintToConsole() | ||
186 | { | ||
187 | Console.WriteLine("Class File:"); | ||
188 | Console.WriteLine("Major version: " + m_majorVersion); | ||
189 | Console.WriteLine("Minor version: " + m_minorVersion); | ||
190 | Console.WriteLine("Pool size: " + m_constantPoolCount); | ||
191 | |||
192 | for (int i = 0; i < m_constantsPool.Count; i++) | ||
193 | { | ||
194 | this.m_constantsPool[i].Print(); | ||
195 | } | ||
196 | |||
197 | Console.WriteLine("Access flags: " + m_accessFlags); | ||
198 | Console.WriteLine("This class: " + m_thisClass); | ||
199 | Console.WriteLine("Super class: " + m_supperClass); | ||
200 | |||
201 | for (int count = 0; count < m_fieldCount; count++) | ||
202 | { | ||
203 | Console.WriteLine(); | ||
204 | this.m_fieldList[count].Print(); | ||
205 | } | ||
206 | |||
207 | for (int count = 0; count < m_methodCount; count++) | ||
208 | { | ||
209 | Console.WriteLine(); | ||
210 | this.m_methodsList[count].Print(); | ||
211 | } | ||
212 | |||
213 | Console.WriteLine("class name is " + this.MClass.Name.Value); | ||
214 | } | ||
215 | |||
216 | public static byte[] ReadFully(Stream stream) | ||
217 | { | ||
218 | byte[] buffer = new byte[1024]; | ||
219 | using (MemoryStream ms = new MemoryStream()) | ||
220 | { | ||
221 | while (true) | ||
222 | { | ||
223 | int read = stream.Read(buffer, 0, buffer.Length); | ||
224 | if (read <= 0) | ||
225 | return ms.ToArray(); | ||
226 | ms.Write(buffer, 0, read); | ||
227 | } | ||
228 | } | ||
229 | } | ||
230 | |||
231 | #region nested classes | ||
232 | public class PoolItem | ||
233 | { | ||
234 | public virtual void Print() | ||
235 | { | ||
236 | |||
237 | } | ||
238 | } | ||
239 | |||
240 | public class PoolUtf8 : PoolItem | ||
241 | { | ||
242 | public string Value = ""; | ||
243 | |||
244 | public void readValue(byte[] data, ref int pointer, int length) | ||
245 | { | ||
246 | for (int i = 0; i < length; i++) | ||
247 | { | ||
248 | int a = (int)data[pointer++]; | ||
249 | if ((a & 0x80) == 0) | ||
250 | { | ||
251 | Value = Value + (char)a; | ||
252 | } | ||
253 | else if ((a & 0x20) == 0) | ||
254 | { | ||
255 | int b = (int)data[pointer++]; | ||
256 | Value = Value + (char)(((a & 0x1f) << 6) + (b & 0x3f)); | ||
257 | } | ||
258 | else | ||
259 | { | ||
260 | int b = (int)data[pointer++]; | ||
261 | int c = (int)data[pointer++]; | ||
262 | Value = Value + (char)(((a & 0xf) << 12) + ((b & 0x3f) << 6) + (c & 0x3f)); | ||
263 | } | ||
264 | } | ||
265 | } | ||
266 | |||
267 | public override void Print() | ||
268 | { | ||
269 | Console.WriteLine("Utf8 type: " + Value); | ||
270 | } | ||
271 | } | ||
272 | |||
273 | private class PoolInt : PoolItem | ||
274 | { | ||
275 | |||
276 | } | ||
277 | |||
278 | public class PoolClass : PoolItem | ||
279 | { | ||
280 | //public string name = ""; | ||
281 | public ushort namePointer = 0; | ||
282 | private ClassRecord parent; | ||
283 | public PoolUtf8 Name; | ||
284 | |||
285 | public PoolClass(ClassRecord paren) | ||
286 | { | ||
287 | parent = paren; | ||
288 | } | ||
289 | |||
290 | public void readValue(byte[] data, ref int pointer) | ||
291 | { | ||
292 | namePointer = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
293 | } | ||
294 | |||
295 | public override void Print() | ||
296 | { | ||
297 | this.Name = ((PoolUtf8)this.parent.m_constantsPool[namePointer - 1]); | ||
298 | Console.Write("Class type: " + namePointer); | ||
299 | Console.WriteLine(" // " + ((PoolUtf8)this.parent.m_constantsPool[namePointer - 1]).Value); | ||
300 | |||
301 | } | ||
302 | } | ||
303 | |||
304 | public class PoolFieldRef : PoolItem | ||
305 | { | ||
306 | public ushort classPointer = 0; | ||
307 | public ushort nameTypePointer = 0; | ||
308 | public PoolNamedType mNameType; | ||
309 | public PoolClass mClass; | ||
310 | private ClassRecord parent; | ||
311 | |||
312 | public PoolFieldRef(ClassRecord paren) | ||
313 | { | ||
314 | parent = paren; | ||
315 | } | ||
316 | |||
317 | public void readValue(byte[] data, ref int pointer) | ||
318 | { | ||
319 | classPointer = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
320 | nameTypePointer = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
321 | } | ||
322 | |||
323 | public override void Print() | ||
324 | { | ||
325 | this.mNameType = ((PoolNamedType)this.parent.m_constantsPool[nameTypePointer - 1]); | ||
326 | this.mClass = ((PoolClass)this.parent.m_constantsPool[classPointer - 1]); | ||
327 | Console.WriteLine("FieldRef type: " + classPointer + " , " + nameTypePointer); | ||
328 | } | ||
329 | } | ||
330 | |||
331 | public class PoolMethodRef : PoolItem | ||
332 | { | ||
333 | public ushort classPointer = 0; | ||
334 | public ushort nameTypePointer = 0; | ||
335 | public PoolNamedType mNameType; | ||
336 | public PoolClass mClass; | ||
337 | private ClassRecord parent; | ||
338 | |||
339 | public PoolMethodRef(ClassRecord paren) | ||
340 | { | ||
341 | parent = paren; | ||
342 | } | ||
343 | |||
344 | public void readValue(byte[] data, ref int pointer) | ||
345 | { | ||
346 | classPointer = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
347 | nameTypePointer = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
348 | } | ||
349 | |||
350 | public override void Print() | ||
351 | { | ||
352 | this.mNameType = ((PoolNamedType)this.parent.m_constantsPool[nameTypePointer - 1]); | ||
353 | this.mClass = ((PoolClass)this.parent.m_constantsPool[classPointer - 1]); | ||
354 | Console.WriteLine("MethodRef type: " + classPointer + " , " + nameTypePointer); | ||
355 | } | ||
356 | } | ||
357 | |||
358 | public class PoolNamedType : PoolItem | ||
359 | { | ||
360 | public ushort namePointer = 0; | ||
361 | public ushort typePointer = 0; | ||
362 | private ClassRecord parent; | ||
363 | public PoolUtf8 Name; | ||
364 | public PoolUtf8 Type; | ||
365 | |||
366 | public PoolNamedType(ClassRecord paren) | ||
367 | { | ||
368 | parent = paren; | ||
369 | } | ||
370 | |||
371 | public void readValue(byte[] data, ref int pointer) | ||
372 | { | ||
373 | namePointer = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
374 | typePointer = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
375 | } | ||
376 | |||
377 | public override void Print() | ||
378 | { | ||
379 | Name = ((PoolUtf8)this.parent.m_constantsPool[namePointer - 1]); | ||
380 | Type = ((PoolUtf8)this.parent.m_constantsPool[typePointer - 1]); | ||
381 | Console.Write("Named type: " + namePointer + " , " + typePointer); | ||
382 | Console.WriteLine(" // " + ((PoolUtf8)this.parent.m_constantsPool[namePointer - 1]).Value); | ||
383 | } | ||
384 | } | ||
385 | |||
386 | //*********************** | ||
387 | public class MethodInfo | ||
388 | { | ||
389 | public ushort AccessFlags = 0; | ||
390 | public ushort NameIndex = 0; | ||
391 | public string Name = ""; | ||
392 | public ushort DescriptorIndex = 0; | ||
393 | public ushort AttributeCount = 0; | ||
394 | public List<MethodAttribute> Attributes = new List<MethodAttribute>(); | ||
395 | private ClassRecord parent; | ||
396 | public int CodePointer = 0; | ||
397 | |||
398 | public MethodInfo(ClassRecord paren) | ||
399 | { | ||
400 | parent = paren; | ||
401 | } | ||
402 | |||
403 | public void AddMethodCode(MethodMemory memory) | ||
404 | { | ||
405 | Array.Copy(this.Attributes[0].Code, 0, memory.MethodBuffer, memory.NextMethodPC, this.Attributes[0].Code.Length); | ||
406 | memory.Methodcount++; | ||
407 | this.CodePointer = memory.NextMethodPC; | ||
408 | memory.NextMethodPC += this.Attributes[0].Code.Length; | ||
409 | } | ||
410 | |||
411 | public void ReadData(byte[] data, ref int pointer) | ||
412 | { | ||
413 | AccessFlags = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
414 | NameIndex = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
415 | DescriptorIndex = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
416 | AttributeCount = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
417 | for (int i = 0; i < AttributeCount; i++) | ||
418 | { | ||
419 | MethodAttribute attri = new MethodAttribute(this.parent); | ||
420 | attri.ReadData(data, ref pointer); | ||
421 | this.Attributes.Add(attri); | ||
422 | } | ||
423 | } | ||
424 | |||
425 | public void Print() | ||
426 | { | ||
427 | Console.WriteLine("Method Info Struct: "); | ||
428 | Console.WriteLine("AccessFlags: " + AccessFlags); | ||
429 | Console.WriteLine("NameIndex: " + NameIndex + " // " + ((PoolUtf8)this.parent.m_constantsPool[NameIndex - 1]).Value); | ||
430 | Console.WriteLine("DescriptorIndex: " + DescriptorIndex + " // " + ((PoolUtf8)this.parent.m_constantsPool[DescriptorIndex - 1]).Value); | ||
431 | Console.WriteLine("Attribute Count:" + AttributeCount); | ||
432 | for (int i = 0; i < AttributeCount; i++) | ||
433 | { | ||
434 | this.Attributes[i].Print(); | ||
435 | } | ||
436 | } | ||
437 | |||
438 | public class MethodAttribute | ||
439 | { | ||
440 | public ushort NameIndex = 0; | ||
441 | public string Name = ""; | ||
442 | public Int32 Length = 0; | ||
443 | //for now only support code attribute | ||
444 | public ushort MaxStack = 0; | ||
445 | public ushort MaxLocals = 0; | ||
446 | public Int32 CodeLength = 0; | ||
447 | public byte[] Code; | ||
448 | public ushort ExceptionTableLength = 0; | ||
449 | public ushort SubAttributeCount = 0; | ||
450 | public List<SubAttribute> SubAttributes = new List<SubAttribute>(); | ||
451 | private ClassRecord parent; | ||
452 | |||
453 | public MethodAttribute(ClassRecord paren) | ||
454 | { | ||
455 | parent = paren; | ||
456 | } | ||
457 | |||
458 | public void ReadData(byte[] data, ref int pointer) | ||
459 | { | ||
460 | NameIndex = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
461 | Length = (Int32)((data[pointer++] << 24) + (data[pointer++] << 16) + (data[pointer++] << 8) + data[pointer++]); | ||
462 | MaxStack = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
463 | MaxLocals = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
464 | CodeLength = (Int32)((data[pointer++] << 24) + (data[pointer++] << 16) + (data[pointer++] << 8) + data[pointer++]); | ||
465 | Code = new byte[CodeLength]; | ||
466 | for (int i = 0; i < CodeLength; i++) | ||
467 | { | ||
468 | Code[i] = data[pointer++]; | ||
469 | } | ||
470 | ExceptionTableLength = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
471 | SubAttributeCount = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
472 | for (int i = 0; i < SubAttributeCount; i++) | ||
473 | { | ||
474 | SubAttribute subAttri = new SubAttribute(this.parent); | ||
475 | subAttri.ReadData(data, ref pointer); | ||
476 | this.SubAttributes.Add(subAttri); | ||
477 | } | ||
478 | } | ||
479 | |||
480 | public void Print() | ||
481 | { | ||
482 | Console.WriteLine("Method Attribute: "); | ||
483 | Console.WriteLine("Name Index: " + NameIndex + " // " + ((PoolUtf8)this.parent.m_constantsPool[NameIndex - 1]).Value); | ||
484 | Console.WriteLine("Length: " + Length); | ||
485 | Console.WriteLine("MaxStack: " + MaxStack); | ||
486 | Console.WriteLine("MaxLocals: " + MaxLocals); | ||
487 | Console.WriteLine("CodeLength: " + CodeLength); | ||
488 | for (int i = 0; i < Code.Length; i++) | ||
489 | { | ||
490 | Console.WriteLine("OpCode #" + i + " is: " + Code[i]); | ||
491 | } | ||
492 | Console.WriteLine("SubAttributes: " + SubAttributeCount); | ||
493 | for (int i = 0; i < SubAttributeCount; i++) | ||
494 | { | ||
495 | this.SubAttributes[i].Print(); | ||
496 | } | ||
497 | } | ||
498 | |||
499 | public class SubAttribute | ||
500 | { | ||
501 | public ushort NameIndex = 0; | ||
502 | public string Name = ""; | ||
503 | public Int32 Length = 0; | ||
504 | public byte[] Data; | ||
505 | private ClassRecord parent; | ||
506 | |||
507 | public SubAttribute(ClassRecord paren) | ||
508 | { | ||
509 | parent = paren; | ||
510 | } | ||
511 | |||
512 | public void ReadData(byte[] data, ref int pointer) | ||
513 | { | ||
514 | NameIndex = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
515 | Length = (Int32)((data[pointer++] << 24) + (data[pointer++] << 16) + (data[pointer++] << 8) + data[pointer++]); | ||
516 | Data = new byte[Length]; | ||
517 | for (int i = 0; i < Length; i++) | ||
518 | { | ||
519 | Data[i] = data[pointer++]; | ||
520 | } | ||
521 | } | ||
522 | |||
523 | public void Print() | ||
524 | { | ||
525 | Console.WriteLine("SubAttribute: NameIndex: " + NameIndex + " // " + ((PoolUtf8)this.parent.m_constantsPool[NameIndex - 1]).Value); | ||
526 | } | ||
527 | |||
528 | } | ||
529 | } | ||
530 | |||
531 | } | ||
532 | private class InterfaceInfo | ||
533 | { | ||
534 | public void ReadData(byte[] data, ref int i) | ||
535 | { | ||
536 | |||
537 | } | ||
538 | } | ||
539 | |||
540 | public class FieldInfo | ||
541 | { | ||
542 | public ushort AccessFlags = 0; | ||
543 | public ushort NameIndex = 0; | ||
544 | public string Name = ""; | ||
545 | public ushort DescriptorIndex = 0; | ||
546 | public ushort AttributeCount = 0; | ||
547 | public List<FieldAttribute> Attributes = new List<FieldAttribute>(); | ||
548 | private ClassRecord parent; | ||
549 | |||
550 | public FieldInfo(ClassRecord paren) | ||
551 | { | ||
552 | parent = paren; | ||
553 | } | ||
554 | |||
555 | public void ReadData(byte[] data, ref int pointer) | ||
556 | { | ||
557 | AccessFlags = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
558 | NameIndex = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
559 | DescriptorIndex = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
560 | AttributeCount = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
561 | for (int i = 0; i < AttributeCount; i++) | ||
562 | { | ||
563 | FieldAttribute attri = new FieldAttribute(this.parent); | ||
564 | attri.ReadData(data, ref pointer); | ||
565 | this.Attributes.Add(attri); | ||
566 | } | ||
567 | } | ||
568 | |||
569 | public void Print() | ||
570 | { | ||
571 | Console.WriteLine("Field Info Struct: "); | ||
572 | Console.WriteLine("AccessFlags: " + AccessFlags); | ||
573 | Console.WriteLine("NameIndex: " + NameIndex + " // " + ((PoolUtf8)this.parent.m_constantsPool[NameIndex - 1]).Value); | ||
574 | Console.WriteLine("DescriptorIndex: " + DescriptorIndex + " // " + ((PoolUtf8)this.parent.m_constantsPool[DescriptorIndex - 1]).Value); | ||
575 | Console.WriteLine("Attribute Count:" + AttributeCount); | ||
576 | //if static, add to static field list | ||
577 | // if (this.AccessFlags == 9) //public and static | ||
578 | if ((this.AccessFlags & 0x08) != 0) | ||
579 | { | ||
580 | switch (((PoolUtf8)this.parent.m_constantsPool[DescriptorIndex - 1]).Value) | ||
581 | { | ||
582 | case "I": | ||
583 | Int newin = new Int(); | ||
584 | this.parent.StaticFields.Add(((PoolUtf8)this.parent.m_constantsPool[NameIndex - 1]).Value, newin); | ||
585 | break; | ||
586 | case "F": | ||
587 | Float newfl = new Float(); | ||
588 | this.parent.StaticFields.Add(((PoolUtf8)this.parent.m_constantsPool[NameIndex - 1]).Value, newfl); | ||
589 | break; | ||
590 | } | ||
591 | |||
592 | } | ||
593 | for (int i = 0; i < AttributeCount; i++) | ||
594 | { | ||
595 | this.Attributes[i].Print(); | ||
596 | } | ||
597 | } | ||
598 | |||
599 | public class FieldAttribute | ||
600 | { | ||
601 | public ushort NameIndex = 0; | ||
602 | public string Name = ""; | ||
603 | public Int32 Length = 0; | ||
604 | public byte[] Data; | ||
605 | private ClassRecord parent; | ||
606 | |||
607 | public FieldAttribute(ClassRecord paren) | ||
608 | { | ||
609 | parent = paren; | ||
610 | } | ||
611 | |||
612 | public void ReadData(byte[] data, ref int pointer) | ||
613 | { | ||
614 | NameIndex = (ushort)((data[pointer++] << 8) + data[pointer++]); | ||
615 | Length = (Int32)((data[pointer++] << 24) + (data[pointer++] << 16) + (data[pointer++] << 8) + data[pointer++]); | ||
616 | Data = new byte[Length]; | ||
617 | for (int i = 0; i < Length; i++) | ||
618 | { | ||
619 | Data[i] = data[pointer++]; | ||
620 | } | ||
621 | } | ||
622 | |||
623 | public void Print() | ||
624 | { | ||
625 | Console.WriteLine("FieldAttribute: NameIndex: " + NameIndex + " // " + ((PoolUtf8)this.parent.m_constantsPool[NameIndex - 1]).Value); | ||
626 | } | ||
627 | } | ||
628 | } | ||
629 | |||
630 | private class AttributeInfo | ||
631 | { | ||
632 | public void ReadData(byte[] data, ref int i) | ||
633 | { | ||
634 | |||
635 | } | ||
636 | } | ||
637 | #endregion | ||
638 | |||
639 | } | ||
640 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Heap.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Heap.cs deleted file mode 100644 index c6423fc..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Heap.cs +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
33 | { | ||
34 | public class Heap | ||
35 | { | ||
36 | public List<ClassInstance> ClassObjects = new List<ClassInstance>(); | ||
37 | |||
38 | public Heap() | ||
39 | { | ||
40 | |||
41 | } | ||
42 | } | ||
43 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs deleted file mode 100644 index ef6570d..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs +++ /dev/null | |||
@@ -1,551 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.Scripting.EmbeddedJVM.Types; | ||
32 | using OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes; | ||
33 | |||
34 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
35 | { | ||
36 | partial class Thread | ||
37 | { | ||
38 | private partial class Interpreter | ||
39 | { | ||
40 | private bool IsLogicOpCode(byte opcode) | ||
41 | { | ||
42 | bool result = false; | ||
43 | switch (opcode) | ||
44 | { | ||
45 | case (byte)(byte)OpCode.iconst_m1: | ||
46 | Int m_int = new Int(); | ||
47 | m_int.mValue = -1; | ||
48 | this.m_thread.m_currentFrame.OpStack.Push(m_int); | ||
49 | result = true; | ||
50 | break; | ||
51 | case (byte)(byte)OpCode.iconst_0: | ||
52 | m_int = new Int(); | ||
53 | m_int.mValue = 0; | ||
54 | this.m_thread.m_currentFrame.OpStack.Push(m_int); | ||
55 | result = true; | ||
56 | break; | ||
57 | case (byte)(byte)OpCode.iconst_1: | ||
58 | m_int = new Int(); | ||
59 | m_int.mValue = 1; | ||
60 | this.m_thread.m_currentFrame.OpStack.Push(m_int); | ||
61 | result = true; | ||
62 | break; | ||
63 | case (byte)(byte)OpCode.iconst_2: | ||
64 | m_int = new Int(); | ||
65 | m_int.mValue = 2; | ||
66 | this.m_thread.m_currentFrame.OpStack.Push(m_int); | ||
67 | result = true; | ||
68 | break; | ||
69 | case (byte)(byte)OpCode.iconst_3: | ||
70 | m_int = new Int(); | ||
71 | m_int.mValue = 3; | ||
72 | this.m_thread.m_currentFrame.OpStack.Push(m_int); | ||
73 | break; | ||
74 | case (byte)(byte)OpCode.iconst_4: | ||
75 | m_int = new Int(); | ||
76 | m_int.mValue = 4; | ||
77 | this.m_thread.m_currentFrame.OpStack.Push(m_int); | ||
78 | result = true; | ||
79 | break; | ||
80 | case (byte)OpCode.iconst_5: | ||
81 | m_int = new Int(); | ||
82 | m_int.mValue = 5; | ||
83 | this.m_thread.m_currentFrame.OpStack.Push(m_int); | ||
84 | result = true; | ||
85 | break; | ||
86 | case (byte)OpCode.fconst_0: | ||
87 | Float m_float = new Float(); | ||
88 | m_float.mValue = 0.0f; | ||
89 | this.m_thread.m_currentFrame.OpStack.Push(m_float); | ||
90 | result = true; | ||
91 | break; | ||
92 | case (byte)OpCode.fconst_1: | ||
93 | m_float = new Float(); | ||
94 | m_float.mValue = 1.0f; | ||
95 | this.m_thread.m_currentFrame.OpStack.Push(m_float); | ||
96 | result = true; | ||
97 | break; | ||
98 | case (byte)OpCode.fconst_2: | ||
99 | m_float = new Float(); | ||
100 | m_float.mValue = 2.0f; | ||
101 | this.m_thread.m_currentFrame.OpStack.Push(m_float); | ||
102 | result = true; | ||
103 | break; | ||
104 | case (byte)OpCode.bipush: //is this right? this should be pushing a byte onto stack not int? | ||
105 | int pushvalue = (int)GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC]; | ||
106 | Int pushInt = new Int(); | ||
107 | pushInt.mValue = pushvalue; | ||
108 | this.m_thread.m_currentFrame.OpStack.Push(pushInt); | ||
109 | this.m_thread.PC++; | ||
110 | result = true; | ||
111 | break; | ||
112 | case (byte)OpCode.sipush: | ||
113 | short pushvalue2 = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]); | ||
114 | Int pushInt2 = new Int(); | ||
115 | pushInt2.mValue = pushvalue2; | ||
116 | this.m_thread.m_currentFrame.OpStack.Push(pushInt2); | ||
117 | this.m_thread.PC += 2; | ||
118 | result = true; | ||
119 | break; | ||
120 | case (byte)OpCode.fload: | ||
121 | short findex1 = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC])); | ||
122 | Float fload = new Float(); | ||
123 | if (this.m_thread.m_currentFrame.LocalVariables[findex1] != null) | ||
124 | { | ||
125 | if (this.m_thread.m_currentFrame.LocalVariables[findex1] is Float) | ||
126 | { | ||
127 | fload.mValue = ((Float)this.m_thread.m_currentFrame.LocalVariables[findex1]).mValue; | ||
128 | this.m_thread.m_currentFrame.OpStack.Push(fload); | ||
129 | } | ||
130 | } | ||
131 | this.m_thread.PC++; | ||
132 | result = true; | ||
133 | break; | ||
134 | case (byte)OpCode.iload_0: | ||
135 | if (this.m_thread.m_currentFrame.LocalVariables[0] != null) | ||
136 | { | ||
137 | if (this.m_thread.m_currentFrame.LocalVariables[0] is Int) | ||
138 | { | ||
139 | Int newInt = new Int(); | ||
140 | newInt.mValue = ((Int)this.m_thread.m_currentFrame.LocalVariables[0]).mValue; | ||
141 | this.m_thread.m_currentFrame.OpStack.Push(newInt); | ||
142 | } | ||
143 | } | ||
144 | result = true; | ||
145 | break; | ||
146 | case (byte)OpCode.iload_1: | ||
147 | if (this.m_thread.m_currentFrame.LocalVariables[1] != null) | ||
148 | { | ||
149 | if (this.m_thread.m_currentFrame.LocalVariables[1] is Int) | ||
150 | { | ||
151 | Int newInt = new Int(); | ||
152 | newInt.mValue = ((Int)this.m_thread.m_currentFrame.LocalVariables[1]).mValue; | ||
153 | this.m_thread.m_currentFrame.OpStack.Push(newInt); | ||
154 | } | ||
155 | } | ||
156 | result = true; | ||
157 | break; | ||
158 | case (byte)OpCode.fload_0: | ||
159 | if (this.m_thread.m_currentFrame.LocalVariables[0] != null) | ||
160 | { | ||
161 | if (this.m_thread.m_currentFrame.LocalVariables[0] is Float) | ||
162 | { | ||
163 | Float newfloat = new Float(); | ||
164 | newfloat.mValue = ((Float)this.m_thread.m_currentFrame.LocalVariables[0]).mValue; | ||
165 | this.m_thread.m_currentFrame.OpStack.Push(newfloat); | ||
166 | } | ||
167 | } | ||
168 | result = true; | ||
169 | break; | ||
170 | case (byte)OpCode.fload_1: | ||
171 | if (this.m_thread.m_currentFrame.LocalVariables[1] != null) | ||
172 | { | ||
173 | if (this.m_thread.m_currentFrame.LocalVariables[1] is Float) | ||
174 | { | ||
175 | Float newfloat = new Float(); | ||
176 | newfloat.mValue = ((Float)this.m_thread.m_currentFrame.LocalVariables[1]).mValue; | ||
177 | this.m_thread.m_currentFrame.OpStack.Push(newfloat); | ||
178 | } | ||
179 | } | ||
180 | result = true; | ||
181 | break; | ||
182 | case (byte)OpCode.fload_2: | ||
183 | if (this.m_thread.m_currentFrame.LocalVariables[2] != null) | ||
184 | { | ||
185 | if (this.m_thread.m_currentFrame.LocalVariables[2] is Float) | ||
186 | { | ||
187 | Float newfloat = new Float(); | ||
188 | newfloat.mValue = ((Float)this.m_thread.m_currentFrame.LocalVariables[2]).mValue; | ||
189 | this.m_thread.m_currentFrame.OpStack.Push(newfloat); | ||
190 | } | ||
191 | } | ||
192 | result = true; | ||
193 | break; | ||
194 | case (byte)OpCode.fload_3: | ||
195 | if (this.m_thread.m_currentFrame.LocalVariables[3] != null) | ||
196 | { | ||
197 | if (this.m_thread.m_currentFrame.LocalVariables[3] is Float) | ||
198 | { | ||
199 | Float newfloat = new Float(); | ||
200 | newfloat.mValue = ((Float)this.m_thread.m_currentFrame.LocalVariables[3]).mValue; | ||
201 | this.m_thread.m_currentFrame.OpStack.Push(newfloat); | ||
202 | } | ||
203 | } | ||
204 | result = true; | ||
205 | break; | ||
206 | case (byte)OpCode.istore: | ||
207 | short findex3 = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC])); | ||
208 | BaseType istor = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
209 | if (istor is Int) | ||
210 | { | ||
211 | this.m_thread.m_currentFrame.LocalVariables[findex3] = (Int)istor; | ||
212 | } | ||
213 | this.m_thread.PC++; | ||
214 | result = true; | ||
215 | break; | ||
216 | case (byte)OpCode.fstore: | ||
217 | short findex = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC])); | ||
218 | BaseType fstor = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
219 | if (fstor is Float) | ||
220 | { | ||
221 | this.m_thread.m_currentFrame.LocalVariables[findex] = (Float)fstor; | ||
222 | } | ||
223 | this.m_thread.PC++; | ||
224 | result = true; | ||
225 | break; | ||
226 | case (byte)OpCode.istore_0: | ||
227 | BaseType baset = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
228 | if (baset is Int) | ||
229 | { | ||
230 | this.m_thread.m_currentFrame.LocalVariables[0] = (Int)baset; | ||
231 | } | ||
232 | result = true; | ||
233 | break; | ||
234 | case (byte)OpCode.istore_1: | ||
235 | baset = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
236 | if (baset is Int) | ||
237 | { | ||
238 | this.m_thread.m_currentFrame.LocalVariables[1] = (Int)baset; | ||
239 | } | ||
240 | result = true; | ||
241 | break; | ||
242 | case (byte)OpCode.fstore_0: | ||
243 | baset = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
244 | if (baset is Float) | ||
245 | { | ||
246 | this.m_thread.m_currentFrame.LocalVariables[0] = (Float)baset; | ||
247 | } | ||
248 | result = true; | ||
249 | break; | ||
250 | case (byte)OpCode.fstore_1: | ||
251 | baset = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
252 | if (baset is Float) | ||
253 | { | ||
254 | this.m_thread.m_currentFrame.LocalVariables[1] = (Float)baset; | ||
255 | } | ||
256 | result = true; | ||
257 | break; | ||
258 | case (byte)OpCode.fstore_2: | ||
259 | baset = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
260 | if (baset is Float) | ||
261 | { | ||
262 | this.m_thread.m_currentFrame.LocalVariables[2] = (Float)baset; | ||
263 | } | ||
264 | result = true; | ||
265 | break; | ||
266 | case (byte)OpCode.fstore_3: | ||
267 | baset = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
268 | if (baset is Float) | ||
269 | { | ||
270 | this.m_thread.m_currentFrame.LocalVariables[3] = (Float)baset; | ||
271 | } | ||
272 | result = true; | ||
273 | break; | ||
274 | case (byte)OpCode.pop: | ||
275 | this.m_thread.m_currentFrame.OpStack.Pop(); | ||
276 | result = true; | ||
277 | break; | ||
278 | case (byte)OpCode.fadd: | ||
279 | BaseType bf2 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
280 | BaseType bf1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
281 | if (bf1 is Float && bf2 is Float) | ||
282 | { | ||
283 | Float nflt = new Float(); | ||
284 | nflt.mValue = ((Float)bf1).mValue + ((Float)bf2).mValue; | ||
285 | this.m_thread.m_currentFrame.OpStack.Push(nflt); | ||
286 | } | ||
287 | result = true; | ||
288 | break; | ||
289 | case (byte)OpCode.fsub: | ||
290 | BaseType bsf2 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
291 | BaseType bsf1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
292 | if (bsf1 is Float && bsf2 is Float) | ||
293 | { | ||
294 | Float resf = new Float(); | ||
295 | resf.mValue = ((Float)bsf1).mValue - ((Float)bsf2).mValue; | ||
296 | this.m_thread.m_currentFrame.OpStack.Push(resf); | ||
297 | } | ||
298 | result = true; | ||
299 | break; | ||
300 | case (byte)OpCode.imul: //check the order of the two values off the stack is correct | ||
301 | BaseType bs2 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
302 | BaseType bs1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
303 | if (bs1 is Int && bs2 is Int) | ||
304 | { | ||
305 | Int nInt = new Int(); | ||
306 | nInt.mValue = ((Int)bs1).mValue * ((Int)bs2).mValue; | ||
307 | this.m_thread.m_currentFrame.OpStack.Push(nInt); | ||
308 | } | ||
309 | result = true; | ||
310 | break; | ||
311 | case (byte)OpCode.iinc: | ||
312 | if (this.m_thread.m_currentFrame.LocalVariables[GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC]] != null) | ||
313 | { | ||
314 | if (this.m_thread.m_currentFrame.LocalVariables[GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC]] is Int) | ||
315 | { | ||
316 | ((Int)this.m_thread.m_currentFrame.LocalVariables[GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC]]).mValue += (sbyte)GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]; | ||
317 | } | ||
318 | } | ||
319 | this.m_thread.PC += 2; | ||
320 | result = true; | ||
321 | break; | ||
322 | case (byte)OpCode.f2i: | ||
323 | BaseType conv1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
324 | if (conv1 is Float) | ||
325 | { | ||
326 | Int newconv = new Int(); | ||
327 | newconv.mValue = (int)((Float)conv1).mValue; | ||
328 | this.m_thread.m_currentFrame.OpStack.Push(newconv); | ||
329 | } | ||
330 | result = true; | ||
331 | break; | ||
332 | case (byte)OpCode.fcmpl: | ||
333 | BaseType flcom2 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
334 | BaseType flcom1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
335 | if (flcom1 is Float && flcom2 is Float) | ||
336 | { | ||
337 | Int compres = new Int(); | ||
338 | if (((Float)flcom1).mValue < ((Float)flcom2).mValue) | ||
339 | { | ||
340 | compres.mValue = -1; | ||
341 | } | ||
342 | else if (((Float)flcom1).mValue > ((Float)flcom2).mValue) | ||
343 | { | ||
344 | compres.mValue = 1; | ||
345 | } | ||
346 | else | ||
347 | { | ||
348 | compres.mValue = 0; | ||
349 | } | ||
350 | this.m_thread.m_currentFrame.OpStack.Push(compres); | ||
351 | } | ||
352 | result = true; | ||
353 | break; | ||
354 | case (byte)OpCode.fcmpg: | ||
355 | flcom2 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
356 | flcom1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
357 | if (flcom1 is Float && flcom2 is Float) | ||
358 | { | ||
359 | Int compres = new Int(); | ||
360 | if (((Float)flcom1).mValue < ((Float)flcom2).mValue) | ||
361 | { | ||
362 | compres.mValue = -1; | ||
363 | } | ||
364 | else if (((Float)flcom1).mValue > ((Float)flcom2).mValue) | ||
365 | { | ||
366 | compres.mValue = 1; | ||
367 | } | ||
368 | else | ||
369 | { | ||
370 | compres.mValue = 0; | ||
371 | } | ||
372 | this.m_thread.m_currentFrame.OpStack.Push(compres); | ||
373 | } | ||
374 | result = true; | ||
375 | break; | ||
376 | case (byte)OpCode.ifge: | ||
377 | short compareoffset2 = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]); | ||
378 | BaseType compe1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
379 | if (compe1 is Int) | ||
380 | { | ||
381 | if (((Int)compe1).mValue >= 0) | ||
382 | { | ||
383 | this.m_thread.PC += -1 + compareoffset2; | ||
384 | } | ||
385 | else | ||
386 | { | ||
387 | this.m_thread.PC += 2; | ||
388 | } | ||
389 | } | ||
390 | else | ||
391 | { | ||
392 | this.m_thread.PC += 2; | ||
393 | } | ||
394 | result = true; | ||
395 | break; | ||
396 | case (byte)OpCode.ifle: | ||
397 | short compareoffset1 = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]); | ||
398 | BaseType comp1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
399 | if (comp1 is Int) | ||
400 | { | ||
401 | if (((Int)comp1).mValue <= 0) | ||
402 | { | ||
403 | this.m_thread.PC += -1 + compareoffset1; | ||
404 | } | ||
405 | else | ||
406 | { | ||
407 | this.m_thread.PC += 2; | ||
408 | } | ||
409 | } | ||
410 | else | ||
411 | { | ||
412 | this.m_thread.PC += 2; | ||
413 | } | ||
414 | result = true; | ||
415 | break; | ||
416 | case (byte)OpCode.if_icmpge: | ||
417 | short compareoffset = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]); | ||
418 | BaseType bc2 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
419 | BaseType bc1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
420 | if (bc1 is Int && bc2 is Int) | ||
421 | { | ||
422 | //Console.WriteLine("comparing " + ((Int)bc1).mValue + " and " + ((Int)bc2).mValue); | ||
423 | if (((Int)bc1).mValue >= ((Int)bc2).mValue) | ||
424 | { | ||
425 | // Console.WriteLine("branch compare true , offset is " +compareoffset); | ||
426 | // Console.WriteLine("current PC is " + this._mThread.PC); | ||
427 | this.m_thread.PC += -1 + compareoffset; | ||
428 | //Console.WriteLine("new PC is " + this._mThread.PC); | ||
429 | } | ||
430 | else | ||
431 | { | ||
432 | //Console.WriteLine("branch compare false"); | ||
433 | this.m_thread.PC += 2; | ||
434 | } | ||
435 | } | ||
436 | else | ||
437 | { | ||
438 | this.m_thread.PC += 2; | ||
439 | } | ||
440 | result = true; | ||
441 | break; | ||
442 | case (byte)OpCode.if_icmple: | ||
443 | short compareloffset = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]); | ||
444 | BaseType bcl2 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
445 | BaseType bcl1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
446 | if (bcl1 is Int && bcl2 is Int) | ||
447 | { | ||
448 | //Console.WriteLine("comparing " + ((Int)bcl1).mValue + " and " + ((Int)bcl2).mValue); | ||
449 | if (((Int)bcl1).mValue <= ((Int)bcl2).mValue) | ||
450 | { | ||
451 | // Console.WriteLine("branch compare true , offset is " + compareloffset); | ||
452 | // Console.WriteLine("current PC is " + this._mThread.PC); | ||
453 | this.m_thread.PC += -1 + compareloffset; | ||
454 | // Console.WriteLine("new PC is " + this._mThread.PC); | ||
455 | } | ||
456 | else | ||
457 | { | ||
458 | //Console.WriteLine("branch compare false"); | ||
459 | this.m_thread.PC += 2; | ||
460 | } | ||
461 | } | ||
462 | else | ||
463 | { | ||
464 | this.m_thread.PC += 2; | ||
465 | } | ||
466 | result = true; | ||
467 | break; | ||
468 | case (byte)OpCode._goto: | ||
469 | short offset = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]); | ||
470 | this.m_thread.PC += -1 + offset; | ||
471 | result = true; | ||
472 | break; | ||
473 | case (byte)OpCode.getstatic: | ||
474 | short fieldrefIndex = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]); | ||
475 | if (this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1] is ClassRecord.PoolFieldRef) | ||
476 | { | ||
477 | if (((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mClass.Name.Value == this.m_thread.currentClass.MClass.Name.Value) | ||
478 | { | ||
479 | //from this class | ||
480 | if (this.m_thread.currentClass.StaticFields.ContainsKey(((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value)) | ||
481 | { | ||
482 | if (this.m_thread.currentClass.StaticFields[((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value] is Float) | ||
483 | { | ||
484 | Float retFloat = new Float(); | ||
485 | retFloat.mValue = ((Float)this.m_thread.currentClass.StaticFields[((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value]).mValue; | ||
486 | this.m_thread.m_currentFrame.OpStack.Push(retFloat); | ||
487 | } | ||
488 | else if (this.m_thread.currentClass.StaticFields[((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value] is Int) | ||
489 | { | ||
490 | Int retInt = new Int(); | ||
491 | retInt.mValue = ((Int)this.m_thread.currentClass.StaticFields[((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value]).mValue; | ||
492 | // Console.WriteLine("getting static field, " + retInt.mValue); | ||
493 | this.m_thread.m_currentFrame.OpStack.Push(retInt); | ||
494 | } | ||
495 | } | ||
496 | } | ||
497 | else | ||
498 | { | ||
499 | //get from a different class | ||
500 | } | ||
501 | } | ||
502 | this.m_thread.PC += 2; | ||
503 | result = true; | ||
504 | break; | ||
505 | case (byte)OpCode.putstatic: | ||
506 | fieldrefIndex = (short)((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC + 1]); | ||
507 | BaseType addstatic = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
508 | if (this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1] is ClassRecord.PoolFieldRef) | ||
509 | { | ||
510 | if (((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mClass.Name.Value == this.m_thread.currentClass.MClass.Name.Value) | ||
511 | { | ||
512 | // this class | ||
513 | if (this.m_thread.currentClass.StaticFields.ContainsKey(((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value)) | ||
514 | { | ||
515 | if (addstatic is Float) | ||
516 | { | ||
517 | if (this.m_thread.currentClass.StaticFields[((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value] is Float) | ||
518 | { | ||
519 | Float newf = new Float(); | ||
520 | newf.mValue = ((Float)addstatic).mValue; | ||
521 | this.m_thread.currentClass.StaticFields[((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value] = newf; | ||
522 | } | ||
523 | } | ||
524 | else if (addstatic is Int) | ||
525 | { | ||
526 | if (this.m_thread.currentClass.StaticFields[((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value] is Int) | ||
527 | { | ||
528 | //Console.WriteLine("setting static field to " + ((Int)addstatic).mValue); | ||
529 | Int newi = new Int(); | ||
530 | newi.mValue = ((Int)addstatic).mValue; | ||
531 | this.m_thread.currentClass.StaticFields[((ClassRecord.PoolFieldRef)this.m_thread.currentClass.m_constantsPool[fieldrefIndex - 1]).mNameType.Name.Value] = newi; | ||
532 | } | ||
533 | } | ||
534 | } | ||
535 | } | ||
536 | else | ||
537 | { | ||
538 | // a different class | ||
539 | } | ||
540 | } | ||
541 | this.m_thread.PC += 2; | ||
542 | result = true; | ||
543 | break; | ||
544 | |||
545 | } | ||
546 | |||
547 | return result; | ||
548 | } | ||
549 | } | ||
550 | } | ||
551 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs deleted file mode 100644 index 42fd299..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.Scripting.EmbeddedJVM.Types; | ||
32 | using OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes; | ||
33 | using OpenSim.Framework.Interfaces; | ||
34 | using OpenSim.Framework; | ||
35 | using OpenSim.Framework.Types; | ||
36 | |||
37 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
38 | { | ||
39 | partial class Thread | ||
40 | { | ||
41 | private partial class Interpreter | ||
42 | { | ||
43 | private bool IsMethodOpCode(byte opcode) | ||
44 | { | ||
45 | bool result = false; | ||
46 | switch (opcode) | ||
47 | { | ||
48 | case 184: | ||
49 | short refIndex = (short) ((GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC+1]); | ||
50 | if (this.m_thread.currentClass.m_constantsPool[refIndex - 1] is ClassRecord.PoolMethodRef) | ||
51 | { | ||
52 | string typ = ((ClassRecord.PoolMethodRef)this.m_thread.currentClass.m_constantsPool[refIndex - 1]).mNameType.Type.Value; | ||
53 | string typeparam = ""; | ||
54 | string typereturn = ""; | ||
55 | int firstbrak = 0; | ||
56 | int secondbrak = 0; | ||
57 | firstbrak = typ.LastIndexOf('('); | ||
58 | secondbrak = typ.LastIndexOf(')'); | ||
59 | typeparam = typ.Substring(firstbrak + 1, secondbrak - firstbrak - 1); | ||
60 | typereturn = typ.Substring(secondbrak + 1, typ.Length - secondbrak - 1); | ||
61 | if (((ClassRecord.PoolMethodRef)this.m_thread.currentClass.m_constantsPool[refIndex - 1]).mClass.Name.Value == this.m_thread.currentClass.MClass.Name.Value) | ||
62 | { | ||
63 | //calling a method in this class | ||
64 | if (typeparam.Length == 0) | ||
65 | { | ||
66 | this.m_thread.JumpToStaticVoidMethod(((ClassRecord.PoolMethodRef)this.m_thread.currentClass.m_constantsPool[refIndex - 1]).mNameType.Name.Value, (this.m_thread.PC + 2)); | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | this.m_thread.JumpToStaticParamMethod(((ClassRecord.PoolMethodRef)this.m_thread.currentClass.m_constantsPool[refIndex - 1]).mNameType.Name.Value, typeparam, (this.m_thread.PC + 2)); | ||
71 | } | ||
72 | } | ||
73 | else | ||
74 | { | ||
75 | //calling a method of a different class | ||
76 | |||
77 | // OpenSimAPI Class | ||
78 | if (((ClassRecord.PoolMethodRef)this.m_thread.currentClass.m_constantsPool[refIndex - 1]).mClass.Name.Value == "OpenSimAPI") | ||
79 | { | ||
80 | this.m_thread.scriptInfo.api.CallMethod(((ClassRecord.PoolMethodRef)this.m_thread.currentClass.m_constantsPool[refIndex - 1]).mNameType.Name.Value, null); | ||
81 | } | ||
82 | } | ||
83 | } | ||
84 | else | ||
85 | { | ||
86 | this.m_thread.PC += 2; | ||
87 | } | ||
88 | result = true; | ||
89 | break; | ||
90 | } | ||
91 | |||
92 | return result; | ||
93 | } | ||
94 | } | ||
95 | } | ||
96 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs deleted file mode 100644 index 3c18a11..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
33 | { | ||
34 | partial class Thread | ||
35 | { | ||
36 | private partial class Interpreter | ||
37 | { | ||
38 | } | ||
39 | } | ||
40 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.cs deleted file mode 100644 index e718328..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.cs +++ /dev/null | |||
@@ -1,135 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.Scripting.EmbeddedJVM.Types; | ||
32 | using OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes; | ||
33 | |||
34 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
35 | { | ||
36 | partial class Thread | ||
37 | { | ||
38 | private partial class Interpreter | ||
39 | { | ||
40 | private Thread m_thread; | ||
41 | |||
42 | public Interpreter(Thread parentThread) | ||
43 | { | ||
44 | m_thread = parentThread; | ||
45 | } | ||
46 | |||
47 | public bool Excute() | ||
48 | { | ||
49 | bool run = true; | ||
50 | byte currentOpCode = GlobalMemory.MethodArea.MethodBuffer[this.m_thread.PC++]; | ||
51 | // Console.WriteLine("opCode is: " + currentOpCode); | ||
52 | bool handled = false; | ||
53 | |||
54 | handled = this.IsLogicOpCode(currentOpCode); | ||
55 | if (!handled) | ||
56 | { | ||
57 | handled = this.IsMethodOpCode(currentOpCode); | ||
58 | } | ||
59 | if (!handled) | ||
60 | { | ||
61 | if (currentOpCode == 172) | ||
62 | { | ||
63 | if (this.m_thread.stack.StackFrames.Count > 1) | ||
64 | { | ||
65 | Console.WriteLine("returning int from function"); | ||
66 | int retPC1 = this.m_thread.m_currentFrame.ReturnPC; | ||
67 | BaseType bas1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
68 | this.m_thread.stack.StackFrames.Pop(); | ||
69 | this.m_thread.m_currentFrame = this.m_thread.stack.StackFrames.Peek(); | ||
70 | this.m_thread.PC = retPC1; | ||
71 | if (bas1 is Int) | ||
72 | { | ||
73 | this.m_thread.m_currentFrame.OpStack.Push((Int)bas1); | ||
74 | } | ||
75 | } | ||
76 | else | ||
77 | { | ||
78 | // Console.WriteLine("No parent function so ending program"); | ||
79 | this.m_thread.stack.StackFrames.Pop(); | ||
80 | run = false; | ||
81 | } | ||
82 | handled = true; | ||
83 | } | ||
84 | if (currentOpCode == 174) | ||
85 | { | ||
86 | if (this.m_thread.stack.StackFrames.Count > 1) | ||
87 | { | ||
88 | Console.WriteLine("returning float from function"); | ||
89 | int retPC1 = this.m_thread.m_currentFrame.ReturnPC; | ||
90 | BaseType bas1 = this.m_thread.m_currentFrame.OpStack.Pop(); | ||
91 | this.m_thread.stack.StackFrames.Pop(); | ||
92 | this.m_thread.m_currentFrame = this.m_thread.stack.StackFrames.Peek(); | ||
93 | this.m_thread.PC = retPC1; | ||
94 | if (bas1 is Float) | ||
95 | { | ||
96 | this.m_thread.m_currentFrame.OpStack.Push((Float)bas1); | ||
97 | } | ||
98 | } | ||
99 | else | ||
100 | { | ||
101 | // Console.WriteLine("No parent function so ending program"); | ||
102 | this.m_thread.stack.StackFrames.Pop(); | ||
103 | run = false; | ||
104 | } | ||
105 | handled = true; | ||
106 | } | ||
107 | if (currentOpCode == 177) | ||
108 | { | ||
109 | if (this.m_thread.stack.StackFrames.Count > 1) | ||
110 | { | ||
111 | Console.WriteLine("returning from function"); | ||
112 | int retPC = this.m_thread.m_currentFrame.ReturnPC; | ||
113 | this.m_thread.stack.StackFrames.Pop(); | ||
114 | this.m_thread.m_currentFrame = this.m_thread.stack.StackFrames.Peek(); | ||
115 | this.m_thread.PC = retPC; | ||
116 | } | ||
117 | else | ||
118 | { | ||
119 | // Console.WriteLine("No parent function so ending program"); | ||
120 | this.m_thread.stack.StackFrames.Pop(); | ||
121 | run = false; | ||
122 | } | ||
123 | handled = true; | ||
124 | } | ||
125 | } | ||
126 | if (!handled) | ||
127 | { | ||
128 | Console.WriteLine("opcode " + currentOpCode + " not been handled "); | ||
129 | } | ||
130 | return run; | ||
131 | |||
132 | } | ||
133 | } | ||
134 | } | ||
135 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MainMemory.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MainMemory.cs deleted file mode 100644 index 7174975..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MainMemory.cs +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
33 | { | ||
34 | public class MainMemory | ||
35 | { | ||
36 | public Heap HeapArea; | ||
37 | public MethodMemory MethodArea; | ||
38 | |||
39 | public MainMemory() | ||
40 | { | ||
41 | MethodArea = new MethodMemory(); | ||
42 | HeapArea = new Heap(); | ||
43 | } | ||
44 | } | ||
45 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MethodMemory.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MethodMemory.cs deleted file mode 100644 index 5f29091..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MethodMemory.cs +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
33 | { | ||
34 | public class MethodMemory | ||
35 | { | ||
36 | public byte[] MethodBuffer; | ||
37 | public List<ClassRecord> Classes = new List<ClassRecord>(); | ||
38 | public int NextMethodPC = 0; | ||
39 | public int Methodcount = 0; | ||
40 | |||
41 | public MethodMemory() | ||
42 | { | ||
43 | MethodBuffer = new byte[20000]; | ||
44 | } | ||
45 | } | ||
46 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Object.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Object.cs deleted file mode 100644 index 8acb2bd..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Object.cs +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
33 | { | ||
34 | public class Object | ||
35 | { | ||
36 | } | ||
37 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/OpCodes.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/OpCodes.cs deleted file mode 100644 index 22a9f12..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/OpCodes.cs +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
6 | { | ||
7 | public enum OpCode : byte | ||
8 | { | ||
9 | iconst_m1 = 2, | ||
10 | iconst_0 = 3, | ||
11 | iconst_1 = 4, | ||
12 | iconst_2 = 5, | ||
13 | iconst_3 = 6, | ||
14 | iconst_4 = 7, | ||
15 | iconst_5 = 8, | ||
16 | fconst_0 = 11, | ||
17 | fconst_1 = 12, | ||
18 | fconst_2 = 13, | ||
19 | bipush = 16, | ||
20 | sipush = 17, | ||
21 | fload = 23, | ||
22 | iload_0 = 26, | ||
23 | iload_1 = 27, | ||
24 | fload_0 = 34, | ||
25 | fload_1 = 35, | ||
26 | fload_2 = 36, | ||
27 | fload_3 = 37, | ||
28 | istore = 54, | ||
29 | fstore = 56, | ||
30 | istore_0 = 59, | ||
31 | istore_1 = 60, | ||
32 | istore_2 = 61, | ||
33 | istore_3 = 62, | ||
34 | fstore_0 = 67, | ||
35 | fstore_1 = 68, | ||
36 | fstore_2 = 69, | ||
37 | fstore_3 = 70, | ||
38 | pop = 87, | ||
39 | fadd = 98, | ||
40 | fsub = 102, | ||
41 | imul = 104, | ||
42 | iinc = 132, | ||
43 | f2i = 139, | ||
44 | fcmpl = 149, | ||
45 | fcmpg = 150, | ||
46 | ifge = 156, | ||
47 | ifgt = 157, | ||
48 | ifle = 158, | ||
49 | if_icmpge = 162, | ||
50 | if_icmpgt = 163, | ||
51 | if_icmple = 164, | ||
52 | _goto = 167, | ||
53 | getstatic = 178, | ||
54 | putstatic = 179 | ||
55 | } | ||
56 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Stack.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Stack.cs deleted file mode 100644 index 7c12678..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Stack.cs +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
33 | { | ||
34 | public class Stack | ||
35 | { | ||
36 | public Stack<StackFrame> StackFrames = new Stack<StackFrame>(); | ||
37 | |||
38 | public Stack() | ||
39 | { | ||
40 | } | ||
41 | } | ||
42 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/StackFrame.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/StackFrame.cs deleted file mode 100644 index 76257b8..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/StackFrame.cs +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.Scripting.EmbeddedJVM.Types; | ||
32 | |||
33 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
34 | { | ||
35 | public class StackFrame | ||
36 | { | ||
37 | public BaseType[] LocalVariables; | ||
38 | public Stack<BaseType> OpStack = new Stack<BaseType>(); | ||
39 | |||
40 | public int ReturnPC = 0; | ||
41 | public ClassRecord CallingClass = null; | ||
42 | |||
43 | public StackFrame() | ||
44 | { | ||
45 | LocalVariables = new BaseType[20]; | ||
46 | } | ||
47 | |||
48 | } | ||
49 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Thread.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Thread.cs deleted file mode 100644 index aad1f47..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Thread.cs +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.Scripting.EmbeddedJVM.Types; | ||
32 | using OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Interfaces; | ||
35 | using OpenSim.Region.Environment.Scenes; | ||
36 | using OpenSim.Region.Scripting; | ||
37 | |||
38 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
39 | { | ||
40 | public partial class Thread | ||
41 | { | ||
42 | // Is this smart? | ||
43 | public static MainMemory GlobalMemory; | ||
44 | public static Scene World; | ||
45 | private int PC = 0; | ||
46 | private Stack stack; | ||
47 | private Interpreter m_Interpreter; | ||
48 | public ClassRecord currentClass; | ||
49 | public ClassInstance currentInstance; | ||
50 | private StackFrame m_currentFrame; | ||
51 | public int excutionCounter = 0; | ||
52 | public bool running = false; | ||
53 | |||
54 | public ScriptInfo scriptInfo; | ||
55 | |||
56 | public Thread() | ||
57 | { | ||
58 | this.m_Interpreter = new Interpreter(this); | ||
59 | this.stack = new Stack(); | ||
60 | } | ||
61 | |||
62 | public void SetPC(int methodpointer) | ||
63 | { | ||
64 | //Console.WriteLine("Thread PC has been set to " + methodpointer); | ||
65 | PC = methodpointer; | ||
66 | } | ||
67 | |||
68 | public void StartMethod(ClassRecord rec, string methName) | ||
69 | { | ||
70 | m_currentFrame = new StackFrame(); | ||
71 | this.stack.StackFrames.Push(m_currentFrame); | ||
72 | this.currentClass = rec; | ||
73 | currentClass.StartMethod(this, methName); | ||
74 | } | ||
75 | |||
76 | public void StartMethod( string methName) | ||
77 | { | ||
78 | m_currentFrame = new StackFrame(); | ||
79 | this.stack.StackFrames.Push(m_currentFrame); | ||
80 | currentClass.StartMethod(this, methName); | ||
81 | } | ||
82 | |||
83 | public void JumpToStaticVoidMethod(string methName, int returnPC) | ||
84 | { | ||
85 | m_currentFrame = new StackFrame(); | ||
86 | m_currentFrame.ReturnPC = returnPC; | ||
87 | this.stack.StackFrames.Push(m_currentFrame); | ||
88 | currentClass.StartMethod(this, methName); | ||
89 | } | ||
90 | |||
91 | public void JumpToStaticParamMethod(string methName, string param, int returnPC) | ||
92 | { | ||
93 | if (param == "I") | ||
94 | { | ||
95 | BaseType bs1 = m_currentFrame.OpStack.Pop(); | ||
96 | m_currentFrame = new StackFrame(); | ||
97 | m_currentFrame.ReturnPC = returnPC; | ||
98 | this.stack.StackFrames.Push(m_currentFrame); | ||
99 | m_currentFrame.LocalVariables[0] = ((Int)bs1); | ||
100 | currentClass.StartMethod(this, methName); | ||
101 | } | ||
102 | if (param == "F") | ||
103 | { | ||
104 | |||
105 | } | ||
106 | } | ||
107 | |||
108 | public void JumpToClassStaticVoidMethod(string className, string methName, int returnPC) | ||
109 | { | ||
110 | |||
111 | } | ||
112 | |||
113 | public bool Excute() | ||
114 | { | ||
115 | excutionCounter++; | ||
116 | return this.m_Interpreter.Excute(); | ||
117 | } | ||
118 | } | ||
119 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JavaEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JavaEngine.cs deleted file mode 100644 index 58cdf49..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JavaEngine.cs +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | using OpenSim.Region.Scripting; | ||
6 | using OpenSim.Region.Scripting.EmbeddedJVM; | ||
7 | |||
8 | namespace OpenSim.Region.Scripting | ||
9 | { | ||
10 | public class JavaEngine : IScriptCompiler | ||
11 | { | ||
12 | public string FileExt() | ||
13 | { | ||
14 | return ".java"; | ||
15 | } | ||
16 | |||
17 | public Dictionary<string, IScript> compile(string filename) | ||
18 | { | ||
19 | JVMScript script = new JVMScript(); | ||
20 | Dictionary<string, IScript> returns = new Dictionary<string, IScript>(); | ||
21 | |||
22 | script.LoadScript(filename); | ||
23 | |||
24 | returns.Add(filename, script); | ||
25 | |||
26 | return returns; | ||
27 | } | ||
28 | } | ||
29 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs deleted file mode 100644 index 78c6f67..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs +++ /dev/null | |||
@@ -1,170 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.IO; | ||
32 | using System.Threading; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Interfaces; | ||
35 | using OpenSim.Framework.Utilities; | ||
36 | using OpenSim.Region.Scripting; | ||
37 | using OpenSim.Region.Environment.Scenes; | ||
38 | |||
39 | namespace OpenSim.Region.Scripting.EmbeddedJVM | ||
40 | { | ||
41 | public class JVMScript : IScript | ||
42 | { | ||
43 | private List<Thread> _threads = new List<Thread>(); | ||
44 | private BlockingQueue<CompileInfo> CompileScripts = new BlockingQueue<CompileInfo>(); | ||
45 | private MainMemory _mainMemory; | ||
46 | |||
47 | ScriptInfo scriptInfo; | ||
48 | |||
49 | public void Initialise(ScriptInfo info) | ||
50 | { | ||
51 | scriptInfo = info; | ||
52 | |||
53 | _mainMemory = new MainMemory(); | ||
54 | Thread.GlobalMemory = this._mainMemory; | ||
55 | Thread.World = info.world; | ||
56 | CompileScript(); | ||
57 | |||
58 | scriptInfo.events.OnFrame += new EventManager.OnFrameDelegate(events_OnFrame); | ||
59 | scriptInfo.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence); | ||
60 | } | ||
61 | |||
62 | void events_OnNewPresence(ScenePresence presence) | ||
63 | { | ||
64 | for (int i = 0; i < this._threads.Count; i++) | ||
65 | { | ||
66 | if (!this._threads[i].running) | ||
67 | { | ||
68 | this._threads[i].StartMethod("OnNewPresence"); | ||
69 | bool run = true; | ||
70 | while (run) | ||
71 | { | ||
72 | run = this._threads[i].Excute(); | ||
73 | } | ||
74 | } | ||
75 | } | ||
76 | } | ||
77 | |||
78 | void events_OnFrame() | ||
79 | { | ||
80 | for (int i = 0; i < this._threads.Count; i++) | ||
81 | { | ||
82 | if (!this._threads[i].running) | ||
83 | { | ||
84 | this._threads[i].StartMethod("OnFrame"); | ||
85 | bool run = true; | ||
86 | while (run) | ||
87 | { | ||
88 | run = this._threads[i].Excute(); | ||
89 | } | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | |||
94 | public string getName() | ||
95 | { | ||
96 | return "JVM Scripting Engine"; | ||
97 | } | ||
98 | |||
99 | public void LoadScript(string script) | ||
100 | { | ||
101 | Console.WriteLine("OpenSimJVM - loading new script: " + script); | ||
102 | CompileInfo comp = new CompileInfo(); | ||
103 | comp.script = script; | ||
104 | comp.scriptName = script; | ||
105 | this.CompileScripts.Enqueue(comp); | ||
106 | } | ||
107 | |||
108 | public void CompileScript() | ||
109 | { | ||
110 | CompileInfo comp = this.CompileScripts.Dequeue(); | ||
111 | string script = comp.script; | ||
112 | string scriptName = comp.scriptName; | ||
113 | try | ||
114 | { | ||
115 | //need to compile the script into a java class file | ||
116 | |||
117 | //first save it to a java source file | ||
118 | TextWriter tw = new StreamWriter(scriptName + ".java"); | ||
119 | tw.WriteLine(script); | ||
120 | tw.Close(); | ||
121 | |||
122 | //now compile | ||
123 | System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo("javac.exe", "*.java"); | ||
124 | // psi.RedirectStandardOutput = true; | ||
125 | psi.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden; | ||
126 | psi.UseShellExecute = false; | ||
127 | |||
128 | System.Diagnostics.Process javacomp; | ||
129 | javacomp = System.Diagnostics.Process.Start(psi); | ||
130 | javacomp.WaitForExit(); | ||
131 | |||
132 | |||
133 | //now load in class file | ||
134 | ClassRecord class1 = new ClassRecord(); | ||
135 | class1.LoadClassFromFile(scriptName + ".class"); | ||
136 | class1.PrintToConsole(); | ||
137 | //Console.WriteLine(); | ||
138 | this._mainMemory.MethodArea.Classes.Add(class1); | ||
139 | class1.AddMethodsToMemory(this._mainMemory.MethodArea); | ||
140 | |||
141 | Thread newThread = new Thread(); | ||
142 | this._threads.Add(newThread); | ||
143 | newThread.currentClass = class1; | ||
144 | newThread.scriptInfo = scriptInfo; | ||
145 | |||
146 | //now delete the created files | ||
147 | System.IO.File.Delete(scriptName + ".java"); | ||
148 | System.IO.File.Delete(scriptName + ".class"); | ||
149 | //this.OnFrame(); | ||
150 | } | ||
151 | catch (Exception e) | ||
152 | { | ||
153 | Console.WriteLine("exception"); | ||
154 | Console.WriteLine(e.StackTrace); | ||
155 | Console.WriteLine(e.Message); | ||
156 | } | ||
157 | } | ||
158 | |||
159 | private class CompileInfo | ||
160 | { | ||
161 | public string script; | ||
162 | public string scriptName; | ||
163 | |||
164 | public CompileInfo() | ||
165 | { | ||
166 | |||
167 | } | ||
168 | } | ||
169 | } | ||
170 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/ArrayReference.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/ArrayReference.cs deleted file mode 100644 index 0c4d623..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/ArrayReference.cs +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Scripting.EmbeddedJVM.Types | ||
6 | { | ||
7 | public class ArrayReference :BaseType | ||
8 | { | ||
9 | } | ||
10 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/BaseType.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/BaseType.cs deleted file mode 100644 index 7fc0a4f..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/BaseType.cs +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Scripting.EmbeddedJVM.Types | ||
6 | { | ||
7 | public class BaseType : Object | ||
8 | { | ||
9 | } | ||
10 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/ObjectReference.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/ObjectReference.cs deleted file mode 100644 index 7718765..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/ObjectReference.cs +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Scripting.EmbeddedJVM.Types | ||
6 | { | ||
7 | public class ObjectReference : BaseType | ||
8 | { | ||
9 | public ushort Reference; | ||
10 | |||
11 | public ObjectReference() | ||
12 | { | ||
13 | |||
14 | } | ||
15 | } | ||
16 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs deleted file mode 100644 index 5a7b780..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Byte.cs +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes | ||
6 | { | ||
7 | public class Byte : BaseType | ||
8 | { | ||
9 | } | ||
10 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs deleted file mode 100644 index c87ee8f..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Char.cs +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes | ||
6 | { | ||
7 | public class Char : BaseType | ||
8 | { | ||
9 | } | ||
10 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs deleted file mode 100644 index 982e748..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Float.cs +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes | ||
6 | { | ||
7 | public class Float : BaseType | ||
8 | { | ||
9 | public float mValue = 0; | ||
10 | |||
11 | public Float() | ||
12 | { | ||
13 | |||
14 | } | ||
15 | } | ||
16 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs deleted file mode 100644 index 073a9b3..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Types/PrimitiveTypes/Int.cs +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Region.Scripting.EmbeddedJVM.Types.PrimitiveTypes | ||
6 | { | ||
7 | public class Int : BaseType | ||
8 | { | ||
9 | public int mValue = 0; | ||
10 | |||
11 | public Int() | ||
12 | { | ||
13 | |||
14 | } | ||
15 | } | ||
16 | } | ||