projects / packages / gdb.git / blame
| Commit | Line | Data |
|---|---|---|
| a7de96f0 PS |
1 | http://sourceware.org/ml/gdb-cvs/2012-07/msg00124.html |
| 2 | ||
| 3 | ### src/gdb/ChangeLog 2012/07/18 16:12:15 1.14474 | |
| 4 | ### src/gdb/ChangeLog 2012/07/18 16:20:36 1.14475 | |
| 5 | ## -1,5 +1,10 @@ | |
| 6 | 2012-07-18 Sergio Durigan Junior <sergiodj@redhat.com> | |
| 7 | ||
| 8 | + * probe.c (probe_safe_evaluate_at_pc): Rename variable `n_probes'. | |
| 9 | + * stap-probe.c (compile_probe_arg): Likewise. | |
| 10 | + | |
| 11 | +2012-07-18 Sergio Durigan Junior <sergiodj@redhat.com> | |
| 12 | + | |
| 13 | * elfread.c (elf_get_probe_argument_count): Remove `objfile' argument. | |
| 14 | (elf_compile_to_ax): Likewise. | |
| 15 | * infrun.c (insert_exception_resume_from_probe): Likewise. | |
| 16 | --- src/gdb/probe.c 2012/07/18 16:12:17 1.4 | |
| 17 | +++ src/gdb/probe.c 2012/07/18 16:20:43 1.5 | |
| 18 | @@ -637,7 +637,7 @@ | |
| 19 | { | |
| 20 | struct probe *probe; | |
| 21 | const struct sym_probe_fns *probe_fns; | |
| 22 | - unsigned n_probes; | |
| 23 | + unsigned n_args; | |
| 24 | ||
| 25 | probe = find_probe_by_pc (get_frame_pc (frame)); | |
| 26 | if (!probe) | |
| 27 | @@ -648,9 +648,9 @@ | |
| 28 | gdb_assert (probe->objfile->sf->sym_probe_fns != NULL); | |
| 29 | ||
| 30 | probe_fns = probe->objfile->sf->sym_probe_fns; | |
| 31 | - n_probes = probe_fns->sym_get_probe_argument_count (probe); | |
| 32 | + n_args = probe_fns->sym_get_probe_argument_count (probe); | |
| 33 | ||
| 34 | - if (n >= n_probes) | |
| 35 | + if (n >= n_args) | |
| 36 | return NULL; | |
| 37 | ||
| 38 | return probe_fns->sym_evaluate_probe_argument (probe, n); | |
| 39 | --- src/gdb/stap-probe.c 2012/07/18 16:12:17 1.5 | |
| 40 | +++ src/gdb/stap-probe.c 2012/07/18 16:20:43 1.6 | |
| 41 | @@ -1160,7 +1160,7 @@ | |
| 42 | int sel = (int) (uintptr_t) data; | |
| 43 | struct probe *pc_probe; | |
| 44 | const struct sym_probe_fns *pc_probe_fns; | |
| 45 | - int n_probes; | |
| 46 | + int n_args; | |
| 47 | ||
| 48 | /* SEL == -1 means "_probe_argc". */ | |
| 49 | gdb_assert (sel >= -1); | |
| 50 | @@ -1175,20 +1175,20 @@ | |
| 51 | ||
| 52 | pc_probe_fns = pc_probe->objfile->sf->sym_probe_fns; | |
| 53 | ||
| 54 | - n_probes = pc_probe_fns->sym_get_probe_argument_count (pc_probe); | |
| 55 | + n_args = pc_probe_fns->sym_get_probe_argument_count (pc_probe); | |
| 56 | ||
| 57 | if (sel == -1) | |
| 58 | { | |
| 59 | value->kind = axs_rvalue; | |
| 60 | value->type = builtin_type (expr->gdbarch)->builtin_int; | |
| 61 | - ax_const_l (expr, n_probes); | |
| 62 | + ax_const_l (expr, n_args); | |
| 63 | return; | |
| 64 | } | |
| 65 | ||
| 66 | gdb_assert (sel >= 0); | |
| 67 | - if (sel >= n_probes) | |
| 68 | + if (sel >= n_args) | |
| 69 | error (_("Invalid probe argument %d -- probe has %d arguments available"), | |
| 70 | - sel, n_probes); | |
| 71 | + sel, n_args); | |
| 72 | ||
| 73 | pc_probe_fns->sym_compile_to_ax (pc_probe, expr, value, sel); | |
| 74 | } |