Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: src/arm/lithium-codegen-arm.cc

Issue 21173004: Version 3.20.11.1 (Closed) Base URL: https://v8.googlecode.com/svn/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/arm/lithium-arm.cc ('k') | src/assembler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/arm/lithium-codegen-arm.cc
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
index 929d04de13aa693065ad37067d8645266eed2300..41636a817131400f798b648763b6a07f0cae2046 100644
--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -1742,14 +1742,7 @@ void LCodeGen::DoShiftI(LShiftI* instr) {
break;
case Token::SHL:
if (shift_count != 0) {
- if (instr->hydrogen_value()->representation().IsSmi() &&
- instr->can_deopt()) {
- __ mov(result, Operand(left, LSL, shift_count - 1));
- __ SmiTag(result, result, SetCC);
- DeoptimizeIf(vs, instr->environment());
- } else {
- __ mov(result, Operand(left, LSL, shift_count));
- }
+ __ mov(result, Operand(left, LSL, shift_count));
} else {
__ Move(result, left);
}
@@ -1822,11 +1815,6 @@ void LCodeGen::DoConstantD(LConstantD* instr) {
}
-void LCodeGen::DoConstantE(LConstantE* instr) {
- __ mov(ToRegister(instr->result()), Operand(instr->value()));
-}
-
-
void LCodeGen::DoConstantT(LConstantT* instr) {
Handle<Object> value = instr->value();
AllowDeferredHandleDereference smi_check;
@@ -3007,13 +2995,6 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
HObjectAccess access = instr->hydrogen()->access();
int offset = access.offset();
Register object = ToRegister(instr->object());
-
- if (access.IsExternalMemory()) {
- Register result = ToRegister(instr->result());
- __ ldr(result, MemOperand(object, offset));
- return;
- }
-
if (instr->hydrogen()->representation().IsDouble()) {
DwVfpRegister result = ToDoubleRegister(instr->result());
__ vldr(result, FieldMemOperand(object, offset));
@@ -4193,15 +4174,10 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
Register object = ToRegister(instr->object());
Register scratch = scratch0();
+
HObjectAccess access = instr->hydrogen()->access();
int offset = access.offset();
- if (access.IsExternalMemory()) {
- Register value = ToRegister(instr->value());
- __ str(value, MemOperand(object, offset));
- return;
- }
-
Handle<Map> transition = instr->transition();
if (FLAG_track_heap_object_fields && representation.IsHeapObject()) {
@@ -4524,7 +4500,7 @@ void LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
// Write barrier.
__ RecordWriteField(object_reg, HeapObject::kMapOffset, new_map_reg,
scratch, GetLinkRegisterState(), kDontSaveFPRegs);
- } else {
+ } else if (FLAG_compiled_transitions) {
PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters);
__ Move(r0, object_reg);
__ Move(r1, to_map);
@@ -4532,6 +4508,28 @@ void LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
__ CallStub(&stub);
RecordSafepointWithRegisters(
instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
+ } else if (IsFastSmiElementsKind(from_kind) &&
+ IsFastDoubleElementsKind(to_kind)) {
+ Register fixed_object_reg = ToRegister(instr->temp());
+ ASSERT(fixed_object_reg.is(r2));
+ Register new_map_reg = ToRegister(instr->new_map_temp());
+ ASSERT(new_map_reg.is(r3));
+ __ mov(new_map_reg, Operand(to_map));
+ __ mov(fixed_object_reg, object_reg);
+ CallCode(isolate()->builtins()->TransitionElementsSmiToDouble(),
+ RelocInfo::CODE_TARGET, instr);
+ } else if (IsFastDoubleElementsKind(from_kind) &&
+ IsFastObjectElementsKind(to_kind)) {
+ Register fixed_object_reg = ToRegister(instr->temp());
+ ASSERT(fixed_object_reg.is(r2));
+ Register new_map_reg = ToRegister(instr->new_map_temp());
+ ASSERT(new_map_reg.is(r3));
+ __ mov(new_map_reg, Operand(to_map));
+ __ mov(fixed_object_reg, object_reg);
+ CallCode(isolate()->builtins()->TransitionElementsDoubleToObject(),
+ RelocInfo::CODE_TARGET, instr);
+ } else {
+ UNREACHABLE();
}
__ bind(&not_applicable);
}
« no previous file with comments | « src/arm/lithium-arm.cc ('k') | src/assembler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698