diff options
| -rw-r--r-- | gdb/ChangeLog | 20 | ||||
| -rw-r--r-- | gdb/common/linux-btrace.c | 68 |
2 files changed, 46 insertions, 42 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0e8820eb7ff..25962917a10 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2013-05-06 Mike Frysinger <vapier@gentoo.org> + + * common/linux-btrace.c (intel_supports_btrace): Fix indentation. + 2013-05-06 Doug Evans <dje@google.com> * psympriv.h (struct partial_symtab): Augment comment for member @@ -1148,7 +1152,7 @@ (_initialize_ctf): New. * tracepoint.c (get_tracepoint_number): New (get_uploaded_tsv): Remove 'static'. - (struct traceframe_info, trace_regblock_size): Move it to ... + (struct traceframe_info, trace_regblock_size): Move it to ... * tracepoint.h: ... here. (get_tracepoint_number): Declare it. (get_uploaded_tsv): Declare it. @@ -2550,11 +2554,11 @@ 2013-03-12 Paul Hilfinger <hilfingr@adacore.com> - * ada-lex.l (rules): Only recognize 'thread' as a - delimiter when followed by numerals, as for c-exp.y. - Use new rewind_to_char function to rewind the input for - expression-delimiting tokens. - (rewind_to_char): New function. + * ada-lex.l (rules): Only recognize 'thread' as a + delimiter when followed by numerals, as for c-exp.y. + Use new rewind_to_char function to rewind the input for + expression-delimiting tokens. + (rewind_to_char): New function. 2013-03-11 Pedro Alves <palves@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> @@ -3544,8 +3548,8 @@ Pedro Alves <palves@redhat.com> * tracepoint.c (tfile_trace_find): For tfind - pc/tp/range/outside, look for the next trace frame instead of - always starting from frame 0. + pc/tp/range/outside, look for the next trace frame instead of + always starting from frame 0. 2013-02-26 Anthony Green <green@moxielogic.com> diff --git a/gdb/common/linux-btrace.c b/gdb/common/linux-btrace.c index ed0cb2445f7..d3c8705d769 100644 --- a/gdb/common/linux-btrace.c +++ b/gdb/common/linux-btrace.c @@ -340,40 +340,40 @@ static int intel_supports_btrace (void) { #if defined __i386__ || defined __x86_64__ - unsigned int cpuid, model, family; - - __asm__ __volatile__ ("movl $1, %%eax;" - "cpuid;" - : "=a" (cpuid) - :: "%ebx", "%ecx", "%edx"); - - family = (cpuid >> 8) & 0xf; - model = (cpuid >> 4) & 0xf; - - switch (family) - { - case 0x6: - model += (cpuid >> 12) & 0xf0; - - switch (model) - { - case 0x1a: /* Nehalem */ - case 0x1f: - case 0x1e: - case 0x2e: - case 0x25: /* Westmere */ - case 0x2c: - case 0x2f: - case 0x2a: /* Sandy Bridge */ - case 0x2d: - case 0x3a: /* Ivy Bridge */ - - /* AAJ122: LBR, BTM, or BTS records may have incorrect branch - "from" information afer an EIST transition, T-states, C1E, or - Adaptive Thermal Throttling. */ - return 0; - } - } + unsigned int cpuid, model, family; + + __asm__ __volatile__ ("movl $1, %%eax;" + "cpuid;" + : "=a" (cpuid) + :: "%ebx", "%ecx", "%edx"); + + family = (cpuid >> 8) & 0xf; + model = (cpuid >> 4) & 0xf; + + switch (family) + { + case 0x6: + model += (cpuid >> 12) & 0xf0; + + switch (model) + { + case 0x1a: /* Nehalem */ + case 0x1f: + case 0x1e: + case 0x2e: + case 0x25: /* Westmere */ + case 0x2c: + case 0x2f: + case 0x2a: /* Sandy Bridge */ + case 0x2d: + case 0x3a: /* Ivy Bridge */ + + /* AAJ122: LBR, BTM, or BTS records may have incorrect branch + "from" information afer an EIST transition, T-states, C1E, or + Adaptive Thermal Throttling. */ + return 0; + } + } return 1; |