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

Side by Side Diff: src/arm/code-stubs-arm.cc

Issue 18050005: Fix ARM build break. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Now actually compiles on ARM XCompile. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 7105 matching lines...) Expand 10 before | Expand all | Expand 10 after
7116 7116
7117 // Align the stack if necessary. 7117 // Align the stack if necessary.
7118 int frame_alignment = masm->ActivationFrameAlignment(); 7118 int frame_alignment = masm->ActivationFrameAlignment();
7119 if (frame_alignment > kPointerSize) { 7119 if (frame_alignment > kPointerSize) {
7120 __ mov(r5, sp); 7120 __ mov(r5, sp);
7121 ASSERT(IsPowerOf2(frame_alignment)); 7121 ASSERT(IsPowerOf2(frame_alignment));
7122 __ and_(sp, sp, Operand(-frame_alignment)); 7122 __ and_(sp, sp, Operand(-frame_alignment));
7123 } 7123 }
7124 7124
7125 #if defined(V8_HOST_ARCH_ARM) 7125 #if defined(V8_HOST_ARCH_ARM)
7126 __ mov(ip, FUNCTION_ADDR(masm->isolate()->function_entry_hook()), 7126 int32_t entry_hook =
7127 RelocInfo::NONE)); 7127 reinterpret_cast<int32_t>(masm->isolate()->function_entry_hook());
7128 __ mov(ip, Operand(entry_hook));
7128 #else 7129 #else
7129 // Under the simulator we need to indirect the entry hook through a 7130 // Under the simulator we need to indirect the entry hook through a
7130 // trampoline function at a known address. 7131 // trampoline function at a known address.
7131 ApiFunction dispatcher(FUNCTION_ADDR(EntryHookTrampoline)); 7132 ApiFunction dispatcher(FUNCTION_ADDR(EntryHookTrampoline));
7132 __ mov(ip, Operand(ExternalReference(&dispatcher, 7133 __ mov(ip, Operand(ExternalReference(&dispatcher,
7133 ExternalReference::BUILTIN_CALL, 7134 ExternalReference::BUILTIN_CALL,
7134 masm->isolate()))); 7135 masm->isolate())));
7135 #endif 7136 #endif
7136 __ Call(ip); 7137 __ Call(ip);
7137 7138
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
7416 __ bind(&fast_elements_case); 7417 __ bind(&fast_elements_case);
7417 GenerateCase(masm, FAST_ELEMENTS); 7418 GenerateCase(masm, FAST_ELEMENTS);
7418 } 7419 }
7419 7420
7420 7421
7421 #undef __ 7422 #undef __
7422 7423
7423 } } // namespace v8::internal 7424 } } // namespace v8::internal
7424 7425
7425 #endif // V8_TARGET_ARCH_ARM 7426 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698