rseq/arch/aarch64.h \
rseq/arch/arm/bits.h \
rseq/arch/arm.h \
+ rseq/arch/generic/common.h \
rseq/arch/generic/thread-pointer.h \
rseq/arch/mips/bits.h \
rseq/arch/mips.h \
#define RSEQ_ASM_TMP_REG "x15"
#define RSEQ_ASM_TMP_REG_2 "x14"
-/* Only used in RSEQ_ASM_DEFINE_TABLE. */
-#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, start_ip, \
- post_commit_offset, abort_ip) \
- " .pushsection __rseq_cs, \"aw\"\n" \
- " .balign 32\n" \
- __rseq_str(label) ":\n" \
- " " RSEQ_ASM_U32(__rseq_str(version)) "\n" \
- " " RSEQ_ASM_U32(__rseq_str(flags)) "\n" \
- " " RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n" \
- " " RSEQ_ASM_U64_PTR(__rseq_str(post_commit_offset)) "\n" \
- " " RSEQ_ASM_U64_PTR(__rseq_str(abort_ip)) "\n" \
- " .popsection\n\t" \
- " .pushsection __rseq_cs_ptr_array, \"aw\"\n" \
- " " RSEQ_ASM_U64_PTR(__rseq_str(label) "b") "\n" \
- " .popsection\n"
-
-/*
- * Define an rseq critical section structure of version 0 with no flags.
- *
- * @label:
- * Local label for the beginning of the critical section descriptor
- * structure.
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @post_commit_ip:
- * Pointer to the instruction after the last instruction of the sequence of
- * consecutive assembly instructions.
- * @abort_ip:
- * Pointer to the instruction where to move the execution flow in case of
- * abort of the sequence of consecutive assembly instructions.
- */
-#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
- __RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
- (post_commit_ip) - (start_ip), abort_ip)
-
-/*
- * Define the @exit_ip pointer as an exit point for the sequence of consecutive
- * assembly instructions at @start_ip.
- *
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @exit_ip:
- * Pointer to an exit point instruction.
- *
- * Exit points of a rseq critical section consist of all instructions outside
- * of the critical section where a critical section can either branch to or
- * reach through the normal course of its execution. The abort IP and the
- * post-commit IP are already part of the __rseq_cs section and should not be
- * explicitly defined as additional exit points. Knowing all exit points is
- * useful to assist debuggers stepping over the critical section.
- */
-#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
- " .pushsection __rseq_exit_point_array, \"aw\"\n" \
- " " RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n" \
- " " RSEQ_ASM_U64_PTR(__rseq_str(exit_ip)) "\n" \
- " .popsection\n"
+/* Common architecture support macros. */
+#include "rseq/arch/generic/common.h"
/*
* Define a critical section abort handler.
#define RSEQ_ASM_U32(x) ".word " x
-/* Only used in RSEQ_ASM_DEFINE_TABLE. */
-#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, start_ip, \
- post_commit_offset, abort_ip) \
- ".pushsection __rseq_cs, \"aw\"\n\t" \
- ".balign 32\n\t" \
- __rseq_str(label) ":\n\t" \
- RSEQ_ASM_U32(__rseq_str(version)) "\n\t" \
- RSEQ_ASM_U32(__rseq_str(flags)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(post_commit_offset)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(abort_ip)) "\n\t" \
- ".popsection\n\t" \
- ".pushsection __rseq_cs_ptr_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(label) "b") "\n\t" \
- ".popsection\n\t"
-
-/*
- * Define an rseq critical section structure of version 0 with no flags.
- *
- * @label:
- * Local label for the beginning of the critical section descriptor
- * structure.
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @post_commit_ip:
- * Pointer to the instruction after the last instruction of the sequence of
- * consecutive assembly instructions.
- * @abort_ip:
- * Pointer to the instruction where to move the execution flow in case of
- * abort of the sequence of consecutive assembly instructions.
- */
-#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
- __RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
- (post_commit_ip) - (start_ip), abort_ip)
-
-/*
- * Define the @exit_ip pointer as an exit point for the sequence of consecutive
- * assembly instructions at @start_ip.
- *
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @exit_ip:
- * Pointer to an exit point instruction.
- *
- * Exit points of a rseq critical section consist of all instructions outside
- * of the critical section where a critical section can either branch to or
- * reach through the normal course of its execution. The abort IP and the
- * post-commit IP are already part of the __rseq_cs section and should not be
- * explicitly defined as additional exit points. Knowing all exit points is
- * useful to assist debuggers stepping over the critical section.
- */
-#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
- ".pushsection __rseq_exit_point_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(exit_ip)) "\n\t" \
- ".popsection\n\t"
+/* Common architecture support macros. */
+#include "rseq/arch/generic/common.h"
/*
* Store the address of the critical section descriptor structure at
--- /dev/null
+/* SPDX-License-Identifier: MIT */
+/* SPDX-FileCopyrightText: 2024 Mathieu Desnoyers <mathieu.desnoyers@efficios.com> */
+
+/*
+ * rseq/arch/generic/common.h: Common architecture support macros.
+ */
+
+#ifndef _RSEQ_GENERIC_COMMON_H
+#define _RSEQ_GENERIC_COMMON_H
+
+/* Only used in RSEQ_ASM_DEFINE_TABLE. */
+#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, \
+ start_ip, post_commit_offset, abort_ip) \
+ ".pushsection __rseq_cs, \"aw\"\n\t" \
+ ".balign 32\n\t" \
+ __rseq_str(label) ":\n\t" \
+ RSEQ_ASM_U32(__rseq_str(version)) "\n\t" \
+ RSEQ_ASM_U32(__rseq_str(flags)) "\n\t" \
+ RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
+ RSEQ_ASM_U64_PTR(__rseq_str(post_commit_offset)) "\n\t" \
+ RSEQ_ASM_U64_PTR(__rseq_str(abort_ip)) "\n\t" \
+ ".popsection\n\t" \
+ ".pushsection __rseq_cs_ptr_array, \"aw\"\n\t" \
+ RSEQ_ASM_U64_PTR(__rseq_str(label) "b") "\n\t" \
+ ".popsection\n\t"
+
+/*
+ * Define an rseq critical section structure of version 0 with no flags.
+ *
+ * @label:
+ * Local label for the beginning of the critical section descriptor
+ * structure.
+ * @start_ip:
+ * Pointer to the first instruction of the sequence of consecutive assembly
+ * instructions.
+ * @post_commit_ip:
+ * Pointer to the instruction after the last instruction of the sequence of
+ * consecutive assembly instructions.
+ * @abort_ip:
+ * Pointer to the instruction where to move the execution flow in case of
+ * abort of the sequence of consecutive assembly instructions.
+ */
+#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
+ __RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
+ (post_commit_ip) - (start_ip), abort_ip)
+
+/*
+ * Define the @exit_ip pointer as an exit point for the sequence of consecutive
+ * assembly instructions at @start_ip.
+ *
+ * @start_ip:
+ * Pointer to the first instruction of the sequence of consecutive assembly
+ * instructions.
+ * @exit_ip:
+ * Pointer to an exit point instruction.
+ *
+ * Exit points of a rseq critical section consist of all instructions outside
+ * of the critical section where a critical section can either branch to or
+ * reach through the normal course of its execution. The abort IP and the
+ * post-commit IP are already part of the __rseq_cs section and should not be
+ * explicitly defined as additional exit points. Knowing all exit points is
+ * useful to assist debuggers stepping over the critical section.
+ */
+#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
+ ".pushsection __rseq_exit_point_array, \"aw\"\n\t" \
+ RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
+ RSEQ_ASM_U64_PTR(__rseq_str(exit_ip)) "\n\t" \
+ ".popsection\n\t"
+
+#endif
#define RSEQ_ASM_U32(x) ".word " x
-/* Only used in RSEQ_ASM_DEFINE_TABLE. */
-#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, start_ip, \
- post_commit_offset, abort_ip) \
- ".pushsection __rseq_cs, \"aw\"\n\t" \
- ".balign 32\n\t" \
- __rseq_str(label) ":\n\t" \
- RSEQ_ASM_U32(__rseq_str(version)) "\n\t" \
- RSEQ_ASM_U32(__rseq_str(flags)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(post_commit_offset)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(abort_ip)) "\n\t" \
- ".popsection\n\t" \
- ".pushsection __rseq_cs_ptr_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(label) "b") "\n\t" \
- ".popsection\n\t"
-
-/*
- * Define an rseq critical section structure of version 0 with no flags.
- *
- * @label:
- * Local label for the beginning of the critical section descriptor
- * structure.
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @post_commit_ip:
- * Pointer to the instruction after the last instruction of the sequence of
- * consecutive assembly instructions.
- * @abort_ip:
- * Pointer to the instruction where to move the execution flow in case of
- * abort of the sequence of consecutive assembly instructions.
- */
-#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
- __RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
- (post_commit_ip) - (start_ip), abort_ip)
-
-/*
- * Define the @exit_ip pointer as an exit point for the sequence of consecutive
- * assembly instructions at @start_ip.
- *
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @exit_ip:
- * Pointer to an exit point instruction.
- *
- * Exit points of a rseq critical section consist of all instructions outside
- * of the critical section where a critical section can either branch to or
- * reach through the normal course of its execution. The abort IP and the
- * post-commit IP are already part of the __rseq_cs section and should not be
- * explicitly defined as additional exit points. Knowing all exit points is
- * useful to assist debuggers stepping over the critical section.
- */
-#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
- ".pushsection __rseq_exit_point_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(exit_ip)) "\n\t" \
- ".popsection\n\t"
+/* Common architecture support macros. */
+#include "rseq/arch/generic/common.h"
/* Only used in RSEQ_ASM_DEFINE_ABORT. */
#define __RSEQ_ASM_DEFINE_ABORT(label, teardown, abort_label, \
#define RSEQ_ASM_U32(x) ".long " x
+/* Common architecture support macros. */
+#include "rseq/arch/generic/common.h"
+
+/*
+ * Define a critical section abort handler.
+ *
+ * @label:
+ * Local label to the abort handler.
+ * @teardown:
+ * Sequence of instructions to run on abort.
+ * @abort_label:
+ * C label to jump to at the end of the sequence.
+ */
+#define RSEQ_ASM_DEFINE_ABORT(label, teardown, abort_label) \
+ ".pushsection __rseq_failure, \"ax\"\n\t" \
+ RSEQ_ASM_U32(__rseq_str(RSEQ_SIG)) "\n\t" \
+ __rseq_str(label) ":\n\t" \
+ teardown \
+ "b %l[" __rseq_str(abort_label) "]\n\t" \
+ ".popsection\n\t"
+
/*
* Store the address of the critical section descriptor structure at
* @cs_label into the @rseq_cs pointer and emit the label @label, which
__rseq_str(label) ":\n\t"
#endif
-/* Only used in RSEQ_ASM_DEFINE_TABLE. */
-#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, \
- start_ip, post_commit_offset, abort_ip) \
- ".pushsection __rseq_cs, \"aw\"\n\t" \
- ".balign 32\n\t" \
- __rseq_str(label) ":\n\t" \
- RSEQ_ASM_U32(__rseq_str(version)) "\n\t" \
- RSEQ_ASM_U32(__rseq_str(flags)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(post_commit_offset)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(abort_ip)) "\n\t" \
- ".popsection\n\t" \
- ".pushsection __rseq_cs_ptr_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(label) "b") "\n\t" \
- ".popsection\n\t"
-
-/*
- * Define an rseq critical section structure of version 0 with no flags.
- *
- * @label:
- * Local label for the beginning of the critical section descriptor
- * structure.
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @post_commit_ip:
- * Pointer to the instruction after the last instruction of the sequence of
- * consecutive assembly instructions.
- * @abort_ip:
- * Pointer to the instruction where to move the execution flow in case of
- * abort of the sequence of consecutive assembly instructions.
- */
-#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
- __RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
- (post_commit_ip) - (start_ip), abort_ip)
-
-/*
- * Define the @exit_ip pointer as an exit point for the sequence of consecutive
- * assembly instructions at @start_ip.
- *
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @exit_ip:
- * Pointer to an exit point instruction.
- *
- * Exit points of a rseq critical section consist of all instructions outside
- * of the critical section where a critical section can either branch to or
- * reach through the normal course of its execution. The abort IP and the
- * post-commit IP are already part of the __rseq_cs section and should not be
- * explicitly defined as additional exit points. Knowing all exit points is
- * useful to assist debuggers stepping over the critical section.
- */
-#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
- ".pushsection __rseq_exit_point_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(exit_ip)) "\n\t" \
- ".popsection\n\t"
-
-/*
- * Define a critical section abort handler.
- *
- * @label:
- * Local label to the abort handler.
- * @teardown:
- * Sequence of instructions to run on abort.
- * @abort_label:
- * C label to jump to at the end of the sequence.
- */
-#define RSEQ_ASM_DEFINE_ABORT(label, teardown, abort_label) \
- ".pushsection __rseq_failure, \"ax\"\n\t" \
- RSEQ_ASM_U32(__rseq_str(RSEQ_SIG)) "\n\t" \
- __rseq_str(label) ":\n\t" \
- teardown \
- "b %l[" __rseq_str(abort_label) "]\n\t" \
- ".popsection\n\t"
-
/* Jump to local label @label when @cpu_id != @current_cpu_id. */
#define RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, label) \
RSEQ_INJECT_ASM(2) \
#define RSEQ_ASM_TMP_REG_3 "t4"
#define RSEQ_ASM_TMP_REG_4 "t3"
-/* Only used in RSEQ_ASM_DEFINE_TABLE. */
-#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, start_ip, \
- post_commit_offset, abort_ip) \
- ".pushsection __rseq_cs, \"aw\"\n" \
- ".balign 32\n" \
- __rseq_str(label) ":\n" \
- RSEQ_ASM_U32(__rseq_str(version)) "\n" \
- RSEQ_ASM_U32(__rseq_str(flags)) "\n" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n" \
- RSEQ_ASM_U64_PTR(__rseq_str(post_commit_offset)) "\n" \
- RSEQ_ASM_U64_PTR(__rseq_str(abort_ip)) "\n" \
- ".popsection\n\t" \
- ".pushsection __rseq_cs_ptr_array, \"aw\"\n" \
- RSEQ_ASM_U64_PTR(__rseq_str(label) "b") "\n" \
- ".popsection\n"
-
-/*
- * Define an rseq critical section structure of version 0 with no flags.
- *
- * @label:
- * Local label for the beginning of the critical section descriptor
- * structure.
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @post_commit_ip:
- * Pointer to the instruction after the last instruction of the sequence of
- * consecutive assembly instructions.
- * @abort_ip:
- * Pointer to the instruction where to move the execution flow in case of
- * abort of the sequence of consecutive assembly instructions.
- */
-#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
- __RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
- (post_commit_ip) - (start_ip), abort_ip)
-
-/*
- * Define the @exit_ip pointer as an exit point for the sequence of consecutive
- * assembly instructions at @start_ip.
- *
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @exit_ip:
- * Pointer to an exit point instruction.
- *
- * Exit points of a rseq critical section consist of all instructions outside
- * of the critical section where a critical section can either branch to or
- * reach through the normal course of its execution. The abort IP and the
- * post-commit IP are already part of the __rseq_cs section and should not be
- * explicitly defined as additional exit points. Knowing all exit points is
- * useful to assist debuggers stepping over the critical section.
- */
-#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
- ".pushsection __rseq_exit_point_array, \"aw\"\n" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n" \
- RSEQ_ASM_U64_PTR(__rseq_str(exit_ip)) "\n" \
- ".popsection\n"
+/* Common architecture support macros. */
+#include "rseq/arch/generic/common.h"
/*
* Define a critical section abort handler.
#define RSEQ_ASM_U32(x) ".long " x
-/* Only used in RSEQ_ASM_DEFINE_TABLE. */
-#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, \
- start_ip, post_commit_offset, abort_ip) \
- ".pushsection __rseq_cs, \"aw\"\n\t" \
- ".balign 32\n\t" \
- __rseq_str(label) ":\n\t" \
- RSEQ_ASM_U32(__rseq_str(version)) "\n\t" \
- RSEQ_ASM_U32(__rseq_str(flags)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(post_commit_offset)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(abort_ip)) "\n\t" \
- ".popsection\n\t" \
- ".pushsection __rseq_cs_ptr_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(label) "b") "\n\t" \
- ".popsection\n\t"
-
-/*
- * Define an rseq critical section structure of version 0 with no flags.
- *
- * @label:
- * Local label for the beginning of the critical section descriptor
- * structure.
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @post_commit_ip:
- * Pointer to the instruction after the last instruction of the sequence of
- * consecutive assembly instructions.
- * @abort_ip:
- * Pointer to the instruction where to move the execution flow in case of
- * abort of the sequence of consecutive assembly instructions.
- */
-#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
- __RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
- (post_commit_ip) - (start_ip), abort_ip)
-
-/*
- * Define the @exit_ip pointer as an exit point for the sequence of consecutive
- * assembly instructions at @start_ip.
- *
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @exit_ip:
- * Pointer to an exit point instruction.
- *
- * Exit points of a rseq critical section consist of all instructions outside
- * of the critical section where a critical section can either branch to or
- * reach through the normal course of its execution. The abort IP and the
- * post-commit IP are already part of the __rseq_cs section and should not be
- * explicitly defined as additional exit points. Knowing all exit points is
- * useful to assist debuggers stepping over the critical section.
- */
-#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
- ".pushsection __rseq_exit_point_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(exit_ip)) "\n\t" \
- ".popsection\n\t"
+/* Common architecture support macros. */
+#include "rseq/arch/generic/common.h"
/*
* Define a critical section abort handler.
#define RSEQ_ASM_U32(x) ".long " x
-/*
- * Store the address of the critical section descriptor structure at
- * @cs_label into the @rseq_cs pointer and emit the label @label, which
- * is the beginning of the sequence of consecutive assembly instructions.
- *
- * @label:
- * Local label to the beginning of the sequence of consecutive assembly
- * instructions.
- * @cs_label:
- * Source local label to the critical section descriptor structure.
- * @rseq_cs:
- * Destination pointer where to store the address of the critical
- * section descriptor structure.
- */
-#ifdef RSEQ_ARCH_AMD64
-#define RSEQ_ASM_STORE_RSEQ_CS(label, cs_label, rseq_cs) \
- RSEQ_INJECT_ASM(1) \
- "leaq " __rseq_str(cs_label) "(%%rip), %%rax\n\t" \
- "movq %%rax, " __rseq_str(rseq_cs) "\n\t" \
- __rseq_str(label) ":\n\t"
-#else
-# define RSEQ_ASM_STORE_RSEQ_CS(label, cs_label, rseq_cs) \
- RSEQ_INJECT_ASM(1) \
- "movl $" __rseq_str(cs_label) ", " __rseq_str(rseq_cs) "\n\t" \
- __rseq_str(label) ":\n\t"
-#endif
-
-/* Only used in RSEQ_ASM_DEFINE_TABLE. */
-#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, \
- start_ip, post_commit_offset, abort_ip) \
- ".pushsection __rseq_cs, \"aw\"\n\t" \
- ".balign 32\n\t" \
- __rseq_str(label) ":\n\t" \
- RSEQ_ASM_U32(__rseq_str(version)) "\n\t" \
- RSEQ_ASM_U32(__rseq_str(flags)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(post_commit_offset)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(abort_ip)) "\n\t" \
- ".popsection\n\t" \
- ".pushsection __rseq_cs_ptr_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(label) "b") "\n\t" \
- ".popsection\n\t"
-
-/*
- * Define an rseq critical section structure of version 0 with no flags.
- *
- * @label:
- * Local label for the beginning of the critical section descriptor
- * structure.
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @post_commit_ip:
- * Pointer to the instruction after the last instruction of the sequence of
- * consecutive assembly instructions.
- * @abort_ip:
- * Pointer to the instruction where to move the execution flow in case of
- * abort of the sequence of consecutive assembly instructions.
- */
-#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
- __RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
- (post_commit_ip) - (start_ip), abort_ip)
-
-/*
- * Define the @exit_ip pointer as an exit point for the sequence of consecutive
- * assembly instructions at @start_ip.
- *
- * @start_ip:
- * Pointer to the first instruction of the sequence of consecutive assembly
- * instructions.
- * @exit_ip:
- * Pointer to an exit point instruction.
- *
- * Exit points of a rseq critical section consist of all instructions outside
- * of the critical section where a critical section can either branch to or
- * reach through the normal course of its execution. The abort IP and the
- * post-commit IP are already part of the __rseq_cs section and should not be
- * explicitly defined as additional exit points. Knowing all exit points is
- * useful to assist debuggers stepping over the critical section.
- */
-#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
- ".pushsection __rseq_exit_point_array, \"aw\"\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(start_ip)) "\n\t" \
- RSEQ_ASM_U64_PTR(__rseq_str(exit_ip)) "\n\t" \
- ".popsection\n\t"
+/* Common architecture support macros. */
+#include "rseq/arch/generic/common.h"
/*
* Define a critical section abort handler.
"jmp %l[" __rseq_str(target_label) "]\n\t" \
".popsection\n\t"
+/*
+ * Store the address of the critical section descriptor structure at
+ * @cs_label into the @rseq_cs pointer and emit the label @label, which
+ * is the beginning of the sequence of consecutive assembly instructions.
+ *
+ * @label:
+ * Local label to the beginning of the sequence of consecutive assembly
+ * instructions.
+ * @cs_label:
+ * Source local label to the critical section descriptor structure.
+ * @rseq_cs:
+ * Destination pointer where to store the address of the critical
+ * section descriptor structure.
+ */
+#ifdef RSEQ_ARCH_AMD64
+#define RSEQ_ASM_STORE_RSEQ_CS(label, cs_label, rseq_cs) \
+ RSEQ_INJECT_ASM(1) \
+ "leaq " __rseq_str(cs_label) "(%%rip), %%rax\n\t" \
+ "movq %%rax, " __rseq_str(rseq_cs) "\n\t" \
+ __rseq_str(label) ":\n\t"
+#else
+# define RSEQ_ASM_STORE_RSEQ_CS(label, cs_label, rseq_cs) \
+ RSEQ_INJECT_ASM(1) \
+ "movl $" __rseq_str(cs_label) ", " __rseq_str(rseq_cs) "\n\t" \
+ __rseq_str(label) ":\n\t"
+#endif
+
/* Jump to local label @label when @cpu_id != @current_cpu_id. */
#define RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, label) \
RSEQ_INJECT_ASM(2) \
projects / librseq.git / commitdiff
