fix: lab8 no angr

Author: YingMuo

.github/workflows/lab-autograding.yml

@@ -56,4 +56,7 @@ jobs:
                   if [ ${{ steps.lab.outputs.result }} -eq 6 ]; then
                     sudo apt install -y llvm-14
                   fi
+                  if [ ${{ steps.lab.outputs.result }} -eq 8 ]; then
+                    python3 -m pip install angr
+                  fi
                   ./validate.sh

lab6/llvm-pass.so.cc

@@ -1,8 +1,6 @@
 #include "llvm/Passes/PassPlugin.h"
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/GlobalVariable.h"
 
 using namespace llvm;
 
@@ -13,38 +11,13 @@ struct LLVMPass : public PassInfoMixin<LLVMPass> {
 PreservedAnalyses LLVMPass::run(Module &M, ModuleAnalysisManager &MAM) {
   LLVMContext &Ctx = M.getContext();
   IntegerType *Int32Ty = IntegerType::getInt32Ty(Ctx);
-  PointerType *Int8PtrTy = Type::getInt8PtrTy(Ctx);
-
-  FunctionType *DebugTy = FunctionType::get(Type::getVoidTy(Ctx), {Int32Ty}, false);
-  FunctionCallee debug_func = M.getOrInsertFunction("debug", DebugTy);
+  FunctionCallee debug_func = M.getOrInsertFunction("debug", Int32Ty);
   ConstantInt *debug_arg = ConstantInt::get(Int32Ty, 48763);
 
-  Constant *StrConstant = ConstantDataArray::getString(Ctx, "hayaku... motohayaku!", true);
-  GlobalVariable *StrVar = new GlobalVariable(M, StrConstant->getType(), true,
-                                               GlobalValue::PrivateLinkage, StrConstant, ".str.hayaku");
-  Constant *Zero = ConstantInt::get(Int32Ty, 0);
-  Constant *Indices[] = {Zero, Zero};
-  Constant *StrPtr = ConstantExpr::getGetElementPtr(StrConstant->getType(), StrVar, Indices);
-
   for (auto &F : M) {
-    if (F.getName() != "main")
-      continue;
-
-    errs() << "Instrumenting function: " << F.getName() << "\n";
-    IRBuilder<> Builder(&*F.getEntryBlock().getFirstInsertionPt());
-
-    Builder.CreateCall(debug_func, {debug_arg});
+    errs() << "func: " << F.getName() << "\n";
 
-    auto ArgIter = F.arg_begin();
-    Argument *argcArg = ArgIter++;
-    Argument *argvArg = ArgIter;
-
-    Value *Argv1Ptr = Builder.CreateGEP(Int8PtrTy, argvArg, ConstantInt::get(Int32Ty, 1));
-    Builder.CreateStore(StrPtr, Argv1Ptr);
-
-    argcArg->replaceAllUsesWith(debug_arg);
   }
-
   return PreservedAnalyses::none();
 }
 
@@ -58,3 +31,4 @@ llvmGetPassPluginInfo() {
         });
     }};
 }
+