X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibspiderscript.so_src%2Fexec_bytecode.c;h=4673bd286759a989061c401a7bff103e79b27143;hb=c43c05ef3234d6118ce601d299df60383d54ac7b;hp=9dabeff6d61059bdb464ac257b652591b783bd7d;hpb=a18890d3ecb360989383d727017a21c103fee865;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libspiderscript.so_src/exec_bytecode.c b/Usermode/Libraries/libspiderscript.so_src/exec_bytecode.c
index 9dabeff6..4673bd28 100644
--- a/Usermode/Libraries/libspiderscript.so_src/exec_bytecode.c
+++ b/Usermode/Libraries/libspiderscript.so_src/exec_bytecode.c
@@ -41,8 +41,8 @@ struct sBC_StackEnt
 {
 	uint8_t	Type;
 	union {
-		uint64_t	Integer;
-		double  	Real;
+		int64_t	Integer;
+		double 	Real;
 		tSpiderValue	*Reference;	// Used for everything else
 		tSpiderObject	*Object;
 		tSpiderNamespace	*Namespace;
@@ -412,30 +412,32 @@ int Bytecode_int_ExecuteFunction(tSpiderScript *Script, tScript_Function *Fcn, t
 			break;
 
 		// Variables
-		case BC_OP_LOADVAR:
+		case BC_OP_LOADVAR: {
+			 int	slot = OP_INDX(op);
 			STATE_HDR();
-			DEBUG_F("LOADVAR %i ", OP_INDX(op));
-			if( OP_INDX(op) < 0 || OP_INDX(op) >= local_var_count ) {
-				AST_RuntimeError(NULL, "Loading from invalid slot %i", OP_INDX(op));
+			DEBUG_F("LOADVAR %i ", slot);
+			if( slot < 0 || slot >= local_var_count ) {
+				AST_RuntimeError(NULL, "Loading from invalid slot %i", slot);
 				return -1;
 			}
-			DEBUG_F("("); PRINT_STACKVAL(local_vars[OP_INDX(op)]); DEBUG_F(")\n");
-			PUT_STACKVAL(local_vars[OP_INDX(op)]);
-			Bytecode_int_RefStackValue( &local_vars[OP_INDX(op)] );
-			break;
-		case BC_OP_SAVEVAR:
+			DEBUG_F("("); PRINT_STACKVAL(local_vars[slot]); DEBUG_F(")\n");
+			PUT_STACKVAL(local_vars[slot]);
+			Bytecode_int_RefStackValue( &local_vars[slot] );
+			} break;
+		case BC_OP_SAVEVAR: {
+			 int	slot = OP_INDX(op);
 			STATE_HDR();
-			DEBUG_F("SAVEVAR %i = ", OP_INDX(op));
-			if( OP_INDX(op) < 0 || OP_INDX(op) >= local_var_count ) {
-				AST_RuntimeError(NULL, "Loading from invalid slot %i", OP_INDX(op));
+			DEBUG_F("SAVEVAR %i = ", slot);
+			if( slot < 0 || slot >= local_var_count ) {
+				AST_RuntimeError(NULL, "Loading from invalid slot %i", slot);
 				return -1;
 			}
-			DEBUG_F("[Deref "); PRINT_STACKVAL(local_vars[OP_INDX(op)]); DEBUG_F("] ");
-			Bytecode_int_DerefStackValue( &local_vars[OP_INDX(op)] );
-			GET_STACKVAL(local_vars[OP_INDX(op)]);
-			PRINT_STACKVAL(local_vars[OP_INDX(op)]);
+			DEBUG_F("[Deref "); PRINT_STACKVAL(local_vars[slot]); DEBUG_F("] ");
+			Bytecode_int_DerefStackValue( &local_vars[slot] );
+			GET_STACKVAL(local_vars[slot]);
+			PRINT_STACKVAL(local_vars[slot]);
 			DEBUG_F("\n");
-			break;
+			} break;
 
 		// Constants:
 		case BC_OP_LOADINT:
@@ -612,6 +614,32 @@ int Bytecode_int_ExecuteFunction(tSpiderScript *Script, tScript_Function *Fcn, t
 
 			GET_STACKVAL(val2);	// Right
 			GET_STACKVAL(val1);	// Left
+
+			#define PERFORM_NUM_OP(_type, _field) if(val1.Type == _type && val1.Type == val2.Type) { \
+				switch(op->Operation) { \
+				case BC_OP_ADD:	val1._field = val1._field + val2._field;	break; \
+				case BC_OP_SUBTRACT:	val1._field = val1._field - val2._field;	break; \
+				case BC_OP_MULTIPLY:	val1._field = val1._field * val2._field;	break; \
+				case BC_OP_DIVIDE:	val1._field = val1._field / val2._field;	break; \
+				case BC_OP_EQUALS:	val1._field = val1._field == val2._field;	break; \
+				case BC_OP_LESSTHAN:	val1._field = val1._field < val2._field;	break; \
+				case BC_OP_LESSTHANOREQUAL:	val1._field = val1._field <= val2._field;	break; \
+				case BC_OP_GREATERTHAN:	val1._field = val1._field > val2._field;	break; \
+				case BC_OP_GREATERTHANOREQUAL:	val1._field = val1._field >= val2._field;	break; \
+				\
+				case BC_OP_BITAND:	val1._field = (int64_t)val1._field & (int64_t)val2._field;	break; \
+				case BC_OP_BITOR:	val1._field = (int64_t)val1._field | (int64_t)val2._field;	break; \
+				case BC_OP_BITXOR:	val1._field = (int64_t)val1._field ^ (int64_t)val2._field;	break; \
+				case BC_OP_MODULO:	val1._field = (int64_t)val1._field % (int64_t)val2._field;	break; \
+				default:	AST_RuntimeError(NULL, "Invalid operation on datatype %i", _type); nextop = NULL; break;\
+				}\
+				PUT_STACKVAL(val1);\
+				break;\
+			}
+
+			PERFORM_NUM_OP(SS_DATATYPE_INTEGER, Integer);
+			PERFORM_NUM_OP(SS_DATATYPE_REAL, Real);
+		
 			pval1 = Bytecode_int_GetSpiderValue(&val1, &tmpVal1);
 			pval2 = Bytecode_int_GetSpiderValue(&val2, &tmpVal2);
 			Bytecode_int_DerefStackValue(&val1);