Changeset 4227 for trunk/src/win32k/include/OS2KVM.h

Timestamp:

Sep 8, 2000, 11:34:12 PM (25 years ago)

Author:

bird

Message:

Experimenting with ldrSetVMflags. Page alignment possible.

File:

• trunk/src/win32k/include/OS2KVM.h (modified) (3 diffs)

trunk/src/win32k/include/OS2KVM.h

@@ -1 @@
-/* $Id: OS2KVM.h,v 1.5 2000-09-02 21:08:00 bird Exp $
+/* $Id: OS2KVM.h,v 1.6 2000-09-08 21:34:11 bird Exp $
  *
  * OS/2 kernel VM functions.
@@ -13 +13 @@
 #define _OS2KVM_h_
 
+
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
+
+/*                                            v8086.h */
+#define VM_PG_W            0x00000002      /* VPMPG_W       - Page Writeable. */
+#define VM_PG_U            0x00000004      /* VPMPG_U       - Page User Mode Accessible.*/
+#define VM_PG_X            0x00000008      /* VPMPG_X       - Page Executable. */
+#define VM_PG_R            0x00000010      /* VPMPG_R       - Page Readable. */
+#define VM_PG_RESERVED     0x00001000      /* VPMPG_RESERVED- Reservered */
+
+/*                                            vpmx2.h */
+#define VM_PG_SWAPPABLE    0x00000000      /* Swappable */
+
+
+
 /*
  * VMAlloc flFlag1 guessings
  */
-#define VMA_CONTIG          0x00000001  /* VMDHA_CONTIG */
-#define VMA_WRITE           0x00000002  /* PAG_WRITE and OB_WRITE */
-#define VMA_USER            0x00000004  /* OB_USER */
-#define VMA_EXECUTE         0x00000008  /* PAG_EXECUTE and OB_READ !! */
-#define VMA_READ            0x00000010  /* PAG_READ and OB_EXEC !! */
-#define VMA_LOWMEM          0x00000020  /* OB_LOWMEM < 1MB physical */
-#define VMA_GUARD           0x00000040  /* PAG_GUARD and VMDHA_16M and OB_GUARD */
+#define VMA_CONTIG          0x00000001UL  /* VMDHA_CONTIG */
+#define VMA_WRITE           VM_PG_W     /* PAG_WRITE and OB_WRITE */
+#define VMA_USER            VM_PG_U     /* OB_USER */
+#define VMA_EXECUTE         VM_PG_X     /* PAG_EXECUTE and OB_READ !! */
+#define VMA_READ            VM_PG_R     /* PAG_READ and OB_EXEC !! */
+#define VMA_LOWMEM          0x00000020UL  /* OB_LOWMEM < 1MB physical */
+#define VMA_GUARD           0x00000040UL  /* PAG_GUARD and VMDHA_16M and OB_GUARD */
 #if 0
-#define VMA_RESIDENT        0x00000080  /* OB_RESIDENT */
-#define VMA_ZEROINIT        0x00000100  /* OB_ZEROINIT */
-#define VMA_PHYS            0x00000200  /* VMDHA_PHYS */
-#define VMA_FIXED           0x00000400  /* VMDHA_FIXED and OB_SHARED */
+#define VMA_RESIDENT        0x00000080UL  /* OB_RESIDENT */
+#define VMA_ZEROINIT        0x00000100UL  /* OB_ZEROINIT */
+#define VMA_PHYS            0x00000200UL  /* VMDHA_PHYS */
+#define VMA_FIXED           0x00000400UL  /* VMDHA_FIXED and OB_SHARED */
 #else
-#define VMA_ZEROFILL        0x00000080
-#define VMA_SWAPONWRITE     0x00000100
-#define VMA_UVIRT           0x00000200  /* VMDHA_PHYS */
-#define VMA_RESIDENT        0x00000400  /* VMDHA_FIXED and OB_SHARED */
+#define VMA_ZEROFILL        0x00000080UL
+#define VMA_SWAPONWRITE     0x00000100UL
+#define VMA_UVIRT           0x00000200UL  /* VMDHA_PHYS */
+#define VMA_RESIDENT        0x00000400UL  /* VMDHA_FIXED and OB_SHARED */
 #endif
