From 39cf27689bc13cf94c047675901c3fb43ba44879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@tideways-gmbh.com>
Date: Tue, 24 Jun 2025 15:22:25 +0200
Subject: [PATCH] php_gdb: Print some numeric fields as hexadecimal (#18925)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* php_gdb: Print `zend_string*`’s `h` field as hexadecimal

A decimal representation of a hash value is not particularly meaningful and
makes it harder to compare hash values.

* php_gdb: Print `HashTable*`’s `nTableMask` field as hexadecimal
---
 main/debug_gdb_scripts.c | 11 ++++++-----
 scripts/gdb/php_gdb.py   | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/main/debug_gdb_scripts.c b/main/debug_gdb_scripts.c
index 3806f6aab60..e3c522bc048 100644
--- a/main/debug_gdb_scripts.c
+++ b/main/debug_gdb_scripts.c
@@ -719,6 +719,8 @@ asm(
     ".ascii \"        for field in self.val.type.fields():\\n\"\n"
     ".ascii \"            if field.name == 'val':\\n\"\n"
     ".ascii \"                yield ('val', format_zstr(self.val))\\n\"\n"
+    ".ascii \"            elif field.name == 'h':\\n\"\n"
+    ".ascii \"                yield (field.name, \\\"0x%x\\\" % self.val[field.name])\\n\"\n"
     ".ascii \"            else:\\n\"\n"
     ".ascii \"                yield (field.name, format_nested(self.val[field.name]))\\n\"\n"
     ".ascii \"\\n\"\n"
@@ -751,12 +753,11 @@ asm(
     ".ascii \"    def children(self):\\n\"\n"
     ".ascii \"        for field in self.val.type.fields():\\n\"\n"
     ".ascii \"            if field.name is None:\\n\"\n"
-    ".ascii \"                name = '<anonymous>'\\n\"\n"
-    ".ascii \"                val = self.val[field]\\n\"\n"
+    ".ascii \"                yield ('<anonymous>', format_nested(self.val[field]))\\n\"\n"
+    ".ascii \"            elif field.name == 'nTableMask':\\n\"\n"
+    ".ascii \"                yield (field.name, \\\"0x%x\\\" % self.val[field.name])\\n\"\n"
     ".ascii \"            else:\\n\"\n"
-    ".ascii \"                name = field.name\\n\"\n"
-    ".ascii \"                val = self.val[field.name]\\n\"\n"
-    ".ascii \"            yield (name, format_nested(val))\\n\"\n"
+    ".ascii \"                yield (field.name, format_nested(self.val[field.name]))\\n\"\n"
     ".ascii \"\\n\"\n"
     ".ascii \"pp_set.add_printer('zend_array', '^_zend_array$', ZendArrayPrettyPrinter)\\n\"\n"
     ".ascii \"\\n\"\n"
diff --git a/scripts/gdb/php_gdb.py b/scripts/gdb/php_gdb.py
index ae8396a2ac0..1c5da0154ae 100644
--- a/scripts/gdb/php_gdb.py
+++ b/scripts/gdb/php_gdb.py
@@ -49,6 +49,8 @@ class ZendStringPrettyPrinter(gdb.printing.PrettyPrinter):
         for field in self.val.type.fields():
             if field.name == 'val':
                 yield ('val', format_zstr(self.val))
+            elif field.name == 'h':
+                yield (field.name, "0x%x" % self.val[field.name])
             else:
                 yield (field.name, format_nested(self.val[field.name]))
 
@@ -81,12 +83,11 @@ class ZendArrayPrettyPrinter(gdb.printing.PrettyPrinter):
     def children(self):
         for field in self.val.type.fields():
             if field.name is None:
-                name = '<anonymous>'
-                val = self.val[field]
+                yield ('<anonymous>', format_nested(self.val[field]))
+            elif field.name == 'nTableMask':
+                yield (field.name, "0x%x" % self.val[field.name])
             else:
-                name = field.name
-                val = self.val[field.name]
-            yield (name, format_nested(val))
+                yield (field.name, format_nested(self.val[field.name]))
 
 pp_set.add_printer('zend_array', '^_zend_array$', ZendArrayPrettyPrinter)