Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed Context constructor to take JSObject* not JSObject&, to be able to control lifetime a little more carefully.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@67068 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com
2000-04-25 03:32:53 +00:00
parent d94e75b843
commit 2483f6c208
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/js/js2/interpreter.cpp
View File

@@ -123,13 +123,13 @@ namespace JavaScript {
case LOAD_NAME:
{
LoadName* ln = static_cast<LoadName*>(instruction);
(*registers)[dst(ln)] = mGlobal[*src1(ln)];
(*registers)[dst(ln)] = (*mGlobal)[*src1(ln)];
}
break;
case SAVE_NAME:
{
SaveName* sn = static_cast<SaveName*>(instruction);
mGlobal[*dst(sn)] = (*registers)[src1(sn)];
(*mGlobal)[*dst(sn)] = (*registers)[src1(sn)];
}
break;
case NEW_OBJECT:
@@ -296,7 +296,7 @@ namespace JavaScript {
break;
case NOT:
{
Move* nt = static_cast<Move*>(instruction);
Not* nt = static_cast<Not*>(instruction);
(*registers)[dst(nt)].i32 = !(*registers)[src1(nt)].i32;
}
break;

12
mozilla/js/js2/interpreter.h
View File

@@ -31,26 +31,26 @@ namespace JavaScript {
class Context : public gc_base {
public:
explicit Context(World& /*world */, JSObject& aGlobal) :
mGlobal(aGlobal) {};
explicit Context(World& /*world */, JSObject* aGlobal) :
mGlobal(aGlobal) {}
JSValue interpret(ICodeModule* iCode, const JSValues& args);
JSObject& setGlobalObject(JSObject& aGlobal)
JSObject* setGlobalObject(JSObject* aGlobal)
{
JSObject &t = mGlobal;
JSObject* t = mGlobal;
mGlobal = aGlobal;
return t;
}
JSObject& getGlobalObject()
JSObject* getGlobalObject()
{
return mGlobal;
}
private:
/* World mWorld; */
JSObject& mGlobal;
JSObject* mGlobal;
}; /* class Interpreter */
} /* namespace JavaScript */

6
mozilla/js/js2/js2.cpp
View File

@@ -216,7 +216,7 @@ namespace Shell {
static float64 testFunctionCall(World &world, float64 n)
{
JSObject glob;
Context cx(world, glob);
Context cx(world, &glob);
uint32 position = 0;
//StringAtom& global = world.identifiers[widenCString("global")];
StringAtom& sum = world.identifiers[widenCString("sum")];
@@ -266,7 +266,7 @@ namespace Shell {
static float64 testFactorial(World &world, float64 n)
{
JSObject glob;
Context cx(world, glob);
Context cx(world, &glob);
// generate code for factorial, and interpret it.
uint32 position = 0;
ICodeGenerator icg;
@@ -327,7 +327,7 @@ namespace Shell {
static float64 testObjects(World &world, int32 n)
{
JSObject glob;
Context cx(world, glob);
Context cx(world, &glob);
// create some objects, put some properties, and retrieve them.
uint32 position = 0;
ICodeGenerator initCG;

6
mozilla/js2/src/interpreter.cpp
View File

@@ -123,13 +123,13 @@ namespace JavaScript {
case LOAD_NAME:
{
LoadName* ln = static_cast<LoadName*>(instruction);
(*registers)[dst(ln)] = mGlobal[*src1(ln)];
(*registers)[dst(ln)] = (*mGlobal)[*src1(ln)];
}
break;
case SAVE_NAME:
{
SaveName* sn = static_cast<SaveName*>(instruction);
mGlobal[*dst(sn)] = (*registers)[src1(sn)];
(*mGlobal)[*dst(sn)] = (*registers)[src1(sn)];
}
break;
case NEW_OBJECT:
@@ -296,7 +296,7 @@ namespace JavaScript {
break;
case NOT:
{
Move* nt = static_cast<Move*>(instruction);
Not* nt = static_cast<Not*>(instruction);
(*registers)[dst(nt)].i32 = !(*registers)[src1(nt)].i32;
}
break;

12
mozilla/js2/src/interpreter.h
View File

@@ -31,26 +31,26 @@ namespace JavaScript {
class Context : public gc_base {
public:
explicit Context(World& /*world */, JSObject& aGlobal) :
mGlobal(aGlobal) {};
explicit Context(World& /*world */, JSObject* aGlobal) :
mGlobal(aGlobal) {}
JSValue interpret(ICodeModule* iCode, const JSValues& args);
JSObject& setGlobalObject(JSObject& aGlobal)
JSObject* setGlobalObject(JSObject* aGlobal)
{
JSObject &t = mGlobal;
JSObject* t = mGlobal;
mGlobal = aGlobal;
return t;
}
JSObject& getGlobalObject()
JSObject* getGlobalObject()
{
return mGlobal;
}
private:
/* World mWorld; */
JSObject& mGlobal;
JSObject* mGlobal;
}; /* class Interpreter */
} /* namespace JavaScript */

6
mozilla/js2/tests/cpp/js2_shell.cpp
View File

@@ -216,7 +216,7 @@ namespace Shell {
static float64 testFunctionCall(World &world, float64 n)
{
JSObject glob;
Context cx(world, glob);
Context cx(world, &glob);
uint32 position = 0;
//StringAtom& global = world.identifiers[widenCString("global")];
StringAtom& sum = world.identifiers[widenCString("sum")];
@@ -266,7 +266,7 @@ namespace Shell {
static float64 testFactorial(World &world, float64 n)
{
JSObject glob;
Context cx(world, glob);
Context cx(world, &glob);
// generate code for factorial, and interpret it.
uint32 position = 0;
ICodeGenerator icg;
@@ -327,7 +327,7 @@ namespace Shell {
static float64 testObjects(World &world, int32 n)
{
JSObject glob;
Context cx(world, glob);
Context cx(world, &glob);
// create some objects, put some properties, and retrieve them.
uint32 position = 0;
ICodeGenerator initCG;