Share rseq definitions between tests

rr-debugger · Aug 1, 2024 · 75b9ed3 · 75b9ed3
1 parent ce3d9e4
commit 75b9ed3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 30 deletions.
diff --git a/src/test/rseq.c b/src/test/rseq.c
@@ -2,21 +2,6 @@
 
 #include "util.h"
 
-struct rseq {
-  uint32_t cpu_id_start;
-  uint32_t cpu_id;
-  uint64_t rseq_cs;
-  uint32_t flags;
-} __attribute__((aligned(32)));
-
-struct rseq_cs {
-  uint32_t version;
-  uint32_t flags;
-  uint64_t start_ip;
-  uint64_t post_commit_offset;
-  uint64_t abort_ip;
-} __attribute__((aligned(32)));
-
 static struct rseq* rs_ptr;
 static struct rseq_cs rs_cs;
 

diff --git a/src/test/rseq_syscallbuf.c b/src/test/rseq_syscallbuf.c
@@ -2,21 +2,6 @@
 
 #include "util.h"
 
-struct rseq {
-  uint32_t cpu_id_start;
-  uint32_t cpu_id;
-  uint64_t rseq_cs;
-  uint32_t flags;
-} __attribute__((aligned(32)));
-
-struct rseq_cs {
-  uint32_t version;
-  uint32_t flags;
-  uint64_t start_ip;
-  uint64_t post_commit_offset;
-  uint64_t abort_ip;
-} __attribute__((aligned(32)));
-
 static struct rseq* rs_ptr;
 static struct rseq_cs rs_cs;
 

diff --git a/src/test/util.h b/src/test/util.h
@@ -585,4 +585,19 @@ struct open_how {
 #define MREMAP_DONTUNMAP 4
 #endif
 
+struct rseq {
+  uint32_t cpu_id_start;
+  uint32_t cpu_id;
+  uint64_t rseq_cs;
+  uint32_t flags;
+} __attribute__((aligned(32)));
+
+struct rseq_cs {
+  uint32_t version;
+  uint32_t flags;
+  uint64_t start_ip;
+  uint64_t post_commit_offset;
+  uint64_t abort_ip;
+} __attribute__((aligned(32)));
+
 #endif /* RRUTIL_H */