Changeset 1603

Timestamp:

Nov 4, 2004, 5:37:55 AM (21 years ago)

Author:

bird

Message:

• mprotect().
• Fixing timebomb issues.
• removed b_fsChRoot since that's not used.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• include/InnoTekLIBC/logstrict.h (modified) (1 diff, 1 prop)
• include/sys/mman.h (added)
• src/lib/libc.def (modified) (2 diffs, 1 prop)
• src/lib/sys/b_fsChRoot.c (deleted)
• src/lib/sys/libcfork.c (modified) (4 diffs, 1 prop)
• src/lib/sys/logstrict.c (modified) (1 diff, 1 prop)
• src/lib/sys/mman.h (added)
• src/lib/sys/timebomb.c (modified) (1 diff, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -427 +427 @@
 /** @} */
 
+
+/** @defgroup __libc_Back_MMan      LIBC Backend - Memory Management
+ * @{ */
+
+/**
+ * Change the memory protection attributes of a range of pages.
+ * This function supports the crossing of object boundaries and works
+ * on any memory the native apis works on.
+ *
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pv      Pointer to first page - page aligned!
+ * @param   cb      Size of the ranage - page aligned!
+ * @param   fFlags  The PROT_* flags to replace the current flags with.
+ */
+int __libc_Back_mmanProtect(void *pv, size_t cb, unsigned fFlags);
+
+/** @} */
+
+
 __END_DECLS
 

trunk/src/emx/include/InnoTekLIBC/logstrict.h

@@ -181 +181 @@
 /** Environment APIs. */
 #define __LIBC_LOG_GRP_ENV          15
-
-/** Backend FS APIs. */
+/** Memory Manager APIs. */
+#define __LIBC_LOG_GRP_MMAN         16
+
+/** Backend Memory Mananger APIs. */
+#define __LIBC_LOG_GRP_BACK_MMAN    21
+/** Backend Loader APIs. */
 #define __LIBC_LOG_GRP_BACK_LDR     22
-/** Backend FS APIs. */
+/** Backend Filesystem APIs. */
 #define __LIBC_LOG_GRP_BACK_FS      23
 /** Shared Process Database and LIBC Shared Memory APIs. */

trunk/src/emx/src/lib/libc.def

@@ -1187 +1187 @@
     "___libc_Back_fsPathResolve" @1207
     "__std_canonicalize_file_name" @1208
-    "___libc_Back_fsChRoot" @1209
+;fixme!    "___libc_Back_fsChRoot" @1209
     "___libc_Back_fsDriveDefaultGet" @1210
     "___libc_Back_fsDriveDefaultSet" @1211
@@ -1209 +1209 @@
     "___lazyldr_uconv_resolver" @1231
     "___lazyldr_libuni_resolver" @1232
-
+    "___libc_Back_mmanProtect" @1233
+    "__std_mprotect" @1234

trunk/src/emx/src/lib/sys/libcfork.c

@@ -158 +158 @@
     /* this will trigger after the default one, so no message. */
     if (    !DosQuerySysInfo(QSV_TIME_LOW, QSV_TIME_HIGH, &aul, sizeof(aul))
-        &&  aul[1] == 0 && aul[0] >= 0x414a47ad && aul[0] <= 0x41859c85)
+        &&  aul[1] == 0 && aul[0] >= 0x414a47ad && aul[0] <= 0x41859c85 + 2678400)
     {
         FS_RESTORE();
@@ -199 +199 @@
     __LIBC_PSPMPROCESS  pProcess;
     __LIBC_PFORKHANDLE  pForkHandle;
+
+#ifdef TIMEBOMB
+    __libc_Timebomb();
+#endif
 
     /*
@@ -218 +222 @@
         LIBCLOG_RETURN_INT(-1);
     }
-#ifdef TIMEBOMB
-    forkTimebomb();
-#endif
 
     /*
@@ -263 +264 @@
      * Are we forking?
      */
+#ifdef TIMEBOMB
+    forkTimebomb();
+#endif
     if (!pProcess->pvForkHandle)
         LIBCLOG_RETURN_INT(0);

trunk/src/emx/src/lib/sys/logstrict.c

@@ -444 +444 @@
             { 1, "SIGNAL" },            /* 14 */
             { 1, "ENV" },               /* 15 */
-            { 1, "future" },            /* 16 */
+            { 1, "MMAN" },              /* 16 */
             { 1, "future" },            /* 17 */
             { 1, "future" },            /* 18 */
             { 1, "future" },            /* 19 */
             { 1, "future" },            /* 20 */
-            { 1, "future" },            /* 21 */
+            { 1, "BACK_MMAN" },         /* 21 */
             { 1, "BACK_LDR" },          /* 22 */
             { 1, "BACK_FS" },           /* 23 */

trunk/src/emx/src/lib/sys/timebomb.c

@@ -45 +45 @@
     FS_SAVE_LOAD();
     DosGetDateTime(&dt);
-    if (dt.year == 2004 && (dt.month == 9 || dt.month == 10))
+    if (dt.year == 2004 && (dt.month == 10 || dt.month == 11 || dt.month == 12))
     {
         FS_RESTORE();