From 32f06c69f2284bc925e8d56fecbfc2a3f9f7301f Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 13 Jun 2022 09:52:59 +0200 Subject: [PATCH] x86: avoid string copy when swapping Vex.W controlled operands Now that op_out[] is an array of pointers, there's no need anymore to copy strings. Simply swap the pointers. --- opcodes/i386-dis.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 602535dc18e..d087b355103 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -13473,9 +13473,10 @@ OP_VexW (instr_info *ins, int bytemode, int sizeflag) if (ins->vex.w) { /* Swap 2nd and 3rd operands. */ - strcpy (ins->scratchbuf, ins->op_out[2]); - strcpy (ins->op_out[2], ins->op_out[1]); - strcpy (ins->op_out[1], ins->scratchbuf); + char *tmp = ins->op_out[2]; + + ins->op_out[2] = ins->op_out[1]; + ins->op_out[1] = tmp; } } @@ -13503,9 +13504,10 @@ OP_REG_VexI4 (instr_info *ins, int bytemode, int sizeflag ATTRIBUTE_UNUSED) if (ins->vex.w) { /* Swap 3rd and 4th operands. */ - strcpy (ins->scratchbuf, ins->op_out[3]); - strcpy (ins->op_out[3], ins->op_out[2]); - strcpy (ins->op_out[2], ins->scratchbuf); + char *tmp = ins->op_out[3]; + + ins->op_out[3] = ins->op_out[2]; + ins->op_out[2] = tmp; } } -- 2.30.2