From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex.bennee@linaro.org
Subject: [RISU v2 15/17] Compute reginfo_size based on the reginfo
Date: Mon, 18 May 2020 19:53:53 -0700 [thread overview]
Message-ID: <20200519025355.4420-16-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200519025355.4420-1-richard.henderson@linaro.org>
This will allow dumping of SVE frames without having
to know the SVE vector length beforehand.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
risu.h | 2 +-
reginfo.c | 6 +++---
risu_reginfo_aarch64.c | 4 ++--
risu_reginfo_arm.c | 2 +-
risu_reginfo_i386.c | 2 +-
risu_reginfo_m68k.c | 2 +-
risu_reginfo_ppc64.c | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/risu.h b/risu.h
index eeb6775..054cef7 100644
--- a/risu.h
+++ b/risu.h
@@ -155,6 +155,6 @@ int reginfo_dump(struct reginfo *ri, FILE * f);
int reginfo_dump_mismatch(struct reginfo *m, struct reginfo *a, FILE *f);
/* return size of reginfo */
-const int reginfo_size(void);
+int reginfo_size(struct reginfo *ri);
#endif /* RISU_H */
diff --git a/reginfo.c b/reginfo.c
index f187d9c..411c2a6 100644
--- a/reginfo.c
+++ b/reginfo.c
@@ -38,7 +38,7 @@ RisuResult send_register_info(void *uc)
case OP_TESTEND:
case OP_COMPARE:
case OP_SIGILL:
- header.size = reginfo_size();
+ header.size = reginfo_size(&ri);
extra = &ri;
break;
@@ -109,7 +109,7 @@ RisuResult recv_and_compare_register_info(void *uc)
case OP_TESTEND:
case OP_COMPARE:
case OP_SIGILL:
- extra_size = reginfo_size();
+ extra_size = reginfo_size(&master_ri);
break;
case OP_SETMEMBLOCK:
case OP_GETMEMBLOCK:
@@ -217,7 +217,7 @@ void report_mismatch_header(void)
case OP_COMPARE:
case OP_SIGILL:
kind = "reginfo";
- a_sz = reginfo_size();
+ a_sz = reginfo_size(&apprentice_ri);
break;
case OP_SETMEMBLOCK:
case OP_GETMEMBLOCK:
diff --git a/risu_reginfo_aarch64.c b/risu_reginfo_aarch64.c
index 028c690..7044648 100644
--- a/risu_reginfo_aarch64.c
+++ b/risu_reginfo_aarch64.c
@@ -69,7 +69,7 @@ void process_arch_opt(int opt, const char *arg)
#endif
}
-const int reginfo_size(void)
+int reginfo_size(struct reginfo *ri)
{
int size = offsetof(struct reginfo, simd.end);
#ifdef SVE_MAGIC
@@ -194,7 +194,7 @@ void reginfo_init(struct reginfo *ri, ucontext_t *uc)
/* reginfo_is_eq: compare the reginfo structs, returns nonzero if equal */
int reginfo_is_eq(struct reginfo *r1, struct reginfo *r2)
{
- return memcmp(r1, r2, reginfo_size()) == 0;
+ return memcmp(r1, r2, reginfo_size(r1)) == 0;
}
#ifdef SVE_MAGIC
diff --git a/risu_reginfo_arm.c b/risu_reginfo_arm.c
index 3662f12..3832e27 100644
--- a/risu_reginfo_arm.c
+++ b/risu_reginfo_arm.c
@@ -36,7 +36,7 @@ void process_arch_opt(int opt, const char *arg)
abort();
}
-const int reginfo_size(void)
+int reginfo_size(struct reginfo *ri)
{
return sizeof(struct reginfo);
}
diff --git a/risu_reginfo_i386.c b/risu_reginfo_i386.c
index 60fc239..902d33e 100644
--- a/risu_reginfo_i386.c
+++ b/risu_reginfo_i386.c
@@ -74,7 +74,7 @@ void process_arch_opt(int opt, const char *arg)
}
}
-const int reginfo_size(void)
+int reginfo_size(struct reginfo *ri)
{
return sizeof(struct reginfo);
}
diff --git a/risu_reginfo_m68k.c b/risu_reginfo_m68k.c
index 32b28c8..361f172 100644
--- a/risu_reginfo_m68k.c
+++ b/risu_reginfo_m68k.c
@@ -23,7 +23,7 @@ void process_arch_opt(int opt, const char *arg)
abort();
}
-const int reginfo_size(void)
+int reginfo_size(struct reginfo *ri)
{
return sizeof(struct reginfo);
}
diff --git a/risu_reginfo_ppc64.c b/risu_reginfo_ppc64.c
index 071c951..c86313c 100644
--- a/risu_reginfo_ppc64.c
+++ b/risu_reginfo_ppc64.c
@@ -32,7 +32,7 @@ void process_arch_opt(int opt, const char *arg)
abort();
}
-const int reginfo_size(void)
+int reginfo_size(struct reginfo *ri)
{
return sizeof(struct reginfo);
}
--
2.20.1
next prev parent reply other threads:[~2020-05-19 2:59 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 2:53 [RISU v2 00/17] risu cleanups and improvements Richard Henderson
2020-05-19 2:53 ` [RISU v2 01/17] Use bool for tracing variables Richard Henderson
2020-05-19 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 02/17] Unify master_fd and apprentice_fd to comm_fd Richard Henderson
2020-05-19 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 03/17] Hoist trace file opening Richard Henderson
2020-05-19 16:50 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 04/17] Adjust tracefile open for write Richard Henderson
2020-05-19 18:24 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 05/17] Use EXIT_FAILURE, EXIT_SUCCESS Richard Henderson
2020-05-19 18:24 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 06/17] Make some risu.c symbols static Richard Henderson
2020-05-19 18:25 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 07/17] Add enum RisuOp Richard Henderson
2020-05-19 18:39 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 08/17] Add enum RisuResult Richard Henderson
2020-05-19 19:06 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 09/17] Unify i/o functions and use RisuResult Richard Henderson
2020-05-20 15:50 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 10/17] Pass non-OK result back through siglongjmp Richard Henderson
2020-05-20 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 11/17] Always write for --master Richard Henderson
2020-05-20 16:12 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 12/17] Simplify syncing with master Richard Henderson
2020-05-20 16:14 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 13/17] Split RES_MISMATCH for registers and memory Richard Henderson
2020-05-20 16:25 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 14/17] Add magic and size to the trace header Richard Henderson
2020-05-19 21:16 ` Richard Henderson
2020-05-20 16:59 ` Alex Bennée
2020-05-19 2:53 ` Richard Henderson [this message]
2020-05-20 17:30 ` [RISU v2 15/17] Compute reginfo_size based on the reginfo Alex Bennée
2020-05-19 2:53 ` [RISU v2 16/17] aarch64: Reorg sve reginfo to save space Richard Henderson
2020-05-20 18:43 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 17/17] Add --dump option to inspect trace files Richard Henderson
2020-05-20 17:49 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200519025355.4420-16-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).