Skip to content

ensure that for float or mixed divisions no div0 exception occurs #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schoetbi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ensure that for float or mixed divisions no div0 exception occurs #309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions squirrel/sqvm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
#include "sqclosure.h"
#include "sqstring.h"
#include "sqtable.h"
#include "squserdata.h"
#include "sqarray.h"
#include "sqclass.h"


#define TOP() (_stack._vals[_top-1])
#define TARGET _stack._vals[_stackbase+arg0]
#define STK(a) _stack._vals[_stackbase+(a)]
Expand Down Expand Up @@ -50,15 +50,29 @@ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,con
} \
}

#define _ARITH_NOZERO(op,trg,o1,o2,err) \
{ \
SQInteger tmask = sq_type(o1)|sq_type(o2); \
switch(tmask) { \
case OT_INTEGER: { SQInteger i2 = _integer(o2); if(i2 == 0) { Raise_Error(err); SQ_THROW(); } trg = _integer(o1) op i2; } break;\
case (OT_FLOAT|OT_INTEGER): \
case (OT_FLOAT): trg = tofloat(o1) op tofloat(o2); break;\
default: _GUARD(ARITH_OP((#op)[0],trg,o1,o2)); break;\
} \
#define _ARITH_NOZERO(op,trg,o1,o2,err) \
{ \
SQInteger tmask = sq_type(o1)|sq_type(o2); \
switch(tmask) { \
case OT_INTEGER: { \
SQInteger i2 = _integer(o2); \
if (i2 == 0) { \
Raise_Error(err); \
SQ_THROW(); \
} \
(trg) = _integer(o1) op i2; \
} break; \
case (OT_FLOAT|OT_INTEGER): \
case (OT_FLOAT): { \
SQFloat f2 = tofloat(o2); \
if (f2 == static_cast<SQFloat>(0.0)) { \
Raise_Error(err); \
SQ_THROW(); \
} \
(trg) = tofloat(o1) op f2; \
} break; \
default: _GUARD(ARITH_OP((#op)[0],trg,o1,o2)); break; \
} \
}

bool SQVM::ARITH_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
Expand Down