Some more code refactoring, plus a restructuring of the directories so that the Grid servers can be a separate solution to the region server.

author: MW 2007-05-24 12:16:50 +0000
committer: MW 2007-05-24 12:16:50 +0000
commit: 3376b82501000692d6dac24b051af738cdaf2737 (patch)
tree: 90ed0a5d4955236f011fa63fce9d555186b0d179 /OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
parent: Added "terrain save grdmap <filename> <gradientmap>" function to console. Gra... (diff)
download: opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.zip
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.gz
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.bz2
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.xz
1 files changed, 0 insertions, 108 deletions
diff --git a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs b/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
deleted file mode 100644
index b94248c..0000000
--- a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Scripting.EmbeddedJVM.Types;
-using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
-namespace OpenSim.Scripting.EmbeddedJVM
-{
-    partial class Thread
-    {
-        private partial class Interpreter
-        {
-            private Thread _mThread;
-            public Interpreter(Thread parentThread)
-            {
-                _mThread = parentThread;
-            }
-            public bool Excute()
-            {
-                bool run = true;
-                byte currentOpCode = GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC++];
-               // Console.WriteLine("opCode is: " + currentOpCode);
-                bool handled = false;
-                handled = this.IsLogicOpCode(currentOpCode);
-                if (!handled)
-                {
-                    handled = this.IsMethodOpCode(currentOpCode);
-                }
-                if (!handled)
-                {
-                    if (currentOpCode == 172)
-                    {
-                        if (this._mThread.stack.StackFrames.Count > 1)
-                        {
-                            Console.WriteLine("returning int from function");
-                            int retPC1 = this._mThread.currentFrame.ReturnPC;
-                            BaseType bas1 = this._mThread.currentFrame.OpStack.Pop();
-                            this._mThread.stack.StackFrames.Pop();
-                            this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
-                            this._mThread.PC = retPC1;
-                            if (bas1 is Int)
-                            {
-                                this._mThread.currentFrame.OpStack.Push((Int)bas1);
-                            }
-                        }
-                        else
-                        {
-                          //  Console.WriteLine("No parent function so ending program");
-                            this._mThread.stack.StackFrames.Pop();
-                            run = false;
-                        }
-                        handled = true;
-                    }
-                    if (currentOpCode == 174)
-                    {
-                        if (this._mThread.stack.StackFrames.Count > 1)
-                        {
-                            Console.WriteLine("returning float from function");
-                            int retPC1 = this._mThread.currentFrame.ReturnPC;
-                            BaseType bas1 = this._mThread.currentFrame.OpStack.Pop();
-                            this._mThread.stack.StackFrames.Pop();
-                            this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
-                            this._mThread.PC = retPC1;
-                            if (bas1 is Float)
-                            {
-                                this._mThread.currentFrame.OpStack.Push((Float)bas1);
-                            }
-                        }
-                        else
-                        {
-                           // Console.WriteLine("No parent function so ending program");
-                            this._mThread.stack.StackFrames.Pop();
-                            run = false;
-                        }
-                        handled = true;
-                    }
-                    if (currentOpCode == 177)
-                    {
-                        if (this._mThread.stack.StackFrames.Count > 1)
-                        {
-                            Console.WriteLine("returning from function");
-                            int retPC = this._mThread.currentFrame.ReturnPC;
-                            this._mThread.stack.StackFrames.Pop();
-                            this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
-                            this._mThread.PC = retPC;
-                        }
-                        else
-                        {
-                           // Console.WriteLine("No parent function so ending program");
-                            this._mThread.stack.StackFrames.Pop();
-                            run = false;
-                        }
-                        handled = true;
-                    }
-                }
-                if (!handled)
-                {
-                    Console.WriteLine("opcode " + currentOpCode + " not been handled ");
-                }
-                return run;
-            }
-        }
-    }
-}
author	MW	2007-05-24 12:16:50 +0000
committer	MW	2007-05-24 12:16:50 +0000
commit	3376b82501000692d6dac24b051af738cdaf2737 (patch)
tree	90ed0a5d4955236f011fa63fce9d555186b0d179 /OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
parent	Added "terrain save grdmap <filename> <gradientmap>" function to console. Gra... (diff)
download	opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.zip opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.gz opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.bz2 opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.xz

diff --git a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs b/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs deleted file mode 100644 index b94248c..0000000 --- a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs +++ /dev/null
@@ -1,108 +0,0 @@
1	using System;
2	using System.Collections.Generic;
3	using System.Text;
4	using OpenSim.Scripting.EmbeddedJVM.Types;
5	using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
6
7	namespace OpenSim.Scripting.EmbeddedJVM
8	{
9	partial class Thread
10	{
11	private partial class Interpreter
12	{
13	private Thread _mThread;
14
15	public Interpreter(Thread parentThread)
16	{
17	_mThread = parentThread;
18	}
19
20	public bool Excute()
21	{
22	bool run = true;
23	byte currentOpCode = GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC++];
24	// Console.WriteLine("opCode is: " + currentOpCode);
25	bool handled = false;
26
27	handled = this.IsLogicOpCode(currentOpCode);
28	if (!handled)
29	{
30	handled = this.IsMethodOpCode(currentOpCode);
31	}
32	if (!handled)
33	{
34	if (currentOpCode == 172)
35	{
36	if (this._mThread.stack.StackFrames.Count > 1)
37	{
38	Console.WriteLine("returning int from function");
39	int retPC1 = this._mThread.currentFrame.ReturnPC;
40	BaseType bas1 = this._mThread.currentFrame.OpStack.Pop();
41	this._mThread.stack.StackFrames.Pop();
42	this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
43	this._mThread.PC = retPC1;
44	if (bas1 is Int)
45	{
46	this._mThread.currentFrame.OpStack.Push((Int)bas1);
47	}
48	}
49	else
50	{
51	// Console.WriteLine("No parent function so ending program");
52	this._mThread.stack.StackFrames.Pop();
53	run = false;
54	}
55	handled = true;
56	}
57	if (currentOpCode == 174)
58	{
59	if (this._mThread.stack.StackFrames.Count > 1)
60	{
61	Console.WriteLine("returning float from function");
62	int retPC1 = this._mThread.currentFrame.ReturnPC;
63	BaseType bas1 = this._mThread.currentFrame.OpStack.Pop();
64	this._mThread.stack.StackFrames.Pop();
65	this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
66	this._mThread.PC = retPC1;
67	if (bas1 is Float)
68	{
69	this._mThread.currentFrame.OpStack.Push((Float)bas1);
70	}
71	}
72	else
73	{
74	// Console.WriteLine("No parent function so ending program");
75	this._mThread.stack.StackFrames.Pop();
76	run = false;
77	}
78	handled = true;
79	}
80	if (currentOpCode == 177)
81	{
82	if (this._mThread.stack.StackFrames.Count > 1)
83	{
84	Console.WriteLine("returning from function");
85	int retPC = this._mThread.currentFrame.ReturnPC;
86	this._mThread.stack.StackFrames.Pop();
87	this._mThread.currentFrame = this._mThread.stack.StackFrames.Peek();
88	this._mThread.PC = retPC;
89	}
90	else
91	{
92	// Console.WriteLine("No parent function so ending program");
93	this._mThread.stack.StackFrames.Pop();
94	run = false;
95	}
96	handled = true;
97	}
98	}
99	if (!handled)
100	{
101	Console.WriteLine("opcode " + currentOpCode + " not been handled ");
102	}
103	return run;
104
105	}
106	}
107	}
108	}