ASoC: Merge up left over v6.8 fix

[linux-block.git] / tools / objtool / orc_gen.c

diff --git a/tools/objtool/orc_gen.c b/tools/objtool/orc_gen.c
index bae343908867105f25ac35c61083e4d0ecfeca73..922e6aac7cea7c089fb48b37e94a01718b8c00ab 100644 (file)
--- a/tools/objtool/orc_gen.c
+++ b/tools/objtool/orc_gen.c
@@ -10,121 +10,10 @@
 #include <asm/orc_types.h>
 
 #include <objtool/check.h>
+#include <objtool/orc.h>
 #include <objtool/warn.h>
 #include <objtool/endianness.h>
 
-static int init_orc_entry(struct orc_entry *orc, struct cfi_state *cfi,
-                         struct instruction *insn)
-{
-       struct cfi_reg *bp = &cfi->regs[CFI_BP];
-
-       memset(orc, 0, sizeof(*orc));
-
-       if (!cfi) {
-               /*
-                * This is usually either unreachable nops/traps (which don't
-                * trigger unreachable instruction warnings), or
-                * STACK_FRAME_NON_STANDARD functions.
-                */
-               orc->type = ORC_TYPE_UNDEFINED;
-               return 0;
-       }
-
-       switch (cfi->type) {
-       case UNWIND_HINT_TYPE_UNDEFINED:
-               orc->type = ORC_TYPE_UNDEFINED;
-               return 0;
-       case UNWIND_HINT_TYPE_END_OF_STACK:
-               orc->type = ORC_TYPE_END_OF_STACK;
-               return 0;
-       case UNWIND_HINT_TYPE_CALL:
-               orc->type = ORC_TYPE_CALL;
-               break;
-       case UNWIND_HINT_TYPE_REGS:
-               orc->type = ORC_TYPE_REGS;
-               break;
-       case UNWIND_HINT_TYPE_REGS_PARTIAL:
-               orc->type = ORC_TYPE_REGS_PARTIAL;
-               break;
-       default:
-               WARN_INSN(insn, "unknown unwind hint type %d", cfi->type);
-               return -1;
-       }
-
-       orc->signal = cfi->signal;
-
-       switch (cfi->cfa.base) {
-       case CFI_SP:
-               orc->sp_reg = ORC_REG_SP;
-               break;
-       case CFI_SP_INDIRECT:
-               orc->sp_reg = ORC_REG_SP_INDIRECT;
-               break;
-       case CFI_BP:
-               orc->sp_reg = ORC_REG_BP;
-               break;
-       case CFI_BP_INDIRECT:
-               orc->sp_reg = ORC_REG_BP_INDIRECT;
-               break;
-       case CFI_R10:
-               orc->sp_reg = ORC_REG_R10;
-               break;
-       case CFI_R13:
-               orc->sp_reg = ORC_REG_R13;
-               break;
-       case CFI_DI:
-               orc->sp_reg = ORC_REG_DI;
-               break;
-       case CFI_DX:
-               orc->sp_reg = ORC_REG_DX;
-               break;
-       default:
-               WARN_INSN(insn, "unknown CFA base reg %d", cfi->cfa.base);
-               return -1;
-       }
-
-       switch (bp->base) {
-       case CFI_UNDEFINED:
-               orc->bp_reg = ORC_REG_UNDEFINED;
-               break;
-       case CFI_CFA:
-               orc->bp_reg = ORC_REG_PREV_SP;
-               break;
-       case CFI_BP:
-               orc->bp_reg = ORC_REG_BP;
-               break;
-       default:
-               WARN_INSN(insn, "unknown BP base reg %d", bp->base);
-               return -1;
-       }
-
-       orc->sp_offset = cfi->cfa.offset;
-       orc->bp_offset = bp->offset;
-
-       return 0;
-}
-
-static int write_orc_entry(struct elf *elf, struct section *orc_sec,
-                          struct section *ip_sec, unsigned int idx,
-                          struct section *insn_sec, unsigned long insn_off,
-                          struct orc_entry *o)
-{
-       struct orc_entry *orc;
-
-       /* populate ORC data */
-       orc = (struct orc_entry *)orc_sec->data->d_buf + idx;
-       memcpy(orc, o, sizeof(*orc));
-       orc->sp_offset = bswap_if_needed(elf, orc->sp_offset);
-       orc->bp_offset = bswap_if_needed(elf, orc->bp_offset);
-
-       /* populate reloc for ip */
-       if (!elf_init_reloc_text_sym(elf, ip_sec, idx * sizeof(int), idx,
-                                    insn_sec, insn_off))
-               return -1;
-
-       return 0;
-}
-
 struct orc_list_entry {
        struct list_head list;
        struct orc_entry orc;