зеркало из https://github.com/mozilla/pjs.git
timeless%mozdev.org
Родитель
18a51a1f6c
Коммит
dcd952cceb
|
|
@ -44,17 +44,40 @@ srcdir = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
CSRCS = jsdrefl.c jsdb.c
|
||||
CSRCS = jsdrefl.c \
|
||||
jsdb.c \
|
||||
../../src/js.c \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = jsdb.h
|
||||
|
||||
MODULE = jsd_refl
|
||||
LIBRARY_NAME = jsdr
|
||||
PROGRAM = jsdb$(BIN_SUFFIX)
|
||||
|
||||
REQUIRES = jsd mozjs
|
||||
REQUIRES = jsdebug js
|
||||
|
||||
MOZ_JSD_LIBS = ../jsd$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(MOZ_JSD_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(EXTRA_DSO_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef JS_THREADSAFE
|
||||
DEFINES += -DJS_THREADSAFE
|
||||
endif
|
||||
|
||||
DEFINES += -DJSDEBUGGER -DJSDEBUGGER_C_UI -DJSD_LOWLEVEL_SOURCE -DJSFILE
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs::
|
||||
$(INSTALL) $(IFLAGS2) ../jsd$(MOZ_BITS)$(VERSION_NUMBER)$(DLL_SUFFIX) $(DIST)/bin
|
||||
$(INSTALL) $(IFLAGS1) $(srcdir)/debugger.js $(DIST)/bin
|
||||
$(INSTALL) $(IFLAGS1) $(srcdir)/f.js $(DIST)/bin
|
||||
|
|
|
|||
|
|
@ -43,6 +43,11 @@
|
|||
#include "jsdbpriv.h"
|
||||
#include <errno.h>
|
||||
|
||||
#ifndef JS_THREADSAFE
|
||||
#define JS_BeginRequest(cx) (void)0
|
||||
#define JS_EndRequest(cx) (void)0
|
||||
#endif
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
JS_STATIC_DLL_CALLBACK(void)
|
||||
|
|
@ -89,6 +94,7 @@ jsdb_ScriptHookProc(JSDContext* jsdc,
|
|||
JSDB_Data* data = (JSDB_Data*) callerdata;
|
||||
JSFunction* fun;
|
||||
|
||||
JS_BeginRequest(data->cxDebugger);
|
||||
if(data->jsScriptHook &&
|
||||
NULL != (fun = JS_ValueToFunction(data->cxDebugger, data->jsScriptHook)))
|
||||
{
|
||||
|
|
@ -100,6 +106,7 @@ jsdb_ScriptHookProc(JSDContext* jsdc,
|
|||
|
||||
JS_CallFunction(data->cxDebugger, NULL, fun, 2, args, &result);
|
||||
}
|
||||
JS_EndRequest(data->cxDebugger);
|
||||
}
|
||||
|
||||
uintN JS_DLL_CALLBACK
|
||||
|
|
@ -120,6 +127,7 @@ jsdb_ExecHookHandler(JSDContext* jsdc,
|
|||
if(data->jsdthreadstate)
|
||||
return JSD_HOOK_RETURN_CONTINUE;
|
||||
|
||||
JS_BeginRequest(data->cxDebugger);
|
||||
if(!jsdb_SetThreadState(data, jsdthreadstate))
|
||||
goto label_bail;
|
||||
|
||||
|
|
@ -150,6 +158,7 @@ jsdb_ExecHookHandler(JSDContext* jsdc,
|
|||
|
||||
label_bail:
|
||||
jsdb_SetThreadState(data, NULL);
|
||||
JS_EndRequest(data->cxDebugger);
|
||||
return ourRetVal;
|
||||
}
|
||||
|
||||
|
|
@ -177,6 +186,7 @@ jsdb_ErrorReporter(JSDContext* jsdc,
|
|||
JSDB_Data* data = (JSDB_Data*) callerdata;
|
||||
JS_ASSERT(data);
|
||||
|
||||
JS_BeginRequest(data->cxDebugger);
|
||||
if(data->jsErrorReporterHook &&
|
||||
NULL != (fun = JS_ValueToFunction(data->cxDebugger,
|
||||
data->jsErrorReporterHook)))
|
||||
|
|
@ -205,6 +215,7 @@ jsdb_ErrorReporter(JSDContext* jsdc,
|
|||
if(JS_ValueToInt32(data->cxDebugger, result, &answer))
|
||||
ourRetVal = (uintN) answer;
|
||||
}
|
||||
JS_EndRequest(data->cxDebugger);
|
||||
return ourRetVal;
|
||||
}
|
||||
|
||||
|
|
@ -405,11 +416,20 @@ _initReturn(const char* str, JSBool retval)
|
|||
return retval;
|
||||
}
|
||||
|
||||
static JSBool
|
||||
_initReturn_cx(const char* str, JSBool retval, JSContext* cx)
|
||||
{
|
||||
JS_EndRequest(cx);
|
||||
return _initReturn(str, retval);
|
||||
}
|
||||
|
||||
#define MAX_DEBUGGER_DEPTH 3
|
||||
|
||||
JS_EXPORT_API(JSBool)
|
||||
JSDB_InitDebugger(JSRuntime* rt, JSDContext* jsdc, int depth)
|
||||
{
|
||||
JSContext* cx;
|
||||
JSObject* dbgObj;
|
||||
jsval rvalIgnore;
|
||||
static char load_deb[] = "load('debugger.js')";
|
||||
|
||||
|
|
@ -424,35 +444,36 @@ JSDB_InitDebugger(JSRuntime* rt, JSDContext* jsdc, int depth)
|
|||
if(!(data->rtDebugger = JS_NewRuntime(8L * 1024L * 1024L)))
|
||||
return _initReturn("debugger runtime creation error", JS_FALSE);
|
||||
|
||||
if(!(data->cxDebugger = JS_NewContext(data->rtDebugger, 8192)))
|
||||
if(!(data->cxDebugger = cx = JS_NewContext(data->rtDebugger, 8192)))
|
||||
return _initReturn("debugger creation error", JS_FALSE);
|
||||
|
||||
JS_SetContextPrivate(data->cxDebugger, data);
|
||||
JS_SetContextPrivate(cx, data);
|
||||
|
||||
JS_SetErrorReporter(data->cxDebugger, _ErrorReporter);
|
||||
JS_SetErrorReporter(cx, _ErrorReporter);
|
||||
|
||||
if(!(data->globDebugger =
|
||||
JS_NewObject(data->cxDebugger, &debugger_global_class, NULL, NULL)))
|
||||
return _initReturn("debugger global object creation error", JS_FALSE);
|
||||
JS_BeginRequest(cx);
|
||||
if(!(data->globDebugger = dbgObj =
|
||||
JS_NewObject(cx, &debugger_global_class, NULL, NULL)))
|
||||
return _initReturn_cx("debugger global object creation error", JS_FALSE, cx);
|
||||
|
||||
if(!JS_InitStandardClasses(data->cxDebugger, data->globDebugger))
|
||||
return _initReturn("debugger InitStandardClasses error", JS_FALSE);
|
||||
if(!JS_InitStandardClasses(cx, dbgObj))
|
||||
return _initReturn_cx("debugger InitStandardClasses error", JS_FALSE, cx);
|
||||
|
||||
if(!JS_DefineFunctions(data->cxDebugger, data->globDebugger, debugger_functions))
|
||||
return _initReturn("debugger DefineFunctions error", JS_FALSE);
|
||||
if(!JS_DefineFunctions(cx, dbgObj, debugger_functions))
|
||||
return _initReturn_cx("debugger DefineFunctions error", JS_FALSE, cx);
|
||||
|
||||
if(!jsdb_ReflectJSD(data))
|
||||
return _initReturn("debugger reflection of JSD API error", JS_FALSE);
|
||||
return _initReturn_cx("debugger reflection of JSD API error", JS_FALSE, cx);
|
||||
|
||||
if(data->debuggerDepth < MAX_DEBUGGER_DEPTH)
|
||||
{
|
||||
JSDContext* local_jsdc;
|
||||
if(!(local_jsdc = JSD_DebuggerOnForUser(data->rtDebugger, NULL, NULL)))
|
||||
return _initReturn("failed to create jsdc for nested debugger",
|
||||
JS_FALSE);
|
||||
JSD_JSContextInUse(local_jsdc, data->cxDebugger);
|
||||
return _initReturn_cx("failed to create jsdc for nested debugger",
|
||||
JS_FALSE, cx);
|
||||
JSD_JSContextInUse(local_jsdc, cx);
|
||||
if(!JSDB_InitDebugger(data->rtDebugger, local_jsdc, data->debuggerDepth))
|
||||
return _initReturn("failed to init nested debugger", JS_FALSE);
|
||||
return _initReturn_cx("failed to init nested debugger", JS_FALSE, cx);
|
||||
}
|
||||
|
||||
JSD_SetScriptHook(jsdc, jsdb_ScriptHookProc, data);
|
||||
|
|
@ -465,10 +486,10 @@ JSDB_InitDebugger(JSRuntime* rt, JSDContext* jsdc, int depth)
|
|||
JS_SetSourceHandler(data->rtDebugger, SendSourceToJSDebugger, jsdc);
|
||||
#endif /* JSD_LOWLEVEL_SOURCE */
|
||||
|
||||
JS_EvaluateScript(data->cxDebugger, data->globDebugger,
|
||||
JS_EvaluateScript(cx, dbgObj,
|
||||
load_deb, sizeof(load_deb)-1, "jsdb_autoload", 1,
|
||||
&rvalIgnore);
|
||||
|
||||
return _initReturn(NULL, JS_TRUE);
|
||||
return _initReturn_cx(NULL, JS_TRUE, cx);
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче