Mesa (master): freedreno/tools: check rnn parse status

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 751af16e1d4d21fdc26b65adfe84975fb2f8d699
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=751af16e1d4d21fdc26b65adfe84975fb2f8d699

Author: Rob Clark <robdclark at chromium.org>
Date:   Tue Jul 28 07:55:49 2020 -0700

freedreno/tools: check rnn parse status

Don't silently ignore issues.

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6107>

---

 src/freedreno/afuc/asm.c       | 3 +++
 src/freedreno/afuc/disasm.c    | 3 +++
 src/freedreno/decode/rnnutil.c | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/src/freedreno/afuc/asm.c b/src/freedreno/afuc/asm.c
index 321d06adfef..5b19c7fd9c0 100644
--- a/src/freedreno/afuc/asm.c
+++ b/src/freedreno/afuc/asm.c
@@ -21,6 +21,7 @@
  * SOFTWARE.
  */
 
+#include <err.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <unistd.h>
@@ -416,6 +417,8 @@ int main(int argc, char **argv)
 	ctx = rnndec_newcontext(db);
 
 	rnn_parsefile(db, "adreno.xml");
+	if (db->estatus)
+		errx(db->estatus, "failed to parse register database");
 	dom[0] = rnn_finddomain(db, name);
 	dom[1] = rnn_finddomain(db, "AXXX");
 	control_regs = rnn_finddomain(db, control_reg_name);
diff --git a/src/freedreno/afuc/disasm.c b/src/freedreno/afuc/disasm.c
index ea9f34cd97f..66e40c1d188 100644
--- a/src/freedreno/afuc/disasm.c
+++ b/src/freedreno/afuc/disasm.c
@@ -21,6 +21,7 @@
  * SOFTWARE.
  */
 
+#include <err.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <unistd.h>
@@ -815,6 +816,8 @@ int main(int argc, char **argv)
 	ctx->colors = colors ? &envy_def_colors : &envy_null_colors;
 
 	rnn_parsefile(db, "adreno.xml");
+	if (db->estatus)
+		errx(db->estatus, "failed to parse register database");
 	dom[0] = rnn_finddomain(db, variant);
 	dom[1] = rnn_finddomain(db, "AXXX");
 	control_regs = rnn_finddomain(db, control_reg_name);
diff --git a/src/freedreno/decode/rnnutil.c b/src/freedreno/decode/rnnutil.c
index 78915977de4..ae5fe826834 100644
--- a/src/freedreno/decode/rnnutil.c
+++ b/src/freedreno/decode/rnnutil.c
@@ -26,6 +26,7 @@
  *    Rob Clark <robclark at freedesktop.org>
  */
 
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -87,6 +88,8 @@ static void init(struct rnn *rnn, char *file, char *domain)
 	rnndec_varadd(rnn->vc, "chip", domain);
 	if (rnn->vc != rnn->vc_nocolor)
 		rnndec_varadd(rnn->vc_nocolor, "chip", domain);
+	if (rnn->db->estatus)
+		errx(rnn->db->estatus, "failed to parse register database");
 }
 
 void rnn_load_file(struct rnn *rnn, char *file, char *domain)