Rename RSEQ_ASM_DEFINE_CMPFAIL to RSEQ_ASM_DEFINE_TEARDOWNpseudo-code

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ic386511c72e99b0818c6ff29fd2996d110296e59

8 files changed, 25 insertions, 25 deletions

diff --git a/include/rseq/rseq-arm-bits.h b/include/rseq/rseq-arm-bits.h
index 941c504..c0c58b8 100644
--- a/include/rseq/rseq-arm-bits.h
+++ b/include/rseq/rseq-arm-bits.h
@@ -442,20 +442,20 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 				      "ldr %[dst], %[rseq_scratch1]\n\t"
 				      "ldr %[src], %[rseq_scratch0]\n\t",
 				      abort, 1b, 2b, 4f)
-		RSEQ_ASM_DEFINE_CMPFAIL(5,
+		RSEQ_ASM_DEFINE_TEARDOWN(5,
 					/* teardown */
 					"ldr %[len], %[rseq_scratch2]\n\t"
 					"ldr %[dst], %[rseq_scratch1]\n\t"
 					"ldr %[src], %[rseq_scratch0]\n\t",
 					ne)
 #ifdef RSEQ_COMPARE_TWICE
-		RSEQ_ASM_DEFINE_CMPFAIL(6,
+		RSEQ_ASM_DEFINE_TEARDOWN(6,
 					/* teardown */
 					"ldr %[len], %[rseq_scratch2]\n\t"
 					"ldr %[dst], %[rseq_scratch1]\n\t"
 					"ldr %[src], %[rseq_scratch0]\n\t",
 					error1)
-		RSEQ_ASM_DEFINE_CMPFAIL(7,
+		RSEQ_ASM_DEFINE_TEARDOWN(7,
 					/* teardown */
 					"ldr %[len], %[rseq_scratch2]\n\t"
 					"ldr %[dst], %[rseq_scratch1]\n\t"
diff --git a/include/rseq/rseq-arm.h b/include/rseq/rseq-arm.h
index 9f4f297..7e8bc40 100644
--- a/include/rseq/rseq-arm.h
+++ b/include/rseq/rseq-arm.h
@@ -138,10 +138,10 @@ do {									\
 				abort_label, 0x0, 0x0, start_ip,	\
 				(post_commit_ip - start_ip), abort_ip)
 
-#define RSEQ_ASM_DEFINE_CMPFAIL(label, teardown, cmpfail_label)		\
+#define RSEQ_ASM_DEFINE_TEARDOWN(label, teardown, target_label)		\
 		__rseq_str(label) ":\n\t"				\
 		teardown						\
-		"b %l[" __rseq_str(cmpfail_label) "]\n\t"
+		"b %l[" __rseq_str(target_label) "]\n\t"
 
 /* Per-cpu-id indexing. */
 
diff --git a/include/rseq/rseq-mips-bits.h b/include/rseq/rseq-mips-bits.h
index b93f2d6..0466408 100644
--- a/include/rseq/rseq-mips-bits.h
+++ b/include/rseq/rseq-mips-bits.h
@@ -405,20 +405,20 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 				      LONG_L " %[dst], %[rseq_scratch1]\n\t"
 				      LONG_L " %[src], %[rseq_scratch0]\n\t",
 				      abort, 1b, 2b, 4f)
-		RSEQ_ASM_DEFINE_CMPFAIL(5,
+		RSEQ_ASM_DEFINE_TEARDOWN(5,
 					/* teardown */
 					LONG_L " %[len], %[rseq_scratch2]\n\t"
 					LONG_L " %[dst], %[rseq_scratch1]\n\t"
 					LONG_L " %[src], %[rseq_scratch0]\n\t",
 					ne)
 #ifdef RSEQ_COMPARE_TWICE
-		RSEQ_ASM_DEFINE_CMPFAIL(6,
+		RSEQ_ASM_DEFINE_TEARDOWN(6,
 					/* teardown */
 					LONG_L " %[len], %[rseq_scratch2]\n\t"
 					LONG_L " %[dst], %[rseq_scratch1]\n\t"
 					LONG_L " %[src], %[rseq_scratch0]\n\t",
 					error1)
-		RSEQ_ASM_DEFINE_CMPFAIL(7,
+		RSEQ_ASM_DEFINE_TEARDOWN(7,
 					/* teardown */
 					LONG_L " %[len], %[rseq_scratch2]\n\t"
 					LONG_L " %[dst], %[rseq_scratch1]\n\t"
diff --git a/include/rseq/rseq-mips.h b/include/rseq/rseq-mips.h
index 41ea3aa..9cce3e8 100644
--- a/include/rseq/rseq-mips.h
+++ b/include/rseq/rseq-mips.h
@@ -144,10 +144,10 @@ do {									\
 				abort_label, 0x0, 0x0, start_ip, \
 				(post_commit_ip - start_ip), abort_ip)
 
-#define RSEQ_ASM_DEFINE_CMPFAIL(label, teardown, cmpfail_label) \
+#define RSEQ_ASM_DEFINE_TEARDOWN(label, teardown, target_label) \
 		__rseq_str(label) ":\n\t" \
 		teardown \
-		"b %l[" __rseq_str(cmpfail_label) "]\n\t"
+		"b %l[" __rseq_str(target_label) "]\n\t"
 
 /* Per-cpu-id indexing. */
 
diff --git a/include/rseq/rseq-s390-bits.h b/include/rseq/rseq-s390-bits.h
index dbfb9bd..4207924 100644
--- a/include/rseq/rseq-s390-bits.h
+++ b/include/rseq/rseq-s390-bits.h
@@ -412,18 +412,18 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 			LONG_L " %[dst], %[rseq_scratch1]\n\t"
 			LONG_L " %[src], %[rseq_scratch0]\n\t",
 			abort)
-		RSEQ_ASM_DEFINE_CMPFAIL(5,
+		RSEQ_ASM_DEFINE_TEARDOWN(5,
 			LONG_L " %[len], %[rseq_scratch2]\n\t"
 			LONG_L " %[dst], %[rseq_scratch1]\n\t"
 			LONG_L " %[src], %[rseq_scratch0]\n\t",
 			ne)
 #ifdef RSEQ_COMPARE_TWICE
-		RSEQ_ASM_DEFINE_CMPFAIL(6,
+		RSEQ_ASM_DEFINE_TEARDOWN(6,
 			LONG_L " %[len], %[rseq_scratch2]\n\t"
 			LONG_L " %[dst], %[rseq_scratch1]\n\t"
 			LONG_L " %[src], %[rseq_scratch0]\n\t",
 			error1)
-		RSEQ_ASM_DEFINE_CMPFAIL(7,
+		RSEQ_ASM_DEFINE_TEARDOWN(7,
 			LONG_L " %[len], %[rseq_scratch2]\n\t"
 			LONG_L " %[dst], %[rseq_scratch1]\n\t"
 			LONG_L " %[src], %[rseq_scratch0]\n\t",
diff --git a/include/rseq/rseq-s390.h b/include/rseq/rseq-s390.h
index 8158826..6d15e12 100644
--- a/include/rseq/rseq-s390.h
+++ b/include/rseq/rseq-s390.h
@@ -124,11 +124,11 @@ do {									\
 		"jg %l[" __rseq_str(abort_label) "]\n\t"		\
 		".popsection\n\t"
 
-#define RSEQ_ASM_DEFINE_CMPFAIL(label, teardown, cmpfail_label)		\
+#define RSEQ_ASM_DEFINE_TEARDOWN(label, teardown, target_label)		\
 		".pushsection __rseq_failure, \"ax\"\n\t"		\
 		__rseq_str(label) ":\n\t"				\
 		teardown						\
-		"jg %l[" __rseq_str(cmpfail_label) "]\n\t"		\
+		"jg %l[" __rseq_str(target_label) "]\n\t"		\
 		".popsection\n\t"
 
 /* Per-cpu-id indexing. */
diff --git a/include/rseq/rseq-x86-bits.h b/include/rseq/rseq-x86-bits.h
index 41ea2d7..80bcbf8 100644
--- a/include/rseq/rseq-x86-bits.h
+++ b/include/rseq/rseq-x86-bits.h
@@ -456,18 +456,18 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 			"movq %[rseq_scratch1], %[dst]\n\t"
 			"movq %[rseq_scratch0], %[src]\n\t",
 			abort)
-		RSEQ_ASM_DEFINE_CMPFAIL(5,
+		RSEQ_ASM_DEFINE_TEARDOWN(5,
 			"movq %[rseq_scratch2], %[len]\n\t"
 			"movq %[rseq_scratch1], %[dst]\n\t"
 			"movq %[rseq_scratch0], %[src]\n\t",
 			ne)
 #ifdef RSEQ_COMPARE_TWICE
-		RSEQ_ASM_DEFINE_CMPFAIL(6,
+		RSEQ_ASM_DEFINE_TEARDOWN(6,
 			"movq %[rseq_scratch2], %[len]\n\t"
 			"movq %[rseq_scratch1], %[dst]\n\t"
 			"movq %[rseq_scratch0], %[src]\n\t",
 			error1)
-		RSEQ_ASM_DEFINE_CMPFAIL(7,
+		RSEQ_ASM_DEFINE_TEARDOWN(7,
 			"movq %[rseq_scratch2], %[len]\n\t"
 			"movq %[rseq_scratch1], %[dst]\n\t"
 			"movq %[rseq_scratch0], %[src]\n\t",
@@ -921,18 +921,18 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 			"movl %[rseq_scratch1], %[dst]\n\t"
 			"movl %[rseq_scratch0], %[src]\n\t",
 			abort)
-		RSEQ_ASM_DEFINE_CMPFAIL(5,
+		RSEQ_ASM_DEFINE_TEARDOWN(5,
 			"movl %[rseq_scratch2], %[len]\n\t"
 			"movl %[rseq_scratch1], %[dst]\n\t"
 			"movl %[rseq_scratch0], %[src]\n\t",
 			ne)
 #ifdef RSEQ_COMPARE_TWICE
-		RSEQ_ASM_DEFINE_CMPFAIL(6,
+		RSEQ_ASM_DEFINE_TEARDOWN(6,
 			"movl %[rseq_scratch2], %[len]\n\t"
 			"movl %[rseq_scratch1], %[dst]\n\t"
 			"movl %[rseq_scratch0], %[src]\n\t",
 			error1)
-		RSEQ_ASM_DEFINE_CMPFAIL(7,
+		RSEQ_ASM_DEFINE_TEARDOWN(7,
 			"movl %[rseq_scratch2], %[len]\n\t"
 			"movl %[rseq_scratch1], %[dst]\n\t"
 			"movl %[rseq_scratch0], %[src]\n\t",
diff --git a/include/rseq/rseq-x86.h b/include/rseq/rseq-x86.h
index ecd7560..9d38628 100644
--- a/include/rseq/rseq-x86.h
+++ b/include/rseq/rseq-x86.h
@@ -106,11 +106,11 @@ do {									\
 		"jmp %l[" __rseq_str(abort_label) "]\n\t"		\
 		".popsection\n\t"
 
-#define RSEQ_ASM_DEFINE_CMPFAIL(label, teardown, cmpfail_label)		\
+#define RSEQ_ASM_DEFINE_TEARDOWN(label, teardown, target_label)		\
 		".pushsection __rseq_failure, \"ax\"\n\t"		\
 		__rseq_str(label) ":\n\t"				\
 		teardown						\
-		"jmp %l[" __rseq_str(cmpfail_label) "]\n\t"		\
+		"jmp %l[" __rseq_str(target_label) "]\n\t"		\
 		".popsection\n\t"
 
 #elif defined(__i386__)
@@ -192,11 +192,11 @@ do {									\
 		"jmp %l[" __rseq_str(abort_label) "]\n\t"		\
 		".popsection\n\t"
 
-#define RSEQ_ASM_DEFINE_CMPFAIL(label, teardown, cmpfail_label)		\
+#define RSEQ_ASM_DEFINE_TEARDOWN(label, teardown, target_label)		\
 		".pushsection __rseq_failure, \"ax\"\n\t"		\
 		__rseq_str(label) ":\n\t"				\
 		teardown						\
-		"jmp %l[" __rseq_str(cmpfail_label) "]\n\t"		\
+		"jmp %l[" __rseq_str(target_label) "]\n\t"		\
 		".popsection\n\t"
 
 #endif