Merge pull request #64 from grimaz/main

llvm-20 update

Author: NaC-L

lifter/CustomPasses.hpp

@@ -8,6 +8,7 @@
 #include "llvm/IR/PassManager.h"
 #include <llvm/Analysis/ValueTracking.h>
 #include <llvm/IR/CFG.h>
+#include <llvm/IR/Module.h>
 #include <llvm/IR/Function.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/Support/KnownBits.h>

lifter/GEPTracker.cpp

@@ -57,7 +57,7 @@ namespace BinaryOperations {
   bool readMemory(uint64_t addr, unsigned byteSize, APInt& value) {
 
     uint64_t mappedAddr = address_to_mapped_address(addr);
-    uint64_t tempValue;
+    uint64_t tempValue = 0;
     if (mappedAddr > 0) {
       std::memcpy(&tempValue,
                   reinterpret_cast<const void*>(data_g + mappedAddr), byteSize);

lifter/OperandUtils.ipp

@@ -62,10 +62,14 @@ static void findAffectedValues(Value* Cond, SmallVectorImpl<Value*>& Affected) {
     }
   };
 
-  llvm::ICmpInst::Predicate Pred;
+  llvm::ICmpInst::Predicate Pred = {};
   Value* A;
-
-  if (match(Cond, m_ICmp(Pred, m_Value(A), m_Constant()))) {
+#if LLVM_VERSION_MAJOR > 18
+  llvm::CmpPredicate CmpPred { Pred };
+  if (match(Cond, m_ICmp(CmpPred, m_Value(A), m_Constant()))) {
+#else
+ if (match(Cond, m_ICmp(Pred, m_Value(A), m_Constant()))) {
+#endif
     AddAffected(A);
 
     if (llvm::ICmpInst::isEquality(Pred)) {
@@ -625,11 +629,19 @@ KnownBits computeKnownBitsFromOperation(KnownBits& vv1, KnownBits& vv2,
 
   switch (opcode) {
   case Instruction::Add: {
-    return KnownBits::computeForAddSub(1, 0, vv1, vv2);
+#if LLVM_VERSION_MAJOR > 18
+    return KnownBits::computeForAddSub(true, false, false, vv1, vv2);
+#else
+    return KnownBits::computeForAddSub(true, false, vv1, vv2);
+#endif
     break;
   }
   case Instruction::Sub: {
-    return KnownBits::computeForAddSub(0, 0, vv1, vv2);
+#if LLVM_VERSION_MAJOR > 18
+    return KnownBits::computeForAddSub(false, false, false, vv1, vv2);
+#else
+    return KnownBits::computeForAddSub(false, false, vv1, vv2);
+#endif
     break;
   }
   case Instruction::Mul: {

lifter/PathSolver.ipp

@@ -4,6 +4,8 @@
 #include "lifterClass.hpp"
 #include <llvm/IR/Function.h>
 #include <llvm/IR/Value.h>
+#include <llvm/IR/Module.h>
+
 
 MERGEN_LIFTER_DEFINITION_TEMPLATES(PATH_info)::solvePath(
     llvm::Function* function, uint64_t& dest, Value* simplifyValue) {
@@ -125,4 +127,4 @@ MERGEN_LIFTER_DEFINITION_TEMPLATES(PATH_info)::solvePath(
   }
 
   return result;
-}
+}