Re: [PATCH v4 19/27] accel/tcg/plugin: Use copy_op in append_{udata,mem}_cb

[Alex Bennée]

Richard Henderson  writes:

> Better to re-use the existing function for copying ops.
>
> Reviewed-by: Philippe Mathieu-Daudé 
> Signed-off-by: Richard Henderson 

Acked-by: Alex Bennée 

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

[PATCH v4 19/27] accel/tcg/plugin: Use copy_op in append_{udata, mem}_cb

[Richard Henderson]

Better to re-use the existing function for copying ops.

Reviewed-by: Philippe Mathieu-Daudé 
Signed-off-by: Richard Henderson 
---
Cc: Alex Bennée 
---
 accel/tcg/plugin-gen.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
index 77e6823d6b..a6aaacd053 100644
--- a/accel/tcg/plugin-gen.c
+++ b/accel/tcg/plugin-gen.c
@@ -415,11 +415,11 @@ static TCGOp *append_udata_cb(const struct 
qemu_plugin_dyn_cb *cb,
 op = copy_const_ptr(_op, op, cb->userp);
 
 /* copy the ld_i32, but note that we only have to copy it once */
-begin_op = QTAILQ_NEXT(begin_op, link);
-tcg_debug_assert(begin_op && begin_op->opc == INDEX_op_ld_i32);
 if (*cb_idx == -1) {
-op = tcg_op_insert_after(tcg_ctx, op, INDEX_op_ld_i32);
-memcpy(op->args, begin_op->args, sizeof(op->args));
+op = copy_op(_op, op, INDEX_op_ld_i32);
+} else {
+begin_op = QTAILQ_NEXT(begin_op, link);
+tcg_debug_assert(begin_op && begin_op->opc == INDEX_op_ld_i32);
 }
 
 /* call */
@@ -462,11 +462,11 @@ static TCGOp *append_mem_cb(const struct 
qemu_plugin_dyn_cb *cb,
 op = copy_const_ptr(_op, op, cb->userp);
 
 /* copy the ld_i32, but note that we only have to copy it once */
-begin_op = QTAILQ_NEXT(begin_op, link);
-tcg_debug_assert(begin_op && begin_op->opc == INDEX_op_ld_i32);
 if (*cb_idx == -1) {
-op = tcg_op_insert_after(tcg_ctx, op, INDEX_op_ld_i32);
-memcpy(op->args, begin_op->args, sizeof(op->args));
+op = copy_op(_op, op, INDEX_op_ld_i32);
+} else {
+begin_op = QTAILQ_NEXT(begin_op, link);
+tcg_debug_assert(begin_op && begin_op->opc == INDEX_op_ld_i32);
 }
 
 /* extu_tl_i64 */
-- 
2.34.1