aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/google_airbag/common/airbag_types.h (renamed from src/google/airbag_types.h)7
-rw-r--r--src/google_airbag/common/minidump_format.h (renamed from src/processor/minidump_format.h)8
-rw-r--r--src/google_airbag/processor/call_stack.h (renamed from src/google/call_stack.h)6
-rw-r--r--src/google_airbag/processor/memory_region.h (renamed from src/processor/memory_region.h)8
-rw-r--r--src/google_airbag/processor/minidump.h (renamed from src/processor/minidump.h)27
-rw-r--r--src/google_airbag/processor/minidump_processor.h (renamed from src/google/minidump_processor.h)6
-rw-r--r--src/google_airbag/processor/process_state.h (renamed from src/google/process_state.h)6
-rw-r--r--src/google_airbag/processor/stack_frame.h (renamed from src/google/stack_frame.h)8
-rw-r--r--src/google_airbag/processor/stack_frame_cpu.h (renamed from src/google/stack_frame_cpu.h)10
-rw-r--r--src/google_airbag/processor/stackwalker.h (renamed from src/processor/stackwalker.h)6
-rw-r--r--src/google_airbag/processor/symbol_supplier.h (renamed from src/google/symbol_supplier.h)6
-rw-r--r--src/processor/call_stack.cc4
-rw-r--r--src/processor/minidump.cc20
-rw-r--r--src/processor/minidump_dump.cc2
-rw-r--r--src/processor/minidump_processor.cc8
-rw-r--r--src/processor/minidump_processor_unittest.cc12
-rw-r--r--src/processor/minidump_stackwalk.cc10
-rw-r--r--src/processor/postfix_evaluator-inl.h2
-rw-r--r--src/processor/postfix_evaluator.h2
-rw-r--r--src/processor/postfix_evaluator_unittest.cc4
-rw-r--r--src/processor/process_state.cc4
-rw-r--r--src/processor/simple_symbol_supplier.cc2
-rw-r--r--src/processor/simple_symbol_supplier.h2
-rw-r--r--src/processor/source_line_resolver.cc2
-rw-r--r--src/processor/source_line_resolver.h2
-rw-r--r--src/processor/source_line_resolver_unittest.cc2
-rw-r--r--src/processor/stack_frame_info.h2
-rw-r--r--src/processor/stackwalker.cc10
-rw-r--r--src/processor/stackwalker_ppc.cc6
-rw-r--r--src/processor/stackwalker_ppc.h6
-rw-r--r--src/processor/stackwalker_selftest.cc12
-rw-r--r--src/processor/stackwalker_x86.cc6
-rw-r--r--src/processor/stackwalker_x86.h6
33 files changed, 111 insertions, 113 deletions
diff --git a/src/google/airbag_types.h b/src/google_airbag/common/airbag_types.h
index fa3804f1..917d6e61 100644
--- a/src/google/airbag_types.h
+++ b/src/google_airbag/common/airbag_types.h
@@ -37,9 +37,8 @@
*
* Author: Mark Mentovai */
-#ifndef GOOGLE_AIRBAG_TYPES_H__
-#define GOOGLE_AIRBAG_TYPES_H__
-
+#ifndef GOOGLE_AIRBAG_COMMON_AIRBAG_TYPES_H__
+#define GOOGLE_AIRBAG_COMMON_AIRBAG_TYPES_H__
#ifndef _WIN32
@@ -62,4 +61,4 @@ typedef struct {
typedef u_int64_t airbag_time_t;
-#endif /* GOOGLE_AIRBAG_TYPES_H__ */
+#endif /* GOOGLE_AIRBAG_COMMON_AIRBAG_TYPES_H__ */
diff --git a/src/processor/minidump_format.h b/src/google_airbag/common/minidump_format.h
index b939b6c1..9ee63ab3 100644
--- a/src/processor/minidump_format.h
+++ b/src/google_airbag/common/minidump_format.h
@@ -64,11 +64,11 @@
* Author: Mark Mentovai */
-#ifndef PROCESSOR_MINIDUMP_FORMAT_H__
-#define PROCESSOR_MINIDUMP_FORMAT_H__
+#ifndef GOOGLE_AIRBAG_COMMON_MINIDUMP_FORMAT_H__
+#define GOOGLE_AIRBAG_COMMON_MINIDUMP_FORMAT_H__
-#include "google/airbag_types.h"
+#include "google_airbag/common/airbag_types.h"
/*
@@ -963,4 +963,4 @@ typedef enum {
} MDMiscInfoFlags1;
-#endif /* PROCESSOR_MINIDUMP_FORMAT_H__ */
+#endif /* GOOGLE_AIRBAG_COMMON_MINIDUMP_FORMAT_H__ */
diff --git a/src/google/call_stack.h b/src/google_airbag/processor/call_stack.h
index f51d0ca7..580d4927 100644
--- a/src/google/call_stack.h
+++ b/src/google_airbag/processor/call_stack.h
@@ -42,8 +42,8 @@
//
// Author: Mark Mentovai
-#ifndef GOOGLE_CALL_STACK_H__
-#define GOOGLE_CALL_STACK_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_CALL_STACK_H__
+#define GOOGLE_AIRBAG_PROCESSOR_CALL_STACK_H__
#include <vector>
@@ -73,4 +73,4 @@ class CallStack {
} // namespace google_airbag
-#endif // GOOGLE_CALL_STACK_H__
+#endif // GOOGLE_AIRBAG_PROCSSOR_CALL_STACK_H__
diff --git a/src/processor/memory_region.h b/src/google_airbag/processor/memory_region.h
index 0070ce32..dba2e359 100644
--- a/src/processor/memory_region.h
+++ b/src/google_airbag/processor/memory_region.h
@@ -35,11 +35,11 @@
//
// Author: Mark Mentovai
-#ifndef PROCESSOR_MEMORY_REGION_H__
-#define PROCESSOR_MEMORY_REGION_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_MEMORY_REGION_H__
+#define GOOGLE_AIRBAG_PROCESSOR_MEMORY_REGION_H__
-#include "google/airbag_types.h"
+#include "google_airbag/common/airbag_types.h"
namespace google_airbag {
@@ -73,4 +73,4 @@ class MemoryRegion {
} // namespace google_airbag
-#endif // PROCESSOR_MEMORY_REGION_H__
+#endif // GOOGLE_AIRBAG_PROCESSOR_MEMORY_REGION_H__
diff --git a/src/processor/minidump.h b/src/google_airbag/processor/minidump.h
index c637dd66..edcda9f8 100644
--- a/src/processor/minidump.h
+++ b/src/google_airbag/processor/minidump.h
@@ -76,18 +76,16 @@
//
// Author: Mark Mentovai
-#ifndef PROCESSOR_MINIDUMP_H__
-#define PROCESSOR_MINIDUMP_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_MINIDUMP_H__
+#define GOOGLE_AIRBAG_PROCESSOR_MINIDUMP_H__
-// TODO(mmentovai): is it ok to include non-<string> header in .h?
#include <map>
#include <string>
#include <vector>
-#include "processor/minidump_format.h"
-#include "processor/memory_region.h"
-#include "processor/range_map.h"
+#include "google_airbag/common/minidump_format.h"
+#include "google_airbag/processor/memory_region.h"
namespace google_airbag {
@@ -99,6 +97,7 @@ using std::vector;
class Minidump;
+template<typename AddressType, typename EntryType> class RangeMap;
// MinidumpObject is the base of all Minidump* objects except for Minidump
@@ -444,10 +443,10 @@ class MinidumpModuleList : public MinidumpStream {
bool Read(u_int32_t expected_size);
// Access to modules using addresses as the key.
- RangeMap<u_int64_t, unsigned int> range_map_;
+ RangeMap<u_int64_t, unsigned int> *range_map_;
- MinidumpModules* modules_;
- u_int32_t module_count_;
+ MinidumpModules *modules_;
+ u_int32_t module_count_;
};
@@ -489,17 +488,17 @@ class MinidumpMemoryList : public MinidumpStream {
bool Read(u_int32_t expected_size);
// Access to memory regions using addresses as the key.
- RangeMap<u_int64_t, unsigned int> range_map_;
+ RangeMap<u_int64_t, unsigned int> *range_map_;
// The list of descriptors. This is maintained separately from the list
// of regions, because MemoryRegion doesn't own its MemoryDescriptor, it
// maintains a pointer to it. descriptors_ provides the storage for this
// purpose.
- MemoryDescriptors* descriptors_;
+ MemoryDescriptors *descriptors_;
// The list of regions.
- MemoryRegions* regions_;
- u_int32_t region_count_;
+ MemoryRegions *regions_;
+ u_int32_t region_count_;
};
@@ -733,4 +732,4 @@ class Minidump {
} // namespace google_airbag
-#endif // PROCESSOR_MINIDUMP_H__
+#endif // GOOGLE_AIRBAG_PROCESSOR_MINIDUMP_H__
diff --git a/src/google/minidump_processor.h b/src/google_airbag/processor/minidump_processor.h
index 21a80325..06c185ff 100644
--- a/src/google/minidump_processor.h
+++ b/src/google_airbag/processor/minidump_processor.h
@@ -27,8 +27,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 GOOGLE_MINIDUMP_PROCESSOR_H__
-#define GOOGLE_MINIDUMP_PROCESSOR_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_MINIDUMP_PROCESSOR_H__
+#define GOOGLE_AIRBAG_PROCESSOR_MINIDUMP_PROCESSOR_H__
#include <string>
@@ -82,4 +82,4 @@ class MinidumpProcessor {
} // namespace google_airbag
-#endif // GOOGLE_MINIDUMP_PROCESSOR_H__
+#endif // GOOGLE_AIRBAG_PROCESSOR_MINIDUMP_PROCESSOR_H__
diff --git a/src/google/process_state.h b/src/google_airbag/processor/process_state.h
index b233b390..e67ae9ae 100644
--- a/src/google/process_state.h
+++ b/src/google_airbag/processor/process_state.h
@@ -31,8 +31,8 @@
//
// Author: Mark Mentovai
-#ifndef GOOGLE_PROCESS_STATE_H__
-#define GOOGLE_PROCESS_STATE_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_PROCESS_STATE_H__
+#define GOOGLE_AIRBAG_PROCESSOR_PROCESS_STATE_H__
#include <string>
#include <vector>
@@ -118,4 +118,4 @@ class ProcessState {
} // namespace google_airbag
-#endif // GOOGLE_CALL_STACK_H__
+#endif // GOOGLE_AIRBAG_PROCESSOR_CALL_STACK_H__
diff --git a/src/google/stack_frame.h b/src/google_airbag/processor/stack_frame.h
index 563106e4..fd9e9f40 100644
--- a/src/google/stack_frame.h
+++ b/src/google_airbag/processor/stack_frame.h
@@ -27,11 +27,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 GOOGLE_STACK_FRAME_H__
-#define GOOGLE_STACK_FRAME_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_STACK_FRAME_H__
+#define GOOGLE_AIRBAG_PROCESSOR_STACK_FRAME_H__
#include <string>
-#include "google/airbag_types.h"
+#include "google_airbag/common/airbag_types.h"
namespace google_airbag {
@@ -83,4 +83,4 @@ struct StackFrame {
} // namespace google_airbag
-#endif // GOOGLE_STACK_FRAME_H__
+#endif // GOOGLE_AIRBAG_PROCESSOR_STACK_FRAME_H__
diff --git a/src/google/stack_frame_cpu.h b/src/google_airbag/processor/stack_frame_cpu.h
index 46539418..a27567f7 100644
--- a/src/google/stack_frame_cpu.h
+++ b/src/google_airbag/processor/stack_frame_cpu.h
@@ -36,11 +36,11 @@
//
// Author: Mark Mentovai
-#ifndef GOOGLE_STACK_FRAME_CPU_H__
-#define GOOGLE_STACK_FRAME_CPU_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_STACK_FRAME_CPU_H__
+#define GOOGLE_AIRBAG_PROCESSOR_STACK_FRAME_CPU_H__
-#include "google/stack_frame.h"
-#include "processor/minidump_format.h"
+#include "google_airbag/common/minidump_format.h"
+#include "google_airbag/processor/stack_frame.h"
namespace google_airbag {
@@ -100,4 +100,4 @@ struct StackFramePPC : public StackFrame {
} // namespace google_airbag
-#endif // GOOGLE_STACK_FRAME_CPU_H__
+#endif // GOOGLE_AIRBAG_PROCESSOR_STACK_FRAME_CPU_H__
diff --git a/src/processor/stackwalker.h b/src/google_airbag/processor/stackwalker.h
index a24f31a6..e6c6e6e8 100644
--- a/src/processor/stackwalker.h
+++ b/src/google_airbag/processor/stackwalker.h
@@ -38,8 +38,8 @@
// Author: Mark Mentovai
-#ifndef PROCESSOR_STACKWALKER_H__
-#define PROCESSOR_STACKWALKER_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_STACKWALKER_H__
+#define GOOGLE_AIRBAG_PROCESSOR_STACKWALKER_H__
#include <vector>
@@ -120,4 +120,4 @@ class Stackwalker {
} // namespace google_airbag
-#endif // PROCESSOR_STACKWALKER_H__
+#endif // GOOGLE_AIRBAG_PROCESSOR_STACKWALKER_H__
diff --git a/src/google/symbol_supplier.h b/src/google_airbag/processor/symbol_supplier.h
index ef2b2353..264dfcf2 100644
--- a/src/google/symbol_supplier.h
+++ b/src/google_airbag/processor/symbol_supplier.h
@@ -30,8 +30,8 @@
// The caller may implement the SymbolSupplier abstract base class
// to provide symbols for a given module.
-#ifndef GOOGLE_SYMBOL_SUPPLIER_H__
-#define GOOGLE_SYMBOL_SUPPLIER_H__
+#ifndef GOOGLE_AIRBAG_PROCESSOR_SYMBOL_SUPPLIER_H__
+#define GOOGLE_AIRBAG_PROCESSOR_SYMBOL_SUPPLIER_H__
#include <string>
@@ -50,4 +50,4 @@ class SymbolSupplier {
} // namespace google_airbag
-#endif // GOOGLE_SYMBOL_SUPPLIER_H__
+#endif // GOOGLE_AIRBAG_PROCESSOR_SYMBOL_SUPPLIER_H__
diff --git a/src/processor/call_stack.cc b/src/processor/call_stack.cc
index 1c31b5a3..8c1362f3 100644
--- a/src/processor/call_stack.cc
+++ b/src/processor/call_stack.cc
@@ -33,8 +33,8 @@
//
// Author: Mark Mentovai
-#include "google/call_stack.h"
-#include "google/stack_frame.h"
+#include "google_airbag/processor/call_stack.h"
+#include "google_airbag/processor/stack_frame.h"
namespace google_airbag {
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index 06993fbd..991a313b 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -53,7 +53,7 @@ typedef SSIZE_T ssize_t;
#include "processor/range_map-inl.h"
-#include "processor/minidump.h"
+#include "google_airbag/processor/minidump.h"
#include "processor/scoped_ptr.h"
@@ -1408,20 +1408,21 @@ void MinidumpModule::Print() {
MinidumpModuleList::MinidumpModuleList(Minidump* minidump)
: MinidumpStream(minidump),
- range_map_(),
+ range_map_(new RangeMap<u_int64_t, unsigned int>()),
modules_(NULL),
module_count_(0) {
}
MinidumpModuleList::~MinidumpModuleList() {
+ delete range_map_;
delete modules_;
}
bool MinidumpModuleList::Read(u_int32_t expected_size) {
// Invalidate cached data.
- range_map_.Clear();
+ range_map_->Clear();
delete modules_;
modules_ = NULL;
module_count_ = 0;
@@ -1460,7 +1461,7 @@ bool MinidumpModuleList::Read(u_int32_t expected_size) {
if (base_address == (u_int64_t)-1)
return false;
- if (!range_map_.StoreRange(base_address, module_size, module_index))
+ if (!range_map_->StoreRange(base_address, module_size, module_index))
return false;
}
@@ -1486,7 +1487,7 @@ MinidumpModule* MinidumpModuleList::GetModuleForAddress(u_int64_t address) {
return NULL;
unsigned int module_index;
- if (!range_map_.RetrieveRange(address, &module_index, NULL, NULL))
+ if (!range_map_->RetrieveRange(address, &module_index, NULL, NULL))
return NULL;
return GetModuleAtIndex(module_index);
@@ -1518,7 +1519,7 @@ void MinidumpModuleList::Print() {
MinidumpMemoryList::MinidumpMemoryList(Minidump* minidump)
: MinidumpStream(minidump),
- range_map_(),
+ range_map_(new RangeMap<u_int64_t, unsigned int>()),
descriptors_(NULL),
regions_(NULL),
region_count_(0) {
@@ -1526,6 +1527,7 @@ MinidumpMemoryList::MinidumpMemoryList(Minidump* minidump)
MinidumpMemoryList::~MinidumpMemoryList() {
+ delete range_map_;
delete descriptors_;
delete regions_;
}
@@ -1537,7 +1539,7 @@ bool MinidumpMemoryList::Read(u_int32_t expected_size) {
descriptors_ = NULL;
delete regions_;
regions_ = NULL;
- range_map_.Clear();
+ range_map_->Clear();
region_count_ = 0;
valid_ = false;
@@ -1587,7 +1589,7 @@ bool MinidumpMemoryList::Read(u_int32_t expected_size) {
if (region_size == 0 || high_address < base_address)
return false;
- if (!range_map_.StoreRange(base_address, region_size, region_index))
+ if (!range_map_->StoreRange(base_address, region_size, region_index))
return false;
(*regions)[region_index].SetDescriptor(descriptor);
@@ -1617,7 +1619,7 @@ MinidumpMemoryRegion* MinidumpMemoryList::GetMemoryRegionForAddress(
return NULL;
unsigned int region_index;
- if (!range_map_.RetrieveRange(address, &region_index, NULL, NULL))
+ if (!range_map_->RetrieveRange(address, &region_index, NULL, NULL))
return NULL;
return GetMemoryRegionAtIndex(region_index);
diff --git a/src/processor/minidump_dump.cc b/src/processor/minidump_dump.cc
index bcabc83a..cde218a1 100644
--- a/src/processor/minidump_dump.cc
+++ b/src/processor/minidump_dump.cc
@@ -37,7 +37,7 @@
#include <string>
-#include "processor/minidump.h"
+#include "google_airbag/processor/minidump.h"
using std::string;
diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc
index 9d1279bf..0a2a867c 100644
--- a/src/processor/minidump_processor.cc
+++ b/src/processor/minidump_processor.cc
@@ -27,10 +27,10 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "google/minidump_processor.h"
-#include "google/call_stack.h"
-#include "google/process_state.h"
-#include "processor/minidump.h"
+#include "google_airbag/processor/minidump_processor.h"
+#include "google_airbag/processor/call_stack.h"
+#include "google_airbag/processor/minidump.h"
+#include "google_airbag/processor/process_state.h"
#include "processor/scoped_ptr.h"
#include "processor/stackwalker_x86.h"
diff --git a/src/processor/minidump_processor_unittest.cc b/src/processor/minidump_processor_unittest.cc
index 81646a50..122acd2f 100644
--- a/src/processor/minidump_processor_unittest.cc
+++ b/src/processor/minidump_processor_unittest.cc
@@ -31,12 +31,12 @@
// corresponding symbol file, and checks the stack frames for correctness.
#include <string>
-#include "google/call_stack.h"
-#include "google/minidump_processor.h"
-#include "google/process_state.h"
-#include "google/stack_frame.h"
-#include "google/symbol_supplier.h"
-#include "processor/minidump.h"
+#include "google_airbag/processor/call_stack.h"
+#include "google_airbag/processor/minidump.h"
+#include "google_airbag/processor/minidump_processor.h"
+#include "google_airbag/processor/process_state.h"
+#include "google_airbag/processor/stack_frame.h"
+#include "google_airbag/processor/symbol_supplier.h"
#include "processor/scoped_ptr.h"
using std::string;
diff --git a/src/processor/minidump_stackwalk.cc b/src/processor/minidump_stackwalk.cc
index 5f343a29..6832a4ac 100644
--- a/src/processor/minidump_stackwalk.cc
+++ b/src/processor/minidump_stackwalk.cc
@@ -36,11 +36,11 @@
#include <cstdlib>
#include <string>
-#include "google/call_stack.h"
-#include "google/minidump_processor.h"
-#include "google/process_state.h"
-#include "google/stack_frame_cpu.h"
-#include "processor/minidump.h"
+#include "google_airbag/processor/call_stack.h"
+#include "google_airbag/processor/minidump.h"
+#include "google_airbag/processor/minidump_processor.h"
+#include "google_airbag/processor/process_state.h"
+#include "google_airbag/processor/stack_frame_cpu.h"
#include "processor/pathname_stripper.h"
#include "processor/scoped_ptr.h"
#include "processor/simple_symbol_supplier.h"
diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h
index 227ebf8e..c80deffe 100644
--- a/src/processor/postfix_evaluator-inl.h
+++ b/src/processor/postfix_evaluator-inl.h
@@ -26,7 +26,7 @@
#include <sstream>
#include "processor/postfix_evaluator.h"
-#include "processor/memory_region.h"
+#include "google_airbag/processor/memory_region.h"
namespace google_airbag {
diff --git a/src/processor/postfix_evaluator.h b/src/processor/postfix_evaluator.h
index 46a32ac0..937eb327 100644
--- a/src/processor/postfix_evaluator.h
+++ b/src/processor/postfix_evaluator.h
@@ -55,8 +55,6 @@
#include <string>
#include <vector>
-#include "processor/memory_region.h"
-
namespace google_airbag {
using std::map;
diff --git a/src/processor/postfix_evaluator_unittest.cc b/src/processor/postfix_evaluator_unittest.cc
index aa55dd98..0362a7ae 100644
--- a/src/processor/postfix_evaluator_unittest.cc
+++ b/src/processor/postfix_evaluator_unittest.cc
@@ -22,8 +22,8 @@
#include "processor/postfix_evaluator-inl.h"
-#include "google/airbag_types.h"
-#include "processor/memory_region.h"
+#include "google_airbag/common/airbag_types.h"
+#include "google_airbag/processor/memory_region.h"
using std::map;
diff --git a/src/processor/process_state.cc b/src/processor/process_state.cc
index 0099af15..b7c2239e 100644
--- a/src/processor/process_state.cc
+++ b/src/processor/process_state.cc
@@ -33,8 +33,8 @@
//
// Author: Mark Mentovai
-#include "google/process_state.h"
-#include "google/call_stack.h"
+#include "google_airbag/processor/process_state.h"
+#include "google_airbag/processor/call_stack.h"
namespace google_airbag {
diff --git a/src/processor/simple_symbol_supplier.cc b/src/processor/simple_symbol_supplier.cc
index 6c4c9a3d..122ec489 100644
--- a/src/processor/simple_symbol_supplier.cc
+++ b/src/processor/simple_symbol_supplier.cc
@@ -34,7 +34,7 @@
// Author: Mark Mentovai
#include "processor/simple_symbol_supplier.h"
-#include "processor/minidump.h"
+#include "google_airbag/processor/minidump.h"
#include "processor/pathname_stripper.h"
namespace google_airbag {
diff --git a/src/processor/simple_symbol_supplier.h b/src/processor/simple_symbol_supplier.h
index 4db8810c..dad34170 100644
--- a/src/processor/simple_symbol_supplier.h
+++ b/src/processor/simple_symbol_supplier.h
@@ -70,7 +70,7 @@
#include <string>
-#include "google/symbol_supplier.h"
+#include "google_airbag/processor/symbol_supplier.h"
namespace google_airbag {
diff --git a/src/processor/source_line_resolver.cc b/src/processor/source_line_resolver.cc
index c89c9498..59b8828f 100644
--- a/src/processor/source_line_resolver.cc
+++ b/src/processor/source_line_resolver.cc
@@ -39,7 +39,7 @@
#include "processor/range_map-inl.h"
#include "processor/source_line_resolver.h"
-#include "google/stack_frame.h"
+#include "google_airbag/processor/stack_frame.h"
#include "processor/linked_ptr.h"
#include "processor/scoped_ptr.h"
#include "processor/stack_frame_info.h"
diff --git a/src/processor/source_line_resolver.h b/src/processor/source_line_resolver.h
index cb0c6801..3e992607 100644
--- a/src/processor/source_line_resolver.h
+++ b/src/processor/source_line_resolver.h
@@ -36,7 +36,7 @@
#include <string>
#include <ext/hash_map>
-#include "google/airbag_types.h"
+#include "google_airbag/common/airbag_types.h"
namespace google_airbag {
diff --git a/src/processor/source_line_resolver_unittest.cc b/src/processor/source_line_resolver_unittest.cc
index 3ac5ea01..abd194b1 100644
--- a/src/processor/source_line_resolver_unittest.cc
+++ b/src/processor/source_line_resolver_unittest.cc
@@ -30,7 +30,7 @@
#include <stdio.h>
#include <string>
#include "processor/source_line_resolver.h"
-#include "google/stack_frame.h"
+#include "google_airbag/processor/stack_frame.h"
#include "processor/linked_ptr.h"
#include "processor/scoped_ptr.h"
#include "processor/stack_frame_info.h"
diff --git a/src/processor/stack_frame_info.h b/src/processor/stack_frame_info.h
index c1241845..e5456076 100644
--- a/src/processor/stack_frame_info.h
+++ b/src/processor/stack_frame_info.h
@@ -40,7 +40,7 @@
#include <string>
-#include "google/airbag_types.h"
+#include "google_airbag/common/airbag_types.h"
namespace google_airbag {
diff --git a/src/processor/stackwalker.cc b/src/processor/stackwalker.cc
index 2ff991d9..78f17363 100644
--- a/src/processor/stackwalker.cc
+++ b/src/processor/stackwalker.cc
@@ -34,12 +34,12 @@
// Author: Mark Mentovai
-#include "processor/stackwalker.h"
-#include "google/call_stack.h"
-#include "google/stack_frame.h"
-#include "google/symbol_supplier.h"
+#include "google_airbag/processor/stackwalker.h"
+#include "google_airbag/processor/call_stack.h"
+#include "google_airbag/processor/minidump.h"
+#include "google_airbag/processor/stack_frame.h"
+#include "google_airbag/processor/symbol_supplier.h"
#include "processor/linked_ptr.h"
-#include "processor/minidump.h"
#include "processor/scoped_ptr.h"
#include "processor/source_line_resolver.h"
#include "processor/stack_frame_info.h"
diff --git a/src/processor/stackwalker_ppc.cc b/src/processor/stackwalker_ppc.cc
index 0dc31e8f..a958f492 100644
--- a/src/processor/stackwalker_ppc.cc
+++ b/src/processor/stackwalker_ppc.cc
@@ -35,9 +35,9 @@
#include "processor/stackwalker_ppc.h"
-#include "google/call_stack.h"
-#include "google/stack_frame_cpu.h"
-#include "processor/minidump.h"
+#include "google_airbag/processor/call_stack.h"
+#include "google_airbag/processor/minidump.h"
+#include "google_airbag/processor/stack_frame_cpu.h"
namespace google_airbag {
diff --git a/src/processor/stackwalker_ppc.h b/src/processor/stackwalker_ppc.h
index b8f3ba0f..10b6a7a5 100644
--- a/src/processor/stackwalker_ppc.h
+++ b/src/processor/stackwalker_ppc.h
@@ -39,9 +39,9 @@
#define PROCESSOR_STACKWALKER_PPC_H__
-#include "google/airbag_types.h"
-#include "processor/stackwalker.h"
-#include "processor/minidump_format.h"
+#include "google_airbag/common/airbag_types.h"
+#include "google_airbag/common/minidump_format.h"
+#include "google_airbag/processor/stackwalker.h"
namespace google_airbag {
diff --git a/src/processor/stackwalker_selftest.cc b/src/processor/stackwalker_selftest.cc
index 45b9a5c0..2534cfd5 100644
--- a/src/processor/stackwalker_selftest.cc
+++ b/src/processor/stackwalker_selftest.cc
@@ -39,12 +39,12 @@
#include <cstdio>
-#include "google/airbag_types.h"
-#include "google/call_stack.h"
-#include "google/stack_frame.h"
-#include "google/stack_frame_cpu.h"
-#include "processor/memory_region.h"
-#include "processor/minidump_format.h"
+#include "google_airbag/common/airbag_types.h"
+#include "google_airbag/common/minidump_format.h"
+#include "google_airbag/processor/call_stack.h"
+#include "google_airbag/processor/memory_region.h"
+#include "google_airbag/processor/stack_frame.h"
+#include "google_airbag/processor/stack_frame_cpu.h"
#include "processor/scoped_ptr.h"
using google_airbag::CallStack;
diff --git a/src/processor/stackwalker_x86.cc b/src/processor/stackwalker_x86.cc
index 9f6f8a8d..61f42a10 100644
--- a/src/processor/stackwalker_x86.cc
+++ b/src/processor/stackwalker_x86.cc
@@ -37,10 +37,10 @@
#include "processor/postfix_evaluator-inl.h"
#include "processor/stackwalker_x86.h"
-#include "google/call_stack.h"
-#include "google/stack_frame_cpu.h"
+#include "google_airbag/processor/call_stack.h"
+#include "google_airbag/processor/minidump.h"
+#include "google_airbag/processor/stack_frame_cpu.h"
#include "processor/linked_ptr.h"
-#include "processor/minidump.h"
#include "processor/stack_frame_info.h"
namespace google_airbag {
diff --git a/src/processor/stackwalker_x86.h b/src/processor/stackwalker_x86.h
index 1dc6fedc..707aa94b 100644
--- a/src/processor/stackwalker_x86.h
+++ b/src/processor/stackwalker_x86.h
@@ -39,9 +39,9 @@
#define PROCESSOR_STACKWALKER_X86_H__
-#include "google/airbag_types.h"
-#include "processor/stackwalker.h"
-#include "processor/minidump_format.h"
+#include "google_airbag/common/airbag_types.h"
+#include "google_airbag/common/minidump_format.h"
+#include "google_airbag/processor/stackwalker.h"
namespace google_airbag {