Port slow_make_string

Author: CraftSpider

crates/engine_xetex/src/c_api/pool.rs

@@ -154,11 +154,29 @@ pub fn rs_make_string(pool: &mut StringPool) -> StrNumber {
     (pool.str_ptr - 1) as StrNumber
 }
 
+pub fn rs_slow_make_string(pool: &mut StringPool) -> StrNumber {
+    let t = rs_make_string(pool);
+    let s = rs_search_string(pool, t);
+
+    if s > 0 {
+        pool.str_ptr -= 1;
+        pool.pool_ptr = pool.str_start[pool.str_ptr - TOO_BIG_CHAR] as usize;
+        s
+    } else {
+        t
+    }
+}
+
 #[no_mangle]
 pub extern "C" fn make_string() -> StrNumber {
     STRING_POOL.with_borrow_mut(rs_make_string)
 }
 
+#[no_mangle]
+pub extern "C" fn slow_make_string() -> StrNumber {
+    STRING_POOL.with_borrow_mut(|pool| rs_slow_make_string(pool))
+}
+
 pub fn rs_str_length(pool: &StringPool, s: StrNumber) -> usize {
     if s >= 0x10000 {
         pool.str(s - 0x10000).len()

crates/engine_xetex/xetex/xetex-stringpool.c

@@ -88,21 +88,3 @@ str_eq_buf(str_number s, int32_t k)
 
     return true;
 }
-
-str_number
-slow_make_string(void)
-{
-    str_number s;
-    str_number t;
-
-    t = make_string();
-    s = search_string(t);
-
-    if (s > 0) {
-        set_str_ptr(str_ptr()-1);
-        set_pool_ptr(str_start(str_ptr() - TOO_BIG_CHAR));
-        return s;
-    }
-
-    return t;
-}

crates/engine_xetex/xetex/xetex_bindings.h

@@ -449,6 +449,8 @@ void set_max_strings(uintptr_t val);
 
 StrNumber make_string(void);
 
+StrNumber slow_make_string(void);
+
 uintptr_t length(StrNumber s);
 
 bool str_eq_str(StrNumber s1, StrNumber s2);