perf tools: Add missing headers, mostly stdlib.h

[linux.git] / tools / perf / util / parse-regs-options.c

diff --git a/tools/perf/util/parse-regs-options.c b/tools/perf/util/parse-regs-options.c
index e6599e290f467cfd9db8cc8d3126c4f4be355c8e..ef46c284880854de3574120e37a99b638242c998 100644 (file)
--- a/tools/perf/util/parse-regs-options.c
+++ b/tools/perf/util/parse-regs-options.c
@@ -1,17 +1,22 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "perf.h"
-#include "util/util.h"
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
 #include "util/debug.h"
 #include <subcmd/parse-options.h>
+#include "util/perf_regs.h"
 #include "util/parse-regs-options.h"
 
-int
-parse_regs(const struct option *opt, const char *str, int unset)
+static int
+__parse_regs(const struct option *opt, const char *str, int unset, bool intr)
 {
        uint64_t *mode = (uint64_t *)opt->value;
        const struct sample_reg *r;
        char *s, *os = NULL, *p;
        int ret = -1;
+       uint64_t mask;
 
        if (unset)
                return 0;
@@ -22,6 +27,11 @@ parse_regs(const struct option *opt, const char *str, int unset)
        if (*mode)
                return -1;
 
+       if (intr)
+               mask = arch__intr_reg_mask();
+       else
+               mask = arch__user_reg_mask();
+
        /* str may be NULL in case no arg is passed to -I */
        if (str) {
                /* because str is read-only */
@@ -37,19 +47,20 @@ parse_regs(const struct option *opt, const char *str, int unset)
                        if (!strcmp(s, "?")) {
                                fprintf(stderr, "available registers: ");
                                for (r = sample_reg_masks; r->name; r++) {
-                                       fprintf(stderr, "%s ", r->name);
+                                       if (r->mask & mask)
+                                               fprintf(stderr, "%s ", r->name);
                                }
                                fputc('\n', stderr);
                                /* just printing available regs */
                                return -1;
                        }
                        for (r = sample_reg_masks; r->name; r++) {
-                               if (!strcasecmp(s, r->name))
+                               if ((r->mask & mask) && !strcasecmp(s, r->name))
                                        break;
                        }
                        if (!r->name) {
-                               ui__warning("unknown register %s,"
-                                           " check man page\n", s);
+                               ui__warning("Unknown register \"%s\", check man page or run \"perf record %s?\"\n",
+                                           s, intr ? "-I" : "--user-regs=");
                                goto error;
                        }
 
@@ -65,8 +76,20 @@ parse_regs(const struct option *opt, const char *str, int unset)
 
        /* default to all possible regs */
        if (*mode == 0)
-               *mode = PERF_REGS_MASK;
+               *mode = mask;
 error:
        free(os);
        return ret;
 }
+
+int
+parse_user_regs(const struct option *opt, const char *str, int unset)
+{
+       return __parse_regs(opt, str, unset, false);
+}
+
+int
+parse_intr_regs(const struct option *opt, const char *str, int unset)
+{
+       return __parse_regs(opt, str, unset, true);
+}