wrappers2

Signed-off-by: sagudev <[email protected]>

Author: sagudev

mozjs/src/generate_wrappers.sh

@@ -3,8 +3,8 @@
 gsed=$(type gsed >/dev/null 2>&1 && echo gsed || echo sed)
 # Detect gfind or find
 gfind=$(type gfind >/dev/null 2>&1 && echo gfind || echo find)
-# This is one big heuristic but seems to work well enough
-grep_heur() {
+
+grep_functions() {
   grep -v "link_name" "$1" | \
   grep -v '"\]' | \
   grep -F -v '/\*\*' | \
@@ -14,8 +14,13 @@ grep_heur() {
   grep -v '^\}$' | \
   $gsed 's/^ *pub/pub/' | \
   $gsed -z 's/\;\n/\n/g' | \
-  grep 'pub fn' | \
-  grep Handle | \
+  grep 'pub fn'
+}
+
+# This is one big heuristic but seems to work well enough
+grep_heur() {
+  grep_functions "$1" |
+  grep -e Handle | \
   grep -v roxyHandler | \
   grep -v '\bIdVector\b' | # name clash between rust::IdVector and JS::IdVector \
   grep -v 'pub fn Unbox' | # this function seems to be platform specific \
@@ -31,16 +36,57 @@ grep_heur() {
   grep -v 'MutableHandleObjectVector' # GetDebuggeeGlobals has it
 }
 
-# usage find_latest_version_of_file_and_parse $input_file $out_wrapper_module_name
+# usage find_latest_version_of_file_and_parse $input_file $out_wrapper_module_name $heur_fn
 find_latest_version_of_file_and_parse() {
   # clone file and reformat (this is needed for grep_heur to work properly)
   # this $(find) only gets last modified file
   cp $($gfind target -name "$1" -printf "%T@ %p\n" | sort -n | tail -n 1 | tr ' ' '\n' | tail -n 1) "target/wrap_$1"
   rustfmt "target/wrap_$1" --config max_width=1000
 
   # parse reformated file
-  grep_heur "target/wrap_$1" | $gsed 's/\(.*\)/wrap!('"$2"': \1);/g'  > "mozjs/src/$2_wrappers.in.rs"
+  ($3 "target/wrap_$1") | $gsed 's/\(.*\)/wrap!('"$2"': \1);/g'  > "mozjs/src/$2$4_wrappers.in.rs"
+}
+
+find_latest_version_of_file_and_parse jsapi.rs jsapi grep_heur
+find_latest_version_of_file_and_parse gluebindings.rs glue grep_heur
+
+# This is one big heuristic but seems to work well enough
+grep_heur2() {
+  grep_functions "$1" |
+  grep -e Handle -e JSContext | \
+  grep -v roxyHandler | \
+  grep -v '\bIdVector\b' | # name clash between rust::IdVector and JS::IdVector \
+  grep -v 'pub fn Unbox' | # this function seems to be platform specific \
+  grep -v 'CopyAsyncStack' | # arch-specific bindgen output
+  grep -v 'pub fn JS_NewContext' |
+  grep -v 'pub fn NewMemoryInfo' |
+  grep -v 'pub fn GetGCContext' |
+  grep -v 'pub fn SetDebuggerMalloc' |
+  grep -v 'pub fn GetDebuggerMallocSizeOf' |
+  grep -v 'pub fn FireOnGarbageCollectionHookRequired' |
+  grep -v 'pub fn ShouldAvoidSideEffects' |
+  $gsed 's/root:://g' |
+  $gsed 's/JS:://g' |
+  $gsed 's/js:://g' |
+  $gsed 's/mozilla:://g' |
+  $gsed 's/\*mut JSContext/\&mut JSContext/g' |
+  $gsed 's/\*const JSContext/\&JSContext/g' |
+  grep -F -v '> Handle' | # We are only wrapping handles in args not in results
+  grep -F -v '...' | # vargs
+  grep -v 'MutableHandleObjectVector' # GetDebuggeeGlobals has it
+}
+
+find_latest_version_of_file_and_parse jsapi.rs jsapi grep_heur2 2
+find_latest_version_of_file_and_parse gluebindings.rs glue grep_heur2 2
+
+mark_as_no_gc() {
+  # Functions with AutoRequireNoGC arg do not trigger GC
+  sed -i '/\*const AutoRequireNoGC/ s/\&mut JSContext/\&JSContext/' $1
+  
+  # Functions that also do not trigger GC
+  for fn in "JS_GetRuntime" "JS_GetParentRuntime"; do
+    sed -i "/pub fn $fn/ s/\&mut JSContext/\&JSContext/g" $1
+  done
 }
 
-find_latest_version_of_file_and_parse jsapi.rs jsapi
-find_latest_version_of_file_and_parse gluebindings.rs glue
+mark_as_no_gc mozjs/src/jsapi2_wrappers.in.rs

mozjs/src/glue2_wrappers.in.rs

@@ -0,0 +1,44 @@
+wrap!(glue: pub fn InvokeGetOwnPropertyDescriptor(handler: *const ::std::os::raw::c_void, cx: &mut JSContext, proxy: HandleObject, id: HandleId, desc: MutableHandle<PropertyDescriptor>, isNone: *mut bool) -> bool);
+wrap!(glue: pub fn InvokeHasOwn(handler: *const ::std::os::raw::c_void, cx: &mut JSContext, proxy: HandleObject, id: HandleId, bp: *mut bool) -> bool);
+wrap!(glue: pub fn CallJitGetterOp(info: *const JSJitInfo, cx: &mut JSContext, thisObj: HandleObject, specializedThis: *mut ::std::os::raw::c_void, argc: ::std::os::raw::c_uint, vp: *mut Value) -> bool);
+wrap!(glue: pub fn CallJitSetterOp(info: *const JSJitInfo, cx: &mut JSContext, thisObj: HandleObject, specializedThis: *mut ::std::os::raw::c_void, argc: ::std::os::raw::c_uint, vp: *mut Value) -> bool);
+wrap!(glue: pub fn CallJitMethodOp(info: *const JSJitInfo, cx: &mut JSContext, thisObj: HandleObject, specializedThis: *mut ::std::os::raw::c_void, argc: u32, vp: *mut Value) -> bool);
+wrap!(glue: pub fn NewCompileOptions(aCx: &mut JSContext, aFile: *const ::std::os::raw::c_char, aLine: ::std::os::raw::c_uint) -> *mut ReadOnlyCompileOptions);
+wrap!(glue: pub fn NewProxyObject(aCx: &mut JSContext, aHandler: *const ::std::os::raw::c_void, aPriv: HandleValue, proto: *mut JSObject, aClass: *const JSClass, aLazyProto: bool) -> *mut JSObject);
+wrap!(glue: pub fn WrapperNew(aCx: &mut JSContext, aObj: HandleObject, aHandler: *const ::std::os::raw::c_void, aClass: *const JSClass) -> *mut JSObject);
+wrap!(glue: pub fn NewWindowProxy(aCx: &mut JSContext, aObj: HandleObject, aHandler: *const ::std::os::raw::c_void) -> *mut JSObject);
+wrap!(glue: pub fn RUST_JSID_IS_INT(id: HandleId) -> bool);
+wrap!(glue: pub fn int_to_jsid(i: i32, id: MutableHandleId));
+wrap!(glue: pub fn RUST_JSID_TO_INT(id: HandleId) -> i32);
+wrap!(glue: pub fn RUST_JSID_IS_STRING(id: HandleId) -> bool);
+wrap!(glue: pub fn RUST_JSID_TO_STRING(id: HandleId) -> *mut JSString);
+wrap!(glue: pub fn RUST_SYMBOL_TO_JSID(sym: *mut Symbol, id: MutableHandleId));
+wrap!(glue: pub fn RUST_JSID_IS_VOID(id: HandleId) -> bool);
+wrap!(glue: pub fn RUST_INTERNED_STRING_TO_JSID(cx: &mut JSContext, str_: *mut JSString, id: MutableHandleId));
+wrap!(glue: pub fn ReportErrorASCII(aCx: &mut JSContext, aError: *const ::std::os::raw::c_char));
+wrap!(glue: pub fn ReportErrorUTF8(aCx: &mut JSContext, aError: *const ::std::os::raw::c_char));
+wrap!(glue: pub fn UnwrapObjectDynamic(obj: *mut JSObject, cx: &mut JSContext, stopAtWindowProxy: bool) -> *mut JSObject);
+wrap!(glue: pub fn CreateRootedIdVector(cx: &mut JSContext) -> *mut PersistentRootedIdVector);
+wrap!(glue: pub fn AppendToIdVector(v: MutableHandleIdVector, id: HandleId) -> bool);
+wrap!(glue: pub fn CreateRootedObjectVector(aCx: &mut JSContext) -> *mut PersistentRootedObjectVector);
+wrap!(glue: pub fn CollectServoSizes(cx: &mut JSContext, sizes: *mut ServoSizes, gs: GetSize) -> bool);
+wrap!(glue: pub fn JS_GetPromiseResult(promise: HandleObject, dest: MutableHandleValue));
+wrap!(glue: pub fn JS_GetScriptPrivate(script: *mut JSScript, dest: MutableHandleValue));
+wrap!(glue: pub fn JS_MaybeGetScriptPrivate(obj: *mut JSObject, dest: MutableHandleValue));
+wrap!(glue: pub fn JS_GetModulePrivate(module: *mut JSObject, dest: MutableHandleValue));
+wrap!(glue: pub fn JS_GetScriptedCallerPrivate(cx: &mut JSContext, dest: MutableHandleValue));
+wrap!(glue: pub fn JS_GetNaNValue(cx: &mut JSContext, dest: *mut Value));
+wrap!(glue: pub fn JS_GetPositiveInfinityValue(cx: &mut JSContext, dest: *mut Value));
+wrap!(glue: pub fn JS_GetEmptyStringValue(cx: &mut JSContext, dest: *mut Value));
+wrap!(glue: pub fn JS_GetRegExpFlags(cx: &mut JSContext, obj: HandleObject, flags: *mut RegExpFlags));
+wrap!(glue: pub fn EncodeStringToUTF8(cx: &mut JSContext, str_: HandleString, cb: EncodedStringCallback));
+wrap!(glue: pub fn SetUpEventLoopDispatch(cx: &mut JSContext, callback: RustDispatchToEventLoopCallback, closure: *mut ::std::os::raw::c_void));
+wrap!(glue: pub fn DispatchableRun(cx: &mut JSContext, ptr: *mut DispatchablePointer, mb: Dispatchable_MaybeShuttingDown));
+wrap!(glue: pub fn DescribeScriptedCaller(cx: &mut JSContext, buffer: *mut ::std::os::raw::c_char, buflen: usize, line: *mut u32, col: *mut u32) -> bool);
+wrap!(glue: pub fn SetDataPropertyDescriptor(desc: MutableHandle<PropertyDescriptor>, value: HandleValue, attrs: u32));
+wrap!(glue: pub fn SetAccessorPropertyDescriptor(desc: MutableHandle<PropertyDescriptor>, getter: HandleObject, setter: HandleObject, attrs: u32));
+wrap!(glue: pub fn DumpJSStack(cx: &mut JSContext, showArgs: bool, showLocals: bool, showThisProps: bool));
+wrap!(glue: pub fn StackGCVectorValueLength(vec: Handle<StackGCVector<Value, TempAllocPolicy>>) -> u32);
+wrap!(glue: pub fn StackGCVectorStringLength(vec: Handle<StackGCVector<*mut JSString, TempAllocPolicy>>) -> u32);
+wrap!(glue: pub fn StackGCVectorValueAtIndex(vec: Handle<StackGCVector<Value, TempAllocPolicy>>, index: u32) -> *const Value);
+wrap!(glue: pub fn StackGCVectorStringAtIndex(vec: Handle<StackGCVector<*mut JSString, TempAllocPolicy>>, index: u32) -> *const *mut JSString);