dwarflint: Move to separate directory

diff --git a/src/Makefile.am b/src/Makefile.am
index 616df335cd4516108b084097512f90d130f200c3..31dc8a945310bec9acb4d87f89293181611ac157 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,20 +79,20 @@ dwarfcmp_test_SOURCES = $(dwarfcmp_SOURCES)
 dwarfcmp_test_LDADD = $(dwarfcmp_LDADD)
 
 dwarflint_SOURCES = dwarfstrings.c \
-                   dwarflint-main.cc dwarflint-main.hh dwarflint-misc.h \
-                   dwarflint-low.c dwarflint-low.h \
-                   dwarflint-expected-at.cc dwarflint-expected.hh \
-                   dwarflint-coverage.cc dwarflint-coverage.h \
-                   dwarflint-readctx.c  dwarflint-readctx.h \
-                   dwarflint-messages.cc dwarflint-messages.h \
-                   dwarflint-where.c dwarflint-where.h \
-                   dwarflint-config.cc dwarflint-config.h \
-                   dwarflint-checks.cc dwarflint-checks.hh \
-                   dwarflint-checks-low.cc dwarflint-checks-low.hh \
-                   dwarflint-checks-high.hh \
-                   dwarflint-check_matching_ranges.cc \
-                   dwarflint-check_range_out_of_scope.cc \
-                   dwarflint-check_expected_trees.cc
+                   dwarflint/main.cc dwarflint/main.hh dwarflint/misc.h \
+                   dwarflint/low.c dwarflint/low.h \
+                   dwarflint/expected-at.cc dwarflint/expected.hh \
+                   dwarflint/coverage.cc dwarflint/coverage.h \
+                   dwarflint/readctx.c  dwarflint/readctx.h \
+                   dwarflint/messages.cc dwarflint/messages.h \
+                   dwarflint/where.c dwarflint/where.h \
+                   dwarflint/config.cc dwarflint/config.h \
+                   dwarflint/checks.cc dwarflint/checks.hh \
+                   dwarflint/checks-low.cc dwarflint/checks-low.hh \
+                   dwarflint/checks-high.hh \
+                   dwarflint/check_matching_ranges.cc \
+                   dwarflint/check_range_out_of_scope.cc \
+                   dwarflint/check_expected_trees.cc
 
 readelf_SOURCES = readelf.c dwarfstrings.c
 

diff --git a/src/dwarflint-check_expected_trees.cc b/src/dwarflint/check_expected_trees.cc
similarity index 98%
rename from src/dwarflint-check_expected_trees.cc
rename to src/dwarflint/check_expected_trees.cc
index a43424a03ac7ad48da3d0062bcfe4d975782e7b1..58907452f335413e3582e1cc8cea920782226e5e 100644 (file)
--- a/src/dwarflint-check_expected_trees.cc
+++ b/src/dwarflint/check_expected_trees.cc
@@ -2,8 +2,8 @@
 # include <config.h>
 #endif
 
-#include "dwarflint-checks-high.hh"
-#include "dwarflint-expected.hh"
+#include "checks-high.hh"
+#include "expected.hh"
 #include "dwarfstrings.h"
 #include "../libdw/c++/dwarf-knowledge.cc"
 

diff --git a/src/dwarflint-check_matching_ranges.cc b/src/dwarflint/check_matching_ranges.cc
similarity index 98%
rename from src/dwarflint-check_matching_ranges.cc
rename to src/dwarflint/check_matching_ranges.cc
index d875a9e91ab52de85cd6005e500a81d110c46595..f15eb6386c99a7d639a84c3956ee7467cf7d35df 100644 (file)
--- a/src/dwarflint-check_matching_ranges.cc
+++ b/src/dwarflint/check_matching_ranges.cc
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include "dwarflint-checks-high.hh"
+#include "checks-high.hh"
 
 using elfutils::dwarf;
 

diff --git a/src/dwarflint-check_range_out_of_scope.cc b/src/dwarflint/check_range_out_of_scope.cc
similarity index 98%
rename from src/dwarflint-check_range_out_of_scope.cc
rename to src/dwarflint/check_range_out_of_scope.cc
index a487551673ed8a3d898e8b3da8f3c7bc18562655..6e728f37ed569d67e525cc7a586003a4793e8a27 100644 (file)
--- a/src/dwarflint-check_range_out_of_scope.cc
+++ b/src/dwarflint/check_range_out_of_scope.cc
@@ -2,8 +2,8 @@
 # include <config.h>
 #endif
 
-#include "dwarflint-checks-high.hh"
-#include "dwarflint-coverage.hh"
+#include "checks-high.hh"
+#include "coverage.hh"
 #include "dwarfstrings.h"
 
 using elfutils::dwarf;

