2013-11-19 10:08:25 +00:00
|
|
|
// -*- Mode: C++ -*-
|
|
|
|
//
|
2015-01-07 12:53:58 +00:00
|
|
|
// Copyright (C) 2013-2015 Red Hat, Inc.
|
2013-11-19 10:08:25 +00:00
|
|
|
//
|
|
|
|
// This file is part of the GNU Application Binary Interface Generic
|
|
|
|
// Analysis and Instrumentation Library (libabigail). This library is
|
|
|
|
// free software; you can redistribute it and/or modify it under the
|
|
|
|
// terms of the GNU Lesser General Public License as published by the
|
|
|
|
// Free Software Foundation; either version 3, or (at your option) any
|
|
|
|
// later version.
|
|
|
|
|
|
|
|
// This library is distributed in the hope that it will be useful, but
|
|
|
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
// General Lesser Public License for more details.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
|
|
// License along with this program; see the file COPYING-LGPLV3. If
|
|
|
|
// not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//
|
|
|
|
// Author: Dodji Seketeli
|
|
|
|
|
|
|
|
/// @file
|
|
|
|
///
|
|
|
|
/// This is a program aimed at checking that a binary instrumentation
|
|
|
|
/// (bi) file is well formed and valid enough. It acts by loading an
|
|
|
|
/// input bi file and saving it back to a temporary file. It then
|
|
|
|
/// runs a diff on the two files and expects the result of the diff to
|
|
|
|
/// be empty.
|
|
|
|
|
|
|
|
#include <cstring>
|
|
|
|
#include <cstdio>
|
|
|
|
#include <cstdlib>
|
|
|
|
#include <string>
|
|
|
|
#include <iostream>
|
|
|
|
#include <fstream>
|
|
|
|
#include "abg-tools-utils.h"
|
|
|
|
#include "abg-ir.h"
|
2014-01-07 13:12:26 +00:00
|
|
|
#include "abg-corpus.h"
|
Prepare serialization API for multiple backends
* include/abg-reader.h: New file with abigail::xml_reader APIs.
* include/abg-writer.h: New file with abigail::xml_writer APIs.
* include/Makefile.am: Add the new files above to the source
distribution.
* src/abg-reader.cc: Update top-file comments.
(namespace xml_reader): Rename namespace
reader into this.
(read_to_translation_unit, read_corpus_from_archive): New static
functions.
(read_translation_unit_from_file)
(read_translation_unit_from_file, read_corpus_from_file): New
entry points.
(struct array_deleter): New functor.
(translation_unit::read): Remove this.
* src/abg-writer.cc: Update top file comments.
(namespace xml_writer): Rename namespace
writer into this.
(struct archive_write_ctxt): New internal type.
(create_archive_write_context, write_translation_unit_to_archive)
(write_translation_unit, write_corpus_to_archive): New low level
static functions overloads.
(write_corpus_to_archive, write_translation_unit): Public higher
level overloads.
(translation_unit::write): Remove.
(dump): Update for new xml_writer namespace.
* include/abg-ir.h (translation_unit::{read, write}): Remove these
serialization methods.
* include/abg-corpus.h (corpus_sptr): New convenience typedef.
(corpus::{read, write}): Remove these methods.
* src/abg-corpus.cc (corpus::{read, write})
(corpus::impl::{serialized_tus, archive}): Remove these members.
(corpus::impl::{get_archive, close_archive, write_tu_to_archive,
read_to_translation_unit}): Remove these methods.
* tests/test-bidiff.cc (main): Update for usage of the new
xml_reader API.
* tests/test-read-write.cc (main): Likewise. Update for the usage
of the new xml_writer API, too.
* tests/test-walker.cc (main): Update for the usage of the new
xml_reader API.
* tests/test-write-read-archive.cc (main): Likewise. And for the
xml_writer API, too.
* tools/biar.cc (add_tus_to_archive, extract_tus_from_archive): Likewise.
* tools/bidiff.cc (main): Likewise, for xml_reader APIs.
* tools/bilint.cc (main): Likewise, for xml_writer APIs, too.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2013-12-04 08:44:20 +00:00
|
|
|
#include "abg-reader.h"
|
2014-01-07 13:12:26 +00:00
|
|
|
#include "abg-dwarf-reader.h"
|
Prepare serialization API for multiple backends
* include/abg-reader.h: New file with abigail::xml_reader APIs.
* include/abg-writer.h: New file with abigail::xml_writer APIs.
* include/Makefile.am: Add the new files above to the source
distribution.
* src/abg-reader.cc: Update top-file comments.
(namespace xml_reader): Rename namespace
reader into this.
(read_to_translation_unit, read_corpus_from_archive): New static
functions.
(read_translation_unit_from_file)
(read_translation_unit_from_file, read_corpus_from_file): New
entry points.
(struct array_deleter): New functor.
(translation_unit::read): Remove this.
* src/abg-writer.cc: Update top file comments.
(namespace xml_writer): Rename namespace
writer into this.
(struct archive_write_ctxt): New internal type.
(create_archive_write_context, write_translation_unit_to_archive)
(write_translation_unit, write_corpus_to_archive): New low level
static functions overloads.
(write_corpus_to_archive, write_translation_unit): Public higher
level overloads.
(translation_unit::write): Remove.
(dump): Update for new xml_writer namespace.
* include/abg-ir.h (translation_unit::{read, write}): Remove these
serialization methods.
* include/abg-corpus.h (corpus_sptr): New convenience typedef.
(corpus::{read, write}): Remove these methods.
* src/abg-corpus.cc (corpus::{read, write})
(corpus::impl::{serialized_tus, archive}): Remove these members.
(corpus::impl::{get_archive, close_archive, write_tu_to_archive,
read_to_translation_unit}): Remove these methods.
* tests/test-bidiff.cc (main): Update for usage of the new
xml_reader API.
* tests/test-read-write.cc (main): Likewise. Update for the usage
of the new xml_writer API, too.
* tests/test-walker.cc (main): Update for the usage of the new
xml_reader API.
* tests/test-write-read-archive.cc (main): Likewise. And for the
xml_writer API, too.
* tools/biar.cc (add_tus_to_archive, extract_tus_from_archive): Likewise.
* tools/bidiff.cc (main): Likewise, for xml_reader APIs.
* tools/bilint.cc (main): Likewise, for xml_writer APIs, too.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2013-12-04 08:44:20 +00:00
|
|
|
#include "abg-writer.h"
|
2013-11-19 10:08:25 +00:00
|
|
|
|
|
|
|
using std::string;
|
|
|
|
using std::cerr;
|
2013-12-11 14:20:42 +00:00
|
|
|
using std::cin;
|
|
|
|
using std::cout;
|
2013-11-19 10:08:25 +00:00
|
|
|
using std::ostream;
|
|
|
|
using std::ofstream;
|
|
|
|
using abigail::tools::check_file;
|
2014-01-07 13:12:26 +00:00
|
|
|
using abigail::tools::file_type;
|
|
|
|
using abigail::tools::guess_file_type;
|
|
|
|
using abigail::corpus;
|
|
|
|
using abigail::corpus_sptr;
|
Prepare serialization API for multiple backends
* include/abg-reader.h: New file with abigail::xml_reader APIs.
* include/abg-writer.h: New file with abigail::xml_writer APIs.
* include/Makefile.am: Add the new files above to the source
distribution.
* src/abg-reader.cc: Update top-file comments.
(namespace xml_reader): Rename namespace
reader into this.
(read_to_translation_unit, read_corpus_from_archive): New static
functions.
(read_translation_unit_from_file)
(read_translation_unit_from_file, read_corpus_from_file): New
entry points.
(struct array_deleter): New functor.
(translation_unit::read): Remove this.
* src/abg-writer.cc: Update top file comments.
(namespace xml_writer): Rename namespace
writer into this.
(struct archive_write_ctxt): New internal type.
(create_archive_write_context, write_translation_unit_to_archive)
(write_translation_unit, write_corpus_to_archive): New low level
static functions overloads.
(write_corpus_to_archive, write_translation_unit): Public higher
level overloads.
(translation_unit::write): Remove.
(dump): Update for new xml_writer namespace.
* include/abg-ir.h (translation_unit::{read, write}): Remove these
serialization methods.
* include/abg-corpus.h (corpus_sptr): New convenience typedef.
(corpus::{read, write}): Remove these methods.
* src/abg-corpus.cc (corpus::{read, write})
(corpus::impl::{serialized_tus, archive}): Remove these members.
(corpus::impl::{get_archive, close_archive, write_tu_to_archive,
read_to_translation_unit}): Remove these methods.
* tests/test-bidiff.cc (main): Update for usage of the new
xml_reader API.
* tests/test-read-write.cc (main): Likewise. Update for the usage
of the new xml_writer API, too.
* tests/test-walker.cc (main): Update for the usage of the new
xml_reader API.
* tests/test-write-read-archive.cc (main): Likewise. And for the
xml_writer API, too.
* tools/biar.cc (add_tus_to_archive, extract_tus_from_archive): Likewise.
* tools/bidiff.cc (main): Likewise, for xml_reader APIs.
* tools/bilint.cc (main): Likewise, for xml_writer APIs, too.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2013-12-04 08:44:20 +00:00
|
|
|
using abigail::xml_reader::read_translation_unit_from_file;
|
2013-12-11 14:20:42 +00:00
|
|
|
using abigail::xml_reader::read_translation_unit_from_istream;
|
2014-01-07 13:12:26 +00:00
|
|
|
using abigail::xml_reader::read_corpus_from_file;
|
|
|
|
using abigail::xml_reader::read_corpus_from_native_xml;
|
|
|
|
using abigail::xml_reader::read_corpus_from_native_xml_file;
|
|
|
|
using abigail::dwarf_reader::read_corpus_from_elf;
|
2013-12-11 14:20:42 +00:00
|
|
|
using abigail::xml_writer::write_translation_unit;
|
2014-01-07 13:12:26 +00:00
|
|
|
using abigail::xml_writer::write_corpus_to_native_xml;
|
|
|
|
using abigail::xml_writer::write_corpus_to_archive;
|
2013-11-19 10:08:25 +00:00
|
|
|
|
|
|
|
struct options
|
|
|
|
{
|
2014-06-04 14:30:18 +00:00
|
|
|
string file_path;
|
|
|
|
bool read_from_stdin;
|
|
|
|
bool read_tu;
|
|
|
|
bool diff;
|
|
|
|
bool bidiff;
|
|
|
|
bool noout;
|
|
|
|
std::tr1::shared_ptr<char> di_root_path;
|
2013-12-11 14:20:42 +00:00
|
|
|
|
|
|
|
options()
|
|
|
|
: read_from_stdin(false),
|
2014-01-07 13:12:26 +00:00
|
|
|
read_tu(false),
|
2014-01-17 12:49:41 +00:00
|
|
|
diff(false),
|
|
|
|
bidiff(false),
|
2014-06-04 14:30:18 +00:00
|
|
|
noout(false)
|
2013-12-11 14:20:42 +00:00
|
|
|
{}
|
2013-11-19 10:08:25 +00:00
|
|
|
};//end struct options;
|
|
|
|
|
2014-07-05 20:17:01 +00:00
|
|
|
static void
|
2013-12-07 06:26:06 +00:00
|
|
|
display_usage(const string& prog_name, ostream& out)
|
2013-11-19 10:08:25 +00:00
|
|
|
{
|
2014-07-05 20:17:01 +00:00
|
|
|
out << "usage: " << prog_name << " [options] [<abi-file1>]\n"
|
2013-11-19 10:08:25 +00:00
|
|
|
<< " where options can be:\n"
|
2014-01-07 13:12:26 +00:00
|
|
|
<< " --help display this message\n"
|
2014-05-22 11:14:44 +00:00
|
|
|
<< " --debug-info-dir <path> the path under which to look for "
|
|
|
|
"debug info for the elf <abi-file>\n"
|
2014-01-17 12:49:41 +00:00
|
|
|
<< " --diff for xml inputs, perform a text diff between "
|
|
|
|
"the input and the memory model saved back to disk\n"
|
|
|
|
<< " --bidiff perform an abi diff between the input "
|
|
|
|
"and the memory model(not yet implemented)\n"
|
2014-01-07 13:12:26 +00:00
|
|
|
<< " --noout do not display anything on stdout\n"
|
|
|
|
<< " --stdin|-- read abi-file content from stdin\n"
|
|
|
|
<< " --tu expect a single translation unit file\n";
|
2013-11-19 10:08:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
parse_command_line(int argc, char* argv[], options& opts)
|
|
|
|
{
|
|
|
|
if (argc < 2)
|
2013-12-11 14:20:42 +00:00
|
|
|
{
|
|
|
|
opts.read_from_stdin = true;
|
|
|
|
return true;
|
|
|
|
}
|
2013-11-19 10:08:25 +00:00
|
|
|
|
|
|
|
for (int i = 1; i < argc; ++i)
|
2013-12-07 06:20:40 +00:00
|
|
|
{
|
|
|
|
if (argv[i][0] != '-')
|
|
|
|
{
|
|
|
|
if (opts.file_path.empty())
|
|
|
|
opts.file_path = argv[i];
|
|
|
|
else
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else if (!strcmp(argv[i], "--help"))
|
|
|
|
return false;
|
2014-05-22 11:14:44 +00:00
|
|
|
else if (!strcmp(argv[i], "--debug-info-dir"))
|
|
|
|
{
|
|
|
|
if (argc <= i + 1
|
|
|
|
|| argv[i + 1][0] == '-')
|
|
|
|
return false;
|
2014-06-04 14:30:18 +00:00
|
|
|
// elfutils wants the root path to the debug info to be
|
|
|
|
// absolute.
|
|
|
|
opts.di_root_path = abigail::tools::make_path_absolute(argv[i + 1]);
|
2014-05-22 11:14:44 +00:00
|
|
|
++i;
|
|
|
|
}
|
2013-12-11 14:20:42 +00:00
|
|
|
else if (!strcmp(argv[i], "--stdin"))
|
|
|
|
opts.read_from_stdin = true;
|
2014-01-07 13:12:26 +00:00
|
|
|
else if (!strcmp(argv[i], "--tu"))
|
|
|
|
opts.read_tu = true;
|
2014-01-17 12:49:41 +00:00
|
|
|
else if (!strcmp(argv[i], "--diff"))
|
|
|
|
opts.diff = true;
|
|
|
|
else if (!strcmp(argv[i], "--bidiff"))
|
|
|
|
opts.bidiff = true;
|
2013-12-11 14:20:42 +00:00
|
|
|
else if (!strcmp(argv[i], "--noout"))
|
|
|
|
opts.noout = true;
|
2013-12-07 06:20:40 +00:00
|
|
|
else
|
|
|
|
return false;
|
|
|
|
}
|
2013-11-19 10:08:25 +00:00
|
|
|
|
|
|
|
if (opts.file_path.empty())
|
2013-12-11 14:20:42 +00:00
|
|
|
opts.read_from_stdin = true;
|
2013-11-19 10:08:25 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Reads a bi (binary instrumentation) file, saves it back to a
|
|
|
|
/// temporary file and run a diff on the two versions.
|
|
|
|
int
|
|
|
|
main(int argc, char* argv[])
|
|
|
|
{
|
|
|
|
options opts;
|
|
|
|
if (!parse_command_line(argc, argv, opts))
|
|
|
|
{
|
|
|
|
display_usage(argv[0], cerr);
|
|
|
|
return true;
|
|
|
|
}
|
Prepare serialization API for multiple backends
* include/abg-reader.h: New file with abigail::xml_reader APIs.
* include/abg-writer.h: New file with abigail::xml_writer APIs.
* include/Makefile.am: Add the new files above to the source
distribution.
* src/abg-reader.cc: Update top-file comments.
(namespace xml_reader): Rename namespace
reader into this.
(read_to_translation_unit, read_corpus_from_archive): New static
functions.
(read_translation_unit_from_file)
(read_translation_unit_from_file, read_corpus_from_file): New
entry points.
(struct array_deleter): New functor.
(translation_unit::read): Remove this.
* src/abg-writer.cc: Update top file comments.
(namespace xml_writer): Rename namespace
writer into this.
(struct archive_write_ctxt): New internal type.
(create_archive_write_context, write_translation_unit_to_archive)
(write_translation_unit, write_corpus_to_archive): New low level
static functions overloads.
(write_corpus_to_archive, write_translation_unit): Public higher
level overloads.
(translation_unit::write): Remove.
(dump): Update for new xml_writer namespace.
* include/abg-ir.h (translation_unit::{read, write}): Remove these
serialization methods.
* include/abg-corpus.h (corpus_sptr): New convenience typedef.
(corpus::{read, write}): Remove these methods.
* src/abg-corpus.cc (corpus::{read, write})
(corpus::impl::{serialized_tus, archive}): Remove these members.
(corpus::impl::{get_archive, close_archive, write_tu_to_archive,
read_to_translation_unit}): Remove these methods.
* tests/test-bidiff.cc (main): Update for usage of the new
xml_reader API.
* tests/test-read-write.cc (main): Likewise. Update for the usage
of the new xml_writer API, too.
* tests/test-walker.cc (main): Update for the usage of the new
xml_reader API.
* tests/test-write-read-archive.cc (main): Likewise. And for the
xml_writer API, too.
* tools/biar.cc (add_tus_to_archive, extract_tus_from_archive): Likewise.
* tools/bidiff.cc (main): Likewise, for xml_reader APIs.
* tools/bilint.cc (main): Likewise, for xml_writer APIs, too.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2013-12-04 08:44:20 +00:00
|
|
|
|
2013-12-11 14:20:42 +00:00
|
|
|
if (opts.read_from_stdin)
|
2013-11-19 10:08:25 +00:00
|
|
|
{
|
2013-12-11 14:20:42 +00:00
|
|
|
if (!cin.good())
|
|
|
|
return true;
|
2013-11-19 10:08:25 +00:00
|
|
|
|
2014-01-07 13:12:26 +00:00
|
|
|
if (opts.read_tu)
|
|
|
|
{
|
|
|
|
abigail::translation_unit_sptr tu =
|
|
|
|
read_translation_unit_from_istream(&cin);
|
|
|
|
|
|
|
|
if (!tu)
|
|
|
|
{
|
|
|
|
cerr << "failed to read the ABI instrumentation from stdin\n";
|
|
|
|
return true;
|
|
|
|
}
|
2013-11-19 10:08:25 +00:00
|
|
|
|
2014-01-07 13:12:26 +00:00
|
|
|
if (!opts.noout)
|
|
|
|
write_translation_unit(*tu, 0, cout);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else
|
2013-12-11 14:20:42 +00:00
|
|
|
{
|
2014-01-07 13:12:26 +00:00
|
|
|
corpus_sptr corp = read_corpus_from_native_xml(&cin);
|
|
|
|
if (!opts.noout)
|
|
|
|
write_corpus_to_native_xml(corp, /*indent=*/0, cout);
|
|
|
|
return false;
|
2013-12-11 14:20:42 +00:00
|
|
|
}
|
2013-11-19 10:08:25 +00:00
|
|
|
}
|
2013-12-11 14:20:42 +00:00
|
|
|
else if (!opts.file_path.empty())
|
2013-11-19 10:08:25 +00:00
|
|
|
{
|
2013-12-11 14:20:42 +00:00
|
|
|
if (!check_file(opts.file_path, cerr))
|
|
|
|
return true;
|
|
|
|
|
2014-01-07 13:12:26 +00:00
|
|
|
abigail::translation_unit_sptr tu;
|
|
|
|
abigail::corpus_sptr corp;
|
2014-06-04 14:30:18 +00:00
|
|
|
abigail::dwarf_reader::status s = abigail::dwarf_reader::STATUS_OK;
|
|
|
|
char* di_root_path = 0;
|
2014-01-07 13:12:26 +00:00
|
|
|
file_type type = guess_file_type(opts.file_path);
|
2013-12-11 14:20:42 +00:00
|
|
|
|
2014-01-07 13:12:26 +00:00
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case abigail::tools::FILE_TYPE_UNKNOWN:
|
|
|
|
cerr << "Unknown file type given in input: " << opts.file_path;
|
|
|
|
return true;
|
|
|
|
case abigail::tools::FILE_TYPE_NATIVE_BI:
|
|
|
|
tu = read_translation_unit_from_file(opts.file_path);
|
|
|
|
break;
|
|
|
|
case abigail::tools::FILE_TYPE_ELF:
|
2014-06-02 15:05:05 +00:00
|
|
|
case abigail::tools::FILE_TYPE_AR:
|
2014-06-04 14:30:18 +00:00
|
|
|
di_root_path = opts.di_root_path.get();
|
|
|
|
s= read_corpus_from_elf(opts.file_path,
|
|
|
|
&di_root_path,
|
|
|
|
corp);
|
2014-01-07 13:12:26 +00:00
|
|
|
break;
|
|
|
|
case abigail::tools::FILE_TYPE_XML_CORPUS:
|
|
|
|
corp = read_corpus_from_native_xml_file(opts.file_path);
|
|
|
|
break;
|
|
|
|
case abigail::tools::FILE_TYPE_ZIP_CORPUS:
|
2014-08-31 08:34:11 +00:00
|
|
|
#if WITH_ZIP_ARCHIVE
|
2014-01-07 13:12:26 +00:00
|
|
|
corp = read_corpus_from_file(opts.file_path);
|
2014-08-31 08:34:11 +00:00
|
|
|
#endif
|
2014-01-07 13:12:26 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!tu && !corp)
|
2013-12-11 14:20:42 +00:00
|
|
|
{
|
|
|
|
cerr << "failed to read " << opts.file_path << "\n";
|
Support comparing symbols not referenced by debug info
* doc/manuals/abidiff.rst: Adjust intro to mention that w/o debug
info, abidiff now works but just report about added/removed
symbols. Add documentation about the new
--no-unreferenced-symbols option.
* include/abg-comparison.h (string_elf_symbol_map): New typedef.
(diff_context::show_symbols_unreferenced_by_debug_info): Declare
new accessors.
* src/abg-comparison.cc
(diff_context::priv::show_syms_unreferenced_by_di_): New data
member.
(diff_context::priv::priv): Adjust.
(diff_context::show_symbols_unreferenced_by_debug_info): Implement
these accessors.
(corpus_diff::priv::{unrefed_fn_syms_edit_script_,
unrefed_var_syms_edit_script_, added_unrefed_fn_syms_,
deleted_unrefed_fn_syms_, added_unrefed_var_syms_,
deleted_unrefed_var_syms_}): New data members.
(corpus_diff::priv::diff_stats::{num_func_syms_removed,
num_func_syms_added, num_var_syms_removed, num_var_syms_added}):
New data members.
(corpus_diff::priv::diff_stats::diff_stats): Adjust.
(corpus_diff::ensure_lookup_tables_populated): Populate lookup
tables for added/removed symbols that are not referenced by any
debug info.
(corpus_diff::priv::apply_filters_and_compute_diff_stats): Compute
stats for the added/removed symbols not referenced by any debug
info.
(corpus_diff::priv::emit_diff_stats): Emit stats about
added/removed symbols that are not referenced by any debug info.
(corpus_diff::length): Adjust to take in account added/removed
symbols not referenced by any debug info.
(show_linkage_name_and_aliases): New static function.
(corpus_diff::report): When emitting a symbol name, emit its
version too, and tell if it aliases other symbols. Avoid emitted
extra new lines. Report added/removed symbols not referenced by
any debug info.
(compute_diff): In the overload for corpus_sptr, compute the diffs
for symbols not referenced by debug info.
* include/abg-corpus.h
(corpus::get_unreferenced_{function,variable}_symbols): Declare
new member functions.
* src/abg-corpus.cc (corpus_priv::{unrefed_fun_symbols,
unrefed_var_symbols}): New data members.
(corpus_priv::build_unreferenced_symbols_tables): Define new
member function.
(struct comp_elf_symbols_functor): New functor.
(corpus::is_empty): Adjust to take in account added/removed
symbols not referenced by debug info.
(corpus::{get_unreferenced_function_symbols,
corpus::get_unreferenced_variable_symbols}): Define these
accessors.
* include/abg-dwarf-reader.h (enum status): Transform this into
bitfields. Add a STATUS_UNKNOWN value that has the value 0.
(operator|(status, status), operator&(status, status))
(operator|=(status&, status), operator&=(status, status)): New
bit-wise operators to manipulate instances of the status bit-field.
* src/abg-dwarf-reader.cc (get_version_for_symbol): Fix this to
avoid returning garbage version sometimes.
(read_debug_info_into_corpus): Fix this to return a non-null but
empty corpus_sptr when there is no debug info available.
(operator|(status, status), operator&(status, status))
(operator|=(status&, status), operator&=(status, status)): Define
these new bitwise operators to manipulate instances of the status
bit-field.
(read_corpus_from_elf): Now that the abigail::dwarf_reader::status
is a bit-field, set it to reflect if debug info and/or symbol
tables have been found. Do not bail out if debug info hasn't been
found. Rather, keep going, and go look for symbols-only; this is
a kind of operating in degraded mode.
* include/abg-ir.h (elf_symbol::get_aliases_id_string): Add a flag
that says if the current instance of elf_symbol should be included
in the list of aliases or not.
* src/abg-ir.cc (elf_symbol::get_aliases_id_string): Define it.
* tests/data/test-diff-dwarf/test16-syms-only-v{0,1}.o: New test
input.
* tools/abidiff.cc
(options::show_symbols_not_referenced_by_debug_info): New data
member.
(options:options): Adjust.
(display_usage): Add an info string for the new
--no-unreferenced-symbols command line option.
(parse_command_line): Parse the new --no-unreferenced-symbols
command line.
(set_diff_context_from_opts): Set the diff_context according to
the presence of --no-unreferenced-symbols.
(main): Adjust for the fact that abigail::dwarf_reader::status is
now a bit-field.
* tools/abilint.cc (main): Adjust for the fact that
abigail::dwarf_reader::status is now a bit-field..
():
* tests/data/test-diff-dwarf/test16-syms-only-report.txt: New test
reference output.
* tests/data/test-diff-dwarf/test16-syms-only-v{0,1}.cc: Source code
for new test input.
* tests/data/test-diff-dwarf/test17-non-refed-syms-v{0,1}.o: New
test input.
* tests/data/test-diff-dwarf/test17-non-refed-syms-v{0,1}.cc: New
source code for test input.
* tests/data/test-diff-dwarf/libtest18-alias-sym-v{0,1}.so: New
test input.
* tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt:
Reference output for new test input.
* tests/data/test-diff-dwarf/test18-alias-sym-v{0,1}.cc: Source
code for new test input.
* tests/data/test-diff-dwarf/test18-alias-sym-version-script:
Source code for new test input.
* tests/Makefile.am: Add the new test materials to the source
distribution.
* tests/test-diff-dwarf.cc(in_out_specs): Add the new input tests
above to the array of tests to run by this harness.
(main): Emit empty reports for empty resulting diffs.
* tests/data/test-diff-dwarf/test{0,8,9,12,14-inline-report,}-report.txt:
Adjust.
* tests/data/test-diff-filter/test{0,01,2,4,5,7,8,9,10,12,13,15-0,15-1}-report.txt:
Likewise.
* tests/data/test-diff-filter/test{19-enum,20-inline,}-report-0.txt:
Likewise.
* tests/data/test-diff-suppr/test0-type-suppr-report-{1,2}.txt:
Likewise.
* tests/data/test-diff-suppr/test{1,2}-typedef-suppr-report-1.txt:
Likewise.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2014-10-22 16:05:31 +00:00
|
|
|
if (!(s & abigail::dwarf_reader::STATUS_OK))
|
2014-06-04 14:30:18 +00:00
|
|
|
{
|
Support comparing symbols not referenced by debug info
* doc/manuals/abidiff.rst: Adjust intro to mention that w/o debug
info, abidiff now works but just report about added/removed
symbols. Add documentation about the new
--no-unreferenced-symbols option.
* include/abg-comparison.h (string_elf_symbol_map): New typedef.
(diff_context::show_symbols_unreferenced_by_debug_info): Declare
new accessors.
* src/abg-comparison.cc
(diff_context::priv::show_syms_unreferenced_by_di_): New data
member.
(diff_context::priv::priv): Adjust.
(diff_context::show_symbols_unreferenced_by_debug_info): Implement
these accessors.
(corpus_diff::priv::{unrefed_fn_syms_edit_script_,
unrefed_var_syms_edit_script_, added_unrefed_fn_syms_,
deleted_unrefed_fn_syms_, added_unrefed_var_syms_,
deleted_unrefed_var_syms_}): New data members.
(corpus_diff::priv::diff_stats::{num_func_syms_removed,
num_func_syms_added, num_var_syms_removed, num_var_syms_added}):
New data members.
(corpus_diff::priv::diff_stats::diff_stats): Adjust.
(corpus_diff::ensure_lookup_tables_populated): Populate lookup
tables for added/removed symbols that are not referenced by any
debug info.
(corpus_diff::priv::apply_filters_and_compute_diff_stats): Compute
stats for the added/removed symbols not referenced by any debug
info.
(corpus_diff::priv::emit_diff_stats): Emit stats about
added/removed symbols that are not referenced by any debug info.
(corpus_diff::length): Adjust to take in account added/removed
symbols not referenced by any debug info.
(show_linkage_name_and_aliases): New static function.
(corpus_diff::report): When emitting a symbol name, emit its
version too, and tell if it aliases other symbols. Avoid emitted
extra new lines. Report added/removed symbols not referenced by
any debug info.
(compute_diff): In the overload for corpus_sptr, compute the diffs
for symbols not referenced by debug info.
* include/abg-corpus.h
(corpus::get_unreferenced_{function,variable}_symbols): Declare
new member functions.
* src/abg-corpus.cc (corpus_priv::{unrefed_fun_symbols,
unrefed_var_symbols}): New data members.
(corpus_priv::build_unreferenced_symbols_tables): Define new
member function.
(struct comp_elf_symbols_functor): New functor.
(corpus::is_empty): Adjust to take in account added/removed
symbols not referenced by debug info.
(corpus::{get_unreferenced_function_symbols,
corpus::get_unreferenced_variable_symbols}): Define these
accessors.
* include/abg-dwarf-reader.h (enum status): Transform this into
bitfields. Add a STATUS_UNKNOWN value that has the value 0.
(operator|(status, status), operator&(status, status))
(operator|=(status&, status), operator&=(status, status)): New
bit-wise operators to manipulate instances of the status bit-field.
* src/abg-dwarf-reader.cc (get_version_for_symbol): Fix this to
avoid returning garbage version sometimes.
(read_debug_info_into_corpus): Fix this to return a non-null but
empty corpus_sptr when there is no debug info available.
(operator|(status, status), operator&(status, status))
(operator|=(status&, status), operator&=(status, status)): Define
these new bitwise operators to manipulate instances of the status
bit-field.
(read_corpus_from_elf): Now that the abigail::dwarf_reader::status
is a bit-field, set it to reflect if debug info and/or symbol
tables have been found. Do not bail out if debug info hasn't been
found. Rather, keep going, and go look for symbols-only; this is
a kind of operating in degraded mode.
* include/abg-ir.h (elf_symbol::get_aliases_id_string): Add a flag
that says if the current instance of elf_symbol should be included
in the list of aliases or not.
* src/abg-ir.cc (elf_symbol::get_aliases_id_string): Define it.
* tests/data/test-diff-dwarf/test16-syms-only-v{0,1}.o: New test
input.
* tools/abidiff.cc
(options::show_symbols_not_referenced_by_debug_info): New data
member.
(options:options): Adjust.
(display_usage): Add an info string for the new
--no-unreferenced-symbols command line option.
(parse_command_line): Parse the new --no-unreferenced-symbols
command line.
(set_diff_context_from_opts): Set the diff_context according to
the presence of --no-unreferenced-symbols.
(main): Adjust for the fact that abigail::dwarf_reader::status is
now a bit-field.
* tools/abilint.cc (main): Adjust for the fact that
abigail::dwarf_reader::status is now a bit-field..
():
* tests/data/test-diff-dwarf/test16-syms-only-report.txt: New test
reference output.
* tests/data/test-diff-dwarf/test16-syms-only-v{0,1}.cc: Source code
for new test input.
* tests/data/test-diff-dwarf/test17-non-refed-syms-v{0,1}.o: New
test input.
* tests/data/test-diff-dwarf/test17-non-refed-syms-v{0,1}.cc: New
source code for test input.
* tests/data/test-diff-dwarf/libtest18-alias-sym-v{0,1}.so: New
test input.
* tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt:
Reference output for new test input.
* tests/data/test-diff-dwarf/test18-alias-sym-v{0,1}.cc: Source
code for new test input.
* tests/data/test-diff-dwarf/test18-alias-sym-version-script:
Source code for new test input.
* tests/Makefile.am: Add the new test materials to the source
distribution.
* tests/test-diff-dwarf.cc(in_out_specs): Add the new input tests
above to the array of tests to run by this harness.
(main): Emit empty reports for empty resulting diffs.
* tests/data/test-diff-dwarf/test{0,8,9,12,14-inline-report,}-report.txt:
Adjust.
* tests/data/test-diff-filter/test{0,01,2,4,5,7,8,9,10,12,13,15-0,15-1}-report.txt:
Likewise.
* tests/data/test-diff-filter/test{19-enum,20-inline,}-report-0.txt:
Likewise.
* tests/data/test-diff-suppr/test0-type-suppr-report-{1,2}.txt:
Likewise.
* tests/data/test-diff-suppr/test{1,2}-typedef-suppr-report-1.txt:
Likewise.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2014-10-22 16:05:31 +00:00
|
|
|
if (s & abigail::dwarf_reader::STATUS_DEBUG_INFO_NOT_FOUND)
|
2014-06-04 14:30:18 +00:00
|
|
|
{
|
|
|
|
cerr << "could not find the debug info";
|
|
|
|
if(di_root_path == 0)
|
|
|
|
cerr << " Maybe you should consider using the "
|
|
|
|
"--debug-info-dir1 option to tell me about the "
|
|
|
|
"root directory of the debuginfo? "
|
|
|
|
"(e.g, --debug-info-dir1 /usr/lib/debug)\n";
|
Support comparing symbols not referenced by debug info
* doc/manuals/abidiff.rst: Adjust intro to mention that w/o debug
info, abidiff now works but just report about added/removed
symbols. Add documentation about the new
--no-unreferenced-symbols option.
* include/abg-comparison.h (string_elf_symbol_map): New typedef.
(diff_context::show_symbols_unreferenced_by_debug_info): Declare
new accessors.
* src/abg-comparison.cc
(diff_context::priv::show_syms_unreferenced_by_di_): New data
member.
(diff_context::priv::priv): Adjust.
(diff_context::show_symbols_unreferenced_by_debug_info): Implement
these accessors.
(corpus_diff::priv::{unrefed_fn_syms_edit_script_,
unrefed_var_syms_edit_script_, added_unrefed_fn_syms_,
deleted_unrefed_fn_syms_, added_unrefed_var_syms_,
deleted_unrefed_var_syms_}): New data members.
(corpus_diff::priv::diff_stats::{num_func_syms_removed,
num_func_syms_added, num_var_syms_removed, num_var_syms_added}):
New data members.
(corpus_diff::priv::diff_stats::diff_stats): Adjust.
(corpus_diff::ensure_lookup_tables_populated): Populate lookup
tables for added/removed symbols that are not referenced by any
debug info.
(corpus_diff::priv::apply_filters_and_compute_diff_stats): Compute
stats for the added/removed symbols not referenced by any debug
info.
(corpus_diff::priv::emit_diff_stats): Emit stats about
added/removed symbols that are not referenced by any debug info.
(corpus_diff::length): Adjust to take in account added/removed
symbols not referenced by any debug info.
(show_linkage_name_and_aliases): New static function.
(corpus_diff::report): When emitting a symbol name, emit its
version too, and tell if it aliases other symbols. Avoid emitted
extra new lines. Report added/removed symbols not referenced by
any debug info.
(compute_diff): In the overload for corpus_sptr, compute the diffs
for symbols not referenced by debug info.
* include/abg-corpus.h
(corpus::get_unreferenced_{function,variable}_symbols): Declare
new member functions.
* src/abg-corpus.cc (corpus_priv::{unrefed_fun_symbols,
unrefed_var_symbols}): New data members.
(corpus_priv::build_unreferenced_symbols_tables): Define new
member function.
(struct comp_elf_symbols_functor): New functor.
(corpus::is_empty): Adjust to take in account added/removed
symbols not referenced by debug info.
(corpus::{get_unreferenced_function_symbols,
corpus::get_unreferenced_variable_symbols}): Define these
accessors.
* include/abg-dwarf-reader.h (enum status): Transform this into
bitfields. Add a STATUS_UNKNOWN value that has the value 0.
(operator|(status, status), operator&(status, status))
(operator|=(status&, status), operator&=(status, status)): New
bit-wise operators to manipulate instances of the status bit-field.
* src/abg-dwarf-reader.cc (get_version_for_symbol): Fix this to
avoid returning garbage version sometimes.
(read_debug_info_into_corpus): Fix this to return a non-null but
empty corpus_sptr when there is no debug info available.
(operator|(status, status), operator&(status, status))
(operator|=(status&, status), operator&=(status, status)): Define
these new bitwise operators to manipulate instances of the status
bit-field.
(read_corpus_from_elf): Now that the abigail::dwarf_reader::status
is a bit-field, set it to reflect if debug info and/or symbol
tables have been found. Do not bail out if debug info hasn't been
found. Rather, keep going, and go look for symbols-only; this is
a kind of operating in degraded mode.
* include/abg-ir.h (elf_symbol::get_aliases_id_string): Add a flag
that says if the current instance of elf_symbol should be included
in the list of aliases or not.
* src/abg-ir.cc (elf_symbol::get_aliases_id_string): Define it.
* tests/data/test-diff-dwarf/test16-syms-only-v{0,1}.o: New test
input.
* tools/abidiff.cc
(options::show_symbols_not_referenced_by_debug_info): New data
member.
(options:options): Adjust.
(display_usage): Add an info string for the new
--no-unreferenced-symbols command line option.
(parse_command_line): Parse the new --no-unreferenced-symbols
command line.
(set_diff_context_from_opts): Set the diff_context according to
the presence of --no-unreferenced-symbols.
(main): Adjust for the fact that abigail::dwarf_reader::status is
now a bit-field.
* tools/abilint.cc (main): Adjust for the fact that
abigail::dwarf_reader::status is now a bit-field..
():
* tests/data/test-diff-dwarf/test16-syms-only-report.txt: New test
reference output.
* tests/data/test-diff-dwarf/test16-syms-only-v{0,1}.cc: Source code
for new test input.
* tests/data/test-diff-dwarf/test17-non-refed-syms-v{0,1}.o: New
test input.
* tests/data/test-diff-dwarf/test17-non-refed-syms-v{0,1}.cc: New
source code for test input.
* tests/data/test-diff-dwarf/libtest18-alias-sym-v{0,1}.so: New
test input.
* tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt:
Reference output for new test input.
* tests/data/test-diff-dwarf/test18-alias-sym-v{0,1}.cc: Source
code for new test input.
* tests/data/test-diff-dwarf/test18-alias-sym-version-script:
Source code for new test input.
* tests/Makefile.am: Add the new test materials to the source
distribution.
* tests/test-diff-dwarf.cc(in_out_specs): Add the new input tests
above to the array of tests to run by this harness.
(main): Emit empty reports for empty resulting diffs.
* tests/data/test-diff-dwarf/test{0,8,9,12,14-inline-report,}-report.txt:
Adjust.
* tests/data/test-diff-filter/test{0,01,2,4,5,7,8,9,10,12,13,15-0,15-1}-report.txt:
Likewise.
* tests/data/test-diff-filter/test{19-enum,20-inline,}-report-0.txt:
Likewise.
* tests/data/test-diff-suppr/test0-type-suppr-report-{1,2}.txt:
Likewise.
* tests/data/test-diff-suppr/test{1,2}-typedef-suppr-report-1.txt:
Likewise.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2014-10-22 16:05:31 +00:00
|
|
|
else
|
|
|
|
cerr << "Maybe the root path to the debug "
|
|
|
|
"information is wrong?\n";
|
2014-06-04 14:30:18 +00:00
|
|
|
}
|
Support comparing symbols not referenced by debug info
* doc/manuals/abidiff.rst: Adjust intro to mention that w/o debug
info, abidiff now works but just report about added/removed
symbols. Add documentation about the new
--no-unreferenced-symbols option.
* include/abg-comparison.h (string_elf_symbol_map): New typedef.
(diff_context::show_symbols_unreferenced_by_debug_info): Declare
new accessors.
* src/abg-comparison.cc
(diff_context::priv::show_syms_unreferenced_by_di_): New data
member.
(diff_context::priv::priv): Adjust.
(diff_context::show_symbols_unreferenced_by_debug_info): Implement
these accessors.
(corpus_diff::priv::{unrefed_fn_syms_edit_script_,
unrefed_var_syms_edit_script_, added_unrefed_fn_syms_,
deleted_unrefed_fn_syms_, added_unrefed_var_syms_,
deleted_unrefed_var_syms_}): New data members.
(corpus_diff::priv::diff_stats::{num_func_syms_removed,
num_func_syms_added, num_var_syms_removed, num_var_syms_added}):
New data members.
(corpus_diff::priv::diff_stats::diff_stats): Adjust.
(corpus_diff::ensure_lookup_tables_populated): Populate lookup
tables for added/removed symbols that are not referenced by any
debug info.
(corpus_diff::priv::apply_filters_and_compute_diff_stats): Compute
stats for the added/removed symbols not referenced by any debug
info.
(corpus_diff::priv::emit_diff_stats): Emit stats about
added/removed symbols that are not referenced by any debug info.
(corpus_diff::length): Adjust to take in account added/removed
symbols not referenced by any debug info.
(show_linkage_name_and_aliases): New static function.
(corpus_diff::report): When emitting a symbol name, emit its
version too, and tell if it aliases other symbols. Avoid emitted
extra new lines. Report added/removed symbols not referenced by
any debug info.
(compute_diff): In the overload for corpus_sptr, compute the diffs
for symbols not referenced by debug info.
* include/abg-corpus.h
(corpus::get_unreferenced_{function,variable}_symbols): Declare
new member functions.
* src/abg-corpus.cc (corpus_priv::{unrefed_fun_symbols,
unrefed_var_symbols}): New data members.
(corpus_priv::build_unreferenced_symbols_tables): Define new
member function.
(struct comp_elf_symbols_functor): New functor.
(corpus::is_empty): Adjust to take in account added/removed
symbols not referenced by debug info.
(corpus::{get_unreferenced_function_symbols,
corpus::get_unreferenced_variable_symbols}): Define these
accessors.
* include/abg-dwarf-reader.h (enum status): Transform this into
bitfields. Add a STATUS_UNKNOWN value that has the value 0.
(operator|(status, status), operator&(status, status))
(operator|=(status&, status), operator&=(status, status)): New
bit-wise operators to manipulate instances of the status bit-field.
* src/abg-dwarf-reader.cc (get_version_for_symbol): Fix this to
avoid returning garbage version sometimes.
(read_debug_info_into_corpus): Fix this to return a non-null but
empty corpus_sptr when there is no debug info available.
(operator|(status, status), operator&(status, status))
(operator|=(status&, status), operator&=(status, status)): Define
these new bitwise operators to manipulate instances of the status
bit-field.
(read_corpus_from_elf): Now that the abigail::dwarf_reader::status
is a bit-field, set it to reflect if debug info and/or symbol
tables have been found. Do not bail out if debug info hasn't been
found. Rather, keep going, and go look for symbols-only; this is
a kind of operating in degraded mode.
* include/abg-ir.h (elf_symbol::get_aliases_id_string): Add a flag
that says if the current instance of elf_symbol should be included
in the list of aliases or not.
* src/abg-ir.cc (elf_symbol::get_aliases_id_string): Define it.
* tests/data/test-diff-dwarf/test16-syms-only-v{0,1}.o: New test
input.
* tools/abidiff.cc
(options::show_symbols_not_referenced_by_debug_info): New data
member.
(options:options): Adjust.
(display_usage): Add an info string for the new
--no-unreferenced-symbols command line option.
(parse_command_line): Parse the new --no-unreferenced-symbols
command line.
(set_diff_context_from_opts): Set the diff_context according to
the presence of --no-unreferenced-symbols.
(main): Adjust for the fact that abigail::dwarf_reader::status is
now a bit-field.
* tools/abilint.cc (main): Adjust for the fact that
abigail::dwarf_reader::status is now a bit-field..
():
* tests/data/test-diff-dwarf/test16-syms-only-report.txt: New test
reference output.
* tests/data/test-diff-dwarf/test16-syms-only-v{0,1}.cc: Source code
for new test input.
* tests/data/test-diff-dwarf/test17-non-refed-syms-v{0,1}.o: New
test input.
* tests/data/test-diff-dwarf/test17-non-refed-syms-v{0,1}.cc: New
source code for test input.
* tests/data/test-diff-dwarf/libtest18-alias-sym-v{0,1}.so: New
test input.
* tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt:
Reference output for new test input.
* tests/data/test-diff-dwarf/test18-alias-sym-v{0,1}.cc: Source
code for new test input.
* tests/data/test-diff-dwarf/test18-alias-sym-version-script:
Source code for new test input.
* tests/Makefile.am: Add the new test materials to the source
distribution.
* tests/test-diff-dwarf.cc(in_out_specs): Add the new input tests
above to the array of tests to run by this harness.
(main): Emit empty reports for empty resulting diffs.
* tests/data/test-diff-dwarf/test{0,8,9,12,14-inline-report,}-report.txt:
Adjust.
* tests/data/test-diff-filter/test{0,01,2,4,5,7,8,9,10,12,13,15-0,15-1}-report.txt:
Likewise.
* tests/data/test-diff-filter/test{19-enum,20-inline,}-report-0.txt:
Likewise.
* tests/data/test-diff-suppr/test0-type-suppr-report-{1,2}.txt:
Likewise.
* tests/data/test-diff-suppr/test{1,2}-typedef-suppr-report-1.txt:
Likewise.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2014-10-22 16:05:31 +00:00
|
|
|
if (s & abigail::dwarf_reader::STATUS_NO_SYMBOLS_FOUND)
|
|
|
|
cerr << "could not find the ELF symbols in the file "
|
|
|
|
<< opts.file_path
|
|
|
|
<< "\n";
|
2014-06-04 14:30:18 +00:00
|
|
|
}
|
2013-12-11 14:20:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
char tmpn[L_tmpnam];
|
|
|
|
tmpnam(tmpn);
|
|
|
|
|
|
|
|
string ofile_name = tmpn;
|
|
|
|
|
|
|
|
ofstream of(ofile_name.c_str(), std::ios_base::trunc);
|
|
|
|
if (!of.is_open())
|
|
|
|
{
|
|
|
|
cerr << "open temporary output file " << ofile_name << "\n";
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-03-11 12:59:01 +00:00
|
|
|
bool r = true;
|
2014-01-07 13:12:26 +00:00
|
|
|
|
|
|
|
if (tu)
|
2014-01-20 11:16:31 +00:00
|
|
|
{
|
|
|
|
if (opts.diff)
|
|
|
|
r = write_translation_unit(*tu, /*indent=*/0, of);
|
|
|
|
if (!opts.noout && !opts.diff)
|
|
|
|
r &= write_translation_unit(*tu, /*indent=*/0, cout);
|
|
|
|
}
|
2014-01-07 13:12:26 +00:00
|
|
|
else
|
|
|
|
{
|
2014-01-17 12:49:41 +00:00
|
|
|
r = true;
|
2014-01-07 13:12:26 +00:00
|
|
|
if (type == abigail::tools::FILE_TYPE_XML_CORPUS)
|
2014-01-17 12:49:41 +00:00
|
|
|
{
|
2014-01-20 11:16:31 +00:00
|
|
|
if (opts.diff)
|
|
|
|
r = write_corpus_to_native_xml(corp, /*indent=*/0, of);
|
|
|
|
|
|
|
|
if (!opts.noout && !opts.diff)
|
|
|
|
r &= write_corpus_to_native_xml(corp, /*indent=*/0, cout);
|
2014-01-17 12:49:41 +00:00
|
|
|
}
|
2014-01-07 13:12:26 +00:00
|
|
|
else if (type == abigail::tools::FILE_TYPE_ZIP_CORPUS)
|
|
|
|
{
|
2014-08-31 08:34:11 +00:00
|
|
|
#ifdef WITH_ZIP_ARCHIVE
|
2014-01-17 12:49:41 +00:00
|
|
|
if (!opts.noout)
|
|
|
|
r = write_corpus_to_archive(*corp, ofile_name);
|
2014-08-31 08:34:11 +00:00
|
|
|
#endif //WITH_ZIP_ARCHIVE
|
2014-01-07 13:12:26 +00:00
|
|
|
of.close();
|
|
|
|
}
|
|
|
|
else if (type == abigail::tools::FILE_TYPE_ELF)
|
2014-01-13 15:52:24 +00:00
|
|
|
{
|
|
|
|
if (!opts.noout)
|
|
|
|
r = write_corpus_to_native_xml(corp, /*indent=*/0, cout);
|
|
|
|
}
|
2014-01-07 13:12:26 +00:00
|
|
|
}
|
|
|
|
|
2013-12-11 14:20:42 +00:00
|
|
|
bool is_ok = r;
|
|
|
|
of.close();
|
|
|
|
|
|
|
|
if (!is_ok)
|
2014-01-07 13:12:26 +00:00
|
|
|
{
|
|
|
|
string output =
|
|
|
|
(type == abigail::tools::FILE_TYPE_NATIVE_BI)
|
|
|
|
? "translation unit"
|
|
|
|
: "ABI corpus";
|
|
|
|
cerr << "failed to write the translation unit "
|
|
|
|
<< opts.file_path << " back\n";
|
|
|
|
}
|
2013-12-11 14:20:42 +00:00
|
|
|
|
2014-01-07 13:12:26 +00:00
|
|
|
if (is_ok
|
2014-01-17 12:49:41 +00:00
|
|
|
&& opts.diff
|
2014-01-07 13:12:26 +00:00
|
|
|
&& ((type == abigail::tools::FILE_TYPE_XML_CORPUS)
|
|
|
|
|| type == abigail::tools::FILE_TYPE_NATIVE_BI
|
|
|
|
|| type == abigail::tools::FILE_TYPE_ZIP_CORPUS))
|
2013-12-11 14:20:42 +00:00
|
|
|
{
|
|
|
|
string cmd = "diff -u " + opts.file_path + " " + ofile_name;
|
|
|
|
if (system(cmd.c_str()))
|
|
|
|
is_ok = false;
|
|
|
|
}
|
|
|
|
remove(ofile_name.c_str());
|
|
|
|
return !is_ok;
|
2013-11-19 10:08:25 +00:00
|
|
|
}
|
|
|
|
|
2013-12-11 14:20:42 +00:00
|
|
|
return true;
|
2013-11-19 10:08:25 +00:00
|
|
|
}
|