lkml.org 
[lkml]   [2016]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 1/7] perf: Define macro for normalized arch names
    Date
    Define macro for each normalized arch name and use them instead
    of using arch name as string.

    Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
    ---
    Changes in v5:
    - No changes.

    tools/perf/arch/common.c | 36 ++++++++++++++++++------------------
    tools/perf/arch/common.h | 11 +++++++++++
    tools/perf/util/unwind-libunwind.c | 4 ++--
    3 files changed, 31 insertions(+), 20 deletions(-)

    diff --git a/tools/perf/arch/common.c b/tools/perf/arch/common.c
    index 886dd2a..f763666 100644
    --- a/tools/perf/arch/common.c
    +++ b/tools/perf/arch/common.c
    @@ -123,25 +123,25 @@ static int lookup_triplets(const char *const *triplets, const char *name)
    const char *normalize_arch(char *arch)
    {
    if (!strcmp(arch, "x86_64"))
    - return "x86";
    + return NORM_X86;
    if (arch[0] == 'i' && arch[2] == '8' && arch[3] == '6')
    - return "x86";
    + return NORM_X86;
    if (!strcmp(arch, "sun4u") || !strncmp(arch, "sparc", 5))
    - return "sparc";
    + return NORM_SPARC;
    if (!strcmp(arch, "aarch64") || !strcmp(arch, "arm64"))
    - return "arm64";
    + return NORM_ARM64;
    if (!strncmp(arch, "arm", 3) || !strcmp(arch, "sa110"))
    - return "arm";
    + return NORM_ARM;
    if (!strncmp(arch, "s390", 4))
    - return "s390";
    + return NORM_S390;
    if (!strncmp(arch, "parisc", 6))
    - return "parisc";
    + return NORM_PARISC;
    if (!strncmp(arch, "powerpc", 7) || !strncmp(arch, "ppc", 3))
    - return "powerpc";
    + return NORM_POWERPC;
    if (!strncmp(arch, "mips", 4))
    - return "mips";
    + return NORM_MIPS;
    if (!strncmp(arch, "sh", 2) && isdigit(arch[2]))
    - return "sh";
    + return NORM_SH;

    return arch;
    }
    @@ -181,21 +181,21 @@ static int perf_env__lookup_binutils_path(struct perf_env *env,
    zfree(&buf);
    }

    - if (!strcmp(arch, "arm"))
    + if (!strcmp(arch, NORM_ARM))
    path_list = arm_triplets;
    - else if (!strcmp(arch, "arm64"))
    + else if (!strcmp(arch, NORM_ARM64))
    path_list = arm64_triplets;
    - else if (!strcmp(arch, "powerpc"))
    + else if (!strcmp(arch, NORM_POWERPC))
    path_list = powerpc_triplets;
    - else if (!strcmp(arch, "sh"))
    + else if (!strcmp(arch, NORM_SH))
    path_list = sh_triplets;
    - else if (!strcmp(arch, "s390"))
    + else if (!strcmp(arch, NORM_S390))
    path_list = s390_triplets;
    - else if (!strcmp(arch, "sparc"))
    + else if (!strcmp(arch, NORM_SPARC))
    path_list = sparc_triplets;
    - else if (!strcmp(arch, "x86"))
    + else if (!strcmp(arch, NORM_X86))
    path_list = x86_triplets;
    - else if (!strcmp(arch, "mips"))
    + else if (!strcmp(arch, NORM_MIPS))
    path_list = mips_triplets;
    else {
    ui__error("binutils for %s not supported.\n", arch);
    diff --git a/tools/perf/arch/common.h b/tools/perf/arch/common.h
    index 6b01c73..14ca8ca 100644
    --- a/tools/perf/arch/common.h
    +++ b/tools/perf/arch/common.h
    @@ -5,6 +5,17 @@

    extern const char *objdump_path;

    +/* Macro for normalized arch names */
    +#define NORM_X86 "x86"
    +#define NORM_SPARC "sparc"
    +#define NORM_ARM64 "arm64"
    +#define NORM_ARM "arm"
    +#define NORM_S390 "s390"
    +#define NORM_PARISC "parisc"
    +#define NORM_POWERPC "powerpc"
    +#define NORM_MIPS "mips"
    +#define NORM_SH "sh"
    +
    int perf_env__lookup_objdump(struct perf_env *env);
    const char *normalize_arch(char *arch);

    diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
    index 6d542a4..6199102 100644
    --- a/tools/perf/util/unwind-libunwind.c
    +++ b/tools/perf/util/unwind-libunwind.c
    @@ -40,10 +40,10 @@ int unwind__prepare_access(struct thread *thread, struct map *map,

    arch = normalize_arch(thread->mg->machine->env->arch);

    - if (!strcmp(arch, "x86")) {
    + if (!strcmp(arch, NORM_X86)) {
    if (dso_type != DSO__TYPE_64BIT)
    ops = x86_32_unwind_libunwind_ops;
    - } else if (!strcmp(arch, "arm64") || !strcmp(arch, "arm")) {
    + } else if (!strcmp(arch, NORM_ARM64) || !strcmp(arch, NORM_ARM)) {
    if (dso_type == DSO__TYPE_64BIT)
    ops = arm64_unwind_libunwind_ops;
    }
    --
    2.5.5
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:3.585 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site