Make constant values to re-use

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>
islet-project · Aug 11, 2023 · 40dcfec · 40dcfec
1 parent 75f969c
commit 40dcfec
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/rmm/monitor/src/rmi/realm/params.rs b/rmm/monitor/src/rmi/realm/params.rs
@@ -1,20 +1,22 @@
 use crate::host::Accessor as HostAccessor;
 use crate::rmm::granule::GRANULE_SIZE;
 
+const PADDING: [usize; 5] = [248, 767, 960, 6, 2020];
+
 #[repr(C)]
 pub struct Params {
     pub features_0: u64,
-    padding0: [u8; 248],
+    padding0: [u8; PADDING[0]],
     pub hash_algo: u8,
-    padding1: [u8; 767],
+    padding1: [u8; PADDING[1]],
     pub rpv: [u8; 64],
-    padding2: [u8; 960],
+    padding2: [u8; PADDING[2]],
     pub vmid: u16,
-    padding3: [u8; 6],
+    padding3: [u8; PADDING[3]],
     pub rtt_base: u64,
     pub rtt_level_start: i64,
     pub rtt_num_start: u32,
-    padding4: [u8; 2020],
+    padding4: [u8; PADDING[4]],
 }
 
 const_assert_eq!(core::mem::size_of::<Params>(), GRANULE_SIZE);
@@ -23,17 +25,17 @@ impl Default for Params {
     fn default() -> Self {
         Self {
             features_0: 0,
-            padding0: [0; 248],
+            padding0: [0; PADDING[0]],
             hash_algo: 0,
-            padding1: [0; 767],
+            padding1: [0; PADDING[1]],
             rpv: [0; 64],
-            padding2: [0; 960],
+            padding2: [0; PADDING[2]],
             vmid: 0,
-            padding3: [0; 6],
+            padding3: [0; PADDING[3]],
             rtt_base: 0,
             rtt_level_start: 0,
             rtt_num_start: 0,
-            padding4: [0; 2020],
+            padding4: [0; PADDING[4]],
         }
     }
 }

diff --git a/rmm/monitor/src/rmi/rec/params.rs b/rmm/monitor/src/rmi/rec/params.rs
@@ -1,19 +1,21 @@
 use crate::host::Accessor as HostAccessor;
 use crate::rmm::granule::GRANULE_SIZE;
 
+const PADDING: [usize; 5] = [248, 248, 248, 1216, 1912];
+
 #[repr(C)]
 pub struct Params {
     pub flags: u64,
-    padding0: [u8; 248],
+    padding0: [u8; PADDING[0]],
     pub mpidr: u64,
-    padding1: [u8; 248],
+    padding1: [u8; PADDING[1]],
     pub pc: u64,
-    padding2: [u8; 248],
+    padding2: [u8; PADDING[2]],
     pub gprs: [u64; 8],
-    padding3: [u8; 1216],
+    padding3: [u8; PADDING[3]],
     pub num_aux: u64,
     pub aux: [u64; 16],
-    padding4: [u8; 1912],
+    padding4: [u8; PADDING[4]],
 }
 
 const_assert_eq!(core::mem::size_of::<Params>(), GRANULE_SIZE);
@@ -22,16 +24,16 @@ impl Default for Params {
     fn default() -> Self {
         Self {
             flags: 0,
-            padding0: [0; 248],
+            padding0: [0; PADDING[0]],
             mpidr: 0,
-            padding1: [0; 248],
+            padding1: [0; PADDING[1]],
             pc: 0,
-            padding2: [0; 248],
+            padding2: [0; PADDING[2]],
             gprs: [0; 8],
-            padding3: [0; 1216],
+            padding3: [0; PADDING[3]],
             num_aux: 0,
             aux: [0; 16],
-            padding4: [0; 1912],
+            padding4: [0; PADDING[4]],
         }
     }
 }