Port some more code to x64

syzygy/agent/common/hot_patcher.cc

 // Copyright 2015 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,
@@ skipping 60 matching lines @@
       reinterpret_cast<uint8_t*>(new_entry_point) - hot_patch_start - 5;
 
   // This is the location where the short jump overwriting the first two bytes
   // of the function should be placed.
   volatile uint16_t* jump_hook_place =
       reinterpret_cast<uint16_t*>(hot_patch_start + 5);
 
   // Writes on x86 architecture are atomic within a cross 4-byte boundary.
   // NOTE: This can be loosened. Any two bytes starting at an address that meets
   //     the (address % 4 != 3) condition does not cross 4-byte boundary.
-  CHECK_EQ(0, reinterpret_cast<int>(jump_hook_place) % 2);
+  CHECK_EQ(0u, reinterpret_cast<uintptr_t>(jump_hook_place) % 2);
 
   // We write the instruction JMP -5 which is represented as: 0xEB 0xF9
   // We reverse the order of the bytes because of the little endian encoding
   // to get the final value 0xF9EB.
   *jump_hook_place = 0xF9EB;
 
   // Restore the old page protection.
   if (!::VirtualProtect(reinterpret_cast<LPVOID>(hot_patch_start),
                         hot_patch_length,
                         old_page_protection,
                         &old_page_protection)) {
     // We do not return false if this fails as the hot patching already
     // happened.
     LOG(ERROR) << "Could not reset old privileges to page. Error code: "
                << ::common::LogWe();
   }
 
   return true;
 }
 
 }  // namespace common
 }  // namespace agent