mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disables the JS debugger.

Browse Source 
It's completely broken since 4b1297b328 and will have to be updated for
the new SpiderMonkey API.
I only uncomment it at the moment because I plan to fix/reimplement it
soon after the upgrade.

Closes #2348
Refs #2241
Refs #1886

This was SVN commit r14506.
This commit is contained in:
Yves
2014-01-04 20:47:56 +00:00
parent da1a2eaba6
commit 7d516e7e7a
6 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/DebuggingServer.cpp
+4 -1
View File
@@ -14,7 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
// JS debugger temporarily disabled during the SpiderMonkey upgrade (check trac ticket #2348 for details)
/*
#include "precompiled.h"
#include "DebuggingServer.h"
@@ -566,3 +568,4 @@ void CDebuggingServer::ReleaseBreakPointAccess(double breakPointsLockID)
ENSURE(m_BreakPointsLockID == breakPointsLockID);
SDL_SemPost(m_BreakPointsSem);
}
*/
source/scriptinterface/ScriptInterface.cpp
+6 -3
View File
@@ -566,13 +566,15 @@ ScriptInterface::ScriptInterface(const char* nativeScopeName, const char* debugN
g_ScriptStatsTable->Add(this, debugName);
}
// JS debugger temporarily disabled during the SpiderMonkey upgrade (check trac ticket #2348 for details)
/*
if (g_JSDebuggerEnabled && g_DebuggingServer != NULL)
{
if(!JS_SetDebugMode(GetContext(), true))
LOGERROR(L"Failed to set Spidermonkey to debug mode!");
else
g_DebuggingServer->RegisterScriptinterface(debugName, this);
}
} */
m_CxPrivate.pScriptInterface = this;
JS_SetContextPrivate(m->m_cx, (void*)&m_CxPrivate);
@@ -587,8 +589,9 @@ ScriptInterface::~ScriptInterface()
}
// Unregister from the Debugger class
if (g_JSDebuggerEnabled && g_DebuggingServer != NULL)
g_DebuggingServer->UnRegisterScriptinterface(this);
// JS debugger temporarily disabled during the SpiderMonkey upgrade (check trac ticket #2348 for details)
//if (g_JSDebuggerEnabled && g_DebuggingServer != NULL)
// g_DebuggingServer->UnRegisterScriptinterface(this);
}
void ScriptInterface::ShutDown()
source/scriptinterface/ThreadDebugger.cpp
+5 -2
View File
@@ -15,6 +15,8 @@
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
// JS debugger temporarily disabled during the SpiderMonkey upgrade (check trac ticket #2348 for details)
/*
#include "precompiled.h"
#include "ThreadDebugger.h"
@@ -757,7 +759,7 @@ void CThreadDebugger::SaveStackFrameData(STACK_INFO stackInfo, uint nestingLevel
}
}
}
*/
/*
* TODO: This is very hacky and ugly and should be improved.
@@ -772,6 +774,7 @@ void CThreadDebugger::SaveStackFrameData(STACK_INFO stackInfo, uint nestingLevel
* the rest of the game and because this part of code should be replaced anyway in the future.
*/
/*
namespace CyclicRefWorkaround
{
std::set<JSObject*> g_ProcessedObjects;
@@ -933,4 +936,4 @@ uint CThreadDebugger::GetID()
CScopeLock lock(m->m_Mutex);
return m->m_ID;
}
*/