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

Side by Side Diff: src/arm/macro-assembler-arm.cc

Issue 14139033: Clean up VMState a little bit. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: fixed mistake Created 7 years, 8 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/api.cc ('k') | src/builtins.cc » ('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 2246 matching lines...) Expand 10 before | Expand all | Expand 10 after
2257 mov(r7, Operand(next_address)); 2257 mov(r7, Operand(next_address));
2258 ldr(r4, MemOperand(r7, kNextOffset)); 2258 ldr(r4, MemOperand(r7, kNextOffset));
2259 ldr(r5, MemOperand(r7, kLimitOffset)); 2259 ldr(r5, MemOperand(r7, kLimitOffset));
2260 ldr(r6, MemOperand(r7, kLevelOffset)); 2260 ldr(r6, MemOperand(r7, kLevelOffset));
2261 add(r6, r6, Operand(1)); 2261 add(r6, r6, Operand(1));
2262 str(r6, MemOperand(r7, kLevelOffset)); 2262 str(r6, MemOperand(r7, kLevelOffset));
2263 2263
2264 if (FLAG_log_timer_events) { 2264 if (FLAG_log_timer_events) {
2265 FrameScope frame(this, StackFrame::MANUAL); 2265 FrameScope frame(this, StackFrame::MANUAL);
2266 PushSafepointRegisters(); 2266 PushSafepointRegisters();
2267 PrepareCallCFunction(0, r0); 2267 PrepareCallCFunction(1, r0);
2268 CallCFunction(ExternalReference::log_enter_external_function(isolate()), 0); 2268 mov(r0, Operand(ExternalReference::isolate_address(isolate())));
2269 CallCFunction(ExternalReference::log_enter_external_function(isolate()), 1);
2269 PopSafepointRegisters(); 2270 PopSafepointRegisters();
2270 } 2271 }
2271 2272
2272 // Native call returns to the DirectCEntry stub which redirects to the 2273 // Native call returns to the DirectCEntry stub which redirects to the
2273 // return address pushed on stack (could have moved after GC). 2274 // return address pushed on stack (could have moved after GC).
2274 // DirectCEntry stub itself is generated early and never moves. 2275 // DirectCEntry stub itself is generated early and never moves.
2275 DirectCEntryStub stub; 2276 DirectCEntryStub stub;
2276 stub.GenerateCall(this, function); 2277 stub.GenerateCall(this, function);
2277 2278
2278 if (FLAG_log_timer_events) { 2279 if (FLAG_log_timer_events) {
2279 FrameScope frame(this, StackFrame::MANUAL); 2280 FrameScope frame(this, StackFrame::MANUAL);
2280 PushSafepointRegisters(); 2281 PushSafepointRegisters();
2281 PrepareCallCFunction(0, r0); 2282 PrepareCallCFunction(1, r0);
2282 CallCFunction(ExternalReference::log_leave_external_function(isolate()), 0); 2283 mov(r0, Operand(ExternalReference::isolate_address(isolate())));
2284 CallCFunction(ExternalReference::log_leave_external_function(isolate()), 1);
2283 PopSafepointRegisters(); 2285 PopSafepointRegisters();
2284 } 2286 }
2285 2287
2286 Label promote_scheduled_exception; 2288 Label promote_scheduled_exception;
2287 Label delete_allocated_handles; 2289 Label delete_allocated_handles;
2288 Label leave_exit_frame; 2290 Label leave_exit_frame;
2289 2291
2290 // If result is non-zero, dereference to get the result value 2292 // If result is non-zero, dereference to get the result value
2291 // otherwise set it to undefined. 2293 // otherwise set it to undefined.
2292 cmp(r0, Operand::Zero()); 2294 cmp(r0, Operand::Zero());
(...skipping 1525 matching lines...) Expand 10 before | Expand all | Expand 10 after
3818 void CodePatcher::EmitCondition(Condition cond) { 3820 void CodePatcher::EmitCondition(Condition cond) {
3819 Instr instr = Assembler::instr_at(masm_.pc_); 3821 Instr instr = Assembler::instr_at(masm_.pc_);
3820 instr = (instr & ~kCondMask) | cond; 3822 instr = (instr & ~kCondMask) | cond;
3821 masm_.emit(instr); 3823 masm_.emit(instr);
3822 } 3824 }
3823 3825
3824 3826
3825 } } // namespace v8::internal 3827 } } // namespace v8::internal
3826 3828
3827 #endif // V8_TARGET_ARCH_ARM 3829 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/api.cc ('k') | src/builtins.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698