fix building of symlite

- add missing pure virtual functions isReadOnly
- fix isCode and isData methods to use program header permissions instead
  of just returning true
- fix printf compiler warning
- disable parseThat if using symlite as it is not compatible
- remove #include <linux/elf.h> from proccontrol/src/linux.h on aarch64
  if SYMLITE is configured as it is incompatible with <elf.h>

CMakeLists.txt

@@ -92,7 +92,6 @@ if(NOT ${PLATFORM} MATCHES nt)
   add_subdirectory (elf)
   add_subdirectory (dwarf)
   add_subdirectory (symlite)
-  add_subdirectory (parseThat)
 endif()
 add_subdirectory (instructionAPI)
 add_subdirectory (symtabAPI)
@@ -104,6 +103,7 @@ add_subdirectory (patchAPI)
 if(${SYMREADER} MATCHES symtabAPI)
   add_subdirectory (dyninstAPI)
   add_subdirectory (dynC_API)
+  add_subdirectory (parseThat)
 endif()
 
 if(BUILD_RTLIB)
@@ -143,7 +143,9 @@ if(BUILD_RTLIB)
     if(TARGET TBB)
       add_dependencies(DyninstRT TBB)
     endif()
-    add_dependencies(dyninstAPI DyninstRT)
+    if(TARGET dyninstAPI)
+      add_dependencies(dyninstAPI DyninstRT)
+    endif()
     if(TARGET dyninstAPI-static)
       add_dependencies(dyninstAPI-static DyninstRT)
     endif()

parseAPI/h/SymLiteCodeSource.h

@@ -68,6 +68,7 @@ class SymReaderCodeRegion : public CodeRegion {
     PARSER_EXPORT unsigned int getAddressWidth() const;
     PARSER_EXPORT bool isCode(const Address) const;
     PARSER_EXPORT bool isData(const Address) const;
+    PARSER_EXPORT bool isReadOnly(const Address) const;
     PARSER_EXPORT Address offset() const;
     PARSER_EXPORT Address length() const;
     PARSER_EXPORT Architecture getArch() const;
@@ -109,6 +110,7 @@ class SymReaderCodeSource : public CodeSource {
     PARSER_EXPORT unsigned int getAddressWidth() const;
     PARSER_EXPORT bool isCode(const Address) const;
     PARSER_EXPORT bool isData(const Address) const;
+    PARSER_EXPORT bool isReadOnly(const Address) const;
     PARSER_EXPORT Address offset() const;
     PARSER_EXPORT Address length() const;
     PARSER_EXPORT Architecture getArch() const;

parseAPI/src/SymLiteCodeSource.C

@@ -148,7 +148,7 @@ bool
 SymReaderCodeRegion::isCode(const Address addr) const
 {
     if(!contains(addr)) return false;
-    return true;
+    return _region->perms & PF_X;
 
     /*
     // XXX this is the predicate from SymReader::isCode(a) +
@@ -163,7 +163,7 @@ bool
 SymReaderCodeRegion::isData(const Address addr) const
 {
     if(!contains(addr)) return false;
-    return true;
+    return !(_region->perms & PF_X);
 
 
     /*
@@ -174,6 +174,16 @@ SymReaderCodeRegion::isData(const Address addr) const
     */
 }
 
+bool
+SymReaderCodeRegion::isReadOnly(const Address addr) const
+{
+    if (!contains(addr))  {
+        return false;
+    }
+
+    return !(_region->perms & PF_W);
+}
+
 Address
 SymReaderCodeRegion::offset() const
 {
@@ -400,7 +410,7 @@ inline void
 SymReaderCodeSource::overlapping_warn(const char * file, unsigned line) const
 {
     if(regionsOverlap()) {
-        fprintf(stderr,"Invocation of routine at %s:%d is ambiguous for "
+        fprintf(stderr,"Invocation of routine at %s:%u is ambiguous for "
                        "binaries with overlapping code regions\n",
             file,line);
     }
@@ -484,6 +494,18 @@ SymReaderCodeSource::isData(const Address addr) const
         return false;
 }
 
+bool
+SymReaderCodeSource::isReadOnly(const Address addr) const
+{
+    overlapping_warn(FILE__,__LINE__);
+
+    CodeRegion * cr = lookup_region(addr);
+    if(cr)
+        return cr->isReadOnly(addr);
+    else
+        return false;
+}
+
 Address
 SymReaderCodeSource::offset() const
 {

proccontrol/src/linux.C

@@ -75,8 +75,10 @@
 #include<sys/user.h>
 #include<sys/procfs.h>
 #include<sys/uio.h>
+#if !defined(WITH_SYMLITE)
 #include<linux/elf.h>
 #endif
+#endif
 
 // Before glibc-2.7, sys/ptrace.h lacked PTRACE_O_* and PTRACE_EVENT_*, so we
 // need them from linux/ptrace.h.  (Conditionally, as later glibc conflicts.)