Added __bitwiseNot handler

Author: jbtronics

Zend/zend.h

@@ -154,6 +154,7 @@ struct _zend_class_entry {
 	zend_function *__bitwiseOr;
 	zend_function *__bitwiseAnd;
 	zend_function *__bitwiseXor;
+	zend_function *__bitwiseNot;
 
 	zend_function *serialize_func;
 	zend_function *unserialize_func;

Zend/zend_API.c

@@ -2015,6 +2015,10 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce,
 		if (fptr->common.num_args != 2) {
 			zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ZSTR_VAL(ce->name), "__bitwiseXor");
 		}
+	} else if (name_len == sizeof(ZEND_NOT_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_NOT_FUNC_NAME, sizeof(ZEND_NOT_FUNC_NAME) - 1)) {
+		if (fptr->common.num_args != 1) {
+			zend_error(error_type, "Method %s::%s() must take exactly 1 arguments", ZSTR_VAL(ce->name), "__bitwiseNot");
+		}
 	}
 }
 /* }}} */

Zend/zend_compile.c

@@ -6128,6 +6128,9 @@ void zend_begin_method_decl(zend_op_array *op_array, zend_string *name, zend_boo
 	} else if (zend_string_equals_literal(lcname, ZEND_XOR_FUNC_NAME)) {
 		zend_check_magic_method_attr(fn_flags, "__bitwiseXor", 1);
 		ce->__bitwiseXor = (zend_function *) op_array;
+	} else if (zend_string_equals_literal(lcname, ZEND_NOT_FUNC_NAME)) {
+		zend_check_magic_method_attr(fn_flags, "__bitwiseNot", 1);
+		ce->__bitwiseNot = (zend_function *) op_array;
 	}
 
 	zend_string_release_ex(lcname, 0);

Zend/zend_compile.h

@@ -1054,6 +1054,7 @@ END_EXTERN_C()
 #define ZEND_OR_FUNC_NAME			"__bitwiseor"
 #define ZEND_AND_FUNC_NAME			"__bitwiseand"
 #define ZEND_XOR_FUNC_NAME			"__bitwisexor"
+#define ZEND_NOT_FUNC_NAME			"__bitwisenot"
 
 
 /* The following constants may be combined in CG(compiler_options)

Zend/zend_object_handlers.c

@@ -194,15 +194,22 @@ static int zend_std_call_op_handler(zend_uchar opcode, zval *result, zval *op1,
 	zend_class_entry *orig_fake_scope = EG(fake_scope);
 	zend_fcall_info fci;
 	zend_fcall_info_cache fcic;
-	zval params[2] = {*op1, *op2};
 
 	EG(fake_scope) = NULL;
 
-	/* op handlers like __add are called with two operands op1, op2 */
+	/* __bitwiseNot is a unary operator and only have one argument */
+	if (opcode == ZEND_BW_NOT) {
+		fci.param_count = 1;
+		zval params[1] = {*op1};
+		fci.params = params;
+	} else { /* op handlers like __add are called with two operands op1, op2 */
+		fci.param_count = 2;
+		zval params[2] = {*op1, *op2};
+		fci.params = params;
+	}
+
 	fci.size = sizeof(fci);
 	fci.retval = result;
-	fci.param_count = 2;
-	fci.params = params;
 	fci.no_separation = 1;
 	//ZVAL_UNDEF(&fci.function_name); /* Unused */
 
@@ -261,6 +268,10 @@ static int zend_std_call_op_handler(zend_uchar opcode, zval *result, zval *op1,
 			fcic.function_handler = ce->__bitwiseXor;
 			ZVAL_STRING(&fci.function_name, "__bitwiseXor");
 			break;
+		case ZEND_BW_NOT:
+			fcic.function_handler = ce->__bitwiseNot;
+			ZVAL_STRING(&fci.function_name, "__bitwiseNot");
+			break;
 		default:
 			return FAILURE;
 			break;
@@ -286,17 +297,25 @@ static int zend_std_call_op_handler(zend_uchar opcode, zval *result, zval *op1,
 
 
 		/* Check if the given types are supported by the given handler signature */
-
-		zval* arr[2] = {op1, op2};
-		if (!zend_check_arg_types(fcic.function_handler, 2, arr))
-		{
-			if (zobj == Z_OBJ_P(op1) && Z_TYPE_P(op2) == IS_OBJECT) {
-				goto retry;
-			} else {
-				zend_type_error("The operand handlers do not support the given operand types!");
+		if(opcode != ZEND_BW_NOT) {
+			zval* arr[2] = {op1, op2};
+			if (!zend_check_arg_types(fcic.function_handler, 2, arr))
+			{
+				if (zobj == Z_OBJ_P(op1) && Z_TYPE_P(op2) == IS_OBJECT) {
+					goto retry;
+				} else {
+					zend_type_error("The operand handlers do not support the given operand types!");
+				}
+			}
+		} else {
+			zval* arr[1] = {op1};
+			if (!zend_check_arg_types(fcic.function_handler, 1, arr))
+			{
+					zend_type_error("The operand handlers do not support the given operand types!");
 			}
 		}
 
+
 		fcic.called_scope = ce;
 		fcic.object = zobj;
 		fcic.function_handler->type = ZEND_USER_FUNCTION;
@@ -305,7 +324,7 @@ static int zend_std_call_op_handler(zend_uchar opcode, zval *result, zval *op1,
 
 		/** The operand handler can either return PHP_OPERAND_NOT_SUPPORTED */
 		if (Z_TYPE_P(result) == IS_NULL) {
-			if(zobj == Z_OBJ_P(op1) && Z_TYPE_P(op2) == IS_OBJECT) {
+			if(zobj == Z_OBJ_P(op1) && op2 != NULL && Z_TYPE_P(op2) == IS_OBJECT) {
 				goto retry;
 			} else {
 				zend_type_error("The operand handlers do not support the given operand types!");