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

Side by Side Diff: src/arm/full-codegen-arm.cc

Issue 10787017: Fix missing tagging of stack value in finally block. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 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 | src/ia32/full-codegen-ia32.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 4491 matching lines...) Expand 10 before | Expand all | Expand 10 after
4502 ExternalReference pending_message_obj = 4502 ExternalReference pending_message_obj =
4503 ExternalReference::address_of_pending_message_obj(isolate()); 4503 ExternalReference::address_of_pending_message_obj(isolate());
4504 __ mov(ip, Operand(pending_message_obj)); 4504 __ mov(ip, Operand(pending_message_obj));
4505 __ ldr(r1, MemOperand(ip)); 4505 __ ldr(r1, MemOperand(ip));
4506 __ push(r1); 4506 __ push(r1);
4507 4507
4508 ExternalReference has_pending_message = 4508 ExternalReference has_pending_message =
4509 ExternalReference::address_of_has_pending_message(isolate()); 4509 ExternalReference::address_of_has_pending_message(isolate());
4510 __ mov(ip, Operand(has_pending_message)); 4510 __ mov(ip, Operand(has_pending_message));
4511 __ ldr(r1, MemOperand(ip)); 4511 __ ldr(r1, MemOperand(ip));
4512 __ SmiTag(r1);
4512 __ push(r1); 4513 __ push(r1);
4513 4514
4514 ExternalReference pending_message_script = 4515 ExternalReference pending_message_script =
4515 ExternalReference::address_of_pending_message_script(isolate()); 4516 ExternalReference::address_of_pending_message_script(isolate());
4516 __ mov(ip, Operand(pending_message_script)); 4517 __ mov(ip, Operand(pending_message_script));
4517 __ ldr(r1, MemOperand(ip)); 4518 __ ldr(r1, MemOperand(ip));
4518 __ push(r1); 4519 __ push(r1);
4519 } 4520 }
4520 4521
4521 4522
4522 void FullCodeGenerator::ExitFinallyBlock() { 4523 void FullCodeGenerator::ExitFinallyBlock() {
4523 ASSERT(!result_register().is(r1)); 4524 ASSERT(!result_register().is(r1));
4524 // Restore pending message from stack. 4525 // Restore pending message from stack.
4525 __ pop(r1); 4526 __ pop(r1);
4526 ExternalReference pending_message_script = 4527 ExternalReference pending_message_script =
4527 ExternalReference::address_of_pending_message_script(isolate()); 4528 ExternalReference::address_of_pending_message_script(isolate());
4528 __ mov(ip, Operand(pending_message_script)); 4529 __ mov(ip, Operand(pending_message_script));
4529 __ str(r1, MemOperand(ip)); 4530 __ str(r1, MemOperand(ip));
4530 4531
4531 __ pop(r1); 4532 __ pop(r1);
4533 __ SmiUntag(r1);
4532 ExternalReference has_pending_message = 4534 ExternalReference has_pending_message =
4533 ExternalReference::address_of_has_pending_message(isolate()); 4535 ExternalReference::address_of_has_pending_message(isolate());
4534 __ mov(ip, Operand(has_pending_message)); 4536 __ mov(ip, Operand(has_pending_message));
4535 __ str(r1, MemOperand(ip)); 4537 __ str(r1, MemOperand(ip));
4536 4538
4537 __ pop(r1); 4539 __ pop(r1);
4538 ExternalReference pending_message_obj = 4540 ExternalReference pending_message_obj =
4539 ExternalReference::address_of_pending_message_obj(isolate()); 4541 ExternalReference::address_of_pending_message_obj(isolate());
4540 __ mov(ip, Operand(pending_message_obj)); 4542 __ mov(ip, Operand(pending_message_obj));
4541 __ str(r1, MemOperand(ip)); 4543 __ str(r1, MemOperand(ip));
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
4577 *context_length = 0; 4579 *context_length = 0;
4578 return previous_; 4580 return previous_;
4579 } 4581 }
4580 4582
4581 4583
4582 #undef __ 4584 #undef __
4583 4585
4584 } } // namespace v8::internal 4586 } } // namespace v8::internal
4585 4587
4586 #endif // V8_TARGET_ARCH_ARM 4588 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/full-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698