JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / bytecode / Watchpoint.cpp

diff --git a/bytecode/Watchpoint.cpp b/bytecode/Watchpoint.cpp
index 081654d5737abc6c83fcc1b9e795f003efb33ddb..3c5f93a83e84cd7268ee52b8dcf6e2d9398abb44 100644 (file)
--- a/bytecode/Watchpoint.cpp
+++ b/bytecode/Watchpoint.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -31,6 +31,11 @@
 
 namespace JSC {
 
 
 namespace JSC {
 

+void StringFireDetail::dump(PrintStream& out) const
+{
+    out.print(m_string);
+}
+

 Watchpoint::~Watchpoint()
 {
     if (isOnList())
 Watchpoint::~Watchpoint()
 {
     if (isOnList())


@@ -64,20 +69,25 @@ void WatchpointSet::add(Watchpoint* watchpoint)
     m_state = IsWatched;
 }
 
     m_state = IsWatched;
 }
 

-void WatchpointSet::fireAllSlow()
+void WatchpointSet::fireAllSlow(const FireDetail& detail)

 {
     ASSERT(state() == IsWatched);
     
     WTF::storeStoreFence();
 {
     ASSERT(state() == IsWatched);
     
     WTF::storeStoreFence();

-    fireAllWatchpoints();
+    fireAllWatchpoints(detail);

     m_state = IsInvalidated;
     WTF::storeStoreFence();
 }
 
     m_state = IsInvalidated;
     WTF::storeStoreFence();
 }
 

-void WatchpointSet::fireAllWatchpoints()
+void WatchpointSet::fireAllSlow(const char* reason)
+{
+    fireAllSlow(StringFireDetail(reason));
+}
+
+void WatchpointSet::fireAllWatchpoints(const FireDetail& detail)

 {
     while (!m_set.isEmpty())
 {
     while (!m_set.isEmpty())

-        m_set.begin()->fire();
+        m_set.begin()->fire(detail);

 }
 
 void InlineWatchpointSet::add(Watchpoint* watchpoint)
 }
 
 void InlineWatchpointSet::add(Watchpoint* watchpoint)


@@ -85,6 +95,11 @@ void InlineWatchpointSet::add(Watchpoint* watchpoint)
     inflate()->add(watchpoint);
 }
 
     inflate()->add(watchpoint);
 }
 

+void InlineWatchpointSet::fireAll(const char* reason)
+{
+    fireAll(StringFireDetail(reason));
+}
+

 WatchpointSet* InlineWatchpointSet::inflateSlow()
 {
     ASSERT(isThin());
 WatchpointSet* InlineWatchpointSet::inflateSlow()
 {
     ASSERT(isThin());