src/mips/code-stubs-mips.cc - Issue 7063017: Rename TypeRecording...Stub into ...Stub.

Unified Diff: src/mips/code-stubs-mips.cc

Issue 7063017: Rename TypeRecording...Stub into ...Stub. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/

Patch Set: Created 9 years, 7 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

Index: src/mips/code-stubs-mips.cc

===================================================================

--- src/mips/code-stubs-mips.cc (revision 8025)

+++ src/mips/code-stubs-mips.cc (working copy)

@@ -1807,14 +1807,13 @@

}

-Handle<Code> GetTypeRecordingUnaryOpStub(int key,

- TRUnaryOpIC::TypeInfo type_info) {

- TypeRecordingUnaryOpStub stub(key, type_info);

+Handle<Code> GetUnaryOpStub(int key, UnaryOpIC::TypeInfo type_info) {

+ UnaryOpStub stub(key, type_info);

return stub.GetCode();

}

-const char* TypeRecordingUnaryOpStub::GetName() {

+const char* UnaryOpStub::GetName() {

if (name_ != NULL) return name_;

const int kMaxNameLength = 100;

name_ = Isolate::Current()->bootstrapper()->AllocateAutoDeletedArray(

@@ -1828,34 +1827,34 @@

}

OS::SNPrintF(Vector<char>(name_, kMaxNameLength),

- "TypeRecordingUnaryOpStub_%s_%s_%s",

+ "UnaryOpStub_%s_%s_%s",

op_name,

overwrite_name,

- TRUnaryOpIC::GetName(operand_type_));

+ UnaryOpIC::GetName(operand_type_));

return name_;

}

// TODO(svenpanne): Use virtual functions instead of switch.

-void TypeRecordingUnaryOpStub::Generate(MacroAssembler* masm) {

+void UnaryOpStub::Generate(MacroAssembler* masm) {

switch (operand_type_) {

- case TRUnaryOpIC::UNINITIALIZED:

+ case UnaryOpIC::UNINITIALIZED:

GenerateTypeTransition(masm);

break;

- case TRUnaryOpIC::SMI:

+ case UnaryOpIC::SMI:

GenerateSmiStub(masm);

break;

- case TRUnaryOpIC::HEAP_NUMBER:

+ case UnaryOpIC::HEAP_NUMBER:

GenerateHeapNumberStub(masm);

break;

- case TRUnaryOpIC::GENERIC:

+ case UnaryOpIC::GENERIC:

GenerateGenericStub(masm);

break;

}

-void TypeRecordingUnaryOpStub::GenerateTypeTransition(MacroAssembler* masm) {

+void UnaryOpStub::GenerateTypeTransition(MacroAssembler* masm) {

// Argument is in a0 and v0 at this point, so we can overwrite a0.

// Push this stub's key. Although the operation and the type info are

// encoded into the key, the encoding is opaque, so push them too.

@@ -1866,7 +1865,7 @@

__ Push(v0, a2, a1, a0);

__ TailCallExternalReference(

- ExternalReference(IC_Utility(IC::kTypeRecordingUnaryOp_Patch),

+ ExternalReference(IC_Utility(IC::kUnaryOp_Patch),

masm->isolate()),

1);

@@ -1874,7 +1873,7 @@

// TODO(svenpanne): Use virtual functions instead of switch.

-void TypeRecordingUnaryOpStub::GenerateSmiStub(MacroAssembler* masm) {

+void UnaryOpStub::GenerateSmiStub(MacroAssembler* masm) {

switch (op_) {

case Token::SUB:

GenerateSmiStubSub(masm);

@@ -1888,7 +1887,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateSmiStubSub(MacroAssembler* masm) {

+void UnaryOpStub::GenerateSmiStubSub(MacroAssembler* masm) {

Label non_smi, slow;

GenerateSmiCodeSub(masm, &non_smi, &slow);

__ bind(&non_smi);

@@ -1897,7 +1896,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateSmiStubBitNot(MacroAssembler* masm) {

+void UnaryOpStub::GenerateSmiStubBitNot(MacroAssembler* masm) {

Label non_smi;

GenerateSmiCodeBitNot(masm, &non_smi);

__ bind(&non_smi);

@@ -1905,7 +1904,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateSmiCodeSub(MacroAssembler* masm,

+void UnaryOpStub::GenerateSmiCodeSub(MacroAssembler* masm,

Søren Thygesen Gjesse 2011/05/24 11:33:11 Indentation.

fschneider 2011/05/24 12:16:41 Done.

Label* non_smi,

Label* slow) {

__ JumpIfNotSmi(a0, non_smi);

@@ -1920,7 +1919,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateSmiCodeBitNot(MacroAssembler* masm,

+void UnaryOpStub::GenerateSmiCodeBitNot(MacroAssembler* masm,

Søren Thygesen Gjesse 2011/05/24 11:33:11 Indentation.

fschneider 2011/05/24 12:16:41 Done.

Label* non_smi) {

__ JumpIfNotSmi(a0, non_smi);

@@ -1932,7 +1931,7 @@

// TODO(svenpanne): Use virtual functions instead of switch.

-void TypeRecordingUnaryOpStub::GenerateHeapNumberStub(MacroAssembler* masm) {

+void UnaryOpStub::GenerateHeapNumberStub(MacroAssembler* masm) {

switch (op_) {

case Token::SUB:

GenerateHeapNumberStubSub(masm);

@@ -1946,7 +1945,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateHeapNumberStubSub(MacroAssembler* masm) {

+void UnaryOpStub::GenerateHeapNumberStubSub(MacroAssembler* masm) {

Label non_smi, slow, call_builtin;

GenerateSmiCodeSub(masm, &non_smi, &call_builtin);

__ bind(&non_smi);

@@ -1958,7 +1957,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateHeapNumberStubBitNot(

+void UnaryOpStub::GenerateHeapNumberStubBitNot(

Søren Thygesen Gjesse 2011/05/24 11:33:11 Fits one line?

fschneider 2011/05/24 12:16:41 Done.

MacroAssembler* masm) {

Label non_smi, slow;

GenerateSmiCodeBitNot(masm, &non_smi);

@@ -1968,7 +1967,7 @@

GenerateTypeTransition(masm);

}

-void TypeRecordingUnaryOpStub::GenerateHeapNumberCodeSub(MacroAssembler* masm,

+void UnaryOpStub::GenerateHeapNumberCodeSub(MacroAssembler* masm,

Søren Thygesen Gjesse 2011/05/24 11:33:11 Indentation.

fschneider 2011/05/24 12:16:41 Done.

Label* slow) {

EmitCheckForHeapNumber(masm, a0, a1, t2, slow);

// a0 is a heap number. Get a new heap number in a1.

@@ -2001,7 +2000,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateHeapNumberCodeBitNot(

+void UnaryOpStub::GenerateHeapNumberCodeBitNot(

Søren Thygesen Gjesse 2011/05/24 11:33:11 Reorganize arguments?

fschneider 2011/05/24 12:16:41 Done.

MacroAssembler* masm, Label* slow) {

EmitCheckForHeapNumber(masm, a0, a1, t2, slow);

// Convert the heap number in a0 to an untagged integer in a1.

@@ -2051,7 +2050,7 @@

// TODO(svenpanne): Use virtual functions instead of switch.

-void TypeRecordingUnaryOpStub::GenerateGenericStub(MacroAssembler* masm) {

+void UnaryOpStub::GenerateGenericStub(MacroAssembler* masm) {

switch (op_) {

case Token::SUB:

GenerateGenericStubSub(masm);

@@ -2065,7 +2064,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateGenericStubSub(MacroAssembler* masm) {

+void UnaryOpStub::GenerateGenericStubSub(MacroAssembler* masm) {

Label non_smi, slow;

GenerateSmiCodeSub(masm, &non_smi, &slow);

__ bind(&non_smi);

@@ -2075,7 +2074,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateGenericStubBitNot(MacroAssembler* masm) {

+void UnaryOpStub::GenerateGenericStubBitNot(MacroAssembler* masm) {

Label non_smi, slow;

GenerateSmiCodeBitNot(masm, &non_smi);

__ bind(&non_smi);

@@ -2085,7 +2084,7 @@

}

-void TypeRecordingUnaryOpStub::GenerateGenericCodeFallback(

+void UnaryOpStub::GenerateGenericCodeFallback(

MacroAssembler* masm) {

// Handle the slow case by jumping to the JavaScript builtin.

__ push(a0);

@@ -2102,15 +2101,15 @@

}

-Handle<Code> GetTypeRecordingBinaryOpStub(int key,

- TRBinaryOpIC::TypeInfo type_info,

- TRBinaryOpIC::TypeInfo result_type_info) {

- TypeRecordingBinaryOpStub stub(key, type_info, result_type_info);

+Handle<Code> GetBinaryOpStub(int key,

Søren Thygesen Gjesse 2011/05/24 11:33:11 Full indentation or int key on separate line.

fschneider 2011/05/24 12:16:41 Done.

+ BinaryOpIC::TypeInfo type_info,

+ BinaryOpIC::TypeInfo result_type_info) {

+ BinaryOpStub stub(key, type_info, result_type_info);

return stub.GetCode();

}

-void TypeRecordingBinaryOpStub::GenerateTypeTransition(MacroAssembler* masm) {

+void BinaryOpStub::GenerateTypeTransition(MacroAssembler* masm) {

Label get_result;

__ Push(a1, a0);

@@ -2121,43 +2120,43 @@

__ Push(a2, a1, a0);

__ TailCallExternalReference(

- ExternalReference(IC_Utility(IC::kTypeRecordingBinaryOp_Patch),

+ ExternalReference(IC_Utility(IC::kBinaryOp_Patch),

masm->isolate()),

1);

}

-void TypeRecordingBinaryOpStub::GenerateTypeTransitionWithSavedArgs(

+void BinaryOpStub::GenerateTypeTransitionWithSavedArgs(

MacroAssembler* masm) {

UNIMPLEMENTED();

}

-void TypeRecordingBinaryOpStub::Generate(MacroAssembler* masm) {

+void BinaryOpStub::Generate(MacroAssembler* masm) {

switch (operands_type_) {

- case TRBinaryOpIC::UNINITIALIZED:

+ case BinaryOpIC::UNINITIALIZED:

GenerateTypeTransition(masm);

break;

- case TRBinaryOpIC::SMI:

+ case BinaryOpIC::SMI:

GenerateSmiStub(masm);

break;

- case TRBinaryOpIC::INT32:

+ case BinaryOpIC::INT32:

GenerateInt32Stub(masm);

break;

- case TRBinaryOpIC::HEAP_NUMBER:

+ case BinaryOpIC::HEAP_NUMBER:

GenerateHeapNumberStub(masm);

break;

- case TRBinaryOpIC::ODDBALL:

+ case BinaryOpIC::ODDBALL:

GenerateOddballStub(masm);

break;

- case TRBinaryOpIC::BOTH_STRING:

+ case BinaryOpIC::BOTH_STRING:

GenerateBothStringStub(masm);

break;

- case TRBinaryOpIC::STRING:

+ case BinaryOpIC::STRING:

GenerateStringStub(masm);

break;

- case TRBinaryOpIC::GENERIC:

+ case BinaryOpIC::GENERIC:

GenerateGeneric(masm);

break;

default:

@@ -2166,7 +2165,7 @@

}

-const char* TypeRecordingBinaryOpStub::GetName() {

+const char* BinaryOpStub::GetName() {

if (name_ != NULL) return name_;

const int kMaxNameLength = 100;

name_ = Isolate::Current()->bootstrapper()->AllocateAutoDeletedArray(

@@ -2182,16 +2181,16 @@

}

OS::SNPrintF(Vector<char>(name_, kMaxNameLength),

- "TypeRecordingBinaryOpStub_%s_%s_%s",

+ "BinaryOpStub_%s_%s_%s",

op_name,

overwrite_name,

- TRBinaryOpIC::GetName(operands_type_));

+ BinaryOpIC::GetName(operands_type_));

return name_;

}

-void TypeRecordingBinaryOpStub::GenerateSmiSmiOperation(

+void BinaryOpStub::GenerateSmiSmiOperation(

Søren Thygesen Gjesse 2011/05/24 11:33:11 Fits one line?

fschneider 2011/05/24 12:16:41 Done.

MacroAssembler* masm) {

@@ -2346,7 +2345,7 @@

}

-void TypeRecordingBinaryOpStub::GenerateFPOperation(MacroAssembler* masm,

+void BinaryOpStub::GenerateFPOperation(MacroAssembler* masm,

Søren Thygesen Gjesse 2011/05/24 11:33:11 Indentation.

fschneider 2011/05/24 12:16:41 Done.

bool smi_operands,

Label* not_numbers,

Label* gc_required) {

@@ -2562,7 +2561,7 @@

// generated. If the result is not a smi and heap number allocation is not

// requested the code falls through. If number allocation is requested but a

// heap number cannot be allocated the code jumps to the lable gc_required.

-void TypeRecordingBinaryOpStub::GenerateSmiCode(MacroAssembler* masm,

+void BinaryOpStub::GenerateSmiCode(MacroAssembler* masm,

Søren Thygesen Gjesse 2011/05/24 11:33:11 MacroAssembler* masm, on separate line.

fschneider 2011/05/24 12:16:41 Done.

Label* use_runtime,

Label* gc_required,

SmiCodeGenerateHeapNumberResults allow_heapnumber_results) {

@@ -2590,11 +2589,11 @@

}

-void TypeRecordingBinaryOpStub::GenerateSmiStub(MacroAssembler* masm) {

+void BinaryOpStub::GenerateSmiStub(MacroAssembler* masm) {

Label not_smis, call_runtime;

- if (result_type_ == TRBinaryOpIC::UNINITIALIZED ||

- result_type_ == TRBinaryOpIC::SMI) {

+ if (result_type_ == BinaryOpIC::UNINITIALIZED ||

+ result_type_ == BinaryOpIC::SMI) {

// Only allow smi results.

GenerateSmiCode(masm, &call_runtime, NULL, NO_HEAPNUMBER_RESULTS);

} else {

@@ -2615,18 +2614,18 @@

}

-void TypeRecordingBinaryOpStub::GenerateStringStub(MacroAssembler* masm) {

- ASSERT(operands_type_ == TRBinaryOpIC::STRING);

+void BinaryOpStub::GenerateStringStub(MacroAssembler* masm) {

+ ASSERT(operands_type_ == BinaryOpIC::STRING);

// Try to add arguments as strings, otherwise, transition to the generic

- // TRBinaryOpIC type.

+ // BinaryOpIC type.

GenerateAddStrings(masm);

GenerateTypeTransition(masm);

}

-void TypeRecordingBinaryOpStub::GenerateBothStringStub(MacroAssembler* masm) {

+void BinaryOpStub::GenerateBothStringStub(MacroAssembler* masm) {

Label call_runtime;

- ASSERT(operands_type_ == TRBinaryOpIC::BOTH_STRING);

+ ASSERT(operands_type_ == BinaryOpIC::BOTH_STRING);

ASSERT(op_ == Token::ADD);

// If both arguments are strings, call the string add stub.

// Otherwise, do a transition.

@@ -2654,8 +2653,8 @@

}

-void TypeRecordingBinaryOpStub::GenerateInt32Stub(MacroAssembler* masm) {

- ASSERT(operands_type_ == TRBinaryOpIC::INT32);

+void BinaryOpStub::GenerateInt32Stub(MacroAssembler* masm) {

+ ASSERT(operands_type_ == BinaryOpIC::INT32);

@@ -2764,7 +2763,7 @@

__ srl(scratch2, scratch2, kFCSRFlagShift);

__ And(scratch2, scratch2, kFCSRFlagMask);

- if (result_type_ <= TRBinaryOpIC::INT32) {

+ if (result_type_ <= BinaryOpIC::INT32) {

// If scratch2 != 0, result does not fit in a 32-bit integer.

__ Branch(&transition, ne, scratch2, Operand(zero_reg));

}

@@ -2789,8 +2788,8 @@

// DIV just falls through to allocating a heap number.

}

- if (result_type_ >= (op_ == Token::DIV) ? TRBinaryOpIC::HEAP_NUMBER

- : TRBinaryOpIC::INT32) {

+ if (result_type_ >= (op_ == Token::DIV) ? BinaryOpIC::HEAP_NUMBER

+ : BinaryOpIC::INT32) {

__ bind(&return_heap_number);

// We are using FPU registers so s0 is available.

heap_number_result = s0;

@@ -2898,14 +2897,14 @@

// The non FPU code does not support this special case, so jump to

// runtime if we don't support it.

if (CpuFeatures::IsSupported(FPU)) {

- __ Branch((result_type_ <= TRBinaryOpIC::INT32)

+ __ Branch((result_type_ <= BinaryOpIC::INT32)

? &transition

: &return_heap_number,

lt,

a2,

Operand(zero_reg));

} else {

- __ Branch((result_type_ <= TRBinaryOpIC::INT32)

+ __ Branch((result_type_ <= BinaryOpIC::INT32)

? &transition

: &call_runtime,

lt,

@@ -2980,7 +2979,7 @@

}

-void TypeRecordingBinaryOpStub::GenerateOddballStub(MacroAssembler* masm) {

+void BinaryOpStub::GenerateOddballStub(MacroAssembler* masm) {

Label call_runtime;

if (op_ == Token::ADD) {

@@ -3013,7 +3012,7 @@

}

-void TypeRecordingBinaryOpStub::GenerateHeapNumberStub(MacroAssembler* masm) {

+void BinaryOpStub::GenerateHeapNumberStub(MacroAssembler* masm) {

Label call_runtime;

GenerateFPOperation(masm, false, &call_runtime, &call_runtime);

@@ -3022,7 +3021,7 @@

}

-void TypeRecordingBinaryOpStub::GenerateGeneric(MacroAssembler* masm) {

+void BinaryOpStub::GenerateGeneric(MacroAssembler* masm) {

Label call_runtime, call_string_add_or_runtime;

GenerateSmiCode(masm, &call_runtime, &call_runtime, ALLOW_HEAPNUMBER_RESULTS);

@@ -3039,7 +3038,7 @@

}

-void TypeRecordingBinaryOpStub::GenerateAddStrings(MacroAssembler* masm) {

+void BinaryOpStub::GenerateAddStrings(MacroAssembler* masm) {

ASSERT(op_ == Token::ADD);

Label left_not_string, call_runtime;

@@ -3070,7 +3069,7 @@

}

-void TypeRecordingBinaryOpStub::GenerateCallRuntime(MacroAssembler* masm) {

+void BinaryOpStub::GenerateCallRuntime(MacroAssembler* masm) {

GenerateRegisterArgsPush(masm);

switch (op_) {

case Token::ADD:

@@ -3112,7 +3111,7 @@

}

-void TypeRecordingBinaryOpStub::GenerateHeapResultAllocation(

+void BinaryOpStub::GenerateHeapResultAllocation(

MacroAssembler* masm,

@@ -3146,7 +3145,7 @@

}

-void TypeRecordingBinaryOpStub::GenerateRegisterArgsPush(MacroAssembler* masm) {

+void BinaryOpStub::GenerateRegisterArgsPush(MacroAssembler* masm) {

__ Push(a1, a0);

}

« src/ic.cc ('K') | « src/mips/code-stubs-mips.h ('k') | src/mips/full-codegen-mips.cc » ('j') | src/x64/code-stubs-x64.cc » ('J')