diff --git a/src/dwarflint-checks-high.hh b/src/dwarflint/checks-high.hh
similarity index 89%
rename from src/dwarflint-checks-high.hh
rename to src/dwarflint/checks-high.hh
index 393315b412a1e70a60ca4fc50acc4823ebf3caf2..7f938849c4e3ca59a90b9d33302fde017e76d994 100644 (file)
--- a/src/dwarflint-checks-high.hh
+++ b/src/dwarflint/checks-high.hh
@@ -1,5 +1,5 @@
-#include "dwarflint-checks-low.hh"
-#include "dwarflint-config.h"
+#include "checks-low.hh"
+#include "config.h"
 #include "c++/dwarf"
 
 template<class T>

diff --git a/src/dwarflint-checks-low.cc b/src/dwarflint/checks-low.cc
similarity index 99%
rename from src/dwarflint-checks-low.cc
rename to src/dwarflint/checks-low.cc
index 5be45f54f0be64672d9ce3823ebfc49f3939daa8..6e870ff2d87056c0919f1e860b096f500ba54a76 100644 (file)
--- a/src/dwarflint-checks-low.cc
+++ b/src/dwarflint/checks-low.cc
@@ -27,8 +27,8 @@
 # include <config.h>
 #endif
 
-#include "dwarflint-checks-low.hh"
-#include "dwarflint-low.h"
+#include "checks-low.hh"
+#include "low.h"
 #include <map>
 #include <sstream>
 #include <cstring>

diff --git a/src/dwarflint-checks-low.hh b/src/dwarflint/checks-low.hh
similarity index 97%
rename from src/dwarflint-checks-low.hh
rename to src/dwarflint/checks-low.hh
index 20ff4362feee96e87048a8f3e777849ed219be41..0e5bddc4a8a024508886e3265cc63d66df9f3dbd 100644 (file)
--- a/src/dwarflint-checks-low.hh
+++ b/src/dwarflint/checks-low.hh
@@ -1,5 +1,5 @@
-#include "dwarflint-checks.hh"
-#include "dwarflint-low.h"
+#include "checks.hh"
+#include "low.h"
 
 class load_sections
   : public check<load_sections>

diff --git a/src/dwarflint-checks.cc b/src/dwarflint/checks.cc
similarity index 70%
rename from src/dwarflint-checks.cc
rename to src/dwarflint/checks.cc
index f332668beca2811ee2c543bfafc706c8c8586813..afb16c83c6082f8fa0ad3e608667b32ce13a78fc 100644 (file)
--- a/src/dwarflint-checks.cc
+++ b/src/dwarflint/checks.cc
@@ -1,2 +1,2 @@
-#include "dwarflint-checks.hh"
+#include "checks.hh"
 check_base::failed check_base::unscheduled ("the check is not scheduled");

diff --git a/src/dwarflint-checks.hh b/src/dwarflint/checks.hh
similarity index 93%
rename from src/dwarflint-checks.hh
rename to src/dwarflint/checks.hh
index 0099db7f562b8efa814c7706897d8f815a1f1658..ba09504b9418fd09c4e03c8a531be57a5cb65102 100644 (file)
--- a/src/dwarflint-checks.hh
+++ b/src/dwarflint/checks.hh
@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <string>
 #include <iostream>
