Rename branch labels from cmpfail to ne/eq

This is done to match the pseudo-code.

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

diff --git a/include/rseq/rseq-arm-bits.h b/include/rseq/rseq-arm-bits.h
index 7eeb84574b15f109a51278ca95bfcdca150f9220..941c504c365190069faaa2970ba538f2ee10be2b 100644 (file)
--- a/include/rseq/rseq-arm-bits.h
+++ b/include/rseq/rseq-arm-bits.h
@@ -23,7 +23,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -34,7 +34,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                RSEQ_INJECT_ASM(3)
                "ldr r0, %[v]\n\t"
                "cmp %[expect], r0\n\t"
-               "bne %l[cmpfail]\n\t"
+               "bne %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -59,7 +59,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                  RSEQ_INJECT_INPUT
                : "r0", "memory", "cc"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -70,7 +70,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -91,7 +91,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[eq])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -102,7 +102,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                RSEQ_INJECT_ASM(3)
                "ldr r0, %[v]\n\t"
                "cmp %[expectnot], r0\n\t"
-               "beq %l[cmpfail]\n\t"
+               "beq %l[eq]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -132,7 +132,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                  RSEQ_INJECT_INPUT
                : "r0", "memory", "cc"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, eq
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -143,7 +143,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+eq:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -218,7 +218,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -230,11 +230,11 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                RSEQ_INJECT_ASM(3)
                "ldr r0, %[v]\n\t"
                "cmp %[expect], r0\n\t"
-               "bne %l[cmpfail]\n\t"
+               "bne %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
                "ldr r0, %[v2]\n\t"
                "cmp %[expect2], r0\n\t"
-               "bne %l[cmpfail]\n\t"
+               "bne %l[ne]\n\t"
                RSEQ_INJECT_ASM(5)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -266,7 +266,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                  RSEQ_INJECT_INPUT
                : "r0", "memory", "cc"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2, error3
 #endif
@@ -277,7 +277,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -308,7 +308,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -319,7 +319,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                RSEQ_INJECT_ASM(3)
                "ldr r0, %[v]\n\t"
                "cmp %[expect], r0\n\t"
-               "bne %l[cmpfail]\n\t"
+               "bne %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -354,7 +354,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                  RSEQ_INJECT_INPUT
                : "r0", "memory", "cc"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -365,7 +365,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -390,7 +390,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -447,7 +447,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                                        "ldr %[len], %[rseq_scratch2]\n\t"
                                        "ldr %[dst], %[rseq_scratch1]\n\t"
                                        "ldr %[src], %[rseq_scratch0]\n\t",
-                                       cmpfail)
+                                       ne)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_CMPFAIL(6,
                                        /* teardown */
@@ -481,7 +481,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                  RSEQ_INJECT_INPUT
                : "r0", "memory", "cc"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -492,7 +492,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE

diff --git a/include/rseq/rseq-arm64-bits.h b/include/rseq/rseq-arm64-bits.h
index 8dfc853011c9de559043267050f60b312cc557cc..6f01a1ce01cadaf15713163aea4092e7ea0c58d9 100644 (file)
--- a/include/rseq/rseq-arm64-bits.h
+++ b/include/rseq/rseq-arm64-bits.h
@@ -24,7 +24,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error2])
@@ -32,7 +32,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
-               RSEQ_ASM_OP_CBNE(v, expect, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v, expect, %l[ne])
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -50,7 +50,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                  [newv]                "r" (newv)
                  RSEQ_INJECT_INPUT
                : "memory", RSEQ_ASM_TMP_REG
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -61,7 +61,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -82,7 +82,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[eq])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error2])
@@ -90,7 +90,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
-               RSEQ_ASM_OP_CBEQ(v, expectnot, %l[cmpfail])
+               RSEQ_ASM_OP_CBEQ(v, expectnot, %l[eq])
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -112,7 +112,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                  [voffp]               "r" (voffp)
                  RSEQ_INJECT_INPUT
                : "memory", RSEQ_ASM_TMP_REG
