regression: elf loading

[lunaix-os.git] / lunaix-os / includes / lunaix / common.h

diff --git a/lunaix-os/includes/lunaix/common.h b/lunaix-os/includes/lunaix/common.h
index 64820083092128555119e2ee2f8850d5a8a8702c..daa55af83023e921746a6fc788a96716e4421d7f 100644 (file)
--- a/lunaix-os/includes/lunaix/common.h
+++ b/lunaix-os/includes/lunaix/common.h
@@ -1,29 +1,38 @@
 #ifndef __LUNAIX_CONSTANTS_H
 #define __LUNAIX_CONSTANTS_H
 
-#define KSTACK_SIZE             (64 << 10)
-#define KSTACK_START            ((0xFFBFFFFFU - KSTACK_SIZE) + 1)
-#define KSTACK_TOP              0xffbffff0
-#define HIGHER_HLF_BASE         0xC0000000
-#define MEM_1MB                 0x100000
-
-#define VGA_BUFFER_VADDR        0xB0000000
-#define VGA_BUFFER_PADDR        0xB8000
-#define VGA_BUFFER_SIZE         4096
-
-#define KCODE_SEG              0x08
-#define KDATA_SEG              0x10
-#define UCODE_SEG              0x1B
-#define UDATA_SEG              0x23
-#define TSS_SEG                0x28
-
-#define USER_START             0x400000
-#define USTACK_SIZE            0x100000
-#define USTACK_TOP             0x9fffffff
-#define USTACK_END             (USTACK_TOP - USTACK_SIZE + 1)
-#define UMMAP_AREA             0x4D000000
-
-#define SYS_TIMER_FREQUENCY_HZ  2048
+#define PG_SIZE_BITS 12
+#define PG_SIZE (1 << PG_SIZE_BITS)
+#define PG_INDEX_BITS 10
+
+#define MEM_1MB 0x100000
+#define MEM_4MB 0x400000
+
+#define USER_START 0x400000
+
+#define KSTACK_SIZE MEM_1MB
+#define KSTACK_START (USER_START - KSTACK_SIZE)
+#define KSTACK_TOP ((USER_START - 1) & ~0xf)
+
+#define KERNEL_MM_BASE 0xC0000000
+
+#define KCODE_MAX_SIZE MEM_4MB
+// #define KHEAP_START (KERNEL_MM_BASE + KCODE_MAX_SIZE)
+// #define KHEAP_SIZE_MB 256
+
+#define VGA_FRAMEBUFFER 0xB8000
+
+#define KCODE_SEG 0x08
+#define KDATA_SEG 0x10
+#define UCODE_SEG 0x1B
+#define UDATA_SEG 0x23
+#define TSS_SEG 0x28
+
+#define USTACK_SIZE MEM_4MB
+#define USTACK_TOP 0x9ffffff0
+#define USTACK_END (0x9fffffff - USTACK_SIZE + 1)
+#define UMMAP_START 0x4D000000
+#define UMMAP_END (USTACK_END - MEM_4MB)
 
 #ifndef __ASM__
 #include <stddef.h>
@@ -36,9 +45,11 @@
  * @member:    the name of the member within the struct.
  *
  */
-#define container_of(ptr, type, member) ({                     \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);   \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
+#define container_of(ptr, type, member)                                        \
+    ({                                                                         \
+        const typeof(((type*)0)->member)* __mptr = (ptr);                      \
+        (ptr) ? (type*)((char*)__mptr - offsetof(type, member)) : 0;           \
+    })
 
 #endif
 #endif /* __LUNAIX_CONSTANTS_H */