Author: [EMAIL PROTECTED]
Date: Tue Nov 25 06:26:13 2008
New Revision: 840
Modified:
branches/bleeding_edge/src/regexp-macro-assembler-ia32.cc
branches/bleeding_edge/src/regexp-macro-assembler-ia32.h
branches/bleeding_edge/test/cctest/cctest.h
branches/bleeding_edge/test/cctest/test-regexp.cc
Log:
IA32-tests won't be compiled on ARM (and not just not run).
Modified: branches/bleeding_edge/src/regexp-macro-assembler-ia32.cc
==============================================================================
--- branches/bleeding_edge/src/regexp-macro-assembler-ia32.cc (original)
+++ branches/bleeding_edge/src/regexp-macro-assembler-ia32.cc Tue Nov 25
06:26:13 2008
@@ -318,7 +318,6 @@
}
-
void RegExpMacroAssemblerIA32::DispatchHighByteMap(
byte start,
Label* byte_map,
Modified: branches/bleeding_edge/src/regexp-macro-assembler-ia32.h
==============================================================================
--- branches/bleeding_edge/src/regexp-macro-assembler-ia32.h (original)
+++ branches/bleeding_edge/src/regexp-macro-assembler-ia32.h Tue Nov 25
06:26:13 2008
@@ -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"
Modified: branches/bleeding_edge/test/cctest/cctest.h
==============================================================================
--- branches/bleeding_edge/test/cctest/cctest.h (original)
+++ branches/bleeding_edge/test/cctest/cctest.h Tue Nov 25 06:26:13 2008
@@ -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)();
Modified: branches/bleeding_edge/test/cctest/test-regexp.cc
==============================================================================
--- branches/bleeding_edge/test/cctest/test-regexp.cc (original)
+++ branches/bleeding_edge/test/cctest/test-regexp.cc Tue Nov 25 06:26:13
2008
@@ -720,7 +720,9 @@
}
-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(MacroAssemblerIA32Simple) {
+TEST(MacroAssemblerIA32Simple) {
typedef bool (*AsciiTest) (
SeqAsciiString** base, int start_index, int end_index, int*
captures);
@@ -812,7 +814,7 @@
}
-IA32TEST(MacroAssemblerIA32Backtrack) {
+TEST(MacroAssemblerIA32Backtrack) {
typedef bool (*AsciiTest) (
SeqAsciiString** base, int start_index, int end_index, int*
captures);
@@ -855,7 +857,7 @@
}
-IA32TEST(MacroAssemblerIA32Registers) {
+TEST(MacroAssemblerIA32Registers) {
typedef bool (*AsciiTest) (
SeqAsciiString** base, int start_index, int end_index, int*
captures);
@@ -952,6 +954,7 @@
CHECK_EQ(9, output[4]);
}
+#endif // !(defined(ARM) || defined(__arm__) || defined(__thumb__))
TEST(AddInverseToTable) {
static const int kLimit = 1000;
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
