bump remill and fix initial state pc (#407)

* bump remill and fix initial state pc * bump remill * don't install python3 bindings in CI * dont set body twice if struct named twice * completely remove python * try to be robust to overlapping vars --------- Co-authored-by: William Tan <[email protected]>
lifting-bits · Feb 28, 2024 · 30969fb · 30969fb
1 parent 70209a8
commit 30969fb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -286,6 +286,7 @@ jobs:
               -Dsleigh_DIR:PATH=${{ steps.remill_installer.outputs.PATH }}/usr/local/lib/cmake/sleigh \
               -DANVILL_ENABLE_TESTS=true \
               -DANVILL_ENABLE_INSTALL=true \
+              -DANVILL_INSTALL_PYTHON3_LIBS=false \
               -G Ninja \
               ${{ steps.build_paths.outputs.SOURCE }}/anvill
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -198,10 +198,6 @@ target_link_libraries(anvill
 
 add_dependencies(anvill check_git_anvill)
 
-if(ANVILL_ENABLE_PYTHON3_LIBS)
-  add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../python" python)
-endif()
-
 # if(ANVILL_ENABLE_TESTS)
 # add_subdirectory("tests")
 # endif()

diff --git a/lib/Lifters/BasicBlockLifter.cpp b/lib/Lifters/BasicBlockLifter.cpp
@@ -200,7 +200,7 @@ bool BasicBlockLifter::DoInterProceduralControlFlow(
         auto func = block->getParent();
         auto should_return = func->getArg(kShouldReturnArgNum);
         builder.CreateStore(llvm::Constant::getAllOnesValue(
-          llvm::IntegerType::getInt1Ty(llvm_context)),
+                                llvm::IntegerType::getInt1Ty(llvm_context)),
                             should_return);
       }
     }
@@ -417,7 +417,8 @@ llvm::MDNode *BasicBlockLifter::GetBasicBlockUidAnnotation(Uid uid) const {
 
 llvm::Function *BasicBlockLifter::DeclareBasicBlockFunction() {
   std::string name_ = "func" + std::to_string(decl.address) + "basic_block" +
-                      std::to_string(this->block_def.addr) + "_" + std::to_string(this->block_def.uid.value);
+                      std::to_string(this->block_def.addr) + "_" +
+                      std::to_string(this->block_def.uid.value);
   auto &context = this->semantics_module->getContext();
   llvm::FunctionType *lifted_func_type =
       llvm::dyn_cast<llvm::FunctionType>(remill::RecontextualizeType(
@@ -597,7 +598,8 @@ BasicBlockFunction BasicBlockLifter::CreateBasicBlockFunction() {
   auto pc_ptr = pc_reg->AddressOf(this->state_ptr, ir);
   auto pc_val = this->options.program_counter_init_procedure(
       ir, this->address_type, this->block_def.addr);
-  ir.CreateStore(pc_val, pc_ptr);
+
+  ir.CreateStore(ir.CreateZExtOrTrunc(pc_val, pc_reg_type), pc_ptr);
 
   std::array<llvm::Value *, kNumLiftedBasicBlockArgs> args = {
       this->state_ptr, pc_val, mem_res, next_pc, should_return};
@@ -648,7 +650,8 @@ void BasicBlockLifter::TerminateBasicBlockFunction(
     llvm::IRBuilder<> calling_bb_builder(calling_bb);
     auto edge_bb = this->decl.cfg.find(edge_uid);
     CHECK(edge_bb != this->decl.cfg.end());
-    auto &child_lifter = this->flifter.GetOrCreateBasicBlockLifter(edge_bb->second.uid);
+    auto &child_lifter =
+        this->flifter.GetOrCreateBasicBlockLifter(edge_bb->second.uid);
     auto retval = child_lifter.ControlFlowCallBasicBlockFunction(
         caller, calling_bb_builder, this->state_ptr, bbfunc.stack, next_mem);
     if (this->flifter.curr_decl->type->getReturnType()->isVoidTy()) {
@@ -658,7 +661,8 @@ void BasicBlockLifter::TerminateBasicBlockFunction(
     }
 
     auto succ_const = llvm::ConstantInt::get(
-        llvm::cast<llvm::IntegerType>(this->address_type), edge_bb->second.addr);
+        llvm::cast<llvm::IntegerType>(this->address_type),
+        edge_bb->second.addr);
     sw->addCase(succ_const, calling_bb);
   }
 

diff --git a/lib/Passes/ReplaceStackReferences.cpp b/lib/Passes/ReplaceStackReferences.cpp
@@ -235,11 +235,12 @@ class StackModel {
                                      GetParamDeclSize(var) - 1);
       }
 
-      LOG(FATAL) << "Inserting variable that overlaps with current frame "
+      LOG(ERROR) << "Inserting variable that overlaps with current frame "
                  << var.ordered_locs[0].mem_offset
                  << " with size: " << GetParamDeclSize(var) << " Overlaps with "
                  << oparam->decl.decl.ordered_locs[0].mem_offset
                  << " with size " << GetParamDeclSize(oparam->decl.decl);
+      return;
     }
 
     this->frame.insert({var.ordered_locs[0].mem_offset, {index, var}});

diff --git a/lib/Protobuf.cpp b/lib/Protobuf.cpp
@@ -933,7 +933,9 @@ Result<std::monostate, std::string> ProtobufTranslator::DecodeTypeMap(
 
         std::string name = names.at(k);
         auto res = getOrCreateNamedStruct(this->context, name);
-        res->setBody(sty->elements());
+        if (res->isOpaque()) {
+          res->setBody(sty->elements());
+        }
       }
       type_names[k] = names.at(k);
     } else {

diff --git a/libraries/lifting-tools-ci b/libraries/lifting-tools-ci
diff --git a/remill b/remill
+0 −1		datasets/architectures.txt
+1 −1		datasets/fetch_anghabench.sh
+4 −4		.github/workflows/ci.yml
+3 −4		Dockerfile
+15 −8		README.md
+7 −2		include/remill/Arch/PPC/Runtime/State.h
+34 −34		lib/Arch/Sleigh/PPCArch.cpp
+88 −41		lib/BC/SleighLifter.cpp
+44 −34		tests/PPC/TestLifting.cpp