This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [OBV PATCH] MPX documentation
- From: Pedro Alves <palves at redhat dot com>
- To: Eli Zaretskii <eliz at gnu dot org>
- Cc: walfred dot tedeschi at intel dot com, joseph at codesourcery dot com, gdb-patches at sourceware dot org
- Date: Mon, 11 Jan 2016 11:42:28 +0000
- Subject: Re: [OBV PATCH] MPX documentation
- Authentication-results: sourceware.org; auth=none
- References: <1450358668-11765-1-git-send-email-walfred dot tedeschi at intel dot com> <83egelyrmd dot fsf at gnu dot org> <alpine dot DEB dot 2 dot 10 dot 1512171804370 dot 3080 at digraph dot polyomino dot org dot uk> <AC542571535E904D8E8ADAE745D60B1944507680 at IRSMSX104 dot ger dot corp dot intel dot com> <5678030C dot 6030304 at redhat dot com> <83lh8nstdx dot fsf at gnu dot org>
On 12/21/2015 03:39 PM, Eli Zaretskii wrote:
>> Date: Mon, 21 Dec 2015 13:47:56 +0000
>> From: Pedro Alves <palves@redhat.com>
>> CC: "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
>>
>>> From: Joseph Myers [mailto:joseph@codesourcery.com]
>>> On Thu, 17 Dec 2015, Eli Zaretskii wrote:
>>>>> From: Walfred Tedeschi <walfred.tedeschi@intel.com>
>>>>> Fix some trademarks on MPX section.
>>>>
>>>> Do we have to?
>>>
>>> The GNU Coding Standards say "Please do not include any trademark acknowledgements in GNU software packages or documentation.". So the patch is wrong.
>>
>> Does that mean that all existing "(R)" occurrences in the documentation
>> should be removed?
>
> I guess so, yes.
Like so?
From: Pedro Alves <palves@redhat.com>
Subject: [PATCH] Remove trademark acknowledgments throughout
The GNU Coding Standards say:
"Please do not include any trademark acknowledgements in GNU
software packages or documentation."
gdb/ChangeLog:
2016-01-11 Pedro Alves <palves@redhat.com>
Remove use of the registered trademark symbol throughout.
gdb/gdbserver/ChangeLog:
2016-01-11 Pedro Alves <palves@redhat.com>
Remove use of the registered trademark symbol throughout.
---
gdb/ChangeLog-2013 | 2 +-
gdb/NEWS | 20 ++++++++++----------
gdb/btrace.c | 27 ++++++++++++++-------------
gdb/btrace.h | 2 +-
gdb/common/btrace-common.c | 2 +-
gdb/common/btrace-common.h | 8 ++++----
gdb/configure | 7 +++----
gdb/configure.ac | 4 ++--
gdb/doc/gdb.texinfo | 26 +++++++++++++-------------
gdb/gdbserver/linux-low.c | 2 +-
gdb/gdbserver/server.c | 2 +-
gdb/i386-tdep.c | 8 ++++----
gdb/nat/linux-btrace.c | 14 +++++++-------
gdb/nat/linux-btrace.h | 3 ++-
gdb/record-btrace.c | 6 +++---
15 files changed, 67 insertions(+), 66 deletions(-)
diff --git a/gdb/ChangeLog-2013 b/gdb/ChangeLog-2013
index 5c01e0a..897ad2a 100644
--- a/gdb/ChangeLog-2013
+++ b/gdb/ChangeLog-2013
@@ -548,7 +548,7 @@
2013-12-03 Walfred Tedeschi <walfred.tedeschi@intel.com>
- * NEWS: Add section for Intel(R) Architecture Instructions
+ * NEWS: Add section for Intel Architecture Instructions
Extesions mentioning MPX.
2013-12-03 Joel Brobecker <brobecker@adacore.com>
diff --git a/gdb/NEWS b/gdb/NEWS
index 484d98d..e3dd399 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -8,7 +8,7 @@
* Support for tracepoints on aarch64-linux was added in GDBserver.
* The 'record instruction-history' command now indicates speculative execution
- when using the Intel(R) Processor Trace recording format.
+ when using the Intel Processor Trace recording format.
* GDB now allows users to specify explicit locations, bypassing
the linespec parser. This feature is also available to GDB/MI
@@ -257,11 +257,11 @@ tui disable
show mpx bound
set mpx bound on i386 and amd64
- Support for bound table investigation on Intel(R) MPX enabled applications.
+ Support for bound table investigation on Intel MPX enabled applications.
record btrace pt
record pt
- Start branch trace recording using Intel(R) Processor Trace format.
+ Start branch trace recording using Intel Processor Trace format.
maint info btrace
Print information about branch tracing internals.
@@ -329,7 +329,7 @@ show debug linux-namespaces
set|show record btrace pt buffer-size
Set and show the size of the ring buffer used for branch tracing in
- Intel(R) Processor Trace format.
+ Intel Processor Trace format.
The obtained size may differ from the requested size. Use "info
record" to see the obtained buffer size.
@@ -354,12 +354,12 @@ Qbtrace-conf:bts:size
Set the requested ring buffer size for branch tracing in BTS format.
Qbtrace:pt
- Enable Intel(R) Procesor Trace-based branch tracing for the current
+ Enable Intel Procesor Trace-based branch tracing for the current
process. The remote stub reports support for this packet to GDB's
qSupported query.
Qbtrace-conf:pt:size
- Set the requested ring buffer size for branch tracing in Intel(R) Processor
+ Set the requested ring buffer size for branch tracing in Intel Processor
Trace format.
swbreak stop reason
@@ -433,7 +433,7 @@ Itanium running HP-UX ia64-*-hpux*
--with-intel-pt
This configure option allows the user to build GDB with support for
- Intel(R) Processor Trace (default: auto). This requires libipt.
+ Intel Processor Trace (default: auto). This requires libipt.
--with-libipt-prefix=PATH
Specify the path to the version of libipt that GDB should use.
@@ -705,10 +705,10 @@ show mi-async
can be used to launch native programs even when "set
auto-connect-native-target" is set to off.
-* GDB now supports access to Intel(R) MPX registers on GNU/Linux.
+* GDB now supports access to Intel MPX registers on GNU/Linux.
-* Support for Intel(R) AVX-512 registers on GNU/Linux.
- Support displaying and modifying Intel(R) AVX-512 registers
+* Support for Intel AVX-512 registers on GNU/Linux.
+ Support displaying and modifying Intel AVX-512 registers
$zmm0 - $zmm31 and $k0 - $k7 on GNU/Linux.
* New remote packets
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 4c88ddd..60d6d4f 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -763,7 +763,7 @@ ftrace_add_pt (struct pt_insn_decoder *decoder,
if (errcode < 0)
{
if (errcode != -pte_eos)
- warning (_("Failed to synchronize onto the Intel(R) Processor "
+ warning (_("Failed to synchronize onto the Intel Processor "
"Trace stream: %s."), pt_errstr (pt_errcode (errcode)));
break;
}
@@ -821,7 +821,7 @@ ftrace_add_pt (struct pt_insn_decoder *decoder,
pt_insn_get_offset (decoder, &offset);
- warning (_("Failed to decode Intel(R) Processor Trace near trace "
+ warning (_("Failed to decode Intel Processor Trace near trace "
"offset 0x%" PRIx64 " near recorded PC 0x%" PRIx64 ": %s."),
offset, insn.ip, pt_errstr (pt_errcode (errcode)));
@@ -894,7 +894,8 @@ static void btrace_finalize_ftrace_pt (struct pt_insn_decoder *decoder,
btrace_add_pc (tp);
}
-/* Compute the function branch trace from Intel(R) Processor Trace. */
+/* Compute the function branch trace from Intel Processor Trace
+ format. */
static void
btrace_compute_ftrace_pt (struct thread_info *tp,
@@ -922,12 +923,12 @@ btrace_compute_ftrace_pt (struct thread_info *tp,
errcode = pt_cpu_errata (&config.errata, &config.cpu);
if (errcode < 0)
- error (_("Failed to configure the Intel(R) Processor Trace decoder: %s."),
+ error (_("Failed to configure the Intel Processor Trace decoder: %s."),
pt_errstr (pt_errcode (errcode)));
decoder = pt_insn_alloc_decoder (&config);
if (decoder == NULL)
- error (_("Failed to allocate the Intel(R) Processor Trace decoder."));
+ error (_("Failed to allocate the Intel Processor Trace decoder."));
TRY
{
@@ -935,11 +936,11 @@ btrace_compute_ftrace_pt (struct thread_info *tp,
image = pt_insn_get_image(decoder);
if (image == NULL)
- error (_("Failed to configure the Intel(R) Processor Trace decoder."));
+ error (_("Failed to configure the Intel Processor Trace decoder."));
errcode = pt_image_set_callback(image, btrace_pt_readmem_callback, NULL);
if (errcode < 0)
- error (_("Failed to configure the Intel(R) Processor Trace decoder: "
+ error (_("Failed to configure the Intel Processor Trace decoder: "
"%s."), pt_errstr (pt_errcode (errcode)));
ftrace_add_pt (decoder, &btinfo->begin, &btinfo->end, &level,
@@ -1038,7 +1039,7 @@ btrace_enable (struct thread_info *tp, const struct btrace_config *conf)
#if !defined (HAVE_LIBIPT)
if (conf->format == BTRACE_FORMAT_PT)
- error (_("GDB does not support Intel(R) Processor Trace."));
+ error (_("GDB does not support Intel Processor Trace."));
#endif /* !defined (HAVE_LIBIPT) */
if (!target_supports_btrace (conf->format))
@@ -2443,7 +2444,7 @@ btrace_maint_decode_pt (struct btrace_maint_info *maint,
}
if (errcode != -pte_eos)
- warning (_("Failed to synchronize onto the Intel(R) Processor Trace "
+ warning (_("Failed to synchronize onto the Intel Processor Trace "
"stream: %s."), pt_errstr (pt_errcode (errcode)));
}
@@ -2477,12 +2478,12 @@ btrace_maint_update_pt_packets (struct btrace_thread_info *btinfo)
errcode = pt_cpu_errata (&config.errata, &config.cpu);
if (errcode < 0)
- error (_("Failed to configure the Intel(R) Processor Trace decoder: %s."),
+ error (_("Failed to configure the Intel Processor Trace decoder: %s."),
pt_errstr (pt_errcode (errcode)));
decoder = pt_pkt_alloc_decoder (&config);
if (decoder == NULL)
- error (_("Failed to allocate the Intel(R) Processor Trace decoder."));
+ error (_("Failed to allocate the Intel Processor Trace decoder."));
TRY
{
@@ -2933,7 +2934,7 @@ Set branch tracing specific variables."),
0, &maintenance_set_cmdlist);
add_prefix_cmd ("pt", class_maintenance, maint_btrace_pt_set_cmd, _("\
-Set Intel(R) Processor Trace specific variables."),
+Set Intel Processor Trace specific variables."),
&maint_btrace_pt_set_cmdlist, "maintenance set btrace pt ",
0, &maint_btrace_set_cmdlist);
@@ -2943,7 +2944,7 @@ Show branch tracing specific variables."),
0, &maintenance_show_cmdlist);
add_prefix_cmd ("pt", class_maintenance, maint_btrace_pt_show_cmd, _("\
-Show Intel(R) Processor Trace specific variables."),
+Show Intel Processor Trace specific variables."),
&maint_btrace_pt_show_cmdlist, "maintenance show btrace pt ",
0, &maint_btrace_show_cmdlist);
diff --git a/gdb/btrace.h b/gdb/btrace.h
index 6e8bb09..202b986 100644
--- a/gdb/btrace.h
+++ b/gdb/btrace.h
@@ -114,7 +114,7 @@ enum btrace_bts_error
BDE_BTS_INSN_SIZE
};
-/* Decode errors for the Intel(R) Processor Trace recording format. */
+/* Decode errors for the Intel Processor Trace recording format. */
enum btrace_pt_error
{
/* The user cancelled trace processing. */
diff --git a/gdb/common/btrace-common.c b/gdb/common/btrace-common.c
index 185a3e5..eba3979 100644
--- a/gdb/common/btrace-common.c
+++ b/gdb/common/btrace-common.c
@@ -35,7 +35,7 @@ btrace_format_string (enum btrace_format format)
return _("Branch Trace Store");
case BTRACE_FORMAT_PT:
- return _("Intel(R) Processor Trace");
+ return _("Intel Processor Trace");
}
internal_error (__FILE__, __LINE__, _("Unknown branch trace format"));
diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h
index 4165fd3..ad208cd 100644
--- a/gdb/common/btrace-common.h
+++ b/gdb/common/btrace-common.h
@@ -60,7 +60,7 @@ enum btrace_format
Actually, the format is a sequence of blocks derived from BTS. */
BTRACE_FORMAT_BTS,
- /* Branch trace is in Intel(R) Processor Trace format. */
+ /* Branch trace is in Intel Processor Trace format. */
BTRACE_FORMAT_PT
};
@@ -103,7 +103,7 @@ struct btrace_config_bts
unsigned int size;
};
-/* An Intel(R) Processor Trace configuration. */
+/* An Intel Processor Trace configuration. */
struct btrace_config_pt
{
@@ -129,7 +129,7 @@ struct btrace_config
/* The BTS format configuration. */
struct btrace_config_bts bts;
- /* The Intel(R) Processor Trace format configuration. */
+ /* The Intel Processor Trace format configuration. */
struct btrace_config_pt pt;
};
@@ -148,7 +148,7 @@ struct btrace_data_pt_config
struct btrace_cpu cpu;
};
-/* Branch trace in Intel(R) Processor Trace format. */
+/* Branch trace in Intel Processor Trace format. */
struct btrace_data_pt
{
/* Some configuration information to go with the data. */
diff --git a/gdb/configure b/gdb/configure
index 15383d6..8eb5ba3 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -1560,8 +1560,7 @@ Optional Packages:
(auto/yes/no/<python-program>)
--with-guile[=GUILE] include guile support
(auto/yes/no/<guile-version>/<pkg-config-program>)
- --with-intel-pt include Intel(R) Processor Trace support
- (auto/yes/no)
+ --with-intel-pt include Intel Processor Trace support (auto/yes/no)
--with-libipt-prefix[=DIR] search for libipt in DIR/include and DIR/lib
--without-libipt-prefix don't search for libipt in includedir and libdir
--without-included-regex
@@ -10111,8 +10110,8 @@ $as_echo_n "checking whether to use intel pt... " >&6; }
$as_echo "$with_intel_pt" >&6; }
if test "${with_intel_pt}" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Intel(R) Processor Trace support disabled; some features may be unavailable." >&5
-$as_echo "$as_me: WARNING: Intel(R) Processor Trace support disabled; some features may be unavailable." >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Intel Processor Trace support disabled; some features may be unavailable." >&5
+$as_echo "$as_me: WARNING: Intel Processor Trace support disabled; some features may be unavailable." >&2;}
HAVE_LIBIPT=no
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/gdb/configure.ac b/gdb/configure.ac
index d102640..0d3c1f0 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1243,13 +1243,13 @@ if test "$ENABLE_LIBMCHECK" = "yes" \
fi
AC_ARG_WITH(intel_pt,
- AS_HELP_STRING([--with-intel-pt], [include Intel(R) Processor Trace support (auto/yes/no)]),
+ AS_HELP_STRING([--with-intel-pt], [include Intel Processor Trace support (auto/yes/no)]),
[], [with_intel_pt=auto])
AC_MSG_CHECKING([whether to use intel pt])
AC_MSG_RESULT([$with_intel_pt])
if test "${with_intel_pt}" = no; then
- AC_MSG_WARN([Intel(R) Processor Trace support disabled; some features may be unavailable.])
+ AC_MSG_WARN([Intel Processor Trace support disabled; some features may be unavailable.])
HAVE_LIBIPT=no
else
AC_PREPROC_IFELSE(AC_LANG_SOURCE([[
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 0778383..d70d578 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -6444,8 +6444,8 @@ this format, the processor stores a from/to record for each executed
branch in the btrace ring buffer.
@item pt
-@cindex Intel(R) Processor Trace
-Use the @dfn{Intel(R) Processor Trace} recording format. In this
+@cindex Intel Processor Trace
+Use the @dfn{Intel Processor Trace} recording format. In this
format, the processor stores the execution trace in a compressed form
that is afterwards decoded by @value{GDBN}.
@@ -6635,12 +6635,12 @@ tracing in @acronym{BTS} format.
@kindex set record btrace pt
@item set record btrace pt buffer-size @var{size}
@itemx set record btrace pt buffer-size unlimited
-Set the requested ring buffer size for branch tracing in Intel(R)
+Set the requested ring buffer size for branch tracing in Intel
Processor Trace format. Default is 16KB.
If @var{size} is a positive number, then @value{GDBN} will try to
allocate a buffer of at least @var{size} bytes for each new thread
-that uses the btrace recording method and the Intel(R) Processor Trace
+that uses the btrace recording method and the Intel Processor Trace
format. The actually obtained buffer size may differ from the
requested @var{size}. Use the @code{info record} command to see the
actual buffer size for each thread.
@@ -6653,7 +6653,7 @@ also need longer to process the branch trace data before it can be used.
@item show record btrace pt buffer-size @var{size}
Show the current setting of the requested ring buffer size for branch
-tracing in Intel(R) Processor Trace format.
+tracing in Intel Processor Trace format.
@kindex info record
@item info record
@@ -22129,8 +22129,8 @@ from functions.
@end table
-@subsubsection Intel(R) @dfn{Memory Protection Extensions} (MPX).
-@cindex Intel(R) Memory Protection Extensions (MPX).
+@subsubsection Intel @dfn{Memory Protection Extensions} (MPX).
+@cindex Intel Memory Protection Extensions (MPX).
Memory Protection Extension (MPX) adds the bound registers @samp{BND0}
@footnote{The register named with capital letters represent the architecture
@@ -33978,8 +33978,8 @@ Newer blocks have higher numbers. The oldest block has number zero.
@end table
@item pt
-For the Intel(R) Processor Trace recording format, print a list of
-Intel(R) Processor Trace packets. For each packet, the following
+For the Intel Processor Trace recording format, print a list of
+Intel Processor Trace packets. For each packet, the following
information is printed:
@table @asis
@@ -37291,7 +37291,7 @@ A badly formed request or an error was encountered.
@end table
@item Qbtrace:pt
-Enable branch tracing for the current thread using Intel(R) Processor Trace.
+Enable branch tracing for the current thread using Intel Processor Trace.
Reply:
@table @samp
@@ -39936,11 +39936,11 @@ This thread uses the @dfn{Branch Trace Store} (@acronym{BTS}) format.
The size of the @acronym{BTS} ring buffer in bytes.
@end table
@item pt
-This thread uses the @dfn{Intel(R) Processor Trace} (@acronym{Intel(R)
+This thread uses the @dfn{Intel Processor Trace} (@acronym{Intel
PT}) format.
@table @code
@item size
-The size of the @acronym{Intel(R) PT} ring buffer in bytes.
+The size of the @acronym{Intel PT} ring buffer in bytes.
@end table
@end table
@@ -40524,7 +40524,7 @@ describe the upper 128 bits of @sc{ymm} registers:
@samp{ymm0h} through @samp{ymm15h} for amd64
@end itemize
-The @samp{org.gnu.gdb.i386.mpx} is an optional feature representing Intel(R)
+The @samp{org.gnu.gdb.i386.mpx} is an optional feature representing Intel
Memory Protection Extension (MPX). It should describe the following registers:
@itemize @minus
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 4f8f573..fe3ba85 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -6913,7 +6913,7 @@ linux_low_disable_btrace (struct btrace_target_info *tinfo)
return (err == BTRACE_ERR_NONE ? 0 : -1);
}
-/* Encode an Intel(R) Processor Trace configuration. */
+/* Encode an Intel Processor Trace configuration. */
static void
linux_low_encode_pt_config (struct buffer *buffer,
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index fe7195d..61b164b 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -420,7 +420,7 @@ handle_btrace_enable_bts (struct thread_info *thread)
return NULL;
}
-/* Handle btrace enabling in Intel(R) Processor Trace format. */
+/* Handle btrace enabling in Intel Processor Trace format. */
static const char *
handle_btrace_enable_pt (struct thread_info *thread)
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index ac3740b..b706463 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -8787,7 +8787,7 @@ i386_mpx_info_bounds (char *args, int from_tty)
if (!i386_mpx_enabled ())
{
- printf_unfiltered (_("Intel(R) Memory Protection Extensions not "
+ printf_unfiltered (_("Intel Memory Protection Extensions not "
"supported on this target.\n"));
return;
}
@@ -8829,7 +8829,7 @@ i386_mpx_set_bounds (char *args, int from_tty)
struct type *data_ptr_type = builtin_type (gdbarch)->builtin_data_ptr;
if (!i386_mpx_enabled ())
- error (_("Intel(R) Memory Protection Extensions not supported\
+ error (_("Intel Memory Protection Extensions not supported\
on this target."));
if (args == NULL)
@@ -8916,14 +8916,14 @@ is \"default\"."),
/* Add "mpx" prefix for the set commands. */
add_prefix_cmd ("mpx", class_support, set_mpx_cmd, _("\
-Set Intel(R) Memory Protection Extensions specific variables."),
+Set Intel Memory Protection Extensions specific variables."),
&mpx_set_cmdlist, "set mpx ",
0 /* allow-unknown */, &setlist);
/* Add "mpx" prefix for the show commands. */
add_prefix_cmd ("mpx", class_support, show_mpx_cmd, _("\
-Show Intel(R) Memory Protection Extensions specific variables."),
+Show Intel Memory Protection Extensions specific variables."),
&mpx_show_cmdlist, "show mpx ",
0 /* allow-unknown */, &showlist);
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index 92c0961..e399e73 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -461,7 +461,7 @@ kernel_supports_bts (void)
}
}
-/* Check whether the kernel supports Intel(R) Processor Trace. */
+/* Check whether the kernel supports Intel Processor Trace. */
static int
kernel_supports_pt (void)
@@ -618,7 +618,7 @@ linux_supports_bts (void)
return cached > 0;
}
-/* Check whether the linux target supports Intel(R) Processor Trace. */
+/* Check whether the linux target supports Intel Processor Trace. */
static int
linux_supports_pt (void)
@@ -779,7 +779,7 @@ linux_enable_bts (ptid_t ptid, const struct btrace_config_bts *conf)
#if defined (PERF_ATTR_SIZE_VER5)
-/* Enable branch tracing in Intel(R) Processor Trace format. */
+/* Enable branch tracing in Intel Processor Trace format. */
static struct btrace_target_info *
linux_enable_pt (ptid_t ptid, const struct btrace_config_pt *conf)
@@ -938,7 +938,7 @@ linux_disable_bts (struct btrace_tinfo_bts *tinfo)
return BTRACE_ERR_NONE;
}
-/* Disable Intel(R) Processor Trace tracing. */
+/* Disable Intel Processor Trace tracing. */
static enum btrace_error
linux_disable_pt (struct btrace_tinfo_pt *tinfo)
@@ -1073,7 +1073,7 @@ linux_read_bts (struct btrace_data_bts *btrace,
return BTRACE_ERR_NONE;
}
-/* Fill in the Intel(R) Processor Trace configuration information. */
+/* Fill in the Intel Processor Trace configuration information. */
static void
linux_fill_btrace_pt_config (struct btrace_data_pt_config *conf)
@@ -1081,7 +1081,7 @@ linux_fill_btrace_pt_config (struct btrace_data_pt_config *conf)
conf->cpu = btrace_this_cpu ();
}
-/* Read branch trace data in Intel(R) Processor Trace format for the thread
+/* Read branch trace data in Intel Processor Trace format for the thread
given by TINFO into BTRACE using the TYPE reading method. */
static enum btrace_error
@@ -1135,7 +1135,7 @@ linux_read_btrace (struct btrace_data *btrace,
return linux_read_bts (&btrace->variant.bts, tinfo, type);
case BTRACE_FORMAT_PT:
- /* We read btrace in Intel(R) Processor Trace format. */
+ /* We read btrace in Intel Processor Trace format. */
btrace->format = BTRACE_FORMAT_PT;
btrace->variant.pt.data = NULL;
btrace->variant.pt.size = 0;
diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
index c778756..7e91e6f 100644
--- a/gdb/nat/linux-btrace.h
+++ b/gdb/nat/linux-btrace.h
@@ -63,7 +63,8 @@ struct btrace_tinfo_bts
struct perf_event_buffer bts;
};
-/* Branch trace target information for Intel(R) Processor Trace. */
+/* Branch trace target information for Intel Processor Trace
+ tracing. */
struct btrace_tinfo_pt
{
/* The Linux perf_event configuration for collecting the branch trace. */
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index a0b8836..6ec981d 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -332,7 +332,7 @@ record_btrace_print_bts_conf (const struct btrace_config_bts *conf)
}
}
-/* Print an Intel(R) Processor Trace configuration. */
+/* Print an Intel Processor Trace configuration. */
static void
record_btrace_print_pt_conf (const struct btrace_config_pt *conf)
@@ -2886,7 +2886,7 @@ cmd_record_btrace_bts_start (char *args, int from_tty)
END_CATCH
}
-/* Start recording Intel(R) Processor Trace. */
+/* Start recording in Intel Processor Trace format. */
static void
cmd_record_btrace_pt_start (char *args, int from_tty)
@@ -3048,7 +3048,7 @@ This format may not be available on all processors."),
add_cmd ("pt", class_obscure, cmd_record_btrace_pt_start,
_("\
-Start branch trace recording in Intel(R) Processor Trace format.\n\n\
+Start branch trace recording in Intel Processor Trace format.\n\n\
This format may not be available on all processors."),
&record_btrace_cmdlist);
add_alias_cmd ("pt", "btrace pt", class_obscure, 1, &record_cmdlist);
--
1.9.3