Finish porting jump target changes to the ARM platform. The v8 test...

src/jump-target-ia32.cc

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 19 matching lines @@
 #include "codegen.h"
 #include "jump-target.h"
 
 namespace v8 { namespace internal {
 
 // -------------------------------------------------------------------------
 // JumpTarget implementation.
 
 #define __ masm_->
 
-JumpTarget::JumpTarget(CodeGenerator* cgen) {
-  ASSERT(cgen != NULL);
-  expected_frame_ = NULL;
-  code_generator_ = cgen;
-  masm_ = cgen->masm();
+JumpTarget::JumpTarget(CodeGenerator* cgen)
+    : expected_frame_(NULL),
+      code_generator_(cgen),
+      masm_(cgen->masm()) {
 }
 
 
 JumpTarget::JumpTarget()
     : expected_frame_(NULL),
       code_generator_(NULL),
       masm_(NULL) {
 }
 
 
 void JumpTarget::set_code_generator(CodeGenerator* cgen) {
   ASSERT(cgen != NULL);
   ASSERT(code_generator_ == NULL);
   code_generator_ = cgen;
   masm_ = cgen->masm();
 }
 
 
 void JumpTarget::Jump() {
   // Precondition: there is a current frame.  There may or may not be an
   // expected frame at the label.
   ASSERT(code_generator_ != NULL);
-  ASSERT(masm_ != NULL);
 
   VirtualFrame* current_frame = code_generator_->frame();
   ASSERT(current_frame != NULL);
 
   if (expected_frame_ == NULL) {
     expected_frame_ = current_frame;
     code_generator_->set_frame(NULL);
     // The frame at the actual function return will always have height
     // zero.
     if (code_generator_->IsActualFunctionReturn(this)) {
@@ skipping 54 matching lines @@
   VirtualFrame* current_frame = code_generator_->frame();
   ASSERT(current_frame != NULL);
   ASSERT(expected_frame_ == NULL);
 
   expected_frame_ = new VirtualFrame(current_frame);
   // Adjust the expected frame's height to account for the return address
   // pushed by the call instruction.
   expected_frame_->Adjust(1);
 
   __ call(&label_);
-
   // Postcondition: there is both a current frame and an expected frame at
   // the label.  The current frame is one shorter than the one at the label
-  // (which contains the 'return address', ie, the eip register and possibly
-  // cs register).
+  // (which contains the return address in memory).
 }
 
 
 void JumpTarget::Bind() {
+  // Precondition: there is either a current frame or an expected frame at
+  // the label (and possibly both).  The label is unbound.
   ASSERT(code_generator_ != NULL);
   ASSERT(masm_ != NULL);
 
-  // Precondition: there is either a current frame or an expected frame at
-  // the label (and possibly both).  The label is unbound.
   VirtualFrame* current_frame = code_generator_->frame();
   ASSERT(current_frame != NULL || expected_frame_ != NULL);
   ASSERT(!label_.is_bound());
 
   if (expected_frame_ == NULL) {
     expected_frame_ = new VirtualFrame(current_frame);
     // The frame at the actual function return will always have height
     // zero.
     if (code_generator_->IsActualFunctionReturn(this)) {
       expected_frame_->Forget(expected_frame_->height());
@@ skipping 46 matching lines @@
 
 #ifdef DEBUG
   is_shadowing_ = false;
 #endif
 }
 
 #undef __
 
 
 } }  // namespace v8::internal