mirror of
https://git.suyu.dev/suyu/breakpad.git
synced 2026-03-05 20:16:32 +00:00
Issue 39002: Breakpad DWARF parser: Move DWARF parser to platform-independent directory.
Move the DWARF parser, and the functioninfo.cc DWARF consumer, from src/common/mac/dwarf to src/commmon/dwarf, so that it can be shared between the Mac and Linux dumpers. Fix up #include directives, multiple inclusion protection macros, and Xcode build files. a=jimblandy, r=nealsid git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@446 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
#ifndef UTIL_DEBUGINFO_BYTEREADER_INL_H__
|
||||
#define UTIL_DEBUGINFO_BYTEREADER_INL_H__
|
||||
|
||||
#include "common/mac/dwarf/bytereader.h"
|
||||
#include "common/dwarf/bytereader.h"
|
||||
|
||||
namespace dwarf2reader {
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include "common/mac/dwarf/bytereader-inl.h"
|
||||
#include "common/mac/dwarf/bytereader.h"
|
||||
#include "common/dwarf/bytereader-inl.h"
|
||||
#include "common/dwarf/bytereader.h"
|
||||
|
||||
namespace dwarf2reader {
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#ifndef COMMON_MAC_DWARF_BYTEREADER_H__
|
||||
#define COMMON_MAC_DWARF_BYTEREADER_H__
|
||||
#ifndef COMMON_DWARF_BYTEREADER_H__
|
||||
#define COMMON_DWARF_BYTEREADER_H__
|
||||
|
||||
#include <string>
|
||||
#include "common/mac/dwarf/types.h"
|
||||
#include "common/dwarf/types.h"
|
||||
|
||||
namespace dwarf2reader {
|
||||
|
||||
@@ -129,4 +129,4 @@ class ByteReader {
|
||||
|
||||
} // namespace dwarf2reader
|
||||
|
||||
#endif // COMMON_MAC_DWARF_BYTEREADER_H__
|
||||
#endif // COMMON_DWARF_BYTEREADER_H__
|
||||
@@ -26,8 +26,8 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#ifndef COMMON_MAC_DWARF_DWARF2ENUMS_H__
|
||||
#define COMMON_MAC_DWARF_DWARF2ENUMS_H__
|
||||
#ifndef COMMON_DWARF_DWARF2ENUMS_H__
|
||||
#define COMMON_DWARF_DWARF2ENUMS_H__
|
||||
|
||||
namespace dwarf2reader {
|
||||
|
||||
@@ -487,4 +487,4 @@ enum DwarfOpcode {
|
||||
};
|
||||
|
||||
} // namespace dwarf2reader
|
||||
#endif // COMMON_MAC_DWARF_DWARF2ENUMS_H__
|
||||
#endif // COMMON_DWARF_DWARF2ENUMS_H__
|
||||
@@ -31,10 +31,10 @@
|
||||
#include <stack>
|
||||
#include <utility>
|
||||
|
||||
#include "common/mac/dwarf/bytereader-inl.h"
|
||||
#include "common/mac/dwarf/dwarf2reader.h"
|
||||
#include "common/mac/dwarf/bytereader.h"
|
||||
#include "common/mac/dwarf/line_state_machine.h"
|
||||
#include "common/dwarf/bytereader-inl.h"
|
||||
#include "common/dwarf/dwarf2reader.h"
|
||||
#include "common/dwarf/bytereader.h"
|
||||
#include "common/dwarf/line_state_machine.h"
|
||||
|
||||
namespace dwarf2reader {
|
||||
|
||||
@@ -33,8 +33,8 @@
|
||||
// reading if you wish to modify the implementation.
|
||||
// Only a cursory attempt is made to explain terminology that is
|
||||
// used here, as it is much better explained in the standard documents
|
||||
#ifndef COMMON_MAC_DWARF_DWARF2READER_H__
|
||||
#define COMMON_MAC_DWARF_DWARF2READER_H__
|
||||
#ifndef COMMON_DWARF_DWARF2READER_H__
|
||||
#define COMMON_DWARF_DWARF2READER_H__
|
||||
|
||||
#include <list>
|
||||
#include <map>
|
||||
@@ -42,8 +42,8 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "common/mac/dwarf/dwarf2enums.h"
|
||||
#include "common/mac/dwarf/types.h"
|
||||
#include "common/dwarf/dwarf2enums.h"
|
||||
#include "common/dwarf/types.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -35,9 +35,9 @@
|
||||
#include <queue>
|
||||
#include <vector>
|
||||
|
||||
#include "common/mac/dwarf/functioninfo.h"
|
||||
#include "common/dwarf/functioninfo.h"
|
||||
|
||||
#include "common/mac/dwarf/bytereader.h"
|
||||
#include "common/dwarf/bytereader.h"
|
||||
|
||||
|
||||
namespace dwarf2reader {
|
||||
@@ -31,15 +31,15 @@
|
||||
// collector that uses the DWARF2/3 reader interface to build a mapping
|
||||
// of addresses to files, lines, and functions.
|
||||
|
||||
#ifndef COMMON_MAC_DWARF_FUNCTIONINFO_H__
|
||||
#define COMMON_MAC_DWARF_FUNCTIONINFO_H__
|
||||
#ifndef COMMON_DWARF_FUNCTIONINFO_H__
|
||||
#define COMMON_DWARF_FUNCTIONINFO_H__
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "common/mac/dwarf/dwarf2reader.h"
|
||||
#include "common/dwarf/dwarf2reader.h"
|
||||
|
||||
|
||||
namespace dwarf2reader {
|
||||
@@ -175,4 +175,4 @@ class CUFunctionInfoHandler: public Dwarf2Handler {
|
||||
};
|
||||
|
||||
} // namespace dwarf2reader
|
||||
#endif // COMMON_MAC_DWARF_FUNCTIONINFO_H__
|
||||
#endif // COMMON_DWARF_FUNCTIONINFO_H__
|
||||
@@ -27,8 +27,8 @@
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
|
||||
#ifndef COMMON_MAC_DWARF_LINE_STATE_MACHINE_H__
|
||||
#define COMMON_MAC_DWARF_LINE_STATE_MACHINE_H__
|
||||
#ifndef COMMON_DWARF_LINE_STATE_MACHINE_H__
|
||||
#define COMMON_DWARF_LINE_STATE_MACHINE_H__
|
||||
|
||||
namespace dwarf2reader {
|
||||
|
||||
@@ -58,4 +58,4 @@ struct LineStateMachine {
|
||||
} // namespace dwarf2reader
|
||||
|
||||
|
||||
#endif // COMMON_MAC_DWARF_LINE_STATE_MACHINE_H__
|
||||
#endif // COMMON_DWARF_LINE_STATE_MACHINE_H__
|
||||
@@ -30,8 +30,8 @@
|
||||
// This file contains some typedefs for basic types
|
||||
|
||||
|
||||
#ifndef _COMMON_MAC_DWARF_TYPES_H__
|
||||
#define _COMMON_MAC_DWARF_TYPES_H__
|
||||
#ifndef _COMMON_DWARF_TYPES_H__
|
||||
#define _COMMON_DWARF_TYPES_H__
|
||||
|
||||
typedef signed char int8;
|
||||
typedef short int16;
|
||||
@@ -43,4 +43,4 @@ typedef unsigned short uint16;
|
||||
typedef unsigned int uint32;
|
||||
typedef unsigned long long uint64;
|
||||
|
||||
#endif // _COMMON_MAC_DWARF_TYPES_H__
|
||||
#endif // _COMMON_DWARF_TYPES_H__
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#include <mach-o/loader.h>
|
||||
#include "common/mac/dwarf/dwarf2reader.h"
|
||||
#include "common/dwarf/dwarf2reader.h"
|
||||
|
||||
// This will map from an architecture string to a SectionMap, which
|
||||
// will contain the offsets for all the sections in the dictionary
|
||||
|
||||
@@ -47,9 +47,9 @@
|
||||
#import "dump_syms.h"
|
||||
#import "common/mac/file_id.h"
|
||||
#import "common/mac/macho_utilities.h"
|
||||
#import "common/mac/dwarf/dwarf2reader.h"
|
||||
#import "common/mac/dwarf/functioninfo.h"
|
||||
#import "common/mac/dwarf/bytereader.h"
|
||||
#import "common/dwarf/dwarf2reader.h"
|
||||
#import "common/dwarf/functioninfo.h"
|
||||
#import "common/dwarf/bytereader.h"
|
||||
|
||||
using google_breakpad::FileID;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user