-               : abort, cmpfail
+               : abort, eq
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -123,7 +123,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+eq:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -192,7 +192,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error2])
@@ -201,9 +201,9 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
-               RSEQ_ASM_OP_CBNE(v, expect, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v, expect, %l[ne])
                RSEQ_INJECT_ASM(4)
-               RSEQ_ASM_OP_CBNE(v2, expect2, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v2, expect2, %l[ne])
                RSEQ_INJECT_ASM(5)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -224,7 +224,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                  [newv]                "r" (newv)
                  RSEQ_INJECT_INPUT
                : "memory", RSEQ_ASM_TMP_REG
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2, error3
 #endif
@@ -235,7 +235,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -266,7 +266,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error2])
@@ -274,7 +274,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
-               RSEQ_ASM_OP_CBNE(v, expect, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v, expect, %l[ne])
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -300,7 +300,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                  [newv2]               "r" (newv2)
                  RSEQ_INJECT_INPUT
                : "memory", RSEQ_ASM_TMP_REG
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -311,7 +311,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -333,7 +333,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(2f, %l[error2])
@@ -341,7 +341,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
-               RSEQ_ASM_OP_CBNE(v, expect, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v, expect, %l[ne])
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -368,7 +368,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                  [len]                 "r" (len)
                  RSEQ_INJECT_INPUT
                : "memory", RSEQ_ASM_TMP_REG, RSEQ_ASM_TMP_REG_2
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -379,7 +379,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE

diff --git a/include/rseq/rseq-mips-bits.h b/include/rseq/rseq-mips-bits.h
index dd2558055d98ece4e7546aaf985e494815f5a805..b93f2d657360d3fb6a261e52457381fcb5d3e1d3 100644 (file)
--- a/include/rseq/rseq-mips-bits.h
+++ b/include/rseq/rseq-mips-bits.h
@@ -24,7 +24,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -34,7 +34,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                LONG_L " $4, %[v]\n\t"
-               "bne $4, %[expect], %l[cmpfail]\n\t"
+               "bne $4, %[expect], %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -58,7 +58,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                  RSEQ_INJECT_INPUT
                : "$4", "memory"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -67,7 +67,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:
@@ -85,7 +85,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[eq])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -95,7 +95,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                LONG_L " $4, %[v]\n\t"
-               "beq $4, %[expectnot], %l[cmpfail]\n\t"
+               "beq $4, %[expectnot], %l[eq]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -124,7 +124,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                  RSEQ_INJECT_INPUT
                : "$4", "memory"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, eq
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -133,7 +133,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+eq:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:
@@ -202,7 +202,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -213,10 +213,10 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                LONG_L " $4, %[v]\n\t"
-               "bne $4, %[expect], %l[cmpfail]\n\t"
+               "bne $4, %[expect], %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
                LONG_L " $4, %[v2]\n\t"
-               "bne $4, %[expect2], %l[cmpfail]\n\t"
+               "bne $4, %[expect2], %l[ne]\n\t"
                RSEQ_INJECT_ASM(5)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -246,7 +246,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                  RSEQ_INJECT_INPUT
                : "$4", "memory"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2, error3
 #endif
@@ -255,7 +255,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:
@@ -282,7 +282,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -292,7 +292,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                LONG_L " $4, %[v]\n\t"
-               "bne $4, %[expect], %l[cmpfail]\n\t"
+               "bne $4, %[expect], %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -326,7 +326,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                  RSEQ_INJECT_INPUT
                : "$4", "memory"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -335,7 +335,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:
