* Better factoring of ARM/IA32 code in irregexp.

test/cctest/test-regexp.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 21 matching lines @@
 #include "v8.h"
 
 #include "cctest.h"
 #include "zone-inl.h"
 #include "parser.h"
 #include "ast.h"
 #include "jsregexp-inl.h"
 #include "assembler-irregexp.h"
 #include "regexp-macro-assembler.h"
 #include "regexp-macro-assembler-irregexp.h"
+#ifdef ARM
+#include "regexp-macro-assembler-arm.h"
+#else  // IA32
+#include "macro-assembler-ia32.h"
 #include "regexp-macro-assembler-ia32.h"
+#endif
 #include "interpreter-irregexp.h"
 
 
 using namespace v8::internal;
 
 
 static SmartPointer<const char> Parse(const char* input) {
   v8::HandleScope scope;
   ZoneScope zone_scope(DELETE_ON_EXIT);
   FlatStringReader reader(CStrVector(input));
@@ skipping 660 matching lines @@
   CHECK_EQ(84, captures[4]);
 
   Handle<String> f2 =
       Factory::NewStringFromAscii(CStrVector("barfoo"));
   Handle<String> f2_16 = RegExpImpl::StringToTwoByte(f2);
   CHECK(!IrregexpInterpreter::Match(array, f2_16, captures, 0));
   CHECK_EQ(42, captures[0]);
 }
 
 
-#if !(defined(ARM) || defined(__arm__) || defined(__thumb__))
+#ifndef ARM  // IA32 only tests.
 
 TEST(MacroAssemblerIA32Success) {
   typedef bool (*AsciiTest) (
       SeqAsciiString** base, int start_index, int end_index, int* captures);
 
   V8::Initialize(NULL);
 
   // regexp-macro-assembler-ia32 needs a handle scope to allocate
   // byte-arrays for constants.
   v8::HandleScope scope;
@@ skipping 213 matching lines @@
       test(seq_input.location(), start_offset, end_offset, output);
 
   CHECK(success);
   CHECK_EQ(0, output[0]);
   CHECK_EQ(3, output[1]);
   CHECK_EQ(6, output[2]);
   CHECK_EQ(9, output[3]);
   CHECK_EQ(9, output[4]);
 }
 
-#endif  // !(defined(ARM) || defined(__arm__) || defined(__thumb__))
+#endif  // !defined ARM
 
 TEST(AddInverseToTable) {
   static const int kLimit = 1000;
   static const int kRangeCount = 16;
   for (int t = 0; t < 10; t++) {
     ZoneScope zone_scope(DELETE_ON_EXIT);
     ZoneList<CharacterRange>* ranges =
         new ZoneList<CharacterRange>(kRangeCount);
     for (int i = 0; i < kRangeCount; i++) {
       int from = PseudoRandom(t + 87, i + 25) % kLimit;
@@ skipping 197 matching lines @@
   // whole block at a time.
   TestSimpleRangeCaseIndependence(CharacterRange('A', 'k'),
                                   CharacterRange('a', 'z'));
 }
 
 
 TEST(Graph) {
   V8::Initialize(NULL);
   Execute("(x)?\\1y", "", true);
 }