Reduce static data

include/retdec/bin2llvmir/analyses/reaching_definitions.h

@@ -83,7 +83,7 @@ class Use
 class BasicBlockEntry
 {
 	public:
-		BasicBlockEntry(const llvm::BasicBlock* b = nullptr);
+		BasicBlockEntry(const llvm::BasicBlock* b = nullptr, std::size_t _id = 0);
 
 		std::string getName() const;
 		friend std::ostream& operator<<(
@@ -115,7 +115,6 @@ class BasicBlockEntry
 
 	private:
 		unsigned id;
-	    static int newUID;
 };
 
 class ReachingDefinitionsAnalysis

include/retdec/bin2llvmir/analyses/symbolic_tree.h

@@ -135,6 +135,7 @@ class SymbolicTree
 	// Global SymbolicTree configuration methods and data.
 	//
 	public:
+		static void clear();
 		static bool isVal2ValMapUsed();
 		static void setAbi(Abi* abi);
 		static void setConfig(Config* config);

include/retdec/bin2llvmir/optimizations/param_return/collector/collector.h

@@ -78,7 +78,8 @@ class Collector
 		bool extractFormatString(CallEntry* ce) const;
 
 		bool storesString(llvm::StoreInst* si, std::string& str) const;
-		llvm::Value* getRoot(llvm::Value* i, bool first = true) const;
+		llvm::Value* getRoot(llvm::Value* i) const;
+		llvm::Value* _getRoot(llvm::Value* i, std::set<llvm::Value*>& seen) const;
 
 	protected:
 		const Abi* _abi;

include/retdec/bin2llvmir/optimizations/register_localization/register_localization.h

@@ -40,7 +40,6 @@ class RegisterLocalization : public llvm::ModulePass
 		llvm::Module* _module = nullptr;
 		Abi* _abi = nullptr;
 		Config* _config = nullptr;
-		static std::map<llvm::Type*, llvm::Function*> _type2fnc;
 };
 
 } // namespace bin2llvmir

include/retdec/bin2llvmir/optimizations/simple_types/simple_types.h

