1 files changed, 34 insertions, 11 deletions

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 5b3a0ef4e232..c7fc18a33d54 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -593,17 +593,27 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx,
 static int config_term(struct perf_event_attr *attr,
                        struct parse_events__term *term)
 {
-        switch (term->type) {
+#define CHECK_TYPE_VAL(type)                                    \
+do {                                                            \
+        if (PARSE_EVENTS__TERM_TYPE_ ## type != term->type_val) \
+                return -EINVAL;                                 \
+} while (0)
+
+        switch (term->type_term) {
         case PARSE_EVENTS__TERM_TYPE_CONFIG:
+                CHECK_TYPE_VAL(NUM);
                 attr->config = term->val.num;
                 break;
         case PARSE_EVENTS__TERM_TYPE_CONFIG1:
+                CHECK_TYPE_VAL(NUM);
                 attr->config1 = term->val.num;
                 break;
         case PARSE_EVENTS__TERM_TYPE_CONFIG2:
+                CHECK_TYPE_VAL(NUM);
                 attr->config2 = term->val.num;
                 break;
         case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
+                CHECK_TYPE_VAL(NUM);
                 attr->sample_period = term->val.num;
                 break;
         case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE:
@@ -615,7 +625,9 @@ static int config_term(struct perf_event_attr *attr,
         default:
                 return -EINVAL;
         }
+
         return 0;
+#undef CHECK_TYPE_VAL
 }
 
 static int config_attr(struct perf_event_attr *attr,
@@ -1015,11 +1027,12 @@ void print_events(const char *event_glob)
 
 int parse_events__is_hardcoded_term(struct parse_events__term *term)
 {
-        return term->type <= PARSE_EVENTS__TERM_TYPE_HARDCODED_MAX;
+        return term->type_term != PARSE_EVENTS__TERM_TYPE_USER;
 }
 
-int parse_events__new_term(struct parse_events__term **_term, int type,
-                           char *config, char *str, long num)
+static int new_term(struct parse_events__term **_term, int type_val,
+                    int type_term, char *config,
+                    char *str, long num)
 {
         struct parse_events__term *term;
 
@@ -1028,15 +1041,11 @@ int parse_events__new_term(struct parse_events__term **_term, int type,
                 return -ENOMEM;
 
         INIT_LIST_HEAD(&term->list);
-        term->type = type;
+        term->type_val  = type_val;
+        term->type_term = type_term;
         term->config = config;
 
-        switch (type) {
-        case PARSE_EVENTS__TERM_TYPE_CONFIG:
-        case PARSE_EVENTS__TERM_TYPE_CONFIG1:
-        case PARSE_EVENTS__TERM_TYPE_CONFIG2:
-        case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
-        case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE:
+        switch (type_val) {
         case PARSE_EVENTS__TERM_TYPE_NUM:
                 term->val.num = num;
                 break;
@@ -1051,6 +1060,20 @@ int parse_events__new_term(struct parse_events__term **_term, int type,
         return 0;
 }
 
+int parse_events__term_num(struct parse_events__term **term,
+                           int type_term, char *config, long num)
+{
+        return new_term(term, PARSE_EVENTS__TERM_TYPE_NUM, type_term,
+                        config, NULL, num);
+}
+
+int parse_events__term_str(struct parse_events__term **term,
+                           int type_term, char *config, char *str)
+{
+        return new_term(term, PARSE_EVENTS__TERM_TYPE_STR, type_term,
+                        config, str, 0);
+}
+
 void parse_events__free_terms(struct list_head *terms)
 {
         struct parse_events__term *term, *h;