M68: Replace FK_PCRel_ with FK_Data_+PCRel

Author: MaskRay

llvm/lib/Target/M68k/MCTargetDesc/M68kFixupKinds.h

@@ -19,36 +19,15 @@
 namespace llvm {
 static inline unsigned getFixupKindLog2Size(unsigned Kind) {
   switch (Kind) {
-  case FK_PCRel_1:
-  case FK_SecRel_1:
   case FK_Data_1:
     return 0;
-  case FK_PCRel_2:
-  case FK_SecRel_2:
   case FK_Data_2:
     return 1;
-  case FK_PCRel_4:
-  case FK_SecRel_4:
   case FK_Data_4:
     return 2;
   }
   llvm_unreachable("invalid fixup kind!");
 }
-
-static inline MCFixupKind getFixupForSize(unsigned Size, bool isPCRel) {
-  switch (Size) {
-  case 8:
-    return isPCRel ? FK_PCRel_1 : FK_Data_1;
-  case 16:
-    return isPCRel ? FK_PCRel_2 : FK_Data_2;
-  case 32:
-    return isPCRel ? FK_PCRel_4 : FK_Data_4;
-  case 64:
-    return isPCRel ? FK_PCRel_8 : FK_Data_8;
-  }
-  llvm_unreachable("Invalid generic fixup size!");
-}
-
 } // namespace llvm
 
 #endif // LLVM_LIB_TARGET_M68k_MCTARGETDESC_M68kFIXUPKINDS_H

llvm/lib/Target/M68k/MCTargetDesc/M68kMCCodeEmitter.cpp

@@ -144,8 +144,7 @@ void M68kMCCodeEmitter::encodeRelocImm(const MCInst &MI, unsigned OpIdx,
 
     // Relocatable address
     unsigned InsertByte = getBytePosition<Size>(InsertPos);
-    addFixup(Fixups, InsertByte, Expr,
-             getFixupForSize(Size, /*IsPCRel=*/false));
+    addFixup(Fixups, InsertByte, Expr, MCFixup::getDataKindForSize(Size / 8));
   }
 }
 
@@ -179,7 +178,8 @@ void M68kMCCodeEmitter::encodePCRelImm(const MCInst &MI, unsigned OpIdx,
             Expr, MCConstantExpr::create(LabelOffset, Ctx), Ctx);
     }
 
-    addFixup(Fixups, InsertByte, Expr, getFixupForSize(Size, true), true);
+    addFixup(Fixups, InsertByte, Expr, MCFixup::getDataKindForSize(Size / 8),
+             true);
   }
 }