From 75944e3e755053bc2ebe9a2a8c55575941f79a56 Mon Sep 17 00:00:00 2001
From: Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
Date: Mon, 12 Jan 2015 21:54:59 +0100
Subject: Added missing executestate.h file (forgot that in previous commit),
 and solved issue #158, the Php::Object constructor for multiple parameters
 accidentally matched the call to Php::Object(name, implementation)

---
 zend/executestate.h | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 zend/executestate.h

(limited to 'zend/executestate.h')

diff --git a/zend/executestate.h b/zend/executestate.h
new file mode 100644
index 0000000..8e33b16
--- /dev/null
+++ b/zend/executestate.h
@@ -0,0 +1,79 @@
+/**
+ *  ExecuteState.h
+ *
+ *  Class that keeps the current execution state (this is used when a different
+ *  script or file is eval'ed to store the execution state so that we can switch
+ *  back to the original state.
+ *
+ *  @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
+ *  @copyright 2014 Copernica BV
+ */
+
+/**
+ *  Set up namespace
+ */
+namespace Php {
+
+/**
+ *  Helper class to store and restore the current opcode state
+ * 
+ *  When we're going to execute a set of instructions, we need to store the
+ *  current state of the Zend engine. After the instructions have been processed,
+ *  we can switch back to the original instructions
+ */
+class ExecuteState
+{
+private:
+    /**
+     *  All the original settings
+     */
+    zend_op_array *_active_op_array;
+    zval **_return_value_ptr_ptr;
+    zend_op **_opline_ptr;
+    int _interactive;
+
+#ifdef ZTS
+    /**
+     *  When in thread safety mode, we also keep track of the TSRM_LS var
+     *  @var void***
+     */
+    void ***tsrm_ls;
+#endif
+    
+public:
+    /**
+     *  Constructor
+     */
+    ExecuteState(TSRMLS_D)
+    {
+        // store all the original stuff
+        _active_op_array = EG(active_op_array);
+        _return_value_ptr_ptr = EG(return_value_ptr_ptr);
+        _opline_ptr = EG(opline_ptr);
+        _interactive = CG(interactive);
+
+#ifdef ZTS
+        // copy tsrm_ls param
+        this->tsrm_ls = tsrm_ls;
+#endif
+    }
+
+    /**
+     *  Destructor
+     */
+    virtual ~ExecuteState()
+    {
+        // restore all settings
+        CG(interactive) = _interactive;
+        EG(no_extensions) = 0;
+        EG(opline_ptr) = _opline_ptr;
+        EG(active_op_array) = _active_op_array;
+        EG(return_value_ptr_ptr) = _return_value_ptr_ptr;
+    }
+};
+
+/**
+ *  End of namespace
+ */
+}
+
-- 
cgit v1.2.3