From 27c49e9a8fc004de116243ba8887e054f1190b42 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 25 Mar 2015 13:44:28 +1100 Subject: [PATCH] powerpc: Only initialise opcode indices once The gdb TUI is calling gdb_print_insn() (which calls disassemble_init_powerpc()) enough to show up high in profiles. As suggested by Alan, only initialise if the indices are empty. opcodes/ChangeLog: 2015-03-25 Anton Blanchard * ppc-dis.c (disassemble_init_powerpc): Only initialise powerpc_opcd_indices and vle_opcd_indices once. --- opcodes/ChangeLog | 5 +++++ opcodes/ppc-dis.c | 54 +++++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index b19a1b18a87..9fdcbe488ff 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2015-03-25 Anton Blanchard + + * ppc-dis.c (disassemble_init_powerpc): Only initialise + powerpc_opcd_indices and vle_opcd_indices once. + 2015-03-25 Anton Blanchard * ppc-opc.c (powerpc_opcodes): Add slbfee. diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c index cf60873640c..ccea46680e2 100644 --- a/opcodes/ppc-dis.c +++ b/opcodes/ppc-dis.c @@ -341,37 +341,41 @@ disassemble_init_powerpc (struct disassemble_info *info) int i; unsigned short last; - i = powerpc_num_opcodes; - while (--i >= 0) + if (powerpc_opcd_indices[PPC_OPCD_SEGS] == 0) { - unsigned op = PPC_OP (powerpc_opcodes[i].opcode); - powerpc_opcd_indices[op] = i; - } + i = powerpc_num_opcodes; + while (--i >= 0) + { + unsigned op = PPC_OP (powerpc_opcodes[i].opcode); - last = powerpc_num_opcodes; - for (i = PPC_OPCD_SEGS; i > 0; --i) - { - if (powerpc_opcd_indices[i] == 0) - powerpc_opcd_indices[i] = last; - last = powerpc_opcd_indices[i]; - } + powerpc_opcd_indices[op] = i; + } - i = vle_num_opcodes; - while (--i >= 0) - { - unsigned op = VLE_OP (vle_opcodes[i].opcode, vle_opcodes[i].mask); - unsigned seg = VLE_OP_TO_SEG (op); + last = powerpc_num_opcodes; + for (i = PPC_OPCD_SEGS; i > 0; --i) + { + if (powerpc_opcd_indices[i] == 0) + powerpc_opcd_indices[i] = last; + last = powerpc_opcd_indices[i]; + } - vle_opcd_indices[seg] = i; - } + i = vle_num_opcodes; + while (--i >= 0) + { + unsigned op = VLE_OP (vle_opcodes[i].opcode, vle_opcodes[i].mask); + unsigned seg = VLE_OP_TO_SEG (op); - last = vle_num_opcodes; - for (i = VLE_OPCD_SEGS; i > 0; --i) - { - if (vle_opcd_indices[i] == 0) - vle_opcd_indices[i] = last; - last = vle_opcd_indices[i]; + vle_opcd_indices[seg] = i; + } + + last = vle_num_opcodes; + for (i = VLE_OPCD_SEGS; i > 0; --i) + { + if (vle_opcd_indices[i] == 0) + vle_opcd_indices[i] = last; + last = vle_opcd_indices[i]; + } } if (info->arch == bfd_arch_powerpc) -- 2.30.2