Changeset 3571 for trunk/kStuff/kLdr/kLdrModLX.c

Timestamp:

Aug 31, 2007, 4:39:26 AM (18 years ago)

Author:

bird

Message:

Eliminated KLDRPROT.

File:

• trunk/kStuff/kLdr/kLdrModLX.c (modified) (5 diffs)

trunk/kStuff/kLdr/kLdrModLX.c

@@ -470 +470 @@
             case 0:
             case OBJSHARED:
-                pMod->aSegments[i].enmProt = KLDRPROT_NOACCESS;
+                pMod->aSegments[i].enmProt = KPROT_NOACCESS;
                 break;
             case OBJREAD:
             case OBJREAD | OBJSHARED:
-                pMod->aSegments[i].enmProt = KLDRPROT_READONLY;
+                pMod->aSegments[i].enmProt = KPROT_READONLY;
                 break;
             case OBJWRITE:
             case OBJWRITE | OBJREAD:
-                pMod->aSegments[i].enmProt = KLDRPROT_WRITECOPY;
+                pMod->aSegments[i].enmProt = KPROT_WRITECOPY;
                 break;
             case OBJWRITE | OBJSHARED:
             case OBJWRITE | OBJSHARED | OBJREAD:
-                pMod->aSegments[i].enmProt = KLDRPROT_READWRITE;
+                pMod->aSegments[i].enmProt = KPROT_READWRITE;
                 break;
             case OBJEXEC:
             case OBJEXEC | OBJSHARED:
-                pMod->aSegments[i].enmProt = KLDRPROT_EXECUTE;
+                pMod->aSegments[i].enmProt = KPROT_EXECUTE;
                 break;
             case OBJEXEC | OBJREAD:
             case OBJEXEC | OBJREAD | OBJSHARED:
-                pMod->aSegments[i].enmProt = KLDRPROT_EXECUTE_READ;
+                pMod->aSegments[i].enmProt = KPROT_EXECUTE_READ;
                 break;
             case OBJEXEC | OBJWRITE:
             case OBJEXEC | OBJWRITE | OBJREAD:
-                pMod->aSegments[i].enmProt = KLDRPROT_EXECUTE_WRITECOPY;
+                pMod->aSegments[i].enmProt = KPROT_EXECUTE_WRITECOPY;
                 break;
             case OBJEXEC | OBJWRITE | OBJSHARED:
             case OBJEXEC | OBJWRITE | OBJSHARED | OBJREAD:
-                pMod->aSegments[i].enmProt = KLDRPROT_EXECUTE_READWRITE;
+                pMod->aSegments[i].enmProt = KPROT_EXECUTE_READWRITE;
                 break;
         }
         if ((pModLX->paObjs[i].o32_flags & (OBJREAD | OBJWRITE | OBJEXEC | OBJRSRC)) == OBJRSRC)
-            pMod->aSegments[i].enmProt = KLDRPROT_READONLY;
+            pMod->aSegments[i].enmProt = KPROT_READONLY;
         /*pMod->aSegments[i].f16bit = !(pModLX->paObjs[i].o32_flags & OBJBIGDEF)
         pMod->aSegments[i].fIOPL = !(pModLX->paObjs[i].o32_flags & OBJIOPL)
@@ -1345 +1345 @@
             return KLDR_ERR_ADDRESS_OVERFLOW;
     }
-    rc = kldrHlpPageAlloc(&pvBase, pModLX->cbMapped, KLDRPROT_EXECUTE_READWRITE, fFixed);
+    rc = kldrHlpPageAlloc(&pvBase, pModLX->cbMapped, KPROT_EXECUTE_READWRITE, fFixed);
     if (rc)
         return rc;
@@ -1829 +1829 @@
         int rc;
         void *pv;
-        KLDRPROT enmProt;
+        KPROT enmProt;
 
         /* calc new protection. */
@@ -1837 +1837 @@
             switch (enmProt)
             {
-                case KLDRPROT_NOACCESS:
-                case KLDRPROT_READONLY:
-                case KLDRPROT_READWRITE:
-                case KLDRPROT_WRITECOPY:
-                    enmProt = KLDRPROT_READWRITE;
+                case KPROT_NOACCESS:
+                case KPROT_READONLY:
+                case KPROT_READWRITE:
+                case KPROT_WRITECOPY:
+                    enmProt = KPROT_READWRITE;
                     break;
-                case KLDRPROT_EXECUTE:
-                case KLDRPROT_EXECUTE_READ:
-                case KLDRPROT_EXECUTE_READWRITE:
-                case KLDRPROT_EXECUTE_WRITECOPY:
-                    enmProt = KLDRPROT_EXECUTE_READWRITE;
+                case KPROT_EXECUTE:
+                case KPROT_EXECUTE_READ:
+                case KPROT_EXECUTE_READWRITE:
+                case KPROT_EXECUTE_WRITECOPY:
+                    enmProt = KPROT_EXECUTE_READWRITE;
                     break;
                 default:
@@ -1857 +1857 @@
         {
             /* copy on write -> normal write. */
-            if (enmProt == KLDRPROT_EXECUTE_WRITECOPY)
-                enmProt = KLDRPROT_EXECUTE_READWRITE;
-            else if (enmProt == KLDRPROT_WRITECOPY)
-                enmProt = KLDRPROT_READWRITE;
+            if (enmProt == KPROT_EXECUTE_WRITECOPY)
+                enmProt = KPROT_EXECUTE_READWRITE;
+            else if (enmProt == KPROT_WRITECOPY)
+                enmProt = KPROT_READWRITE;
         }