Changes in tools/gdb/utils-gdb.py [6abcb4d:d8b17e2]

File:

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

tools/gdb/utils-gdb.py

@@ -23 +23 @@
 gdb.execute('handle SIGUSR1 nostop noprint pass')
 
-CfaTypes = collections.namedtuple('CfaTypes', 'cluster_ptr processor_ptr thread_ptr int_ptr thread_state yield_state')
+CfaTypes = collections.namedtuple('CfaTypes', 'cluster_ptr processor_ptr thread_ptr int_ptr thread_state')
 
 class ThreadInfo:
@@ -52 +52 @@
         # GDB types for various structures/types in CFA
         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(),
-                int_ptr = gdb.lookup_type('int').pointer(),
-                thread_state = gdb.lookup_type('enum __Coroutine_State'),
-                yield_state = gdb.lookup_type('enum __Preemption_Reason'))
+                                  processor_ptr = gdb.lookup_type('struct processor').pointer(),
+                                         thread_ptr = gdb.lookup_type('struct $thread').pointer(),
+                                                int_ptr = gdb.lookup_type('int').pointer(),
+                                   thread_state = gdb.lookup_type('enum __Coroutine_State'))
 
 def get_addr(addr):
@@ -372 +371 @@
         def print_thread(self, thread, tid, marked):
                 cfa_t = get_cfa_types()
-                ys = str(thread['preempted'].cast(cfa_t.yield_state))
-                if ys == '_X15__NO_PREEMPTIONKM19__Preemption_Reason_1':
-                        state = str(thread['state'].cast(cfa_t.thread_state))
-                elif ys == '_X18__ALARM_PREEMPTIONKM19__Preemption_Reason_1':
-                        state = 'preempted'
-                elif ys == '_X19__MANUAL_PREEMPTIONKM19__Preemption_Reason_1':
-                        state = 'yield'
-                elif ys == '_X17__POLL_PREEMPTIONKM19__Preemption_Reason_1':
-                        state = 'poll'
-                else:
-                        print("error: thread {} in undefined preemption state {}".format(thread, ys))
-                        state = 'error'
-                self.print_formatted(marked, tid, thread['self_cor']['name'].string(), state, str(thread))
+                self.print_formatted(marked, tid, thread['self_cor']['name'].string(), str(thread['state'].cast(cfa_t.thread_state)), str(thread))
 
         def print_threads_by_cluster(self, cluster, print_system = False):
@@ -493 +480 @@
                 context = thread['context']
 
-
+                # lookup for sp,fp and uSwitch
+                xsp = context['SP'] + 48
+                xfp = context['FP']
+
+                # convert string so we can strip out the address
+                try:
+                        xpc = get_addr(gdb.parse_and_eval('__cfactx_switch').address + 28)
+                except:
+                        print("here")
+                        return
 
                 # must be at frame 0 to set pc register
                 gdb.execute('select-frame 0')
-                if gdb.selected_frame().architecture().name() != 'i386:x86-64':
-                        print('gdb debugging only supported for i386:x86-64 for now')
-                        return
-
-                # gdb seems to handle things much better if we pretend we just entered the context switch
-                # pretend the pc is __cfactx_switch and adjust the sp, base pointer doesn't need to change
-                # lookup for sp,fp and uSwitch
-                xsp = context['SP'] + 40 # 40 = 5 64bit registers : %r15, %r14, %r13, %r12, %rbx WARNING: x64 specific
-                xfp = context['FP']
-
-                # convert string so we can strip out the address
-                try:
-                        xpc = get_addr(gdb.parse_and_eval('__cfactx_switch').address)
-                except:
-                        print("here")
-                        return
 
                 # push sp, fp, pc into a global stack
@@ -523 +503 @@
 
                 # update registers for new task
-                # print('switching to {} ({}) : [{}, {}, {}]'.format(thread['self_cor']['name'].string(), str(thread), str(xsp), str(xfp), str(xpc)))
-                print('switching to thread {} ({})'.format(str(thread), thread['self_cor']['name'].string()))
+                print('switching to ')
                 gdb.execute('set $rsp={}'.format(xsp))
                 gdb.execute('set $rbp={}'.format(xfp))
@@ -573 +552 @@
 
                 argv = parse(arg)
+                print(argv)
                 if argv[0].isdigit():
                         cname = " ".join(argv[1:]) if len(argv) > 1 else None