LGTM On Tue, Nov 25, 2008 at 2:50 PM, <[EMAIL PROTECTED]> wrote:
> Reviewers: Erik Corry, > > Message: > Review please. > > Description: > IA32-tests won't be compiled on ARM (and not just not run). > > Please review this at http://codereview.chromium.org/12635 > > Affected files: > M src/regexp-macro-assembler-ia32.h > M src/regexp-macro-assembler-ia32.cc > M test/cctest/cctest.h > M test/cctest/test-regexp.cc > > > Index: src/regexp-macro-assembler-ia32.cc > diff --git a/src/regexp-macro-assembler-ia32.cc > b/src/regexp-macro-assembler-ia32.cc > index > 66c47836d8b3d9635cc8d92bd1fc9d627d5048de..dd4ff00b3fd65684691f01473e0349a1e1f92822 > 100644 > --- a/src/regexp-macro-assembler-ia32.cc > +++ b/src/regexp-macro-assembler-ia32.cc > @@ -318,7 +318,6 @@ void RegExpMacroAssemblerIA32::DispatchByteMap( > } > > > - > void RegExpMacroAssemblerIA32::DispatchHighByteMap( > byte start, > Label* byte_map, > Index: src/regexp-macro-assembler-ia32.h > diff --git a/src/regexp-macro-assembler-ia32.h > b/src/regexp-macro-assembler-ia32.h > index > a336a441e24b33f8e110a3f7a57f19be6861b388..34410dbf738f0f9ab6d29a4316a9cc9d63f90c10 > 100644 > --- a/src/regexp-macro-assembler-ia32.h > +++ b/src/regexp-macro-assembler-ia32.h > @@ -28,7 +28,7 @@ > #ifndef REGEXP_MACRO_ASSEMBLER_IA32_H_ > #define REGEXP_MACRO_ASSEMBLER_IA32_H_ > > -#if !(defined __arm__ || defined __thumb__ || defined ARM) > +#if !(defined(ARM) || defined(__arm__) || defined(__thumb__)) > > #include "regexp-macro-assembler.h" > #include "macro-assembler-ia32.h" > Index: test/cctest/cctest.h > diff --git a/test/cctest/cctest.h b/test/cctest/cctest.h > index > 92f7aadd1a8da495e1cd080bd1c875ddb27beb01..d6d1ba3051d7935ae60ebe6a9b5d2d567c5479f2 > 100644 > --- a/test/cctest/cctest.h > +++ b/test/cctest/cctest.h > @@ -42,15 +42,6 @@ > static void Test##Name() > #endif > > -#if (defined __arm__ || defined __thumb__ || defined ARM) > -#define IA32TEST DISABLED_TEST > -#define ARMTEST TEST > -#else // ia32 > -#define IA32TEST TEST > -#define ARMTEST DISABLED_TEST > -#endif > - > - > class CcTest { > public: > typedef void (TestFunction)(); > Index: test/cctest/test-regexp.cc > diff --git a/test/cctest/test-regexp.cc b/test/cctest/test-regexp.cc > index > 4decfee52cff2e379d0c33f0b3db45feca747ad3..8b1dd4f9d737111339703073378de4a3226cb35a > 100644 > --- a/test/cctest/test-regexp.cc > +++ b/test/cctest/test-regexp.cc > @@ -720,7 +720,9 @@ TEST(MacroAssembler) { > } > > > -IA32TEST(MacroAssemblerIA32Success) { > +#if !(defined(ARM) || defined(__arm__) || defined(__thumb__)) > + > +TEST(MacroAssemblerIA32Success) { > typedef bool (*AsciiTest) ( > SeqAsciiString** base, int start_index, int end_index, int* > captures); > > @@ -756,7 +758,7 @@ IA32TEST(MacroAssemblerIA32Success) { > } > > > -IA32TEST(MacroAssemblerIA32Simple) { > +TEST(MacroAssemblerIA32Simple) { > typedef bool (*AsciiTest) ( > SeqAsciiString** base, int start_index, int end_index, int* > captures); > > @@ -812,7 +814,7 @@ IA32TEST(MacroAssemblerIA32Simple) { > } > > > -IA32TEST(MacroAssemblerIA32Backtrack) { > +TEST(MacroAssemblerIA32Backtrack) { > typedef bool (*AsciiTest) ( > SeqAsciiString** base, int start_index, int end_index, int* > captures); > > @@ -855,7 +857,7 @@ IA32TEST(MacroAssemblerIA32Backtrack) { > } > > > -IA32TEST(MacroAssemblerIA32Registers) { > +TEST(MacroAssemblerIA32Registers) { > typedef bool (*AsciiTest) ( > SeqAsciiString** base, int start_index, int end_index, int* > captures); > > @@ -952,6 +954,7 @@ IA32TEST(MacroAssemblerIA32Registers) { > CHECK_EQ(9, output[4]); > } > > +#endif // !(defined(ARM) || defined(__arm__) || defined(__thumb__)) > > TEST(AddInverseToTable) { > static const int kLimit = 1000; > > > -- Erik Corry, Software Engineer Google Denmark ApS. CVR nr. 28 86 69 84 c/o Philip & Partners, 7 Vognmagergade, P.O. Box 2227, DK-1018 Copenhagen K, Denmark. --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
