Port dvi_four, dvi_two, and dvi_pop

Author: CraftSpider

crates/engine_xetex/src/c_api/dvi.rs

@@ -1,4 +1,4 @@
-use crate::c_api::engine::TEX_INFINITY;
+use crate::c_api::engine::{POP, TEX_INFINITY};
 use crate::c_api::fatal_error;
 use crate::c_api::globals::Globals;
 use std::cell::RefCell;
@@ -171,3 +171,49 @@ pub fn rs_dvi_out(globals: &mut Globals<'_, '_>, c: u8) {
 pub extern "C" fn dvi_out(c: u8) {
     Globals::with(|globals| rs_dvi_out(globals, c))
 }
+
+pub fn rs_dvi_four(globals: &mut Globals<'_, '_>, mut x: i32) {
+    // TODO: Honestly, this could just use `x.to_*_bytes()`
+    if x >= 0 {
+        rs_dvi_out(globals, (x / 0x1000000) as u8);
+    } else {
+        x = x + 0x40000000;
+        x = x + 0x40000000;
+        rs_dvi_out(globals, ((x / 0x1000000) + 128) as u8);
+    }
+
+    x = x % 0x1000000;
+    rs_dvi_out(globals, (x / 0x10000) as u8);
+
+    x = x % 0x10000;
+    rs_dvi_out(globals, (x / 0x100) as u8);
+    rs_dvi_out(globals, (x % 0x100) as u8);
+}
+
+#[no_mangle]
+pub extern "C" fn dvi_four(x: i32) {
+    Globals::with(|globals| rs_dvi_four(globals, x))
+}
+
+pub fn rs_dvi_two(globals: &mut Globals<'_, '_>, mut s: u16) {
+    rs_dvi_out(globals, (s / 0x100) as u8);
+    rs_dvi_out(globals, (s % 0x100) as u8);
+}
+
+#[no_mangle]
+pub extern "C" fn dvi_two(s: u16) {
+    Globals::with(|globals| rs_dvi_two(globals, s))
+}
+
+pub fn rs_dvi_pop(globals: &mut Globals<'_, '_>, l: i32) {
+    if l == globals.dvi.offset + globals.dvi.ptr && globals.dvi.ptr > 0 {
+        globals.dvi.ptr -= 1;
+    } else {
+        rs_dvi_out(globals, POP);
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn dvi_pop(l: i32) {
+    Globals::with(|globals| rs_dvi_pop(globals, l))
+}

crates/engine_xetex/src/c_api/engine.rs

@@ -26,6 +26,8 @@ pub const SCRIPT_SCRIPT_SIZE: usize = 512;
 /* "the largest positive value that TeX knows" */
 pub const TEX_INFINITY: i32 = 0x7FFFFFFF;
 
+pub const POP: u8 = 142;
+
 thread_local! {
     pub static ENGINE_CTX: RefCell<EngineCtx> = RefCell::new(EngineCtx::new())
 }
@@ -56,6 +58,7 @@ pub struct EngineCtx {
     pub(crate) cur_input: InputState,
     pub(crate) interaction: InteractionMode,
     pub(crate) history: History,
+    pub(crate) total_pages: i32,
 
     pub(crate) eqtb: Vec<MemoryWord>,
     pub(crate) prim: Box<[B32x2; PRIM_SIZE + 1]>,
@@ -160,6 +163,7 @@ impl EngineCtx {
             cur_input: InputState::default(),
             interaction: InteractionMode::Batch,
             history: History::Spotless,
+            total_pages: 0,
 
             eqtb: Vec::new(),
             prim: Box::new([B32x2 { s0: 0, s1: 0 }; PRIM_SIZE + 1]),
@@ -574,6 +578,16 @@ pub extern "C" fn set_history(val: u8) {
     ENGINE_CTX.with_borrow_mut(|engine| engine.history = History::try_from(val).unwrap())
 }
 
+#[no_mangle]
+pub extern "C" fn total_pages() -> i32 {
+    ENGINE_CTX.with_borrow(|engine| engine.total_pages)
+}
+
+#[no_mangle]
+pub extern "C" fn set_total_pages(val: i32) {
+    ENGINE_CTX.with_borrow_mut(|engine| engine.total_pages = val)
+}
+
 #[no_mangle]
 pub extern "C" fn eqtb(idx: usize) -> MemoryWord {
     ENGINE_CTX.with_borrow(|engine| engine.eqtb[idx])

crates/engine_xetex/xetex/xetex-ini.c

@@ -169,7 +169,6 @@ int32_t *kern_base;
 int32_t *exten_base;
 int32_t *param_base;
 b16x4 null_character;
-int32_t total_pages;
 scaled_t max_v;
 scaled_t max_h;
 int32_t max_push;
@@ -3102,7 +3101,7 @@ initialize_more_variables(void)
     null_character.s2 = 0;
     null_character.s1 = 0;
     null_character.s0 = 0;
-    total_pages = 0;
+    set_total_pages(0);
     max_v = 0;
     max_h = 0;
     max_push = 0;

crates/engine_xetex/xetex/xetex-shipout.c

@@ -29,9 +29,6 @@ static void prune_movements(int32_t l);
 static void special_out(int32_t p);
 static void write_out(int32_t p);
 static void pic_out(int32_t p);
-static void dvi_four(int32_t x);
-static void dvi_two(UTF16_code s);
-static void dvi_pop(int32_t l);
 static void dvi_font_def(internal_font_number f);
 
 
@@ -163,7 +160,7 @@ ship_out(int32_t p)
 
     /* First page? Emit preamble items. */
 
-    if (total_pages == 0) {
+    if (total_pages() == 0) {
         dvi_out(PRE);
 
         if (semantic_pagination_enabled)
@@ -233,7 +230,7 @@ ship_out(int32_t p)
         hlist_out();
 
     dvi_out(EOP);
-    total_pages++;
+    set_total_pages(total_pages()+1);
     set_cur_s(-1);
 
 done:
@@ -2265,13 +2262,13 @@ finalize_dvi_file(void)
             dvi_out(POP);
         } else {
             dvi_out(EOP);
-            total_pages++;
+            set_total_pages(total_pages()+1);
         }
 
         set_cur_s(cur_s()-1);
     }
 
-    if (total_pages == 0) {
+    if (total_pages() == 0) {
         print_nl_cstr("No pages of output.");
         return;
     }
@@ -2291,8 +2288,8 @@ finalize_dvi_file(void)
     dvi_four(max_h);
     dvi_out(max_push / 256);
     dvi_out(max_push % 256);
-    dvi_out((total_pages / 256) % 256);
-    dvi_out(total_pages % 256);
+    dvi_out((total_pages() / 256) % 256);
+    dvi_out(total_pages() % 256);
 
     while (font_ptr > FONT_BASE) {
         if (font_used[font_ptr])
@@ -2332,8 +2329,8 @@ finalize_dvi_file(void)
         print_nl_cstr("Output written on ");
         print(output_file_name);
         print_cstr(" (");
-        print_int(total_pages);
-        if (total_pages != 1)
+        print_int(total_pages());
+        if (total_pages() != 1)
             print_cstr(" pages");
         else
             print_cstr(" page");
@@ -2352,42 +2349,3 @@ finalize_dvi_file(void)
         /* XeTeX adds history = OUTPUT_FAILURE = 4 here; I'm not implementing that. */
     }
 }
-
-
-static void
-dvi_four(int32_t x)
-{
-    if (x >= 0) {
-        dvi_out(x / 0x1000000);
-    } else {
-        x = x + 0x40000000;
-        x = x + 0x40000000;
-        dvi_out((x / 0x1000000) + 128);
-    }
-
-    x = x % 0x1000000;
-    dvi_out(x / 0x10000);
-
-    x = x % 0x10000;
-    dvi_out(x / 0x100);
-    dvi_out(x % 0x100);
-}
-
-
-static void
-dvi_two(UTF16_code s)
-{
-    dvi_out(s / 0x100);
-    dvi_out(s % 0x100);
-}
-
-
-static void
-dvi_pop(int32_t l)
-{
-    if (l == dvi_offset() + dvi_ptr() && dvi_ptr() > 0) {
-        set_dvi_ptr(dvi_ptr()-1);
-    } else {
-        dvi_out(POP);
-    }
-}

crates/engine_xetex/xetex/xetex-synctex.c

@@ -400,7 +400,7 @@ void synctex_sheet(int32_t mag)
         }
         return;
     }
-    if (total_pages == 0) {
+    if (total_pages() == 0) {
         /*  Now it is time to properly set up the scale factor. */
         if (mag > 0) {
             synctex_ctxt.magnification = mag;
@@ -411,7 +411,7 @@ void synctex_sheet(int32_t mag)
          *  or it was activated with the \synctex macro and the first page is already shipped out.
          *  Second possibility: tries to open the .synctex, useful if synchronization was enabled
          *  from the source file and not from the CLI. */
-        synctex_record_sheet(total_pages + 1);
+        synctex_record_sheet(total_pages() + 1);
     }
     return;
 }
@@ -424,7 +424,7 @@ void synctex_teehs(void)
     if (synctex_ctxt.flags.off || !synctex_ctxt.file) {
         return;
     }
-    synctex_record_teehs(total_pages);/* not total_pages+1*/
+    synctex_record_teehs(total_pages());/* not total_pages+1*/
     return;
 }
 

crates/engine_xetex/xetex/xetex-xetexd.h

@@ -529,7 +529,6 @@ extern int32_t *kern_base;
 extern int32_t *exten_base;
 extern int32_t *param_base;
 extern b16x4 null_character;
-extern int32_t total_pages;
 extern scaled_t max_v;
 extern scaled_t max_h;
 extern int32_t max_push;

crates/engine_xetex/xetex/xetex_bindings.h

@@ -42,6 +42,8 @@
 
 #define TEX_INFINITY 2147483647
 
+#define POP 142
+
 #define WHATSIT_NODE 8
 
 #define NATIVE_WORD_NODE 40
@@ -205,6 +207,12 @@ void deinitialize_shipout_variables(void);
 
 void dvi_out(uint8_t c);
 
+void dvi_four(int32_t x);
+
+void dvi_two(uint16_t s);
+
+void dvi_pop(int32_t l);
+
 uint32_t selector(void);
 
 void set_selector(uint32_t val);