From 6020ff66679959a610f6bb4678d268fcb6c716ae Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 27 Feb 2024 15:44:30 -0500 Subject: [PATCH] arm64: Rename RSEQ_ASM_OP_R_BAD_MEMCPY to RSEQ_ASM_OP_R_BYTEWISE_MEMCPY This is more descriptive. Signed-off-by: Mathieu Desnoyers Change-Id: Ic5b33693ae39729859ea734721ffd323a7151c68 --- include/rseq/rseq-arm64-bits.h | 2 +- include/rseq/rseq-arm64.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/rseq/rseq-arm64-bits.h b/include/rseq/rseq-arm64-bits.h index 9d3c96a..f10735f 100644 --- a/include/rseq/rseq-arm64-bits.h +++ b/include/rseq/rseq-arm64-bits.h @@ -347,7 +347,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, %l[error1]) RSEQ_ASM_OP_CBNE(v, expect, %l[error2]) #endif - RSEQ_ASM_OP_R_BAD_MEMCPY(dst, src, len) + RSEQ_ASM_OP_R_BYTEWISE_MEMCPY(dst, src, len) RSEQ_INJECT_ASM(5) #ifdef RSEQ_TEMPLATE_MO_RELEASE RSEQ_ASM_OP_FINAL_STORE_RELEASE(newv, v, 3) diff --git a/include/rseq/rseq-arm64.h b/include/rseq/rseq-arm64.h index d73a80b..d1da1ec 100644 --- a/include/rseq/rseq-arm64.h +++ b/include/rseq/rseq-arm64.h @@ -192,7 +192,7 @@ do { \ " str " RSEQ_ASM_TMP_REG ", %[" __rseq_str(var) "]\n" \ __rseq_str(post_commit_label) ":\n" -#define RSEQ_ASM_OP_R_BAD_MEMCPY(dst, src, len) \ +#define RSEQ_ASM_OP_R_BYTEWISE_MEMCPY(dst, src, len) \ " cbz %[" __rseq_str(len) "], 333f\n" \ " mov " RSEQ_ASM_TMP_REG_2 ", %[" __rseq_str(len) "]\n" \ "222: sub " RSEQ_ASM_TMP_REG_2 ", " RSEQ_ASM_TMP_REG_2 ", #1\n" \ -- 2.34.1