Port some more code to x64

syzygy/agent/common/stack_capture.h

 // Copyright 2013 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.
 //
 // Declares a utility class for getting and storing quick and dirty stack
 // captures.
 
 #ifndef SYZYGY_AGENT_COMMON_STACK_CAPTURE_H_
 #define SYZYGY_AGENT_COMMON_STACK_CAPTURE_H_
 
 #include <windows.h>
 
 #include "base/logging.h"
-#include "syzygy/agent/common/stack_walker_x86.h"
+#include "syzygy/agent/common/stack_walker.h"
 #include "syzygy/common/asan_parameters.h"
 
 namespace agent {
 namespace common {
 
 // A simple class for holding a stack trace capture.
 class StackCapture {
  public:
   // From http://msdn.microsoft.com/en-us/library/bb204633.aspx,
   // The maximum number of frames which CaptureStackBackTrace can be asked
@@ skipping 179 matching lines @@
 };
 
 // static
 __forceinline StackId StackCapture::StartStackId() {
   return 0x4ADFA3E5;
 }
 
 // static
 __forceinline StackId StackCapture::UpdateStackId(StackId stack_id,
                                                   const void* frame) {
-  stack_id += reinterpret_cast<StackId>(frame);
+  stack_id += static_cast<StackId>(reinterpret_cast<uintptr_t>(frame));
   stack_id += stack_id << 10;
   stack_id ^= stack_id >> 6;
   return stack_id;
 }
 
 // static
 __forceinline StackId StackCapture::FinalizeStackId(StackId stack_id,
                                                     size_t num_frames) {
   stack_id += stack_id << 3;
   stack_id ^= stack_id >> 11;
   stack_id += stack_id << 15;
   stack_id ^= num_frames;
   return stack_id;
 }
 
 }  // namespace common
 }  // namespace agent
 
 #endif  // SYZYGY_AGENT_COMMON_STACK_CAPTURE_H_