ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disas/microblaze: Split out print_immval_addr 

Unify the code blocks that try to print a symbolic address.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-15-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-12 00:33:33 -07:00
parent 7210ddb45f
commit 58e5632c70
1 changed files with 29 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
disas/microblaze.c
View File

@ -767,6 +767,24 @@ read_insn_microblaze (bfd_vma memaddr,
return inst; return inst;
} }
static void print_immval_addr(struct disassemble_info *info, bool immfound,
int immval, unsigned inst, int addend)
{
if (info->print_address_func && info->symbol_at_address_func) {
if (immfound) {
immval |= get_int_field_imm(inst) & 0x0000ffff;
} else {
immval = (int16_t)get_int_field_imm(inst);
}
immval += addend;
if (immval != 0 && info->symbol_at_address_func(immval, info)) {
info->fprintf_func(info->stream, "\t// ");
info->print_address_func (immval, info);
} else if (addend) {
info->fprintf_func(info->stream, "\t// %x", immval);
}
}
}
int int
print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
@ -821,18 +839,8 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
break; break;
case INST_TYPE_RD_R1_IMM: case INST_TYPE_RD_R1_IMM:
fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(inst), get_field_imm(inst)); fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(inst), get_field_imm(inst));
if (info->print_address_func && get_int_field_r1(inst) == 0 && info->symbol_at_address_func) { if (get_int_field_r1(inst) == 0) {
if (immfound) print_immval_addr(info, immfound, immval, inst, 0);
immval |= (get_int_field_imm(inst) & 0x0000ffff);
else {
immval = get_int_field_imm(inst);
if (immval & 0x8000)
immval |= 0xFFFF0000;
}
if (immval > 0 && info->symbol_at_address_func(immval, info)) {
fprintf_func (stream, "\t// ");
info->print_address_func (immval, info);
}
} }
break; break;
case INST_TYPE_RD_R1_IMM5: case INST_TYPE_RD_R1_IMM5:
@ -860,61 +868,22 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_imm(inst)); fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_imm(inst));
/* The non-pc relative instructions are returns, which shouldn't /* The non-pc relative instructions are returns, which shouldn't
have a label printed */ have a label printed */
if (info->print_address_func && op->inst_offset_type == INST_PC_OFFSET && info->symbol_at_address_func) { if (op->inst_offset_type == INST_PC_OFFSET) {
if (immfound) print_immval_addr(info, immfound, immval, inst, memaddr);
immval |= (get_int_field_imm(inst) & 0x0000ffff);
else {
immval = get_int_field_imm(inst);
if (immval & 0x8000)
immval |= 0xFFFF0000;
}
immval += memaddr;
if (immval > 0 && info->symbol_at_address_func(immval, info)) {
fprintf_func (stream, "\t// ");
info->print_address_func (immval, info);
} else {
fprintf_func (stream, "\t\t// ");
fprintf_func (stream, "%x", immval);
}
} }
break; break;
case INST_TYPE_RD_IMM: case INST_TYPE_RD_IMM:
fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm(inst)); fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm(inst));
if (info->print_address_func && info->symbol_at_address_func) { print_immval_addr(info, immfound, immval, inst,
if (immfound) op->inst_offset_type == INST_PC_OFFSET
immval |= (get_int_field_imm(inst) & 0x0000ffff); ? memaddr : 0);
else {
immval = get_int_field_imm(inst);
if (immval & 0x8000)
immval |= 0xFFFF0000;
}
if (op->inst_offset_type == INST_PC_OFFSET)
immval += (int) memaddr;
if (info->symbol_at_address_func(immval, info)) {
fprintf_func (stream, "\t// ");
info->print_address_func (immval, info);
}
}
break; break;
case INST_TYPE_IMM: case INST_TYPE_IMM:
fprintf_func(stream, "\t%s", get_field_imm(inst)); fprintf_func(stream, "\t%s", get_field_imm(inst));
if (info->print_address_func && info->symbol_at_address_func && op->instr != imm) { if (op->instr != imm) {
if (immfound) print_immval_addr(info, immfound, immval, inst,
immval |= (get_int_field_imm(inst) & 0x0000ffff); op->inst_offset_type == INST_PC_OFFSET
else { ? memaddr : 0);
immval = get_int_field_imm(inst);
if (immval & 0x8000)
immval |= 0xFFFF0000;
}
if (op->inst_offset_type == INST_PC_OFFSET)
immval += (int) memaddr;
if (immval > 0 && info->symbol_at_address_func(immval, info)) {
fprintf_func (stream, "\t// ");
info->print_address_func (immval, info);
} else if (op->inst_offset_type == INST_PC_OFFSET) {
fprintf_func (stream, "\t\t// ");
fprintf_func (stream, "%x", immval);
}
} }
break; break;
case INST_TYPE_RD_R2: case INST_TYPE_RD_R2: