aboutsummaryrefslogtreecommitdiff
path: root/src/processor/stackwalker_x86.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/processor/stackwalker_x86.h')
-rw-r--r--src/processor/stackwalker_x86.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/processor/stackwalker_x86.h b/src/processor/stackwalker_x86.h
index 9c56ae80..410a473d 100644
--- a/src/processor/stackwalker_x86.h
+++ b/src/processor/stackwalker_x86.h
@@ -1,4 +1,4 @@
-// -*- mode: c++ -*-
+// -*- mode: c++ -*-
// Copyright (c) 2010 Google Inc.
// All rights reserved.
@@ -40,6 +40,7 @@
#ifndef PROCESSOR_STACKWALKER_X86_H__
#define PROCESSOR_STACKWALKER_X86_H__
+#include <vector>
#include "google_breakpad/common/breakpad_types.h"
#include "google_breakpad/common/minidump_format.h"
@@ -58,12 +59,11 @@ class StackwalkerX86 : public Stackwalker {
// register state corresponding to the innermost called frame to be
// included in the stack. The other arguments are passed directly through
// to the base Stackwalker constructor.
- StackwalkerX86(const SystemInfo *system_info,
- const MDRawContextX86 *context,
- MemoryRegion *memory,
- const CodeModules *modules,
- SymbolSupplier *supplier,
- SourceLineResolverInterface *resolver);
+ StackwalkerX86(const SystemInfo* system_info,
+ const MDRawContextX86* context,
+ MemoryRegion* memory,
+ const CodeModules* modules,
+ StackFrameSymbolizer* frame_symbolizer);
private:
// A STACK CFI-driven frame walker for the X86.
@@ -73,32 +73,32 @@ class StackwalkerX86 : public Stackwalker {
// stack conventions (saved %ebp at [%ebp], saved %eip at 4[%ebp], or
// alternate conventions as guided by any WindowsFrameInfo available for the
// code in question.).
- virtual StackFrame *GetContextFrame();
- virtual StackFrame *GetCallerFrame(const CallStack *stack);
+ virtual StackFrame* GetContextFrame();
+ virtual StackFrame* GetCallerFrame(const CallStack* stack);
// Use windows_frame_info (derived from STACK WIN and FUNC records)
// to construct the frame that called frames.back(). The caller
// takes ownership of the returned frame. Return NULL on failure.
- StackFrameX86 *GetCallerByWindowsFrameInfo(
+ StackFrameX86* GetCallerByWindowsFrameInfo(
const vector<StackFrame*> &frames,
- WindowsFrameInfo *windows_frame_info);
+ WindowsFrameInfo* windows_frame_info);
// Use cfi_frame_info (derived from STACK CFI records) to construct
// the frame that called frames.back(). The caller takes ownership
// of the returned frame. Return NULL on failure.
- StackFrameX86 *GetCallerByCFIFrameInfo(const vector<StackFrame*> &frames,
- CFIFrameInfo *cfi_frame_info);
+ StackFrameX86* GetCallerByCFIFrameInfo(const vector<StackFrame*> &frames,
+ CFIFrameInfo* cfi_frame_info);
// Assuming a traditional frame layout --- where the caller's %ebp
// has been pushed just after the return address and the callee's
// %ebp points to the saved %ebp --- construct the frame that called
// frames.back(). The caller takes ownership of the returned frame.
// Return NULL on failure.
- StackFrameX86 *GetCallerByEBPAtBase(const vector<StackFrame*> &frames);
+ StackFrameX86* GetCallerByEBPAtBase(const vector<StackFrame*> &frames);
// Stores the CPU context corresponding to the innermost stack frame to
// be returned by GetContextFrame.
- const MDRawContextX86 *context_;
+ const MDRawContextX86* context_;
// Our register map, for cfi_walker_.
static const CFIWalker::RegisterSet cfi_register_map_[];