Periodic merge of bleeding_edge to experimental code generator branch....

src/SConscript

Index: src/SConscript
===================================================================
--- src/SConscript	(revision 868)
+++ src/SConscript	(working copy)
@@ -41,31 +41,38 @@
     'conversions.cc', 'counters.cc', 'dateparser.cc', 'debug.cc',
     'disassembler.cc', 'execution.cc', 'factory.cc', 'flags.cc', 'frames.cc',
     'global-handles.cc', 'handles.cc', 'hashmap.cc', 'heap.cc', 'ic.cc',
-    'jsregexp.cc', 'log.cc', 'mark-compact.cc', 'messages.cc', 'objects.cc',
-    'parser.cc', 'property.cc', 'rewriter.cc', 'runtime.cc', 'scanner.cc',
-    'scopeinfo.cc', 'scopes.cc', 'serialize.cc', 'snapshot-common.cc',
-    'spaces.cc', 'string-stream.cc', 'stub-cache.cc', 'token.cc', 'top.cc',
-    'unicode.cc', 'usage-analyzer.cc', 'utils.cc', 'v8-counters.cc', 'v8.cc',
-    'v8threads.cc', 'variables.cc', 'zone.cc'
+    'interpreter-irregexp.cc', 'jsregexp.cc', 'log.cc', 'mark-compact.cc',
+    'messages.cc', 'objects.cc', 'parser.cc', 'property.cc',
+    'regexp-macro-assembler.cc', 'regexp-macro-assembler-irregexp.cc',
+    'rewriter.cc', 'runtime.cc', 'scanner.cc', 'scopeinfo.cc', 'scopes.cc',
+    'serialize.cc', 'snapshot-common.cc', 'spaces.cc', 'string-stream.cc',
+    'stub-cache.cc', 'token.cc', 'top.cc', 'unicode.cc', 'usage-analyzer.cc',
+    'utils.cc', 'v8-counters.cc', 'v8.cc', 'v8threads.cc', 'variables.cc',
+    'zone.cc'
   ],
   'arch:arm': [
     'assembler-arm.cc', 'builtins-arm.cc', 'codegen-arm.cc', 'cpu-arm.cc',
     'disasm-arm.cc', 'frames-arm.cc', 'ic-arm.cc', 'jump-target-arm.cc',
-    'macro-assembler-arm.cc', 'stub-cache-arm.cc', 'virtual-frame-arm.cc'
+    'macro-assembler-arm.cc', 'regexp-macro-assembler-arm.cc',
+    'stub-cache-arm.cc', 'virtual-frame-arm.cc'
   ],
   'arch:ia32': [
     'assembler-ia32.cc', 'builtins-ia32.cc', 'codegen-ia32.cc', 'cpu-ia32.cc',
     'disasm-ia32.cc', 'frames-ia32.cc', 'ic-ia32.cc', 'jump-target-ia32.cc',
-    'macro-assembler-ia32.cc', 'register-allocator-ia32.cc',
-    'stub-cache-ia32.cc', 'virtual-frame-ia32.cc'
+    'macro-assembler-ia32.cc', 'regexp-macro-assembler-ia32.cc',
+    'register-allocator-ia32.cc', 'stub-cache-ia32.cc',
+    'virtual-frame-ia32.cc'
   ],
   'simulator:arm': ['simulator-arm.cc'],
-  'os:linux':  ['platform-linux.cc'],
-  'os:macos':  ['platform-macos.cc'],
-  'os:nullos': ['platform-nullos.cc'],
-  'os:win32':  ['platform-win32.cc'],
+  'os:freebsd': ['platform-freebsd.cc'],
+  'os:linux':   ['platform-linux.cc'],
+  'os:macos':   ['platform-macos.cc'],
+  'os:nullos':  ['platform-nullos.cc'],
+  'os:win32':   ['platform-win32.cc'],
   'mode:release': [],
-  'mode:debug': ['objects-debug.cc', 'prettyprinter.cc']
+  'mode:debug': [
+    'objects-debug.cc', 'prettyprinter.cc', 'regexp-macro-assembler-tracer.cc'
+  ]
 }