YJIT: s/page_end_offset/page_end_reserve/g

k0kubun · k0kubun · commit 2d7b060fcdc6 · 2022-10-06T16:02:59.000-07:00
diff --git a/yjit/src/asm/mod.rs b/yjit/src/asm/mod.rs
@@ -55,7 +55,7 @@ pub struct CodeBlock {
     page_size: usize,
 
     // Size reserved for writing a jump to the next page
-    page_end_offset: usize,
+    page_end_reserve: usize,
 
     // Table of registered label addresses
     label_addrs: Vec<usize>,
@@ -88,7 +88,7 @@ impl CodeBlock {
             mem_size,
             write_pos: 0,
             page_size,
-            page_end_offset: 20, // TODO: make it non Arm-specific
+            page_end_reserve: 20, // TODO: make it non Arm-specific
             label_addrs: Vec::new(),
             label_names: Vec::new(),
             label_refs: Vec::new(),
@@ -144,15 +144,15 @@ impl CodeBlock {
         } else {
             self.page_size
         };
-        page_end - self.page_end_offset // reserve space to jump to the next page
+        page_end - self.page_end_reserve // reserve space to jump to the next page
     }
 
-    /// Call a given function with page_end_offset = 0
-    pub fn without_page_end_offset<F: Fn(&mut Self)>(&mut self, block: F) {
-        let old_page_end_offset = self.page_end_offset;
-        self.page_end_offset = 0;
+    /// Call a given function with page_end_reserve = 0
+    pub fn without_page_end_reserve<F: Fn(&mut Self)>(&mut self, block: F) {
+        let old_page_end_reserve = self.page_end_reserve;
+        self.page_end_reserve = 0;
         block(self);
-        self.page_end_offset = old_page_end_offset;
+        self.page_end_reserve = old_page_end_reserve;
     }
 
     /// Check if this code block has sufficient remaining capacity
diff --git a/yjit/src/backend/arm64/mod.rs b/yjit/src/backend/arm64/mod.rs
@@ -1007,7 +1007,7 @@ impl Assembler
             if !had_dropped_bytes && cb.has_dropped_bytes() && cb.next_page(None) {
                 let dst_ptr = cb.get_write_ptr();
                 cb.set_write_ptr(src_ptr);
-                cb.without_page_end_offset(|cb| {
+                cb.without_page_end_reserve(|cb| {
                     emit_jmp_ptr(cb, &dst_ptr);
                 });
                 cb.set_write_ptr(dst_ptr);
