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

Side by Side Diff: src/arm/stub-cache-arm.cc

Issue 15484006: fix arm simulator after 14725 (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/arm/simulator-arm.cc ('k') | src/assembler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 __ str(ip, MemOperand(r0, 2 * kPointerSize)); 930 __ str(ip, MemOperand(r0, 2 * kPointerSize));
931 // v8::Arguments::is_construct_call = 0 931 // v8::Arguments::is_construct_call = 0
932 __ mov(ip, Operand::Zero()); 932 __ mov(ip, Operand::Zero());
933 __ str(ip, MemOperand(r0, 3 * kPointerSize)); 933 __ str(ip, MemOperand(r0, 3 * kPointerSize));
934 934
935 const int kStackUnwindSpace = argc + kFastApiCallArguments + 1; 935 const int kStackUnwindSpace = argc + kFastApiCallArguments + 1;
936 Address function_address = v8::ToCData<Address>(api_call_info->callback()); 936 Address function_address = v8::ToCData<Address>(api_call_info->callback());
937 bool returns_handle = 937 bool returns_handle =
938 !CallbackTable::ReturnsVoid(masm->isolate(), function_address); 938 !CallbackTable::ReturnsVoid(masm->isolate(), function_address);
939 ApiFunction fun(function_address); 939 ApiFunction fun(function_address);
940 ExternalReference::Type type =
941 returns_handle ?
942 ExternalReference::DIRECT_API_CALL :
943 ExternalReference::DIRECT_API_CALL_NEW;
940 ExternalReference ref = ExternalReference(&fun, 944 ExternalReference ref = ExternalReference(&fun,
941 ExternalReference::DIRECT_API_CALL, 945 type,
942 masm->isolate()); 946 masm->isolate());
943 AllowExternalCallThatCantCauseGC scope(masm); 947 AllowExternalCallThatCantCauseGC scope(masm);
944 __ CallApiFunctionAndReturn(ref, 948 __ CallApiFunctionAndReturn(ref,
945 kStackUnwindSpace, 949 kStackUnwindSpace,
946 returns_handle, 950 returns_handle,
947 kFastApiCallArguments + 1); 951 kFastApiCallArguments + 1);
948 } 952 }
949 953
950 954
951 class CallInterceptorCompiler BASE_EMBEDDED { 955 class CallInterceptorCompiler BASE_EMBEDDED {
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 // Create AccessorInfo instance on the stack above the exit frame with 1435 // Create AccessorInfo instance on the stack above the exit frame with
1432 // scratch2 (internal::Object** args_) as the data. 1436 // scratch2 (internal::Object** args_) as the data.
1433 __ str(scratch2(), MemOperand(sp, 1 * kPointerSize)); 1437 __ str(scratch2(), MemOperand(sp, 1 * kPointerSize));
1434 __ add(r1, sp, Operand(1 * kPointerSize)); // r1 = AccessorInfo& 1438 __ add(r1, sp, Operand(1 * kPointerSize)); // r1 = AccessorInfo&
1435 1439
1436 const int kStackUnwindSpace = kFastApiCallArguments + 1; 1440 const int kStackUnwindSpace = kFastApiCallArguments + 1;
1437 Address getter_address = v8::ToCData<Address>(callback->getter()); 1441 Address getter_address = v8::ToCData<Address>(callback->getter());
1438 bool returns_handle = 1442 bool returns_handle =
1439 !CallbackTable::ReturnsVoid(isolate(), getter_address); 1443 !CallbackTable::ReturnsVoid(isolate(), getter_address);
1440 ApiFunction fun(getter_address); 1444 ApiFunction fun(getter_address);
1441 ExternalReference ref = ExternalReference( 1445 ExternalReference::Type type =
1442 &fun, ExternalReference::DIRECT_GETTER_CALL, isolate()); 1446 returns_handle ?
1447 ExternalReference::DIRECT_GETTER_CALL :
1448 ExternalReference::DIRECT_GETTER_CALL_NEW;
1449
1450 ExternalReference ref = ExternalReference(&fun, type, isolate());
1443 __ CallApiFunctionAndReturn(ref, 1451 __ CallApiFunctionAndReturn(ref,
1444 kStackUnwindSpace, 1452 kStackUnwindSpace,
1445 returns_handle, 1453 returns_handle,
1446 3); 1454 3);
1447 } 1455 }
1448 1456
1449 1457
1450 void BaseLoadStubCompiler::GenerateLoadInterceptor( 1458 void BaseLoadStubCompiler::GenerateLoadInterceptor(
1451 Register holder_reg, 1459 Register holder_reg,
1452 Handle<JSObject> object, 1460 Handle<JSObject> object,
(...skipping 2310 matching lines...) Expand 10 before | Expand all | Expand 10 after
3763 TailCallBuiltin(masm, Builtins::kKeyedStoreIC_Slow); 3771 TailCallBuiltin(masm, Builtins::kKeyedStoreIC_Slow);
3764 } 3772 }
3765 } 3773 }
3766 3774
3767 3775
3768 #undef __ 3776 #undef __
3769 3777
3770 } } // namespace v8::internal 3778 } } // namespace v8::internal
3771 3779
3772 #endif // V8_TARGET_ARCH_ARM 3780 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/simulator-arm.cc ('k') | src/assembler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698