Enable gap parsing based on the binary's architecture to analyze inst…

…ead of the architecture where Dyninst runs
dyninst · Nov 19, 2020 · b834d9d · b834d9d
1 parent 246a4ce
commit b834d9d
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 80 deletions.
diff --git a/cmake/cap_arch_def.cmake b/cmake/cap_arch_def.cmake
@@ -12,7 +12,6 @@ set (ARCH_DEFINES -Darch_x86)
 set (CAP_DEFINES ${CAP_DEFINES}
              -Dcap_fixpoint_gen 
              -Dcap_noaddr_gen 
-             -Dcap_stripped_binaries 
              -Dcap_tramp_liveness 
              -Dcap_virtual_registers
              -Dcap_stack_mods
@@ -25,7 +24,6 @@ set (CAP_DEFINES ${CAP_DEFINES}
              -Dcap_fixpoint_gen 
              -Dcap_noaddr_gen
              -Dcap_registers
-             -Dcap_stripped_binaries 
              -Dcap_tramp_liveness
              -Dcap_stack_mods
     )

diff --git a/common/src/arch-x86.C b/common/src/arch-x86.C
@@ -12011,54 +12011,6 @@ entryID ia32_entry::getID(ia32_locations* l) const
    return id;
 }
 
-bool isStackFramePrecheck_gcc( const unsigned char *buffer )
-{
-   //Currently enabled entry bytes for gaps:
-   //  0x55 - push %ebp
-   static char gap_initial_bytes[] =
-   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   return (gap_initial_bytes[*buffer] != 0);
-}  
-
-bool isStackFramePrecheck_msvs( const unsigned char *buffer )
-{
-   //Currently enabled entry bytes for gaps:
-   //  0x55 - push %ebp
-   static char gap_initial_bytes[] =
-   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   return (gap_initial_bytes[*buffer] != 0);
-}  
-
 /*
    bool isStackFramePreamble( instruction& insn1 )
    {

diff --git a/common/src/arch-x86.h b/common/src/arch-x86.h
@@ -1191,9 +1191,6 @@ COMMON_EXPORT bool insn_hasSIB(unsigned,unsigned&,unsigned&,unsigned&);
 COMMON_EXPORT bool insn_hasDisp8(unsigned ModRM);
 COMMON_EXPORT bool insn_hasDisp32(unsigned ModRM);
 
-COMMON_EXPORT bool isStackFramePrecheck_msvs( const unsigned char *buffer );
-COMMON_EXPORT bool isStackFramePrecheck_gcc( const unsigned char *buffer );
-
 }; // namespace arch_x86
 
 #endif

diff --git a/dyninstAPI/src/image.C b/dyninstAPI/src/image.C
@@ -1381,7 +1381,6 @@ void image::analyzeImage() {
     obj_->parse();
 
 
-#if defined(cap_stripped_binaries)
    {
        vector<CodeRegion *>::const_iterator rit = cs_->regions().begin();
        for( ; rit != cs_->regions().end(); ++rit)
@@ -1392,7 +1391,6 @@ void image::analyzeImage() {
         }
        } 
    }
-#endif // cap_stripped_binaries
 
 
     parseState_ = analyzed;

diff --git a/parseAPI/src/IdiomModelDesc.C b/parseAPI/src/IdiomModelDesc.C
@@ -1,6 +1,3 @@
-#if defined(cap_stripped_binaries)
-
-
 #include "ProbabilisticParser.h"
 #include "util.h"
 
@@ -14,7 +11,6 @@ using namespace hd;
 using namespace Dyninst;
 
 IdiomModel::IdiomModel(string model_spec) {
-#if defined(arch_x86) || defined(arch_x86_64) || defined(i386_unknown_nt4_0)
   #if defined(os_windows)
     if (!strcmp(model_spec.c_str(), "32-bit")) {
         bias = -10.374549;
@@ -1204,7 +1200,5 @@ IdiomModel::IdiomModel(string model_spec) {
 
     }    
   #endif
-#endif
 }
 
-#endif
diff --git a/parseAPI/src/Parser-speculative.C b/parseAPI/src/Parser-speculative.C
@@ -50,11 +50,59 @@ using namespace std;
 using namespace Dyninst;
 using namespace Dyninst::ParseAPI;
 
-#if defined(cap_stripped_binaries)
-
 #include "ProbabilisticParser.h"
 
 namespace hd {
+
+bool isStackFramePrecheck_gcc( const unsigned char *buffer )
+{
+   //Currently enabled entry bytes for gaps:
+   //  0x55 - push %ebp
+   static char gap_initial_bytes[] =
+   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+   return (gap_initial_bytes[*buffer] != 0);
+}  
+
+bool isStackFramePrecheck_msvs( const unsigned char *buffer )
+{
+   //Currently enabled entry bytes for gaps:
+   //  0x55 - push %ebp
+   static char gap_initial_bytes[] =
+   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+   return (gap_initial_bytes[*buffer] != 0);
+}  
+
+
     Address calc_end(Function * f) {
         Address ret = f->addr() + 1;
         if(!f->extents().empty()) {
@@ -220,14 +268,12 @@ namespace hd {
     bool gap_heuristics(CodeObject *co,CodeRegion *cr,Address addr)
     {
         bool ret = false;
-#if defined(arch_x86) || defined(arch_x86_64) || defined(i386_unknown_nt4_0)
 
   #if defined(os_windows)
         ret = gap_heuristic_MSVS(co,cr,addr);
   #else
         ret = gap_heuristic_GCC(co,cr,addr);
   #endif
-#endif  
         return ret;
     }
 
@@ -287,6 +333,9 @@ namespace hd {
  */
 void Parser::parse_gap_heuristic(CodeRegion * cr)
 {
+    Architecture arch = cr->getArch();
+    if (arch != Arch_x86 && arch != Arch_x86_64) return;
+
     // ensure that we've parsed and finalized
     // all vanilla parsing
     if(_parse_state < COMPLETE)
@@ -357,6 +406,9 @@ bool Parser::getGapRange(CodeRegion* cr, Address curAddr, Address& gapStart, Add
 }
 
 void Parser::probabilistic_gap_parsing(CodeRegion *cr) {
+    Architecture arch = cr->getArch();
+    if (arch != Arch_x86 && arch != Arch_x86_64) return;
+
     // 0. ensure that we've parsed and finalized all vanilla parsing.
     // We also locate all the gaps
 
@@ -393,11 +445,3 @@ void Parser::probabilistic_gap_parsing(CodeRegion *cr) {
     }
 }
 
-#else // cap_stripped binaries
-void Parser::parse_gap_heuristic(CodeRegion*)
-{
-
-}
-void Parser::probabilistic_gap_parsing(CodeRegion *cr) {
-}
-#endif
diff --git a/parseAPI/src/ProbabilisticParser.C b/parseAPI/src/ProbabilisticParser.C
@@ -28,8 +28,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#if defined(cap_stripped_binaries)
-
 #include "ProbabilisticParser.h"
 
 #include <cstdio>
@@ -633,5 +631,4 @@ void ProbabilityCalculator::prioritizedGapParsing() {
     }
 
 }
