objtool/x86: Separate arch-specific and generic parts

[linux-2.6-block.git] / tools / objtool / orc_dump.c

diff --git a/tools/objtool/orc_dump.c b/tools/objtool/orc_dump.c
index 0e183bb1c72051157cb1e6daf30fa12ff3f0ce7c..a62247efb64f2e06c293e129ade3abae4fd456c1 100644 (file)
--- a/tools/objtool/orc_dump.c
+++ b/tools/objtool/orc_dump.c
@@ -6,65 +6,10 @@
 #include <unistd.h>
 #include <asm/orc_types.h>
 #include <objtool/objtool.h>
+#include <objtool/orc.h>
 #include <objtool/warn.h>
 #include <objtool/endianness.h>
 
-static const char *reg_name(unsigned int reg)
-{
-       switch (reg) {
-       case ORC_REG_PREV_SP:
-               return "prevsp";
-       case ORC_REG_DX:
-               return "dx";
-       case ORC_REG_DI:
-               return "di";
-       case ORC_REG_BP:
-               return "bp";
-       case ORC_REG_SP:
-               return "sp";
-       case ORC_REG_R10:
-               return "r10";
-       case ORC_REG_R13:
-               return "r13";
-       case ORC_REG_BP_INDIRECT:
-               return "bp(ind)";
-       case ORC_REG_SP_INDIRECT:
-               return "sp(ind)";
-       default:
-               return "?";
-       }
-}
-
-static const char *orc_type_name(unsigned int type)
-{
-       switch (type) {
-       case ORC_TYPE_UNDEFINED:
-               return "(und)";
-       case ORC_TYPE_END_OF_STACK:
-               return "end";
-       case ORC_TYPE_CALL:
-               return "call";
-       case ORC_TYPE_REGS:
-               return "regs";
-       case ORC_TYPE_REGS_PARTIAL:
-               return "regs (partial)";
-       default:
-               return "?";
-       }
-}
-
-static void print_reg(unsigned int reg, int offset)
-{
-       if (reg == ORC_REG_BP_INDIRECT)
-               printf("(bp%+d)", offset);
-       else if (reg == ORC_REG_SP_INDIRECT)
-               printf("(sp)%+d", offset);
-       else if (reg == ORC_REG_UNDEFINED)
-               printf("(und)");
-       else
-               printf("%s%+d", reg_name(reg), offset);
-}
-
 int orc_dump(const char *_objname)
 {
        int fd, nr_entries, i, *orc_ip = NULL, orc_size = 0;
@@ -205,17 +150,7 @@ int orc_dump(const char *_objname)
                        printf("%llx:", (unsigned long long)(orc_ip_addr + (i * sizeof(int)) + orc_ip[i]));
                }
 
-               printf("type:%s", orc_type_name(orc[i].type));
-
-               printf(" sp:");
-
-               print_reg(orc[i].sp_reg, bswap_if_needed(&dummy_elf, orc[i].sp_offset));
-
-               printf(" bp:");
-
-               print_reg(orc[i].bp_reg, bswap_if_needed(&dummy_elf, orc[i].bp_offset));
-
-               printf(" signal:%d\n", orc[i].signal);
+               orc_print_dump(&dummy_elf, orc, i);
        }
 
        elf_end(elf);