| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index f0fafa5a8b4f099fc55b64c79adabec263817e5a..ada2a8ebad11eb5c524629eb78dc149b97bc890e 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -197,7 +197,7 @@ void FullCodeGenerator::Generate() {
|
| if (FLAG_harmony_scoping && info->scope()->is_global_scope()) {
|
| __ push(r1);
|
| __ Push(info->scope()->GetScopeInfo());
|
| - __ CallRuntime(Runtime::kHiddenNewGlobalContext, 2);
|
| + __ CallRuntime(Runtime::kNewGlobalContext, 2);
|
| } else if (heap_slots <= FastNewContextStub::kMaximumSlots) {
|
| FastNewContextStub stub(isolate(), heap_slots);
|
| __ CallStub(&stub);
|
| @@ -205,7 +205,7 @@ void FullCodeGenerator::Generate() {
|
| need_write_barrier = false;
|
| } else {
|
| __ push(r1);
|
| - __ CallRuntime(Runtime::kHiddenNewFunctionContext, 1);
|
| + __ CallRuntime(Runtime::kNewFunctionContext, 1);
|
| }
|
| function_in_register = false;
|
| // Context is returned in r0. It replaces the context passed to us.
|
| @@ -841,7 +841,7 @@ void FullCodeGenerator::VisitVariableDeclaration(
|
| __ mov(r0, Operand(Smi::FromInt(0))); // Indicates no initial value.
|
| __ Push(cp, r2, r1, r0);
|
| }
|
| - __ CallRuntime(Runtime::kHiddenDeclareContextSlot, 4);
|
| + __ CallRuntime(Runtime::kDeclareContextSlot, 4);
|
| break;
|
| }
|
| }
|
| @@ -897,7 +897,7 @@ void FullCodeGenerator::VisitFunctionDeclaration(
|
| __ Push(cp, r2, r1);
|
| // Push initial value for function declaration.
|
| VisitForStackValue(declaration->fun());
|
| - __ CallRuntime(Runtime::kHiddenDeclareContextSlot, 4);
|
| + __ CallRuntime(Runtime::kDeclareContextSlot, 4);
|
| break;
|
| }
|
| }
|
| @@ -969,7 +969,7 @@ void FullCodeGenerator::DeclareGlobals(Handle<FixedArray> pairs) {
|
| __ mov(r1, Operand(pairs));
|
| __ mov(r0, Operand(Smi::FromInt(DeclareGlobalsFlags())));
|
| __ Push(cp, r1, r0);
|
| - __ CallRuntime(Runtime::kHiddenDeclareGlobals, 3);
|
| + __ CallRuntime(Runtime::kDeclareGlobals, 3);
|
| // Return value is ignored.
|
| }
|
|
|
| @@ -977,7 +977,7 @@ void FullCodeGenerator::DeclareGlobals(Handle<FixedArray> pairs) {
|
| void FullCodeGenerator::DeclareModules(Handle<FixedArray> descriptions) {
|
| // Call the runtime to declare the modules.
|
| __ Push(descriptions);
|
| - __ CallRuntime(Runtime::kHiddenDeclareModules, 1);
|
| + __ CallRuntime(Runtime::kDeclareModules, 1);
|
| // Return value is ignored.
|
| }
|
|
|
| @@ -1329,7 +1329,7 @@ void FullCodeGenerator::EmitNewClosure(Handle<SharedFunctionInfo> info,
|
| __ LoadRoot(r1, pretenure ? Heap::kTrueValueRootIndex
|
| : Heap::kFalseValueRootIndex);
|
| __ Push(cp, r0, r1);
|
| - __ CallRuntime(Runtime::kHiddenNewClosure, 3);
|
| + __ CallRuntime(Runtime::kNewClosure, 3);
|
| }
|
| context()->Plug(r0);
|
| }
|
| @@ -1454,7 +1454,7 @@ void FullCodeGenerator::EmitDynamicLookupFastCase(Variable* var,
|
| __ b(ne, done);
|
| __ mov(r0, Operand(var->name()));
|
| __ push(r0);
|
| - __ CallRuntime(Runtime::kHiddenThrowReferenceError, 1);
|
| + __ CallRuntime(Runtime::kThrowReferenceError, 1);
|
| }
|
| }
|
| __ jmp(done);
|
| @@ -1532,7 +1532,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) {
|
| __ b(ne, &done);
|
| __ mov(r0, Operand(var->name()));
|
| __ push(r0);
|
| - __ CallRuntime(Runtime::kHiddenThrowReferenceError, 1);
|
| + __ CallRuntime(Runtime::kThrowReferenceError, 1);
|
| __ bind(&done);
|
| } else {
|
| // Uninitalized const bindings outside of harmony mode are unholed.
|
| @@ -1556,7 +1556,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) {
|
| __ bind(&slow);
|
| __ mov(r1, Operand(var->name()));
|
| __ Push(cp, r1); // Context and name.
|
| - __ CallRuntime(Runtime::kHiddenLoadContextSlot, 2);
|
| + __ CallRuntime(Runtime::kLoadContextSlot, 2);
|
| __ bind(&done);
|
| context()->Plug(r0);
|
| }
|
| @@ -1589,7 +1589,7 @@ void FullCodeGenerator::VisitRegExpLiteral(RegExpLiteral* expr) {
|
| __ mov(r2, Operand(expr->pattern()));
|
| __ mov(r1, Operand(expr->flags()));
|
| __ Push(r4, r3, r2, r1);
|
| - __ CallRuntime(Runtime::kHiddenMaterializeRegExpLiteral, 4);
|
| + __ CallRuntime(Runtime::kMaterializeRegExpLiteral, 4);
|
| __ mov(r5, r0);
|
|
|
| __ bind(&materialized);
|
| @@ -1601,7 +1601,7 @@ void FullCodeGenerator::VisitRegExpLiteral(RegExpLiteral* expr) {
|
| __ bind(&runtime_allocate);
|
| __ mov(r0, Operand(Smi::FromInt(size)));
|
| __ Push(r5, r0);
|
| - __ CallRuntime(Runtime::kHiddenAllocateInNewSpace, 1);
|
| + __ CallRuntime(Runtime::kAllocateInNewSpace, 1);
|
| __ pop(r5);
|
|
|
| __ bind(&allocated);
|
| @@ -1645,7 +1645,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| masm()->serializer_enabled() || flags != ObjectLiteral::kFastElements ||
|
| properties_count > FastCloneShallowObjectStub::kMaximumClonedProperties) {
|
| __ Push(r3, r2, r1, r0);
|
| - __ CallRuntime(Runtime::kHiddenCreateObjectLiteral, 4);
|
| + __ CallRuntime(Runtime::kCreateObjectLiteral, 4);
|
| } else {
|
| FastCloneShallowObjectStub stub(isolate(), properties_count);
|
| __ CallStub(&stub);
|
| @@ -1786,7 +1786,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
|
| if (expr->depth() > 1 || length > JSObject::kInitialMaxFastElementArray) {
|
| __ mov(r0, Operand(Smi::FromInt(flags)));
|
| __ Push(r3, r2, r1, r0);
|
| - __ CallRuntime(Runtime::kHiddenCreateArrayLiteral, 4);
|
| + __ CallRuntime(Runtime::kCreateArrayLiteral, 4);
|
| } else {
|
| FastCloneShallowArrayStub stub(isolate(), allocation_site_mode);
|
| __ CallStub(&stub);
|
| @@ -1978,7 +1978,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| __ cmp(sp, r1);
|
| __ b(eq, &post_runtime);
|
| __ push(r0); // generator object
|
| - __ CallRuntime(Runtime::kHiddenSuspendJSGeneratorObject, 1);
|
| + __ CallRuntime(Runtime::kSuspendJSGeneratorObject, 1);
|
| __ ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| __ bind(&post_runtime);
|
| __ pop(result_register());
|
| @@ -2044,7 +2044,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| __ mov(r1, cp);
|
| __ RecordWriteField(r0, JSGeneratorObject::kContextOffset, r1, r2,
|
| kLRHasBeenSaved, kDontSaveFPRegs);
|
| - __ CallRuntime(Runtime::kHiddenSuspendJSGeneratorObject, 1);
|
| + __ CallRuntime(Runtime::kSuspendJSGeneratorObject, 1);
|
| __ ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| __ pop(r0); // result
|
| EmitReturnSequence();
|
| @@ -2096,7 +2096,7 @@ void FullCodeGenerator::EmitGeneratorResume(Expression *generator,
|
| Expression *value,
|
| JSGeneratorObject::ResumeMode resume_mode) {
|
| // The value stays in r0, and is ultimately read by the resumed generator, as
|
| - // if CallRuntime(Runtime::kHiddenSuspendJSGeneratorObject) returned it. Or it
|
| + // if CallRuntime(Runtime::kSuspendJSGeneratorObject) returned it. Or it
|
| // is read to throw the value when the resumed generator is already closed.
|
| // r1 will hold the generator object until the activation has been resumed.
|
| VisitForStackValue(generator);
|
| @@ -2190,7 +2190,7 @@ void FullCodeGenerator::EmitGeneratorResume(Expression *generator,
|
| ASSERT(!result_register().is(r1));
|
| __ Push(r1, result_register());
|
| __ Push(Smi::FromInt(resume_mode));
|
| - __ CallRuntime(Runtime::kHiddenResumeJSGeneratorObject, 3);
|
| + __ CallRuntime(Runtime::kResumeJSGeneratorObject, 3);
|
| // Not reached: the runtime call returns elsewhere.
|
| __ stop("not-reached");
|
|
|
| @@ -2205,14 +2205,14 @@ void FullCodeGenerator::EmitGeneratorResume(Expression *generator,
|
| } else {
|
| // Throw the provided value.
|
| __ push(r0);
|
| - __ CallRuntime(Runtime::kHiddenThrow, 1);
|
| + __ CallRuntime(Runtime::kThrow, 1);
|
| }
|
| __ jmp(&done);
|
|
|
| // Throw error if we attempt to operate on a running generator.
|
| __ bind(&wrong_state);
|
| __ push(r1);
|
| - __ CallRuntime(Runtime::kHiddenThrowGeneratorStateError, 1);
|
| + __ CallRuntime(Runtime::kThrowGeneratorStateError, 1);
|
|
|
| __ bind(&done);
|
| context()->Plug(result_register());
|
| @@ -2230,7 +2230,7 @@ void FullCodeGenerator::EmitCreateIteratorResult(bool done) {
|
|
|
| __ bind(&gc_required);
|
| __ Push(Smi::FromInt(map->instance_size()));
|
| - __ CallRuntime(Runtime::kHiddenAllocateInNewSpace, 1);
|
| + __ CallRuntime(Runtime::kAllocateInNewSpace, 1);
|
| __ ldr(context_register(),
|
| MemOperand(fp, StandardFrameConstants::kContextOffset));
|
|
|
| @@ -2444,7 +2444,7 @@ void FullCodeGenerator::EmitCallStoreContextSlot(
|
| __ mov(r1, Operand(name));
|
| __ mov(r0, Operand(Smi::FromInt(strict_mode)));
|
| __ Push(cp, r1, r0); // Context, name, strict mode.
|
| - __ CallRuntime(Runtime::kHiddenStoreContextSlot, 4);
|
| + __ CallRuntime(Runtime::kStoreContextSlot, 4);
|
| }
|
|
|
|
|
| @@ -2462,7 +2462,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op) {
|
| __ push(r0);
|
| __ mov(r0, Operand(var->name()));
|
| __ Push(cp, r0); // Context and name.
|
| - __ CallRuntime(Runtime::kHiddenInitializeConstContextSlot, 3);
|
| + __ CallRuntime(Runtime::kInitializeConstContextSlot, 3);
|
| } else {
|
| ASSERT(var->IsStackAllocated() || var->IsContextSlot());
|
| Label skip;
|
| @@ -2487,7 +2487,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op) {
|
| __ b(ne, &assign);
|
| __ mov(r3, Operand(var->name()));
|
| __ push(r3);
|
| - __ CallRuntime(Runtime::kHiddenThrowReferenceError, 1);
|
| + __ CallRuntime(Runtime::kThrowReferenceError, 1);
|
| // Perform the assignment.
|
| __ bind(&assign);
|
| EmitStoreToStackLocalOrContextSlot(var, location);
|
| @@ -2681,7 +2681,7 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
|
|
|
| // Do the runtime call.
|
| __ Push(r4, r3, r2, r1);
|
| - __ CallRuntime(Runtime::kHiddenResolvePossiblyDirectEval, 5);
|
| + __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 5);
|
| }
|
|
|
|
|
| @@ -2755,7 +2755,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
| ASSERT(!context_register().is(r2));
|
| __ mov(r2, Operand(proxy->name()));
|
| __ Push(context_register(), r2);
|
| - __ CallRuntime(Runtime::kHiddenLoadContextSlot, 2);
|
| + __ CallRuntime(Runtime::kLoadContextSlot, 2);
|
| __ Push(r0, r1); // Function, receiver.
|
|
|
| // If fast case code has been generated, emit code to push the
|
| @@ -3384,7 +3384,7 @@ void FullCodeGenerator::EmitDateField(CallRuntime* expr) {
|
| }
|
|
|
| __ bind(¬_date_object);
|
| - __ CallRuntime(Runtime::kHiddenThrowNotDateError, 0);
|
| + __ CallRuntime(Runtime::kThrowNotDateError, 0);
|
| __ bind(&done);
|
| context()->Plug(r0);
|
| }
|
| @@ -3733,7 +3733,7 @@ void FullCodeGenerator::EmitGetFromCache(CallRuntime* expr) {
|
| __ bind(¬_found);
|
| // Call runtime to perform the lookup.
|
| __ Push(cache, key);
|
| - __ CallRuntime(Runtime::kHiddenGetFromCache, 2);
|
| + __ CallRuntime(Runtime::kGetFromCache, 2);
|
|
|
| __ bind(&done);
|
| context()->Plug(r0);
|
| @@ -4112,7 +4112,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) {
|
| ASSERT(!context_register().is(r2));
|
| __ mov(r2, Operand(var->name()));
|
| __ Push(context_register(), r2);
|
| - __ CallRuntime(Runtime::kHiddenDeleteContextSlot, 2);
|
| + __ CallRuntime(Runtime::kDeleteContextSlot, 2);
|
| context()->Plug(r0);
|
| }
|
| } else {
|
| @@ -4389,7 +4389,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) {
|
| __ bind(&slow);
|
| __ mov(r0, Operand(proxy->name()));
|
| __ Push(cp, r0);
|
| - __ CallRuntime(Runtime::kHiddenLoadContextSlotNoReferenceError, 2);
|
| + __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2);
|
| PrepareForBailout(expr, TOS_REG);
|
| __ bind(&done);
|
|
|
|
|