Refactor the register to name mapping in the ARM simulator

src/arm/constants-arm.h

 // Copyright 2009 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 34 matching lines @@
 
 // Simulator should support ARM5 instructions.
 #if !defined(__arm__)
 # define __ARM_ARCH_5__ 1
 # define __ARM_ARCH_5T__ 1
 #endif
 
 namespace assembler {
 namespace arm {
 
+// Number of registers in normal ARM mode.
+static const int kNumRegisters = 16;
+
+// PC is register 15.
+static const int kPCRegister = 15;
+static const int kNoRegister = -1;
+
 // Defines constants and accessor classes to assemble, disassemble and
 // simulate ARM instructions.
 //
 // Section references in the code refer to the "ARM Architecture Reference
 // Manual" from July 2005 (available at http://www.arm.com/miscPDFs/14128.pdf)
 //
 // Constants for specific fields are defined in their respective named enums.
 // General constants are in an anonymous enum in class Instr.
 
 typedef unsigned char byte;
@@ skipping 197 matching lines @@
   // to allocate or create instances of class Instr.
   // Use the At(pc) function to create references to Instr.
   static Instr* At(byte* pc) { return reinterpret_cast<Instr*>(pc); }
 
  private:
   // We need to prevent the creation of instances of class Instr.
   DISALLOW_IMPLICIT_CONSTRUCTORS(Instr);
 };
 
 
+// Helper functions for converting between register numbers and names.
+class Registers {
+ public:
+

[iposva, 2009/09/08 21:59:57]

Please drop this extra empty line.

[Søren Thygesen Gjesse, 2009/09/09 07:01:12]

Done.

+  // Return the name of the register.
+  static const char* Name(int reg);
+
+  // Lookup the register number for the name provided.
+  static int Number(const char* name);
+
+  struct RegisterAlias {
+    int reg;
+    const char *name;
+  };
+
+ private:
+  static const char* names_[kNumRegisters];
+  static const RegisterAlias aliases_[];
+};
+
+
+
 } }  // namespace assembler::arm
 
 #endif  // V8_ARM_CONSTANTS_ARM_H_