#include "sqarray.h"
#include "sqclass.h"
-#define TOP() (_stack[_top-1])
+#define TOP() (_stack._vals[_top-1])
-bool SQVM::BW_OP(unsigned int op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
+bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
{
SQInteger res;
SQInteger i1 = _integer(o1), i2 = _integer(o2);
case BW_XOR: res = i1 ^ i2; break;
case BW_SHIFTL: res = i1 << i2; break;
case BW_SHIFTR: res = i1 >> i2; break;
- case BW_USHIFTR:res = (SQInteger)(*((unsigned int*)&i1) >> i2); break;
+ case BW_USHIFTR:res = (SQInteger)(*((SQUnsignedInteger*)&i1) >> i2); break;
default: { Raise_Error(_SC("internal vm error bitwise op failed")); return false; }
}
}
return true;
}
-bool SQVM::ARITH_OP(unsigned int op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
+bool SQVM::ARITH_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
{
if(sq_isnumeric(o1) && sq_isnumeric(o2)) {
if((type(o1)==OT_INTEGER) && (type(o2)==OT_INTEGER)) {
+ SQInteger res, i1 = _integer(o1), i2 = _integer(o2);
switch(op) {
- case '+': trg = _integer(o1) + _integer(o2); break;
- case '-': trg = _integer(o1) - _integer(o2); break;
- case '/': if(_integer(o2) == 0) { Raise_Error(_SC("division by zero")); return false; }
- trg = _integer(o1) / _integer(o2);
+ case '+': res = i1 + i2; break;
+ case '-': res = i1 - i2; break;
+ case '/': if(i2 == 0) { Raise_Error(_SC("division by zero")); return false; }
+ res = i1 / i2;
break;
- case '*': trg = _integer(o1) * _integer(o2); break;
- case '%': trg = _integer(o1) % _integer(o2); break;
+ case '*': res = i1 * i2; break;
+ case '%': res = i1 % i2; break;
+ default: res = 0xDEADBEEF;
}
+ trg = res;
}else{
+ SQFloat res, f1 = tofloat(o1), f2 = tofloat(o2);
switch(op) {
- case '+': trg = tofloat(o1) + tofloat(o2); break;
- case '-': trg = tofloat(o1) - tofloat(o2); break;
- case '/': trg = tofloat(o1) / tofloat(o2); break;
- case '*': trg = tofloat(o1) * tofloat(o2); break;
- case '%': trg = SQFloat(fmod((double)tofloat(o1),(double)tofloat(o2))); break;
+ case '+': res = f1 + f2; break;
+ case '-': res = f1 - f2; break;
+ case '/': res = f1 / f2; break;
+ case '*': res = f1 * f2; break;
+ case '%': res = SQFloat(fmod((double)f1,(double)f2)); break;
+ default: res = 0x0f;
}
+ trg = res;
}
} else {
if(op == '+' && (type(o1) == OT_STRING || type(o2) == OT_STRING)){
return true;
}
-SQObjectPtr &stack_get(HSQUIRRELVM v,int idx){return ((idx>=0)?(v->GetAt(idx+v->_stackbase-1)):(v->GetUp(idx)));}
-
SQVM::SQVM(SQSharedState *ss)
{
_sharedstate=ss;
_suspended_traps=-1;
_foreignptr=NULL;
_nnativecalls=0;
- _uiRef=0;
_lasterror = _null_;
_errorhandler = _null_;
_debughook = _null_;
+ ci = NULL;
INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);
}
_errorhandler = _null_;
_debughook = _null_;
temp_reg = _null_;
- int size=_stack.size();
- for(int i=0;i<size;i++)
+ _callstackdata.resize(0);
+ SQInteger size=_stack.size();
+ for(SQInteger i=0;i<size;i++)
_stack[i]=_null_;
}
SQVM::~SQVM()
{
Finalize();
+ //sq_free(_callsstack,_alloccallsstacksize*sizeof(CallInfo));
REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain,this);
}
-bool SQVM::ArithMetaMethod(int op,const SQObjectPtr &o1,const SQObjectPtr &o2,SQObjectPtr &dest)
+bool SQVM::ArithMetaMethod(SQInteger op,const SQObjectPtr &o1,const SQObjectPtr &o2,SQObjectPtr &dest)
{
SQMetaMethod mm;
switch(op){
case _SC('/'): mm=MT_DIV; break;
case _SC('*'): mm=MT_MUL; break;
case _SC('%'): mm=MT_MODULO; break;
+ default: mm = MT_ADD; assert(0); break; //shutup compiler
}
if(is_delegable(o1) && _delegable(o1)->_delegate) {
Push(o1);Push(o2);
return true;
}
}
- return true;
-
+ default:break; //shutup compiler
}
Raise_Error(_SC("attempt to negate a %s"), GetTypeName(o));
return false;
}
#define _RET_SUCCEED(exp) { result = (exp); return true; }
-bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,int &result)
+bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
{
if(type(o1)==type(o2)){
if(_userpointer(o1)==_userpointer(o2))_RET_SUCCEED(0);
case OT_TABLE:
case OT_USERDATA:
case OT_INSTANCE:
- Push(o1);Push(o2);
- if(_delegable(o1)->_delegate)CallMetaMethod(_delegable(o1),MT_CMP,2,res);
- break;
+ if(_delegable(o1)->_delegate) {
+ Push(o1);Push(o2);
+ if(CallMetaMethod(_delegable(o1),MT_CMP,2,res)) break;
+ }
+ //continues through (no break needed)
+ default:
+ _RET_SUCCEED( _userpointer(o1) < _userpointer(o2)?-1:1 );
}
if(type(res)!=OT_INTEGER) { Raise_CompareError(o1,o2); return false; }
- _RET_SUCCEED(_integer(res));
+ _RET_SUCCEED(_integer(res));
+
}
else{
if(sq_isnumeric(o1) && sq_isnumeric(o2)){
bool SQVM::CMP_OP(CmpOP op, const SQObjectPtr &o1,const SQObjectPtr &o2,SQObjectPtr &res)
{
- int r;
+ SQInteger r;
if(ObjCmp(o1,o2,r)) {
switch(op) {
case CMP_G: res = (r > 0)?_true_:_false_; return true;
return false;
}
-bool SQVM::StringCat(const SQObjectPtr &str,const SQObjectPtr &obj,SQObjectPtr &dest)
+void SQVM::ToString(const SQObjectPtr &o,SQObjectPtr &res)
{
- switch(type(obj))
- {
+ switch(type(o)) {
case OT_STRING:
- switch(type(str)){
- case OT_STRING: {
- int l=_string(str)->_len,ol=_string(obj)->_len;
- SQChar *s=_sp(rsl(l+ol+1));
- memcpy(s,_stringval(str),rsl(l));memcpy(s+l,_stringval(obj),rsl(ol));s[l+ol]=_SC('\0');
- break;
- }
- case OT_FLOAT:
- scsprintf(_sp(rsl(NUMBER_MAX_CHAR+_string(obj)->_len+1)),_SC("%g%s"),_float(str),_stringval(obj));
- break;
- case OT_INTEGER:
- scsprintf(_sp(rsl(NUMBER_MAX_CHAR+_string(obj)->_len+1)),_SC("%d%s"),_integer(str),_stringval(obj));
- break;
- default:
- Raise_Error(_SC("string concatenation between '%s' and '%s'"),GetTypeName(str),GetTypeName(obj));
- return false;
- }
- dest=SQString::Create(_ss(this),_spval);
- break;
+ res = o;
+ return;
case OT_FLOAT:
- scsprintf(_sp(rsl(NUMBER_MAX_CHAR+_string(str)->_len+1)),_SC("%s%g"),_stringval(str),_float(obj));
- dest=SQString::Create(_ss(this),_spval);
+ scsprintf(_sp(rsl(NUMBER_MAX_CHAR+1)),_SC("%g"),_float(o));
break;
case OT_INTEGER:
- scsprintf(_sp(rsl(NUMBER_MAX_CHAR+_string(str)->_len+1)),_SC("%s%d"),_stringval(str),_integer(obj));
- dest=SQString::Create(_ss(this),_spval);
+ scsprintf(_sp(rsl(NUMBER_MAX_CHAR+1)),_SC("%d"),_integer(o));
break;
+ case OT_BOOL:
+ scsprintf(_sp(rsl(6)),_integer(o)?_SC("true"):_SC("false"));
+ break;
+ case OT_TABLE:
+ case OT_USERDATA:
+ case OT_INSTANCE:
+ if(_delegable(o)->_delegate) {
+ Push(o);
+ if(CallMetaMethod(_delegable(o),MT_TOSTRING,1,res)) {
+ if(type(res) == OT_STRING)
+ return;
+ //else keeps going to the default
+ }
+ }
default:
- Raise_Error(_SC("string concatenation between '%s' and '%s'"),GetTypeName(str),GetTypeName(obj));
- return false;
+ scsprintf(_sp(rsl(sizeof(void*)+20)),_SC("(%s : 0x%p)"),GetTypeName(o),(void*)_rawval(o));
}
- return true;
+ res = SQString::Create(_ss(this),_spval);
}
-const SQChar *IdType2Name(SQObjectType type)
-{
- switch(_RAW_TYPE(type))
- {
- case _RT_NULL:return _SC("null");
- case _RT_INTEGER:return _SC("integer");
- case _RT_FLOAT:return _SC("float");
- case _RT_BOOL:return _SC("bool");
- case _RT_STRING:return _SC("string");
- case _RT_TABLE:return _SC("table");
- case _RT_ARRAY:return _SC("array");
- case _RT_GENERATOR:return _SC("generator");
- case _RT_CLOSURE:
- case _RT_NATIVECLOSURE:
- return _SC("function");
- case _RT_USERDATA:
- case _RT_USERPOINTER:
- return _SC("userdata");
- case _RT_THREAD: return _SC("thread");
- case _RT_FUNCPROTO: return _SC("function");
- case _RT_CLASS: return _SC("class");
- case _RT_INSTANCE: return _SC("instance");
- default:
- return NULL;
- }
-}
-const SQChar *GetTypeName(const SQObjectPtr &obj1)
+bool SQVM::StringCat(const SQObjectPtr &str,const SQObjectPtr &obj,SQObjectPtr &dest)
{
- return IdType2Name(type(obj1));
+ SQObjectPtr a, b;
+ ToString(str, a);
+ ToString(obj, b);
+ SQInteger l = _string(a)->_len , ol = _string(b)->_len;
+ SQChar *s = _sp(rsl(l + ol + 1));
+ memcpy(s, _stringval(a), rsl(l));
+ memcpy(s + l, _stringval(b), rsl(ol));
+ dest = SQString::Create(_ss(this), _spval, l + ol);
+ return true;
}
void SQVM::TypeOf(const SQObjectPtr &obj1,SQObjectPtr &dest)
dest = SQString::Create(_ss(this),GetTypeName(obj1));
}
-bool SQVM::Init(SQVM *friendvm, int stacksize)
+bool SQVM::Init(SQVM *friendvm, SQInteger stacksize)
{
_stack.resize(stacksize);
- _callsstack.reserve(4);
+ //_callsstack.reserve(4);
+ _alloccallsstacksize = 4;
+ _callstackdata.resize(_alloccallsstacksize);
+ _callsstacksize = 0;
+ _callsstack = &_callstackdata[0];
+ //_callsstack = (CallInfo*)sq_malloc(_alloccallsstacksize*sizeof(CallInfo));
_stackbase = 0;
_top = 0;
if(!friendvm)
extern SQInstructionDesc g_InstrDesc[];
-bool SQVM::StartCall(SQClosure *closure,int target,int nargs,int stackbase,bool tailcall)
+bool SQVM::StartCall(SQClosure *closure,SQInteger target,SQInteger args,SQInteger stackbase,bool tailcall)
{
SQFunctionProto *func = _funcproto(closure->_function);
- //const int outerssize = func->_outervalues.size();
-
- const int paramssize = func->_parameters.size();
- const int oldtop = _top;
- const int newtop = stackbase + func->_stacksize;
-
- if(func->_varparams)
- {
- if (nargs < paramssize) {
- Raise_Error(_SC("wrong number of parameters"));
- return false;
+ const SQInteger paramssize = func->_nparameters;
+ const SQInteger newtop = stackbase + func->_stacksize;
+ SQInteger nargs = args;
+ if (paramssize != nargs) {
+ SQInteger ndef = func->_ndefaultparams;
+ if(ndef && nargs < paramssize) {
+ SQInteger diff = paramssize - nargs;
+ for(SQInteger n = ndef - diff; n < ndef; n++) {
+ _stack._vals[stackbase + (nargs++)] = closure->_defaultparams[n];
+ }
}
- for(int n = 0; n < nargs - paramssize; n++) {
- _vargsstack.push_back(_stack[stackbase+paramssize+n]);
- _stack[stackbase+paramssize+n] = _null_;
+ else if(func->_varparams)
+ {
+ if (nargs < paramssize) {
+ Raise_Error(_SC("wrong number of parameters"));
+ return false;
+ }
+ for(SQInteger n = 0; n < nargs - paramssize; n++) {
+ _vargsstack.push_back(_stack._vals[stackbase+paramssize+n]);
+ _stack._vals[stackbase+paramssize+n] = _null_;
+ }
}
- }
- else {
- if (paramssize != nargs) {
+ else {
Raise_Error(_SC("wrong number of parameters"));
return false;
}
-
}
-
+
+ if(type(closure->_env) == OT_WEAKREF) {
+ _stack._vals[stackbase] = _weakref(closure->_env)->_obj;
+ }
+
if (!tailcall) {
- PUSH_CALLINFO(this, CallInfo());
- ci->_etraps = 0;
- ci->_prevstkbase = stackbase - _stackbase;
- ci->_target = target;
- ci->_prevtop = _top - _stackbase;
- ci->_ncalls = 1;
- ci->_root = SQFalse;
+ CallInfo lc;
+ lc._generator = NULL;
+ lc._etraps = 0;
+ lc._prevstkbase = (SQInt32) ( stackbase - _stackbase );
+ lc._target = (SQInt32) target;
+ lc._prevtop = (SQInt32) (_top - _stackbase);
+ lc._ncalls = 1;
+ lc._root = SQFalse;
+ PUSH_CALLINFO(this, lc);
}
else {
ci->_ncalls++;
}
- ci->_vargs.size = (nargs - paramssize);
- ci->_vargs.base = _vargsstack.size()-(nargs - paramssize);
- ci->_closure._unVal.pClosure = closure;
- ci->_closure._type = OT_CLOSURE;
- ci->_iv = &func->_instructions;
- ci->_literals = &func->_literals;
+ ci->_vargs.size = (SQInt32)(nargs - paramssize);
+ ci->_vargs.base = (SQInt32)(_vargsstack.size()-(ci->_vargs.size));
+ ci->_closure = closure;
+ ci->_literals = func->_literals;
+ ci->_ip = func->_instructions;
//grows the stack if needed
- if (((unsigned int)newtop + (func->_stacksize<<1)) > _stack.size()) {
+ if (((SQUnsignedInteger)newtop + (func->_stacksize<<1)) > _stack.size()) {
_stack.resize(_stack.size() + (func->_stacksize<<1));
}
_top = newtop;
_stackbase = stackbase;
- ci->_ip = ci->_iv->_vals;
+ if (type(_debughook) != OT_NULL && _rawval(_debughook) != _rawval(ci->_closure))
+ CallDebugHook(_SC('c'));
return true;
}
-bool SQVM::Return(int _arg0, int _arg1, SQObjectPtr &retval)
+bool SQVM::Return(SQInteger _arg0, SQInteger _arg1, SQObjectPtr &retval)
{
if (type(_debughook) != OT_NULL && _rawval(_debughook) != _rawval(ci->_closure))
- for(int i=0;i<ci->_ncalls;i++)
+ for(SQInteger i=0;i<ci->_ncalls;i++)
CallDebugHook(_SC('r'));
-
+
SQBool broot = ci->_root;
- int last_top = _top;
- int target = ci->_target;
- int oldstackbase = _stackbase;
+ SQInteger last_top = _top;
+ SQInteger target = ci->_target;
+ SQInteger oldstackbase = _stackbase;
_stackbase -= ci->_prevstkbase;
_top = _stackbase + ci->_prevtop;
if(ci->_vargs.size) PopVarArgs(ci->_vargs);
POP_CALLINFO(this);
if (broot) {
- if (_arg0 != MAX_FUNC_STACKSIZE) retval = _stack[oldstackbase+_arg1];
+ if (_arg0 != MAX_FUNC_STACKSIZE) retval = _stack._vals[oldstackbase+_arg1];
else retval = _null_;
}
else {
- if (_arg0 != MAX_FUNC_STACKSIZE)
- STK(target) = _stack[oldstackbase+_arg1];
- else
- STK(target) = _null_;
+ if(target != -1) { //-1 is when a class contructor ret value has to be ignored
+ if (_arg0 != MAX_FUNC_STACKSIZE)
+ STK(target) = _stack._vals[oldstackbase+_arg1];
+ else
+ STK(target) = _null_;
+ }
}
- while (last_top >= _top) _stack[last_top--].Null();
+ while (last_top >= _top) _stack._vals[last_top--].Null();
assert(oldstackbase >= _stackbase);
return broot?true:false;
}
#define _RET_ON_FAIL(exp) { if(!exp) return false; }
-bool SQVM::LOCAL_INC(int op,SQObjectPtr &target, SQObjectPtr &a, SQObjectPtr &incr)
+bool SQVM::LOCAL_INC(SQInteger op,SQObjectPtr &target, SQObjectPtr &a, SQObjectPtr &incr)
{
_RET_ON_FAIL(ARITH_OP( op , target, a, incr));
a = target;
return true;
}
-bool SQVM::PLOCAL_INC(int op,SQObjectPtr &target, SQObjectPtr &a, SQObjectPtr &incr)
+bool SQVM::PLOCAL_INC(SQInteger op,SQObjectPtr &target, SQObjectPtr &a, SQObjectPtr &incr)
{
SQObjectPtr trg;
_RET_ON_FAIL(ARITH_OP( op , trg, a, incr));
return true;
}
-bool SQVM::DerefInc(int op,SQObjectPtr &target, SQObjectPtr &self, SQObjectPtr &key, SQObjectPtr &incr, bool postfix)
+bool SQVM::DerefInc(SQInteger op,SQObjectPtr &target, SQObjectPtr &self, SQObjectPtr &key, SQObjectPtr &incr, bool postfix)
{
SQObjectPtr tmp, tself = self, tkey = key;
if (!Get(tself, tkey, tmp, false, true)) { Raise_IdxError(tkey); return false; }
#define arg0 (_i_._arg0)
#define arg1 (_i_._arg1)
-#define sarg1 (*((int *)&_i_._arg1))
+#define sarg1 (*((SQInt32 *)&_i_._arg1))
#define arg2 (_i_._arg2)
#define arg3 (_i_._arg3)
-#define sarg3 (*((char *)&_i_._arg3))
+#define sarg3 ((SQInteger)*((signed char *)&_i_._arg3))
SQRESULT SQVM::Suspend()
{
void SQVM::PopVarArgs(VarArgs &vargs)
{
- for(int n = 0; n< vargs.size; n++)
+ for(SQInteger n = 0; n< vargs.size; n++)
_vargsstack.pop_back();
}
-#define _FINISH(stoploop) {finished = stoploop; return true; }
+#define _FINISH(howmuchtojump) {jump = howmuchtojump; return true; }
bool SQVM::FOREACH_OP(SQObjectPtr &o1,SQObjectPtr &o2,SQObjectPtr
-&o3,SQObjectPtr &o4,int arg_2,bool &finished)
+&o3,SQObjectPtr &o4,SQInteger arg_2,int exitpos,int &jump)
{
- int nrefidx;
+ SQInteger nrefidx;
switch(type(o1)) {
case OT_TABLE:
- if((nrefidx = _table(o1)->Next(o4, o2, o3)) == -1) _FINISH(true);
- o4 = (SQInteger)nrefidx; _FINISH(false);
+ if((nrefidx = _table(o1)->Next(false,o4, o2, o3)) == -1) _FINISH(exitpos);
+ o4 = (SQInteger)nrefidx; _FINISH(1);
case OT_ARRAY:
- if((nrefidx = _array(o1)->Next(o4, o2, o3)) == -1) _FINISH(true);
- o4 = (SQInteger) nrefidx; _FINISH(false);
+ if((nrefidx = _array(o1)->Next(o4, o2, o3)) == -1) _FINISH(exitpos);
+ o4 = (SQInteger) nrefidx; _FINISH(1);
case OT_STRING:
- if((nrefidx = _string(o1)->Next(o4, o2, o3)) == -1)_FINISH(true);
- o4 = (SQInteger)nrefidx; _FINISH(false);
+ if((nrefidx = _string(o1)->Next(o4, o2, o3)) == -1)_FINISH(exitpos);
+ o4 = (SQInteger)nrefidx; _FINISH(1);
case OT_CLASS:
- if((nrefidx = _class(o1)->Next(o4, o2, o3)) == -1)_FINISH(true);
- o4 = (SQInteger)nrefidx; _FINISH(false);
+ if((nrefidx = _class(o1)->Next(o4, o2, o3)) == -1)_FINISH(exitpos);
+ o4 = (SQInteger)nrefidx; _FINISH(1);
case OT_USERDATA:
case OT_INSTANCE:
if(_delegable(o1)->_delegate) {
Push(o4);
if(CallMetaMethod(_delegable(o1), MT_NEXTI, 2, itr)){
o4 = o2 = itr;
- if(type(itr) == OT_NULL) _FINISH(true);
+ if(type(itr) == OT_NULL) _FINISH(exitpos);
if(!Get(o1, itr, o3, false,false)) {
Raise_Error(_SC("_nexti returned an invalid idx"));
return false;
}
- _FINISH(false);
+ _FINISH(1);
}
Raise_Error(_SC("_nexti failed"));
return false;
}
break;
case OT_GENERATOR:
- if(_generator(o1)->_state == SQGenerator::eDead) _FINISH(true);
+ if(_generator(o1)->_state == SQGenerator::eDead) _FINISH(exitpos);
if(_generator(o1)->_state == SQGenerator::eSuspended) {
SQInteger idx = 0;
if(type(o4) == OT_INTEGER) {
o2 = idx;
o4 = idx;
_generator(o1)->Resume(this, arg_2+1);
- _FINISH(false);
+ _FINISH(0);
}
+ default:
+ Raise_Error(_SC("cannot iterate %s"), GetTypeName(o1));
}
- Raise_Error(_SC("cannot iterate %s"), GetTypeName(o1));
return false; //cannot be hit(just to avoid warnings)
}
trg = o1;
return true;
}
-#define COND_LITERAL (arg3!=0?(*ci->_literals)[arg1]:STK(arg1))
+#define COND_LITERAL (arg3!=0?ci->_literals[arg1]:STK(arg1))
#define _GUARD(exp) { if(!exp) { Raise_Error(_lasterror); SQ_THROW();} }
bool SQVM::CLOSURE_OP(SQObjectPtr &target, SQFunctionProto *func)
{
- int nouters;
+ SQInteger nouters;
SQClosure *closure = SQClosure::Create(_ss(this), func);
- if(nouters = func->_outervalues.size()) {
+ if((nouters = func->_noutervalues)) {
closure->_outervalues.reserve(nouters);
- for(int i = 0; i<nouters; i++) {
+ for(SQInteger i = 0; i<nouters; i++) {
SQOuterVar &v = func->_outervalues[i];
switch(v._type){
case otSYMBOL:
}
}
}
+ SQInteger ndefparams;
+ if((ndefparams = func->_ndefaultparams)) {
+ closure->_defaultparams.reserve(ndefparams);
+ for(SQInteger i = 0; i < ndefparams; i++) {
+ SQInteger spos = func->_defaultparams[i];
+ closure->_defaultparams.push_back(_stack._vals[_stackbase + spos]);
+ }
+ }
target = closure;
return true;
Raise_Error(_SC("indexing 'vargv' with %s"),GetTypeName(index));
return false;
}
- int idx = tointeger(index);
+ SQInteger idx = tointeger(index);
if(idx < 0 || idx >= ci->_vargs.size){ Raise_Error(_SC("vargv index out of range")); return false; }
target = _vargsstack[ci->_vargs.base+idx];
return true;
}
-bool SQVM::CLASS_OP(SQObjectPtr &target,int baseclass,int attributes)
+bool SQVM::CLASS_OP(SQObjectPtr &target,SQInteger baseclass,SQInteger attributes)
{
SQClass *base = NULL;
SQObjectPtr attrs;
- if(baseclass != MAX_LITERALS) {
+ if(baseclass != -1) {
if(type(_stack._vals[_stackbase+baseclass]) != OT_CLASS) { Raise_Error(_SC("trying to inherit from a %s"),GetTypeName(_stack._vals[_stackbase+baseclass])); return false; }
base = _class(_stack._vals[_stackbase + baseclass]);
}
attrs = _stack._vals[_stackbase+attributes];
}
target = SQClass::Create(_ss(this),base);
+ if(type(_class(target)->_metamethods[MT_INHERITED]) != OT_NULL) {
+ int nparams = 2;
+ SQObjectPtr ret;
+ Push(target); Push(attrs);
+ Call(_class(target)->_metamethods[MT_INHERITED],nparams,_top - nparams, ret, false);
+ Pop(nparams);
+ }
_class(target)->_attributes = attrs;
return true;
}
-bool SQVM::IsFalse(SQObjectPtr &o)
-{
- SQObjectType t = type(o);
- if((t & SQOBJECT_CANBEFALSE)
- && ((t == OT_NULL) || ((t == OT_INTEGER || t == OT_BOOL) && _integer(o) == 0)
- || (t == OT_FLOAT && _float(o) == SQFloat(0.0)))) {
- return true;
- }
- return false;
-}
+
bool SQVM::IsEqual(SQObjectPtr &o1,SQObjectPtr &o2,bool &res)
{
}
else {
if(sq_isnumeric(o1) && sq_isnumeric(o2)) {
- int cmpres;
+ SQInteger cmpres;
if(!ObjCmp(o1, o2,cmpres)) return false;
res = (cmpres == 0);
}
return true;
}
-bool SQVM::Execute(SQObjectPtr &closure, int target, int nargs, int stackbase,SQObjectPtr &outres, ExecutionType et)
+bool SQVM::IsFalse(SQObjectPtr &o)
+{
+ if((type(o) & SQOBJECT_CANBEFALSE) && ( (type(o) == OT_FLOAT) && (_float(o) == SQFloat(0.0)) )
+ || (_integer(o) == 0) ) { //OT_NULL|OT_INTEGER|OT_BOOL
+ return true;
+ }
+ return false;
+}
+
+bool SQVM::GETPARENT_OP(SQObjectPtr &o,SQObjectPtr &target)
+{
+ switch(type(o)) {
+ case OT_TABLE: target = _table(o)->_delegate?SQObjectPtr(_table(o)->_delegate):_null_;
+ break;
+ case OT_CLASS: target = _class(o)->_base?_class(o)->_base:_null_;
+ break;
+ default:
+ Raise_Error(_SC("the %s type doesn't have a parent slot"), GetTypeName(o));
+ return false;
+ }
+ return true;
+}
+
+bool SQVM::Execute(SQObjectPtr &closure, SQInteger target, SQInteger nargs, SQInteger stackbase,SQObjectPtr &outres, SQBool raiseerror,ExecutionType et)
{
if ((_nnativecalls + 1) > MAX_NATIVE_CALLS) { Raise_Error(_SC("Native stack overflow")); return false; }
_nnativecalls++;
AutoDec ad(&_nnativecalls);
- int traps = 0;
+ SQInteger traps = 0;
//temp_reg vars for OP_CALL
- int ct_target;
+ SQInteger ct_target;
+ SQInteger ct_stackbase;
bool ct_tailcall;
switch(et) {
case ET_RESUME_VM:
traps = _suspended_traps;
ci->_root = _suspended_root;
+ ci->_vargs = _suspend_varargs;
_suspended = SQFalse;
break;
}
if(type(_debughook) != OT_NULL && _rawval(_debughook) != _rawval(ci->_closure))
CallDebugHook(_SC('l'),arg1);
continue;
- case _OP_LOAD: TARGET = (*ci->_literals)[arg1]; continue;
+ case _OP_LOAD: TARGET = ci->_literals[arg1]; continue;
+ case _OP_LOADINT: TARGET = (SQInteger)arg1; continue;
+ case _OP_LOADFLOAT: TARGET = *((SQFloat *)&arg1); continue;
+ case _OP_DLOAD: TARGET = ci->_literals[arg1]; STK(arg2) = ci->_literals[arg3];continue;
case _OP_TAILCALL:
temp_reg = STK(arg1);
if (type(temp_reg) == OT_CLOSURE){
ct_tailcall = true;
if(ci->_vargs.size) PopVarArgs(ci->_vargs);
- for (int i = 0; i < arg3; i++) STK(i) = STK(arg2 + i);
+ for (SQInteger i = 0; i < arg3; i++) STK(i) = STK(arg2 + i);
ct_target = ci->_target;
+ ct_stackbase = _stackbase;
goto common_call;
}
case _OP_CALL: {
ct_tailcall = false;
ct_target = arg0;
temp_reg = STK(arg1);
+ ct_stackbase = _stackbase+arg2;
+
common_call:
- int last_top = _top;
- switch (type(temp_reg)) {
+ SQObjectPtr clo = temp_reg;
+ SQInteger last_top = _top;
+ switch (type(clo)) {
case OT_CLOSURE:{
- _GUARD(StartCall(_closure(temp_reg), ct_target, arg3, ct_tailcall?_stackbase:_stackbase+arg2, ct_tailcall));
- if (_funcproto(_closure(temp_reg)->_function)->_bgenerator) {
- SQGenerator *gen = SQGenerator::Create(_ss(this), _closure(temp_reg));
+ _GUARD(StartCall(_closure(clo), ct_target, arg3, ct_stackbase, ct_tailcall));
+ if (_funcproto(_closure(clo)->_function)->_bgenerator) {
+ SQGenerator *gen = SQGenerator::Create(_ss(this), _closure(clo));
_GUARD(gen->Yield(this));
- Return(1, ct_target, temp_reg);
+ Return(1, ct_target, clo);
STK(ct_target) = gen;
- while (last_top >= _top) _stack[last_top--].Null();
+ while (last_top >= _top) _stack._vals[last_top--].Null();
continue;
}
- if (type(_debughook) != OT_NULL && _rawval(_debughook) != _rawval(ci->_closure))
- CallDebugHook(_SC('c'));
}
- break;
+ continue;
case OT_NATIVECLOSURE: {
bool suspend;
- _GUARD(CallNative(_nativeclosure(temp_reg), arg3, _stackbase+arg2, ct_tailcall, temp_reg,suspend));
+ _GUARD(CallNative(_nativeclosure(clo), arg3, ct_stackbase, clo,suspend));
if(suspend){
_suspended = SQTrue;
_suspended_target = ct_target;
_suspended_root = ci->_root;
_suspended_traps = traps;
- outres = temp_reg;
+ _suspend_varargs = ci->_vargs;
+ outres = clo;
return true;
}
- STK(ct_target) = temp_reg;
+ if(ct_target != -1) { //skip return value for constructors
+ STK(ct_target) = clo;
+ }
}
- break;
+ continue;
case OT_CLASS:{
- _GUARD(CreateClassInstance(_class(temp_reg),arg3,_stackbase+arg2,STK(ct_target)));
+ SQObjectPtr inst;
+ _GUARD(CreateClassInstance(_class(clo),inst,temp_reg));
+ STK(ct_target) = inst;
+ ct_target = -1; //fakes return value target so that is not overwritten by the constructor
+ if(type(temp_reg) != OT_NULL) {
+ _stack._vals[ct_stackbase] = inst;
+ goto common_call; //hard core spaghetti code(reissues the OP_CALL to invoke the constructor)
+ }
}
break;
case OT_TABLE:
case OT_USERDATA:
case OT_INSTANCE:
{
- Push(temp_reg);
- for (int i = 0; i < arg3; i++) Push(STK(arg2 + i));
- if (_delegable(temp_reg) && CallMetaMethod(_delegable(temp_reg), MT_CALL, arg3+1, temp_reg)){
- STK(ct_target) = temp_reg;
+ Push(clo);
+ for (SQInteger i = 0; i < arg3; i++) Push(STK(arg2 + i));
+ if (_delegable(clo) && CallMetaMethod(_delegable(clo), MT_CALL, arg3+1, clo)){
+ STK(ct_target) = clo;
break;
}
- Raise_Error(_SC("attempt to call '%s'"), GetTypeName(temp_reg));
+ Raise_Error(_SC("attempt to call '%s'"), GetTypeName(clo));
SQ_THROW();
}
default:
- Raise_Error(_SC("attempt to call '%s'"), GetTypeName(temp_reg));
+ Raise_Error(_SC("attempt to call '%s'"), GetTypeName(clo));
SQ_THROW();
}
}
continue;
case _OP_PREPCALL:
- if (!Get(STK(arg2), STK(arg1), temp_reg, false,true))
- { Raise_IdxError(STK(arg1)); SQ_THROW(); }
- goto common_prepcall;
case _OP_PREPCALLK:
- if (!Get(STK(arg2), (*ci->_literals)[arg1], temp_reg,false,true)) {
- if(type(STK(arg2)) == OT_CLASS) { //hack?
- if(_class_ddel->Get((*ci->_literals)[arg1],temp_reg)) {
- STK(arg3) = STK(arg2);
+ {
+ SQObjectPtr &key = _i_.op == _OP_PREPCALLK?(ci->_literals)[arg1]:STK(arg1);
+ SQObjectPtr &o = STK(arg2);
+ if (!Get(o, key, temp_reg,false,true)) {
+ if(type(o) == OT_CLASS) { //hack?
+ if(_class_ddel->Get(key,temp_reg)) {
+ STK(arg3) = o;
TARGET = temp_reg;
continue;
}
}
- { Raise_IdxError((*ci->_literals)[arg1]); SQ_THROW();}
- }
-common_prepcall:
- if(type(STK(arg2)) == OT_CLASS) {
- STK(arg3) = STK(0); // this
- }
- else {
- STK(arg3) = STK(arg2);
+ { Raise_IdxError(key); SQ_THROW();}
}
+
+ STK(arg3) = type(o) == OT_CLASS?STK(0):o;
TARGET = temp_reg;
+ }
continue;
case _OP_GETK:
- if (!Get(STK(arg2), (*ci->_literals)[arg1], temp_reg, false,true)) { Raise_IdxError((*ci->_literals)[arg1]); SQ_THROW();}
+ if (!Get(STK(arg2), ci->_literals[arg1], temp_reg, false,true)) { Raise_IdxError(ci->_literals[arg1]); SQ_THROW();}
TARGET = temp_reg;
continue;
case _OP_MOVE: TARGET = STK(arg1); continue;
case _OP_NEWSLOT:
- _GUARD(NewSlot(STK(arg1), STK(arg2), STK(arg3)));
+ _GUARD(NewSlot(STK(arg1), STK(arg2), STK(arg3),false));
if(arg0 != arg3) TARGET = STK(arg3);
continue;
case _OP_DELETE: _GUARD(DeleteSlot(STK(arg1), STK(arg2), TARGET)); continue;
case _OP_ARITH: _GUARD(ARITH_OP( arg3 , temp_reg, STK(arg2), STK(arg1))); TARGET = temp_reg; continue;
case _OP_BITW: _GUARD(BW_OP( arg3,TARGET,STK(arg2),STK(arg1))); continue;
case _OP_RETURN:
- if(type((ci)->_generator) == OT_GENERATOR) {
- _generator((ci)->_generator)->Kill();
+ if(ci->_generator) {
+ ci->_generator->Kill();
}
if(Return(arg0, arg1, temp_reg)){
assert(traps==0);
return true;
}
continue;
- case _OP_LOADNULLS:{ for(unsigned int n=0;n<arg1;n++) STK(arg0+n) = _null_; }continue;
+ case _OP_LOADNULLS:{ for(SQInt32 n=0; n < arg1; n++) STK(arg0+n) = _null_; }continue;
case _OP_LOADROOTTABLE: TARGET = _roottable; continue;
case _OP_LOADBOOL: TARGET = arg1?_true_:_false_; continue;
case _OP_DMOVE: STK(arg0) = STK(arg1); STK(arg2) = STK(arg3); continue;
case _OP_NEWTABLE: TARGET = SQTable::Create(_ss(this), arg1); continue;
case _OP_NEWARRAY: TARGET = SQArray::Create(_ss(this), 0); _array(TARGET)->Reserve(arg1); continue;
case _OP_APPENDARRAY: _array(STK(arg0))->Append(COND_LITERAL); continue;
- case _OP_GETPARENT:
- switch(type(STK(arg1))) {
- case OT_TABLE:
- TARGET = _table(STK(arg1))->_delegate?SQObjectPtr(_table(STK(arg1))->_delegate):_null_;
- continue;
- case OT_CLASS: TARGET = _class(STK(arg1))->_base?_class(STK(arg1))->_base:_null_;
- continue;
- }
- Raise_Error(_SC("the %s type doesn't have a parent slot"), GetTypeName(STK(arg1)));
- SQ_THROW();
- continue;
- case _OP_COMPARITH: _GUARD(DerefInc(arg3, TARGET, STK((((unsigned int)arg1&0xFFFF0000)>>16)), STK(arg2), STK(arg1&0x0000FFFF), false)); continue;
+ case _OP_GETPARENT: _GUARD(GETPARENT_OP(STK(arg1),TARGET)); continue;
+ case _OP_COMPARITH: _GUARD(DerefInc(arg3, TARGET, STK((((SQUnsignedInteger)arg1&0xFFFF0000)>>16)), STK(arg2), STK(arg1&0x0000FFFF), false)); continue;
case _OP_COMPARITHL: _GUARD(LOCAL_INC(arg3, TARGET, STK(arg1), STK(arg2))); continue;
case _OP_INC: {SQObjectPtr o(sarg3); _GUARD(DerefInc('+',TARGET, STK(arg1), STK(arg2), o, false));} continue;
case _OP_INCL: {SQObjectPtr o(sarg3); _GUARD(LOCAL_INC('+',TARGET, STK(arg1), o));} continue;
case _OP_NOT: TARGET = (IsFalse(STK(arg1))?_true_:_false_); continue;
case _OP_BWNOT:
if(type(STK(arg1)) == OT_INTEGER) {
- TARGET = SQInteger(~_integer(STK(arg1)));
+ SQInteger t = _integer(STK(arg1));
+ TARGET = SQInteger(~t);
continue;
}
Raise_Error(_SC("attempt to perform a bitwise op on a %s"), GetTypeName(STK(arg1)));
continue;
}
case _OP_YIELD:{
- if(type(ci->_generator) == OT_GENERATOR) {
+ if(ci->_generator) {
if(sarg1 != MAX_FUNC_STACKSIZE) temp_reg = STK(arg1);
- _GUARD(_generator(ci->_generator)->Yield(this));
+ _GUARD(ci->_generator->Yield(this));
traps -= ci->_etraps;
if(sarg1 != MAX_FUNC_STACKSIZE) STK(arg1) = temp_reg;
}
else { Raise_Error(_SC("trying to yield a '%s',only genenerator can be yielded"), GetTypeName(ci->_generator)); SQ_THROW();}
if(Return(arg0, arg1, temp_reg)){
- assert(traps==0);
+ assert(traps == 0);
outres = temp_reg;
return true;
}
_GUARD(_generator(STK(arg1))->Resume(this, arg0));
traps += ci->_etraps;
continue;
- case _OP_FOREACH:{ bool finished;
- _GUARD(FOREACH_OP(STK(arg0),STK(arg2),STK(arg2+1),STK(arg2+2),arg2,finished));
- if(finished) ci->_ip += sarg1; }
+ case _OP_FOREACH:{ int tojump;
+ _GUARD(FOREACH_OP(STK(arg0),STK(arg2),STK(arg2+1),STK(arg2+2),arg2,sarg1,tojump));
+ ci->_ip += tojump; }
+ continue;
+ case _OP_POSTFOREACH:
+ assert(type(STK(arg0)) == OT_GENERATOR);
+ if(_generator(STK(arg0))->_state == SQGenerator::eDead)
+ ci->_ip += (sarg1 - 1);
continue;
case _OP_DELEGATE: _GUARD(DELEGATE_OP(TARGET,STK(arg1),STK(arg2))); continue;
case _OP_CLONE:
{ Raise_Error(_SC("cloning a %s"), GetTypeName(STK(arg1))); SQ_THROW();}
continue;
case _OP_TYPEOF: TypeOf(STK(arg1), TARGET); continue;
- case _OP_PUSHTRAP:
- _etraps.push_back(SQExceptionTrap(_top,_stackbase, &ci->_iv->_vals[(ci->_ip-ci->_iv->_vals)+arg1], arg0)); traps++;
+ case _OP_PUSHTRAP:{
+ SQInstruction *_iv = _funcproto(_closure(ci->_closure)->_function)->_instructions;
+ _etraps.push_back(SQExceptionTrap(_top,_stackbase, &_iv[(ci->_ip-_iv)+arg1], arg0)); traps++;
ci->_etraps++;
+ }
continue;
- case _OP_POPTRAP:{
- for(int i=0; i<arg0; i++) {
+ case _OP_POPTRAP: {
+ for(SQInteger i = 0; i < arg0; i++) {
_etraps.pop_back(); traps--;
ci->_etraps--;
- }}
+ }
+ }
continue;
case _OP_THROW: Raise_Error(TARGET); SQ_THROW(); continue;
case _OP_CLASS: _GUARD(CLASS_OP(TARGET,arg1,arg2)); continue;
case _OP_NEWSLOTA:
- _GUARD(NewSlot(STK(arg1), STK(arg2), STK(arg3)));
- _class(STK(arg1))->SetAttributes(STK(arg2),STK(arg2-1));
- if(arg0 != arg3) TARGET = STK(arg3);
+ bool bstatic = (arg0&NEW_SLOT_STATIC_FLAG)?true:false;
+ if(type(STK(arg1)) == OT_CLASS) {
+ if(type(_class(STK(arg1))->_metamethods[MT_NEWMEMBER]) != OT_NULL ) {
+ Push(STK(arg1)); Push(STK(arg2)); Push(STK(arg3));
+ Push((arg0&NEW_SLOT_ATTRIBUTES_FLAG) ? STK(arg2-1) : _null_);
+ int nparams = 4;
+ if(Call(_class(STK(arg1))->_metamethods[MT_NEWMEMBER], nparams, _top - nparams, temp_reg,SQFalse)) {
+ Pop(nparams);
+ continue;
+ }
+ }
+ }
+ _GUARD(NewSlot(STK(arg1), STK(arg2), STK(arg3),bstatic));
+ if((arg0&NEW_SLOT_ATTRIBUTES_FLAG)) {
+ _class(STK(arg1))->SetAttributes(STK(arg2),STK(arg2-1));
+ }
continue;
}
{
SQObjectPtr currerror = _lasterror;
// dumpstack(_stackbase);
- int n = 0;
- int last_top = _top;
+ SQInteger n = 0;
+ SQInteger last_top = _top;
if(ci) {
+ if(_ss(this)->_notifyallexceptions) CallErrorHandler(currerror);
+
if(traps) {
do {
if(ci->_etraps > 0) {
ci->_ip = et._ip;
_top = et._stacksize;
_stackbase = et._stackbase;
- _stack[_stackbase+et._extarget] = currerror;
+ _stack._vals[_stackbase+et._extarget] = currerror;
_etraps.pop_back(); traps--; ci->_etraps--;
- while(last_top >= _top) _stack[last_top--].Null();
+ while(last_top >= _top) _stack._vals[last_top--].Null();
goto exception_restore;
}
//if is a native closure
if(type(ci->_closure) != OT_CLOSURE && n)
break;
- if(type(ci->_generator) == OT_GENERATOR) _generator(ci->_generator)->Kill();
+ if(ci->_generator) ci->_generator->Kill();
PopVarArgs(ci->_vargs);
POP_CALLINFO(this);
n++;
- }while(_callsstack.size());
+ } while(_callsstacksize);
+ }
+ else {
+ //call the hook
+ if(raiseerror && !_ss(this)->_notifyallexceptions)
+ CallErrorHandler(currerror);
}
- //call the hook
- CallErrorHandler(currerror);
//remove call stack until a C function is found or the cstack is empty
- if(ci) do{
+ if(ci) do {
SQBool exitafterthisone = ci->_root;
- if(type(ci->_generator) == OT_GENERATOR) _generator(ci->_generator)->Kill();
+ if(ci->_generator) ci->_generator->Kill();
_stackbase -= ci->_prevstkbase;
_top = _stackbase + ci->_prevtop;
PopVarArgs(ci->_vargs);
POP_CALLINFO(this);
if( (ci && type(ci->_closure) != OT_CLOSURE) || exitafterthisone) break;
- }while(_callsstack.size());
+ } while(_callsstacksize);
- while(last_top >= _top) _stack[last_top--].Null();
+ while(last_top >= _top) _stack._vals[last_top--].Null();
}
_lasterror = currerror;
return false;
assert(0);
}
-bool SQVM::CreateClassInstance(SQClass *theclass, int nargs, int stackbase, SQObjectPtr &retval)
+bool SQVM::CreateClassInstance(SQClass *theclass, SQObjectPtr &inst, SQObjectPtr &constructor)
{
- SQObjectPtr constr;
- SQObjectPtr inst = theclass->CreateInstance();
- _stack[stackbase] = inst;
- if(theclass->Get(_ss(this)->_constructoridx,constr)) {
- if(!Call(constr,nargs,stackbase,constr))
- return false;
+ inst = theclass->CreateInstance();
+ if(!theclass->Get(_ss(this)->_constructoridx,constructor)) {
+ //if(!Call(constr,nargs,stackbase,constr,false))
+ // return false;
+ constructor = _null_;
}
- retval = inst;
return true;
}
if(type(_errorhandler) != OT_NULL) {
SQObjectPtr out;
Push(_roottable); Push(error);
- Call(_errorhandler, 2, _top-2, out);
+ Call(_errorhandler, 2, _top-2, out,SQFalse);
Pop(2);
}
}
-void SQVM::CallDebugHook(int type,int forcedline)
+void SQVM::CallDebugHook(SQInteger type,SQInteger forcedline)
{
SQObjectPtr temp_reg;
- int nparams=5;
+ SQInteger nparams=5;
SQFunctionProto *func=_funcproto(_closure(ci->_closure)->_function);
Push(_roottable); Push(type); Push(func->_sourcename); Push(forcedline?forcedline:func->GetLine(ci->_ip)); Push(func->_name);
- Call(_debughook,nparams,_top-nparams,temp_reg);
+ Call(_debughook,nparams,_top-nparams,temp_reg,SQFalse);
Pop(nparams);
}
-bool SQVM::CallNative(SQNativeClosure *nclosure,int nargs,int stackbase,bool tailcall,SQObjectPtr &retval,bool &suspend)
+bool SQVM::CallNative(SQNativeClosure *nclosure,SQInteger nargs,SQInteger stackbase,SQObjectPtr &retval,bool &suspend)
{
if (_nnativecalls + 1 > MAX_NATIVE_CALLS) { Raise_Error(_SC("Native stack overflow")); return false; }
- int nparamscheck = nclosure->_nparamscheck;
+ SQInteger nparamscheck = nclosure->_nparamscheck;
if(((nparamscheck > 0) && (nparamscheck != nargs))
|| ((nparamscheck < 0) && (nargs < (-nparamscheck)))) {
Raise_Error(_SC("wrong number of parameters"));
return false;
}
- int tcs;
- if(tcs = nclosure->_typecheck.size()) {
- for(int i = 0; i < nargs && i < tcs; i++)
- if((nclosure->_typecheck[i] != -1) && !(type(_stack[stackbase+i]) & nclosure->_typecheck[i])) {
- Raise_ParamTypeError(i,nclosure->_typecheck[i],type(_stack[stackbase+i]));
+ SQInteger tcs;
+ if((tcs = nclosure->_typecheck.size())) {
+ for(SQInteger i = 0; i < nargs && i < tcs; i++)
+ if((nclosure->_typecheck._vals[i] != -1) && !(type(_stack._vals[stackbase+i]) & nclosure->_typecheck[i])) {
+ Raise_ParamTypeError(i,nclosure->_typecheck._vals[i],type(_stack._vals[stackbase+i]));
return false;
}
}
_nnativecalls++;
- if ((_top + MIN_STACK_OVERHEAD) > (int)_stack.size()) {
+ if ((_top + MIN_STACK_OVERHEAD) > (SQInteger)_stack.size()) {
_stack.resize(_stack.size() + (MIN_STACK_OVERHEAD<<1));
}
- int oldtop = _top;
- int oldstackbase = _stackbase;
+ SQInteger oldtop = _top;
+ SQInteger oldstackbase = _stackbase;
_top = stackbase + nargs;
- PUSH_CALLINFO(this, CallInfo());
- ci->_etraps = 0;
- ci->_closure._unVal.pNativeClosure = nclosure;
- ci->_closure._type = OT_NATIVECLOSURE;
- ci->_prevstkbase = stackbase - _stackbase;
- ci->_ncalls = 1;
+ CallInfo lci;
+ lci._closure = nclosure;
+ lci._generator = NULL;
+ lci._etraps = 0;
+ lci._prevstkbase = (SQInt32) (stackbase - _stackbase);
+ lci._ncalls = 1;
+ lci._prevtop = (SQInt32) (oldtop - oldstackbase);
+ PUSH_CALLINFO(this, lci);
_stackbase = stackbase;
//push free variables
- int outers = nclosure->_outervalues.size();
- for (int i = 0; i < outers; i++) {
+ SQInteger outers = nclosure->_outervalues.size();
+ for (SQInteger i = 0; i < outers; i++) {
Push(nclosure->_outervalues[i]);
}
- ci->_prevtop = (oldtop - oldstackbase);
- int ret = (nclosure->_function)(this);
+
+ if(type(nclosure->_env) == OT_WEAKREF) {
+ _stack[stackbase] = _weakref(nclosure->_env)->_obj;
+ }
+
+
+ SQInteger ret = (nclosure->_function)(this);
_nnativecalls--;
suspend = false;
if( ret == SQ_SUSPEND_FLAG) suspend = true;
return false;
}
- if (ret != 0){ retval = TOP(); }
+ if (ret != 0){ retval = TOP(); TOP().Null(); }
else { retval = _null_; }
_stackbase = oldstackbase;
_top = oldtop;
case OT_INSTANCE:
if(_instance(self)->Get(key,dest)) return true;
break;
+ default:break; //shut up compiler
}
if(FallBackGet(self,key,dest,raw)) return true;
case OT_STRING:
if(sq_isnumeric(key)){
SQInteger n=tointeger(key);
- if(abs(n)<_string(self)->_len){
+ if(abs((int)n)<_string(self)->_len){
if(n<0)n=_string(self)->_len-n;
dest=SQInteger(_stringval(self)[n]);
return true;
case OT_THREAD:
if(raw)return false;
return _thread_ddel->Get(key,dest);
+ case OT_WEAKREF:
+ if(raw)return false;
+ return _weakref_ddel->Get(key,dest);
default:return false;
}
return false;
bool SQVM::Clone(const SQObjectPtr &self,SQObjectPtr &target)
{
SQObjectPtr temp_reg;
+ SQObjectPtr newobj;
switch(type(self)){
case OT_TABLE:
- target = _table(self)->Clone();
+ newobj = _table(self)->Clone();
goto cloned_mt;
case OT_INSTANCE:
- target = _instance(self)->Clone(_ss(this));
+ newobj = _instance(self)->Clone(_ss(this));
cloned_mt:
- if(_delegable(target)->_delegate){
- Push(target);
+ if(_delegable(newobj)->_delegate){
+ Push(newobj);
Push(self);
- CallMetaMethod(_delegable(target),MT_CLONED,2,temp_reg);
+ CallMetaMethod(_delegable(newobj),MT_CLONED,2,temp_reg);
}
+ target = newobj;
return true;
case OT_ARRAY:
- target=_array(self)->Clone();
+ target = _array(self)->Clone();
return true;
default: return false;
}
}
-bool SQVM::NewSlot(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val)
+bool SQVM::NewSlot(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val,bool bstatic)
{
if(type(key) == OT_NULL) { Raise_Error(_SC("null cannot be used as index")); return false; }
switch(type(self)) {
if(rawcall) _table(self)->NewSlot(key,val); //cannot fail
break;}
+ case OT_INSTANCE: {
+ SQObjectPtr res;
+ Push(self);Push(key);Push(val);
+ if(!CallMetaMethod(_instance(self),MT_NEWSLOT,3,res)) {
+ Raise_Error(_SC("class instances do not support the new slot operator"));
+ return false;
+ }
+ break;}
case OT_CLASS:
- if(!_class(self)->NewSlot(key,val)) {
+ if(!_class(self)->NewSlot(_ss(this),key,val,bstatic)) {
if(_class(self)->_locked) {
Raise_Error(_SC("trying to modify a class that has already been instantiated"));
return false;
return true;
}
-bool SQVM::Call(SQObjectPtr &closure,int nparams,int stackbase,SQObjectPtr &outres)
+bool SQVM::Call(SQObjectPtr &closure,SQInteger nparams,SQInteger stackbase,SQObjectPtr &outres,SQBool raiseerror)
{
#ifdef _DEBUG
-int prevstackbase = _stackbase;
+SQInteger prevstackbase = _stackbase;
#endif
switch(type(closure)) {
case OT_CLOSURE:
- return Execute(closure, _top - nparams, nparams, stackbase,outres);
+ return Execute(closure, _top - nparams, nparams, stackbase,outres,raiseerror);
break;
case OT_NATIVECLOSURE:{
bool suspend;
- return CallNative(_nativeclosure(closure), nparams, stackbase, false, outres,suspend);
+ return CallNative(_nativeclosure(closure), nparams, stackbase, outres,suspend);
}
break;
- case OT_CLASS:
- return CreateClassInstance(_class(closure),nparams,stackbase,outres);
+ case OT_CLASS: {
+ SQObjectPtr constr;
+ SQObjectPtr temp;
+ CreateClassInstance(_class(closure),outres,constr);
+ if(type(constr) != OT_NULL) {
+ _stack[stackbase] = outres;
+ return Call(constr,nparams,stackbase,temp,raiseerror);
+ }
+ return true;
+ }
break;
default:
return false;
return true;
}
-bool SQVM::CallMetaMethod(SQDelegable *del,SQMetaMethod mm,int nparams,SQObjectPtr &outres)
+bool SQVM::CallMetaMethod(SQDelegable *del,SQMetaMethod mm,SQInteger nparams,SQObjectPtr &outres)
{
SQObjectPtr closure;
- if(del->GetMetaMethod(mm, closure)) {
- if(Call(closure, nparams, _top - nparams, outres)) {
+ if(del->GetMetaMethod(this, mm, closure)) {
+ if(Call(closure, nparams, _top - nparams, outres, SQFalse)) {
Pop(nparams);
return true;
}
return false;
}
-void SQVM::Remove(int n) {
+void SQVM::Remove(SQInteger n) {
n = (n >= 0)?n + _stackbase - 1:_top + n;
- for(int i = n; i < _top; i++){
+ for(SQInteger i = n; i < _top; i++){
_stack[i] = _stack[i+1];
}
_stack[_top] = _null_;
_top--;
}
+void SQVM::Pop() {
+ _stack[--_top] = _null_;
+}
+
+void SQVM::Pop(SQInteger n) {
+ for(SQInteger i = 0; i < n; i++){
+ _stack[--_top] = _null_;
+ }
+}
+
+void SQVM::Push(const SQObjectPtr &o) { _stack[_top++] = o; }
+SQObjectPtr &SQVM::Top() { return _stack[_top-1]; }
+SQObjectPtr &SQVM::PopGet() { return _stack[--_top]; }
+SQObjectPtr &SQVM::GetUp(SQInteger n) { return _stack[_top+n]; }
+SQObjectPtr &SQVM::GetAt(SQInteger n) { return _stack[n]; }
#ifdef _DEBUG_DUMP
-void SQVM::dumpstack(int stackbase,bool dumpall)
+void SQVM::dumpstack(SQInteger stackbase,bool dumpall)
{
- int size=dumpall?_stack.size():_top;
- int n=0;
+ SQInteger size=dumpall?_stack.size():_top;
+ SQInteger n=0;
scprintf(_SC("\n>>>>stack dump<<<<\n"));
- CallInfo &ci=_callsstack.back();
- scprintf(_SC("IP: %d\n"),ci._ip);
+ CallInfo &ci=_callsstack[_callsstacksize-1];
+ scprintf(_SC("IP: %p\n"),ci._ip);
scprintf(_SC("prev stack base: %d\n"),ci._prevstkbase);
scprintf(_SC("prev top: %d\n"),ci._prevtop);
- for(int i=0;i<size;i++){
+ for(SQInteger i=0;i<size;i++){
SQObjectPtr &obj=_stack[i];
if(stackbase==i)scprintf(_SC(">"));else scprintf(_SC(" "));
scprintf(_SC("[%d]:"),n);
case OT_CLOSURE: scprintf(_SC("CLOSURE [%p]"),_closure(obj));break;
case OT_NATIVECLOSURE: scprintf(_SC("NATIVECLOSURE"));break;
case OT_USERDATA: scprintf(_SC("USERDATA %p[%p]"),_userdataval(obj),_userdata(obj)->_delegate);break;
- case OT_GENERATOR: scprintf(_SC("GENERATOR"));break;
+ case OT_GENERATOR: scprintf(_SC("GENERATOR %p"),_generator(obj));break;
case OT_THREAD: scprintf(_SC("THREAD [%p]"),_thread(obj));break;
case OT_USERPOINTER: scprintf(_SC("USERPOINTER %p"),_userpointer(obj));break;
case OT_CLASS: scprintf(_SC("CLASS %p"),_class(obj));break;
case OT_INSTANCE: scprintf(_SC("INSTANCE %p"),_instance(obj));break;
+ case OT_WEAKREF: scprintf(_SC("WEAKERF %p"),_weakref(obj));break;
default:
assert(0);
break;
}
}
+
+
#endif
projects / supertux.git / blobdiff