More cleanup of slot handling in the nonoptimizing code generator....

src/fast-codegen.h

 // 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 201 matching lines @@
 
 
   int SlotOffset(Slot* slot);
   void Move(Expression::Context destination, Register source);
   void MoveTOS(Expression::Context destination);
   void Move(Expression::Context destination, Slot* source, Register scratch);
   void Move(Expression::Context destination, Literal* source);
   void Move(Slot* dst, Register source, Register scratch1, Register scratch2);
   void Move(Register dst, Slot* source);
 
-  // Templated to allow for Operand on intel and MemOperand on ARM.
-  template <typename MemoryLocation>
-  MemoryLocation CreateSlotOperand(Slot* slot, Register scratch);
+  // Return an operand used to read/write to a known (ie, non-LOOKUP) slot.
+  // May emit code to traverse the context chain, destroying the scratch
+  // register.
+  MemOperand EmitSlotSearch(Slot* slot, Register scratch);
 
   // Drop the TOS, and store source to destination.
   // If destination is TOS, just overwrite TOS with source.
   void DropAndMove(Expression::Context destination,
                    Register source,
                    int drop_count = 1);
 
   // Test the JavaScript value in source as if in a test context, compile
   // control flow to a pair of labels.
   void TestAndBranch(Register source, Label* true_label, Label* false_label);
@@ skipping 86 matching lines @@
 
   friend class NestedStatement;
 
   DISALLOW_COPY_AND_ASSIGN(FastCodeGenerator);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FAST_CODEGEN_H_