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

runtime/vm/debugger.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/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 202 matching lines @@
   if (bpt_location_->IsResolved()) {
     jsobj.AddLocation(bpt_location_);
   } else {
     jsobj.AddUnresolvedLocation(bpt_location_);
   }
 }
 
 
 void CodeBreakpoint::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&code_));
-  visitor->VisitPointer(reinterpret_cast<RawObject**>(&saved_value_));
 }
 
 
 ActivationFrame::ActivationFrame(
     uword pc,
     uword fp,
     uword sp,
     const Code& code,
     const Array& deopt_frame,
     intptr_t deopt_frame_offset)
@@ skipping 873 matching lines @@
                                uword pc,
                                RawPcDescriptors::Kind kind)
     : code_(code.raw()),
       token_pos_(token_pos),
       pc_(pc),
       line_number_(-1),
       is_enabled_(false),
       bpt_location_(NULL),
       next_(NULL),
       breakpoint_kind_(kind),
-      saved_value_(Code::null()) {
+      saved_value_(0) {
   ASSERT(!code.IsNull());
   ASSERT(token_pos_ > 0);
   ASSERT(pc_ != 0);
   ASSERT((breakpoint_kind_ & kSafepointKind) != 0);
 }
 
 
 CodeBreakpoint::~CodeBreakpoint() {
   // Make sure we don't leave patched code behind.
   ASSERT(!IsEnabled());
@@ skipping 263 matching lines @@
 
 RawArray* Debugger::DeoptimizeToArray(Isolate* isolate,
                                       StackFrame* frame,
                                       const Code& code) {
   ASSERT(code.is_optimized());
 
   // Create the DeoptContext for this deoptimization.
   DeoptContext* deopt_context =
       new DeoptContext(frame, code,
                        DeoptContext::kDestIsAllocated,
-                       NULL,
-                       NULL,
-                       true);
+                       NULL, NULL);
   isolate->set_deopt_context(deopt_context);
 
   deopt_context->FillDestFrame();
   deopt_context->MaterializeDeferredObjects();
   const Array& dest_frame = Array::Handle(isolate,
                                           deopt_context->DestFrameAsArray());
 
   isolate->set_deopt_context(NULL);
   delete deopt_context;
 
@@ skipping 1588 matching lines @@
   while (bpt != NULL) {
     if (bpt->pc() == breakpoint_address) {
       return bpt;
     }
     bpt = bpt->next();
   }
   return NULL;
 }
 
 
-RawCode* Debugger::GetPatchedStubAddress(uword breakpoint_address) {
+uword Debugger::GetPatchedStubAddress(uword breakpoint_address) {
   CodeBreakpoint* bpt = GetCodeBreakpoint(breakpoint_address);
   if (bpt != NULL) {
     return bpt->OrigStubAddress();
   }
   UNREACHABLE();
-  return Code::null();
+  return 0L;
 }
 
 
 // Remove and delete the source breakpoint bpt and its associated
 // code breakpoints.
 void Debugger::RemoveBreakpoint(intptr_t bp_id) {
   BreakpointLocation* prev_loc = NULL;
   BreakpointLocation* curr_loc = breakpoint_locations_;
   while (curr_loc != NULL) {
     Breakpoint* prev_bpt = NULL;
@@ skipping 146 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart