Updated tests

ftsrg · Jul 24, 2023 · ed15da5 · ed15da5
1 parent 9720b00
commit ed15da5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/lib/libtheta-llvm.so b/lib/libtheta-llvm.so
diff --git a/subprojects/frontends/llvm/src/main/cpp/hu_bme_mit_theta_llvm2xcfa_LlvmIrProvider.cpp b/subprojects/frontends/llvm/src/main/cpp/hu_bme_mit_theta_llvm2xcfa_LlvmIrProvider.cpp
@@ -1,6 +1,9 @@
 #include "hu_bme_mit_theta_llvm2xcfa_LlvmIrProvider.h"
 #include "types/Module.h"
 #include "utilities/CPipeline.h"
+#include "utilities/Analysis.h"
+#include "types/BasicBlock.h"
+#include "types/operands/Register.h"
 
 // NOTE: don't use CLions automatic code formatting, it handles this part pretty badly
 
@@ -11,13 +14,18 @@
  */
 JNIEXPORT void JNICALL
 Java_hu_bme_mit_theta_llvm2xcfa_LlvmIrProvider_JniParseIr(JNIEnv* env, jobject, jstring filename) {
+    Analysis::reset();
+    BasicBlock::reset();
+    Register::reset();
+
     // Convert the JNI String (jstring) into C-String (char*)
     const char *cFilename = env->GetStringUTFChars(filename, NULL);
     if (NULL == cFilename) {
         std::cout << "Could not get filename from jenv!" << std::endl;
         return;
     }
 
+
     // (compile and) parse into llvm Module
     std::unique_ptr <llvm::Module> llvmModule;
     llvm::SMDiagnostic error;

diff --git a/subprojects/frontends/llvm/src/main/cpp/types/Module.cpp b/subprojects/frontends/llvm/src/main/cpp/types/Module.cpp
@@ -57,9 +57,6 @@ Module::Module() {
 
 void Module::parseLLVMModule(std::shared_ptr <llvm::Module> llvmModule) {
     instance = Module();
-    Analysis::reset();
-    BasicBlock::reset();
-    Register::reset();
 
     // Analyze module first
     Analysis::checkModule(llvmModule.get());

diff --git a/subprojects/frontends/llvm/src/main/cpp/utilities/Analysis.cpp b/subprojects/frontends/llvm/src/main/cpp/utilities/Analysis.cpp
@@ -99,6 +99,6 @@ bool Analysis::checkIfAndOrXor(const llvm::BinaryOperator *binOp) {
 }
 
 void Analysis::reset() {
-//    hasIntInBitwiseBinaryOp = false;
-//    hasStructs = false;
+    hasIntInBitwiseBinaryOp = false;
+    hasStructs = false;
 }
diff --git a/...c/main/java/hu/bme/mit/theta/llvm2xcfa/handlers/concrete/BitvectorInstructionHandler.java b/...c/main/java/hu/bme/mit/theta/llvm2xcfa/handlers/concrete/BitvectorInstructionHandler.java
@@ -72,11 +72,13 @@ public void handleInstruction(Instruction instruction, GlobalState globalState,
                 break;
             case "udiv":
                 udiv(instruction, globalState, functionState, blockState);
+                break;
             case "sdiv":
                 sdiv(instruction, globalState, functionState, blockState);
                 break;
             case "urem":
                 urem(instruction, globalState, functionState, blockState);
+                break;
             case "srem":
                 srem(instruction, globalState, functionState, blockState);
                 break;

diff --git a/subprojects/xcfa/llvm2xcfa/src/test/resources/c/example_binbitwiseop.c b/subprojects/xcfa/llvm2xcfa/src/test/resources/c/example_binbitwiseop.c
@@ -4,9 +4,9 @@ int main() {
     int a, b;
     scanf("%d", &a);
     scanf("%d", &b);
-//
-//    int c = a << 2;
-//    int d = b >> 2;
-//    int e = c | d & 11;
-    return a&&b;
+
+    int c = a << 2;
+    int d = b >> 2;
+    int e = c | d & 11;
+    return (unsigned long long)(char)(e + a - b * c / d);
 }