-#endif
 
diff --git a/parseAPI/src/ProbabilisticParser.h b/parseAPI/src/ProbabilisticParser.h
@@ -35,8 +35,6 @@
 #ifndef _PROBABILISTIC_PARSER_H_
 #define _PROBABILISTIC_PARSER_H_
 
-#if defined(cap_stripped_binaries)
-
 #include "Parser.h"
 
 #include <string>
@@ -217,4 +215,3 @@ class ProbabilityCalculator {
 
 #endif
 
-#endif
diff --git a/patchAPI/test/findPoint/Makefile b/patchAPI/test/findPoint/Makefile
@@ -5,7 +5,7 @@ LIB_DIR = -L$(DYNINST_ROOT)/$(PLATFORM)/lib
 LIB     = -ldyninstAPI -lsymtabAPI -linstructionAPI -lcommon -lpcontrol -lparseAPI -lpatchAPI
 CC  = g++ 
 cc  = gcc
-CXXFLAG = -Wall -g -Dos_linux -Darch_x86_64 -Darch_64bit -Dx86_64_unknown_linux2_4  -Dcap_ptrace -Dcap_stripped_binaries -Dcap_async_events -Dcap_threads -Dcap_dynamic_heap -Dcap_relocation -Dcap_dwarf -Dcap_32_64 -Dcap_liveness -Dcap_fixpoint_gen -Dcap_noaddr_gen -Dcap_mutatee_traps -Dcap_binary_rewriter -Dcap_registers -Dcap_instruction_api -Dcap_serialization -Dcap_instruction_replacement -Dcap_tramp_liveness -Dbug_syscall_changepc_rewind -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
+CXXFLAG = -Wall -g -Dos_linux -Darch_x86_64 -Darch_64bit -Dx86_64_unknown_linux2_4  -Dcap_ptrace -Dcap_async_events -Dcap_threads -Dcap_dynamic_heap -Dcap_relocation -Dcap_dwarf -Dcap_32_64 -Dcap_liveness -Dcap_fixpoint_gen -Dcap_noaddr_gen -Dcap_mutatee_traps -Dcap_binary_rewriter -Dcap_registers -Dcap_instruction_api -Dcap_serialization -Dcap_instruction_replacement -Dcap_tramp_liveness -Dbug_syscall_changepc_rewind -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
 CFLAG = -Wall -fPIC
 
 PLATFORM = x86_64-unknown-linux2.4