@@ -356,7 +356,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(9, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -410,7 +410,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                                        LONG_L " %[len], %[rseq_scratch2]\n\t"
                                        LONG_L " %[dst], %[rseq_scratch1]\n\t"
                                        LONG_L " %[src], %[rseq_scratch0]\n\t",
-                                       cmpfail)
+                                       ne)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_CMPFAIL(6,
                                        /* teardown */
@@ -444,7 +444,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                  RSEQ_INJECT_INPUT
                : "$4", "memory"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -453,7 +453,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:

diff --git a/include/rseq/rseq-ppc-bits.h b/include/rseq/rseq-ppc-bits.h
index aebb234d627035f8022130a5e977cc4ccca394e4..b3194de6e79504720dcd0dca66e35bb23919e060 100644 (file)
--- a/include/rseq/rseq-ppc-bits.h
+++ b/include/rseq/rseq-ppc-bits.h
@@ -24,7 +24,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -35,7 +35,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                /* cmp @v equal to @expect */
-               RSEQ_ASM_OP_CBNE(v, expect, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v, expect, %l[ne])
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                /* cmp cpuid */
@@ -57,7 +57,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r17"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -68,7 +68,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -89,7 +89,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[eq])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -100,7 +100,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                /* cmp @v not equal to @expectnot */
-               RSEQ_ASM_OP_CBEQ(v, expectnot, %l[cmpfail])
+               RSEQ_ASM_OP_CBEQ(v, expectnot, %l[eq])
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                /* cmp cpuid */
@@ -130,7 +130,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r17"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, eq
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -141,7 +141,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+eq:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -218,7 +218,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -230,10 +230,10 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                /* cmp @v equal to @expect */
-               RSEQ_ASM_OP_CBNE(v, expect, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v, expect, %l[ne])
                RSEQ_INJECT_ASM(4)
                /* cmp @v2 equal to @expct2 */
-               RSEQ_ASM_OP_CBNE(v2, expect2, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v2, expect2, %l[ne])
                RSEQ_INJECT_ASM(5)
 #ifdef RSEQ_COMPARE_TWICE
                /* cmp cpuid */
@@ -261,7 +261,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r17"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2, error3
 #endif
@@ -272,7 +272,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -303,7 +303,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -314,7 +314,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                /* cmp @v equal to @expect */
-               RSEQ_ASM_OP_CBNE(v, expect, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v, expect, %l[ne])
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                /* cmp cpuid */
@@ -347,7 +347,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r17"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -358,7 +358,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -380,7 +380,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -395,7 +395,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                /* cmp @v equal to @expect */
-               RSEQ_ASM_OP_CBNE(v, expect, %l[cmpfail])
+               RSEQ_ASM_OP_CBNE(v, expect, %l[ne])
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                /* cmp cpuid */
@@ -430,7 +430,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r17", "r18", "r19", "r20", "r21"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -441,7 +441,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE

diff --git a/include/rseq/rseq-riscv-bits.h b/include/rseq/rseq-riscv-bits.h
index 2afcc5a7a2f939591cb8fdc3b44a035e4008983e..7fa1ffc8d3134e510ce0fbff3181d03002b25c2b 100644 (file)
--- a/include/rseq/rseq-riscv-bits.h
+++ b/include/rseq/rseq-riscv-bits.h
@@ -18,7 +18,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
        RSEQ_INJECT_C(9)
 
        __asm__ __volatile__ goto(RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[cmpfail]")
+                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[ne]")
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error1]")
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error2]")
@@ -26,7 +26,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                                  RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                                  RSEQ_INJECT_ASM(3)
-                                 RSEQ_ASM_OP_CBNE(v, expect, "%l[cmpfail]")
+                                 RSEQ_ASM_OP_CBNE(v, expect, "%l[ne]")
                                  RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, "%l[error1]")
@@ -45,7 +45,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                                    RSEQ_INJECT_INPUT
                                  : "memory", RSEQ_ASM_TMP_REG_1
                                    RSEQ_INJECT_CLOBBER
-                                 : abort, cmpfail
+                                 : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                                    , error1, error2
 #endif
@@ -55,7 +55,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:
@@ -72,7 +72,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
        RSEQ_INJECT_C(9)
 
        __asm__ __volatile__ goto(RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[cmpfail]")
+                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[eq]")
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error1]")
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error2]")
@@ -80,7 +80,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                                  RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                                  RSEQ_INJECT_ASM(3)
-                                 RSEQ_ASM_OP_CBEQ(v, expectnot, "%l[cmpfail]")
+                                 RSEQ_ASM_OP_CBEQ(v, expectnot, "%l[eq]")
                                  RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, "%l[error1]")