@@ -132,7 +132,7 @@ using EquationEntrySet = std::unordered_set<EquationEntry, EquationEntryHash>;
 class EqSet
 {
 	public:
-		EqSet();
+		EqSet(std::size_t id);
 		void insert(Config* config, llvm::Value* v, eSourcePriority p = eSourcePriority::PRIORITY_NONE);
 		void insert(llvm::Type* t, eSourcePriority p = eSourcePriority::PRIORITY_NONE);
 		void propagate(llvm::Module* module);
@@ -157,8 +157,7 @@ class EqSet
 
 	public:
 		/// Each instance gets its own unique ID for debug print purposes.
-		static unsigned newUID;
-		const unsigned id;
+		const std::size_t id;
 
 		/// Type of an entire equivalence set.
 		TypeEntry masterType;

include/retdec/bin2llvmir/providers/calling_convention/calling_convention.h

@@ -129,6 +129,7 @@ class CallingConventionProvider
 	// Destructor, singleton method.
 	public:
 		static CallingConventionProvider* getProvider();
+		static void clear();
 
 	// Factory methods.
 	public:

src/bin2llvmir/analyses/reaching_definitions.cpp

@@ -94,7 +94,7 @@ void ReachingDefinitionsAnalysis::initializeBasicBlocks(llvm::Function& F)
 {
 	for (BasicBlock& B : F)
 	{
-		BasicBlockEntry bbe(&B);
+		BasicBlockEntry bbe(&B, bbMap.size());
 
 		int insnPos = -1;
 		for (Instruction& I : B)
@@ -385,11 +385,9 @@ std::ostream& operator<<(std::ostream& out, const ReachingDefinitionsAnalysis& r
 //=============================================================================
 //
 
-int BasicBlockEntry::newUID = 0;
-
-BasicBlockEntry::BasicBlockEntry(const llvm::BasicBlock* b) :
+BasicBlockEntry::BasicBlockEntry(const llvm::BasicBlock* b, std::size_t _id) :
 	bb(b),
-	id(newUID++)
+	id(_id)
 {
 
 }

src/bin2llvmir/analyses/symbolic_tree.cpp

@@ -709,8 +709,16 @@ bool SymbolicTree::_trackOnlyFlagRegisters = false;
 bool SymbolicTree::_simplifyAtCreation = true;
 unsigned SymbolicTree::_naryLimit = 3;
 
+void SymbolicTree::clear()
+{
+	_abi = nullptr;
+	_config = nullptr;
+	setToDefaultConfiguration();
+}
+
 void SymbolicTree::setToDefaultConfiguration()
 {
+	_val2valUsed = false;
 	_trackThroughAllocaLoads = true;
 	_trackThroughGeneralRegisterLoads = true;
 	_trackOnlyFlagRegisters = false;

src/bin2llvmir/optimizations/decoder/arm.cpp

@@ -109,7 +109,7 @@ std::size_t Decoder::decodeJumpTargetDryRun_arm(
 	auto basicMode = _c2l->getBasicMode();
 	if (mode != basicMode) _c2l->modifyBasicMode(mode);
 
-	static csh ce = _c2l->getCapstoneEngine();
+	csh ce = _c2l->getCapstoneEngine();
 
 	decodedSz = 0;
 	uint64_t addr = jt.getAddress();

src/bin2llvmir/optimizations/decoder/arm64.cpp

@@ -55,7 +55,7 @@ std::size_t Decoder::decodeJumpTargetDryRun_arm64(
 		return true;
 	}
 
-	static csh ce = _c2l->getCapstoneEngine();
+	csh ce = _c2l->getCapstoneEngine();
 
 	uint64_t addr = jt.getAddress();
 	std::size_t nops = 0;

src/bin2llvmir/optimizations/decoder/decoder_ranges.cpp

@@ -78,7 +78,7 @@ void RangesToDecode::removeZeroSequences(
 		FileImage* image,
 		common::AddressRangeContainer& rs)
 {
-	static unsigned minSequence = 0x50; // TODO: Maybe should be smaller.
+	unsigned minSequence = 0x50; // TODO: Maybe should be smaller.
 	retdec::common::AddressRangeContainer toRemove;
 
 	for (auto& range : rs)

src/bin2llvmir/optimizations/decoder/jump_targets.cpp

@@ -187,7 +187,7 @@ const JumpTarget* JumpTargets::push(
 		retdec::common::Address f,
 		std::optional<std::size_t> sz)
 {
-	static auto& arch = config->getConfig().architecture;
+	auto& arch = config->getConfig().architecture;
 
 	if (arch.isArm64() && m == CS_MODE_THUMB)
 	{

src/bin2llvmir/optimizations/decoder/mips.cpp

@@ -75,7 +75,7 @@ std::size_t Decoder::decodeJumpTargetDryRun_mips(
 		return true;
 	}
 
-	static csh ce = _c2l->getCapstoneEngine();
+	csh ce = _c2l->getCapstoneEngine();
 
 	uint64_t addr = jt.getAddress();
 	std::size_t nops = 0;

src/bin2llvmir/optimizations/decoder/powerpc.cpp

@@ -25,7 +25,7 @@ std::size_t Decoder::decodeJumpTargetDryRun_ppc(
 		return true;
 	}
 
-	static csh ce = _c2l->getCapstoneEngine();
+	csh ce = _c2l->getCapstoneEngine();
 
 	uint64_t addr = jt.getAddress();
 	std::size_t nops = 0;

src/bin2llvmir/optimizations/decoder/x86.cpp

@@ -25,7 +25,7 @@ std::size_t Decoder::decodeJumpTargetDryRun_x86(
 		return true;
 	}
 
-	static csh ce = _c2l->getCapstoneEngine();
+	csh ce = _c2l->getCapstoneEngine();
 
 	uint64_t addr = jt.getAddress();
 	std::size_t nops = 0;

src/bin2llvmir/optimizations/inst_opt_rda/inst_opt_rda.cpp

@@ -29,7 +29,7 @@ namespace inst_opt_rda {
  */
 bool unusedStores(llvm::Instruction* insn, ReachingDefinitionsAnalysis& RDA)
 {
-	static auto* abi = AbiProvider::getAbi(insn->getModule());
+	auto* abi = AbiProvider::getAbi(insn->getModule());
 	auto* store = llvm::dyn_cast<llvm::StoreInst>(insn);
 	if (store == nullptr
 			|| (llvm::isa<llvm::GlobalVariable>(store->getPointerOperand())

src/bin2llvmir/optimizations/param_return/collector/collector.cpp

@@ -545,13 +545,14 @@ bool Collector::storesString(StoreInst* si, std::string& str) const
 	return true;
 }
 
-llvm::Value* Collector::getRoot(llvm::Value* i, bool first) const
+llvm::Value* Collector::getRoot(llvm::Value* i) const
+{
+	std::set<llvm::Value*> seen;
+	return _getRoot(i, seen);
+}
+
+llvm::Value* Collector::_getRoot(llvm::Value* i, std::set<llvm::Value*>& seen) const
 {
-	static std::set<llvm::Value*> seen;
-	if (first)
-	{
-		seen.clear();
-	}
 	if (seen.count(i))
 	{
 		return i;
@@ -568,7 +569,7 @@ llvm::Value* Collector::getRoot(llvm::Value* i, bool first) const
 				auto* d = (*u->defs.begin())->def;
 				if (auto* s = dyn_cast<StoreInst>(d))
 				{
-					return getRoot(s->getValueOperand(), false);
+					return _getRoot(s->getValueOperand(), seen);
 				}
 				else
 				{
@@ -577,7 +578,7 @@ llvm::Value* Collector::getRoot(llvm::Value* i, bool first) const
 			}
 			else if (auto* l = dyn_cast<LoadInst>(ii))
 			{
-				return getRoot(l->getPointerOperand(), false);
+				return _getRoot(l->getPointerOperand(), seen);
 			}
 			else
 			{
@@ -586,7 +587,7 @@ llvm::Value* Collector::getRoot(llvm::Value* i, bool first) const
 		}
 		else if (auto* l = dyn_cast<LoadInst>(ii))
 		{
-			return getRoot(l->getPointerOperand(), false);
+			return _getRoot(l->getPointerOperand(), seen);
 		}
 		else
 		{

src/bin2llvmir/optimizations/provider_init/provider_init.cpp

@@ -13,6 +13,7 @@
 #include "retdec/bin2llvmir/optimizations/provider_init/provider_init.h"
 #include "retdec/bin2llvmir/providers/abi/abi.h"
 #include "retdec/bin2llvmir/providers/asm_instruction.h"
+#include "retdec/bin2llvmir/providers/calling_convention/calling_convention.h"
 #include "retdec/bin2llvmir/providers/config.h"
 #include "retdec/bin2llvmir/providers/debugformat.h"
 #include "retdec/bin2llvmir/providers/demangler.h"
@@ -170,11 +171,16 @@ void ProviderInitialization::setConfig(retdec::config::Config* c)
  */
 bool ProviderInitialization::runOnModule(Module& m)
 {
-	static bool firstRun = true;
-	if (!firstRun)
-	{
-		return false;
-	}
+	AbiProvider::clear();
+	AsmInstruction::clear();
+	ConfigProvider::clear();
+	DebugFormatProvider::clear();
+	DemanglerProvider::clear();
+	FileImageProvider::clear();
+	LtiProvider::clear();
+	NamesProvider::clear();
+	SymbolicTree::clear();
+	CallingConventionProvider::clear();
 
 	// Config.
 	//
@@ -397,8 +403,6 @@ bool ProviderInitialization::runOnModule(Module& m)
 
 	AsmInstruction::clear();
 
-	firstRun = false;
-
 	return false;
 }
 

src/bin2llvmir/optimizations/register_localization/register_localization.cpp

@@ -24,8 +24,6 @@ namespace bin2llvmir {
 
 char RegisterLocalization::ID = 0;
 
-std::map<llvm::Type*, llvm::Function*> RegisterLocalization::_type2fnc;
-
 static RegisterPass<RegisterLocalization> X(
 		"retdec-register-localization",
 		"Make all registers local",

src/bin2llvmir/optimizations/simple_types/simple_types.cpp

@@ -87,18 +87,21 @@ bool SimpleTypesAnalysis::runOnModule(Module& M)
 
 	if (first)
 	{
+		first = false;
+
 		RDA.runOnModule(M, AbiProvider::getAbi(&M));
 		buildEqSets(M);
 		buildEquations();
 		eqSets.propagate(module);
 		eqSets.apply(module, config, objf, instToErase);
 		eraseObsoleteInstructions();
 		setGlobalConstants();
-		first = false;
 		RDA.clear();
 	}
 	else
 	{
+		first = true;
+
 		instToErase.clear();
 
 		IrModifier irModif(module, config);
@@ -721,7 +724,7 @@ void SimpleTypesAnalysis::eraseObsoleteInstructions()
 
 EqSet& EqSetContainer::createEmptySet()
 {
-	eqSets.push_back( EqSet() );
+	eqSets.push_back(EqSet(eqSets.size()));
 	return eqSets.back();
 }
 
@@ -762,10 +765,8 @@ std::ostream& operator<<(std::ostream& out, const EqSetContainer& eqs)
 //=============================================================================
 //
 
-unsigned EqSet::newUID = 0;
-
-EqSet::EqSet() :
-		id(newUID++)
+EqSet::EqSet(std::size_t id) :
+		id(id)
 {
 
 }
@@ -1228,7 +1229,7 @@ void EqSet::apply(
 
 	LOG << "\napply BEGIN " << id << " =============================\n";
 
-	static auto &conf = config->getConfig();
+	auto &conf = config->getConfig();
 
 	IrModifier irModif(module, config);
 	for (auto& vs : valSet)

src/bin2llvmir/optimizations/types_propagator/types_propagator.cpp

@@ -97,7 +97,7 @@ if (fnc.getName() != "_func") continue;
 
 bool TypesPropagator::skipRootProcessing(llvm::Value* val)
 {
-	static auto* special = AsmInstruction::getLlvmToAsmGlobalVariable(_module);
+	auto* special = AsmInstruction::getLlvmToAsmGlobalVariable(_module);
 	return val == special
 			|| _abi->isRegister(val)
 			// || (llvm::isa<llvm::Instruction>(val)

src/bin2llvmir/optimizations/value_protect/value_protect.cpp

@@ -303,6 +303,11 @@ bool ValueProtect::run()
 
 	bool changed = false;
 
+	if (!_type2fnc.empty() && _type2fnc.begin()->second->getParent() != _module)
+	{
+		_type2fnc.clear();
+	}
+
 	changed = _type2fnc.empty() ? protect() : unprotect();
 
 	return changed;

src/bin2llvmir/optimizations/writer_dsm/writer_dsm.cpp

@@ -259,7 +259,7 @@ void DsmWriter::generateFunction(
 
 void DsmWriter::getAsmInstructionHex(AsmInstruction& ai, std::ostream& ret)
 {
-	static std::size_t longestHexa = _longestInst * 3 - 1;
+	std::size_t longestHexa = _longestInst * 3 - 1;
 	const std::size_t aiHexa = ai.getByteSize() * 3 - 1;
 
 	std::vector<std::uint64_t> bytes;

src/bin2llvmir/providers/calling_convention/calling_convention.cpp

@@ -192,6 +192,13 @@ CallingConventionProvider* CallingConventionProvider::getProvider()
 	return &instance;
 }
 
+void CallingConventionProvider::clear()
+{
+	// TODO: probably not needed. and definitely not working.
+//	auto* ccp = getProvider();
+//	ccp->_id2cc.clear();
+}
+
 void CallingConventionProvider::registerCC(
 					const CallingConvention::ID& cc,
 					const CallingConvention::ConstructorMethod& con)

src/bin2llvmir/providers/fileimage.cpp

@@ -507,7 +507,7 @@ llvm::Constant* FileImage::getConstant(
 			refGvs.push_back(newGv);
 			addr += Abi::getTypeByteSize(_module, Abi::getDefaultType(_module));
 
-			static auto& conf = config->getConfig();
+			auto& conf = config->getConfig();
 			if (conf.globals.getObjectByAddress(addr))
 			{
 				break;