Backport #442

Author: mohanson

Cargo.toml

@@ -5,7 +5,7 @@ version = "0.24.12"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2021"
-rust-version = "1.75.0"
+rust-version = "1.81.0"
 build = "build.rs"
 exclude = ["/benches", "/tests"]
 homepage = "https://github.com/nervosnetwork/ckb-vm"
@@ -54,3 +54,6 @@ harness = false
 name = "vm_benchmark"
 path = "benches/vm_benchmark.rs"
 harness = false
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(has_asm)'] }

benches/vm_benchmark.rs

@@ -40,7 +40,7 @@ fn asm_benchmark(c: &mut Criterion) {
             "bar",
         ].into_iter().map(|a| Ok(a.into()));
         b.iter(|| {
-            let asm_core = AsmCoreMachine::new(ISA_IMC, VERSION0, u64::max_value());
+            let asm_core = AsmCoreMachine::new(ISA_IMC, VERSION0, u64::MAX);
             let core = DefaultMachineBuilder::new(asm_core).build();
             let mut machine = AsmMachine::new(core);
             machine.load_program(&buffer, args.clone()).unwrap();
@@ -61,7 +61,7 @@ fn mop_benchmark(c: &mut Criterion) {
             "bar",
         ].into_iter().map(|a| Ok(a.into()));
         b.iter(|| {
-            let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B | ISA_MOP, VERSION2, u64::max_value());
+            let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B | ISA_MOP, VERSION2, u64::MAX);
             let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
                 .build();
             let mut machine = AsmMachine::new(core);

definitions/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.24.12"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2021"
-rust-version = "1.75.0"
+rust-version = "1.81.0"
 autobins = false
 homepage = "https://github.com/nervosnetwork/ckb-vm"
 repository = "https://github.com/nervosnetwork/ckb-vm"

definitions/src/asm.rs

@@ -117,8 +117,8 @@ impl AsmCoreMachine {
         machine.frames_size = (memory_size / MEMORY_FRAMESIZE) as u64;
         machine.flags_size = (memory_size / RISCV_PAGESIZE) as u64;
 
-        machine.last_read_frame = u64::max_value();
-        machine.last_write_page = u64::max_value();
+        machine.last_read_frame = u64::MAX;
+        machine.last_write_page = u64::MAX;
 
         machine
     }

definitions/src/instructions.rs

@@ -292,7 +292,7 @@ macro_rules! __for_each_inst_inner {
 /// a callback macro that takes (at least) 3 arguments:
 ///
 /// 1. $name: an identifier containing the full defined opcode name,
-/// e.g., OP_ADD
+///    e.g., OP_ADD
 /// 2. $real_name: an identifier containing just the opcode part, e.g., ADD
 /// 3. $code: an expr containing the actual opcode number
 ///
@@ -323,10 +323,10 @@ macro_rules! for_each_inst2 {
 /// arguments:
 ///
 /// * A callback macro that takes the exact same arguments as callback
-/// macro in +for_each_inst+
+///   macro in +for_each_inst+
 /// * A value expression containing the actual value to match against.
 /// * An expression used as wildcard matches when the passed value does
-/// not match any opcode
+///   not match any opcode
 ///
 /// * Free variables are attached to the variants ending with match1, match2, etc.
 #[macro_export]
@@ -356,7 +356,7 @@ macro_rules! for_each_inst_match2 {
 /// Generates an array on all instructions
 ///
 /// * A callback macro that takes the exact same arguments as callback
-/// macro in +for_each_inst+
+///   macro in +for_each_inst+
 ///
 /// * Free variables are attached to the variants ending with fold1, fold2, etc.
 #[macro_export]

examples/check_real_memory.rs

@@ -69,7 +69,7 @@ fn get_current_memory_linux() -> usize {
 }
 
 fn get_current_memory() -> usize {
-    if !cfg!(linux) {
+    if !cfg!(target_os = "linux") {
         get_current_memory_linux()
     } else {
         let pid = format!("{}", id());
@@ -168,8 +168,7 @@ fn check_asm(memory_size: usize) -> Result<(), ()> {
     );
     println!("Base memory: {}", get_current_memory());
     for _ in 0..G_CHECK_LOOP {
-        let asm_core =
-            AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::max_value(), memory_size);
+        let asm_core = AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::MAX, memory_size);
         let core = DefaultMachineBuilder::new(asm_core).build();
         let mut machine = AsmMachine::new(core);
         machine
@@ -193,8 +192,7 @@ fn check_asm_in_thread(memory_size: usize) -> Result<(), ()> {
     );
     println!("Base memory: {}", get_current_memory());
     for _ in 0..G_CHECK_LOOP {
-        let asm_core =
-            AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::max_value(), memory_size);
+        let asm_core = AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::MAX, memory_size);
         let core = DefaultMachineBuilder::new(asm_core).build();
         let mut machine = AsmMachine::new(core);
         machine

fuzz/fuzz_targets/snapshot2.rs

@@ -65,7 +65,7 @@ impl DataSource<u32> for DummyData {
 
 fn build_machine() -> DefaultMachine<Box<AsmCoreMachine>> {
     let isa = ISA_IMC | ISA_A | ISA_B | ISA_MOP;
-    let core_machine = AsmCoreMachine::new(isa, VERSION2, u64::max_value());
+    let core_machine = AsmCoreMachine::new(isa, VERSION2, u64::MAX);
     DefaultMachineBuilder::new(core_machine).build()
 }
 

rust-toolchain

@@ -1 +1 @@
-1.75.0
+1.81.0

src/bits.rs

@@ -24,8 +24,8 @@ mod tests {
         assert_eq!(16, roundup(15, 16));
         assert_eq!(16, roundup(16, 16));
         assert_eq!(32, roundup(17, 16));
-        assert_eq!(u64::max_value() - 15, roundup(u64::max_value() - 15, 16));
-        assert_eq!(0, roundup(u64::max_value(), 16));
+        assert_eq!(u64::MAX - 15, roundup(u64::MAX - 15, 16));
+        assert_eq!(0, roundup(u64::MAX, 16));
     }
 
     #[test]
@@ -35,7 +35,7 @@ mod tests {
         assert_eq!(0, rounddown(15, 16));
         assert_eq!(16, rounddown(16, 16));
         assert_eq!(16, rounddown(17, 16));
-        assert_eq!(u64::max_value() - 15, rounddown(u64::max_value(), 16));
+        assert_eq!(u64::MAX - 15, rounddown(u64::MAX, 16));
     }
 
     proptest! {

src/instructions/ast.rs

@@ -147,11 +147,11 @@ impl Register for Value {
     }
 
     fn min_value() -> Value {
-        Value::Imm(u64::min_value())
+        Value::Imm(u64::MIN)
     }
 
     fn max_value() -> Value {
-        Value::Imm(u64::max_value())
+        Value::Imm(u64::MAX)
     }
 
     fn eq(&self, other: &Value) -> Value {