Changeset c86ee4c for tools/gdb/utils-gdb.py

Timestamp:

Jul 7, 2021, 6:24:42 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d83b266

Parents:

1f45c7d (diff), b1a2c4a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tools/gdb/utils-gdb.py (modified) (4 diffs)

tools/gdb/utils-gdb.py

@@ -53 +53 @@
         return CfaTypes(cluster_ptr = gdb.lookup_type('struct cluster').pointer(),
                 processor_ptr = gdb.lookup_type('struct processor').pointer(),
-                thread_ptr = gdb.lookup_type('struct $thread').pointer(),
+                thread_ptr = gdb.lookup_type('struct thread$').pointer(),
                 int_ptr = gdb.lookup_type('int').pointer(),
                 thread_state = gdb.lookup_type('enum __Coroutine_State'),
@@ -163 +163 @@
 
 def thread_for_pthread(pthrd):
-        return tls_for_pthread(pthrd)['_X11this_threadVPS7$thread_1']
+        return tls_for_pthread(pthrd)['_X11this_threadVPS7thread$_1']
 
 def thread_for_proc(proc):
-        return tls_for_proc(proc)['_X11this_threadVPS7$thread_1']
+        return tls_for_proc(proc)['_X11this_threadVPS7thread$_1']
 
 
@@ -216 +216 @@
 
                 cfa_t = get_cfa_types()
-                root = cluster['_X7threadsS8__dllist_S7$thread__1']['_X4headPY15__TYPE_generic__1'].cast(cfa_t.thread_ptr)
+                root = cluster['_X7threadsS8__dllist_S7thread$__1']['_X4headPY15__TYPE_generic__1'].cast(cfa_t.thread_ptr)
 
                 if root == 0x0 or root.address == 0x0:
@@ -313 +313 @@
                 ))
                 tls = tls_for_proc( processor )
-                thrd = tls['_X11this_threadVPS7$thread_1']
+                thrd = tls['_X11this_threadVPS7thread$_1']
                 if thrd != 0x0:
                         tname = '{} {}'.format(thrd['self_cor']['name'].string(), str(thrd))