From 2aa31f76f8365957ba88153b592851c092a941c6 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 21 Oct 2009 18:54:44 +0200 Subject: [PATCH] dwarflint: Move to separate directory --- src/Makefile.am | 28 +++++++++---------- .../check_expected_trees.cc} | 4 +-- .../check_matching_ranges.cc} | 2 +- .../check_range_out_of_scope.cc} | 4 +-- .../checks-high.hh} | 4 +-- .../checks-low.cc} | 4 +-- .../checks-low.hh} | 4 +-- .../checks.cc} | 2 +- .../checks.hh} | 4 +-- .../config.cc} | 2 +- .../config.h} | 0 .../coverage.cc} | 2 +- .../coverage.h} | 2 +- .../coverage.hh} | 2 +- .../expected-at.cc} | 2 +- .../expected.hh} | 0 src/{dwarflint-low.c => dwarflint/low.c} | 6 ++-- src/{dwarflint-low.h => dwarflint/low.h} | 6 ++-- src/{dwarflint-main.cc => dwarflint/main.cc} | 18 ++++-------- src/{dwarflint-main.hh => dwarflint/main.hh} | 0 .../messages.cc} | 6 ++-- .../messages.h} | 2 +- src/{dwarflint-misc.h => dwarflint/misc.h} | 0 .../readctx.c} | 4 +-- .../readctx.h} | 0 src/{dwarflint-where.c => dwarflint/where.c} | 4 +-- src/{dwarflint-where.h => dwarflint/where.h} | 0 27 files changed, 53 insertions(+), 59 deletions(-) rename src/{dwarflint-check_expected_trees.cc => dwarflint/check_expected_trees.cc} (98%) rename src/{dwarflint-check_matching_ranges.cc => dwarflint/check_matching_ranges.cc} (98%) rename src/{dwarflint-check_range_out_of_scope.cc => dwarflint/check_range_out_of_scope.cc} (98%) rename src/{dwarflint-checks-high.hh => dwarflint/checks-high.hh} (89%) rename src/{dwarflint-checks-low.cc => dwarflint/checks-low.cc} (99%) rename src/{dwarflint-checks-low.hh => dwarflint/checks-low.hh} (97%) rename src/{dwarflint-checks.cc => dwarflint/checks.cc} (70%) rename src/{dwarflint-checks.hh => dwarflint/checks.hh} (93%) rename src/{dwarflint-config.cc => dwarflint/config.cc} (94%) rename src/{dwarflint-config.h => dwarflint/config.h} (100%) rename src/{dwarflint-coverage.cc => dwarflint/coverage.cc} (99%) rename src/{dwarflint-coverage.h => dwarflint/coverage.h} (99%) rename src/{dwarflint-coverage.hh => dwarflint/coverage.hh} (98%) rename src/{dwarflint-expected-at.cc => dwarflint/expected-at.cc} (99%) rename src/{dwarflint-expected.hh => dwarflint/expected.hh} (100%) rename src/{dwarflint-low.c => dwarflint/low.c} (99%) rename src/{dwarflint-low.h => dwarflint/low.h} (98%) rename src/{dwarflint-main.cc => dwarflint/main.cc} (95%) rename src/{dwarflint-main.hh => dwarflint/main.hh} (100%) rename src/{dwarflint-messages.cc => dwarflint/messages.cc} (98%) rename src/{dwarflint-messages.h => dwarflint/messages.h} (99%) rename src/{dwarflint-misc.h => dwarflint/misc.h} (100%) rename src/{dwarflint-readctx.c => dwarflint/readctx.c} (99%) rename src/{dwarflint-readctx.h => dwarflint/readctx.h} (100%) rename src/{dwarflint-where.c => dwarflint/where.c} (98%) rename src/{dwarflint-where.h => dwarflint/where.h} (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 616df335c..31dc8a945 100644 --- 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 a43424a03..58907452f 100644 --- a/src/dwarflint-check_expected_trees.cc +++ b/src/dwarflint/check_expected_trees.cc @@ -2,8 +2,8 @@ # include #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 d875a9e91..f15eb6386 100644 --- a/src/dwarflint-check_matching_ranges.cc +++ b/src/dwarflint/check_matching_ranges.cc @@ -2,7 +2,7 @@ # include #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 a48755167..6e728f37e 100644 --- a/src/dwarflint-check_range_out_of_scope.cc +++ b/src/dwarflint/check_range_out_of_scope.cc @@ -2,8 +2,8 @@ # include #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 393315b41..7f938849c 100644 --- 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 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 5be45f54f..6e870ff2d 100644 --- a/src/dwarflint-checks-low.cc +++ b/src/dwarflint/checks-low.cc @@ -27,8 +27,8 @@ # include #endif -#include "dwarflint-checks-low.hh" -#include "dwarflint-low.h" +#include "checks-low.hh" +#include "low.h" #include #include #include 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 20ff4362f..0e5bddc4a 100644 --- 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 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 f332668be..afb16c83c 100644 --- 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 0099db7f5..ba09504b9 100644 --- a/src/dwarflint-checks.hh +++ b/src/dwarflint/checks.hh @@ -4,8 +4,8 @@ #include #include #include -#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 81fe871e1..c368f0814 100644 --- 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 fee57a158..c0fa66222 100644 --- a/src/dwarflint-coverage.cc +++ b/src/dwarflint/coverage.cc @@ -28,7 +28,7 @@ # include #endif -#include "dwarflint-coverage.hh" +#include "coverage.hh" #include #include 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 28d86dd5d..49e413a61 100644 --- a/src/dwarflint-coverage.h +++ b/src/dwarflint/coverage.h @@ -32,7 +32,7 @@ #include #include -#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 176a274a1..22506314f 100644 --- a/src/dwarflint-coverage.hh +++ b/src/dwarflint/coverage.hh @@ -29,7 +29,7 @@ #include #include -#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 3c2829287..b3442d623 100644 --- a/src/dwarflint-expected-at.cc +++ b/src/dwarflint/expected-at.cc @@ -25,7 +25,7 @@ . */ #include -#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 502324c68..c7487b985 100644 --- 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 bba57167d..6bdfe35fd 100644 --- 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 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 9162bf3cb..4dfdaa157 100644 --- a/src/dwarflint-main.cc +++ b/src/dwarflint/main.cc @@ -35,12 +35,12 @@ #include -#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 9539e642b..a10674740 100644 --- 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 #include 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 3ae7c1642..7ea1ef6a4 100644 --- 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 b1e3296d0..20666fc86 100644 --- a/src/dwarflint-readctx.c +++ b/src/dwarflint/readctx.c @@ -24,8 +24,8 @@ Network licensing program, please visit www.openinventionnetwork.com . */ -#include "dwarflint-readctx.h" -#include "dwarflint-low.h" +#include "readctx.h" +#include "low.h" #include #include 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 3d89cb443..9bbd6de03 100644 --- 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 #include 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 -- 2.47.3