diff options
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 142 |
1 files changed, 99 insertions, 43 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index ebc07ba3..84187960 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -1343,14 +1343,15 @@ struct dwflpp dwfl_assert ("dwfl_addrmodule", mod == NULL); int n = dwfl_module_relocations (mod); dwfl_assert ("dwfl_module_relocations", n < 0); - if (n > 0) - { - int i = dwfl_module_relocate_address (mod, &address); - dwfl_assert ("dwfl_module_relocate_address", i < 0); - const char *modname = dwfl_module_info (mod, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); - dwfl_assert ("dwfl_module_info", modname == NULL); - const char *secname = dwfl_module_relocation_info (mod, i, NULL); + int i = dwfl_module_relocate_address (mod, &address); + dwfl_assert ("dwfl_module_relocate_address", i < 0); + const char *modname = dwfl_module_info (mod, NULL, NULL, NULL, + NULL, NULL, NULL, NULL); + dwfl_assert ("dwfl_module_info", modname == NULL); + const char *secname = dwfl_module_relocation_info (mod, i, NULL); + + if (n > 0 && !(n == 1 && secname == NULL)) + { dwfl_assert ("dwfl_module_relocation_info", secname == NULL); if (n > 1 || secname[0] != '\0') { @@ -2137,6 +2138,7 @@ struct dwarf_query : public base_query int line, Dwarf_Die *scope_die, Dwarf_Addr addr); + string get_blacklist_section(Dwarf_Addr addr); set<string> blacklisted_probes; set<string> blacklisted_return_probes; @@ -2551,6 +2553,34 @@ dwarf_query::blacklisted_p(const string& funcname, return false; } +string dwarf_query::get_blacklist_section(Dwarf_Addr addr) +{ + Dwarf_Addr baseaddr; + string blacklist_section; + Elf* elf = dwfl_module_getelf (dw.module, & baseaddr); + Dwarf_Addr offset = addr - baseaddr; + if (elf) + { + Elf_Scn* scn = 0; + size_t shstrndx; + dw.dwfl_assert ("getshstrndx", elf_getshstrndx (elf, &shstrndx)); + while ((scn = elf_nextscn (elf, scn)) != NULL) + { + GElf_Shdr shdr_mem; + GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); + if (! shdr) continue; // XXX error? + + GElf_Addr start = shdr->sh_addr; + GElf_Addr end = start + shdr->sh_size; + if (! (offset >= start && offset < end)) + continue; + + blacklist_section = elf_strptr (elf, shstrndx, shdr->sh_name); + break; + } + } + return blacklist_section; +} void @@ -2577,43 +2607,13 @@ dwarf_query::add_probe_point(const string& funcname, if (r_s) reloc_section = r_s; blacklist_section = reloc_section; + + if(reloc_section == "" && dwfl_module_relocations (dw.module) == 1) + blacklist_section = this->get_blacklist_section(addr); } else { - // This is not a relocatable module, so addr is all set. To - // find the section name, must do this the long way - scan - // through elf section headers. - Dwarf_Addr baseaddr; - Elf* elf = dwfl_module_getelf (dw.module, & baseaddr); - Dwarf_Addr offset = addr - baseaddr; - // NB: this offset does not end up as reloc_addr, since the latter is - // only computed differently if load-time relocation is needed. For - // non-relocatable modules, this is not the case. - if (elf) - { - // Iterate through section headers to find which one - // contains the given offset. - Elf_Scn* scn = 0; - size_t shstrndx; - dw.dwfl_assert ("getshstrndx", elf_getshstrndx (elf, &shstrndx)); - while ((scn = elf_nextscn (elf, scn)) != NULL) - { - GElf_Shdr shdr_mem; - GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); - if (! shdr) continue; // XXX error? - - // check for address inclusion - GElf_Addr start = shdr->sh_addr; - GElf_Addr end = start + shdr->sh_size; - if (! (offset >= start && offset < end)) - continue; - - // check for section name - blacklist_section = elf_strptr (elf, shstrndx, shdr->sh_name); - break; - } - } - + blacklist_section = this->get_blacklist_section(addr); reloc_section = ""; } @@ -4800,6 +4800,25 @@ procfs_var_expanding_copy_visitor::visit_target_symbol (target_symbol* e) throw semantic_error ("invalid target symbol for procfs probe, $value expected", e->tok); + if (e->components.size() > 0) + { + switch (e->components[0].first) + { + case target_symbol::comp_literal_array_index: + throw semantic_error("procfs target variable '$value' may not be used as array", + e->tok); + break; + case target_symbol::comp_struct_member: + throw semantic_error("procfs target variable '$value' may not be used as a structure", + e->tok); + break; + default: + throw semantic_error ("invalid use of procfs target variable '$value'", + e->tok); + break; + } + } + bool lvalue = is_active_lvalue(e); if (write_probe && lvalue) throw semantic_error("procfs $value variable is read-only in a procfs write probe", e->tok); @@ -5044,6 +5063,24 @@ mark_var_expanding_copy_visitor::visit_target_symbol (target_symbol* e) if (is_active_lvalue (e)) throw semantic_error("write to marker parameter not permitted", e->tok); + if (e->components.size() > 0) + { + switch (e->components[0].first) + { + case target_symbol::comp_literal_array_index: + throw semantic_error("marker argument may not be used as array", + e->tok); + break; + case target_symbol::comp_struct_member: + throw semantic_error("marker argument may not be used as a structure", + e->tok); + break; + default: + throw semantic_error ("invalid marker argument use", e->tok); + break; + } + } + // Remember that we've seen a target variable. target_symbol_seen = true; @@ -5100,7 +5137,7 @@ mark_derived_probe::mark_derived_probe (systemtap_session &s, this->locations.push_back (pp); if (cond) - add_condition (cond); + add_condition (cond); insert_condition_statement (); // expand the signature string @@ -5845,6 +5882,25 @@ perfmon_var_expanding_copy_visitor::visit_target_symbol (target_symbol *e) if (e->base_name != "$counter") throw semantic_error ("target variables not available to perfmon probes"); + if (e->components.size() > 0) + { + switch (e->components[0].first) + { + case target_symbol::comp_literal_array_index: + throw semantic_error("perfmon probe '$counter' variable may not be used as array", + e->tok); + break; + case target_symbol::comp_struct_member: + throw semantic_error("perfmon probe '$counter' variable may not be used as a structure", + e->tok); + break; + default: + throw semantic_error ("invalid use of perfmon probe '$counter' variable", + e->tok); + break; + } + } + ec->code = "THIS->__retvalue = _pfm_pmd_x[" + lex_cast<string>(counter_number) + "].reg_num;"; ec->code += "/* pure */"; |