Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

sapi/phpdbg/.gitignore

@@ -3,5 +3,3 @@ phpdbg
 *.lo
 *.o
 build
-phpdbg_parser.c
-phpdbg_parser.h

sapi/phpdbg/config.w32

@@ -1,7 +1,7 @@
 ARG_ENABLE('phpdbg', 'Build phpdbg', 'no');
 ARG_ENABLE('phpdbgs', 'Build phpdbg shared', 'no');
 
-PHPDBG_SOURCES='phpdbg.c phpdbg_prompt.c phpdbg_cmd.c phpdbg_info.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_win.c phpdbg_btree.c';
+PHPDBG_SOURCES='phpdbg.c phpdbg_prompt.c phpdbg_cmd.c phpdbg_info.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_win.c phpdbg_btree.c phpdbg_parser.c phpdbg_lexer.c';
 PHPDBG_DLL='php' + PHP_VERSION + 'phpdbg.dll';
 PHPDBG_EXE='phpdbg.exe';
 
@@ -9,10 +9,12 @@ if (PHP_PHPDBG == "yes") {
     SAPI('phpdbg', PHPDBG_SOURCES, PHPDBG_EXE);
     ADD_FLAG("LIBS_PHPDBG", "ws2_32.lib user32.lib");
 	DEFINE("CFLAGS", configure_subst.item("CFLAGS") + " /EHa");
+	ADD_FLAG("CFLAGS_PHPDBG", "/D YY_NO_UNISTD_H");
 }
 
 if (PHP_PHPDBGS == "yes") {
 	SAPI('phpdbgs', PHPDBG_SOURCES, PHPDBG_DLL, '/D PHP_PHPDBG_EXPORTS /I win32');
 	ADD_FLAG("LIBS_PHPDBGS", "ws2_32.lib user32.lib");
 	DEFINE("CFLAGS", configure_subst.item("CFLAGS") + " /EHa");
+	ADD_FLAG("CFLAGS_PHPDBG", "/D YY_NO_UNISTD_H");
 }

sapi/phpdbg/phpdbg_lexer.c

@@ -1026,7 +1026,7 @@ YY_RULE_SETUP
 #line 78 "/usr/src/php-src/sapi/phpdbg/phpdbg_lexer.l"
 {
 		phpdbg_init_param(yylval, STR_PARAM);
-		yylval->str = strndup(yytext, yyleng);
+		yylval->str = zend_strndup(yytext, yyleng);
 		yylval->len = yyleng;
 		return T_PROTO;
 	}
@@ -1087,7 +1087,7 @@ YY_RULE_SETUP
 #line 108 "/usr/src/php-src/sapi/phpdbg/phpdbg_lexer.l"
 {
 		phpdbg_init_param(yylval, OP_PARAM);
-		yylval->str = strndup(yytext, yyleng);
+		yylval->str = zend_strndup(yytext, yyleng);
 		yylval->len = yyleng;
 		return T_OPCODE;
 	}
@@ -1097,7 +1097,7 @@ YY_RULE_SETUP
 #line 114 "/usr/src/php-src/sapi/phpdbg/phpdbg_lexer.l"
 {
 		phpdbg_init_param(yylval, STR_PARAM);
-		yylval->str = strndup(yytext, yyleng);
+		yylval->str = zend_strndup(yytext, yyleng);
 		yylval->len = yyleng;
 		return T_ID; 
 	}