@@ -103,7 +103,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                                    RSEQ_INJECT_INPUT
                                  : "memory", RSEQ_ASM_TMP_REG_1
                                    RSEQ_INJECT_CLOBBER
-                                 : abort, cmpfail
+                                 : abort, eq
 #ifdef RSEQ_COMPARE_TWICE
                                    , error1, error2
 #endif
@@ -112,7 +112,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+eq:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:
@@ -174,7 +174,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
        RSEQ_INJECT_C(9)
 
        __asm__ __volatile__ goto(RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[cmpfail]")
+                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[ne]")
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error1]")
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error2]")
@@ -183,9 +183,9 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                                  RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                                  RSEQ_INJECT_ASM(3)
-                                 RSEQ_ASM_OP_CBNE(v, expect, "%l[cmpfail]")
+                                 RSEQ_ASM_OP_CBNE(v, expect, "%l[ne]")
                                  RSEQ_INJECT_ASM(4)
-                                 RSEQ_ASM_OP_CBNE(v2, expect2, "%l[cmpfail]")
+                                 RSEQ_ASM_OP_CBNE(v2, expect2, "%l[ne]")
                                  RSEQ_INJECT_ASM(5)
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, "%l[error1]")
@@ -207,7 +207,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                                    RSEQ_INJECT_INPUT
                                  : "memory", RSEQ_ASM_TMP_REG_1
                                    RSEQ_INJECT_CLOBBER
-                                 : abort, cmpfail
+                                 : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                                    , error1, error2, error3
 #endif
@@ -217,7 +217,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:
@@ -288,7 +288,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
        RSEQ_INJECT_C(9)
 
        __asm__ __volatile__ goto(RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[cmpfail]")
+                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[ne]")
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error1]")
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error2]")
@@ -296,7 +296,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                                  RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                                  RSEQ_INJECT_ASM(3)
-                                 RSEQ_ASM_OP_CBNE(v, expect, "%l[cmpfail]")
+                                 RSEQ_ASM_OP_CBNE(v, expect, "%l[ne]")
                                  RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, "%l[error1]")
@@ -323,7 +323,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                                    RSEQ_INJECT_INPUT
                                  : "memory", RSEQ_ASM_TMP_REG_1
                                    RSEQ_INJECT_CLOBBER
-                                 : abort, cmpfail
+                                 : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                                    , error1, error2
 #endif
@@ -333,7 +333,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:
@@ -350,7 +350,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 {
        RSEQ_INJECT_C(9)
        __asm__ __volatile__ goto(RSEQ_ASM_DEFINE_TABLE(1, 2f, 3f, 4f)
-                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[cmpfail]")
+                                 RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[ne]")
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error1]")
                                  RSEQ_ASM_DEFINE_EXIT_POINT(2f, "%l[error2]")
@@ -358,7 +358,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                                  RSEQ_ASM_STORE_RSEQ_CS(2, 1b, rseq_cs)
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                                  RSEQ_INJECT_ASM(3)
-                                 RSEQ_ASM_OP_CBNE(v, expect, "%l[cmpfail]")
+                                 RSEQ_ASM_OP_CBNE(v, expect, "%l[ne]")
                                  RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                                  RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, "%l[error1]")
@@ -387,7 +387,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                                  : "memory", RSEQ_ASM_TMP_REG_1, RSEQ_ASM_TMP_REG_2,
                                    RSEQ_ASM_TMP_REG_3, RSEQ_ASM_TMP_REG_4
                                    RSEQ_INJECT_CLOBBER
-                                 : abort, cmpfail
+                                 : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                                    , error1, error2
 #endif
@@ -397,7 +397,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 abort:
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
 error1:

