Index: /trunk/processor/dispatch.m4
===================================================================
--- /trunk/processor/dispatch.m4	(revision 483)
+++ /trunk/processor/dispatch.m4	(revision 484)
@@ -2,4 +2,5 @@
 define(`DISPATCH', `
 	DBG(`$0($*)')
+	assert(sizeof($1) == sizeof(src->$2));
 	ifelse(
 		`$1', `zend_bool',        `PROC_INT(`$2', `u',  `$1')'
Index: /trunk/processor/processor.m4
===================================================================
--- /trunk/processor/processor.m4	(revision 483)
+++ /trunk/processor/processor.m4	(revision 484)
@@ -150,5 +150,9 @@
 		DISPATCH(zval_data_type, type)
 		DISPATCH(zend_uchar, is_ref)
+#ifdef ZEND_ENGINE_2
+		DISPATCH(zend_uint, refcount)
+#else
 		DISPATCH(zend_ushort, refcount)
+#endif
 #ifdef ZEND_ENGINE_2_3
 		DISPATCH(zend_uchar, idx_type)
