RE: [PATCH] gdb, btrace: support libipt v2.2 events

["Metzger, Markus T" <markus.t.metzger@intel.com>]

Hello Tom,

>>>>>> "Keith" == Keith Seitz <keiths@redhat.com> writes:
>
>>> +	    std::string aux_string = std::string (_("trig: trbv = "))
>>> +	      + hex_string (event.variant.trig.trbv);
>
>Normally here we'd wrap the RSH in parens, per the coding standards.

I'd need to break at the =, then, like this:

	    std::string aux_string
	      = (std::string (_("trig: trbv = "))
		 + hex_string (event.variant.trig.trbv));

The patch matches the surrounding style, so if you want this fixed, I'd need
to fix it everywhere in a separate patch.


>>> +#endif /* (LIBIPT_VERSION >= 0x202) */
>
>Keith> Elsewhere in the file, this comment includes "defined".
>
>True but those spots seem to be in error.

I fixed those in a separate obvious patch:

diff --git a/gdb/btrace.c b/gdb/btrace.c
index f9c6f0e5b6a..ef152c531fb 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -1283,7 +1283,7 @@ decode_interrupt_vector (const uint8_t vector)
 
   return nullptr;
 }
-#endif /* defined (LIBIPT_VERSION >= 0x201) */
+#endif /* (LIBIPT_VERSION >= 0x201) */
 
 /* Handle instruction decode events (libipt-v2).  */
 
@@ -1596,7 +1596,7 @@ handle_pt_insn_events (struct btrace_thread_info *btinfo,
            handle_pt_aux_insn (btinfo, aux_string, pc);
            break;
          }
-#endif /* defined (LIBIPT_VERSION >= 0x201) */
+#endif /* (LIBIPT_VERSION >= 0x201) */
 
 #if (LIBIPT_VERSION >= 0x202)
        case ptev_trig:
@@ -3064,7 +3064,7 @@ pt_print_packet (const struct pt_packet *packet)
                  packet->payload.ptw.payload,
                  packet->payload.ptw.ip ? (" ip") : (""));
       break;
-#endif /* defined (LIBIPT_VERSION >= 0x200)  */
+#endif /* (LIBIPT_VERSION >= 0x200)  */
 
 #if (LIBIPT_VERSION >= 0x201)
     case ppt_cfe:
@@ -3077,7 +3077,7 @@ pt_print_packet (const struct pt_packet *packet)
       gdb_printf (("evd %u: 0x%" PRIx64 ""), packet->payload.evd.type,
                  packet->payload.evd.payload);
       break;
-#endif /* defined (LIBIPT_VERSION >= 0x201)  */
+#endif /* (LIBIPT_VERSION >= 0x201)  */
     }
 }

Markus.
Intel Deutschland GmbH
Registered Address: Dornacher Strasse 1, 85622 Feldkirchen, Germany
Tel: +49 89 991 430, www.intel.de
Managing Directors: Harry Demas, Jeffrey Schneiderman, Yin Chong Sorrell
Chairperson of the Supervisory Board: Nicole Lau
Registered Seat: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928