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

Side by Side Diff: src/debug.cc

Issue 8117001: Remove #include "isolate-inl.h" from v8.h. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 2 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/debug.h ('k') | src/execution.cc » ('j') | src/frames.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 22 matching lines...) Expand all
33 #include "code-stubs.h" 33 #include "code-stubs.h"
34 #include "codegen.h" 34 #include "codegen.h"
35 #include "compilation-cache.h" 35 #include "compilation-cache.h"
36 #include "compiler.h" 36 #include "compiler.h"
37 #include "debug.h" 37 #include "debug.h"
38 #include "deoptimizer.h" 38 #include "deoptimizer.h"
39 #include "execution.h" 39 #include "execution.h"
40 #include "global-handles.h" 40 #include "global-handles.h"
41 #include "ic.h" 41 #include "ic.h"
42 #include "ic-inl.h" 42 #include "ic-inl.h"
43 #include "isolate-inl.h"
43 #include "list.h" 44 #include "list.h"
44 #include "messages.h" 45 #include "messages.h"
45 #include "natives.h" 46 #include "natives.h"
46 #include "stub-cache.h" 47 #include "stub-cache.h"
47 #include "log.h" 48 #include "log.h"
48 49
49 #include "../include/v8-debug.h" 50 #include "../include/v8-debug.h"
50 51
51 namespace v8 { 52 namespace v8 {
52 namespace internal { 53 namespace internal {
(...skipping 2877 matching lines...) Expand 10 before | Expand all | Expand 10 after
2930 { 2931 {
2931 ScopedLock with(dispatch_handler_access_); 2932 ScopedLock with(dispatch_handler_access_);
2932 handler = Debugger::debug_message_dispatch_handler_; 2933 handler = Debugger::debug_message_dispatch_handler_;
2933 } 2934 }
2934 if (handler != NULL) { 2935 if (handler != NULL) {
2935 handler(); 2936 handler();
2936 } 2937 }
2937 } 2938 }
2938 2939
2939 2940
2941 EnterDebugger::EnterDebugger()
2942 : isolate_(Isolate::Current()),
2943 prev_(isolate_->debug()->debugger_entry()),
2944 it_(isolate_),
2945 has_js_frames_(!it_.done()),
2946 save_(isolate_) {
2947 Debug* debug = isolate_->debug();
2948 ASSERT(prev_ != NULL || !debug->is_interrupt_pending(PREEMPT));
2949 ASSERT(prev_ != NULL || !debug->is_interrupt_pending(DEBUGBREAK));
2950
2951 // Link recursive debugger entry.
2952 debug->set_debugger_entry(this);
2953
2954 // Store the previous break id and frame id.
2955 break_id_ = debug->break_id();
2956 break_frame_id_ = debug->break_frame_id();
2957
2958 // Create the new break info. If there is no JavaScript frames there is no
2959 // break frame id.
2960 if (has_js_frames_) {
2961 debug->NewBreak(it_.frame()->id());
2962 } else {
2963 debug->NewBreak(StackFrame::NO_ID);
2964 }
2965
2966 // Make sure that debugger is loaded and enter the debugger context.
2967 load_failed_ = !debug->Load();
2968 if (!load_failed_) {
2969 // NOTE the member variable save which saves the previous context before
2970 // this change.
2971 isolate_->set_context(*debug->debug_context());
2972 }
2973 }
2974
2975
2976 EnterDebugger::~EnterDebugger() {
2977 ASSERT(Isolate::Current() == isolate_);
2978 Debug* debug = isolate_->debug();
2979
2980 // Restore to the previous break state.
2981 debug->SetBreak(break_frame_id_, break_id_);
2982
2983 // Check for leaving the debugger.
2984 if (prev_ == NULL) {
2985 // Clear mirror cache when leaving the debugger. Skip this if there is a
2986 // pending exception as clearing the mirror cache calls back into
2987 // JavaScript. This can happen if the v8::Debug::Call is used in which
2988 // case the exception should end up in the calling code.
2989 if (!isolate_->has_pending_exception()) {
2990 // Try to avoid any pending debug break breaking in the clear mirror
2991 // cache JavaScript code.
2992 if (isolate_->stack_guard()->IsDebugBreak()) {
2993 debug->set_interrupts_pending(DEBUGBREAK);
2994 isolate_->stack_guard()->Continue(DEBUGBREAK);
2995 }
2996 debug->ClearMirrorCache();
2997 }
2998
2999 // Request preemption and debug break when leaving the last debugger entry
3000 // if any of these where recorded while debugging.
3001 if (debug->is_interrupt_pending(PREEMPT)) {
3002 // This re-scheduling of preemption is to avoid starvation in some
3003 // debugging scenarios.
3004 debug->clear_interrupt_pending(PREEMPT);
3005 isolate_->stack_guard()->Preempt();
3006 }
3007 if (debug->is_interrupt_pending(DEBUGBREAK)) {
3008 debug->clear_interrupt_pending(DEBUGBREAK);
3009 isolate_->stack_guard()->DebugBreak();
3010 }
3011
3012 // If there are commands in the queue when leaving the debugger request
3013 // that these commands are processed.
3014 if (isolate_->debugger()->HasCommands()) {
3015 isolate_->stack_guard()->DebugCommand();
3016 }
3017
3018 // If leaving the debugger with the debugger no longer active unload it.
3019 if (!isolate_->debugger()->IsDebuggerActive()) {
3020 isolate_->debugger()->UnloadDebugger();
3021 }
3022 }
3023
3024 // Leaving this debugger entry.
3025 debug->set_debugger_entry(prev_);
3026 }
3027
3028
2940 MessageImpl MessageImpl::NewEvent(DebugEvent event, 3029 MessageImpl MessageImpl::NewEvent(DebugEvent event,
2941 bool running, 3030 bool running,
2942 Handle<JSObject> exec_state, 3031 Handle<JSObject> exec_state,
2943 Handle<JSObject> event_data) { 3032 Handle<JSObject> event_data) {
2944 MessageImpl message(true, event, running, 3033 MessageImpl message(true, event, running,
2945 exec_state, event_data, Handle<String>(), NULL); 3034 exec_state, event_data, Handle<String>(), NULL);
2946 return message; 3035 return message;
2947 } 3036 }
2948 3037
2949 3038
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
3232 { 3321 {
3233 Locker locker; 3322 Locker locker;
3234 Isolate::Current()->debugger()->CallMessageDispatchHandler(); 3323 Isolate::Current()->debugger()->CallMessageDispatchHandler();
3235 } 3324 }
3236 } 3325 }
3237 } 3326 }
3238 3327
3239 #endif // ENABLE_DEBUGGER_SUPPORT 3328 #endif // ENABLE_DEBUGGER_SUPPORT
3240 3329
3241 } } // namespace v8::internal 3330 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/debug.h ('k') | src/execution.cc » ('j') | src/frames.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698