diff --git a/include/rseq/rseq-s390-bits.h b/include/rseq/rseq-s390-bits.h
index 0d687f09eb352e8bf99551207e4c1a588ce40403..dbfb9bd3baed3d39276022d4485c1bc894a6eb40 100644 (file)
--- a/include/rseq/rseq-s390-bits.h
+++ b/include/rseq/rseq-s390-bits.h
@@ -19,7 +19,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -29,7 +29,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                LONG_CMP " %[expect], %[v]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -51,7 +51,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r0"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -62,7 +62,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -83,7 +83,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[eq])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -94,7 +94,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                RSEQ_INJECT_ASM(3)
                LONG_L " %%r1, %[v]\n\t"
                LONG_CMP_R " %%r1, %[expectnot]\n\t"
-               "je %l[cmpfail]\n\t"
+               "je %l[eq]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -122,7 +122,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r0", "r1"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, eq
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -133,7 +133,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+eq:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -207,7 +207,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -218,10 +218,10 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                LONG_CMP " %[expect], %[v]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
                LONG_CMP " %[expect2], %[v2]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(5)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -249,7 +249,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r0"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2, error3
 #endif
@@ -260,7 +260,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -292,7 +292,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -302,7 +302,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, 4f)
                RSEQ_INJECT_ASM(3)
                LONG_CMP " %[expect], %[v]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, current_cpu_id, %l[error1])
@@ -331,7 +331,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r0"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -342,7 +342,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -367,7 +367,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -416,7 +416,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                        LONG_L " %[len], %[rseq_scratch2]\n\t"
                        LONG_L " %[dst], %[rseq_scratch1]\n\t"
                        LONG_L " %[src], %[rseq_scratch0]\n\t",
-                       cmpfail)
+                       ne)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_CMPFAIL(6,
                        LONG_L " %[len], %[rseq_scratch2]\n\t"
@@ -447,7 +447,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                  RSEQ_INJECT_INPUT
                : "memory", "cc", "r0"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -458,7 +458,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE

diff --git a/include/rseq/rseq-x86-bits.h b/include/rseq/rseq-x86-bits.h
index 2bfa8518585758f0528aa0e38dd240e7b7ce58c5..41ea2d76f07aa9b4bd073d21431cff409f92d5fa 100644 (file)
--- a/include/rseq/rseq-x86-bits.h
+++ b/include/rseq/rseq-x86-bits.h
@@ -24,7 +24,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -34,7 +34,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), 4f)
                RSEQ_INJECT_ASM(3)
                "cmpq %[v], %[expect]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])
@@ -54,7 +54,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                  [newv]                "r" (newv)
                : "memory", "cc", "rax"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -65,7 +65,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -86,7 +86,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[eq])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -97,7 +97,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                RSEQ_INJECT_ASM(3)
                "movq %[v], %%rbx\n\t"
                "cmpq %%rbx, %[expectnot]\n\t"
-               "je %l[cmpfail]\n\t"
+               "je %l[eq]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])
@@ -123,7 +123,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                  [load]                "m" (*load)
                : "memory", "cc", "rax", "rbx"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, eq
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -134,7 +134,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+eq:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -257,7 +257,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -268,10 +268,10 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), 4f)
                RSEQ_INJECT_ASM(3)
                "cmpq %[v], %[expect]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
                "cmpq %[v2], %[expect2]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(5)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])
@@ -297,7 +297,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                  [newv]                "r" (newv)
                : "memory", "cc", "rax"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2, error3
 #endif
@@ -308,7 +308,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -339,7 +339,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -349,7 +349,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), 4f)
                RSEQ_INJECT_ASM(3)
                "cmpq %[v], %[expect]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])
@@ -376,7 +376,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                  [newv]                "r" (newv)
                : "memory", "cc", "rax"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -387,7 +387,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -411,7 +411,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -460,7 +460,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                        "movq %[rseq_scratch2], %[len]\n\t"
                        "movq %[rseq_scratch1], %[dst]\n\t"
                        "movq %[rseq_scratch0], %[src]\n\t",