-#define VMA_DISCARDABLE     0x00000800  /* discarable object */
-#define VMA_SHARE           0x00001000  /* OBJSHARE and OBJEXEC (which implies shared) */
-#define VMA_PROTECTED       0x00004000  /* PAG_PROTECTED */
-#define VMA_LOWMEM2         0x00010000  /* OB_LOWMEM */
-#define VMA_VDM             0x00040000  /* VDM */
-#define VMA_DECOMMIT        0x00080000  /* PAG_DECOMMIT */
-#define VMA_TILE            0x00400000  /* OBJ_TILE */
-#define VMA_SELALLOC        0x00400000  /* Allocates selector */
-#define VMA_SHRINKABLE      0x00800000  /* OB_SHRINKABLE */
-#define VMA_HUGH            0x01000000  /* OB_HUGH */
+#define VMA_DISCARDABLE     0x00000800UL  /* discarable object */
+#define VMA_SHARE           0x00001000UL  /* OBJSHARE and OBJEXEC (which implies shared) */
+#define VMA_PROTECTED       0x00004000UL  /* PAG_PROTECTED */
+#define VMA_LOWMEM2         0x00010000UL  /* OB_LOWMEM */
+#define VMA_VDM             0x00040000UL  /* (VPMVMAC_VDM)    VDM allocation */
+#define VMA_DECOMMIT        0x00080000UL  /* PAG_DECOMMIT */
+#define VMA_TILE            0x00400000UL  /* OBJ_TILE */
+#define VMA_SELALLOC        0x00400000UL  /* Allocates selector */
+#define VMA_SHRINKABLE      0x00800000UL  /* OB_SHRINKABLE */
+#define VMA_HUGH            0x01000000UL  /* OB_HUGH */
 
-#define VMA_ARENASHARED     0x04000000  /* Shared Arena */
-#define VMA_ARENASYSTEM     0x00000000  /* System Arena */
-#define VMA_ARENAPRIVATE    0x02000000  /* Private Arena */
-#define VMA_ARENAHEAP       0x06000000  /* Heap Arena */
-#define VMA_ARENAHIGHA      0x00008000  /* High shared arena (Warp >= fp13) */
+#define VMA_ARENASHARED     0x04000000UL  /* Shared Arena */
+#define VMA_ARENASYSTEM     0x00000000UL  /* System Arena */
+#define VMA_ARENAPRIVATE    0x02000000UL  /* (VPMVMAC_ARENAPRV) Private Arena */
+#define VMA_ARENAHEAP       0x06000000UL  /* Heap Arena */
+#define VMA_ARENAHIGHA      0x00008000UL  /* High shared arena (Warp >= fp13) */
 #define VMA_ARENAHIGH   (options.ulBuild >= MERLINFP13 ? VMA_ARENAHIGHA : 0UL)
-#define VMA_ARENAMASKW      0x06000000  /* Warp < fp13 Arena Mask */
-#define VMA_ARENAMASKA      0x06008000  /* Aurora Arena Mask */
+#define VMA_ARENAMASKW      0x06000000UL  /* Warp < fp13 Arena Mask */
+#define VMA_ARENAMASKA      0x06008000UL  /* Aurora Arena Mask */
 #define VMA_ARENAMASK   (options.ulBuild >= MERLINFP13 ? VMA_ARENAMASKA : VMA_ARENAMASKW)
 
-#define VMA_LOCMASK         0xC0000000  /* Location mask */
-#define VMA_LOCSPECIFIC     0x80000000  /* Specific location */
-#define VMA_LOCABOVE        0x40000000  /* Above or equal to specified location */
-#define VMA_LOCANY          0x00000000  /* Anywhere */
+#define VMA_ALIGNPAGE       0x18000000UL  /* (VPMVMAC_ALIGNPAGE)      Page alignment */
+
+#define VMA_LOCMASK         0xC0000000UL  /* Location mask */
+#define VMA_LOCSPECIFIC     0x80000000UL  /* (VPMVMAC_LOCSPECIFIC)    Specific location */
+#define VMA_LOCABOVE        0x40000000UL  /* (VPMVMAC_LOCABOVE)       Above or equal to specified location */
+#define VMA_LOCANY          0x00000000UL  /* Anywhere */
 
 
@@ -68 +84 @@
  * VMAlloc flFlags2 guessings
  */
-#define VMAF2_WRITE         0x00000002 /* PAG_WRITE */
+#if 0 /*???*/
+#define VDHAM_FIXED         0x0000UL
+#define VDHAM_SWAPPABLE     0x0001UL
+#define VPMVMFM_VDM         0x00000004UL  /* Request on behalf of VDM */
+#endif
+
+#define VMAF2_WRITE         0x00000002UL  /* PAG_WRITE */
+