Port some more code to x64

syzygy/agent/common/stack_walker.cc

-// Copyright 2015 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "syzygy/agent/common/stack_walker_x86.h"
+#include "syzygy/agent/common/stack_walker.h"
 
 #include <windows.h>
-#include <winnt.h>
 
+#ifndef _WIN64
 #include "base/logging.h"
 #include "syzygy/agent/common/stack_capture.h"
 #include "syzygy/common/align.h"
+#endif
 
 namespace agent {
 namespace common {
 
+#ifndef _WIN64
+
 namespace {
 
 static size_t kPointerSize = sizeof(void*);
 
 __declspec(naked) void* GetEbp() {
   __asm {
     mov eax, ebp
     ret
   }
 }
@@ skipping 52 matching lines @@
   // The next frame pointer must be at least a full frame beyond the current
   // frame. Checking that the next frame lies within the stack is done by
   // 'FrameHasValidReturnAddress' before it gets read.
   if (frame + 1 > frame->next_frame)
     return false;
   return true;
 }
 
 }  // namespace
 
 size_t __declspec(noinline) WalkStack(size_t bottom_frames_to_skip,

[Sébastien Marchand, 2016/08/04 13:30:52]

You need to update this signature as well (uint32 -> size_t), I'll also move the
#ifdef block inside of it.

                                       size_t max_frame_count,
                                       void** frames,
                                       StackId* absolute_stack_id) {
   // Get the stack extents.
   // The first thing in the TEB is actually the TIB.
   // http://www.nirsoft.net/kernel_struct/vista/TEB.html
   NT_TIB* tib = reinterpret_cast<NT_TIB*>(NtCurrentTeb());
   void* stack_bottom = tib->StackLimit;  // Lower address.
   void* stack_top = tib->StackBase;  // Higher address.
 
@@ skipping 65 matching lines @@
 
     current_frame = current_frame->next_frame;
   }
 
   *absolute_stack_id =
       StackCapture::FinalizeStackId(*absolute_stack_id, num_frames);
 
   return num_frames;
 }
 
+#else
+
+size_t __declspec(noinline) WalkStack(uint32_t bottom_frames_to_skip,
+                                      uint32_t max_frame_count,
+                                      void** frames,
+                                      StackId* absolute_stack_id) {
+  return CaptureStackBackTrace(bottom_frames_to_skip,
+                               max_frame_count,
+                               frames,
+                               reinterpret_cast<PDWORD>(absolute_stack_id));
+}
+
+#endif  // !defined _WIN64
+
 }  // namespace common
 }  // namespace agent