diff --git a/FEXCore/Source/Interface/Core/OpcodeDispatcher.h b/FEXCore/Source/Interface/Core/OpcodeDispatcher.h index a69070dce..357585af0 100644 --- a/FEXCore/Source/Interface/Core/OpcodeDispatcher.h +++ b/FEXCore/Source/Interface/Core/OpcodeDispatcher.h @@ -81,7 +81,6 @@ public: TYPE_ADC, TYPE_SBB, TYPE_SUB, - TYPE_ADD, TYPE_MUL, TYPE_UMUL, TYPE_LOGICAL, @@ -1829,24 +1828,6 @@ private: }; } - void GenerateFlags_ADD(FEXCore::X86Tables::DecodedOp Op, OrderedNode *Src1, OrderedNode *Src2, bool UpdateCF = true) { - if (!UpdateCF) { - // If we aren't updating CF then we need to calculate flags. Invalidation mask would make this not required. - CalculateDeferredFlags(); - } - CurrentDeferredFlags = DeferredFlagData { - .Type = FlagsGenerationType::TYPE_ADD, - .SrcSize = GetSrcSize(Op), - .Sources = { - .TwoSrcImmediate = { - .Src1 = Src1, - .Src2 = Src2, - .UpdateCF = UpdateCF, - }, - }, - }; - } - void GenerateFlags_MUL(FEXCore::X86Tables::DecodedOp Op, OrderedNode *Res, OrderedNode *High) { CurrentDeferredFlags = DeferredFlagData { .Type = FlagsGenerationType::TYPE_MUL, diff --git a/FEXCore/Source/Interface/Core/OpcodeDispatcher/Flags.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher/Flags.cpp index 0f81ecce2..7a5286d6c 100644 --- a/FEXCore/Source/Interface/Core/OpcodeDispatcher/Flags.cpp +++ b/FEXCore/Source/Interface/Core/OpcodeDispatcher/Flags.cpp @@ -333,13 +333,6 @@ void OpDispatchBuilder::CalculateDeferredFlags(uint32_t FlagsToCalculateMask) { CurrentDeferredFlags.Sources.TwoSrcImmediate.Src2, CurrentDeferredFlags.Sources.TwoSrcImmediate.UpdateCF); break; - case FlagsGenerationType::TYPE_ADD: - CalculateFlags_ADD( - CurrentDeferredFlags.SrcSize, - CurrentDeferredFlags.Sources.TwoSrcImmediate.Src1, - CurrentDeferredFlags.Sources.TwoSrcImmediate.Src2, - CurrentDeferredFlags.Sources.TwoSrcImmediate.UpdateCF); - break; case FlagsGenerationType::TYPE_MUL: CalculateFlags_MUL( CurrentDeferredFlags.SrcSize,