@@ -28,14 +28,14 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
28
28
static inline zend_uint phpdbg_decode_literal (zend_op_array * ops , zend_literal * literal TSRMLS_DC ) /* {{{ */
29
29
{
30
30
zend_uint iter = 0 ;
31
-
31
+
32
32
while (iter < ops -> last_literal ) {
33
33
if (literal == & ops -> literals [iter ]) {
34
34
return iter ;
35
35
}
36
36
iter ++ ;
37
37
}
38
-
38
+
39
39
return 0 ;
40
40
} /* }}} */
41
41
@@ -47,24 +47,24 @@ static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, zend_uint
47
47
case IS_CV :
48
48
asprintf (& decode , "$%s" , ops -> vars [op -> var ].name );
49
49
break ;
50
-
50
+
51
51
case IS_VAR :
52
52
case IS_TMP_VAR : {
53
53
zend_ulong id = 0 , * pid = NULL ;
54
54
if (zend_hash_index_find (vars , (zend_ulong ) ops -> vars - op -> var , (void * * ) & pid ) != SUCCESS ) {
55
55
id = zend_hash_num_elements (vars );
56
56
zend_hash_index_update (
57
- vars , (zend_ulong ) ops -> vars - op -> var ,
58
- (void * * ) & id ,
57
+ vars , (zend_ulong ) ops -> vars - op -> var ,
58
+ (void * * ) & id ,
59
59
sizeof (zend_ulong ), NULL );
60
60
} else id = * pid ;
61
61
asprintf (& decode , "@%lu" , id );
62
62
} break ;
63
-
63
+
64
64
case IS_CONST :
65
- asprintf (& decode , "C%lu " , phpdbg_decode_literal (ops , op -> literal TSRMLS_CC ));
65
+ asprintf (& decode , "C%u " , phpdbg_decode_literal (ops , op -> literal TSRMLS_CC ));
66
66
break ;
67
-
67
+
68
68
case IS_UNUSED :
69
69
asprintf (& decode , "<unused>" );
70
70
break ;
@@ -75,7 +75,7 @@ static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, zend_uint
75
75
char * phpdbg_decode_opline (zend_op_array * ops , zend_op * op , HashTable * vars TSRMLS_DC ) /*{{{ */
76
76
{
77
77
char * decode [4 ] = {NULL , NULL , NULL , NULL };
78
-
78
+
79
79
switch (op -> opcode ) {
80
80
case ZEND_JMP :
81
81
#ifdef ZEND_GOTO
@@ -86,18 +86,18 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM
86
86
#endif
87
87
asprintf (& decode [1 ], "#%lu" , op -> op1 .jmp_addr - ops -> opcodes );
88
88
goto format ;
89
-
89
+
90
90
case ZEND_JMPZNZ :
91
91
decode [1 ] = phpdbg_decode_op (ops , & op -> op1 , op -> op1_type , vars TSRMLS_CC );
92
92
asprintf (
93
- & decode [2 ], "#%lu or #%lu" , op -> op2 .opline_num , op -> extended_value );
93
+ & decode [2 ], "#%u or #%lu" , op -> op2 .opline_num , op -> extended_value );
94
94
goto result ;
95
-
95
+
96
96
case ZEND_JMPZ :
97
97
case ZEND_JMPNZ :
98
98
case ZEND_JMPZ_EX :
99
99
case ZEND_JMPNZ_EX :
100
-
100
+
101
101
#ifdef ZEND_JMP_SET
102
102
case ZEND_JMP_SET :
103
103
#endif
@@ -111,22 +111,22 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM
111
111
112
112
case ZEND_RECV_INIT :
113
113
goto result ;
114
-
114
+
115
115
default : {
116
116
decode [1 ] = phpdbg_decode_op (ops , & op -> op1 , op -> op1_type , vars TSRMLS_CC );
117
117
decode [2 ] = phpdbg_decode_op (ops , & op -> op2 , op -> op2_type , vars TSRMLS_CC );
118
118
result :
119
- decode [3 ] = phpdbg_decode_op (ops , & op -> result , op -> result_type , vars TSRMLS_CC );
119
+ decode [3 ] = phpdbg_decode_op (ops , & op -> result , op -> result_type , vars TSRMLS_CC );
120
120
format :
121
121
asprintf (
122
122
& decode [0 ],
123
- "%-20s %-20s %-20s" ,
124
- decode [1 ] ? decode [1 ] : "" ,
123
+ "%-20s %-20s %-20s" ,
124
+ decode [1 ] ? decode [1 ] : "" ,
125
125
decode [2 ] ? decode [2 ] : "" ,
126
126
decode [3 ] ? decode [3 ] : "" );
127
127
}
128
128
}
129
-
129
+
130
130
if (decode [1 ])
131
131
free (decode [1 ]);
132
132
if (decode [2 ])
@@ -147,7 +147,7 @@ void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, ze
147
147
148
148
zend_op * opline = execute_data -> opline ;
149
149
char * decode = phpdbg_decode_opline (execute_data -> op_array , opline , vars TSRMLS_CC );
150
-
150
+
151
151
if (ignore_flags ||
152
152
(!(PHPDBG_G (flags ) & PHPDBG_IS_QUIET ) ||
153
153
(PHPDBG_G (flags ) & PHPDBG_IS_STEPPING ))) {
@@ -168,7 +168,7 @@ void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, ze
168
168
decode ,
169
169
execute_data -> op_array -> filename ? execute_data -> op_array -> filename : "unknown" );
170
170
}
171
-
171
+
172
172
if (decode ) {
173
173
free (decode );
174
174
}
@@ -356,7 +356,7 @@ const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
356
356
CASE (ZEND_RECV_VARIADIC );
357
357
#endif
358
358
CASE (ZEND_OP_DATA );
359
- default :
359
+ default :
360
360
return "UNKNOWN" ;
361
361
}
362
362
} /* }}} */
0 commit comments