From 28880e72adc5d600b99eb1b2b838f298184660c7 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 27 Feb 2024 15:45:32 -0500 Subject: [PATCH] riscv: 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: I3f397cc63f60c2d806b1665de9b6bae4106f1db1 --- include/rseq/rseq-riscv-bits.h | 2 +- include/rseq/rseq-riscv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/rseq/rseq-riscv-bits.h b/include/rseq/rseq-riscv-bits.h index 1d923ba..3cc8ece 100644 --- a/include/rseq/rseq-riscv-bits.h +++ b/include/rseq/rseq-riscv-bits.h @@ -364,7 +364,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-riscv.h b/include/rseq/rseq-riscv.h index 2475b72..3fb7232 100644 --- a/include/rseq/rseq-riscv.h +++ b/include/rseq/rseq-riscv.h @@ -147,7 +147,7 @@ do { \ REG_S RSEQ_ASM_TMP_REG_1 ", %[" __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) \ "beqz %[" __rseq_str(len) "], 333f\n" \ "mv " RSEQ_ASM_TMP_REG_1 ", %[" __rseq_str(len) "]\n" \ "mv " RSEQ_ASM_TMP_REG_2 ", %[" __rseq_str(src) "]\n" \ -- 2.34.1