blah

Cisco-Talos · Jan 19, 2024 · 65414fd · 65414fd
1 parent c7133f4
commit 65414fd
Show file tree

Hide file tree

Showing 54 changed files with 139 additions and 134 deletions.
diff --git a/libclambcc/CMakeLists.txt b/libclambcc/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (C) 2021 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
 
 
+set (CLAMBC_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
 add_subdirectory(ClamBCLogicalCompiler)
 add_subdirectory(ClamBCLogicalCompilerHelper)
 #add_subdirectory(ClamBCRemoveUndefs)

diff --git a/libclambcc/ClamBCAnalyzer/CMakeLists.txt b/libclambcc/ClamBCAnalyzer/CMakeLists.txt
@@ -11,9 +11,9 @@ target_sources(clambcanalyzer_obj
 
 target_include_directories(clambcanalyzer_obj
     PRIVATE
-        ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ${CMAKE_BINARY_DIR}                 # For clambc-version.h (generated file)
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCAnalyzer/ClamBCAnalyzer.cpp b/libclambcc/ClamBCAnalyzer/ClamBCAnalyzer.cpp
@@ -20,8 +20,9 @@
  *  MA 02110-1301, USA.
  */
 #include "ClamBCAnalyzer.h"
-#include "Common/ClamBCCommon.h"
-#include "Common/ClamBCUtilities.h"
+
+#include "ClamBCCommon.h"
+#include "ClamBCUtilities.h"
 
 #include <llvm/IR/Dominators.h>
 #include <llvm/IR/DerivedTypes.h>

diff --git a/libclambcc/ClamBCAnalyzer/ClamBCAnalyzer.h b/libclambcc/ClamBCAnalyzer/ClamBCAnalyzer.h
@@ -22,7 +22,7 @@
 #ifndef CLAMBC_ANALYZER_H_
 #define CLAMBC_ANALYZER_H_
 
-#include "Common/clambc.h"
+#include "clambc.h"
 
 #include <llvm/ADT/DenseMap.h>
 #include <llvm/ADT/DenseSet.h>

diff --git a/libclambcc/ClamBCChangeMallocArgSize/CMakeLists.txt b/libclambcc/ClamBCChangeMallocArgSize/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambcchangemallocargsize_obj
 target_include_directories(clambcchangemallocargsize_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCChangeMallocArgSize/ClamBCChangeMallocArgSize.cpp b/libclambcc/ClamBCChangeMallocArgSize/ClamBCChangeMallocArgSize.cpp
@@ -1,3 +1,4 @@
+#include "clambc.h"
 
 #include <llvm/Pass.h>
 #include <llvm/IR/Function.h>
@@ -11,7 +12,6 @@
 #include <llvm/Passes/PassBuilder.h>
 #include <llvm/Passes/PassPlugin.h>
 
-#include "Common/clambc.h"
 
 using namespace llvm;
 

diff --git a/libclambcc/ClamBCConvertIntrinsicsTo32Bit/CMakeLists.txt b/libclambcc/ClamBCConvertIntrinsicsTo32Bit/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambcconvertintrinsicsto32bit_obj
 target_include_directories(clambcconvertintrinsicsto32bit_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCConvertIntrinsicsTo32Bit/ClamBCConvertIntrinsicsTo32Bit.cpp b/libclambcc/ClamBCConvertIntrinsicsTo32Bit/ClamBCConvertIntrinsicsTo32Bit.cpp
@@ -1,3 +1,4 @@
+#include "clambc.h"
 
 #include <llvm/Pass.h>
 #include <llvm/IR/Function.h>
@@ -14,7 +15,6 @@
 #include <llvm/IR/Constants.h>
 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
 
-#include "Common/clambc.h"
 
 #include <vector>
 

diff --git a/libclambcc/ClamBCExtendPHIsTo64Bit/CMakeLists.txt b/libclambcc/ClamBCExtendPHIsTo64Bit/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambcextendphisto64bit_obj
 target_include_directories(clambcextendphisto64bit_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCExtendPHIsTo64Bit/ClamBCExtendPHIsTo64Bit.cpp b/libclambcc/ClamBCExtendPHIsTo64Bit/ClamBCExtendPHIsTo64Bit.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA 02110-1301, USA.
  */
-#include "Common/bytecode_api.h"
-#include "Common/clambc.h"
-#include "Common/ClamBCUtilities.h"
+#include "bytecode_api.h"
+#include "clambc.h"
+#include "ClamBCUtilities.h"
 
 #include <llvm/Support/DataTypes.h>
 #include <llvm/ADT/STLExtras.h>

diff --git a/libclambcc/ClamBCLogicalCompiler/CMakeLists.txt b/libclambcc/ClamBCLogicalCompiler/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambclogicalcompiler_obj
 target_include_directories(clambclogicalcompiler_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCLogicalCompiler/ClamBCLogicalCompiler.cpp b/libclambcc/ClamBCLogicalCompiler/ClamBCLogicalCompiler.cpp
@@ -20,11 +20,11 @@
  *  MA 02110-1301, USA.
  */
 
-#include "Common/clambc.h"
-#include "Common/bytecode_api.h"
-#include "Common/ClamBCDiagnostics.h"
-#include "Common/ClamBCCommon.h"
-#include "Common/ClamBCUtilities.h"
+#include "clambc.h"
+#include "bytecode_api.h"
+#include "ClamBCDiagnostics.h"
+#include "ClamBCCommon.h"
+#include "ClamBCUtilities.h"
 
 #include <llvm/Support/DataTypes.h>
 #include <llvm/ADT/FoldingSet.h>

diff --git a/libclambcc/ClamBCLogicalCompilerHelper/CMakeLists.txt b/libclambcc/ClamBCLogicalCompilerHelper/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambclogicalcompilerhelper_obj
 target_include_directories(clambclogicalcompilerhelper_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCLogicalCompilerHelper/ClamBCLogicalCompilerHelper.cpp b/libclambcc/ClamBCLogicalCompilerHelper/ClamBCLogicalCompilerHelper.cpp
@@ -20,11 +20,11 @@
  *  MA 02110-1301, USA.
  */
 
-#include "Common/clambc.h"
-#include "Common/bytecode_api.h"
-#include "Common/ClamBCDiagnostics.h"
-#include "Common/ClamBCCommon.h"
-#include "Common/ClamBCUtilities.h"
+#include "clambc.h"
+#include "bytecode_api.h"
+#include "ClamBCDiagnostics.h"
+#include "ClamBCCommon.h"
+#include "ClamBCUtilities.h"
 
 #include <llvm/Support/DataTypes.h>
 #include <llvm/ADT/FoldingSet.h>

diff --git a/libclambcc/ClamBCLowering/CMakeLists.txt b/libclambcc/ClamBCLowering/CMakeLists.txt
@@ -13,8 +13,8 @@ target_sources(clambcloweringf_obj
 target_include_directories(clambcloweringf_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 
@@ -58,8 +58,8 @@ target_sources(clambcloweringnf_obj
 target_include_directories(clambcloweringnf_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCLowering/ClamBCLowering.cpp b/libclambcc/ClamBCLowering/ClamBCLowering.cpp
@@ -21,7 +21,7 @@
  */
 #include "ClamBCLowering.h"
 
-#include "Common/clambc.h"
+#include "clambc.h"
 
 #include <llvm/Passes/PassPlugin.h>
 #include <llvm/IR/InstIterator.h>

diff --git a/libclambcc/ClamBCLowering/ClamBCLoweringF.cpp b/libclambcc/ClamBCLowering/ClamBCLoweringF.cpp
@@ -22,7 +22,7 @@
 
 #include "ClamBCLowering.h"
 
-#include "Common/clambc.h"
+#include "clambc.h"
 
 #include <llvm/Passes/PassPlugin.h>
 

diff --git a/libclambcc/ClamBCLowering/ClamBCLoweringNF.cpp b/libclambcc/ClamBCLowering/ClamBCLoweringNF.cpp
@@ -22,7 +22,7 @@
 
 #include "ClamBCLowering.h"
 
-#include "Common/clambc.h"
+#include "clambc.h"
 
 #include <llvm/Passes/PassPlugin.h>
 

diff --git a/libclambcc/ClamBCOutlineEndiannessCalls/CMakeLists.txt b/libclambcc/ClamBCOutlineEndiannessCalls/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambcoutlineendiannesscalls_obj
 target_include_directories(clambcoutlineendiannesscalls_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCOutlineEndiannessCalls/ClamBCOutlineEndiannessCalls.cpp b/libclambcc/ClamBCOutlineEndiannessCalls/ClamBCOutlineEndiannessCalls.cpp
@@ -1,5 +1,5 @@
 
-#include "Common/clambc.h"
+#include "clambc.h"
 
 #include <llvm/Pass.h>
 #include <llvm/IR/Function.h>

diff --git a/libclambcc/ClamBCPrepareGEPsForWriter/CMakeLists.txt b/libclambcc/ClamBCPrepareGEPsForWriter/CMakeLists.txt
@@ -11,9 +11,9 @@ target_sources(clambcpreparegepsforwriter_obj
 
 target_include_directories(clambcpreparegepsforwriter_obj
     PRIVATE
-        ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ${CMAKE_BINARY_DIR}                 # For clambc-version.h (generated file)
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCPrepareGEPsForWriter/ClamBCPrepareGEPsForWriter.cpp b/libclambcc/ClamBCPrepareGEPsForWriter/ClamBCPrepareGEPsForWriter.cpp
@@ -19,11 +19,12 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA 02110-1301, USA.
  */
-#include "Common/bytecode_api.h"
-#include "Common/clambc.h"
-#include "Common/ClamBCModule.h"
+#include "bytecode_api.h"
+#include "clambc.h"
+#include "ClamBCModule.h"
+#include "ClamBCUtilities.h"
+
 #include "ClamBCAnalyzer/ClamBCAnalyzer.h"
-#include "Common/ClamBCUtilities.h"
 
 #include <llvm/Support/DataTypes.h>
 #include <llvm/ADT/STLExtras.h>

diff --git a/libclambcc/ClamBCPreserveABIs/CMakeLists.txt b/libclambcc/ClamBCPreserveABIs/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambcpreserveabis_obj
 target_include_directories(clambcpreserveabis_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCPreserveABIs/ClamBCPreserveABIs.cpp b/libclambcc/ClamBCPreserveABIs/ClamBCPreserveABIs.cpp
@@ -1,4 +1,7 @@
 
+#include "clambc.h"
+#include "ClamBCUtilities.h"
+
 #include <llvm/Pass.h>
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Module.h"
@@ -7,14 +10,10 @@
 
 #include <llvm/IR/Dominators.h>
 
-//#include "llvm/IR/LegacyPassManager.h"
 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
 #include <llvm/Passes/PassPlugin.h>
 #include <llvm/Passes/PassBuilder.h>
 
-#include "Common/clambc.h"
-#include "Common/ClamBCUtilities.h"
-
 #include <sstream>
 #include <string>
 using namespace llvm;

diff --git a/libclambcc/ClamBCRebuild/CMakeLists.txt b/libclambcc/ClamBCRebuild/CMakeLists.txt
@@ -11,9 +11,9 @@ target_sources(clambcrebuild_obj
 
 target_include_directories(clambcrebuild_obj
     PRIVATE
-        ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ${CMAKE_BINARY_DIR}                # For clambc-version.h (generated file)
+        ..
+        ${CLAMBC_LIB_DIR}/Common           # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCRebuild/ClamBCRebuild.cpp b/libclambcc/ClamBCRebuild/ClamBCRebuild.cpp
@@ -20,9 +20,9 @@
  *  MA 02110-1301, USA.
  */
 
-#include "Common/ClamBCModule.h"
-#include "Common/clambc.h"
-#include "Common/ClamBCUtilities.h"
+#include "ClamBCModule.h"
+#include "clambc.h"
+#include "ClamBCUtilities.h"
 
 #include <llvm/Support/DataTypes.h>
 #include <llvm/ADT/DenseMap.h>

diff --git a/libclambcc/ClamBCRegAlloc/CMakeLists.txt b/libclambcc/ClamBCRegAlloc/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambcregalloc_obj
 target_include_directories(clambcregalloc_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCRegAlloc/ClamBCRegAlloc.cpp b/libclambcc/ClamBCRegAlloc/ClamBCRegAlloc.cpp
@@ -20,12 +20,10 @@
  *  MA 02110-1301, USA.
  */
 #include "ClamBCRegAlloc.h"
-#include "Common/ClamBCUtilities.h"
-#include "Common/clambc.h"
+#include "ClamBCUtilities.h"
+#include "clambc.h"
 
 #include <llvm/IR/Dominators.h>
-//#include "llvm/Analysis/LiveValues.h"
-//#include "llvm/Config/config.h"
 #include <llvm/IR/DerivedTypes.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/IntrinsicInst.h>

diff --git a/libclambcc/ClamBCRegAlloc/ClamBCRegAlloc.h b/libclambcc/ClamBCRegAlloc/ClamBCRegAlloc.h
@@ -21,7 +21,9 @@
  */
 #ifndef CLAMBC_REGALLOC_H
 #define CLAMBC_REGALLOC_H
-#include <cstddef>
+
+#include "clambc.h"
+
 #include <llvm/ADT/DenseMap.h>
 #include <llvm/ADT/DenseSet.h>
 #include <llvm/ADT/StringMap.h>
@@ -36,8 +38,7 @@
 
 #include <vector>
 #include <map>
-
-#include "Common/clambc.h"
+#include <cstddef>
 
 class ClamBCRegAllocAnalysis
 {

diff --git a/libclambcc/ClamBCRemoveFSHL/CMakeLists.txt b/libclambcc/ClamBCRemoveFSHL/CMakeLists.txt
@@ -12,8 +12,8 @@ target_sources(clambcremovefshl_obj
 target_include_directories(clambcremovefshl_obj
     PRIVATE
         ${CMAKE_BINARY_DIR} # For clambc-version.h (generated file)
-        .                   # For Common/clambc.h
-        ..                  # For clambc.h  #TODO: change all passes to use "Common" and then delete this line.
+        ..
+        ${CLAMBC_LIB_DIR}/Common            # For anything in 'Common'
         ${LLVM_INCLUDE_DIRS}
 )
 

diff --git a/libclambcc/ClamBCRemoveFSHL/ClamBCRemoveFSHL.cpp b/libclambcc/ClamBCRemoveFSHL/ClamBCRemoveFSHL.cpp
@@ -20,8 +20,8 @@
  *  MA 02110-1301, USA.
  */
 
-#include "Common/clambc.h"
-#include "Common/ClamBCUtilities.h"
+#include "clambc.h"
+#include "ClamBCUtilities.h"
 
 #include <llvm/IR/Module.h>
 #include <llvm/IR/Instructions.h>