ARM: Implement StringLength and StringCharCodeAt in the lithium-arm

src/ia32/lithium-codegen-ia32.cc

 // Copyright 2011 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 2638 matching lines @@
 void LCodeGen::DoStringCharCodeAt(LStringCharCodeAt* instr) {
   class DeferredStringCharCodeAt: public LDeferredCode {
    public:
     DeferredStringCharCodeAt(LCodeGen* codegen, LStringCharCodeAt* instr)
         : LDeferredCode(codegen), instr_(instr) { }
     virtual void Generate() { codegen()->DoDeferredStringCharCodeAt(instr_); }
    private:
     LStringCharCodeAt* instr_;
   };
 
-  DeferredStringCharCodeAt* deferred = new DeferredStringCharCodeAt(this,
-                                                                    instr);
+  DeferredStringCharCodeAt* deferred
+      = new DeferredStringCharCodeAt(this, instr);
 
   Register string = ToRegister(instr->string());
   Register index = no_reg;
   int const_index = -1;
   if (instr->index()->IsConstantOperand()) {
     const_index = ToInteger32(LConstantOperand::cast(instr->index()));
   } else {
     index = ToRegister(instr->index());
   }
   Register result = ToRegister(instr->result());
@@ skipping 32 matching lines @@
 
   // Check for 1-byte or 2-byte string.
   __ bind(&flat_string);
   STATIC_ASSERT(kAsciiStringTag != 0);
   __ test(result, Immediate(kStringEncodingMask));
   __ j(not_zero, &ascii_string);
 
   // 2-byte string.
   // Load the 2-byte character code into the result register.
   STATIC_ASSERT(kSmiTag == 0 && kSmiTagSize == 1);
-  if (index.is_valid()) {
+  if (instr->index()->IsConstantOperand()) {
+    __ movzx_w(result,
+               FieldOperand(string,
+                            SeqTwoByteString::kHeaderSize + 2 * const_index));
+  } else {
     __ movzx_w(result, FieldOperand(string,
-                                    index, times_2,
+                                    index,
+                                    times_2,
                                     SeqTwoByteString::kHeaderSize));
-  } else {
-    __ movzx_w(result, FieldOperand(
-        string, SeqTwoByteString::kHeaderSize + 2 * const_index));
   }
   __ jmp(&done);
 
   // ASCII string.
   // Load the byte into the result register.
   __ bind(&ascii_string);
-  if (index.is_valid()) {
+  if (instr->index()->IsConstantOperand()) {
     __ movzx_b(result, FieldOperand(string,
-                                    index, times_1,
-                                    SeqAsciiString::kHeaderSize));
+                                    SeqAsciiString::kHeaderSize + const_index));
   } else {
     __ movzx_b(result, FieldOperand(string,
-                                    SeqAsciiString::kHeaderSize + const_index));
+                                    index,
+                                    times_1,
+                                    SeqAsciiString::kHeaderSize));
   }
   __ bind(&done);
   __ bind(deferred->exit());
 }
 
 
 void LCodeGen::DoDeferredStringCharCodeAt(LStringCharCodeAt* instr) {
   Register string = ToRegister(instr->string());
   Register result = ToRegister(instr->result());
 
@@ skipping 837 matching lines @@
   ASSERT(osr_pc_offset_ == -1);
   osr_pc_offset_ = masm()->pc_offset();
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32