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

Side by Side Diff: src/execution.cc

Issue 116093006: Try fixing NaCl V8 compilation failure by initializing interrupt_callback_data_. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years 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 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 616
617 617
618 void StackGuard::ThreadLocal::Clear() { 618 void StackGuard::ThreadLocal::Clear() {
619 real_jslimit_ = kIllegalLimit; 619 real_jslimit_ = kIllegalLimit;
620 jslimit_ = kIllegalLimit; 620 jslimit_ = kIllegalLimit;
621 real_climit_ = kIllegalLimit; 621 real_climit_ = kIllegalLimit;
622 climit_ = kIllegalLimit; 622 climit_ = kIllegalLimit;
623 nesting_ = 0; 623 nesting_ = 0;
624 postpone_interrupts_nesting_ = 0; 624 postpone_interrupts_nesting_ = 0;
625 interrupt_flags_ = 0; 625 interrupt_flags_ = 0;
626 interrupt_callback_ = 0; 626 interrupt_callback_ = NULL;
627 interrupt_callback_data_ = NULL;
627 } 628 }
628 629
629 630
630 bool StackGuard::ThreadLocal::Initialize(Isolate* isolate) { 631 bool StackGuard::ThreadLocal::Initialize(Isolate* isolate) {
631 bool should_set_stack_limits = false; 632 bool should_set_stack_limits = false;
632 if (real_climit_ == kIllegalLimit) { 633 if (real_climit_ == kIllegalLimit) {
633 // Takes the address of the limit variable in order to find out where 634 // Takes the address of the limit variable in order to find out where
634 // the top of stack is right now. 635 // the top of stack is right now.
635 const uintptr_t kLimitSize = FLAG_stack_size * KB; 636 const uintptr_t kLimitSize = FLAG_stack_size * KB;
636 uintptr_t limit = reinterpret_cast<uintptr_t>(&limit) - kLimitSize; 637 uintptr_t limit = reinterpret_cast<uintptr_t>(&limit) - kLimitSize;
637 ASSERT(reinterpret_cast<uintptr_t>(&limit) > kLimitSize); 638 ASSERT(reinterpret_cast<uintptr_t>(&limit) > kLimitSize);
638 real_jslimit_ = SimulatorStack::JsLimitFromCLimit(isolate, limit); 639 real_jslimit_ = SimulatorStack::JsLimitFromCLimit(isolate, limit);
639 jslimit_ = SimulatorStack::JsLimitFromCLimit(isolate, limit); 640 jslimit_ = SimulatorStack::JsLimitFromCLimit(isolate, limit);
640 real_climit_ = limit; 641 real_climit_ = limit;
641 climit_ = limit; 642 climit_ = limit;
642 should_set_stack_limits = true; 643 should_set_stack_limits = true;
643 } 644 }
644 nesting_ = 0; 645 nesting_ = 0;
645 postpone_interrupts_nesting_ = 0; 646 postpone_interrupts_nesting_ = 0;
646 interrupt_flags_ = 0; 647 interrupt_flags_ = 0;
647 interrupt_callback_ = 0; 648 interrupt_callback_ = NULL;
649 interrupt_callback_data_ = NULL;
648 return should_set_stack_limits; 650 return should_set_stack_limits;
649 } 651 }
650 652
651 653
652 void StackGuard::ClearThread(const ExecutionAccess& lock) { 654 void StackGuard::ClearThread(const ExecutionAccess& lock) {
653 thread_local_.Clear(); 655 thread_local_.Clear();
654 isolate_->heap()->SetStackLimits(); 656 isolate_->heap()->SetStackLimits();
655 } 657 }
656 658
657 659
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 ASSERT(isolate->concurrent_recompilation_enabled()); 1017 ASSERT(isolate->concurrent_recompilation_enabled());
1016 stack_guard->Continue(INSTALL_CODE); 1018 stack_guard->Continue(INSTALL_CODE);
1017 isolate->optimizing_compiler_thread()->InstallOptimizedFunctions(); 1019 isolate->optimizing_compiler_thread()->InstallOptimizedFunctions();
1018 } 1020 }
1019 isolate->runtime_profiler()->OptimizeNow(); 1021 isolate->runtime_profiler()->OptimizeNow();
1020 return isolate->heap()->undefined_value(); 1022 return isolate->heap()->undefined_value();
1021 } 1023 }
1022 1024
1023 1025
1024 } } // namespace v8::internal 1026 } } // namespace v8::internal
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