Changeset bf9afa07 in mainline

Timestamp:

2006-06-02T11:35:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2d22049

Parents:

49d072e

Message:

Allocation function for allocating free areas for mmap, map_physmem etc.

Files:

• fb/ega.c (modified) (2 diffs)
• fb/fb.c (modified) (3 diffs)
• libc/generic/as.c (modified) (4 diffs)
• libc/generic/time.c (modified) (3 diffs)
• libc/include/align.h (modified) (1 diff)
• libc/include/as.h (modified) (1 diff)
• ns/ns.c (modified) (1 diff)

fb/ega.c

@@ -112 +112 @@
 {
         void *ega_ph_addr;
+        size_t sz;
 
 
@@ -118 +119 @@
         scr_height=sysinfo_value("fb.height");
 
-        scr_addr=(void *)ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE);
+        sz = scr_width*scr_height*2;
+        scr_addr = as_get_mappable_page(sz);
 
-        if (ega_ph_addr != ALIGN_DOWN((unsigned long)ega_ph_addr, PAGE_SIZE))
-                return -1;
-        
-        map_physmem(ega_ph_addr, scr_addr, (scr_width*scr_height*2+PAGE_SIZE-1)>>PAGE_WIDTH,
+        map_physmem(ega_ph_addr, scr_addr, ALIGN_UP(sz,PAGE_SIZE)>>PAGE_WIDTH,
                     AS_AREA_READ | AS_AREA_WRITE);
-
 
         async_set_client_connection(ega_client_connection);

fb/fb.c

@@ -360 +360 @@
  *
  */
-static void screen_init(__address addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan)
+static void screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan)
 {
         switch (bpp) {
@@ -598 +598 @@
 int fb_init(void)
 {
-        __address fb_ph_addr;
+        void *fb_ph_addr;
         unsigned int fb_width;
         unsigned int fb_height;
         unsigned int fb_bpp;
         unsigned int fb_scanline;
-        __address fb_addr;
+        void *fb_addr;
+        size_t asz;
 
         async_set_client_connection(fb_client_connection);
 
-        fb_ph_addr=sysinfo_value("fb.address.physical");
+        fb_ph_addr=(void *)sysinfo_value("fb.address.physical");
         fb_width=sysinfo_value("fb.width");
         fb_height=sysinfo_value("fb.height");
@@ -613 +614 @@
         fb_scanline=sysinfo_value("fb.scanline");
 
-        fb_addr=ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE);
+        asz = fb_scanline*fb_height;
+        fb_addr = as_get_mappable_page(asz);
         
-        map_physmem((void *)((__address)fb_ph_addr),(void *)fb_addr,
-                    (fb_scanline*fb_height+PAGE_SIZE-1)>>PAGE_WIDTH,
+        map_physmem(fb_ph_addr, fb_addr, ALIGN_UP(asz,PAGE_SIZE) >>PAGE_WIDTH,
                     AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         

libc/generic/as.c

@@ -27 +27 @@
  */ 
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ddi.h>
+#include <sysinfo.h>
+#include <align.h>
+#include <as.h>
+#include <ipc/fb.h>
+#include <ipc/ipc.h>
+#include <ipc/ns.h>
+#include <ipc/services.h>
+#include <kernel/errno.h>
+
+
 #include <as.h>
 #include <libc.h>
 #include <unistd.h>
-#include <task.h>
+#include <align.h>
 
 /** Create address space area.
@@ -71 +85 @@
 static size_t heapsize = 0;
 static size_t maxheapsize = (size_t)(-1);
+
+static void * last_allocated = 0;
+
 /* Start of heap linker symbol */
 extern char _heap;
@@ -108 +125 @@
 }
 
+/** Set maximum heap size and return pointer just after the heap */
 void *set_maxheapsize(size_t mhs)
 {
@@ -115 +133 @@
 
 }
+
+/** Return pointer to some unmapped area, where fits new as_area
+ *
+ * TODO: make some first_fit/... algorithm, we are now just incrementing
+ *       the pointer to last area
+ */
+void * as_get_mappable_page(size_t sz)
+{
+        void *res;
+
+        /* Set heapsize to some meaningful value */
+        if (maxheapsize == -1)
+                set_maxheapsize(ALIGN_UP(USER_ADDRESS_SPACE_SIZE_ARCH>>1,PAGE_SIZE));
+        if (!last_allocated)
+                last_allocated = ALIGN_UP((void *)&_heap + maxheapsize, PAGE_SIZE);
+        
+        sz = ALIGN_UP(sz, PAGE_SIZE);
+        res = last_allocated;
+        last_allocated += sz;
+
+        return res;
+}

libc/generic/time.c

@@ -57 +57 @@
  * sequence of subsequent gettimeofday calls is ordered.
  */
-#define TMAREA (100*1024*1024)
 int gettimeofday(struct timeval *tv, struct timezone *tz)
 {
@@ -66 +65 @@
 
         if (!ktime) {
-                /* TODO: specify better, where to map the area */
+                mapping = as_get_mappable_page(PAGE_SIZE);
                 /* Get the mapping of kernel clock */
                 res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, 
-                                      TMAREA,
-                                      PAGE_SIZE,
-                                      0,
+                                      mapping, PAGE_SIZE, 0,
                                       NULL,&rights,NULL);
                 if (res) {
@@ -80 +77 @@
                         printf("Received bad rights on time area: %X\n",
                                rights);
-                        as_area_destroy(TMAREA);
+                        as_area_destroy(mapping);
                         _exit(1);
                 }
-                ktime = (void *) (TMAREA);
+                ktime = mapping;
         }
         if (tz) {

libc/include/align.h

@@ -43 +43 @@
  * @param a Size of alignment, must be power of 2.
  */
-#define ALIGN_UP(s, a)          (((s) + ((a) - 1)) & ~((a) - 1))
+#define ALIGN_UP(s, a)          ((long)((s) + ((a) - 1)) & ~((long) (a) - 1))
 
 #endif

libc/include/as.h

@@ -41 +41 @@
 extern int as_area_destroy(void *address);
 extern void *set_maxheapsize(size_t mhs);
+extern void * as_get_mappable_page(size_t sz);
 
 #endif

ns/ns.c

@@ -88 +88 @@
                         return;
                 }
-                addr = (void *)(200*1024*1024); /* TODO: intelligent freemem space */
+                addr = as_get_mappable_page(PAGE_SIZE);
                 map_physmem(ph_addr, addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
         }