@@ -1108,7 +1108,7 @@ YY_RULE_SETUP
 #line 122 "/usr/src/php-src/sapi/phpdbg/phpdbg_lexer.l"
 {
 	phpdbg_init_param(yylval, STR_PARAM);
-	yylval->str = strndup(yytext, yyleng);
+	yylval->str = zend_strndup(yytext, yyleng);
 	yylval->len = yyleng;
 	BEGIN(INITIAL);
 	return T_INPUT;

sapi/phpdbg/phpdbg_lexer.l

@@ -77,7 +77,7 @@ INPUT				[^\n]+
 <INITIAL,NORMAL>{
 	{ID}[:]{1}[//]{2}	{
 		phpdbg_init_param(yylval, STR_PARAM);
-		yylval->str = strndup(yytext, yyleng);
+		yylval->str = zend_strndup(yytext, yyleng);
 		yylval->len = yyleng;
 		return T_PROTO;
 	}
@@ -107,13 +107,13 @@ INPUT				[^\n]+
 	}
 	{OPCODE}	{
 		phpdbg_init_param(yylval, OP_PARAM);
-		yylval->str = strndup(yytext, yyleng);
+		yylval->str = zend_strndup(yytext, yyleng);
 		yylval->len = yyleng;
 		return T_OPCODE;
 	}
 	{ID}			{
 		phpdbg_init_param(yylval, STR_PARAM);
-		yylval->str = strndup(yytext, yyleng);
+		yylval->str = zend_strndup(yytext, yyleng);
 		yylval->len = yyleng;
 		return T_ID; 
 	}
@@ -121,7 +121,7 @@ INPUT				[^\n]+
 
 <RAW>{INPUT}		{
 	phpdbg_init_param(yylval, STR_PARAM);
-	yylval->str = strndup(yytext, yyleng);
+	yylval->str = zend_strndup(yytext, yyleng);
 	yylval->len = yyleng;
 	BEGIN(INITIAL);
 	return T_INPUT;

sapi/phpdbg/phpdbg_parser.h

@@ -0,0 +1,126 @@
+/* A Bison parser, made by GNU Bison 2.7.  */
+
+/* Bison interface for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
+# define YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+/* "%code requires" blocks.  */
+/* Line 2058 of yacc.c  */
+#line 40 "/usr/src/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+#include "phpdbg.h"
+#ifndef YY_TYPEDEF_YY_SCANNER_T
+#define YY_TYPEDEF_YY_SCANNER_T
+typedef void* yyscan_t;
+#endif
+
+
+/* Line 2058 of yacc.c  */
+#line 55 "sapi/phpdbg/phpdbg_parser.h"
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_EVAL = 258,
+     T_RUN = 259,
+     T_SHELL = 260,
+     T_IF = 261,
+     T_TRUTHY = 262,
+     T_FALSY = 263,
+     T_STRING = 264,
+     T_COLON = 265,
+     T_DCOLON = 266,
+     T_POUND = 267,
+     T_PROTO = 268,
+     T_DIGITS = 269,
+     T_LITERAL = 270,
+     T_ADDR = 271,
+     T_OPCODE = 272,
+     T_ID = 273,
+     T_INPUT = 274,
+     T_UNEXPECTED = 275
+   };
+#endif
+/* Tokens.  */
+#define T_EVAL 258
+#define T_RUN 259
+#define T_SHELL 260
+#define T_IF 261
+#define T_TRUTHY 262
+#define T_FALSY 263
+#define T_STRING 264
+#define T_COLON 265
+#define T_DCOLON 266
+#define T_POUND 267
+#define T_PROTO 268
+#define T_DIGITS 269
+#define T_LITERAL 270
+#define T_ADDR 271
+#define T_OPCODE 272
+#define T_ID 273
+#define T_INPUT 274
+#define T_UNEXPECTED 275
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (phpdbg_param_t *stack, yyscan_t scanner);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+#endif /* !YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED  */

sapi/phpdbg/phpdbg_watch.c

@@ -463,10 +463,9 @@ PHPDBG_WATCH(array) /* {{{ */
 } /* }}} */
 
 void phpdbg_watch_HashTable_dtor(zval **zv) {
-	TSRMLS_FETCH();
-
 	phpdbg_btree_result *result;
 	zval_ptr_dtor_wrapper(zv);
+	TSRMLS_FETCH();
 
 
 	if ((result = phpdbg_btree_find(&PHPDBG_G(watchpoint_tree), (zend_ulong)*zv))) {
@@ -545,9 +544,8 @@ void phpdbg_watchpoints_clean(TSRMLS_D) {
 }
 
 static void phpdbg_watch_dtor(void *pDest) {
-	TSRMLS_FETCH();
-
 	phpdbg_watchpoint_t *watch = *(phpdbg_watchpoint_t **)pDest;
+	TSRMLS_FETCH();
 
 	phpdbg_deactivate_watchpoint(watch TSRMLS_CC);
 	phpdbg_remove_watchpoint(watch TSRMLS_CC);
@@ -599,7 +597,7 @@ static void phpdbg_print_changed_zval(phpdbg_watch_memdump *dump TSRMLS_DC) {
 		void *oldPtr = (char *)&dump->data + ((size_t)watch->addr.ptr - (size_t)dump->page);
 		char reenable = 1;
 
-		if (watch->addr.ptr < dump->page || watch->addr.ptr + watch->size > dump->page + dump->size) {
+		if ((size_t)watch->addr.ptr < (size_t)dump->page || (size_t)watch->addr.ptr + watch->size > (size_t)dump->page + dump->size) {
 			continue;
 		}
 
@@ -774,8 +772,8 @@ void phpdbg_list_watchpoints(TSRMLS_D) {
 }
 
 void phpdbg_watch_efree(void *ptr) {
-	TSRMLS_FETCH();
 	phpdbg_btree_result *result = phpdbg_btree_find_closest(&PHPDBG_G(watchpoint_tree), (zend_ulong)ptr);
+	TSRMLS_FETCH();
 
 	if (result) {
 		phpdbg_watchpoint_t *watch = result->ptr;