-#include "dwarflint-where.h"
-#include "dwarflint-main.hh"
+#include "where.h"
+#include "main.hh"
 
 struct check_base
 {

diff --git a/src/dwarflint-config.cc b/src/dwarflint/config.cc
similarity index 94%
rename from src/dwarflint-config.cc
rename to src/dwarflint/config.cc
index 81fe871e1424bf85985b2463d44adddeb69a6a7e..c368f081477aefdb51bd2c897df502f40df9e991 100644 (file)
--- a/src/dwarflint-config.cc
+++ b/src/dwarflint/config.cc
@@ -1,4 +1,4 @@
-#include "dwarflint-config.h"
+#include "config.h"
 
 /* If true, we accept silently files without debuginfo.  */
 bool tolerate_nodebug = false;

diff --git a/src/dwarflint-config.h b/src/dwarflint/config.h
similarity index 100%
rename from src/dwarflint-config.h
rename to src/dwarflint/config.h

diff --git a/src/dwarflint-coverage.cc b/src/dwarflint/coverage.cc
similarity index 99%
rename from src/dwarflint-coverage.cc
rename to src/dwarflint/coverage.cc
index fee57a15891e17217c277c9d1ad4ab1a872239e2..c0fa662220c4d34d0268980286f5a07e942f36d6 100644 (file)
--- a/src/dwarflint-coverage.cc
+++ b/src/dwarflint/coverage.cc
@@ -28,7 +28,7 @@
 # include <config.h>
 #endif
 
-#include "dwarflint-coverage.hh"
+#include "coverage.hh"
 
 #include <stdbool.h>
 #include <assert.h>

diff --git a/src/dwarflint-coverage.h b/src/dwarflint/coverage.h
similarity index 99%
rename from src/dwarflint-coverage.h
rename to src/dwarflint/coverage.h
index 28d86dd5d9376e650dcad22c8cec83e2fd26240d..49e413a619613166208e5630fe46fe174a9c1206 100644 (file)
--- a/src/dwarflint-coverage.h
+++ b/src/dwarflint/coverage.h
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "dwarflint-misc.h"
+#include "misc.h"
 
 #ifdef __cplusplus
 extern "C"

diff --git a/src/dwarflint-coverage.hh b/src/dwarflint/coverage.hh
similarity index 98%
rename from src/dwarflint-coverage.hh
rename to src/dwarflint/coverage.hh
index 176a274a10e32f1d58f0660999d1476f848c65dc..22506314f16b8ae0553fd8eebea5bee5a9a4f362 100644 (file)
--- a/src/dwarflint-coverage.hh
+++ b/src/dwarflint/coverage.hh
@@ -29,7 +29,7 @@
 
 #include <string>
 #include <sstream>
-#include "dwarflint-coverage.h"
+#include "coverage.h"
 
 std::string range_fmt (uint64_t start, uint64_t end);
 

diff --git a/src/dwarflint-expected-at.cc b/src/dwarflint/expected-at.cc
similarity index 99%
rename from src/dwarflint-expected-at.cc
rename to src/dwarflint/expected-at.cc
index 3c2829287ba3ceb4d1e09b97db02213052b5786f..b3442d623f891f8eb5b2bfd23118a642da16ffed 100644 (file)
--- a/src/dwarflint-expected-at.cc
+++ b/src/dwarflint/expected-at.cc
@@ -25,7 +25,7 @@
    <http://www.openinventionnetwork.com>.  */
 
 #include <config.h>
-#include "dwarflint-expected.hh"
+#include "expected.hh"
 #include "../libdw/dwarf.h"
 
 expected_at_map::expected_at_map ()

diff --git a/src/dwarflint-expected.hh b/src/dwarflint/expected.hh
similarity index 100%
rename from src/dwarflint-expected.hh
rename to src/dwarflint/expected.hh

diff --git a/src/dwarflint-low.c b/src/dwarflint/low.c
similarity index 99%
rename from src/dwarflint-low.c
rename to src/dwarflint/low.c
index 502324c680e8af4dba8949212bd34e939893b22d..c7487b985a0553a0d5da4376696653b3de55b4d3 100644 (file)
--- a/src/dwarflint-low.c
+++ b/src/dwarflint/low.c
@@ -45,9 +45,9 @@
 #include "../libdw/known-dwarf.h"
 #include "../libebl/libebl.h"
 #include "dwarfstrings.h"
-#include "dwarflint-low.h"
-#include "dwarflint-readctx.h"
-#include "dwarflint-config.h"
+#include "low.h"
+#include "readctx.h"
+#include "config.h"
 #include "dwarf-opcodes.h"
 
 /* True if coverage analysis of .debug_ranges vs. ELF sections should

diff --git a/src/dwarflint-low.h b/src/dwarflint/low.h
similarity index 98%
rename from src/dwarflint-low.h
rename to src/dwarflint/low.h
index bba57167d48672a385f6931b3ccddbfc4eb5c373..6bdfe35fd20dc34fe832b73af9aa212500e59ca3 100644 (file)
--- a/src/dwarflint-low.h
+++ b/src/dwarflint/low.h
@@ -28,9 +28,9 @@
 
 #include "../libdw/libdw.h"
 #include "../libebl/libebl.h"
-#include "dwarflint-coverage.h"
-#include "dwarflint-messages.h"
-#include "dwarflint-readctx.h"
+#include "coverage.h"
+#include "messages.h"
+#include "readctx.h"
 
 #ifdef __cplusplus
 # include <string>

diff --git a/src/dwarflint-main.cc b/src/dwarflint/main.cc
similarity index 95%
rename from src/dwarflint-main.cc
rename to src/dwarflint/main.cc
index 9162bf3cb3dffb212324f5cea85e2e4e88a18308..4dfdaa157b6dcb66654d7935f3355571cf177c10 100644 (file)
--- a/src/dwarflint-main.cc
+++ b/src/dwarflint/main.cc
@@ -35,12 +35,12 @@
 
 #include <iostream>
 
-#include "dwarflint-low.h"
-#include "dwarflint-config.h"
-#include "dwarflint-main.hh"
-#include "dwarflint-readctx.h"
-#include "dwarflint-checks.hh"
-#include "dwarflint-checks-low.hh" // xxx
+#include "low.h"
+#include "config.h"
+#include "main.hh"
+#include "readctx.h"
+#include "checks.hh"
+#include "checks-low.hh" // xxx
 
 /* Bug report address.  */
 const char *argp_program_bug_address = PACKAGE_BUGREPORT;
@@ -271,11 +271,6 @@ dwarflint::dwarflint (Elf *a_elf)
   // xxx check_expected_trees
   cu *cu_chain = check_info->cu_chain;
 
-  /* Don't attempt to do high-level checks if we couldn't initialize
-     high-level context.  The wrapper takes care of printing out error
-     messages if any.  */
-  struct hl_ctx *hlctx = do_high_level ? hl_ctx_new (a_elf) : NULL;
-
 #define SEC(sec) (file.debugsec[sec_##sec])
 #define HAS_SEC(sec) (SEC(sec) != NULL && SEC(sec)->data != NULL)
 
@@ -292,7 +287,6 @@ dwarflint::dwarflint (Elf *a_elf)
   if (file.ebl != NULL)
     ebl_closebackend (file.ebl);
   free (file.sec);
-  hl_ctx_delete (hlctx);
 
 #undef SEC
 #undef HAS_SEC

diff --git a/src/dwarflint-main.hh b/src/dwarflint/main.hh
similarity index 100%
rename from src/dwarflint-main.hh
rename to src/dwarflint/main.hh

diff --git a/src/dwarflint-messages.cc b/src/dwarflint/messages.cc
similarity index 98%
rename from src/dwarflint-messages.cc
rename to src/dwarflint/messages.cc
index 9539e642b252b3586f2145d0559aba0a884aadf9..a106747400840e2bf809a65a0d2f799da48a521a 100644 (file)
--- a/src/dwarflint-messages.cc
+++ b/src/dwarflint/messages.cc
@@ -1,6 +1,6 @@
-#include "dwarflint-messages.h"
-#include "dwarflint-misc.h"
-#include "dwarflint-coverage.h"
+#include "messages.h"
+#include "misc.h"
+#include "coverage.h"
 
 #include <vector>
 #include <sstream>

diff --git a/src/dwarflint-messages.h b/src/dwarflint/messages.h
similarity index 99%
rename from src/dwarflint-messages.h
rename to src/dwarflint/messages.h
index 3ae7c164210cf69e308edfdc832f83cf73680fd4..7ea1ef6a41463553486f1fa9d00e095699c59cac 100644 (file)
--- a/src/dwarflint-messages.h
+++ b/src/dwarflint/messages.h
@@ -1,7 +1,7 @@
 #ifndef DWARFLINT_MESSAGES_H
 #define DWARFLINT_MESSAGES_H
 
-#include "dwarflint-where.h"
+#include "where.h"
 
 #ifdef __cplusplus
 # define IF_CPLUSPLUS(X) X

diff --git a/src/dwarflint-misc.h b/src/dwarflint/misc.h
similarity index 100%
rename from src/dwarflint-misc.h
rename to src/dwarflint/misc.h

diff --git a/src/dwarflint-readctx.c b/src/dwarflint/readctx.c
similarity index 99%
rename from src/dwarflint-readctx.c
rename to src/dwarflint/readctx.c
index b1e3296d04fa4165f519950c445142c5a5ada262..20666fc8635fb4e6e5524ff5a3107dc9ab8e4364 100644 (file)
--- a/src/dwarflint-readctx.c
+++ b/src/dwarflint/readctx.c
@@ -24,8 +24,8 @@
    Network licensing program, please visit www.openinventionnetwork.com
    <http://www.openinventionnetwork.com>.  */
 
-#include "dwarflint-readctx.h"
-#include "dwarflint-low.h"
+#include "readctx.h"
+#include "low.h"
 
 #include <stdlib.h>
 #include <assert.h>

diff --git a/src/dwarflint-readctx.h b/src/dwarflint/readctx.h
similarity index 100%
rename from src/dwarflint-readctx.h
rename to src/dwarflint/readctx.h

diff --git a/src/dwarflint-where.c b/src/dwarflint/where.c
similarity index 98%
rename from src/dwarflint-where.c
rename to src/dwarflint/where.c
index 3d89cb44324c9a81b7f11422fc1fde5b937fc539..9bbd6de03f133d0b2cfcb1269c5e21986bbaeaac 100644 (file)
--- a/src/dwarflint-where.c
+++ b/src/dwarflint/where.c
@@ -1,5 +1,5 @@
-#include "dwarflint-where.h"
-#include "dwarflint-config.h"
+#include "where.h"
+#include "config.h"
 
 #include <inttypes.h>
 #include <assert.h>

diff --git a/src/dwarflint-where.h b/src/dwarflint/where.h
similarity index 100%
rename from src/dwarflint-where.h
rename to src/dwarflint/where.h