Implement code generation for conditional expressions and regexp...

src/x64/register-allocator-x64.cc

 // Copyright 2009 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 @@
 
 namespace v8 {
 namespace internal {
 
 // -------------------------------------------------------------------------
 // Result implementation.
 
 void Result::ToRegister() {
   ASSERT(is_valid());
   if (is_constant()) {
-    // TODO(X64): Handle constant results.
-    /*
     Result fresh = CodeGeneratorScope::Current()->allocator()->Allocate();
     ASSERT(fresh.is_valid());
-    if (CodeGeneratorScope::Current()->IsUnsafeSmi(handle())) {
-      CodeGeneratorScope::Current()->LoadUnsafeSmi(fresh.reg(), handle());
+    if (handle()->IsSmi()) {
+      if (CodeGeneratorScope::Current()->IsUnsafeSmi(handle())) {
+        CodeGeneratorScope::Current()->LoadUnsafeSmi(fresh.reg(), handle());
+      } else {
+        CodeGeneratorScope::Current()->masm()->movq(fresh.reg(),
+                                                    handle(),
+                                                    RelocInfo::NONE);

[William Hesse, 2009/06/22 19:14:23]

Could you say
CodeGeneratorScope::Current()->masm()->Move(fresh.reg(), handle()), or is there
no way to access the masm?

[Mads Ager (chromium), 2009/06/22 19:25:00]

Done.  And also done for the same piece of code below.

+      }
     } else {
-      CodeGeneratorScope::Current()->masm()->Set(fresh.reg(),
-                                                 Immediate(handle()));
+      CodeGeneratorScope::Current()->masm()->movq(fresh.reg(),
+                                                  handle(),
+                                                  RelocInfo::EMBEDDED_OBJECT);
     }
     // This result becomes a copy of the fresh one.
     *this = fresh;
-    */
   }
   ASSERT(is_register());
 }
 
 
 void Result::ToRegister(Register target) {
   ASSERT(is_valid());
   if (!is_register() || !reg().is(target)) {
     Result fresh = CodeGeneratorScope::Current()->allocator()->Allocate(target);
     ASSERT(fresh.is_valid());
@@ skipping 18 matching lines @@
     ASSERT(CodeGeneratorScope::Current()->has_valid_frame());
     CodeGeneratorScope::Current()->frame()->Spill(target);
     ASSERT(CodeGeneratorScope::Current()->allocator()->count(target) == 1);
   }
   ASSERT(is_register());
   ASSERT(reg().is(target));
 }
 
 
 } }  // namespace v8::internal