Thumb2 Backend: Update Code objects with mode, separate Assembler methods for Thumb2

src/objects-inl.h

 // Copyright 2012 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 1210 matching lines @@
 
 
 void HeapObject::set_map_word(MapWord map_word) {
   // WRITE_FIELD does not invoke write barrier, but there is no need
   // here.
   WRITE_FIELD(this, kMapOffset, reinterpret_cast<Object*>(map_word.value_));
 }
 
 
 HeapObject* HeapObject::FromAddress(Address address) {
+  address = (Address)((uint32_t)address & ~1);
   ASSERT_TAG_ALIGNED(address);
   return reinterpret_cast<HeapObject*>(address + kHeapObjectTag);
 }
 
 
 Address HeapObject::address() {
   return reinterpret_cast<Address>(this) - kHeapObjectTag;
 }
 
 
@@ skipping 2622 matching lines @@
 
 
 void Code::set_is_pregenerated(bool value) {
   ASSERT(kind() == STUB);
   Flags f = flags();
   f = static_cast<Flags>(IsPregeneratedField::update(f, value));
   set_flags(f);
 }
 
 
+bool Code::is_thumb_mode() {
+  return IsThumbModeField::decode(flags());
+}
+
+
 bool Code::optimizable() {
   ASSERT_EQ(FUNCTION, kind());
   return READ_BYTE_FIELD(this, kOptimizableOffset) == 1;
 }
 
 
 void Code::set_optimizable(bool value) {
   ASSERT_EQ(FUNCTION, kind());
   WRITE_BYTE_FIELD(this, kOptimizableOffset, value ? 1 : 0);
 }
@@ skipping 192 matching lines @@
     default: return false;
   }
 }
 
 
 bool Code::is_debug_stub() {
   return ic_state() == DEBUG_STUB;
 }
 
 
+Code::Flags Code::SetThumbModeInFlags(Code::Flags flag) {
+  return static_cast<Flags>(flag | IsThumbModeField::encode(true));
+}
+
+
 Code::Flags Code::ComputeFlags(Kind kind,
                                InlineCacheState ic_state,
                                ExtraICState extra_ic_state,
                                StubType type,
                                int argc,
-                               InlineCacheHolderFlag holder) {
+                               InlineCacheHolderFlag holder,
+                               bool thumb_mode) {
   ASSERT(argc <= Code::kMaxArguments);
   // Since the extended extra ic state overlaps with the argument count
   // for CALL_ICs, do so checks to make sure that they don't interfere.
   ASSERT((kind != Code::CALL_IC &&
           kind != Code::KEYED_CALL_IC) ||
          (ExtraICStateField::encode(extra_ic_state) | true));
   // Compute the bit mask.
   unsigned int bits = KindField::encode(kind)
       | ICStateField::encode(ic_state)
       | TypeField::encode(type)
       | ExtendedExtraICStateField::encode(extra_ic_state)
-      | CacheHolderField::encode(holder);
+      | CacheHolderField::encode(holder)
+      | IsThumbModeField::encode(thumb_mode);
   if (!Code::needs_extended_extra_ic_state(kind)) {
     bits |= (argc << kArgumentsCountShift);
   }
   return static_cast<Flags>(bits);
 }
 
 
 Code::Flags Code::ComputeMonomorphicFlags(Kind kind,
                                           ExtraICState extra_ic_state,
                                           StubType type,
@@ skipping 39 matching lines @@
 }
 
 
 Code::Flags Code::RemoveTypeFromFlags(Flags flags) {
   int bits = flags & ~TypeField::kMask;
   return static_cast<Flags>(bits);
 }
 
 
 Code* Code::GetCodeFromTargetAddress(Address address) {
+  address = (Address)((uint32_t)address & ~3);
   HeapObject* code = HeapObject::FromAddress(address - Code::kHeaderSize);
   // GetCodeFromTargetAddress might be called when marking objects during mark
   // sweep. reinterpret_cast is therefore used instead of the more appropriate
   // Code::cast. Code::cast does not work when the object's map is
   // marked.
   Code* result = reinterpret_cast<Code*>(code);
   return result;
 }
 
 
 Object* Code::GetObjectFromEntryAddress(Address location_of_address) {
   return HeapObject::
-      FromAddress(Memory::Address_at(location_of_address) - Code::kHeaderSize);
+      FromAddress(
+          Memory::Address_at((Address)((uint32_t)location_of_address & ~1))
+          - Code::kHeaderSize);
 }
 
 
 Object* Map::prototype() {
   return READ_FIELD(this, kPrototypeOffset);
 }
 
 
 void Map::set_prototype(Object* value, WriteBarrierMode mode) {
   ASSERT(value->IsNull() || value->IsJSReceiver());
@@ skipping 1159 matching lines @@
   return unchecked_relocation_info()->GetDataStartAddress();
 }
 
 
 int Code::relocation_size() {
   return unchecked_relocation_info()->length();
 }
 
 
 byte* Code::entry() {
-  return instruction_start();
+  int mode_encoding = is_thumb_mode() ? 1 : 0;
+  return mode_encoding + instruction_start();
 }
 
 
 bool Code::contains(byte* inner_pointer) {
   return (address() <= inner_pointer) && (inner_pointer <= address() + Size());
 }
 
 
 ACCESSORS(JSArray, length, Object, kLengthOffset)
 
@@ skipping 928 matching lines @@
 #undef WRITE_UINT32_FIELD
 #undef READ_SHORT_FIELD
 #undef WRITE_SHORT_FIELD
 #undef READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_INL_H_