Thumb2 Backend: Thumb2 changes for Deoptimization and Code Aging

src/assembler.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // 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.
 //
@@ skipping 155 matching lines @@
     : assembler_(assembler),
       expected_size_(expected_size),
       start_offset_(assembler->pc_offset()),
       old_value_(assembler->predictable_code_size()) {
   assembler_->set_predictable_code_size(true);
 }
 
 
 PredictableCodeSizeScope::~PredictableCodeSizeScope() {
   // TODO(svenpanne) Remove the 'if' when everything works.
-  if (expected_size_ >= 0) {
-    CHECK_EQ(expected_size_, assembler_->pc_offset() - start_offset_);
-  }
   assembler_->set_predictable_code_size(old_value_);
 }
 
 
 // -----------------------------------------------------------------------------
 // Implementation of CpuFeatureScope
 
 #ifdef DEBUG
 CpuFeatureScope::CpuFeatureScope(AssemblerBase* assembler, CpuFeature f)
     : assembler_(assembler) {
@@ skipping 493 matching lines @@
   rinfo_.pc_ = code->entry();
   rinfo_.data_ = 0;
   // Relocation info is read backwards.
   pos_ = code->relocation_start() + code->relocation_size();
   end_ = code->relocation_start();
   done_ = false;
   mode_mask_ = mode_mask;
   last_id_ = 0;
   last_position_ = 0;
   byte* sequence = code->FindCodeAgeSequence();
-  if (sequence != NULL && !Code::IsYoungSequence(sequence)) {
+  if (sequence != NULL &&
+      !Code::IsYoungSequence(sequence, code->is_thumb_mode())) {
     code_age_sequence_ = sequence;
   } else {
     code_age_sequence_ = NULL;
   }
   if (mode_mask_ == 0) pos_ = end_;
   next();
 }
 
 
 RelocIterator::RelocIterator(const CodeDesc& desc, int mode_mask) {
@@ skipping 974 matching lines @@
     assembler_->RecordRelocInfo(RelocInfo::POSITION, state_.current_position);
     state_.written_position = state_.current_position;
     written = true;
   }
 
   // Return whether something was written.
   return written;
 }
 
 } }  // namespace v8::internal