Timers and modules

justfile

@@ -14,7 +14,7 @@ download-cleanup:
     find "{{embed_dir}}" -type f | grep test | xargs rm
 
 generate-bindings:
-    (cd libquickjs-sys; bindgen wrapper.h -o embed/bindings.rs -- -I ./embed)
+    (cd libquickjs-sys; bindgen wrapper.h -o src/bindings.rs -- -I ./embed)
     # Update VERSION in README
     sed -i "s/**Embedded VERSION: .*/**Embedded VERSION: $(cat ./libquickjs-sys/embed/quickjs/VERSION)**/" ./libquickjs-sys/README.md
 

libquickjs-sys/Cargo.toml

@@ -17,11 +17,13 @@ build = "build.rs"
 bundled = ["copy_dir"]
 patched = []
 bignum = []
-default = ["bundled"]
+pic = []
+debug = []
+default = ["bundled","pic","debug"]
 
 system = ["bindgen"]
 
 [build-dependencies]
 bindgen = { version = "0.51.0", optional = true }
 copy_dir = { version = "0.1.2", optional = true }
-
+regex = "1.3.1"

libquickjs-sys/README.md

@@ -25,7 +25,7 @@ QuickJS sources and a pre-generated `bindings.rs` are included in the repo.
 
 They are used if the `embedded` feature is enabled.
 
-To updat the bindings, follow these steps:
+To update the bindings, follow these steps:
 
 * (Install [just](https://github.com/casey/just))
 * Update the download URL in ./justfile

libquickjs-sys/build.rs

@@ -1,6 +1,8 @@
 use std::path::{Path, PathBuf};
 
-use std::env;
+use std::{env, fs};
+
+use regex::Regex;
 
 fn exists(path: impl AsRef<Path>) -> bool {
     PathBuf::from(path.as_ref()).exists()
@@ -70,6 +72,7 @@ fn main() {
     apply_patches(&code_dir);
 
     eprintln!("Compiling quickjs...");
+    patch_makefile(code_dir.join("Makefile").as_path());
     std::process::Command::new("make")
         .arg(format!("lib{}.a", LIB_NAME))
         .current_dir(&code_dir)
@@ -78,9 +81,6 @@ fn main() {
         .wait()
         .expect("Could not compile quickjs");
 
-    std::fs::copy("./embed/bindings.rs", out_path.join("bindings.rs"))
-        .expect("Could not copy bindings.rs");
-
     // Instruct cargo to statically link quickjs.
     println!(
         "cargo:rustc-link-search=native={}",
@@ -89,6 +89,33 @@ fn main() {
     println!("cargo:rustc-link-lib=static={}", LIB_NAME);
 }
 
+fn patch_makefile(makefile: &Path) {
+    let content = fs::read_to_string(makefile).unwrap();
+
+    let content = if cfg!(feature = "debug") {
+        Regex::new("CFLAGS_OPT=(.*) -O2")
+            .unwrap()
+            .replace_all(&content, "CFLAGS_OPT=$1 -O0 -g")
+    } else {
+        content.into()
+    };
+
+    let content = Regex::new("CROSS_PREFIX=")
+        .unwrap()
+        .replace_all(&content, "CROSS_PREFIX?=");
+
+    let content = if cfg!(feature = "pic") {
+        content
+            .replace("CFLAGS+=$(DEFINES)\n", "CFLAGS+=$(DEFINES) -fPIC\n")
+            .into()
+    } else {
+        content
+    };
+
+    fs::rename(makefile, makefile.with_extension("bak")).unwrap();
+    fs::write(makefile, content.as_bytes()).unwrap();
+}
+
 #[cfg(feature = "patched")]
 fn apply_patches(code_dir: &PathBuf) {
     use std::fs;

libquickjs-sys/embed/quickjs/quickjs.c

@@ -14888,6 +14888,7 @@ static JSValue JS_CallInternal(JSContext *ctx, JSValueConst func_obj,
 
     alloca_size = sizeof(JSValue) * (arg_allocated_size + b->var_count +
                                      b->stack_size);
+
     if (js_check_stack_overflow(ctx, alloca_size))
         return JS_ThrowStackOverflow(ctx);