| Index: src/ia32/lithium-codegen-ia32.cc
|
| ===================================================================
|
| --- src/ia32/lithium-codegen-ia32.cc (revision 10404)
|
| +++ src/ia32/lithium-codegen-ia32.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2011 the V8 project authors. All rights reserved.
|
| +// Copyright 2012 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:
|
| @@ -1831,7 +1831,7 @@
|
|
|
|
|
| // Branches to a label or falls through with the answer in the z flag. Trashes
|
| -// the temp registers, but not the input. Only input and temp2 may alias.
|
| +// the temp registers, but not the input.
|
| void LCodeGen::EmitClassOfTest(Label* is_true,
|
| Label* is_false,
|
| Handle<String>class_name,
|
| @@ -1839,7 +1839,8 @@
|
| Register temp,
|
| Register temp2) {
|
| ASSERT(!input.is(temp));
|
| - ASSERT(!temp.is(temp2)); // But input and temp2 may be the same register.
|
| + ASSERT(!input.is(temp2));
|
| + ASSERT(!temp.is(temp2));
|
| __ JumpIfSmi(input, is_false);
|
|
|
| if (class_name->IsEqualTo(CStrVector("Function"))) {
|
| @@ -1899,12 +1900,7 @@
|
| Register input = ToRegister(instr->InputAt(0));
|
| Register temp = ToRegister(instr->TempAt(0));
|
| Register temp2 = ToRegister(instr->TempAt(1));
|
| - if (input.is(temp)) {
|
| - // Swap.
|
| - Register swapper = temp;
|
| - temp = temp2;
|
| - temp2 = swapper;
|
| - }
|
| +
|
| Handle<String> class_name = instr->hydrogen()->class_name();
|
|
|
| int true_block = chunk_->LookupDestination(instr->true_block_id());
|
| @@ -1979,7 +1975,9 @@
|
| Register map = ToRegister(instr->TempAt(0));
|
| __ mov(map, FieldOperand(object, HeapObject::kMapOffset));
|
| __ bind(deferred->map_check()); // Label for calculating code patching.
|
| - __ cmp(map, factory()->the_hole_value()); // Patched to cached map.
|
| + Handle<JSGlobalPropertyCell> cache_cell =
|
| + factory()->NewJSGlobalPropertyCell(factory()->the_hole_value());
|
| + __ cmp(map, Operand::Cell(cache_cell)); // Patched to cached map.
|
| __ j(not_equal, &cache_miss, Label::kNear);
|
| __ mov(eax, factory()->the_hole_value()); // Patched to either true or false.
|
| __ jmp(&done);
|
| @@ -3016,6 +3014,29 @@
|
| }
|
|
|
|
|
| +void LCodeGen::DoRandom(LRandom* instr) {
|
| + // Having marked this instruction as a call we can use any
|
| + // registers.
|
| + ASSERT(ToDoubleRegister(instr->result()).is(xmm1));
|
| + ASSERT(ToRegister(instr->InputAt(0)).is(eax));
|
| +
|
| + __ PrepareCallCFunction(1, ebx);
|
| + __ mov(eax, FieldOperand(eax, GlobalObject::kGlobalContextOffset));
|
| + __ mov(Operand(esp, 0), eax);
|
| + __ CallCFunction(ExternalReference::random_uint32_function(isolate()), 1);
|
| +
|
| + // Convert 32 random bits in eax to 0.(32 random bits) in a double
|
| + // by computing:
|
| + // ( 1.(20 0s)(32 random bits) x 2^20 ) - (1.0 x 2^20)).
|
| + __ mov(ebx, Immediate(0x49800000)); // 1.0 x 2^20 as single.
|
| + __ movd(xmm2, ebx);
|
| + __ movd(xmm1, eax);
|
| + __ cvtss2sd(xmm2, xmm2);
|
| + __ xorps(xmm1, xmm2);
|
| + __ subsd(xmm1, xmm2);
|
| +}
|
| +
|
| +
|
| void LCodeGen::DoMathLog(LUnaryMathOperation* instr) {
|
| ASSERT(instr->value()->Equals(instr->result()));
|
| XMMRegister input_reg = ToDoubleRegister(instr->value());
|
| @@ -3678,8 +3699,10 @@
|
|
|
|
|
| void LCodeGen::EmitNumberUntagD(Register input_reg,
|
| + Register temp_reg,
|
| XMMRegister result_reg,
|
| bool deoptimize_on_undefined,
|
| + bool deoptimize_on_minus_zero,
|
| LEnvironment* env) {
|
| Label load_smi, done;
|
|
|
| @@ -3708,6 +3731,15 @@
|
| }
|
| // Heap number to XMM conversion.
|
| __ movdbl(result_reg, FieldOperand(input_reg, HeapNumber::kValueOffset));
|
| + if (deoptimize_on_minus_zero) {
|
| + XMMRegister xmm_scratch = xmm0;
|
| + __ xorps(xmm_scratch, xmm_scratch);
|
| + __ ucomisd(result_reg, xmm_scratch);
|
| + __ j(not_zero, &done, Label::kNear);
|
| + __ movmskpd(temp_reg, result_reg);
|
| + __ test_b(temp_reg, 1);
|
| + DeoptimizeIf(not_zero, env);
|
| + }
|
| __ jmp(&done, Label::kNear);
|
|
|
| // Smi to XMM conversion
|
| @@ -3830,14 +3862,23 @@
|
| void LCodeGen::DoNumberUntagD(LNumberUntagD* instr) {
|
| LOperand* input = instr->InputAt(0);
|
| ASSERT(input->IsRegister());
|
| + LOperand* temp = instr->TempAt(0);
|
| + ASSERT(temp == NULL || temp->IsRegister());
|
| LOperand* result = instr->result();
|
| ASSERT(result->IsDoubleRegister());
|
|
|
| Register input_reg = ToRegister(input);
|
| XMMRegister result_reg = ToDoubleRegister(result);
|
|
|
| - EmitNumberUntagD(input_reg, result_reg,
|
| + bool deoptimize_on_minus_zero =
|
| + instr->hydrogen()->deoptimize_on_minus_zero();
|
| + Register temp_reg = deoptimize_on_minus_zero ? ToRegister(temp) : no_reg;
|
| +
|
| + EmitNumberUntagD(input_reg,
|
| + temp_reg,
|
| + result_reg,
|
| instr->hydrogen()->deoptimize_on_undefined(),
|
| + deoptimize_on_minus_zero,
|
| instr->environment());
|
| }
|
|
|
| @@ -4033,13 +4074,23 @@
|
| }
|
|
|
|
|
| +void LCodeGen::DoCheckMapCommon(Register reg,
|
| + Handle<Map> map,
|
| + CompareMapMode mode,
|
| + LEnvironment* env) {
|
| + Label success;
|
| + __ CompareMap(reg, map, &success, mode);
|
| + DeoptimizeIf(not_equal, env);
|
| + __ bind(&success);
|
| +}
|
| +
|
| +
|
| void LCodeGen::DoCheckMap(LCheckMap* instr) {
|
| LOperand* input = instr->InputAt(0);
|
| ASSERT(input->IsRegister());
|
| Register reg = ToRegister(input);
|
| - __ cmp(FieldOperand(reg, HeapObject::kMapOffset),
|
| - instr->hydrogen()->map());
|
| - DeoptimizeIf(not_equal, instr->environment());
|
| + Handle<Map> map = instr->hydrogen()->map();
|
| + DoCheckMapCommon(reg, map, instr->hydrogen()->mode(), instr->environment());
|
| }
|
|
|
|
|
| @@ -4102,9 +4153,9 @@
|
|
|
| // Check prototype maps up to the holder.
|
| while (!current_prototype.is_identical_to(holder)) {
|
| - __ cmp(FieldOperand(reg, HeapObject::kMapOffset),
|
| - Handle<Map>(current_prototype->map()));
|
| - DeoptimizeIf(not_equal, instr->environment());
|
| + DoCheckMapCommon(reg, Handle<Map>(current_prototype->map()),
|
| + ALLOW_ELEMENT_TRANSITION_MAPS, instr->environment());
|
| +
|
| current_prototype =
|
| Handle<JSObject>(JSObject::cast(current_prototype->GetPrototype()));
|
| // Load next prototype object.
|
| @@ -4112,9 +4163,8 @@
|
| }
|
|
|
| // Check the holder map.
|
| - __ cmp(FieldOperand(reg, HeapObject::kMapOffset),
|
| - Handle<Map>(current_prototype->map()));
|
| - DeoptimizeIf(not_equal, instr->environment());
|
| + DoCheckMapCommon(reg, Handle<Map>(current_prototype->map()),
|
| + ALLOW_ELEMENT_TRANSITION_MAPS, instr->environment());
|
| }
|
|
|
|
|
| @@ -4139,7 +4189,7 @@
|
| DeoptimizeIf(not_equal, instr->environment());
|
| }
|
|
|
| - // Setup the parameters to the stub/runtime call.
|
| + // Set up the parameters to the stub/runtime call.
|
| __ mov(eax, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
|
| __ push(FieldOperand(eax, JSFunction::kLiteralsOffset));
|
| __ push(Immediate(Smi::FromInt(instr->hydrogen()->literal_index())));
|
| @@ -4247,7 +4297,7 @@
|
| Handle<FixedArray> constant_properties =
|
| instr->hydrogen()->constant_properties();
|
|
|
| - // Setup the parameters to the stub/runtime call.
|
| + // Set up the parameters to the stub/runtime call.
|
| __ mov(eax, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
|
| __ push(FieldOperand(eax, JSFunction::kLiteralsOffset));
|
| __ push(Immediate(Smi::FromInt(instr->hydrogen()->literal_index())));
|
|
|