summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile1
-rw-r--r--kernel/console.c2
-rw-r--r--kernel/kernel.c75
-rw-r--r--kernel/kmalloc.c9
-rw-r--r--kernel/kmalloc.h2
-rw-r--r--kernel/mem.c176
-rw-r--r--kernel/mem.h3
-rw-r--r--kernel/multiboot.c33
-rw-r--r--kernel/vmem.c2
-rw-r--r--lib/logger/log.c2
-rw-r--r--terminal/vt52.c65
11 files changed, 181 insertions, 189 deletions
diff --git a/Makefile b/Makefile
index 7b5018f..c47f944 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,7 @@ SOURCES+=$(wildcard ./kernel/*.c)
SOURCES+=$(wildcard ./video/*.c)
SOURCES+=$(wildcard ./lib/*/*.c)
SOURCES+=$(wildcard ./fs/*.c)
+SOURCES+=$(wildcard ./terminal/*.c)
#derive kernel object files
OBJECTS=$(patsubst %.c, %.o, $(SOURCES))
diff --git a/kernel/console.c b/kernel/console.c
index c33c205..2244345 100644
--- a/kernel/console.c
+++ b/kernel/console.c
@@ -15,7 +15,7 @@
uint32_t console_init(uint32_t mode, uint32_t control){
scr_clear();
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"init console");
+ //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"init console");
return 0;
}
void console_del_char(){scr_backspace();}
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 657b69a..224f98b 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -25,14 +25,21 @@
#include "lib/buffer/ringbuffer.h"
#include "task.h"
#include "video/vesa.h"
+#include "multiboot.h"
void kernel_main(uint32_t eax,uint32_t ebx)
{
//
+ // Init Console
+ //
+
+ uint32_t physbase=console_init(0,0);
+
+ //
// PR
//
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%s",KERNEL_VERSION);
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%s - compiled on %s at %s",KERNEL_VERSION,__DATE__,__TIME__);
//
// Configuring the PIT timer.
@@ -44,27 +51,7 @@ void kernel_main(uint32_t eax,uint32_t ebx)
// Process Multiboot Header
//
- if(eax!=0x2badb002)panic(FOOLOS_MODULE_NAME,"EAX was not set properly by your bootlaoder!");
-
- multiboot_information *info;
- info=ebx;
- if(info->flags&&1<<9)
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Loaded by: \"%s\"",info->boot_loader_name);
- }
-
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"multiboot flags: 0x%08X",info->flags);
-
- if(info->flags&&1<<0)
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mem_lower: %d KB",info->mem_lower);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mem_upper: %d KB",info->mem_upper);
- }
-
- if(info->flags&&1<<2)
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"cmdline: \"%s\"",info->cmdline);
- }
+ multiboot_information *info=get_multiboot(eax, ebx);
//
// Memory Init
@@ -75,42 +62,16 @@ void kernel_main(uint32_t eax,uint32_t ebx)
// we know that here, the bootloader placed the memory map and
// its length
//
+ mem_init(info); //info->mmap_addr,info->mmap_length);
- if(info->flags&&1<<6)
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"memory map of length %d provided by bootloader",info->mmap_length);
- mem_init(info->mmap_addr,info->mmap_length);
- }
-
- else panic(FOOLOS_MODULE_NAME,"Unable to continue without memory map, sorry!");
-
- //
- // Modules
//
-
- if(info->flags&&1<<3)
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%d modules loaded",info->mods_count);
-
- multiboot_mod *mod=info->mods_addr;
-
- for(int i=0;i<info->mods_count;i++)
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mod at 0x%08X-0x%08X : %s",
- mod->mod_start,mod->mod_end, mod->string);
-
- mod++;
- }
- }
-
- //
- // Video
+ // Video TODO
//
+ /*
log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"VBE Info: 0x%04X (0x%08X 0x%08X)",info->vbe_mode,info->vbe_control_info, info->vbe_mode_info);
vbeinfo *vbe=info->vbe_mode_info;
//log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%c%c",'X',vbe->VbeSignature[0]);
- /*
uint16_t VbeVersion; // == 0x0300 for VBE 3.0
uint16_t OemStringPtr[2]; // isa vbeFarPtr
uint8_t Capabilities[4];
@@ -120,21 +81,11 @@ void kernel_main(uint32_t eax,uint32_t ebx)
//
- // init output to screen
- //
-
- uint32_t physbase=console_init(info->vbe_mode_info,info->vbe_control_info);
-
-
- //
// Activate Virtual Memory (paging)
//
pdirectory *dir=vmem_init(physbase);
- // log buffered messages to console
- log_log();
- while(1);
//
// Setup Interrupts (code segment: 0x08)
@@ -142,6 +93,8 @@ void kernel_main(uint32_t eax,uint32_t ebx)
int_init(0x08);
+ while(1);
+
//
// Scan the PCI Bus
diff --git a/kernel/kmalloc.c b/kernel/kmalloc.c
new file mode 100644
index 0000000..4939e05
--- /dev/null
+++ b/kernel/kmalloc.c
@@ -0,0 +1,9 @@
+#include "kmalloc.h"
+#include <stddef.h>
+
+static uint8_t data[1024*1024*8]; //8MB kernel memory managed by kmalloc
+
+uint32_t kmalloc(uint32_t size)
+{
+ return NULL;
+}
diff --git a/kernel/kmalloc.h b/kernel/kmalloc.h
new file mode 100644
index 0000000..330546b
--- /dev/null
+++ b/kernel/kmalloc.h
@@ -0,0 +1,2 @@
+#include <stdint.h>
+uint32_t kmalloc(uint32_t size);
diff --git a/kernel/mem.c b/kernel/mem.c
index f29c34f..f33b5d8 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -4,27 +4,28 @@
#include "config.h"
#include "multiboot.h"
-#include "lib/logger/log.h" // logger facilities
+#include "lib/logger/log.h"
-//! 8 blocks per byte
-#define PMMNGR_BLOCKS_PER_BYTE 8
-
-//! block size (4k)
+
+#define PMMNGR_BLOCKS_PER_BYTE 8
#define PMMNGR_BLOCK_SIZE 4096
-
-//! block alignment ??? TODO: what is this!?
-#define PMMNGR_BLOCK_ALIGN PMMNGR_BLOCK_SIZE
+#define PMMNGR_MAX_BLOCKS 1048576
+#define PMMNGR_MAP_SIZE PMMNGR_MAX_BLOCKS/PMMNGR_BLOCKS_PER_BYTE/4
+// defined in linker.ld and multiboot.s
extern uint32_t kernel_start[];
extern uint32_t kernel_end[];
extern uint32_t stack_top[];
extern uint32_t stack_bottom[];
-//memory map bit array. Each bit represents a 4KB memory block
-static uint32_t *_mmngr_memory_map;
-static uint32_t mem_free_blocks;
-static uint32_t mem_array_size;
+//memory map bit array. Each bit represents a 4KB memory block,
+//so uint32_t represents 8*4 blocks
+static uint32_t _mmngr_memory_map[PMMNGR_MAP_SIZE];
+
+static uint32_t mem_free_blocks; //number of free blocks
+static uint32_t mem_max_block; //index of highest usable block
+static uint32_t mem_min_block; //index of lowset block available to userspace
char *memmap_type_to_string[]=
{
@@ -62,7 +63,7 @@ void pmmngr_init ()
{
mem_free_blocks=0;
- for(int i=0;i<mem_array_size;i++)
+ for(int i=0;i<PMMNGR_MAP_SIZE;i++)
{
_mmngr_memory_map[i]=0xffffffff;
}
@@ -71,7 +72,7 @@ void pmmngr_init ()
//find the first free bit
int mmap_first_free ()
{
- for (int i=0; i< mem_array_size ; i++)
+ for (int i=0; i<mem_max_block ; i++)
if (_mmngr_memory_map[i] != 0xffffffff)
for (int j=0; j<32; j++)
{
@@ -81,31 +82,10 @@ int mmap_first_free ()
return -1;
}
-/*
-//find the first free consecutive x bits
-int mmap_first_free_s (uint32_t x)
-{
- int found=0;
-
- for (int i=0; i< mem_array_size; i++)
- if (_mmngr_memory_map[i] != 0xffffffff)
- for (int j=0; j<32; j++)
- {
- if(!mmap_test(32*i+j))found++;
- else found=0;
- if(found==x)return 32*i+j;
- }
-
- return -1;
-}
-*/
-
void pmmngr_init_region (uint32_t base, uint32_t size)
{
- uint32_t align = base / PMMNGR_BLOCK_SIZE +1; // TODO: calc properly
- uint32_t blocks = size / PMMNGR_BLOCK_SIZE -1;
-
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"init blocks: 0x%08X 0x%08X",base,size);
+ uint32_t align = base / PMMNGR_BLOCK_SIZE;
+ uint32_t blocks = size / PMMNGR_BLOCK_SIZE;
for (; blocks>0; blocks--)
{
@@ -116,10 +96,10 @@ void pmmngr_init_region (uint32_t base, uint32_t size)
void pmmngr_deinit_region (uint32_t base, uint32_t size)
{
- uint32_t align = base / PMMNGR_BLOCK_SIZE -1; // TODO: calc properly
- uint32_t blocks = size / PMMNGR_BLOCK_SIZE +2;
+ uint32_t align = base / PMMNGR_BLOCK_SIZE;
+ uint32_t blocks = size / PMMNGR_BLOCK_SIZE;
- //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%08X, %08X -> deinit %d blocks",base,size,blocks);
+ if(size%PMMNGR_BLOCK_SIZE)blocks++;
for (; blocks>0; blocks--)
{
@@ -146,30 +126,7 @@ void* pmmngr_alloc_block ()
return (void*)addr;
}
-/*
-
-void* pmmngr_alloc_blocks (uint32_t size)
-{
-
- int frame = mmap_first_free_s (size);
- if (frame == -1)
- {
- panic(FOOLOS_MODULE_NAME,"OUT OF MEMORY (alloc_blocks)");
- return 0; //out of memory
- }
-
- for (int i=0; i<size; i++)
- {
- mmap_set (frame+i);
- mem_free_blocks--;
- }
-
- uint32_t addr = frame * PMMNGR_BLOCK_SIZE;
-
- return (void*)addr;
-}
-*/
void pmmngr_free_block (void* p)
{
@@ -192,18 +149,26 @@ void pmmngr_free_block (void* p)
}
-void mem_init(uint32_t memmap,uint32_t length)
+void mem_init(multiboot_information *info)
{
+ if(info->flags&&1<<6)
+ {
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"memory map of length %d provided by bootloader",info->mmap_length);
+ }
+ else panic(FOOLOS_MODULE_NAME,"Unable to continue without memory map, sorry!");
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"kernel loaded at: 0x%08X- 0x%08X",kernel_start,kernel_end);
+ pmmngr_init (); //clear memmap
+
+ uint64_t memmap=info->mmap_addr;
+ uint64_t length=info->mmap_length;
- // we will place the memory map directly after the kernel for now (TODO: move somewehere else, so modules are not overwritten!)
- _mmngr_memory_map=kernel_end;
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"kernel loaded at: 0x%08X- 0x%08X",kernel_start,kernel_end);
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"initial stack at: 0x%08X- 0x%08X",stack_top,stack_bottom);
// count available mem and track high_end of usable memory
uint32_t total_mem=0, highest_end;
- // iterate : print memory map and calc blocks.
+ // iterate : print memory map, calc blocks, deinit
for(uint32_t mmap_addr=memmap;mmap_addr<memmap+length;)
{
multiboot_mmap *mmap=mmap_addr;
@@ -222,6 +187,7 @@ void mem_init(uint32_t memmap,uint32_t length)
{
total_mem+=mem;
highest_end=mmap->base_addr+mmap->length-1;
+ pmmngr_init_region(mmap->base_addr,mmap->length);
}
//next
@@ -229,69 +195,33 @@ void mem_init(uint32_t memmap,uint32_t length)
}
uint32_t blocks=highest_end/4096+1;
- mem_array_size=blocks/32+1;
+ mem_max_block=blocks/32+1;
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Init bitmap for %d blocks (array size: %d bytes)",blocks,mem_array_size*4);
-
- pmmngr_init (); //clear memmap
-
- // iterate : initialize memory
- for(uint32_t mmap_addr=memmap;mmap_addr<memmap+length;)
+ // deinit modules memory
+ if(info->flags&&1<<3)
{
- multiboot_mmap *mmap=mmap_addr;
-
- //reclaimable OR usable
- if(mmap->type==1||mmap->type==3)
+ multiboot_mod *mod=info->mods_addr;
+ for(int i=0;i<info->mods_count;i++)
{
- pmmngr_init_region(mmap->base_addr,mmap->length);
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mod 0x%08X-0x%08X : %s",
+ mod->mod_start,mod->mod_end, mod->string);
+
+ mem_min_block=mod->mod_end/PMMNGR_BLOCK_SIZE+1;
+
+ pmmngr_deinit_region(mod->mod_start,((uint32_t)mod->mod_end-(uint32_t)mod->mod_start)+1);
+
+ mod++;
}
-
- //next
- mmap_addr+=mmap->size+4;
}
-
- // deinitialize kernel + memory (TODO: modules)
- pmmngr_deinit_region(kernel_start,((uint32_t)kernel_end-(uint32_t)kernel_start));
- pmmngr_deinit_region(_mmngr_memory_map,mem_array_size*4+PMMNGR_BLOCK_SIZE);
- pmmngr_deinit_region(0,0x700000);
+ // deinitialize kernel
+ pmmngr_deinit_region(kernel_start,((uint32_t)kernel_end-(uint32_t)kernel_start)+1);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Usable Mem: %d (0x%X) bytes. (~%d MB)",total_mem,total_mem,total_mem/1024/1024);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Currently Free 4K blocks: %d blocks.",mem_free_blocks);
- // mmap_show_free();
-}
-
-// analytics
-void mmap_show_free ()
-{
-
- int last_pos=0;
- uint32_t last=_mmngr_memory_map[0];
-
- for (int i=1; i< mem_array_size ; i++)
- {
- if (_mmngr_memory_map[i] != last||i==mem_array_size-1)
- {
-
- if(last==0)
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%d -%d free",last_pos*32,i*32);
- }
- else if(last==0xffffffff)
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%d -%d full",last_pos*32,i*32);
- }
- else
- {
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%d -%d some free",last_pos*32,i*32);
- }
-
- last_pos=i;
- last=_mmngr_memory_map[i];
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Usable ~%d / %d MB ",mem_free_blocks*4096/1024/1024,total_mem/1024/1024);
-
- }
- }
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,
+ "Free 4K blocks: %d (first free: %d)",mem_free_blocks,mem_min_block);
}
+
diff --git a/kernel/mem.h b/kernel/mem.h
index 521bc4a..32b1160 100644
--- a/kernel/mem.h
+++ b/kernel/mem.h
@@ -1,4 +1,5 @@
#include "types.h"
+#include "multiboot.h"
physical_address* pmmngr_alloc_block ();
void pmmngr_free_block (physical_address* p);
-void mem_init(physical_address *memmap,int entries);
+void mem_init(multiboot_information *info);
diff --git a/kernel/multiboot.c b/kernel/multiboot.c
new file mode 100644
index 0000000..c294ee2
--- /dev/null
+++ b/kernel/multiboot.c
@@ -0,0 +1,33 @@
+
+#define FOOLOS_MODULE_NAME "multiboot"
+#include "multiboot.h"
+#include "lib/logger/log.h"
+
+uint32_t* get_multiboot(uint32_t eax, uint32_t ebx)
+{
+
+ if(eax!=0x2badb002)panic(FOOLOS_MODULE_NAME,"EAX was not set properly by your bootlaoder!");
+ multiboot_information *info;
+ info=ebx;
+
+ if(info->flags&&1<<9)
+ {
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Loaded by: \"%s\"",info->boot_loader_name);
+ }
+
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"multiboot flags: 0x%08X",info->flags);
+
+ if(info->flags&&1<<0)
+ {
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mem_lower: %d KB",info->mem_lower);
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mem_upper: %d KB",info->mem_upper);
+ }
+
+ if(info->flags&&1<<2)
+ {
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"cmdline: \"%s\"",info->cmdline);
+ }
+
+ return info;
+
+}
diff --git a/kernel/vmem.c b/kernel/vmem.c
index c2892c7..ffd39c8 100644
--- a/kernel/vmem.c
+++ b/kernel/vmem.c
@@ -49,8 +49,6 @@ enum PAGE_PDE_FLAGS
//! virtual address
typedef uint32_t virtual_addr;
typedef uint32_t physical_addr;
-
-typedef uint8_t bool;
////
void pt_entry_add_attrib (pt_entry* e, uint32_t attrib)
diff --git a/lib/logger/log.c b/lib/logger/log.c
index 9f859bc..a51ccf5 100644
--- a/lib/logger/log.c
+++ b/lib/logger/log.c
@@ -13,7 +13,7 @@
static char buffer[LOG_BUF_SIZE];
static int first=0;
static int last=0;
-static bool init=false;
+static bool init=true;//
void log(char *module_name, int log_level, char *format_string, ...)
{
diff --git a/terminal/vt52.c b/terminal/vt52.c
new file mode 100644
index 0000000..813cf40
--- /dev/null
+++ b/terminal/vt52.c
@@ -0,0 +1,65 @@
+//
+// http://en.wikipedia.org/wiki/VT52
+//
+//
+//
+// ------------
+// PROG <---> | VT 52 | <--- Keyboard
+// | | ---> Screen
+// ------------
+
+
+
+// REQUIREMENTS
+// * kmalloc
+
+#include <stdint.h>
+#include "kernel/kmalloc.h"
+
+//TODO: check?
+#define VT52_WIDTH 80
+#define VT52_HEIGHT 24
+#define VT52_ESC 0x33
+
+typedef struct vt52_tty_struct
+{
+
+ uint8_t x;
+ uint8_t y;
+ uint8_t *data; // screen data
+
+}vt52_tty;
+
+
+vt52_tty *vt52_init()
+{
+ vt52_tty *tty=kmalloc(sizeof(vt52_tty));
+ return tty;
+}
+
+
+// User interaction
+void putKey(uint32_t code)
+{
+
+}
+
+void refreshScreen()
+{
+
+}
+
+// Programm Interaction
+void put()
+{
+
+}
+
+void get()
+{
+
+}
+
+
+
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-08 20:51:17 +0000