-                       cmpfail)
+                       ne)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_CMPFAIL(6,
                        "movq %[rseq_scratch2], %[len]\n\t"
@@ -489,7 +489,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                  [rseq_scratch2]       "m" (rseq_scratch[2])
                : "memory", "cc", "rax"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -500,7 +500,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -528,7 +528,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -538,7 +538,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), 4f)
                RSEQ_INJECT_ASM(3)
                "cmpl %[v], %[expect]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])
@@ -558,7 +558,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store__ptr)(intptr_t *v, intptr_t ex
                  [newv]                "r" (newv)
                : "memory", "cc", "eax"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -569,7 +569,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -590,7 +590,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[eq])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -601,7 +601,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                RSEQ_INJECT_ASM(3)
                "movl %[v], %%ebx\n\t"
                "cmpl %%ebx, %[expectnot]\n\t"
-               "je %l[cmpfail]\n\t"
+               "je %l[eq]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])
@@ -627,7 +627,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbeq_store_add_load_store__ptr)(intptr_t
                  [load]                "m" (*load)
                : "memory", "cc", "eax", "ebx"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, eq
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -638,7 +638,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+eq:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -708,7 +708,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -719,10 +719,10 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), 4f)
                RSEQ_INJECT_ASM(3)
                "cmpl %[v], %[expect]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
                "cmpl %[expect2], %[v2]\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(5)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])
@@ -749,7 +749,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_load_cbne_store__ptr)(intptr_t *v, i
                  [newv]                "m" (newv)
                : "memory", "cc", "eax"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2, error3
 #endif
@@ -760,7 +760,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -791,7 +791,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -802,7 +802,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                RSEQ_INJECT_ASM(3)
                "movl %[expect], %%eax\n\t"
                "cmpl %[v], %%eax\n\t"
-               "jnz %l[cmpfail]\n\t"
+               "jnz %l[ne]\n\t"
                RSEQ_INJECT_ASM(4)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_CBNE_CPU_ID(cpu_id, RSEQ_ASM_TP_SEGMENT:RSEQ_TEMPLATE_CPU_ID_OFFSET(%[rseq_offset]), %l[error1])
@@ -833,7 +833,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_store_store__ptr)(intptr_t *v, intpt
                  [newv]                "r" (newv)
                : "memory", "cc", "eax"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -844,7 +844,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE
@@ -870,7 +870,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
 
        __asm__ __volatile__ goto (
                RSEQ_ASM_DEFINE_TABLE(3, 1f, 2f, 4f) /* start, commit, abort */
-               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[cmpfail])
+               RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[ne])
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error1])
                RSEQ_ASM_DEFINE_EXIT_POINT(1f, %l[error2])
@@ -925,7 +925,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                        "movl %[rseq_scratch2], %[len]\n\t"
                        "movl %[rseq_scratch1], %[dst]\n\t"
                        "movl %[rseq_scratch0], %[src]\n\t",
-                       cmpfail)
+                       ne)
 #ifdef RSEQ_COMPARE_TWICE
                RSEQ_ASM_DEFINE_CMPFAIL(6,
                        "movl %[rseq_scratch2], %[len]\n\t"
@@ -954,7 +954,7 @@ int RSEQ_TEMPLATE_IDENTIFIER(rseq_load_cbne_memcpy_store__ptr)(intptr_t *v, intp
                  [rseq_scratch2]       "m" (rseq_scratch[2])
                : "memory", "cc", "eax"
                  RSEQ_INJECT_CLOBBER
-               : abort, cmpfail
+               : abort, ne
 #ifdef RSEQ_COMPARE_TWICE
                  , error1, error2
 #endif
@@ -965,7 +965,7 @@ abort:
        rseq_after_asm_goto();
        RSEQ_INJECT_FAILED
        return -1;
-cmpfail:
+ne:
        rseq_after_asm_goto();
        return 1;
 #ifdef RSEQ_COMPARE_TWICE