Cleanup for arm and mips.

runtime/vm/elfgen.h

 // 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.
 
 #ifndef VM_ELFGEN_H_
 #define VM_ELFGEN_H_
 
 #include "vm/thread.h"
 
 namespace dart {
@@ skipping 102 matching lines @@
   kStrtab,      // String table.
   kSymtab,      // Symbol table.
   kNumSections,  // Num of section header entries in section header table.
 
   // Various ELF constants.
   kELFCLASS32 = 1,
   kELFCLASS64 = 2,
   kELFDATA2LSB = 1,
   kELFDATA2MSB = 2,
   kEM_386 = 3,
+  kEM_MIPS = 8,
   kEM_ARM = 40,
   kEM_X86_64 = 62,
   kEV_CURRENT = 1,
   kET_EXEC = 2,  // not used
   kET_DYN = 3,
   kSHT_PROGBITS = 1,
   kSHT_SYMTAB = 2,
   kSHT_STRTAB = 3,
   kSHF_WRITE = 1,  // not used
   kSHF_ALLOC = 2,
@@ skipping 196 matching lines @@
   OS::SNPrint(end_name, sizeof(end_name), "%s_end", name);
   AddFunction(end_name, pc + size, 0);
 }
 
 
 int ElfGen::AddFunction(const char* name, uword pc, intptr_t size) {
   ASSERT(text_vma_ != 0);  // code must have been added
   DebugInfo::ByteBuffer* symtab = &section_buf_[kSymtab];
   const int beg = symtab->size();
   WriteInt(symtab, AddName(name));  // st_name
-#if defined(TARGET_ARCH_X64)
+#if defined(ARCH_IS_64_BIT)
   WriteShort(symtab, (kSTB_LOCAL << 4) + kSTT_FUNC);  // st_info + (st_other<<8)
   WriteShort(symtab, kText);  // st_shndx
 #endif
   WriteWord(symtab, pc);  // st_value
   WriteWord(symtab, size);  // st_size
-#if defined(TARGET_ARCH_IA32) ||                                               \
-    defined(TARGET_ARCH_ARM) ||                                                \
-    defined(TARGET_ARCH_MIPS)
+#if defined(ARCH_IS_32_BIT)
   // st_info + (st_other<<8)
   WriteShort(symtab, (kSTB_EXPORTED << 4) + kSTT_FUNC);
   WriteShort(symtab, kText);  // st_shndx
 #endif
   ASSERT(symtab->size() - beg == kSymbolSize);
   return beg / kSymbolSize;  // symbol index in symtab
 }
 
 
 bool ElfGen::WriteToFile(File* handle) {
@@ skipping 20 matching lines @@
 
 
 int ElfGen::AddName(const char* str) {
   return AddString(&section_buf_[kStrtab], str);
 }
 
 
 void ElfGen::AddELFHeader(int shoff) {
   ASSERT(text_vma_ != 0);  // Code must have been added.
   Write(&header_, kEI_MAG0_MAG3, 4);  // EI_MAG0..EI_MAG3
-#if defined(TARGET_ARCH_IA32) ||                                               \
-    defined(TARGET_ARCH_ARM) ||                                                \
-    defined(TARGET_ARCH_MIPS)
+#if defined(ARCH_IS_32_BIT)
   WriteByte(&header_, kELFCLASS32);  // EI_CLASS
-#elif defined(TARGET_ARCH_X64)
+#elif defined(ARCH_IS_64_BIT)
   WriteByte(&header_, kELFCLASS64);  // EI_CLASS
+#else
+#error Unknown architecture.
 #endif
   WriteByte(&header_, kELFDATA2LSB);  // EI_DATA
   WriteByte(&header_, kEV_CURRENT);  // EI_VERSION
   WriteByte(&header_, 0);  // EI_PAD
   WriteInt(&header_, 0);  // EI_PAD
   WriteInt(&header_, 0);  // EI_PAD
   WriteShort(&header_, kET_DYN);  // e_type, fake a shared object.
 #if defined(TARGET_ARCH_IA32)
   WriteShort(&header_, kEM_386);  // e_machine
 #elif defined(TARGET_ARCH_X64)
   WriteShort(&header_, kEM_X86_64);  // e_machine
 #elif defined(TARGET_ARCH_ARM)
   WriteShort(&header_, kEM_ARM);  // e_machine
+#elif defined(TARGET_ARCH_MIPS)
+  WriteShort(&header_, kEM_MIPS);  // e_machine
+#else
+#error Unknown architecture.
 #endif
   WriteInt(&header_, kEV_CURRENT);  // e_version
   WriteWord(&header_, 0);  // e_entry: none
   WriteWord(&header_, 0);  // e_phoff: no program header table.
   WriteWord(&header_, shoff);  // e_shoff: section header table offset.
   WriteInt(&header_, 0);  // e_flags: no flags.
   WriteShort(&header_, kELFHeaderSize);  // e_ehsize: header size.
   WriteShort(&header_, kProgramHeaderEntrySize);  // e_phentsize
   WriteShort(&header_, 0);  // e_phnum: no entries program header table.
   WriteShort(&header_, kSectionHeaderEntrySize);  // e_shentsize
@@ skipping 76 matching lines @@
   ASSERT(offset == shoff);
   offset += (*writer)(handle, sheaders_);
   ASSERT(offset == shoff + kNumSections * kSectionHeaderEntrySize);
 
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_ELFGEN_H_