mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 785096: part3: Removing ccx from codegen/qsgen. r=bholley

This commit is contained in:
Gabor Krizsanits 2012-09-20 15:04:28 +02:00
Родитель dc6a0acf70
Коммит aac50ebea7
3 изменённых файлов: 35 добавлений и 86 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

25
js/xpconnect/src/codegen.py
Просмотреть файл

@ -161,7 +161,7 @@ argumentUnboxingTemplates = {
# `null`; this behavior is from XPCWrappedNative::CallMethod. The 'jsval' type,
# however, defaults to 'undefined'.
#
def writeArgumentUnboxing(f, i, name, type, haveCcx, optional, rvdeclared,
def writeArgumentUnboxing(f, i, name, type, optional, rvdeclared,
nullBehavior, undefinedBehavior):
# f - file to write to
# i - int or None - Indicates the source jsval. If i is an int, the source
@ -232,8 +232,6 @@ def writeArgumentUnboxing(f, i, name, type, haveCcx, optional, rvdeclared,
if isSetter:
f.write(" xpc_qsThrowBadSetterValue("
"cx, rv, JSVAL_TO_OBJECT(*tvr.jsval_addr()), id);\n")
elif haveCcx:
f.write(" xpc_qsThrowBadArgWithCcx(ccx, rv, %d);\n" % i)
else:
f.write(" xpc_qsThrowBadArgWithDetails(cx, rv, %d, %s, %s);\n" % (i, "\"\"", "\"\""))
f.write(" return JS_FALSE;\n"
@ -390,12 +388,6 @@ def writeResultConv(f, type, interfaceResultTemplate, jsvalPtr, jsvalRef):
% jsvalRef)
f.write(" return xpc_qsThrow(cx, NS_ERROR_UNEXPECTED); // FIXME\n")
def anyParamRequiresCcx(member):
return False
def memberNeedsCcx(member):
return member.kind == 'method' and anyParamRequiresCcx(member)
def validateParam(member, param):
def pfail(msg):
raise UserError(
@ -522,15 +514,7 @@ def writeStub(f, customMethodCalls, member, stubName, writeThisUnwrapping, write
" if (!obj)\n"
" return JS_FALSE;\n")
# Create ccx if needed.
haveCcx = memberNeedsCcx(member)
if haveCcx:
f.write(" XPCCallContext ccx(JS_CALLER, cx, obj, "
"JSVAL_TO_OBJECT(JS_CALLEE(cx, vp)));\n")
if isInterfaceType(member.realtype):
f.write(" XPCLazyCallContext lccx(ccx);\n")
selfname = writeThisUnwrapping(f, member, isMethod, isGetter, customMethodCall, haveCcx)
selfname = writeThisUnwrapping(f, member, isMethod, isGetter, customMethodCall)
rvdeclared = False
if isMethod:
@ -560,7 +544,6 @@ def writeStub(f, customMethodCalls, member, stubName, writeThisUnwrapping, write
# Emit code to convert this argument from jsval.
rvdeclared = writeArgumentUnboxing(
f, i, argName, realtype,
haveCcx=haveCcx,
optional=param.optional,
rvdeclared=rvdeclared,
nullBehavior=param.null,
@ -569,7 +552,7 @@ def writeStub(f, customMethodCalls, member, stubName, writeThisUnwrapping, write
f.write(" nsWrapperCache *cache;\n")
elif isSetter:
rvdeclared = writeArgumentUnboxing(f, None, 'arg0', member.realtype,
haveCcx=False, optional=False,
optional=False,
rvdeclared=rvdeclared,
nullBehavior=member.null,
undefinedBehavior=member.undefined)
@ -643,7 +626,7 @@ def writeStub(f, customMethodCalls, member, stubName, writeThisUnwrapping, write
if canFail:
# Check for errors.
writeCheckForFailure(f, isMethod, isGetter, haveCcx)
writeCheckForFailure(f, isMethod, isGetter)
# Convert the return value.
if isMethod or isGetter:

4
js/xpconnect/src/dombindingsgen.py
Просмотреть файл

@ -573,7 +573,7 @@ listTemplateFooter = (
"\n")
def writeBindingStub(f, classname, member, stubName, isSetter=False):
def writeThisUnwrapping(f, member, isMethod, isGetter, customMethodCall, haveCcx):
def writeThisUnwrapping(f, member, isMethod, isGetter, customMethodCall):
if isMethod:
f.write(" JSObject *callee = JSVAL_TO_OBJECT(JS_CALLEE(cx, vp));\n"
" if (!%sWrapper::instanceIsListObject(cx, obj, callee))\n"
@ -582,7 +582,7 @@ def writeBindingStub(f, classname, member, stubName, isSetter=False):
f.write(" if (!%sWrapper::instanceIsListObject(cx, obj, NULL))\n"
" return false;\n" % classname)
return "%sWrapper::getListObject(obj)" % classname
def writeCheckForFailure(f, isMethod, isGeter, haveCcx):
def writeCheckForFailure(f, isMethod, isGeter):
f.write(" if (NS_FAILED(rv))\n"
" return xpc_qsThrowMethodFailedWithDetails(cx, rv, \"%s\", \"%s\");\n" % (classname, member.name))
def writeResultWrapping(f, member, jsvalPtr, jsvalRef):

40
js/xpconnect/src/qsgen.py
Просмотреть файл

@ -490,7 +490,7 @@ argumentUnboxingTemplates = {
# `null`; this behavior is from XPCWrappedNative::CallMethod. The 'jsval' type,
# however, defaults to 'undefined'.
#
def writeArgumentUnboxing(f, i, name, type, haveCcx, optional, rvdeclared,
def writeArgumentUnboxing(f, i, name, type, optional, rvdeclared,
nullBehavior, undefinedBehavior):
# f - file to write to
# i - int or None - Indicates the source jsval. If i is an int, the source
@ -561,8 +561,6 @@ def writeArgumentUnboxing(f, i, name, type, haveCcx, optional, rvdeclared,
if isSetter:
f.write(" xpc_qsThrowBadSetterValue("
"cx, rv, JSVAL_TO_OBJECT(*tvr.jsval_addr()), id);\n")
elif haveCcx:
f.write(" xpc_qsThrowBadArgWithCcx(ccx, rv, %d);\n" % i)
else:
f.write(" xpc_qsThrowBadArg(cx, rv, vp, %d);\n" % i)
f.write(" return JS_FALSE;\n"
@ -723,14 +721,8 @@ def writeResultConv(f, type, jsvalPtr, jsvalRef):
% jsvalRef)
f.write(" return xpc_qsThrow(cx, NS_ERROR_UNEXPECTED); // FIXME\n")
def anyParamRequiresCcx(member):
return False
def memberNeedsCcx(member):
return member.kind == 'method' and anyParamRequiresCcx(member)
def memberNeedsCallee(member):
return memberNeedsCcx(member) or isInterfaceType(member.realtype)
return isInterfaceType(member.realtype)
def validateParam(member, param):
def pfail(msg):
@ -851,33 +843,12 @@ def writeQuickStub(f, customMethodCalls, member, stubName, isSetter=False):
" if (!obj)\n"
" return JS_FALSE;\n")
# Create ccx if needed.
haveCcx = memberNeedsCcx(member)
if haveCcx and not unwrapThisFailureFatal:
raise UserError(member.iface.name + '.' + member.name + ": "
"Unwrapping this failure must be fatal when we have a ccx")
if haveCcx:
f.write(" XPCCallContext ccx(JS_CALLER, cx, obj, "
"JSVAL_TO_OBJECT(JS_CALLEE(cx, vp)));\n")
if isInterfaceType(member.realtype):
f.write(" XPCLazyCallContext lccx(ccx);\n")
# Get the 'self' pointer.
if customMethodCall is None or not 'thisType' in customMethodCall:
f.write(" %s *self;\n" % member.iface.name)
else:
f.write(" %s *self;\n" % customMethodCall['thisType'])
f.write(" xpc_qsSelfRef selfref;\n")
# Don't use FromCcx for getters or setters; the way we construct the ccx in
# a getter/setter causes it to find the wrong wrapper in some cases.
if haveCcx:
# Undocumented, but the interpreter puts 'this' at argv[-1],
# which is vp[1]; and it's ok to overwrite it.
f.write(" if (!xpc_qsUnwrapThisFromCcx(ccx, &self, &selfref.ptr, "
"&vp[1]))\n")
f.write(" return JS_FALSE;\n")
else:
if isGetter:
pthisval = 'vp'
elif isSetter:
@ -934,14 +905,13 @@ def writeQuickStub(f, customMethodCalls, member, stubName, isSetter=False):
# Emit code to convert this argument from jsval.
rvdeclared = writeArgumentUnboxing(
f, i, argName, realtype,
haveCcx=haveCcx,
optional=param.optional,
rvdeclared=rvdeclared,
nullBehavior=param.null,
undefinedBehavior=param.undefined)
elif isSetter:
rvdeclared = writeArgumentUnboxing(f, None, 'arg0', member.realtype,
haveCcx=False, optional=False,
optional=False,
rvdeclared=rvdeclared,
nullBehavior=member.null,
undefinedBehavior=member.undefined)
@ -1014,10 +984,6 @@ def writeQuickStub(f, customMethodCalls, member, stubName, isSetter=False):
# Check for errors.
f.write(" if (NS_FAILED(rv))\n")
if isMethod:
if haveCcx:
f.write(" return xpc_qsThrowMethodFailedWithCcx("
"ccx, rv);\n")
else:
f.write(" return xpc_qsThrowMethodFailed("
"cx, rv, vp);\n")
else: