Got memory info from multiboot & minor adjustments

kernel/include/kernel.h

@@ -60,6 +60,13 @@ typedef int32_t		ssize_t;
 typedef uint32_t	uintptr_t;
 typedef int32_t		intptr_t;
 
+/*
+ * Boolean
+ */
+#define bool _Bool
+#define true 1
+#define false 0
+
 /*
  * Logging and errors
  */
@@ -69,7 +76,11 @@ typedef int32_t		intptr_t;
 #define WARN()		NULL
 #define BUG_ON(_e)	((_e) ? BUG() : NULL)
 #define WARN_ON(_e)	((_e) ? WARN() : NULL)
-// TODO: Write a panic()
+#include <serial.h>
-#define panic(_s)	while(1);
+__noreturn static inline void panic(char* s) { 
+	serial_puts(COM1, s);
+	__asm__ volatile("cli");
+	while (1) __asm__ volatile ("hlt");
+}
 
 #endif

kernel/include/multiboot.h

@@ -0,0 +1,274 @@
+/* multiboot.h - Multiboot header file. */
+/* Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to
+ *  deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ *  sell copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL ANY
+ *  DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef MULTIBOOT_HEADER
+#define MULTIBOOT_HEADER 1
+
+/* How many bytes from the start of the file we search for the header. */
+#define MULTIBOOT_SEARCH                        8192
+#define MULTIBOOT_HEADER_ALIGN                  4
+
+/* The magic field should contain this. */
+#define MULTIBOOT_HEADER_MAGIC                  0x1BADB002
+
+/* This should be in %eax. */
+#define MULTIBOOT_BOOTLOADER_MAGIC              0x2BADB002
+
+/* Alignment of multiboot modules. */
+#define MULTIBOOT_MOD_ALIGN                     0x00001000
+
+/* Alignment of the multiboot info structure. */
+#define MULTIBOOT_INFO_ALIGN                    0x00000004
+
+/* Flags set in the ’flags’ member of the multiboot header. */
+
+/* Align all boot modules on i386 page (4KB) boundaries. */
+#define MULTIBOOT_PAGE_ALIGN                    0x00000001
+
+/* Must pass memory information to OS. */
+#define MULTIBOOT_MEMORY_INFO                   0x00000002
+
+/* Must pass video information to OS. */
+#define MULTIBOOT_VIDEO_MODE                    0x00000004
+
+/* This flag indicates the use of the address fields in the header. */
+#define MULTIBOOT_AOUT_KLUDGE                   0x00010000
+
+/* Flags to be set in the ’flags’ member of the multiboot info structure. */
+
+/* is there basic lower/upper memory information? */
+#define MULTIBOOT_INFO_MEMORY                   0x00000001
+/* is there a boot device set? */
+#define MULTIBOOT_INFO_BOOTDEV                  0x00000002
+/* is the command-line defined? */
+#define MULTIBOOT_INFO_CMDLINE                  0x00000004
+/* are there modules to do something with? */
+#define MULTIBOOT_INFO_MODS                     0x00000008
+
+/* These next two are mutually exclusive */
+
+/* is there a symbol table loaded? */
+#define MULTIBOOT_INFO_AOUT_SYMS                0x00000010
+/* is there an ELF section header table? */
+#define MULTIBOOT_INFO_ELF_SHDR                 0X00000020
+
+/* is there a full memory map? */
+#define MULTIBOOT_INFO_MEM_MAP                  0x00000040
+
+/* Is there drive info? */
+#define MULTIBOOT_INFO_DRIVE_INFO               0x00000080
+
+/* Is there a config table? */
+#define MULTIBOOT_INFO_CONFIG_TABLE             0x00000100
+
+/* Is there a boot loader name? */
+#define MULTIBOOT_INFO_BOOT_LOADER_NAME         0x00000200
+
+/* Is there a APM table? */
+#define MULTIBOOT_INFO_APM_TABLE                0x00000400
+
+/* Is there video information? */
+#define MULTIBOOT_INFO_VBE_INFO                 0x00000800
+#define MULTIBOOT_INFO_FRAMEBUFFER_INFO         0x00001000
+
+#ifndef ASM_FILE
+
+typedef unsigned char           multiboot_uint8_t;
+typedef unsigned short          multiboot_uint16_t;
+typedef unsigned int            multiboot_uint32_t;
+typedef unsigned long long      multiboot_uint64_t;
+
+struct multiboot_header
+{
+  /* Must be MULTIBOOT_MAGIC - see above. */
+  multiboot_uint32_t magic;
+
+  /* Feature flags. */
+  multiboot_uint32_t flags;
+
+  /* The above fields plus this one must equal 0 mod 2^32. */
+  multiboot_uint32_t checksum;
+
+  /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
+  multiboot_uint32_t header_addr;
+  multiboot_uint32_t load_addr;
+  multiboot_uint32_t load_end_addr;
+  multiboot_uint32_t bss_end_addr;
+  multiboot_uint32_t entry_addr;
+
+  /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
+  multiboot_uint32_t mode_type;
+  multiboot_uint32_t width;
+  multiboot_uint32_t height;
+  multiboot_uint32_t depth;
+};
+
+/* The symbol table for a.out. */
+struct multiboot_aout_symbol_table
+{
+  multiboot_uint32_t tabsize;
+  multiboot_uint32_t strsize;
+  multiboot_uint32_t addr;
+  multiboot_uint32_t reserved;
+};
+typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
+
+/* The section header table for ELF. */
+struct multiboot_elf_section_header_table
+{
+  multiboot_uint32_t num;
+  multiboot_uint32_t size;
+  multiboot_uint32_t addr;
+  multiboot_uint32_t shndx;
+};
+typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
+
+struct multiboot_info
+{
+  /* Multiboot info version number */
+  multiboot_uint32_t flags;
+
+  /* Available memory from BIOS */
+  multiboot_uint32_t mem_lower;
+  multiboot_uint32_t mem_upper;
+
+  /* "root" partition */
+  multiboot_uint32_t boot_device;
+
+  /* Kernel command line */
+  multiboot_uint32_t cmdline;
+
+  /* Boot-Module list */
+  multiboot_uint32_t mods_count;
+  multiboot_uint32_t mods_addr;
+
+  union
+  {
+    multiboot_aout_symbol_table_t aout_sym;
+    multiboot_elf_section_header_table_t elf_sec;
+  } u;
+
+  /* Memory Mapping buffer */
+  multiboot_uint32_t mmap_length;
+  multiboot_uint32_t mmap_addr;
+
+  /* Drive Info buffer */
+  multiboot_uint32_t drives_length;
+  multiboot_uint32_t drives_addr;
+
+  /* ROM configuration table */
+  multiboot_uint32_t config_table;
+
+  /* Boot Loader Name */
+  multiboot_uint32_t boot_loader_name;
+
+  /* APM table */
+  multiboot_uint32_t apm_table;
+
+  /* Video */
+  multiboot_uint32_t vbe_control_info;
+  multiboot_uint32_t vbe_mode_info;
+  multiboot_uint16_t vbe_mode;
+  multiboot_uint16_t vbe_interface_seg;
+  multiboot_uint16_t vbe_interface_off;
+  multiboot_uint16_t vbe_interface_len;
+
+  multiboot_uint64_t framebuffer_addr;
+  multiboot_uint32_t framebuffer_pitch;
+  multiboot_uint32_t framebuffer_width;
+  multiboot_uint32_t framebuffer_height;
+  multiboot_uint8_t framebuffer_bpp;
+#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
+#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
+#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT     2
+  multiboot_uint8_t framebuffer_type;
+  union
+  {
+    struct
+    {
+      multiboot_uint32_t framebuffer_palette_addr;
+      multiboot_uint16_t framebuffer_palette_num_colors;
+    };
+    struct
+    {
+      multiboot_uint8_t framebuffer_red_field_position;
+      multiboot_uint8_t framebuffer_red_mask_size;
+      multiboot_uint8_t framebuffer_green_field_position;
+      multiboot_uint8_t framebuffer_green_mask_size;
+      multiboot_uint8_t framebuffer_blue_field_position;
+      multiboot_uint8_t framebuffer_blue_mask_size;
+    };
+  };
+};
+typedef struct multiboot_info multiboot_info_t;
+
+struct multiboot_color
+{
+  multiboot_uint8_t red;
+  multiboot_uint8_t green;
+  multiboot_uint8_t blue;
+};
+
+struct multiboot_mmap_entry
+{
+  multiboot_uint32_t size;
+  multiboot_uint64_t addr;
+  multiboot_uint64_t len;
+#define MULTIBOOT_MEMORY_AVAILABLE              1
+#define MULTIBOOT_MEMORY_RESERVED               2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
+#define MULTIBOOT_MEMORY_NVS                    4
+#define MULTIBOOT_MEMORY_BADRAM                 5
+  multiboot_uint32_t type;
+} __attribute__((packed));
+typedef struct multiboot_mmap_entry multiboot_memory_map_t;
+
+struct multiboot_mod_list
+{
+  /* the memory used goes from bytes ’mod_start’ to ’mod_end-1’ inclusive */
+  multiboot_uint32_t mod_start;
+  multiboot_uint32_t mod_end;
+
+  /* Module command line */
+  multiboot_uint32_t cmdline;
+
+  /* padding to take it to 16 bytes (must be zero) */
+  multiboot_uint32_t pad;
+};
+typedef struct multiboot_mod_list multiboot_module_t;
+
+/* APM BIOS info. */
+struct multiboot_apm_info
+{
+  multiboot_uint16_t version;
+  multiboot_uint16_t cseg;
+  multiboot_uint32_t offset;
+  multiboot_uint16_t cseg_16;
+  multiboot_uint16_t dseg;
+  multiboot_uint16_t flags;
+  multiboot_uint16_t cseg_len;
+  multiboot_uint16_t cseg_16_len;
+  multiboot_uint16_t dseg_len;
+};
+
+#endif /* ! ASM_FILE */
+
+#endif /* ! MULTIBOOT_HEADER */

kernel/include/pmm.h

@@ -0,0 +1,6 @@
+#ifndef _PMM_H
+#define _PMM_H
+
+int pmm_init();
+
+#endif

kernel/include/serial.h

@@ -14,6 +14,6 @@ void serial_send(int dev, char data);
 int  serial_rcvd(int dev);
 char serial_recv(int dev);
 void serial_write(int dev, char* buf, size_t len);
-void serial_print(int dev, char* s);
+void serial_puts(int dev, char* s);
 
 #endif

kernel/include/tty.h

@@ -7,9 +7,12 @@
 #define VGA_HEIGHT	25
 #define VGA_MEMORY	0xb8000
 
-void tty_init(void);
+int  tty_init(void);
 void tty_clear(void);
 void tty_setattr(uint8_t attr);
+void tty_enableCursor(uint8_t start, uint8_t end);
+void tty_disableCursor(void);
+void tty_write(char* buf, size_t len);
 void tty_putc(char c);
 void tty_puts(char* s);
 

kernel/src/entry.s

@@ -22,7 +22,7 @@ align 16
 
 ; Initialize stack
 stack_bottom:
-	resb 16384	; 16kB
+	resb 16384
 stack_top:
 
 ; Entry point
@@ -31,6 +31,7 @@ global _start
 extern kmain
 _start:
 	mov esp, stack_top	; Setup stack
