Kernel - Fixing bugs exposed by enabling -O3

[tpg/acess2.git] / Kernel / vfs / mmap.c

diff --git a/Kernel/vfs/mmap.c b/Kernel/vfs/mmap.c
index e3e6d94..f4132d5 100644 (file)
--- a/Kernel/vfs/mmap.c
+++ b/Kernel/vfs/mmap.c
@@ -1,6 +1,9 @@
 /*
- * Acess2 VFS
- * - Open, Close and ChDir
+ * Acess2 Kernel VFS
+ * - By John Hodge (thePowersGang)
+ *
+ * mmap.c
+ * - VFS_MMap support
  */
 #define DEBUG  0
 #include <acess.h>
@@ -29,6 +32,9 @@ void *VFS_MMap(void *DestHint, size_t Length, int Protection, int Flags, int FD,
 
        ENTER("pDestHint iLength xProtection xFlags xFD XOffset", DestHint, Length, Protection, Flags, FD, Offset);
 
+       if( Flags & MMAP_MAP_ANONYMOUS )
+               Offset = (tVAddr)DestHint & 0xFFF;
+       
        npages = ((Offset & (PAGE_SIZE-1)) + Length + (PAGE_SIZE - 1)) / PAGE_SIZE;
        pagenum = Offset / PAGE_SIZE;
 
@@ -41,14 +47,19 @@ void *VFS_MMap(void *DestHint, size_t Length, int Protection, int Flags, int FD,
        if( Flags & MMAP_MAP_ANONYMOUS )
        {
                size_t  ofs = 0;
+               LOG("%i pages anonymous to %p", npages, mapping_dest);
                for( ; npages --; mapping_dest += PAGE_SIZE, ofs += PAGE_SIZE )
                {
                        if( MM_GetPhysAddr(mapping_dest) ) {
                                // TODO: Set flags to COW if needed (well, if shared)
                                MM_SetFlags(mapping_dest, MM_PFLAG_COW, MM_PFLAG_COW);
+                               LOG("clear from %p, %i bytes", (void*)(mapping_base + ofs),
+                                       PAGE_SIZE - (mapping_base & (PAGE_SIZE-1))
+                                       );
                                memset( (void*)(mapping_base + ofs), 0, PAGE_SIZE - (mapping_base & (PAGE_SIZE-1)));
                        }
                        else {
+                               LOG("New empty page");
                                // TODO: Map a COW zero page instead
                                if( !MM_Allocate(mapping_dest) ) {
                                        // TODO: Error
@@ -143,6 +154,13 @@ void *VFS_MMap(void *DestHint, size_t Length, int Protection, int Flags, int FD,
                        else {
                                MM_SetFlags(mapping_dest, 0, MM_PFLAG_RO);
                        }
+                       
+                       if( Protection & MMAP_PROT_EXEC ) {
+                               MM_SetFlags(mapping_dest, MM_PFLAG_EXEC, MM_PFLAG_EXEC);
+                       }
+                       else {
+                               MM_SetFlags(mapping_dest, 0, MM_PFLAG_EXEC);
+                       }
                }
                else
                {