فهرست منبع

Move things to constants.odin

Jeroen van Rijn 4 ماه پیش
والد
کامیت
be24feb862
3فایلهای تغییر یافته به همراه23 افزوده شده و 19 حذف شده
  1. 2 4
      core/sys/linux/bits.odin
  2. 19 0
      core/sys/linux/constants.odin
  3. 2 15
      core/sys/linux/types.odin

+ 2 - 4
core/sys/linux/bits.odin

@@ -594,6 +594,8 @@ Mem_Protection_Bits :: enum {
 
 /*
 	Bits for Map_Flags
+
+	See `constants.odin` for `MAP_SHARED_VALIDATE` and `MAP_HUGE_16KB`, et al.
 */
 Map_Flags_Bits :: enum {
 	SHARED          = 0,
@@ -619,10 +621,6 @@ Map_Flags_Bits :: enum {
 	UNINITIALIZED   = 26,
 }
 
-// Not actually flags, but a shift and mask for when HUGETLB is defined
-MAP_HUGE_SHIFT :: 26
-MAP_HUGE_MASK  :: 63
-
 /*
 	Bits for MLock_Flags
 */

+ 19 - 0
core/sys/linux/constants.odin

@@ -373,3 +373,22 @@ PTRACE_SECCOMP_GET_FILTER     :: PTrace_Seccomp_Get_Filter_Type(.SECCOMP_GET_FIL
 PTRACE_SECCOMP_GET_METADATA   :: PTrace_Seccomp_Get_Metadata_Type(.SECCOMP_GET_METADATA)
 PTRACE_GET_SYSCALL_INFO       :: PTrace_Get_Syscall_Info_Type(.GET_SYSCALL_INFO)
 PTRACE_GET_RSEQ_CONFIGURATION :: PTrace_Get_RSeq_Configuration_Type(.GET_RSEQ_CONFIGURATION)
+
+MAP_SHARED_VALIDATE :: Map_Flags{.SHARED, .PRIVATE}
+
+MAP_HUGE_SHIFT :: 26
+MAP_HUGE_MASK  :: 63
+
+MAP_HUGE_16KB       :: transmute(Map_Flags)(u32(14) << MAP_HUGE_SHIFT)
+MAP_HUGE_64KB       :: transmute(Map_Flags)(u32(16) << MAP_HUGE_SHIFT)
+MAP_HUGE_512KB      :: transmute(Map_Flags)(u32(19) << MAP_HUGE_SHIFT)
+MAP_HUGE_1MB        :: transmute(Map_Flags)(u32(20) << MAP_HUGE_SHIFT)
+MAP_HUGE_2MB        :: transmute(Map_Flags)(u32(21) << MAP_HUGE_SHIFT)
+MAP_HUGE_8MB        :: transmute(Map_Flags)(u32(23) << MAP_HUGE_SHIFT)
+MAP_HUGE_16MB       :: transmute(Map_Flags)(u32(24) << MAP_HUGE_SHIFT)
+MAP_HUGE_32MB       :: transmute(Map_Flags)(u32(25) << MAP_HUGE_SHIFT)
+MAP_HUGE_256MB      :: transmute(Map_Flags)(u32(28) << MAP_HUGE_SHIFT)
+MAP_HUGE_512MB      :: transmute(Map_Flags)(u32(29) << MAP_HUGE_SHIFT)
+MAP_HUGE_1GB        :: transmute(Map_Flags)(u32(30) << MAP_HUGE_SHIFT)
+MAP_HUGE_2GB        :: transmute(Map_Flags)(u32(31) << MAP_HUGE_SHIFT)
+MAP_HUGE_16GB       :: transmute(Map_Flags)(u32(34) << MAP_HUGE_SHIFT)

+ 2 - 15
core/sys/linux/types.odin

@@ -368,24 +368,11 @@ Mem_Protection :: bit_set[Mem_Protection_Bits; i32]
 
 /*
 	Flags for mmap.
+
+	See `constants.odin` for `MAP_SHARED_VALIDATE` and `MAP_HUGE_16KB`, et al.
 */
 Map_Flags :: bit_set[Map_Flags_Bits; i32]
 
-Map_Shared_Validate :: Map_Flags{.SHARED, .PRIVATE}
-Map_Huge_16KB       :: transmute(Map_Flags)(u32(14) << MAP_HUGE_SHIFT)
-Map_Huge_64KB       :: transmute(Map_Flags)(u32(16) << MAP_HUGE_SHIFT)
-Map_Huge_512KB      :: transmute(Map_Flags)(u32(19) << MAP_HUGE_SHIFT)
-Map_Huge_1MB        :: transmute(Map_Flags)(u32(20) << MAP_HUGE_SHIFT)
-Map_Huge_2MB        :: transmute(Map_Flags)(u32(21) << MAP_HUGE_SHIFT)
-Map_Huge_8MB        :: transmute(Map_Flags)(u32(23) << MAP_HUGE_SHIFT)
-Map_Huge_16MB       :: transmute(Map_Flags)(u32(24) << MAP_HUGE_SHIFT)
-Map_Huge_32MB       :: transmute(Map_Flags)(u32(25) << MAP_HUGE_SHIFT)
-Map_Huge_256MB      :: transmute(Map_Flags)(u32(28) << MAP_HUGE_SHIFT)
-Map_Huge_512MB      :: transmute(Map_Flags)(u32(29) << MAP_HUGE_SHIFT)
-Map_Huge_1GB        :: transmute(Map_Flags)(u32(30) << MAP_HUGE_SHIFT)
-Map_Huge_2GB        :: transmute(Map_Flags)(u32(31) << MAP_HUGE_SHIFT)
-Map_Huge_16GB       :: transmute(Map_Flags)(u32(34) << MAP_HUGE_SHIFT)
-
 /*
 	Flags for mlock(2).
 */