ZJIT: DRY up underscore rexport anti-pattern

Keeping the same name makes re-exporting more concise.

Author: XrXr

zjit/src/backend/arm64/mod.rs

@@ -11,12 +11,12 @@ use crate::cast::*;
 pub type Reg = A64Reg;
 
 // Callee-saved registers
-pub const _CFP: Opnd = Opnd::Reg(X19_REG);
-pub const _EC: Opnd = Opnd::Reg(X20_REG);
-pub const _SP: Opnd = Opnd::Reg(X21_REG);
+pub const CFP: Opnd = Opnd::Reg(X19_REG);
+pub const EC: Opnd = Opnd::Reg(X20_REG);
+pub const SP: Opnd = Opnd::Reg(X21_REG);
 
 // C argument registers on this platform
-pub const _C_ARG_OPNDS: [Opnd; 6] = [
+pub const C_ARG_OPNDS: [Opnd; 6] = [
     Opnd::Reg(X0_REG),
     Opnd::Reg(X1_REG),
     Opnd::Reg(X2_REG),
@@ -27,8 +27,8 @@ pub const _C_ARG_OPNDS: [Opnd; 6] = [
 
 // C return value register on this platform
 pub const C_RET_REG: Reg = X0_REG;
-pub const _C_RET_OPND: Opnd = Opnd::Reg(X0_REG);
-pub const _NATIVE_STACK_PTR: Opnd = Opnd::Reg(XZR_REG);
+pub const C_RET_OPND: Opnd = Opnd::Reg(X0_REG);
+pub const NATIVE_STACK_PTR: Opnd = Opnd::Reg(XZR_REG);
 
 // These constants define the way we work with Arm64's stack pointer. The stack
 // pointer always needs to be aligned to a 16-byte boundary.

zjit/src/backend/lir.rs

@@ -4,19 +4,16 @@ use std::mem::take;
 use crate::codegen::local_size_and_idx_to_ep_offset;
 use crate::cruby::{Qundef, RUBY_OFFSET_CFP_PC, RUBY_OFFSET_CFP_SP, SIZEOF_VALUE_I32};
 use crate::options::{debug, get_option};
-use crate::{cruby::VALUE};
-use crate::backend::current::*;
+use crate::cruby::VALUE;
 use crate::virtualmem::CodePtr;
 use crate::asm::{CodeBlock, Label};
 
-pub const EC: Opnd = _EC;
-pub const CFP: Opnd = _CFP;
-pub const SP: Opnd = _SP;
-
-pub const C_ARG_OPNDS: [Opnd; 6] = _C_ARG_OPNDS;
-pub const C_RET_OPND: Opnd = _C_RET_OPND;
-pub const NATIVE_STACK_PTR: Opnd = _NATIVE_STACK_PTR;
-pub use crate::backend::current::{Reg, C_RET_REG};
+pub use crate::backend::current::{
+    Reg,
+    EC, CFP, SP,
+    NATIVE_STACK_PTR,
+    C_ARG_OPNDS, C_RET_REG, C_RET_OPND,
+};
 
 // Memory operand base
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]

zjit/src/backend/x86_64/mod.rs

@@ -11,12 +11,12 @@ use crate::cast::*;
 pub type Reg = X86Reg;
 
 // Callee-saved registers
-pub const _CFP: Opnd = Opnd::Reg(R13_REG);
-pub const _EC: Opnd = Opnd::Reg(R12_REG);
-pub const _SP: Opnd = Opnd::Reg(RBX_REG);
+pub const CFP: Opnd = Opnd::Reg(R13_REG);
+pub const EC: Opnd = Opnd::Reg(R12_REG);
+pub const SP: Opnd = Opnd::Reg(RBX_REG);
 
 // C argument registers on this platform
-pub const _C_ARG_OPNDS: [Opnd; 6] = [
+pub const C_ARG_OPNDS: [Opnd; 6] = [
     Opnd::Reg(RDI_REG),
     Opnd::Reg(RSI_REG),
     Opnd::Reg(RDX_REG),
@@ -27,8 +27,8 @@ pub const _C_ARG_OPNDS: [Opnd; 6] = [
 
 // C return value register on this platform
 pub const C_RET_REG: Reg = RAX_REG;
-pub const _C_RET_OPND: Opnd = Opnd::Reg(RAX_REG);
-pub const _NATIVE_STACK_PTR: Opnd = Opnd::Reg(RSP_REG);
+pub const C_RET_OPND: Opnd = Opnd::Reg(RAX_REG);
+pub const NATIVE_STACK_PTR: Opnd = Opnd::Reg(RSP_REG);
 
 impl CodeBlock {
     // The number of bytes that are generated by jmp_ptr