More PcDescriptor cleanups.

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 344 matching lines @@
 
 
 // Compute token_pos_ and pc_desc_index_.
 intptr_t ActivationFrame::TokenPos() {
   if (token_pos_ < 0) {
     token_pos_ = Scanner::kNoSourcePos;
     GetPcDescriptors();
     PcDescriptors::Iterator iter(pc_desc_, RawPcDescriptors::kAnyKind);
     while (iter.HasNext()) {
       const RawPcDescriptors::PcDescriptorRec& rec = iter.Next();
-      if (rec.pc == pc_) {
+      if (rec.pc() == pc_) {
         desc_rec_ = &rec;
-        token_pos_ = rec.token_pos;
+        token_pos_ = rec.token_pos();
         break;
       }
     }
   }
   return token_pos_;
 }
 
 
 intptr_t ActivationFrame::TryIndex() {
   if (desc_rec_ == NULL) {
     return -1;
   } else {
-    return desc_rec_->try_index;
+    return desc_rec_->try_index();
   }
 }
 
 
 intptr_t ActivationFrame::LineNumber() {
   // Compute line number lazily since it causes scanning of the script.
   if ((line_number_ < 0) && (TokenPos() >= 0)) {
     const Script& script = Script::Handle(SourceScript());
     script.GetTokenLocation(TokenPos(), &line_number_, NULL);
   }
@@ skipping 530 matching lines @@
 }
 
 
 const uint8_t kSafepointKind =
     RawPcDescriptors::kIcCall |  RawPcDescriptors::kOptStaticCall |
     RawPcDescriptors::kUnoptStaticCall | RawPcDescriptors::kClosureCall |
     RawPcDescriptors::kRuntimeCall;
 
 
 static bool HasTokenPos(const RawPcDescriptors::PcDescriptorRec& rec) {
-  return rec.token_pos != Scanner::kNoSourcePos;
+  return rec.token_pos() != Scanner::kNoSourcePos;
 }
 
 
 CodeBreakpoint::CodeBreakpoint(const Code& code,
                                const RawPcDescriptors::PcDescriptorRec& rec)
     : code_(code.raw()),
-      token_pos_(rec.token_pos),
-      pc_(rec.pc),
+      token_pos_(rec.token_pos()),
+      pc_(rec.pc()),
       line_number_(-1),
       is_enabled_(false),
       src_bpt_(NULL),
       next_(NULL),
       breakpoint_kind_(rec.kind()),
       saved_value_(0) {
   ASSERT(!code.IsNull());
   ASSERT(token_pos_ > 0);
   ASSERT(pc_ != 0);
   ASSERT((breakpoint_kind_ & kSafepointKind) != 0);
@@ skipping 246 matching lines @@
   // might cause the GC to run.
   Code& code = Code::Handle(isolate, target_function.unoptimized_code());
   ASSERT(!code.IsNull());
   DeoptimizeWorld();
   ASSERT(!target_function.HasOptimizedCode());
   PcDescriptors& desc = PcDescriptors::Handle(isolate, code.pc_descriptors());
   PcDescriptors::Iterator iter(desc, kSafepointKind);
   while (iter.HasNext()) {
     const RawPcDescriptors::PcDescriptorRec& rec = iter.Next();
     if (HasTokenPos(rec)) {
-      CodeBreakpoint* bpt = GetCodeBreakpoint(rec.pc);
+      CodeBreakpoint* bpt = GetCodeBreakpoint(rec.pc());
       if (bpt != NULL) {
         // There is already a breakpoint for this address. Make sure
         // it is enabled.
         bpt->Enable();
         continue;
       }
       bpt = new CodeBreakpoint(code, rec);
       RegisterCodeBreakpoint(bpt);
       bpt->Enable();
     }
@@ skipping 29 matching lines @@
   // Is there a closure call at the current PC?
   //
   // We can't just check the callee_activation to see if it is a
   // closure function, because it may not be on the stack yet.
   bool is_closure_call = false;
   const PcDescriptors& pc_desc =
       PcDescriptors::Handle(isolate, code.pc_descriptors());
   PcDescriptors::Iterator iter(pc_desc, RawPcDescriptors::kClosureCall);
   while (iter.HasNext()) {
     const RawPcDescriptors::PcDescriptorRec& rec = iter.Next();
-    if (rec.pc == pc) {
+    if (rec.pc() == pc) {
       is_closure_call = true;
       break;
     }
   }
 
   // Recover the context for this frame.
   if (is_closure_call) {
     // If the callee is a closure, we should have stored the context
     // in the current frame before making the call.
     const Context& closure_call_ctx =
@@ skipping 278 matching lines @@
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
   intptr_t best_fit_pos = INT_MAX;
   const RawPcDescriptors::PcDescriptorRec* best_fit_rec = NULL;
   uword lowest_pc = kUwordMax;
   const RawPcDescriptors::PcDescriptorRec* lowest_pc_rec = NULL;
 
   const RawPcDescriptors::PcDescriptorRec* rec = NULL;
   PcDescriptors::Iterator iter(desc, kSafepointKind);
   while (iter.HasNext()) {
     rec = &iter.Next();
-    intptr_t desc_token_pos = rec->token_pos;
+    intptr_t desc_token_pos = rec->token_pos();
     ASSERT(desc_token_pos >= 0);
     if (HasTokenPos(*rec)) {
       if ((desc_token_pos < requested_token_pos) ||
           (desc_token_pos > last_token_pos)) {
         // This descriptor is outside the desired token range.
         continue;
       }
       if (desc_token_pos < best_fit_pos) {
         // So far, this descriptor has the lowest token position after
         // the first acceptable token position.
         best_fit_pos = desc_token_pos;
         best_fit_rec = rec;
       }
-      if (rec->pc < lowest_pc) {
+      if (rec->pc() < lowest_pc) {
         // This descriptor so far has the lowest code address.
-        lowest_pc = rec->pc;
+        lowest_pc = rec->pc();
         lowest_pc_rec = rec;
       }
     }
   }
   if (lowest_pc_rec != NULL) {
     // We found the pc descriptor that has the lowest execution address.
     // This is the first possible breakpoint after the requested token
     // position. We use this instead of the nearest PC descriptor
     // measured in token index distance.
     best_fit_rec = lowest_pc_rec;
   }
   if (best_fit_rec != NULL) {
-    return best_fit_rec->token_pos;
+    return best_fit_rec->token_pos();
   }
   // We didn't find a safe point in the given token range. Try and find
   // a safe point in the remaining source code of the function.
   if (last_token_pos < func.end_token_pos()) {
     return ResolveBreakpointPos(func, last_token_pos, func.end_token_pos());
   }
   return -1;
 }
 
 
 void Debugger::MakeCodeBreakpointAt(const Function& func,
                                     SourceBreakpoint* bpt) {
   ASSERT((bpt != NULL) && bpt->IsResolved());
   ASSERT(!func.HasOptimizedCode());
   Code& code = Code::Handle(func.unoptimized_code());
   ASSERT(!code.IsNull());
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
   uword lowest_pc = kUwordMax;
   // Find the safe point with the lowest compiled code address
   // that maps to the token position of the source breakpoint.
   PcDescriptors::Iterator iter(desc, kSafepointKind);
   const RawPcDescriptors::PcDescriptorRec* lowest_rec = NULL;
   while (iter.HasNext()) {
     const RawPcDescriptors::PcDescriptorRec& rec = iter.Next();
-    intptr_t desc_token_pos = rec.token_pos;
+    intptr_t desc_token_pos = rec.token_pos();
     if ((desc_token_pos == bpt->token_pos_) && HasTokenPos(rec)) {
-      if (rec.pc < lowest_pc) {
-        lowest_pc = rec.pc;
+      if (rec.pc() < lowest_pc) {
+        lowest_pc = rec.pc();
         lowest_rec = &rec;
       }
     }
   }
   if (lowest_rec == NULL) {
     return;
   }
-  CodeBreakpoint* code_bpt = GetCodeBreakpoint(lowest_rec->pc);
+  CodeBreakpoint* code_bpt = GetCodeBreakpoint(lowest_rec->pc());
   if (code_bpt == NULL) {
     // No code breakpoint for this code exists; create one.
     code_bpt = new CodeBreakpoint(code, *lowest_rec);
     RegisterCodeBreakpoint(code_bpt);
   }
   code_bpt->set_src_bpt(bpt);
   if (bpt->IsEnabled()) {
     code_bpt->Enable();
   }
 }
@@ skipping 944 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart