VM: Clean up and fix bugs in instructions patterns

runtime/vm/code_patcher_x64.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/cpu.h"
@@ skipping 23 matching lines @@
   static bool IsValid(uword return_address) {
     uint8_t* code_bytes =
         reinterpret_cast<uint8_t*>(return_address - kCallPatternSize);
     return (code_bytes[0] == 0x49) && (code_bytes[1] == 0x8B) &&
            (code_bytes[2] == 0x9F) &&
            (code_bytes[7] == 0x41) && (code_bytes[8] == 0xFF) &&
            (code_bytes[9] == 0x97);
   }
 
   RawObject* ic_data() const {
-    intptr_t index = InstructionPattern::IndexFromPPLoad(start_ + 3);
+    intptr_t index = IndexFromPPLoad(start_ + 3);
     return object_pool_.ObjectAt(index);
   }
 
   uword target() const {
-    intptr_t index = InstructionPattern::IndexFromPPLoad(start_ + 10);
+    intptr_t index = IndexFromPPLoad(start_ + 10);
     return object_pool_.RawValueAt(index);
   }
 
   void set_target(uword target) const {
-    intptr_t index = InstructionPattern::IndexFromPPLoad(start_ + 10);
+    intptr_t index = IndexFromPPLoad(start_ + 10);
     object_pool_.SetRawValueAt(index, target);
     // No need to flush the instruction cache, since the code is not modified.
   }
 
  private:
   uword start_;
   const ObjectPool& object_pool_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(UnoptimizedCall);
 };
 
@@ skipping 45 matching lines @@
   static const int kCallPatternSize = 7;
 
   static bool IsValid(uword return_address) {
     uint8_t* code_bytes =
         reinterpret_cast<uint8_t*>(return_address - kCallPatternSize);
     return (code_bytes[0] == 0x41) && (code_bytes[1] == 0xFF) &&
            (code_bytes[2] == 0x97);
   }
 
   intptr_t pp_index() const {
-    return InstructionPattern::IndexFromPPLoad(start_ + 3);
+    return IndexFromPPLoad(start_ + 3);
   }
 
   uword Target() const {
     return object_pool_.RawValueAt(pp_index());
   }
 
   void SetTarget(uword target) const {
     object_pool_.SetRawValueAt(pp_index(), target);
     // No need to flush the instruction cache, since the code is not modified.
   }
@@ skipping 52 matching lines @@
 }
 
 
 intptr_t CodePatcher::InstanceCallSizeInBytes() {
   return InstanceCall::kCallPatternSize;
 }
 
 
 void CodePatcher::InsertCallAt(uword start, uword target) {
   // The inserted call should not overlap the lazy deopt jump code.
-  ASSERT(start + ShortCallPattern::InstructionLength() <= target);
+  ASSERT(start + ShortCallPattern::pattern_length_in_bytes() <= target);
   *reinterpret_cast<uint8_t*>(start) = 0xE8;
   ShortCallPattern call(start);
   call.SetTargetAddress(target);
-  CPU::FlushICache(start, ShortCallPattern::InstructionLength());
+  CPU::FlushICache(start, ShortCallPattern::pattern_length_in_bytes());
 }
 
 
 RawFunction* CodePatcher::GetUnoptimizedStaticCallAt(
     uword return_address, const Code& code, ICData* ic_data_result) {
   ASSERT(code.ContainsInstructionAt(return_address));
   UnoptimizedStaticCall static_call(return_address, code);
   ICData& ic_data = ICData::Handle();
   ic_data ^= static_call.ic_data();
   if (ic_data_result != NULL) {
@@ skipping 12 matching lines @@
         object_pool_(ObjectPool::Handle(code.GetObjectPool())) {
     ASSERT(IsValid(end_));
   }
 
   static bool IsValid(uword end) {
     uint8_t* bytes = reinterpret_cast<uint8_t*>(end - 7);
     return (bytes[0] == 0x49) && (bytes[1] == 0x8b) && (bytes[2] == 0x87);
   }
 
   RawObject* edge_counter() const {
-    return object_pool_.ObjectAt(InstructionPattern::IndexFromPPLoad(end_ - 4));
+    return object_pool_.ObjectAt(IndexFromPPLoad(end_ - 4));
   }
 
  private:
   uword end_;
   const ObjectPool& object_pool_;
 };
 
 
 RawObject* CodePatcher::GetEdgeCounterAt(uword pc, const Code& code) {
   ASSERT(code.ContainsInstructionAt(pc));
   EdgeCounter counter(pc, code);
   return counter.edge_counter();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64