[PATCH v9 05/13] perf expr: Use macros for operators

Ian Rogers
2021-09-23T07:47:18Z

No functional change, switch the operators to use macros so that
additional complexity for constants can be added in a later change.

Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/expr.y | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
index 68b122e59b3f..5535badeef0a 100644
--- a/tools/perf/util/expr.y
+++ b/tools/perf/util/expr.y
@@ -43,6 +43,12 @@ static void expr_error(double *final_val __maybe_unused,
pr_debug("%s\n", s);
}

+#define BINARY_LONG_OP(RESULT, OP, LHS, RHS) \
+ RESULT = (long)LHS OP (long)RHS;
+
+#define BINARY_OP(RESULT, OP, LHS, RHS) \
+ RESULT = LHS OP RHS;
+
%}
%%

@@ -81,14 +87,14 @@ expr: NUMBER

free($1);
}
- | expr '|' expr { $$ = (long)$1 | (long)$3; }
- | expr '&' expr { $$ = (long)$1 & (long)$3; }
- | expr '^' expr { $$ = (long)$1 ^ (long)$3; }
- | expr '<' expr { $$ = $1 < $3; }
- | expr '>' expr { $$ = $1 > $3; }
- | expr '+' expr { $$ = $1 + $3; }
- | expr '-' expr { $$ = $1 - $3; }
- | expr '*' expr { $$ = $1 * $3; }
+ | expr '|' expr { BINARY_LONG_OP($$, |, $1, $3); }
+ | expr '&' expr { BINARY_LONG_OP($$, &, $1, $3); }
+ | expr '^' expr { BINARY_LONG_OP($$, ^, $1, $3); }
+ | expr '<' expr { BINARY_OP($$, <, $1, $3); }
+ | expr '>' expr { BINARY_OP($$, >, $1, $3); }
+ | expr '+' expr { BINARY_OP($$, +, $1, $3); }
+ | expr '-' expr { BINARY_OP($$, -, $1, $3); }
+ | expr '*' expr { BINARY_OP($$, *, $1, $3); }
| expr '/' expr { if ($3 == 0) {
pr_debug("division by zero\n");
YYABORT;
--
2.33.0.464.g1972c5931b-goog