+	push ebx
 	call kmain		; Call kernel main
 
 	; Hang if kernel returns

kernel/src/kernel.c

@@ -1,25 +1,49 @@
+#include <multiboot.h>
 #include <kernel.h>
 #include <serial.h>
+#include <pmm.h>
 #include <tty.h>
 
 #define _hlt()	while (1) __asm__ volatile ("cli; hlt");
 
-__noreturn
+char* itoa(uint8_t n) {
-void kmain(void) {
+	static char str[32];
-	serial_init(COM1);
+	int i = sizeof(str) - 2;
-	serial_print(COM1, "kern.\n\n");
+	while (n) {
-	while (1) {
+		str[i--] = (n % 10) + '0';
-		char c = serial_recv(COM1);
+		n /= 10;
-		serial_send(COM1, c);
-		if (c == '\r') {
-			serial_send(COM1, '\n');
-			break;
-		}
 	}
+	str[sizeof(str) - 1] = '\0';
+	return &str[i+1];
+}
 
+__noreturn
+void kmain(void* ptr) {
+	multiboot_info_t* mbi = ptr;
+
+	// Serial console for debugging
+	serial_init(COM1);
+	serial_puts(COM1, "\x1b[0H\x1b[Jkern.\n");
+
+	// Check if we have a valid memmap
+	if (!(mbi->flags >> 6 & 1)) {
+		panic("Invalid memory map.");
+	}
+
+	// VGA tty thingy
 	tty_init();
-	tty_puts("Hello, World!\n");
+	tty_puts("kern.");
+
+	// Memory manager init
+	// pmm_init();
+	// vmm_init();
+
+	// x86 shit
+	// gdt_init();
+	// isr_init();
+	
+	/* TODO: Commeted out stuff */
 
-	panic("kmain() reached end!");
+	panic("kmain() reached end.");
 }
 

kernel/src/pmm.c

@@ -0,0 +1,4 @@
+#include <pmm.h>
+
+int pmm_init() { return 0; }
+

kernel/src/serial.c

@@ -44,7 +44,7 @@ void serial_write(int dev, char* buf, size_t len) {
 	}
 }
 
-void serial_print(int dev, char* s) {
+void serial_puts(int dev, char* s) {
 	size_t len = 0;
 	char* p = s;
 	while (*p++ != '\0') len++;

kernel/src/tty.c

@@ -1,4 +1,5 @@
 #include <kernel.h>
+#include <system.h>
 #include <tty.h>
 
 struct {
@@ -6,14 +7,17 @@ struct {
 	size_t col;
 	uint8_t attr;
 	uint8_t* buf;
+	size_t updateWait;
 } ctx;
 
-void tty_init(void) {
+int tty_init(void) {
 	ctx.row = 0;
 	ctx.col = 0;
 	ctx.attr = 0x07;
 	ctx.buf = (uint8_t*)VGA_MEMORY;
 	tty_clear();
+
+	return 0;
 }
 
 void tty_clear(void) {
@@ -27,6 +31,31 @@ void tty_setattr(uint8_t attr) {
 	ctx.attr = attr;
 }
 
+void tty_enableCursor(uint8_t start, uint8_t end) {
+	outb(0x3d4, 0x0a);
+	outb(0x3d5, (inb(0x3d5) & 0xc0) | start);
+	outb(0x3d4, 0x0b);
+	outb(0x3d5, (inb(0x3d5) & 0xe0) | end);
+}
+
+void tty_disableCursor(void) {
+	outb(0x3d4, 0x0a);
+	outb(0x3d5, 0x20);
+}
+
+void tty_updateCursor(void) {
+	if (ctx.updateWait > 0) {
+		ctx.updateWait--;
+		return;
+	}
+
+	uint16_t pos = ctx.row * VGA_WIDTH + ctx.col;
+	outb(0x3d4, 0x0f);
+	outb(0x3d5, (uint8_t)pos);
+	outb(0x3d4, 0x0e);
+	outb(0x3d5, (uint8_t)(pos >> 8));
+}
+
 // TODO:
 void tty_scroll(void) {
 	ctx.row = 0;
@@ -44,8 +73,7 @@ void tty_putc(char c) {
 	if (c == '\n') { 
 		ctx.col = 0;
 		ctx.row++;
-		if (ctx.row >= VGA_HEIGHT) tty_scroll();
+		goto scroll_check;
-		return;
 	}
 
 	tty_putat(c, ctx.row, ctx.col++);
@@ -54,10 +82,20 @@ void tty_putc(char c) {
 		ctx.row++;
 	}
 
+scroll_check:
 	if (ctx.row >= VGA_HEIGHT) tty_scroll();
+	tty_updateCursor();
+}
+
+void tty_write(char* buf, size_t len) {
+	ctx.updateWait = len - 1;
+	for (int i = 0; i < len; i++) tty_putc(buf[i]);
 }
 
 void tty_puts(char* s) {
-	while (*s != '\0') tty_putc(*s++);
+	size_t len = 0;
+	char* p = s;
+	while (*p++ != '\0') len++;
+	tty_write(s, len);
 }