Add Load/Store Static/Instance fields.

runtime/vm/flow_graph_compiler_x64.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/disassembler.h"
 #include "vm/longjump.h"
 #include "vm/parser.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
+DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, print_ast);
 DECLARE_FLAG(bool, print_scopes);
 DECLARE_FLAG(bool, trace_functions);
 
 void FlowGraphCompiler::Bailout(const char* reason) {
   const char* kFormat = "FlowGraphCompiler Bailout: %s %s.";
   const char* function_name = parsed_function_.function().ToCString();
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
+#define __ assembler_->
 
-#define __ assembler_->
+
+void FlowGraphCompiler::GenerateAssertAssignable(intptr_t node_id,
+                                                 intptr_t token_index,
+                                                 const AbstractType& dst_type,
+                                                 const String& dst_name) {
+  Bailout("GenerateAssertAssignable");
+}
+
 
 void FlowGraphCompiler::LoadValue(Value* value) {
   if (value->IsConstant()) {
     ConstantVal* constant = value->AsConstant();
     if (constant->instance().IsSmi()) {
       int64_t imm = reinterpret_cast<int64_t>(constant->instance().raw());
       __ movq(RAX, Immediate(imm));
     } else {
       __ LoadObject(RAX, value->AsConstant()->instance());
     }
@@ skipping 122 matching lines @@
   LoadValue(comp->value());
   __ movq(Address(RBP, comp->local().index() * kWordSize), RAX);
 }
 
 
 void FlowGraphCompiler::VisitNativeCall(NativeCallComp* comp) {
   Bailout("NativeCallComp");
 }
 
 
+void FlowGraphCompiler::VisitLoadInstanceField(LoadInstanceFieldComp* comp) {
+  LoadValue(comp->instance());  // -> RAX.
+  __ movq(RAX, FieldAddress(RAX, comp->field_offset()));
+}
+
+
+void FlowGraphCompiler::VisitStoreInstanceField(StoreInstanceFieldComp* comp) {
+  LoadValue(comp->value());
+  if (FLAG_enable_type_checks) {
+    GenerateAssertAssignable(comp->node_id(),

[Kevin Millikin (Google), 2012/03/05 11:02:41]

There is an AssertAssignableComp that can go in the IL instruction stream (see
EffectGraphVisitor::VisitStoreLocalNode).

The idea is that by exposing them in the IL they can be eliminated and/or
shared.

I think it's up in the air whether we insert them up front or later (but I
prefer up front a bit).  For now, it probably doesn't even matter if we're
uniform as long as we keep it in mind as an issue to sort out.

[srdjan, 2012/03/05 18:35:21]

Moved to graph builder.

+                             comp->token_index(),
+                             AbstractType::ZoneHandle(comp->field_type()),
+                             String::ZoneHandle(comp->field_name()));
+  }
+  __ movq(R10, RAX);
+  LoadValue(comp->instance());  // -> RAX.
+  __ StoreIntoObject(RAX, FieldAddress(RAX, comp->field_offset()), R10);
+}
+
+
+
+void FlowGraphCompiler::VisitLoadStaticField(LoadStaticFieldComp* comp) {
+  __ LoadObject(RDX, comp->field());
+  __ movq(RAX, FieldAddress(RDX, Field::value_offset()));
+}
+
+
+void FlowGraphCompiler::VisitStoreStaticField(StoreStaticFieldComp* comp) {
+  LoadValue(comp->value());
+  if (FLAG_enable_type_checks) {

[srdjan, 2012/03/05 18:35:21]

Removed here as well.

+    GenerateAssertAssignable(comp->node_id(),
+                             comp->token_index(),
+                             AbstractType::ZoneHandle(comp->field().type()),
+                             String::ZoneHandle(comp->field().name()));
+  }
+  __ LoadObject(RDX, comp->field());
+  __ StoreIntoObject(RDX, FieldAddress(RDX, Field::value_offset()), RAX);
+}
+
+
 void FlowGraphCompiler::VisitStoreIndexed(StoreIndexedComp* comp) {
   // Call operator []= but preserve the third argument value under the
   // arguments as the result of the computation.
   const String& function_name =
       String::ZoneHandle(String::NewSymbol(Token::Str(Token::kASSIGN_INDEX)));
   // Placeholder is under value, index, and receiver.
   const int kPlaceholderOffset = 3 * kWordSize;
   __ movq(RAX, Address(RSP, 0));  // Value.
   __ movq(Address(RSP, kPlaceholderOffset), RAX);
   EmitInstanceCall(comp->node_id(), comp->token_index(), function_name, 3,
                    Array::ZoneHandle(), 1);
   __ popq(RAX);
 }
 
-
 void FlowGraphCompiler::VisitInstanceSetter(InstanceSetterComp* comp) {
   // Preserve the second argument under the arguments as the result of the
   // computation, then call the getter.
   const String& function_name =
       String::ZoneHandle(Field::SetterSymbol(comp->field_name()));
   // Placeholder is under value and receiver.
   const int kPlaceholderOffset = 2 * kWordSize;
   __ movq(RAX, Address(RSP, 0));  // Value.
   __ movq(Address(RSP, kPlaceholderOffset), RAX);
   EmitInstanceCall(comp->node_id(), comp->token_index(), function_name, 2,
@@ skipping 208 matching lines @@
 void FlowGraphCompiler::FinalizeExceptionHandlers(const Code& code) {
   // We don't compile exception handlers yet.
   code.set_exception_handlers(
       ExceptionHandlers::Handle(ExceptionHandlers::New(0)));
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64