File tree 1 file changed +21
-11
lines changed
1 file changed +21
-11
lines changed Original file line number Diff line number Diff line change @@ -318,7 +318,8 @@ define ____print_ht
318
318
set $n = $n - 1
319
319
end
320
320
321
- if $ht ->u.v.flags & 4
321
+ set $packed = $ht ->u.v.flags & 4
322
+ if $packed
322
323
printf " Packed"
323
324
else
324
325
printf " Hash"
@@ -329,36 +330,45 @@ define ____print_ht
329
330
set $i = 0
330
331
set $ind = $ind + 1
331
332
while $i < $num
332
- set $p = (Bucket*)($ht ->arData + $i )
333
+ if $packed
334
+ set $val = (zval*)($ht ->arPacked + $i )
335
+ set $key = (zend_string*)0
336
+ set $h = $i
337
+ else
338
+ set $bucket = (Bucket*)($ht ->arData + $i )
339
+ set $val = &$bucket ->val
340
+ set $key = $bucket ->key
341
+ set $h = $bucket ->h
342
+ end
333
343
set $n = $ind
334
- if $p ->val. u1.v.type > 0
344
+ if $val -> u1.v.type > 0
335
345
while $n > 0
336
346
printf " "
337
347
set $n = $n - 1
338
348
end
339
349
printf " [%d] " , $i
340
- if $p -> key
341
- ____print_str $p -> key->val $p -> key->len
350
+ if $key
351
+ ____print_str $key ->val $key ->len
342
352
printf " => "
343
353
else
344
- printf " %d => " , $p -> h
354
+ printf " %d => " , $h
345
355
end
346
356
if $arg1 == 0
347
- printf " %p\n " , (zval *)& $p -> val
357
+ printf " %p\n " , $ val
348
358
end
349
359
if $arg1 == 1
350
- set $zval = (zval *)& $p -> val
360
+ set $zval = $ val
351
361
____printzv $zval 1
352
362
end
353
363
if $arg1 == 2
354
- printf " %s\n " , (char*)$p ->val. value.ptr
364
+ printf " %s\n " , (char*)$val -> value.ptr
355
365
end
356
366
if $arg1 == 3
357
- set $func = (zend_function*)$p ->val. value.ptr
367
+ set $func = (zend_function*)$val -> value.ptr
358
368
printf " \" %s\"\n " , $func ->common .function_name->val
359
369
end
360
370
if $arg1 == 4
361
- set $const = (zend_constant *)$p ->val. value.ptr
371
+ set $const = (zend_constant *)$val -> value.ptr
362
372
____printzv $const 1
363
373
end
364
374
end
You can’t perform that action at this time.
0 commit comments