Building on regexp-ia32.

regexp2000/src/jsregexp.cc

 // Copyright 2006-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 25 matching lines @@
 #include "jsregexp-inl.h"
 #include "platform.h"
 #include "runtime.h"
 #include "top.h"
 #include "compilation-cache.h"
 #include "string-stream.h"
 #include "parser.h"
 #include "assembler-re2k.h"
 #include "regexp-macro-assembler.h"
 #include "regexp-macro-assembler-re2k.h"
+#include "regexp-macro-assembler-ia32.h"
 #include "interpreter-re2k.h"
 
 // Including pcre.h undefines DEBUG to avoid getting debug output from
 // the JSCRE implementation. Make sure to redefine it in debug mode
 // after having included the header file.
 #ifdef DEBUG
 #include "third_party/jscre/pcre.h"
 #define DEBUG
 #else
 #include "third_party/jscre/pcre.h"
@@ skipping 2227 matching lines @@
   RegExpNode* node = RegExpQuantifier::ToNode(0,
                                               RegExpQuantifier::kInfinity,
                                               false,
                                               new RegExpCharacterClass('*'),
                                               &compiler,
                                               captured_body,
                                               compiler.backtrack());
   if (node_return != NULL) *node_return = node;
   Analysis analysis;
   analysis.EnsureAnalyzed(node);
-  byte codes[1024];
-  Re2kAssembler assembler(Vector<byte>(codes, 1024));
-  RegExpMacroAssemblerRe2k macro_assembler(&assembler);
-  return compiler.Assemble(&macro_assembler,
-                           node,
-                           input->capture_count,
-                           ignore_case);
-}
 
-RegExpMacroAssembler::RegExpMacroAssembler() {
-}
-
-RegExpMacroAssembler::~RegExpMacroAssembler() {
+  if (FLAG_re2k_native) {

[Erik Corry, 2008/11/21 13:03:04]

We should probably either ignore the flag on ARM or not have it at all.  This
looks like it will crash in release mode if the flag is set on ARM?

[Lasse Reichstein, 2008/11/24 08:32:33]

Done.

+    // DON'T USE ON ARM YET!
+#if defined __arm__ || defined ARM || defined __thumb__
+    UNREACHABLE();
+    return NULL;
+#else
+    // FIXME.

[Erik Corry, 2008/11/21 13:03:04]

Thuis should be a TODO with a name or issue number.

[Lasse Reichstein, 2008/11/24 08:32:33]

Done.

+    // Don't compile *here*, we don't know the input type yet! This won't work!

[Erik Corry, 2008/11/21 13:03:04]

For now we just do 16 bit always for the bytecode version.

[Lasse Reichstein, 2008/11/24 08:32:33]

The ia32 code will also assume 16-bit strings then, for now.

+    RegExpMacroAssemblerIA32 macro_assembler(RegExpMacroAssemblerIA32::ASCII,
+                                             input->capture_count,
+                                             ignore_case);
+    return compiler.Assemble(&macro_assembler,
+                             node,
+                             input->capture_count,
+                             ignore_case);
+#endif
+  } else {
+    byte codes[1024];
+    Re2kAssembler assembler(Vector<byte>(codes, 1024));
+    RegExpMacroAssemblerRe2k macro_assembler(&assembler);
+    return compiler.Assemble(&macro_assembler,
+                             node,
+                             input->capture_count,
+                             ignore_case);
+  }
 }
 
 
 }}  // namespace v8::internal