Adjust the position of AsmCore members

Author: mohanson

definitions/src/asm.rs

@@ -105,8 +105,8 @@ pub struct AsmCoreMachine {
 
     pub cfi: u8,
     pub elp: u32,
-    pub shadow_stack: [u8; DEFAULT_SHADOW_STACK_SIZE],
     pub ssp: u64,
+    pub shadow_stack: [u8; DEFAULT_SHADOW_STACK_SIZE],
 }
 
 impl Drop for AsmCoreMachine {

definitions/src/generate_asm_constants.rs

@@ -227,14 +227,14 @@ fn main() {
         "#define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_ELP {}",
         (&m.elp as *const u32 as usize) - m_address
     );
-    println!(
-        "#define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_SHADOW_STACK {}",
-        (&m.shadow_stack as *const [u8; DEFAULT_SHADOW_STACK_SIZE] as usize) - m_address
-    );
     println!(
         "#define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_SSP {}",
         (&m.ssp as *const u64 as usize) - m_address
     );
+    println!(
+        "#define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_SHADOW_STACK {}",
+        (&m.shadow_stack as *const [u8; DEFAULT_SHADOW_STACK_SIZE] as usize) - m_address
+    );
     println!();
 
     for op in MINIMAL_OPCODE..MAXIMUM_OPCODE {

src/machine/asm/cdefinitions_generated.h

@@ -59,8 +59,8 @@
 #define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_FRAMES_PTR 384
 #define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_CFI 392
 #define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_ELP 396
-#define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_SHADOW_STACK 400
-#define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_SSP 65936
+#define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_SSP 400
+#define CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_SHADOW_STACK 408
 
 #define CKB_VM_ASM_OP_UNLOADED 16
 #define CKB_VM_ASM_OP_ADD 17