Revert "VM: New calling convention for generated code."

runtime/vm/raw_object.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/raw_object.h"
 
 #include "vm/class_table.h"
 #include "vm/dart.h"
 #include "vm/freelist.h"
 #include "vm/isolate.h"
@@ skipping 421 matching lines @@
 
 
 intptr_t RawFunction::VisitFunctionPointers(RawFunction* raw_obj,
                                             ObjectPointerVisitor* visitor) {
   if (visitor->visit_function_code() || !CheckUsageCounter(raw_obj)) {
     visitor->VisitPointers(raw_obj->from(), raw_obj->to());
     return Function::InstanceSize();
   }
   visitor->VisitPointers(raw_obj->from(), raw_obj->to_no_code());
 
-  if (ShouldVisitCode(raw_obj->ptr()->code_)) {
+  if (ShouldVisitCode(raw_obj->ptr()->instructions_->ptr()->code_)) {
     visitor->VisitPointer(
-        reinterpret_cast<RawObject**>(&raw_obj->ptr()->code_));
+        reinterpret_cast<RawObject**>(&raw_obj->ptr()->instructions_));
   } else {
     visitor->add_skipped_code_function(raw_obj);
   }
 
   if (ShouldVisitCode(raw_obj->ptr()->unoptimized_code_)) {
     visitor->VisitPointer(
         reinterpret_cast<RawObject**>(&raw_obj->ptr()->unoptimized_code_));
   } else {
     visitor->add_skipped_code_function(raw_obj);
   }
@@ skipping 43 matching lines @@
 }
 
 
 intptr_t RawNamespace::VisitNamespacePointers(
     RawNamespace* raw_obj, ObjectPointerVisitor* visitor) {
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return Namespace::InstanceSize();
 }
 
 
-bool RawCode::ContainsPC(RawObject* raw_obj, uword pc) {
-  uword tags = raw_obj->ptr()->tags_;
-  if (RawObject::ClassIdTag::decode(tags) == kCodeCid) {
-    RawCode* raw_code = reinterpret_cast<RawCode*>(raw_obj);
-    return RawInstructions::ContainsPC(raw_code->ptr()->instructions_, pc);
-  }
-  return false;
-}
-
-
 intptr_t RawCode::VisitCodePointers(RawCode* raw_obj,
                                     ObjectPointerVisitor* visitor) {
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
 
   RawCode* obj = raw_obj->ptr();
   intptr_t length = Code::PtrOffBits::decode(obj->state_bits_);
   if (Code::AliveBit::decode(obj->state_bits_)) {
     // Also visit all the embedded pointers in the corresponding instructions.
     uword entry_point = reinterpret_cast<uword>(obj->instructions_->ptr()) +
         Instructions::HeaderSize();
@@ skipping 21 matching lines @@
       visitor->VisitPointer(&(first + i)->raw_obj_);
     }
   }
   return ObjectPool::InstanceSize(raw_obj->ptr()->length_);
 }
 
 
 intptr_t RawInstructions::VisitInstructionsPointers(
     RawInstructions* raw_obj, ObjectPointerVisitor* visitor) {
   RawInstructions* obj = raw_obj->ptr();
+  visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return Instructions::InstanceSize(obj->size_);
 }
 
 
-bool RawInstructions::ContainsPC(RawInstructions* raw_instr, uword pc) {
-  uword start_pc =
-      reinterpret_cast<uword>(raw_instr->ptr()) + Instructions::HeaderSize();
-  uword end_pc = start_pc + raw_instr->ptr()->size_;
-  ASSERT(end_pc > start_pc);
-  return (pc >= start_pc) && (pc < end_pc);
+bool RawInstructions::ContainsPC(RawObject* raw_obj, uword pc) {
+  uword tags = raw_obj->ptr()->tags_;
+  if (RawObject::ClassIdTag::decode(tags) == kInstructionsCid) {
+    RawInstructions* raw_instr = reinterpret_cast<RawInstructions*>(raw_obj);
+    uword start_pc =
+        reinterpret_cast<uword>(raw_instr->ptr()) + Instructions::HeaderSize();
+    uword end_pc = start_pc + raw_instr->ptr()->size_;
+    ASSERT(end_pc > start_pc);
+    if ((pc >= start_pc) && (pc < end_pc)) {
+      return true;
+    }
+  }
+  return false;
 }
 
 
 intptr_t RawPcDescriptors::VisitPcDescriptorsPointers(
     RawPcDescriptors* raw_obj, ObjectPointerVisitor* visitor) {
   return PcDescriptors::InstanceSize(raw_obj->ptr()->length_);
 }
 
 
 intptr_t RawStackmap::VisitStackmapPointers(RawStackmap* raw_obj,
@@ skipping 355 matching lines @@
 intptr_t RawUserTag::VisitUserTagPointers(
     RawUserTag* raw_obj, ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return UserTag::InstanceSize();
 }
 
 
 }  // namespace dart