[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RISU 7/9] Compute reginfo_size based on the reginfo
From: |
Richard Henderson |
Subject: |
[RISU 7/9] Compute reginfo_size based on the reginfo |
Date: |
Wed, 13 May 2020 11:09:51 -0700 |
This will allow dumping of SVE frames without having
to know the SVE vector length beforehand.
Signed-off-by: Richard Henderson <address@hidden>
---
risu.h | 2 +-
reginfo.c | 7 ++++---
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, 11 insertions(+), 10 deletions(-)
diff --git a/risu.h b/risu.h
index 3fc198f..0ae7fa9 100644
--- a/risu.h
+++ b/risu.h
@@ -139,6 +139,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 a4f7da6..1727867 100644
--- a/reginfo.c
+++ b/reginfo.c
@@ -40,7 +40,7 @@ int send_register_info(write_fn write_fn, void *uc)
case OP_TESTEND:
case OP_COMPARE:
default:
- header.size = reginfo_size();
+ header.size = reginfo_size(&ri);
extra = &ri;
break;
@@ -121,8 +121,9 @@ int recv_and_compare_register_info(read_fn read_fn,
/* Do a simple register compare on (a) explicit request
* (b) end of test (c) a non-risuop UNDEF
*/
- if (header.size != reginfo_size() ||
- read_fn(&apprentice_ri, header.size)) {
+ if (header.size > sizeof(struct reginfo) ||
+ read_fn(&apprentice_ri, header.size) ||
+ header.size != reginfo_size(&apprentice_ri)) {
packet_mismatch = 1;
resp = 2;
} else if (!reginfo_is_eq(&master_ri, &apprentice_ri)) {
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
- [RISU 1/9] Use bool for tracing variables, (continued)
- [RISU 1/9] Use bool for tracing variables, Richard Henderson, 2020/05/13
- [RISU 2/9] Unify master_fd and apprentice_fd to comm_fd, Richard Henderson, 2020/05/13
- [RISU 3/9] Hoist trace file opening, Richard Henderson, 2020/05/13
- [RISU 6/9] Add magic and size to the trace header, Richard Henderson, 2020/05/13
- [RISU 4/9] Adjust tracefile open for write, Richard Henderson, 2020/05/13
- [RISU 8/9] aarch64: Reorg sve reginfo to save space, Richard Henderson, 2020/05/13
- [RISU 7/9] Compute reginfo_size based on the reginfo,
Richard Henderson <=
- [RISU 5/9] Use EXIT_FAILURE, EXIT_SUCCESS, Richard Henderson, 2020/05/13
- [RISU 9/9] Add --dump option to inspect trace files, Richard Henderson, 2020/05/13
- Re: [RISU 0/9] risu cleanups and improvements, Peter Maydell, 2020/05/18