diff options
52 files changed, 892 insertions, 1334 deletions
diff --git a/src/kernel/acpi/acpi.c b/src/kernel/acpi/acpi.c index 36a3d29..60ed4f9 100644 --- a/src/kernel/acpi/acpi.c +++ b/src/kernel/acpi/acpi.c @@ -69,19 +69,19 @@ unsigned int *acpi_get_rsd_ptr() int acpi_enable() { - if ((inw((unsigned int) PM1a_CNT) & SCI_EN) == 0) { + if ((inw((uint16_t) (unsigned int) PM1a_CNT) & SCI_EN) == 0) { if (SMI_CMD != 0 && ACPI_ENABLE != 0) { - outb((unsigned int) SMI_CMD, ACPI_ENABLE); // Enable ACPI + outb((uint16_t) (unsigned int) SMI_CMD, (uint8_t) ACPI_ENABLE); // Enable ACPI // Try 3s until ACPI is enabled int i; for (i = 0; i < 300; i++) { - if ((inw((unsigned int) PM1a_CNT) & SCI_EN) == 1) + if ((inw((uint16_t) (unsigned int) PM1a_CNT) & SCI_EN) == 1) break; timer_wait(1); } if (PM1b_CNT != 0) for (; i < 300; i++) { - if ((inw((unsigned int) PM1b_CNT) & SCI_EN) == 1) + if ((inw((uint16_t) (unsigned int) PM1b_CNT) & SCI_EN) == 1) break; timer_wait(1); } @@ -117,7 +117,7 @@ int acpi_install() fadt = (struct FADT *) *ptr; // TODO: Allocate ACPI tables after paging (page fault)! if (memcmp((unsigned int *) fadt->DSDT, "DSDT", 4) == 0) { char *S5Addr = (char *) fadt->DSDT + 36; - int dsdt_length = *(fadt->DSDT + 1) - 36; + int dsdt_length = (int) (*(fadt->DSDT + 1) - 36); while (0 < dsdt_length--) { if (memcmp(S5Addr, "_S5_", 4) == 0) break; @@ -182,9 +182,9 @@ void acpi_poweroff() } // Send shutdown command - outw((unsigned int) PM1a_CNT, SLP_TYPa | SLP_EN); + outw((uint16_t) (unsigned int) PM1a_CNT, (uint16_t) (SLP_TYPa | SLP_EN)); if (PM1b_CNT != 0) - outw((unsigned int) PM1b_CNT, SLP_TYPb | SLP_EN); + outw((uint16_t) (unsigned int) PM1b_CNT, (uint16_t) (SLP_TYPb | SLP_EN)); else { outw(0xB004, 0x2000); // Bochs outw(0x604, 0x2000); // QEMU diff --git a/src/kernel/cmos/rtc.c b/src/kernel/cmos/rtc.c index 378bfd5..9f4e7c2 100644 --- a/src/kernel/cmos/rtc.c +++ b/src/kernel/cmos/rtc.c @@ -16,7 +16,7 @@ int get_update_in_progress_flag() unsigned char get_rtc_register(int reg) { - outb(0x70, reg); + outb(0x70, (uint8_t) reg); return inb(0x71); } @@ -48,8 +48,8 @@ void read_rtc() last_hour = hour; last_day = day; last_month = month; - last_year = year; - last_century = century; + last_year = (unsigned char) year; + last_century = (unsigned char) century; while (get_update_in_progress_flag()); second = get_rtc_register(0x00); @@ -66,11 +66,11 @@ void read_rtc() registerB = get_rtc_register(0x0B); if (!(registerB & 0x04)) { - second = (second & 0x0F) + ((second / 16) * 10); - minute = (minute & 0x0F) + ((minute / 16) * 10); - hour = ((hour & 0x0F) + (((hour & 0x70) / 16) * 10)) | (hour & 0x80); - day = (day & 0x0F) + ((day / 16) * 10); - month = (month & 0x0F) + ((month / 16) * 10); + second = (unsigned char) ((second & 0x0F) + ((second / 16) * 10)); + minute = (unsigned char) ((minute & 0x0F) + ((minute / 16) * 10)); + hour = (unsigned char) (((hour & 0x0F) + (((hour & 0x70) / 16) * 10)) | (hour & 0x80)); + day = (unsigned char) ((day & 0x0F) + ((day / 16) * 10)); + month = (unsigned char) ((month & 0x0F) + ((month / 16) * 10)); year = (year & 0x0F) + ((year / 16) * 10); // century = (century & 0x0F) + ((century / 16) * 10); } @@ -79,7 +79,7 @@ void read_rtc() // Convert to 24h if necessary if (!(registerB & 0x02) && (hour & 0x80)) { - hour = ((hour & 0x7F) + 12) % 24; + hour = (unsigned char) (((hour & 0x7F) + 12) % 24); } } diff --git a/src/kernel/commands/command.c b/src/kernel/commands/command.c deleted file mode 100644 index 691684b..0000000 --- a/src/kernel/commands/command.c +++ /dev/null @@ -1,39 +0,0 @@ -#include <kernel/lib/lib.h> -#include <kernel/io/io.h> -#include <kernel/acpi/acpi.h> -#include <kernel/graphics/vesa.h> -#include <kernel/cmos/rtc.h> -#include <kernel/timer/timer.h> -#include <kernel/lib/string.h> -#include <kernel/lib/stdio.h> - -int32_t starts_with(const char *a, const char *b) -{ - size_t length_pre = strlen(b); - size_t length_main = strlen(a); - return length_main < length_pre ? 0 : memcmp(b, a, length_pre) == 0; -} - -void exec_command(char *command) -{ - if (starts_with(command, "ls")) - printf("Listing files\n"); - else if (starts_with(command, "help")) - printf("I can't help you write now\n"); - else if (starts_with(command, "ping")) - printf("pong!\n"); - else if (starts_with(command, "clear")) - vesa_clear(); - else if (starts_with(command, "shutdown") || starts_with(command, "exit")) - acpi_poweroff(); - else if (starts_with(command, "zzz")) - printf("Not implemented\n"); - else if (starts_with(command, "time")) - printf("%d\n", (int) get_time()); - else if (starts_with(command, "date")) - write_time(); - else if (starts_with(command, "reboot")) - reboot(); - else if (command[0] != 0) - warn("Command not found!"); -} diff --git a/src/kernel/commands/command.h b/src/kernel/commands/command.h deleted file mode 100644 index 9e402aa..0000000 --- a/src/kernel/commands/command.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef MELVIX_COMMAND_H -#define MELVIX_COMMAND_H - -/** - * Execute a command in the pseudo shell - * @deprecated - will be replaced by real shell soon - * @param command The desired command - */ -void exec_command(char *command); - -#endif diff --git a/src/kernel/fs/ata_pio.c b/src/kernel/fs/ata_pio.c index 0134ee4..fef3a32 100644 --- a/src/kernel/fs/ata_pio.c +++ b/src/kernel/fs/ata_pio.c @@ -1,35 +1,35 @@ #include <kernel/io/io.h> -#include <kernel/lib/stdlib.h> #include <kernel/fs/ata_pio.h> +#include <kernel/memory/kheap.h> struct ata_interface *new_ata(uint8_t master, uint16_t port_base) { - struct ata_interface *ret = kmalloc(sizeof(struct ata_interface)); + struct ata_interface *ret = (struct ata_interface *) kmalloc(sizeof(struct ata_interface)); ret->master = master; ret->data_port = port_base; - ret->error_port = port_base + 0x1; - ret->sector_count_port = port_base + 0x2; - ret->lba_low_port = port_base + 0x3; - ret->lba_mid_port = port_base + 0x4; - ret->lba_high_port = port_base + 0x5; - ret->device_port = port_base + 0x6; - ret->command_port = port_base + 0x7; - ret->control_port = port_base + 0x206; + ret->error_port = (uint16_t) (port_base + 0x1); + ret->sector_count_port = (uint16_t) (port_base + 0x2); + ret->lba_low_port = (uint16_t) (port_base + 0x3); + ret->lba_mid_port = (uint16_t) (port_base + 0x4); + ret->lba_high_port = (uint16_t) (port_base + 0x5); + ret->device_port = (uint16_t) (port_base + 0x6); + ret->command_port = (uint16_t) (port_base + 0x7); + ret->control_port = (uint16_t) (port_base + 0x206); return ret; } uint8_t ata_identify(struct ata_interface *interface, uint16_t *ret_data) { - outb(interface->device_port, interface->master ? 0xA0 : 0xB0); + outb(interface->device_port, (uint8_t) (interface->master ? 0xA0 : 0xB0)); outb(interface->control_port, 0); outb(interface->device_port, 0xA0); uint8_t status = inb(interface->command_port); if (status == 0xFF) return 1; - outb(interface->device_port, interface->master ? 0xA0 : 0xB0); + outb(interface->device_port, (uint8_t) (interface->master ? 0xA0 : 0xB0)); outb(interface->sector_count_port, 0); outb(interface->lba_low_port, 0); outb(interface->lba_mid_port, 0); @@ -53,7 +53,7 @@ uint8_t *ata_read28(struct ata_interface *interface, uint32_t sector) { if (sector > 0x0FFFFFFF) return 0; - outb(interface->device_port, (interface->master ? 0xE0 : 0xF0) | ((sector & 0x0F000000) >> 24)); + outb(interface->device_port, (uint8_t) ((interface->master ? 0xE0 : 0xF0) | ((sector & 0x0F000000) >> 24))); uint8_t status = 0; for (int i = 0; i < 5; i++) status = inb(interface->command_port); @@ -61,19 +61,19 @@ uint8_t *ata_read28(struct ata_interface *interface, uint32_t sector) outb(interface->error_port, 0); outb(interface->sector_count_port, 1); - outb(interface->lba_low_port, sector & 0x000000FF); - outb(interface->lba_mid_port, (sector & 0x0000FF00) >> 8); - outb(interface->lba_high_port, (sector & 0x00FF0000) >> 16); + outb(interface->lba_low_port, (uint8_t) (sector & 0x000000FF)); + outb(interface->lba_mid_port, (uint8_t) ((sector & 0x0000FF00) >> 8)); + outb(interface->lba_high_port, (uint8_t) ((sector & 0x00FF0000) >> 16)); outb(interface->command_port, 0x20); // Read command status = inb(interface->command_port); while ((status & 0x80) && !(status & 0x01)) status = inb(interface->command_port); - uint8_t *ret = kmalloc(BYTES_PER_SECTOR); + uint8_t *ret = (uint8_t *) kmalloc(BYTES_PER_SECTOR); for (int i = 0; i < BYTES_PER_SECTOR; i += 2) { uint16_t data = inw(interface->data_port); - ret[i] = data & 0xFF; - ret[i + 1] = (data >> 8) & 0xFF; + ret[i] = (uint8_t) (data & 0xFF); + ret[i + 1] = (uint8_t) ((data >> 8) & 0xFF); } return ret; } @@ -83,7 +83,7 @@ uint8_t ata_write28(struct ata_interface *interface, uint32_t sector, const uint if (sector > 0x0FFFFFFF) return 1; asm ("cli"); - outb(interface->device_port, (interface->master ? 0xE0 : 0xF0) | ((sector & 0x0F000000) >> 24)); + outb(interface->device_port, (uint8_t) ((interface->master ? 0xE0 : 0xF0) | ((sector & 0x0F000000) >> 24))); uint8_t status = 0; for (int i = 0; i < 5; i++) status = inb(interface->command_port); @@ -91,9 +91,9 @@ uint8_t ata_write28(struct ata_interface *interface, uint32_t sector, const uint outb(interface->error_port, 0); outb(interface->sector_count_port, 1); - outb(interface->lba_low_port, sector & 0x000000FF); - outb(interface->lba_mid_port, (sector & 0x0000FF00) >> 8); - outb(interface->lba_high_port, (sector & 0x00FF0000) >> 16); + outb(interface->lba_low_port, (uint8_t) (sector & 0x000000FF)); + outb(interface->lba_mid_port, (uint8_t) ((sector & 0x0000FF00) >> 8)); + outb(interface->lba_high_port, (uint8_t) ((sector & 0x00FF0000) >> 16)); outb(interface->command_port, 0x30); // Write command while ((status & 0x80) || !(status & 0x08)) status = inb(interface->command_port); diff --git a/src/kernel/fs/atapi_pio.c b/src/kernel/fs/atapi_pio.c index c2cdd8c..39f32b6 100644 --- a/src/kernel/fs/atapi_pio.c +++ b/src/kernel/fs/atapi_pio.c @@ -1,7 +1,6 @@ #include <stdint.h> #include <kernel/fs/atapi_pio.h> #include <kernel/system.h> -#include <kernel/paging/paging.h> void ATAPI_read(uint16_t nblocks, uint32_t lba) { diff --git a/src/kernel/fs/install.c b/src/kernel/fs/install.c index af148c8..daeb91b 100644 --- a/src/kernel/fs/install.c +++ b/src/kernel/fs/install.c @@ -3,10 +3,11 @@ #include <kernel/fs/marfs/marfs.h> #include <kernel/fs/iso9660/iso9660.h> #include <kernel/fs/atapi_pio.h> -#include <kernel/lib/stdlib.h> #include <kernel/acpi/acpi.h> #include <kernel/lib/stdio.h> #include <kernel/timer/timer.h> +#include <kernel/memory/kheap.h> +#include <kernel/graphics/font.h> void install_melvix() { @@ -27,6 +28,7 @@ void install_melvix() // Copy MBR info("Copying MBR... "); + serial_printf("Copying MBR... "); char *stage1_p[] = {"BOOT", "HDD1.BIN"}; struct iso9660_entity *stage1_e = ISO9660_get(stage1_p, 2); if (!stage1_e) @@ -37,10 +39,12 @@ void install_melvix() // Format disk info("Formatting disk..."); + serial_printf("Formatting disk..."); marfs_format(); // Copy second stage info("Copying second stage..."); + serial_printf("Copying second stage..."); char *stage2_p[] = {"BOOT", "HDD2.BIN"}; struct iso9660_entity *stage2_e = ISO9660_get(stage2_p, 2); if (!stage2_e) @@ -51,11 +55,12 @@ void install_melvix() // Copy the kernel info("Copying the kernel..."); + serial_printf("Copying the kernel..."); char *kernel_p[] = {"BOOT", "KERNEL.BIN"}; struct iso9660_entity *kernel_e = ISO9660_get(kernel_p, 2); if (!kernel_e) panic("WTH Kernel not found!?"); - uint8_t *kernel = kmalloc(kernel_e->length + 2048); + uint8_t *kernel = (uint8_t *) kmalloc(kernel_e->length + 2048); ATAPI_granular_read(1 + (kernel_e->length / 2048), kernel_e->lba, kernel); marfs_new_file(kernel_e->length, kernel, 0, 0, 0); kfree(kernel); @@ -63,6 +68,7 @@ void install_melvix() // Copy the userspace binary info("Copying userspace... "); + serial_printf("Copying userspace... "); char *userspace_p[] = {"USER.BIN"}; struct iso9660_entity *userspace_e = ISO9660_get(userspace_p, 1); if (!userspace_e) @@ -73,14 +79,10 @@ void install_melvix() // Copy the global font binary info("Copying font... "); + serial_printf("Copying font... "); char *font_p[] = {"FONT.BIN"}; struct iso9660_entity *font_e = ISO9660_get(font_p, 1); - if (!font_e) - panic("Font not found!"); - uint8_t *font = kmalloc(font_e->length + 2048); - ATAPI_granular_read(1 + (font_e->length / 2048), font_e->lba, font); - marfs_new_file(font_e->length, font, 0, 0, 0); - kfree(font); + marfs_new_file(font_e->length, (uint8_t *) font, 0, 0, 0); kfree(font_e); info("Installation successful!"); diff --git a/src/kernel/fs/iso9660/iso9660.c b/src/kernel/fs/iso9660/iso9660.c index 3c61d94..2262408 100644 --- a/src/kernel/fs/iso9660/iso9660.c +++ b/src/kernel/fs/iso9660/iso9660.c @@ -1,8 +1,8 @@ #include <stdint.h> -#include <kernel/lib/lib.h> #include <kernel/fs/atapi_pio.h> #include <kernel/fs/iso9660/iso9660.h> #include <kernel/lib/stdlib.h> +#include <kernel/memory/kheap.h> struct iso9660_entity *ISO9660_get(char **dirs, uint8_t dirs_sz) { diff --git a/src/kernel/fs/marfs/directory.c b/src/kernel/fs/marfs/directory.c index d0a1bff..dce92b1 100644 --- a/src/kernel/fs/marfs/directory.c +++ b/src/kernel/fs/marfs/directory.c @@ -2,6 +2,7 @@ #include <kernel/fs/ata_pio.h> #include <kernel/lib/stdlib.h> #include <kernel/fs/marfs/marfs.h> +#include <kernel/memory/kheap.h> uint32_t marfs_new_dir(uint32_t uid) { @@ -17,7 +18,7 @@ void marfs_add_to_dir(uint32_t lba_inode, char *filename, uint32_t lba) uint8_t *old = marfs_allocate_and_read_whole_file(lba_inode); // Allocate memory - uint8_t *contents = kmalloc(inode->size + strlen(filename) + 1 + 4); + uint8_t *contents = (uint8_t *) kmalloc((uint32_t) (inode->size + strlen(filename) + 1 + 4)); // Copy the content uint8_t last_was_null = 0; @@ -26,16 +27,16 @@ void marfs_add_to_dir(uint32_t lba_inode, char *filename, uint32_t lba) if (old[i] == 0 && last_was_null) continue; contents[new_size++] = old[i]; - last_was_null = (old[i] == 0); + last_was_null = (uint8_t) (old[i] == 0); } kfree(old); // Append new file - for (size_t i = 0; i <= strlen(filename); i++) contents[new_size++] = filename[i]; - for (signed char j = 24; j > 0; j -= 8) contents[new_size++] = (lba >> j) & 0xFF; + for (size_t i = 0; i <= strlen(filename); i++) contents[new_size++] = (uint8_t) filename[i]; + for (signed char j = 24; j > 0; j -= 8) contents[new_size++] = (uint8_t) ((lba >> j) & 0xFF); // Free the blocks - uint32_t new_size_in_blocks = new_size / 512; + uint32_t new_size_in_blocks = (uint32_t) (new_size / 512); if (new_size % 512) new_size_in_blocks++; for (uint32_t i = 0; i < new_size_in_blocks; i++) marfs_mark_block_as_free(marfs_get_block(inode, i)); diff --git a/src/kernel/fs/marfs/new_file.c b/src/kernel/fs/marfs/new_file.c index 4fef3b9..ab1c241 100644 --- a/src/kernel/fs/marfs/new_file.c +++ b/src/kernel/fs/marfs/new_file.c @@ -1,7 +1,7 @@ #include <stdint.h> #include <kernel/fs/ata_pio.h> -#include <kernel/lib/stdlib.h> #include <kernel/fs/marfs/marfs.h> +#include <kernel/memory/kheap.h> static uint8_t last_max_level = 0; @@ -30,17 +30,17 @@ void marfs_update_recursive(uint8_t level, uint32_t i, uint32_t rec_lba, uint32_ uint32_t contents_idx = contents[idx]; kfree(contents); if (level != 1) { - marfs_update_recursive(level - 1, i, contents_idx, real_lba); + marfs_update_recursive((uint8_t) (level - 1), i, contents_idx, real_lba); } last_max_level = 0; } uint32_t marfs_new_file(uint64_t size, uint8_t *data, uint32_t uid, uint8_t exec, uint8_t dir) { - struct marfs_inode *inode = (struct marfs_inode *) kcalloc(1, 512); + struct marfs_inode *inode = (struct marfs_inode *) kmalloc(512); inode->size = size; inode->creation_time = inode->last_mod_time = inode->last_access_time = 0; // TODO: POSIX time - inode->n_blocks = size / 512; + inode->n_blocks = (uint32_t) (size / 512); if (size % 512) inode->n_blocks++; inode->uid = uid; inode->is_app = exec; diff --git a/src/kernel/fs/marfs/read_whole_file.c b/src/kernel/fs/marfs/read_whole_file.c index 85f9bbb..dda5daf 100644 --- a/src/kernel/fs/marfs/read_whole_file.c +++ b/src/kernel/fs/marfs/read_whole_file.c @@ -1,7 +1,7 @@ #include <stdint.h> #include <kernel/fs/ata_pio.h> -#include <kernel/lib/stdlib.h> #include <kernel/fs/marfs/marfs.h> +#include <kernel/memory/kheap.h> static uint8_t last_max_level = 0; @@ -19,7 +19,7 @@ uint32_t marfs_get_recursive(uint8_t level, uint32_t i, uint32_t rec_lba) kfree(contents); uint32_t toRet; - if (level > 1) toRet = marfs_get_recursive(level - 1, i, next_rec_lba); + if (level > 1) toRet = marfs_get_recursive((uint8_t) (level - 1), i, next_rec_lba); else toRet = next_rec_lba; last_max_level = 0; return toRet; @@ -48,7 +48,7 @@ void marfs_read_whole_file(uint32_t lba_inode, uint8_t *buffer) for (uint32_t i = 0; i < size_in_blocks; i++) { uint32_t this_block = marfs_get_block(inode, i); uint8_t *this_block_contents = ata_read28(interface, this_block); - uint16_t upper_bound = (i != size_in_blocks - 1) ? 512 : (inode->size % 512); + uint16_t upper_bound = (uint16_t) ((i != size_in_blocks - 1) ? 512 : (inode->size % 512)); for (uint16_t j = 0; j < upper_bound; j++) buffer[(i * 512) + j] = this_block_contents[j]; kfree(this_block_contents); } @@ -63,7 +63,7 @@ uint8_t *marfs_allocate_and_read_whole_file(uint32_t lba_inode) uint64_t size = inode->size; kfree(inode); - uint8_t *buffer = kmalloc(size); + uint8_t *buffer = (uint8_t *) kmalloc((uint32_t) size); marfs_read_whole_file(lba_inode, buffer); return buffer; } diff --git a/src/kernel/fs/marfs/sectorlevel.c b/src/kernel/fs/marfs/sectorlevel.c index d905315..8302054 100644 --- a/src/kernel/fs/marfs/sectorlevel.c +++ b/src/kernel/fs/marfs/sectorlevel.c @@ -1,7 +1,7 @@ #include <stdint.h> -#include <kernel/lib/stdlib.h> #include <kernel/fs/ata_pio.h> #include <kernel/fs/marfs/marfs.h> +#include <kernel/memory/kheap.h> uint8_t marfs_init(struct ata_interface *_interface) { @@ -62,7 +62,7 @@ static uint8_t marfs_mark_block(uint32_t lba_sector, uint8_t mode) { lba_sector -= 2; lba_sector -= sb_cache.s_first_chunk; - uint16_t block_in_chunk = lba_sector % 512; + uint16_t block_in_chunk = (uint16_t) (lba_sector % 512); lba_sector /= 512; lba_sector = 2 + sb_cache.s_first_chunk + (512 * lba_sector); diff --git a/src/kernel/gdt/gdt.c b/src/kernel/gdt/gdt.c index 435528a..efff8a3 100644 --- a/src/kernel/gdt/gdt.c +++ b/src/kernel/gdt/gdt.c @@ -2,7 +2,7 @@ #include <kernel/gdt/gdt.h> #include <kernel/system.h> #include <kernel/lib/lib.h> -#include <kernel/lib/stdlib.h> +#include <kernel/memory/kheap.h> struct gdt_entry { unsigned short limit_low; @@ -58,13 +58,13 @@ extern void gdt_flush(); void gdt_set_gate(int32_t num, uint32_t base, uint32_t limit, uint8_t access, uint8_t gran) { // Set descriptor base address - gdt[num].base_low = (base & 0xFFFF); - gdt[num].base_middle = (base >> 16) & 0xFF; - gdt[num].base_high = (base >> 24) & 0xFF; + gdt[num].base_low = (unsigned short) (base & 0xFFFF); + gdt[num].base_middle = (unsigned char) ((base >> 16) & 0xFF); + gdt[num].base_high = (unsigned char) ((base >> 24) & 0xFF); // Set descriptor limits - gdt[num].limit_low = (limit & 0xFFFF); - gdt[num].granularity = ((limit >> 16) & 0x0F); + gdt[num].limit_low = (unsigned short) (limit & 0xFFFF); + gdt[num].granularity = (unsigned char) ((limit >> 16) & 0x0F); // Set granularity and access flags gdt[num].granularity |= (gran & 0xF0); @@ -120,7 +120,7 @@ void tss_write(int32_t num, uint16_t ss0, uint32_t esp0) void tss_flush(void) { - tss_entry.esp0 = 4096 + (uint32_t) umalloc(4096); + tss_entry.esp0 = 4096 + (uint32_t) kmalloc(4096); asm volatile ("ltr %%ax": : "a" (0x2B)); } diff --git a/src/kernel/graphics/font.c b/src/kernel/graphics/font.c index 49bcd8a..10372b3 100644 --- a/src/kernel/graphics/font.c +++ b/src/kernel/graphics/font.c @@ -1,16 +1,14 @@ #include <kernel/fs/marfs/marfs.h> -#include <kernel/paging/paging.h> #include <kernel/graphics/font.h> -#include <kernel/lib/stdlib/liballoc.h> #include <kernel/fs/ata_pio.h> #include <kernel/fs/atapi_pio.h> #include <kernel/system.h> #include <kernel/fs/iso9660/iso9660.h> +#include <kernel/memory/kheap.h> void font_install() { - font = (struct font *) paging_alloc_pages(25);; // High quality shit - paging_set_user((uint32_t) font, 25); + font = (struct font *) kmalloc(100000);; // High quality shit uint8_t boot_drive_id = (uint8_t) (*((uint8_t *) 0x9000)); if (boot_drive_id != 0xE0) { diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c index a9b7f4c..d941413 100644 --- a/src/kernel/graphics/vesa.c +++ b/src/kernel/graphics/vesa.c @@ -1,11 +1,13 @@ #include <kernel/graphics/vesa.h> #include <kernel/graphics/font.h> #include <kernel/lib/lib.h> -#include <kernel/paging/paging.h> #include <kernel/system.h> #include <kernel/lib/stdlib.h> -#include <kernel/commands/command.h> #include <kernel/lib/stdio.h> +#include <kernel/memory/kheap.h> +#include <kernel/memory/paging.h> + +extern page_directory_t *kernel_directory; void switch_to_vga() { @@ -32,7 +34,7 @@ struct edid_data get_edid() struct edid_data *edid = (struct edid_data *) 0x7E00; - return *(struct edid_data *) edid; + return *edid; } void vbe_set_mode(unsigned short mode) @@ -68,7 +70,7 @@ uint16_t *vbe_get_modes() size_t number_modes = 1; for (uint16_t *p = mode_ptr; *p != 0xFFFF; p++) number_modes++; - uint16_t *ret = kmalloc(sizeof(uint16_t) * number_modes); + uint16_t *ret = (uint16_t *) kmalloc(sizeof(uint16_t) * number_modes); for (size_t i = 0; i < number_modes; i++) ret[i] = ((uint16_t *) info->video_modes)[i]; @@ -154,7 +156,7 @@ void set_optimal_resolution() }; for (size_t i = 0; i < sizeof(modes) / sizeof(modes[0]); i++) { - mode_info = vbe_get_mode_info(modes[i]); + mode_info = vbe_get_mode_info((uint16_t) modes[i]); if (mode_info == 0 || (mode_info->attributes & 0x90) != 0x90 || (mode_info->memory_model != 4 && mode_info->memory_model != 6)) { kfree(mode_info); @@ -162,7 +164,7 @@ void set_optimal_resolution() } if ((mode_info->width > vbe_width || (mode_info->width == vbe_width && (mode_info->bpp >> 3) > vbe_bpl))) { - highest = modes[i]; + highest = (uint16_t) modes[i]; vbe_width = mode_info->width; vbe_height = mode_info->height; vbe_pitch = mode_info->pitch; @@ -180,11 +182,10 @@ void set_optimal_resolution() vbe_set_mode(highest); uint32_t fb_size = vbe_width * vbe_height * vbe_bpl; - cursor_buffer = umalloc(fb_size); - for (uint32_t z = 0; z < fb_size; z += 4096) { - paging_set_user((uint32_t) fb + z, 1); - paging_map((uint32_t) fb + z, (uint32_t) fb + z, PT_PRESENT | PT_RW | PT_USED | PT_ALL_PRIV); - paging_map((uint32_t) cursor_buffer + z, (uint32_t) cursor_buffer + z, PT_PRESENT | PT_RW | PT_USED); + cursor_buffer = (unsigned char *) kmalloc(fb_size); + for (uint32_t z = 0; z < fb_size; z += 0x1000) { + alloc_frame(get_page((uint32_t) fb + z, 1, kernel_directory), 0, 1); + alloc_frame(get_page((uint32_t) cursor_buffer + z, 1, kernel_directory), 0, 1); } if (vbe_height > 1440) vesa_set_font(32); @@ -220,9 +221,9 @@ void vesa_set_font(int height) void vesa_convert_color(uint32_t *color_array, uint32_t color) { - uint8_t red = (color >> 16) & 255; - uint8_t green = (color >> 8) & 255; - uint8_t blue = color & 255; + uint8_t red = (uint8_t) ((color >> 16) & 255); + uint8_t green = (uint8_t) ((color >> 8) & 255); + uint8_t blue = (uint8_t) (color & 255); if ((vbe_bpl << 3) == 8) { uint32_t new_color = ((red * 7 / 255) << 5) + ((green * 7 / 255) << 2) + (blue * 3 / 255); @@ -245,11 +246,11 @@ void vesa_convert_color(uint32_t *color_array, uint32_t color) void vesa_set_pixel(uint16_t x, uint16_t y, const uint32_t color[3]) { - unsigned pos = x * vbe_bpl + y * vbe_pitch; + unsigned pos = (unsigned int) (x * vbe_bpl + y * vbe_pitch); char *draw = (char *) &fb[pos]; - draw[pos] = color[2]; - draw[pos + 1] = color[1]; - draw[pos + 2] = color[0]; + draw[pos] = (char) color[2]; + draw[pos + 1] = (char) color[1]; + draw[pos + 2] = (char) color[0]; } void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3]) @@ -258,9 +259,9 @@ void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3] char *draw = (char *) &fb[pos1]; for (int i = 0; i <= y2 - y1; i++) { for (int j = 0; j <= x2 - x1; j++) { - draw[vbe_bpl * j] = color[2]; - draw[vbe_bpl * j + 1] = color[1]; - draw[vbe_bpl * j + 2] = color[0]; + draw[vbe_bpl * j] = (char) color[2]; + draw[vbe_bpl * j + 1] = (char) color[1]; + draw[vbe_bpl * j + 2] = (char) color[0]; } draw += vbe_pitch; } @@ -286,13 +287,13 @@ void vesa_draw_char(char ch) else if (font_height == 32) bitmap = font->font_32[ch - 32][cy]; for (int cx = 0; cx <= font_width + 1; cx++) { if (bitmap & ((1 << font_width) >> cx)) { // Side effect: Smoothness factor! - draw[vbe_bpl * cx] = terminal_color[2]; - draw[vbe_bpl * cx + 1] = terminal_color[1]; - draw[vbe_bpl * cx + 2] = terminal_color[0]; + draw[vbe_bpl * cx] = (char) terminal_color[2]; + draw[vbe_bpl * cx + 1] = (char) terminal_color[1]; + draw[vbe_bpl * cx + 2] = (char) terminal_color[0]; } else { - draw[vbe_bpl * cx] = terminal_background[2]; - draw[vbe_bpl * cx + 1] = terminal_background[1]; - draw[vbe_bpl * cx + 2] = terminal_background[0]; + draw[vbe_bpl * cx] = (char) terminal_background[2]; + draw[vbe_bpl * cx + 1] = (char) terminal_background[1]; + draw[vbe_bpl * cx + 2] = (char) terminal_background[0]; } } draw += vbe_pitch; @@ -312,34 +313,6 @@ void vesa_draw_char(char ch) } } -void vesa_keyboard_char(char ch) -{ - vesa_draw_rectangle(terminal_x, terminal_y, terminal_x + font_width, terminal_y + font_height, - terminal_background); - - if (ch == 0x08) { - if (terminal_x != 0) terminal_x -= font_width; - text[strlen(text) - 1] = '\0'; - } else if (ch == 0x09) { - terminal_x += 4 * font_width; - } else if (ch == '\r') { - terminal_x = 0; - } else if (ch == '\n') { - writec(ch); - exec_command(text); - memset(text, 0, sizeof(text)); - // terminal_scroll(); - } else if (ch >= ' ') { - writec(ch); - char tmp[2] = {ch}; - strcat(text, tmp); - } - - // terminal_scroll(); - vesa_draw_rectangle(terminal_x, terminal_y, terminal_x + font_width, terminal_y + font_height, - terminal_color); -} - int prev_coords[2] = {}; int first = 1; // TODO: Better initial cursor buffer solution void vesa_draw_cursor(int x, int y) @@ -372,9 +345,9 @@ void vesa_draw_cursor(int x, int y) prev[vbe_bpl * cx + 1] = draw[vbe_bpl * cx + 1]; prev[vbe_bpl * cx + 2] = draw[vbe_bpl * cx + 2]; if (font->cursor[cy] & ((1 << 12) >> cx)) { - draw[vbe_bpl * cx] = terminal_color[2]; - draw[vbe_bpl * cx + 1] = terminal_color[1]; - draw[vbe_bpl * cx + 2] = terminal_color[0]; + draw[vbe_bpl * cx] = (char) terminal_color[2]; + draw[vbe_bpl * cx + 1] = (char) terminal_color[1]; + draw[vbe_bpl * cx + 2] = (char) terminal_color[0]; } } draw += vbe_pitch; diff --git a/src/kernel/input/ps2/keyboard.c b/src/kernel/input/ps2/keyboard.c index 4cbbf04..3c4ef0a 100644 --- a/src/kernel/input/ps2/keyboard.c +++ b/src/kernel/input/ps2/keyboard.c @@ -2,8 +2,8 @@ #include <kernel/io/io.h> #include <kernel/graphics/vesa.h> #include <kernel/input/input.h> -#include <kernel/lib/stdlib/liballoc.h> #include <kernel/lib/string.h> +#include <kernel/memory/kheap.h> int shift_pressed; int control_pressed; @@ -126,8 +126,8 @@ void keyboard_rate() void keyboard_clear_buffer() { - ufree(keyboard_buffer); - keyboard_buffer = (char *) umalloc(4096); // 4KiB + kfree(keyboard_buffer); + keyboard_buffer = (char *) kmalloc(4096); // 4KiB } // Installs the keyboard handler into IRQ1 diff --git a/src/kernel/input/ps2/mouse.c b/src/kernel/input/ps2/mouse.c index 8b36ef9..c9fa94f 100644 --- a/src/kernel/input/ps2/mouse.c +++ b/src/kernel/input/ps2/mouse.c @@ -85,7 +85,7 @@ void mouse_install() mouse_wait(1); outb(0x64, 0x20); mouse_wait(0); - status = (inb(0x60) | 3); + status = (unsigned char) (inb(0x60) | 3); mouse_wait(1); outb(0x64, 0x60); mouse_wait(1); @@ -109,7 +109,7 @@ void mouse_install() mouse_read(); mouse_write(0xF2); mouse_read(); - status = mouse_read(); + status = (unsigned char) mouse_read(); if (status == 3) serial_printf("Scrollwheel support!"); // Activate 4th and 5th mouse buttons @@ -130,7 +130,7 @@ void mouse_install() mouse_read(); mouse_write(0xF2); mouse_read(); - status = mouse_read(); + status = (unsigned char) mouse_read(); if (status == 4) serial_printf("4th and 5th mouse button support!"); /* TODO: Fix mouse laggyness diff --git a/src/kernel/interrupts/idt.c b/src/kernel/interrupts/idt.c index 25a9504..026b23c 100644 --- a/src/kernel/interrupts/idt.c +++ b/src/kernel/interrupts/idt.c @@ -24,13 +24,13 @@ extern void idt_load(); void idt_set_gate(unsigned char num, unsigned long base, unsigned short sel, unsigned char flags) { // Specify the interrupt routine's base address - idt[num].base_low = (base & 0xFFFF); - idt[num].base_high = (base >> 16) & 0xFFFF; + idt[num].base_low = (uint16_t) (base & 0xFFFF); + idt[num].base_high = (uint16_t) ((base >> 16) & 0xFFFF); // Set selector/segment of IDT entry idt[num].sel = sel; idt[num].always0 = 0; - idt[num].flags = flags | 0x60; + idt[num].flags = (uint8_t) (flags | 0x60); } // Install IDT diff --git a/src/kernel/interrupts/isr.c b/src/kernel/interrupts/isr.c index 8b2a9e5..eb932b2 100644 --- a/src/kernel/interrupts/isr.c +++ b/src/kernel/interrupts/isr.c @@ -3,7 +3,6 @@ #include <kernel/system.h> #include <kernel/lib/string.h> #include <kernel/lib/stdio.h> -#include <kernel/paging/paging.h> // Install ISRs in IDT void isrs_install() @@ -117,7 +116,6 @@ void fault_handler(struct regs *r) r->eip, r->eax, r->ebx, r->ecx, r->edx, r->esp, faulting_address, r->eflags, r->err_code, r->int_no, exception_messages[r->int_no] ); - serial_printf("%d", paging_get_flags(faulting_address)); // halt_loop(); // Idk loop? char *message = (char *) exception_messages[r->int_no]; strcat(message, " Exception"); diff --git a/src/kernel/io/io.c b/src/kernel/io/io.c index 0dc7483..858f968 100644 --- a/src/kernel/io/io.c +++ b/src/kernel/io/io.c @@ -57,5 +57,5 @@ int is_transmit_empty() void serial_put(char ch) { while (is_transmit_empty() == 0); - outb(0x3f8, ch); + outb(0x3f8, (uint8_t) ch); }
\ No newline at end of file diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index b2b7ada..efa6ca0 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -3,7 +3,7 @@ #include <kernel/interrupts/interrupts.h> #include <kernel/io/io.h> #include <kernel/timer/timer.h> -#include <kernel/paging/paging.h> +#include <kernel/memory/paging.h> #include <kernel/input/input.h> #include <kernel/acpi/acpi.h> #include <kernel/smbios/smbios.h> @@ -12,9 +12,10 @@ #include <kernel/fs/marfs/marfs.h> #include <kernel/fs/iso9660/iso9660.h> #include <kernel/fs/atapi_pio.h> -#include <kernel/lib/stdlib/liballoc.h> #include <kernel/pci/pci.h> #include <kernel/net/network.h> +#include <kernel/memory/kheap.h> +#include <kernel/lib/stdio.h> extern void jump_userspace(); @@ -32,6 +33,7 @@ void kernel_main() isrs_install(); irq_install(); font_install(); + serial_printf("%d", memory_get_all()); set_optimal_resolution(); // Install drivers @@ -53,6 +55,7 @@ void kernel_main() #ifdef INSTALL_MELVIX #include <kernel/fs/install.h> + serial_printf("Install flag given!"); if (boot_drive_id == 0xE0) install_melvix(); #endif @@ -60,8 +63,7 @@ void kernel_main() info("Switching to user mode..."); syscalls_install(); tss_flush(); - uint32_t userspace = (uint32_t) umalloc(8096); - paging_switch_directory(1); + uint32_t userspace = (uint32_t) kmalloc(8096); if (boot_drive_id == 0xE0) { char *user_p[] = {"USER.BIN"}; struct iso9660_entity *user_e = ISO9660_get(user_p, 1); @@ -71,7 +73,6 @@ void kernel_main() jump_userspace(userspace + 4096, userspace + 4096); } else { marfs_read_whole_file(4, (uint8_t *) (userspace + 4096)); - paging_switch_directory(1); jump_userspace(userspace + 4096, userspace + 4096); } diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c index c1c6ee1..eb7f610 100644 --- a/src/kernel/lib/memory.c +++ b/src/kernel/lib/memory.c @@ -1,6 +1,5 @@ #include <stddef.h> #include <stdint.h> -#include <kernel/paging/paging.h> void *memcpy(void *dest, const void *src, size_t count) { @@ -53,13 +52,13 @@ void memory_init() max_length = i->length; } } - total_memory = max_base + max_length; + total_memory = (uint32_t) (max_base + max_length); total_memory /= 1024; } uint32_t memory_get_free() { - return total_memory - paging_get_used_pages() * 4; + return total_memory; // - paging_get_used_pages() * 4; } uint32_t memory_get_all() diff --git a/src/kernel/lib/stdio/debug.c b/src/kernel/lib/stdio/debug.c index d66ee59..f670588 100644 --- a/src/kernel/lib/stdio/debug.c +++ b/src/kernel/lib/stdio/debug.c @@ -3,6 +3,7 @@ #include <kernel/lib/string.h> #include <kernel/lib/stdlib.h> #include <kernel/io/io.h> +#include <kernel/memory/kheap.h> void _write_serial(const char *data) { diff --git a/src/kernel/lib/stdio/vprintf.c b/src/kernel/lib/stdio/vprintf.c index 81b7be0..72f3917 100644 --- a/src/kernel/lib/stdio/vprintf.c +++ b/src/kernel/lib/stdio/vprintf.c @@ -3,6 +3,7 @@ #include <kernel/lib/stdio.h> #include <kernel/lib/string.h> #include <kernel/lib/stdlib.h> +#include <kernel/memory/kheap.h> void _writes(const char *data) { diff --git a/src/kernel/lib/stdlib.h b/src/kernel/lib/stdlib.h index fb79f42..9cd9fab 100644 --- a/src/kernel/lib/stdlib.h +++ b/src/kernel/lib/stdlib.h @@ -3,12 +3,6 @@ #include <stdint.h> -#ifndef MELVIX_ALLOC_H - -#include <kernel/lib/stdlib/liballoc.h> - -#endif - #ifndef MELVIX_STRING_H #include <kernel/lib/string.h> diff --git a/src/kernel/lib/stdlib/atoi.c b/src/kernel/lib/stdlib/atoi.c index 4044972..bcdd395 100644 --- a/src/kernel/lib/stdlib/atoi.c +++ b/src/kernel/lib/stdlib/atoi.c @@ -16,7 +16,7 @@ int atoi(char *str) int ret = 0; for (; i < s_str; i++) { - ret += (str[i] - '0') * pow(10, (s_str - i) - 1); + ret += (str[i] - '0') * pow(10, (int) ((s_str - i) - 1)); } if (negative) ret *= -1; diff --git a/src/kernel/lib/stdlib/htoa.c b/src/kernel/lib/stdlib/htoa.c index 660e26c..ccb01f1 100644 --- a/src/kernel/lib/stdlib/htoa.c +++ b/src/kernel/lib/stdlib/htoa.c @@ -1,12 +1,12 @@ #include <stdint.h> #include <kernel/lib/string.h> -#include <kernel/lib/stdlib.h> +#include <kernel/memory/kheap.h> static const char HTOA_TABLE[] = "0123456789ABCDEF"; char *htoa(uint32_t n) { - char *ret = kmalloc(10); + char *ret = (char *) kmalloc(10); int i = 0; while (n) { diff --git a/src/kernel/lib/stdlib/htoi.c b/src/kernel/lib/stdlib/htoi.c index f2d4702..cc77e16 100644 --- a/src/kernel/lib/stdlib/htoi.c +++ b/src/kernel/lib/stdlib/htoi.c @@ -16,7 +16,7 @@ int htoi(char *str) else if (c >= 'A' && c <= 'F') aux = (c - 'A') + 10; - ret += aux * pow(16, (s_str - i) - 1); + ret += aux * pow(16, (int) ((s_str - i) - 1)); } return ret; diff --git a/src/kernel/lib/stdlib/itoa.c b/src/kernel/lib/stdlib/itoa.c index 67273b3..ea03aa2 100644 --- a/src/kernel/lib/stdlib/itoa.c +++ b/src/kernel/lib/stdlib/itoa.c @@ -1,8 +1,8 @@ #include <kernel/lib/math.h> #include <stdint.h> #include <kernel/lib/string.h> -#include <kernel/lib/stdlib.h> -#include <kernel/paging/paging.h> +#include <kernel/memory/kheap.h> +#include <kernel/memory/paging.h> static const char ITOA_TABLE[] = "0123456789"; @@ -12,7 +12,7 @@ char *itoa(int n) return "0"; // kmalloc isn't available if (!n) { - char *ret = kmalloc(2); + char *ret = (char *) kmalloc(2); ret[0] = '0'; ret[1] = 0; return ret; @@ -23,7 +23,7 @@ char *itoa(int n) int sz; for (sz = 0; n % pow(10, sz) != n; sz++) {} - char *ret = kmalloc(sz + 1); + char *ret = (char *) kmalloc((uint32_t) (sz + 1)); for (int i = 0; i < sz; i++) { int digit = (n % pow(10, i + 1)) / pow(10, i); @@ -32,7 +32,7 @@ char *itoa(int n) ret[sz] = 0; if (negative) { - char *aux = kmalloc(sz + 2); + char *aux = (char *) kmalloc((uint32_t) (sz + 2)); strcpy(aux, ret); aux[sz] = '-'; aux[sz + 1] = 0; diff --git a/src/kernel/lib/stdlib/liballoc.c b/src/kernel/lib/stdlib/liballoc.c deleted file mode 100644 index c1a5de1..0000000 --- a/src/kernel/lib/stdlib/liballoc.c +++ /dev/null @@ -1,785 +0,0 @@ -/** - * TODO: This file suffers from major ugliness and needs a cleanup! - */ - -#include <stddef.h> -#include <stdint.h> -#include <kernel/paging/paging.h> - -int liballoc_lock() -{ - // asm ("cli"); - return 0; -} - -int liballoc_unlock() -{ - // asm ("sti"); - return 0; -} - -void *liballoc_alloc(size_t p) -{ - uint32_t ptr = paging_alloc_pages((uint32_t) p); - return (void *) ptr; -} - -int liballoc_free(void *ptr, size_t p) -{ - paging_set_free((uint32_t) ptr, (uint32_t) p); - return 0; -} - -#define ALIGNMENT 16ul -#define ALIGN_TYPE char -#define ALIGN_INFO sizeof(ALIGN_TYPE) * 16 - -#define ALIGN(ptr) \ - if ( ALIGNMENT > 1 ) { \ - uintptr_t diff; \ - ptr = (void*) ((uintptr_t) ptr + ALIGN_INFO); \ - diff = (uintptr_t) ptr & (ALIGNMENT - 1); \ - if (diff != 0) { \ - diff = ALIGNMENT - diff; \ - ptr = (void*) ((uintptr_t) ptr + diff); \ - } \ - *((ALIGN_TYPE*) ((uintptr_t) ptr - ALIGN_INFO)) = diff + ALIGN_INFO; \ - } - -#define UNALIGN(ptr) \ - if (ALIGNMENT > 1) { \ - uintptr_t diff = *((ALIGN_TYPE*) ((uintptr_t) ptr - ALIGN_INFO)); \ - if (diff < (ALIGNMENT + ALIGN_INFO)) { \ - ptr = (void*) ((uintptr_t) ptr - diff); \ - } \ - } - -#define LIBALLOC_MAGIC 0x900df00d -#define LIBALLOC_DEAD 0xbaadf00d - -struct liballoc_major { - struct liballoc_major *prev; - struct liballoc_major *next; - unsigned int pages; - unsigned int size; - unsigned int usage; - struct liballoc_minor *first; -}; - -struct liballoc_minor { - struct liballoc_minor *prev; - struct liballoc_minor *next; - struct liballoc_major *block; - unsigned int magic; - unsigned int size; - unsigned int req_size; -}; - -static struct liballoc_major *l_mem_root = NULL; -static struct liballoc_major *l_best_bet = NULL; - -static unsigned int l_page_size = 4096; -static unsigned int l_page_count = 16; -static unsigned long long l_allocated = 0; -static unsigned long long l_in_use = 0; -static long long l_warning_count = 0; -static long long l_error_count = 0; -static long long l_possible_overruns = 0; -static struct liballoc_major *l_mem_root_user = NULL; -static struct liballoc_major *l_best_bet_user = NULL; - -static unsigned long long l_allocated_user = 0; -static unsigned long long l_in_use_user = 0; -static long long l_warning_count_user = 0; -static long long l_error_count_user = 0; -static long long l_possible_overruns_user = 0; - -static void *liballoc_memset(void *s, int c, size_t n) -{ - unsigned int i; - for (i = 0; i < n; i++) - ((char *) s)[i] = c; - - return s; -} - -static void *liballoc_memcpy(void *s1, const void *s2, size_t n) -{ - char *cdest; - char *csrc; - unsigned int *ldest = (unsigned int *) s1; - unsigned int *lsrc = (unsigned int *) s2; - - while (n >= sizeof(unsigned int)) { - *ldest++ = *lsrc++; - n -= sizeof(unsigned int); - } - - cdest = (char *) ldest; - csrc = (char *) lsrc; - - while (n > 0) { - *cdest++ = *csrc++; - n -= 1; - } - return s1; -} - -static struct liballoc_major *allocate_new_page(unsigned int size, unsigned int shared) -{ - unsigned int st; - struct liballoc_major *maj; - - st = size + sizeof(struct liballoc_major); - st += sizeof(struct liballoc_minor); - - if ((st % l_page_size) == 0) - st = st / (l_page_size); - else - st = st / (l_page_size) + 1; - - if (st < l_page_count) st = l_page_count; - - maj = (struct liballoc_major *) liballoc_alloc(st); - if (shared == 1) paging_set_user((uint32_t) maj, st); - - if (maj == NULL) { - if (shared == 1) - l_warning_count_user += 1; - else - l_warning_count += 1; - return NULL; - } - - maj->prev = NULL; - maj->next = NULL; - maj->pages = st; - maj->size = st * l_page_size; - maj->usage = sizeof(struct liballoc_major); - maj->first = NULL; - - if (shared == 1) - l_allocated_user += maj->size; - else - l_allocated += maj->size; - - return maj; -} - -/** - * KERNEL SECTION -*/ - -void *kmalloc(size_t req_size) -{ - int started_bet = 0; - unsigned long long best_size = 0; - void *p = NULL; - uintptr_t diff; - struct liballoc_major *maj; - struct liballoc_minor *min; - struct liballoc_minor *new_min; - unsigned long size = req_size; - - if (ALIGNMENT > 1) { - size += ALIGNMENT + ALIGN_INFO; - } - - liballoc_lock(); - - if (size == 0) { - l_warning_count += 1; - liballoc_unlock(); - return kmalloc(1); - } - - if (l_mem_root == NULL) { - l_mem_root = allocate_new_page(size, 0); - if (l_mem_root == NULL) { - liballoc_unlock(); - return NULL; - } - } - - maj = l_mem_root; - started_bet = 0; - - if (l_best_bet != NULL) { - best_size = l_best_bet->size - l_best_bet->usage; - - if (best_size > (size + sizeof(struct liballoc_minor))) { - maj = l_best_bet; - started_bet = 1; - } - } - - while (maj != NULL) { - diff = maj->size - maj->usage; - if (best_size < diff) { - l_best_bet = maj; - best_size = diff; - } - - // Use-case 1 - if (diff < (size + sizeof(struct liballoc_minor))) { - if (maj->next != NULL) { - maj = maj->next; - continue; - } - - if (started_bet == 1) { - maj = l_mem_root; - started_bet = 0; - continue; - } - - maj->next = allocate_new_page(size, 0); - if (maj->next == NULL) break; - maj->next->prev = maj; - maj = maj->next; - } - - // Use-case 2 - if (maj->first == NULL) { - maj->first = (struct liballoc_minor *) ((uintptr_t) maj + sizeof(struct liballoc_major)); - - maj->first->magic = LIBALLOC_MAGIC; - maj->first->prev = NULL; - maj->first->next = NULL; - maj->first->block = maj; - maj->first->size = size; - maj->first->req_size = req_size; - maj->usage += size + sizeof(struct liballoc_minor); - l_in_use += size; - p = (void *) ((uintptr_t) (maj->first) + sizeof(struct liballoc_minor)); - ALIGN(p); - liballoc_unlock(); - return p; - } - - // Use-case 3 - diff = (uintptr_t) (maj->first); - diff -= (uintptr_t) maj; - diff -= sizeof(struct liballoc_major); - - if (diff >= (size + sizeof(struct liballoc_minor))) { - maj->first->prev = (struct liballoc_minor *) ((uintptr_t) maj + sizeof(struct liballoc_major)); - maj->first->prev->next = maj->first; - maj->first = maj->first->prev; - maj->first->magic = LIBALLOC_MAGIC; - maj->first->prev = NULL; - maj->first->block = maj; - maj->first->size = size; - maj->first->req_size = req_size; - maj->usage += size + sizeof(struct liballoc_minor); - l_in_use += size; - p = (void *) ((uintptr_t) (maj->first) + sizeof(struct liballoc_minor)); - ALIGN(p); - liballoc_unlock(); - return p; - } - - // Use-case 4 - min = maj->first; - while (min != NULL) { - if (min->next == NULL) { - diff = (uintptr_t) (maj) + maj->size; - diff -= (uintptr_t) min; - diff -= sizeof(struct liballoc_minor); - diff -= min->size; - if (diff >= (size + sizeof(struct liballoc_minor))) { - min->next = (struct liballoc_minor *) ((uintptr_t) min + sizeof(struct liballoc_minor) + min->size); - min->next->prev = min; - min = min->next; - min->next = NULL; - min->magic = LIBALLOC_MAGIC; - min->block = maj; - min->size = size; - min->req_size = req_size; - maj->usage += size + sizeof(struct liballoc_minor); - l_in_use += size; - p = (void *) ((uintptr_t) min + sizeof(struct liballoc_minor)); - ALIGN(p); - liballoc_unlock(); - return p; - } - } - - if (min->next != NULL) { - diff = (uintptr_t) (min->next); - diff -= (uintptr_t) min; - diff -= sizeof(struct liballoc_minor); - diff -= min->size; - - if (diff >= (size + sizeof(struct liballoc_minor))) { - new_min = (struct liballoc_minor *) ((uintptr_t) min + sizeof(struct liballoc_minor) + min->size); - new_min->magic = LIBALLOC_MAGIC; - new_min->next = min->next; - new_min->prev = min; - new_min->size = size; - new_min->req_size = req_size; - new_min->block = maj; - min->next->prev = new_min; - min->next = new_min; - maj->usage += size + sizeof(struct liballoc_minor); - l_in_use += size; - p = (void *) ((uintptr_t) new_min + sizeof(struct liballoc_minor)); - ALIGN(p); - liballoc_unlock(); - return p; - } - } - - min = min->next; - } - - // Use-case 5 - if (maj->next == NULL) { - if (started_bet == 1) { - maj = l_mem_root; - started_bet = 0; - continue; - } - maj->next = allocate_new_page(size, 0); - if (maj->next == NULL) break; - maj->next->prev = maj; - } - maj = maj->next; - } - - liballoc_unlock(); - - return NULL; -} - -void kfree(void *ptr) -{ - struct liballoc_minor *min; - struct liballoc_major *maj; - - if (ptr == NULL) { - l_warning_count += 1; - return; - } - - UNALIGN(ptr); - liballoc_lock(); - - min = (struct liballoc_minor *) ((uintptr_t) ptr - sizeof(struct liballoc_minor)); - - if (min->magic != LIBALLOC_MAGIC) { - l_error_count += 1; - - if (((min->magic & 0xFFFFFF) == (LIBALLOC_MAGIC & 0xFFFFFF)) || - ((min->magic & 0xFFFF) == (LIBALLOC_MAGIC & 0xFFFF)) || - ((min->magic & 0xFF) == (LIBALLOC_MAGIC & 0xFF))) { - l_possible_overruns += 1; - } - - liballoc_unlock(); - return; - } - - maj = min->block; - l_in_use -= min->size; - maj->usage -= (min->size + sizeof(struct liballoc_minor)); - min->magic = LIBALLOC_DEAD; - - if (min->next != NULL) min->next->prev = min->prev; - if (min->prev != NULL) min->prev->next = min->next; - if (min->prev == NULL) maj->first = min->next; - if (maj->first == NULL) { - if (l_mem_root == maj) l_mem_root = maj->next; - if (l_best_bet == maj) l_best_bet = NULL; - if (maj->prev != NULL) maj->prev->next = maj->next; - if (maj->next != NULL) maj->next->prev = maj->prev; - l_allocated -= maj->size; - liballoc_free(maj, maj->pages); - } else { - if (l_best_bet != NULL) { - int best_size = l_best_bet->size - l_best_bet->usage; - int majSize = maj->size - maj->usage; - if (majSize > best_size) l_best_bet = maj; - } - } - liballoc_unlock(); -} - -void *kcalloc(size_t nobj, size_t size) -{ - int real_size; - void *p; - - real_size = nobj * size; - - p = kmalloc(real_size); - - liballoc_memset(p, 0, real_size); - - return p; -} - -void *krealloc(void *p, size_t size) -{ - void *ptr; - struct liballoc_minor *min; - unsigned int real_size; - - if (size == 0) { - kfree(p); - return NULL; - } - - if (p == NULL) return kmalloc(size); - - ptr = p; - UNALIGN(ptr); - liballoc_lock(); - min = (struct liballoc_minor *) ((uintptr_t) ptr - sizeof(struct liballoc_minor)); - - if (min->magic != LIBALLOC_MAGIC) { - l_error_count += 1; - if (((min->magic & 0xFFFFFF) == (LIBALLOC_MAGIC & 0xFFFFFF)) || - ((min->magic & 0xFFFF) == (LIBALLOC_MAGIC & 0xFFFF)) || - ((min->magic & 0xFF) == (LIBALLOC_MAGIC & 0xFF))) { - l_possible_overruns += 1; - } - - liballoc_unlock(); - return NULL; - } - - real_size = min->req_size; - - if (real_size >= size) { - min->req_size = size; - liballoc_unlock(); - return p; - } - - liballoc_unlock(); - - ptr = kmalloc(size); - liballoc_memcpy(ptr, p, real_size); - kfree(p); - - return ptr; -} - -/** - * USER SECTION -*/ - -void *umalloc(size_t req_size) -{ - paging_switch_directory(1); - int started_bet = 0; - unsigned long long best_size = 0; - void *p = NULL; - uintptr_t diff; - struct liballoc_major *maj; - struct liballoc_minor *min; - struct liballoc_minor *new_min; - unsigned long size = req_size; - - if (ALIGNMENT > 1) { - size += ALIGNMENT + ALIGN_INFO; - } - - liballoc_lock(); - - if (size == 0) { - l_warning_count_user += 1; - liballoc_unlock(); - return umalloc(1); - } - - if (l_mem_root_user == NULL) { - l_mem_root_user = allocate_new_page(size, 1); - if (l_mem_root_user == NULL) { - liballoc_unlock(); - paging_switch_directory(0); - return NULL; - } - } - - maj = l_mem_root_user; - started_bet = 0; - - if (l_best_bet_user != NULL) { - best_size = l_best_bet_user->size - l_best_bet_user->usage; - - if (best_size > (size + sizeof(struct liballoc_minor))) { - maj = l_best_bet_user; - started_bet = 1; - } - } - - while (maj != NULL) { - diff = maj->size - maj->usage; - if (best_size < diff) { - l_best_bet_user = maj; - best_size = diff; - } - - // Use-case 1 - if (diff < (size + sizeof(struct liballoc_minor))) { - if (maj->next != NULL) { - maj = maj->next; - continue; - } - - if (started_bet == 1) { - maj = l_mem_root_user; - started_bet = 0; - continue; - } - - maj->next = allocate_new_page(size, 1); - if (maj->next == NULL) break; - maj->next->prev = maj; - maj = maj->next; - } - - // Use-case 2 - if (maj->first == NULL) { - maj->first = (struct liballoc_minor *) ((uintptr_t) maj + sizeof(struct liballoc_major)); - - maj->first->magic = LIBALLOC_MAGIC; - maj->first->prev = NULL; - maj->first->next = NULL; - maj->first->block = maj; - maj->first->size = size; - maj->first->req_size = req_size; - maj->usage += size + sizeof(struct liballoc_minor); - l_in_use_user += size; - p = (void *) ((uintptr_t) (maj->first) + sizeof(struct liballoc_minor)); - ALIGN(p); - liballoc_unlock(); - paging_switch_directory(0); - return p; - } - - // Use-case 3 - diff = (uintptr_t) (maj->first); - diff -= (uintptr_t) maj; - diff -= sizeof(struct liballoc_major); - - if (diff >= (size + sizeof(struct liballoc_minor))) { - maj->first->prev = (struct liballoc_minor *) ((uintptr_t) maj + sizeof(struct liballoc_major)); - maj->first->prev->next = maj->first; - maj->first = maj->first->prev; - maj->first->magic = LIBALLOC_MAGIC; - maj->first->prev = NULL; - maj->first->block = maj; - maj->first->size = size; - maj->first->req_size = req_size; - maj->usage += size + sizeof(struct liballoc_minor); - l_in_use_user += size; - p = (void *) ((uintptr_t) (maj->first) + sizeof(struct liballoc_minor)); - ALIGN(p); - liballoc_unlock(); - paging_switch_directory(0); - return p; - } - - // Use-case 4 - min = maj->first; - while (min != NULL) { - if (min->next == NULL) { - diff = (uintptr_t) (maj) + maj->size; - diff -= (uintptr_t) min; - diff -= sizeof(struct liballoc_minor); - diff -= min->size; - if (diff >= (size + sizeof(struct liballoc_minor))) { - min->next = (struct liballoc_minor *) ((uintptr_t) min + sizeof(struct liballoc_minor) + min->size); - min->next->prev = min; - min = min->next; - min->next = NULL; - min->magic = LIBALLOC_MAGIC; - min->block = maj; - min->size = size; - min->req_size = req_size; - maj->usage += size + sizeof(struct liballoc_minor); - l_in_use_user += size; - p = (void *) ((uintptr_t) min + sizeof(struct liballoc_minor)); - ALIGN(p); - liballoc_unlock(); - paging_switch_directory(0); - return p; - } - } - - if (min->next != NULL) { - diff = (uintptr_t) (min->next); - diff -= (uintptr_t) min; - diff -= sizeof(struct liballoc_minor); - diff -= min->size; - - if (diff >= (size + sizeof(struct liballoc_minor))) { - new_min = (struct liballoc_minor *) ((uintptr_t) min + sizeof(struct liballoc_minor) + min->size); - new_min->magic = LIBALLOC_MAGIC; - new_min->next = min->next; - new_min->prev = min; - new_min->size = size; - new_min->req_size = req_size; - new_min->block = maj; - min->next->prev = new_min; - min->next = new_min; - maj->usage += size + sizeof(struct liballoc_minor); - l_in_use_user += size; - p = (void *) ((uintptr_t) new_min + sizeof(struct liballoc_minor)); - ALIGN(p); - liballoc_unlock(); - paging_switch_directory(0); - return p; - } - } - - min = min->next; - } - - // Use-case 5 - if (maj->next == NULL) { - if (started_bet == 1) { - maj = l_mem_root_user; - started_bet = 0; - continue; - } - maj->next = allocate_new_page(size, 1); - if (maj->next == NULL) break; - maj->next->prev = maj; - } - maj = maj->next; - } - - liballoc_unlock(); - - paging_switch_directory(0); - return NULL; -} - -void ufree(void *ptr) -{ - paging_switch_directory(1); - struct liballoc_minor *min; - struct liballoc_major *maj; - - if (ptr == NULL) { - l_warning_count_user += 1; - paging_switch_directory(0); - return; - } - - UNALIGN(ptr); - liballoc_lock(); - - min = (struct liballoc_minor *) ((uintptr_t) ptr - sizeof(struct liballoc_minor)); - - if (min->magic != LIBALLOC_MAGIC) { - l_error_count_user += 1; - - if (((min->magic & 0xFFFFFF) == (LIBALLOC_MAGIC & 0xFFFFFF)) || - ((min->magic & 0xFFFF) == (LIBALLOC_MAGIC & 0xFFFF)) || - ((min->magic & 0xFF) == (LIBALLOC_MAGIC & 0xFF))) { - l_possible_overruns_user += 1; - } - - liballoc_unlock(); - paging_switch_directory(0); - return; - } - - maj = min->block; - l_in_use_user -= min->size; - maj->usage -= (min->size + sizeof(struct liballoc_minor)); - min->magic = LIBALLOC_DEAD; - - if (min->next != NULL) min->next->prev = min->prev; - if (min->prev != NULL) min->prev->next = min->next; - if (min->prev == NULL) maj->first = min->next; - if (maj->first == NULL) { - if (l_mem_root_user == maj) l_mem_root_user = maj->next; - if (l_best_bet_user == maj) l_best_bet_user = NULL; - if (maj->prev != NULL) maj->prev->next = maj->next; - if (maj->next != NULL) maj->next->prev = maj->prev; - l_allocated_user -= maj->size; - liballoc_free(maj, maj->pages); - } else { - if (l_best_bet_user != NULL) { - int best_size = l_best_bet_user->size - l_best_bet_user->usage; - int majSize = maj->size - maj->usage; - if (majSize > best_size) l_best_bet_user = maj; - } - } - liballoc_unlock(); - paging_switch_directory(0); -} - -void *ucalloc(size_t nobj, size_t size) -{ - paging_switch_directory(1); - int real_size; - void *p; - - real_size = nobj * size; - - p = umalloc(real_size); - - liballoc_memset(p, 0, real_size); - - paging_switch_directory(0); - return p; -} - -void *urealloc(void *p, size_t size) -{ - paging_switch_directory(1); - void *ptr; - struct liballoc_minor *min; - unsigned int real_size; - - if (size == 0) { - ufree(p); - paging_switch_directory(0); - return NULL; - } - - if (p == NULL) return umalloc(size); - - ptr = p; - UNALIGN(ptr); - liballoc_lock(); - min = (struct liballoc_minor *) ((uintptr_t) ptr - sizeof(struct liballoc_minor)); - - if (min->magic != LIBALLOC_MAGIC) { - l_error_count_user += 1; - if (((min->magic & 0xFFFFFF) == (LIBALLOC_MAGIC & 0xFFFFFF)) || - ((min->magic & 0xFFFF) == (LIBALLOC_MAGIC & 0xFFFF)) || - ((min->magic & 0xFF) == (LIBALLOC_MAGIC & 0xFF))) { - l_possible_overruns_user += 1; - } - - liballoc_unlock(); - paging_switch_directory(0); - return NULL; - } - - real_size = min->req_size; - - if (real_size >= size) { - min->req_size = size; - liballoc_unlock(); - paging_switch_directory(0); - return p; - } - - liballoc_unlock(); - - ptr = umalloc(size); - liballoc_memcpy(ptr, p, real_size); - ufree(p); - - paging_switch_directory(0); - return ptr; -}
\ No newline at end of file diff --git a/src/kernel/lib/stdlib/liballoc.h b/src/kernel/lib/stdlib/liballoc.h deleted file mode 100644 index 37a1624..0000000 --- a/src/kernel/lib/stdlib/liballoc.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef MELVIX_ALLOC_H -#define MELVIX_ALLOC_H - -#include <stddef.h> - -int liballoc_lock(); - -int liballoc_unlock(); - -void *liballoc_alloc(size_t); - -int liballoc_free(void *, size_t); - -void *kmalloc(size_t); - -void *krealloc(void *, size_t); - -void *kcalloc(size_t, size_t); - -void kfree(void *); - -void *umalloc(size_t); - -void *urealloc(void *, size_t); - -void *ucalloc(size_t, size_t); - -void ufree(void *); - -#endif diff --git a/src/kernel/lib/string/strdup.c b/src/kernel/lib/string/strdup.c index 9330144..7ddbf74 100644 --- a/src/kernel/lib/string/strdup.c +++ b/src/kernel/lib/string/strdup.c @@ -1,10 +1,10 @@ #include <kernel/lib/string.h> -#include <kernel/lib/stdlib.h> +#include <kernel/memory/kheap.h> char *strdup(const char *orig) { size_t s_orig = strlen(orig); - char *ret = kmalloc(s_orig + 1); + char *ret = (char *) kmalloc(s_orig + 1); strcpy(ret, orig); return ret; }
\ No newline at end of file diff --git a/src/kernel/memory/kheap.c b/src/kernel/memory/kheap.c new file mode 100644 index 0000000..def9ca2 --- /dev/null +++ b/src/kernel/memory/kheap.c @@ -0,0 +1,311 @@ +#include <stdint.h> +#include <kernel/memory/kheap.h> +#include <kernel/memory/paging.h> +#include <kernel/system.h> + +uint32_t placement_address = (uint32_t) &ASM_KERNEL_END; +extern page_directory_t *kernel_directory; +heap_t *kheap = 0; + +uint32_t kmalloc_int(uint32_t sz, int align, uint32_t *phys) +{ + if (kheap != 0) { + void *addr = alloc(sz, (uint8_t) align, kheap); + if (phys != 0) { + page_t *page = get_page((uint32_t) addr, 0, kernel_directory); + *phys = page->frame * 0x1000 + ((uint32_t) addr & 0xFFF); + } + return (uint32_t) addr; + } else { + if (align == 1 && (placement_address & 0xFFFFF000)) { + placement_address &= 0xFFFFF000; + placement_address += 0x1000; + } + if (phys) { + *phys = placement_address; + } + uint32_t tmp = placement_address; + placement_address += sz; + return tmp; + } +} + +void kfree(void *p) +{ + free(p, kheap); +} + +uint32_t kmalloc_a(uint32_t sz) +{ + return kmalloc_int(sz, 1, 0); +} + +uint32_t kmalloc_p(uint32_t sz, uint32_t *phys) +{ + return kmalloc_int(sz, 0, phys); +} + +uint32_t kmalloc_ap(uint32_t sz, uint32_t *phys) +{ + return kmalloc_int(sz, 1, phys); +} + +uint32_t kmalloc(uint32_t sz) +{ + return kmalloc_int(sz, 0, 0); +} + +static void expand(uint32_t new_size, heap_t *heap) +{ + assert(new_size > heap->end_address - heap->start_address); + + if ((new_size & 0xFFFFF000) != 0) { + new_size &= 0xFFFFF000; + new_size += 0x1000; + } + + assert(heap->start_address + new_size <= heap->max_address); + + uint32_t old_size = heap->end_address - heap->start_address; + + uint32_t i = old_size; + while (i < new_size) { + alloc_frame(get_page(heap->start_address + i, 1, kernel_directory), + (heap->supervisor) ? 1 : 0, (heap->readonly) ? 0 : 1); + i += 0x1000; + } + heap->end_address = heap->start_address + new_size; +} + +static uint32_t contract(uint32_t new_size, heap_t *heap) +{ + assert(new_size < heap->end_address - heap->start_address); + + if (new_size & 0x1000) { + new_size &= 0x1000; + new_size += 0x1000; + } + + if (new_size < HEAP_MIN_SIZE) + new_size = HEAP_MIN_SIZE; + + uint32_t old_size = heap->end_address - heap->start_address; + uint32_t i = old_size - 0x1000; + while (new_size < i) { + free_frame(get_page(heap->start_address + i, 0, kernel_directory)); + i -= 0x1000; + } + + heap->end_address = heap->start_address + new_size; + return new_size; +} + +static int32_t find_smallest_hole(uint32_t size, uint8_t page_align, heap_t *heap) +{ + uint32_t iterator = 0; + while (iterator < heap->index.size) { + header_t *header = (header_t *) lookup_ordered_array(iterator, &heap->index); + if (page_align > 0) { + uint32_t location = (uint32_t) header; + int32_t offset = 0; + if (((location + sizeof(header_t)) & 0xFFFFF000) != 0) + offset = 0x1000 - (location + sizeof(header_t)) % 0x1000; + int32_t hole_size = (int32_t) header->size - offset; + if (hole_size >= (int32_t) size) + break; + } else if (header->size >= size) + break; + iterator++; + } + if (iterator == heap->index.size) + return -1; + else + return iterator; +} + +static int8_t header_t_less_than(void *a, void *b) +{ + return (int8_t) ((((header_t *) a)->size < ((header_t *) b)->size) ? 1 : 0); +} + +heap_t *create_heap(uint32_t start, uint32_t end_addr, uint32_t max, uint8_t supervisor, uint8_t readonly) +{ + heap_t *heap = (heap_t *) kmalloc(sizeof(heap_t)); + + assert(start % 0x1000 == 0); + assert(end_addr % 0x1000 == 0); + + heap->index = place_ordered_array((void *) start, HEAP_INDEX_SIZE, &header_t_less_than); + + start += sizeof(type_t) * HEAP_INDEX_SIZE; + + if ((start & 0xFFFFF000) != 0) { + start &= 0xFFFFF000; + start += 0x1000; + } + + heap->start_address = start; + heap->end_address = end_addr; + heap->max_address = max; + heap->supervisor = supervisor; + heap->readonly = readonly; + + header_t *hole = (header_t *) start; + hole->size = end_addr - start; + hole->magic = HEAP_MAGIC; + hole->is_hole = 1; + insert_ordered_array((void *) hole, &heap->index); + + return heap; +} + +void *alloc(uint32_t size, uint8_t page_align, heap_t *heap) +{ + uint32_t new_size = size + sizeof(header_t) + sizeof(footer_t); + int32_t iterator = find_smallest_hole(new_size, page_align, heap); + + if (iterator == -1) { + uint32_t old_length = heap->end_address - heap->start_address; + uint32_t old_end_address = heap->end_address; + + expand(old_length + new_size, heap); + uint32_t new_length = heap->end_address - heap->start_address; + + iterator = 0; + uint32_t idx = (uint32_t) -1; + uint32_t value = 0x0; + while ((uint32_t) iterator < heap->index.size) { + uint32_t tmp = (uint32_t) lookup_ordered_array((uint32_t) iterator, &heap->index); + if (tmp > value) { + value = tmp; + idx = (uint32_t) iterator; + } + iterator++; + } + + if ((int) idx == -1) { + header_t *header = (header_t *) old_end_address; + header->magic = HEAP_MAGIC; + header->size = new_length - old_length; + header->is_hole = 1; + footer_t *footer = (footer_t *) (old_end_address + header->size - sizeof(footer_t)); + footer->magic = HEAP_MAGIC; + footer->header = header; + insert_ordered_array((void *) header, &heap->index); + } else { + header_t *header = lookup_ordered_array(idx, &heap->index); + header->size += new_length - old_length; + footer_t *footer = (footer_t *) ((uint32_t) header + header->size - sizeof(footer_t)); + footer->header = header; + footer->magic = HEAP_MAGIC; + } + return alloc(size, page_align, heap); + } + + header_t *orig_hole_header = (header_t *) lookup_ordered_array((uint32_t) iterator, &heap->index); + uint32_t orig_hole_pos = (uint32_t) orig_hole_header; + uint32_t orig_hole_size = orig_hole_header->size; + if (orig_hole_size - new_size < sizeof(header_t) + sizeof(footer_t)) { + size += orig_hole_size - new_size; + new_size = orig_hole_size; + } + + if (page_align && orig_hole_pos & 0xFFFFF000) { + uint32_t new_location = orig_hole_pos + 0x1000 - (orig_hole_pos & 0xFFF) - sizeof(header_t); + header_t *hole_header = (header_t *) orig_hole_pos; + hole_header->size = 0x1000 - (orig_hole_pos & 0xFFF) - sizeof(header_t); + hole_header->magic = HEAP_MAGIC; + hole_header->is_hole = 1; + footer_t *hole_footer = (footer_t *) ((uint32_t) new_location - sizeof(footer_t)); + hole_footer->magic = HEAP_MAGIC; + hole_footer->header = hole_header; + orig_hole_pos = new_location; + orig_hole_size = orig_hole_size - hole_header->size; + } else { + remove_ordered_array((uint32_t) iterator, &heap->index); + } + + header_t *block_header = (header_t *) orig_hole_pos; + block_header->magic = HEAP_MAGIC; + block_header->is_hole = 0; + block_header->size = new_size; + footer_t *block_footer = (footer_t *) (orig_hole_pos + sizeof(header_t) + size); + block_footer->magic = HEAP_MAGIC; + block_footer->header = block_header; + + if (orig_hole_size - new_size > 0) { + header_t *hole_header = (header_t *) (orig_hole_pos + sizeof(header_t) + size + sizeof(footer_t)); + hole_header->magic = HEAP_MAGIC; + hole_header->is_hole = 1; + hole_header->size = orig_hole_size - new_size; + footer_t *hole_footer = (footer_t *) ((uint32_t) hole_header + orig_hole_size - new_size - sizeof(footer_t)); + if ((uint32_t) hole_footer < heap->end_address) { + hole_footer->magic = HEAP_MAGIC; + hole_footer->header = hole_header; + } + insert_ordered_array((void *) hole_header, &heap->index); + } + + return (void *) ((uint32_t) block_header + sizeof(header_t)); +} + +void free(void *p, heap_t *heap) +{ + if (p == 0) + return; + + header_t *header = (header_t *) ((uint32_t) p - sizeof(header_t)); + footer_t *footer = (footer_t *) ((uint32_t) header + header->size - sizeof(footer_t)); + + assert(header->magic == HEAP_MAGIC); + assert(footer->magic == HEAP_MAGIC); + + header->is_hole = 1; + + char do_add = 1; + + footer_t *test_footer = (footer_t *) ((uint32_t) header - sizeof(footer_t)); + if (test_footer->magic == HEAP_MAGIC && + test_footer->header->is_hole == 1) { + uint32_t cache_size = header->size; + header = test_footer->header; + footer->header = header; + header->size += cache_size; + do_add = 0; + } + + header_t *test_header = (header_t *) ((uint32_t) footer + sizeof(footer_t)); + if (test_header->magic == HEAP_MAGIC && + test_header->is_hole) { + header->size += test_header->size; + test_footer = (footer_t *) ((uint32_t) test_header + test_header->size - sizeof(footer_t)); + footer = test_footer; + uint32_t iterator = 0; + while ((iterator < heap->index.size) && (lookup_ordered_array(iterator, &heap->index) != (void *) test_header)) + iterator++; + + assert(iterator < heap->index.size); + remove_ordered_array(iterator, &heap->index); + } + + if ((uint32_t) footer + sizeof(footer_t) == heap->end_address) { + uint32_t old_length = heap->end_address - heap->start_address; + uint32_t new_length = contract((uint32_t) header - heap->start_address, heap); + if (header->size - (old_length - new_length) > 0) { + header->size -= old_length - new_length; + footer = (footer_t *) ((uint32_t) header + header->size - sizeof(footer_t)); + footer->magic = HEAP_MAGIC; + footer->header = header; + } else { + uint32_t iterator = 0; + while ((iterator < heap->index.size) && + (lookup_ordered_array(iterator, &heap->index) != (void *) test_header)) + iterator++; + if (iterator < heap->index.size) + remove_ordered_array(iterator, &heap->index); + } + } + + if (do_add == 1) + insert_ordered_array((void *) header, &heap->index); +}
\ No newline at end of file diff --git a/src/kernel/memory/kheap.h b/src/kernel/memory/kheap.h new file mode 100644 index 0000000..f31a2d3 --- /dev/null +++ b/src/kernel/memory/kheap.h @@ -0,0 +1,52 @@ +#ifndef MELVIX_KHEAP_H +#define MELVIX_KHEAP_H + +#include <stdint.h> +#include <kernel/memory/ordered_array.h> + +#define KHEAP_START 0xC0000000 +#define KHEAP_INITIAL_SIZE 0x100000 + +#define HEAP_INDEX_SIZE 0x20000 +#define HEAP_MAGIC 0xabcdef42 +#define HEAP_MIN_SIZE 0x70000 + +typedef struct { + uint32_t magic; + uint8_t is_hole; + uint32_t size; +} header_t; + +typedef struct { + uint32_t magic; + header_t *header; +} footer_t; + +typedef struct { + ordered_array_t index; + uint32_t start_address; + uint32_t end_address; + uint32_t max_address; + uint8_t supervisor; + uint8_t readonly; +} heap_t; + +heap_t *create_heap(uint32_t start, uint32_t end, uint32_t max, uint8_t supervisor, uint8_t readonly); + +void *alloc(uint32_t size, uint8_t page_align, heap_t *heap); + +void free(void *p, heap_t *heap); + +uint32_t kmalloc_int(uint32_t sz, int align, uint32_t *phys); + +uint32_t kmalloc_a(uint32_t sz); + +uint32_t kmalloc_p(uint32_t sz, uint32_t *phys); + +uint32_t kmalloc_ap(uint32_t sz, uint32_t *phys); + +uint32_t kmalloc(uint32_t sz); + +void kfree(void *p); + +#endif
\ No newline at end of file diff --git a/src/kernel/memory/ordered_array.c b/src/kernel/memory/ordered_array.c new file mode 100644 index 0000000..5d94491 --- /dev/null +++ b/src/kernel/memory/ordered_array.c @@ -0,0 +1,68 @@ +#include <kernel/memory/ordered_array.h> +#include <stdint.h> +#include <kernel/lib/lib.h> +#include <kernel/system.h> +#include "kheap.h" + +int8_t standard_lessthan_predicate(type_t a, type_t b) +{ + return (int8_t) ((a < b) ? 1 : 0); +} + +ordered_array_t create_ordered_array(uint32_t max_size, lessthan_predicate_t less_than) +{ + ordered_array_t to_ret; + to_ret.array = (void *) kmalloc(max_size * sizeof(type_t)); + memset(to_ret.array, 0, max_size * sizeof(type_t)); + to_ret.size = 0; + to_ret.max_size = max_size; + to_ret.less_than = less_than; + return to_ret; +} + +ordered_array_t place_ordered_array(void *addr, uint32_t max_size, lessthan_predicate_t less_than) +{ + ordered_array_t to_ret; + to_ret.array = (type_t *) addr; + memset(to_ret.array, 0, max_size * sizeof(type_t)); + to_ret.size = 0; + to_ret.max_size = max_size; + to_ret.less_than = less_than; + return to_ret; +} + +void insert_ordered_array(type_t item, ordered_array_t *array) +{ + assert((int) array->less_than); + uint32_t iterator = 0; + while (iterator < array->size && array->less_than(array->array[iterator], item)) + iterator++; + if (iterator == array->size) + array->array[array->size++] = item; + else { + type_t tmp = array->array[iterator]; + array->array[iterator] = item; + while (iterator < array->size) { + iterator++; + type_t tmp2 = array->array[iterator]; + array->array[iterator] = tmp; + tmp = tmp2; + } + array->size++; + } +} + +type_t lookup_ordered_array(uint32_t i, ordered_array_t *array) +{ + assert(i < array->size); + return array->array[i]; +} + +void remove_ordered_array(uint32_t i, ordered_array_t *array) +{ + while (i < array->size) { + array->array[i] = array->array[i + 1]; + i++; + } + array->size--; +}
\ No newline at end of file diff --git a/src/kernel/memory/ordered_array.h b/src/kernel/memory/ordered_array.h new file mode 100644 index 0000000..cf753e3 --- /dev/null +++ b/src/kernel/memory/ordered_array.h @@ -0,0 +1,31 @@ +#ifndef MELVIX_ORDERED_ARRAY_H +#define MELVIX_ORDERED_ARRAY_H + +#include <stdint.h> + +typedef void *type_t; + +typedef int8_t (*lessthan_predicate_t)(type_t, type_t); + +typedef struct { + type_t *array; + uint32_t size; + uint32_t max_size; + lessthan_predicate_t less_than; +} ordered_array_t; + +int8_t standard_lessthan_predicate(type_t a, type_t b); + +ordered_array_t create_ordered_array(uint32_t max_size, lessthan_predicate_t less_than); + +ordered_array_t place_ordered_array(void *addr, uint32_t max_size, lessthan_predicate_t less_than); + +void destroy_ordered_array(ordered_array_t *array); + +void insert_ordered_array(type_t item, ordered_array_t *array); + +type_t lookup_ordered_array(uint32_t i, ordered_array_t *array); + +void remove_ordered_array(uint32_t i, ordered_array_t *array); + +#endif diff --git a/src/kernel/memory/paging.c b/src/kernel/memory/paging.c new file mode 100644 index 0000000..e050861 --- /dev/null +++ b/src/kernel/memory/paging.c @@ -0,0 +1,203 @@ +#include <kernel/memory/paging.h> +#include <kernel/memory/kheap.h> +#include <kernel/lib/lib.h> +#include <kernel/system.h> + +int paging_enabled = 0; + +page_directory_t *kernel_directory = 0; +page_directory_t *current_directory = 0; + +uint32_t *frames; +uint32_t nframes; + +extern uint32_t placement_address; +extern heap_t *kheap; + +extern void copy_page_physical(); + +#define INDEX_FROM_BIT(a) (a/(8*4)) +#define OFFSET_FROM_BIT(a) (a%(8*4)) + +static void set_frame(uint32_t frame_addr) +{ + uint32_t frame = frame_addr / 0x1000; + uint32_t idx = INDEX_FROM_BIT(frame); + uint32_t off = OFFSET_FROM_BIT(frame); + frames[idx] |= (0x1 << off); +} + +static void clear_frame(uint32_t frame_addr) +{ + uint32_t frame = frame_addr / 0x1000; + uint32_t idx = INDEX_FROM_BIT(frame); + uint32_t off = OFFSET_FROM_BIT(frame); + frames[idx] &= ~(0x1 << off); +} + +static uint32_t first_frame() +{ + uint32_t i, j; + for (i = 0; i < INDEX_FROM_BIT(nframes); i++) { + if (frames[i] != 0xFFFFFFFF) { + for (j = 0; j < 32; j++) { + uint32_t toTest = (0x1 << j); + if (!(frames[i] & toTest)) { + return i * 4 * 8 + j; + } + } + } + } + return 0; +} + +void alloc_frame(page_t *page, int is_kernel, int is_writeable) +{ + if (page->frame != 0) { + return; + } else { + uint32_t idx = first_frame(); + if (idx == (uint32_t) -1) + panic("No free frames!"); + set_frame(idx * 0x1000); + page->present = 1; + page->rw = (is_writeable == 1) ? 1 : 0; + page->user = (is_kernel == 1) ? 0 : 1; + page->frame = idx; + } +} + +void free_frame(page_t *page) +{ + uint32_t frame; + if (!(frame = page->frame)) { + return; + } else { + clear_frame(frame); + page->frame = 0x0; + } +} + +void paging_install() +{ + uint32_t mem_end_page = memory_get_all() << 10; + + nframes = mem_end_page / 0x1000; + frames = (uint32_t *) kmalloc(INDEX_FROM_BIT(nframes)); + memset(frames, 0, INDEX_FROM_BIT(nframes)); + + kernel_directory = (page_directory_t *) kmalloc_a(sizeof(page_directory_t)); + memset(kernel_directory, 0, sizeof(page_directory_t)); + kernel_directory->physicalAddr = (uint32_t) kernel_directory->tablesPhysical; + + for (uint32_t i = KHEAP_START; i < KHEAP_START + KHEAP_INITIAL_SIZE; i += 0x1000) + get_page((uint32_t) i, 1, kernel_directory); + + int i = 0; + while (i < 0x400000) { + alloc_frame(get_page((uint32_t) i, 1, kernel_directory), 0, 0); + i += 0x1000; + } + + for (i = KHEAP_START; i < (int) (KHEAP_START + KHEAP_INITIAL_SIZE); i += 0x1000) + alloc_frame(get_page((uint32_t) i, 1, kernel_directory), 0, 0); + + switch_page_directory(kernel_directory); + + kheap = create_heap(KHEAP_START, KHEAP_START + KHEAP_INITIAL_SIZE, 0xCFFFF000, 0, 0); + + current_directory = clone_directory(kernel_directory); + switch_page_directory(current_directory); + vga_log("Installed Paging"); +} + +void switch_page_directory(page_directory_t *dir) +{ + current_directory = dir; + asm volatile("mov %0, %%cr3"::"r"(dir->physicalAddr)); + uint32_t cr0; + asm volatile("mov %%cr0, %0": "=r"(cr0)); + cr0 |= 0x80000000; // Enable paging! + asm volatile("mov %0, %%cr0"::"r"(cr0)); +} + +void paging_enable() +{ + switch_page_directory(kernel_directory); + paging_enabled = 1; +} + +void paging_disable() +{ + uint32_t cr0; + asm ("mov %%cr0, %0": "=r"(cr0)); + cr0 &= 0x7fffffff; + asm ("mov %0, %%cr0"::"r"(cr0)); + paging_enabled = 0; +} + +page_t *get_page(uint32_t address, int make, page_directory_t *dir) +{ + address /= 0x1000; + uint32_t table_idx = address / 1024; + + if (dir->tables[table_idx]) { + return &dir->tables[table_idx]->pages[address % 1024]; + } else if (make) { + uint32_t tmp; + dir->tables[table_idx] = (page_table_t *) kmalloc_ap(sizeof(page_table_t), &tmp); + memset(dir->tables[table_idx], 0, 0x1000); + dir->tablesPhysical[table_idx] = tmp | 0x7; // PRESENT, RW, US + return &dir->tables[table_idx]->pages[address % 1024]; + } else { + return 0; + } +} + +static page_table_t *clone_table(page_table_t *src, uint32_t *physAddr) +{ + page_table_t *table = (page_table_t *) kmalloc_ap(sizeof(page_table_t), physAddr); + memset(table, 0, sizeof(page_directory_t)); + + for (int i = 0; i < 1024; i++) { + if (!src->pages[i].frame) + continue; + + alloc_frame(&table->pages[i], 0, 0); + + if (src->pages[i].present) table->pages[i].present = 1; + if (src->pages[i].rw) table->pages[i].rw = 1; + if (src->pages[i].user) table->pages[i].user = 1; + if (src->pages[i].accessed)table->pages[i].accessed = 1; + if (src->pages[i].dirty) table->pages[i].dirty = 1; + + copy_page_physical(src->pages[i].frame * 0x1000, table->pages[i].frame * 0x1000); + } + return table; +} + +page_directory_t *clone_directory(page_directory_t *src) +{ + uint32_t phys; + page_directory_t *dir = (page_directory_t *) kmalloc_ap(sizeof(page_directory_t), &phys); + memset(dir, 0, sizeof(page_directory_t)); + + uint32_t offset = (uint32_t) dir->tablesPhysical - (uint32_t) dir; + + dir->physicalAddr = phys + offset; + + for (int i = 0; i < 1024; i++) { + if (!src->tables[i]) + continue; + + if (kernel_directory->tables[i] == src->tables[i]) { + dir->tables[i] = src->tables[i]; + dir->tablesPhysical[i] = src->tablesPhysical[i]; + } else { + uint32_t phys; + dir->tables[i] = clone_table(src->tables[i], &phys); + dir->tablesPhysical[i] = phys | 0x07; + } + } + return dir; +}
\ No newline at end of file diff --git a/src/kernel/memory/paging.h b/src/kernel/memory/paging.h new file mode 100644 index 0000000..285cb6f --- /dev/null +++ b/src/kernel/memory/paging.h @@ -0,0 +1,47 @@ +#ifndef MELVIX_PAGING_H +#define MELVIX_PAGING_H + +#include <stdint.h> +#include <kernel/interrupts/interrupts.h> + +typedef struct page { + uint32_t present: 1; + uint32_t rw: 1; + uint32_t user: 1; + uint32_t accessed: 1; + uint32_t dirty: 1; + uint32_t unused: 7; + uint32_t frame: 20; +} page_t; + +typedef struct page_table { + page_t pages[1024]; +} page_table_t; + +typedef struct page_directory { + page_table_t *tables[1024]; + uint32_t tablesPhysical[1024]; + uint32_t physicalAddr; +} page_directory_t; + +int paging_enabled; + +void alloc_frame(page_t *page, int is_kernel, int is_writeable); + +void free_frame(page_t *page); + +void paging_install(); + +void switch_page_directory(page_directory_t *new); + +void paging_enable(); + +void paging_disable(); + +page_t *get_page(uint32_t address, int make, page_directory_t *dir); + +void page_fault(struct regs *regs); + +page_directory_t *clone_directory(page_directory_t *src); + +#endif diff --git a/src/kernel/net/rtl8139.c b/src/kernel/net/rtl8139.c index cfddebc..13a9c29 100644 --- a/src/kernel/net/rtl8139.c +++ b/src/kernel/net/rtl8139.c @@ -2,8 +2,8 @@ #include <kernel/pci/pci.h> #include <kernel/system.h> #include <kernel/interrupts/interrupts.h> -#include <kernel/lib/stdlib/liballoc.h> #include <kernel/lib/stdio.h> +#include <kernel/memory/kheap.h> int rtl_irq = 0; uint8_t mac[6]; @@ -21,12 +21,12 @@ void find_rtl(uint32_t device, uint16_t vendor_id, uint16_t device_id, void *ext void rtl8139_irq_handler(struct regs *r) { serial_printf("RTL INT!"); - uint16_t status = inw(rtl_iobase + 0x3E); + uint16_t status = inw((uint16_t) (rtl_iobase + 0x3E)); if (!status) return; - outw(rtl_iobase + 0x3E, status); + outw((uint16_t) (rtl_iobase + 0x3E), status); if (status & 0x01 || status & 0x02) { - while ((inw(rtl_iobase + 0x37) & 0x01) == 0) { + while ((inw((uint16_t) (rtl_iobase + 0x37)) & 0x01) == 0) { serial_printf("RECEIVE"); // RECEIVE } @@ -36,7 +36,7 @@ void rtl8139_irq_handler(struct regs *r) int rtl8139_init(void) { if (rtl_device_pci) { - uint16_t command_reg = pci_read_field(rtl_device_pci, PCI_COMMAND, 4); + uint16_t command_reg = (uint16_t) pci_read_field(rtl_device_pci, PCI_COMMAND, 4); if (command_reg & (1 << 2)) { } else { @@ -59,28 +59,28 @@ int rtl8139_init(void) // Get mac address for (int i = 0; i < 6; ++i) - mac[i] = inb(rtl_iobase + 0x00 + i); + mac[i] = inb((uint16_t) (rtl_iobase + 0x00 + i)); debug("Mac address: %2x:%2x:%2x:%2x:%2x:%2x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); // Activate (turn on) - outb(rtl_iobase + 0x52, 0x0); + outb((uint16_t) (rtl_iobase + 0x52), 0x0); // Reset - outb(rtl_iobase + 0x37, 0x10); - while ((inb(rtl_iobase + 0x37) & 0x10) != 0) {} + outb((uint16_t) (rtl_iobase + 0x37), 0x10); + while ((inb((uint16_t) (rtl_iobase + 0x37)) & 0x10) != 0) {} // Set receive buffer - rtl_rx_buffer = kmalloc(8192 + 16); - outl(rtl_iobase + 0x30, (uintptr_t) rtl_rx_buffer); + rtl_rx_buffer = (uint8_t *) kmalloc(8192 + 16); + outl((uint16_t) (rtl_iobase + 0x30), (uintptr_t) rtl_rx_buffer); // Enable ISR - outw(rtl_iobase + 0x3C, 0x0005); + outw((uint16_t) (rtl_iobase + 0x3C), 0x0005); // Accept packets - outl(rtl_iobase + 0x44, 0xf | (1 << 7)); + outl((uint16_t) (rtl_iobase + 0x44), 0xf | (1 << 7)); // Enable receive and transmitter - outb(rtl_iobase + 0x37, 0x0C); + outb((uint16_t) (rtl_iobase + 0x37), 0x0C); } else { return -1; } diff --git a/src/kernel/paging/paging.c b/src/kernel/paging/paging.c deleted file mode 100644 index c4a2940..0000000 --- a/src/kernel/paging/paging.c +++ /dev/null @@ -1,192 +0,0 @@ -#include <stdint.h> -#include <kernel/paging/paging.h> -#include <kernel/system.h> -#include <kernel/lib/lib.h> - -int paging_enabled = 0; - -uint32_t *current_page_directory; -uint32_t (*current_page_tables)[1024]; -uint32_t kernel_page_directory[1024] __attribute__((aligned(4096))); -uint32_t kernel_page_tables[1024][1024] __attribute__((aligned(4096))); -uint32_t user_page_directory[1024] __attribute__((aligned(4096))); -uint32_t user_page_tables[1024][1024] __attribute__((aligned(4096))); - -void paging_init() -{ - for (uint32_t i = 0; i < 1024; i++) { - for (uint32_t j = 0; j < 1024; j++) { - current_page_tables[i][j] = ((j * 0x1000) + (i * 0x400000)) | PT_RW; - } - } - - for (uint32_t i = 0; i < 1024; i++) { - current_page_directory[i] = ((uint32_t) current_page_tables[i]) | PD_RW | PD_PRESENT; - } - - paging_set_present(0, memory_get_all() >> 3); // /4 -} - -void paging_install() -{ - // User paging - paging_switch_directory(1); - paging_init(); - paging_set_user(0, memory_get_all() >> 3); - - // Kernel paging - paging_switch_directory(0); - paging_init(); - paging_set_used(0, ((uint32_t) ASM_KERNEL_END >> 12) + 1); // /4096 - - paging_enable(); - - vga_log("Installed paging"); -} - -void paging_disable() -{ - uint32_t cr0; - asm ("mov %%cr0, %0": "=r"(cr0)); - cr0 &= 0x7fffffff; - asm ("mov %0, %%cr0"::"r"(cr0)); - paging_enabled = 0; -} - -void paging_switch_directory(int user) -{ - if (user == 1) { - current_page_tables = user_page_tables; - current_page_directory = user_page_directory; - } else { - current_page_tables = kernel_page_tables; - current_page_directory = kernel_page_directory; - } - asm ("mov %0, %%cr3"::"r"(current_page_directory)); -} - -void paging_enable() -{ - asm ("mov %0, %%cr3"::"r"(current_page_directory)); - uint32_t cr0; - asm ("mov %%cr0, %0": "=r"(cr0)); - cr0 |= 0x80000000; - asm ("mov %0, %%cr0"::"r"(cr0)); - paging_enabled = 1; -} - -inline void invlpg(uint32_t addr) -{ - asm ("invlpg (%0)"::"r" (addr) : "memory"); -} - -void paging_map(uint32_t phy, uint32_t virt, uint16_t flags) -{ - uint32_t pdi = virt >> 22; - uint32_t pti = virt >> 12 & 0x03FF; - current_page_tables[pdi][pti] = phy | flags; - invlpg(virt); -} - -uint32_t paging_get_phys(uint32_t virt) -{ - uint32_t pdi = virt >> 22; - uint32_t pti = (virt >> 12) & 0x03FF; - return current_page_tables[pdi][pti] & 0xFFFFF000; -} - -uint16_t paging_get_flags(uint32_t virt) -{ - uint32_t pdi = virt >> 22; - uint32_t pti = (virt >> 12) & 0x03FF; - return current_page_tables[pdi][pti] & 0xFFF; -} - -void paging_set_flag_up(uint32_t virt, uint32_t count, uint32_t flag) -{ - uint32_t page_n = virt / 4096; - for (uint32_t i = page_n; i < page_n + count; i++) { - current_page_tables[i / 1024][i % 1024] |= flag; - invlpg(i * 4096); - } -} - -void paging_set_flag_down(uint32_t virt, uint32_t count, uint32_t flag) -{ - uint32_t page_n = virt / 4096; - for (uint32_t i = page_n; i < page_n + count; i++) { - current_page_tables[i / 1024][i % 1024] &= ~flag; - invlpg(i * 4096); - } -} - -void paging_set_present(uint32_t virt, uint32_t count) -{ - paging_set_flag_up(virt, count, PT_PRESENT); -} - -void paging_set_absent(uint32_t virt, uint32_t count) -{ - paging_set_flag_down(virt, count, PT_PRESENT); -} - -void paging_set_used(uint32_t virt, uint32_t count) -{ - paging_set_flag_up(virt, count, PT_USED); -} - -void paging_set_free(uint32_t virt, uint32_t count) -{ - paging_set_flag_down(virt, count, PT_USED); -} - -void paging_set_user(uint32_t virt, uint32_t count) -{ - uint32_t page_n = virt / 4096; - for (uint32_t i = page_n; i < page_n + count; i += 1024) { - current_page_directory[i / 1024] |= PD_ALL_PRIV; - } - paging_set_flag_up(virt, count, PT_ALL_PRIV); -} - -uint32_t paging_find_pages(uint32_t count) -{ - uint32_t continuous = 0; - uint32_t startDir = 0; - uint32_t startPage = 0; - for (uint32_t i = 0; i < 1024; i++) { - for (uint32_t j = 0; j < 1024; j++) { - if (!(current_page_tables[i][j] & PT_PRESENT) || (current_page_tables[i][j] & PT_USED)) { - continuous = 0; - startDir = i; - startPage = j + 1; - } else { - if (++continuous == count) - return (startDir * 0x400000) + (startPage * 0x1000); - } - } - } - - panic("Out of memory!"); - return 0; -} - -uint32_t paging_alloc_pages(uint32_t count) -{ - uint32_t ptr = paging_find_pages(count); - paging_set_used(ptr, count); - paging_set_user(ptr, count); - return ptr; -} - -uint32_t paging_get_used_pages() -{ - uint32_t n = 0; - for (uint32_t i = 0; i < 1024; i++) { - for (uint32_t j = 0; j < 1024; j++) { - uint8_t flags = current_page_tables[i][j] & PT_USED; - if (flags == 1) n++; - } - } - return n; -}
\ No newline at end of file diff --git a/src/kernel/paging/paging.h b/src/kernel/paging/paging.h deleted file mode 100644 index b75bbe3..0000000 --- a/src/kernel/paging/paging.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef MELVIX_PAGING_H -#define MELVIX_PAGING_H - -#include <stdint.h> - -#define PD_PRESENT 1 << 0 -#define PD_RW 1 << 1 -#define PD_ALL_PRIV 1 << 2 -#define PD_WRITETHR 1 << 3 -#define PD_CACHE_D 1 << 4 -#define PD_ACCESSED 1 << 5 -#define PD_4M_PAGE 1 << 7 - -#define PT_PRESENT 1 << 0 -#define PT_RW 1 << 1 -#define PT_ALL_PRIV 1 << 2 -#define PT_WRITETHR 1 << 3 -#define PT_CACHE_D 1 << 4 -#define PT_ACCESSED 1 << 5 -#define PT_DIRTY 1 << 6 -#define PT_GLOBAL 1 << 8 -#define PT_USED 1 << 9 - -int paging_enabled; - -void paging_install(); - -void paging_enable(); - -void paging_disable(); - -void paging_switch_directory(int user); - -void paging_map(uint32_t phy, uint32_t virt, uint16_t flags); - -uint32_t paging_get_phys(uint32_t virt); - -uint16_t paging_get_flags(uint32_t virt); - -void paging_set_flags(uint32_t virt, uint32_t count, uint16_t flags); - -void paging_set_flag_up(uint32_t virt, uint32_t count, uint32_t flag); - -void paging_set_flag_down(uint32_t virt, uint32_t count, uint32_t flag); - -void paging_set_present(uint32_t virt, uint32_t count); - -void paging_set_absent(uint32_t virt, uint32_t count); - -void paging_set_used(uint32_t virt, uint32_t count); - -void paging_set_free(uint32_t virt, uint32_t count); - -void paging_set_user(uint32_t virt, uint32_t count); - -uint32_t paging_find_pages(uint32_t count); - -uint32_t paging_alloc_pages(uint32_t count); - -uint32_t paging_get_used_pages(); - -#endif diff --git a/src/kernel/pci/pci.c b/src/kernel/pci/pci.c index 5a6f060..478a82d 100644 --- a/src/kernel/pci/pci.c +++ b/src/kernel/pci/pci.c @@ -17,10 +17,10 @@ uint32_t pci_read_field(uint32_t device, int field, int size) uint32_t t = inl(PCI_VALUE_PORT); return t; } else if (size == 2) { - uint16_t t = inw(PCI_VALUE_PORT + (field & 2)); + uint16_t t = inw((uint16_t) (PCI_VALUE_PORT + (field & 2))); return t; } else if (size == 1) { - uint8_t t = inb(PCI_VALUE_PORT + (field & 3)); + uint8_t t = inb((uint16_t) (PCI_VALUE_PORT + (field & 3))); return t; } return 0xFFFF; @@ -28,7 +28,7 @@ uint32_t pci_read_field(uint32_t device, int field, int size) uint16_t pci_find_type(uint32_t dev) { - return (pci_read_field(dev, PCI_CLASS, 1) << 8) | pci_read_field(dev, PCI_SUBCLASS, 1); + return (uint16_t) ((pci_read_field(dev, PCI_CLASS, 1) << 8) | pci_read_field(dev, PCI_SUBCLASS, 1)); } void pci_scan_hit(pci_func_t f, uint32_t dev, void *extra) @@ -36,7 +36,7 @@ void pci_scan_hit(pci_func_t f, uint32_t dev, void *extra) int dev_vend = (int) pci_read_field(dev, PCI_VENDOR_ID, 2); int dev_dvid = (int) pci_read_field(dev, PCI_DEVICE_ID, 2); - f(dev, dev_vend, dev_dvid, extra); + f(dev, (uint16_t) dev_vend, (uint16_t) dev_dvid, extra); } void pci_scan_func(pci_func_t f, int type, int bus, int slot, int func, void *extra) @@ -45,7 +45,7 @@ void pci_scan_func(pci_func_t f, int type, int bus, int slot, int func, void *ex if (type == -1 || type == pci_find_type(dev)) pci_scan_hit(f, dev, extra); if (pci_find_type(dev) == PCI_TYPE_BRIDGE) - pci_scan_bus(f, type, pci_read_field(dev, PCI_SECONDARY_BUS, 1), extra); + pci_scan_bus(f, type, (int) pci_read_field(dev, PCI_SECONDARY_BUS, 1), extra); } void pci_scan_slot(pci_func_t f, int type, int bus, int slot, void *extra) @@ -99,9 +99,9 @@ void pci_remap() pci_scan(&find_isa_bridge, -1, &pci_isa); if (pci_isa) { for (int i = 0; i < 4; ++i) { - pci_remaps[i] = pci_read_field(pci_isa, 0x60 + i, 1); + pci_remaps[i] = (uint8_t) pci_read_field(pci_isa, 0x60 + i, 1); if (pci_remaps[i] == 0x80) { - pci_remaps[i] = 10 + (i % 1); + pci_remaps[i] = (uint8_t) (10 + (i % 1)); } } uint32_t out = 0; @@ -115,16 +115,16 @@ int pci_get_interrupt(uint32_t device) if (pci_isa) { uint32_t irq_pin = pci_read_field(device, 0x3D, 1); if (irq_pin == 0) - return pci_read_field(device, PCI_INTERRUPT_LINE, 1); + return (int) pci_read_field(device, PCI_INTERRUPT_LINE, 1); int pirq = (int) (irq_pin + pci_extract_slot(device) - 2) % 4; - int int_line = pci_read_field(device, PCI_INTERRUPT_LINE, 1); + int int_line = (int) pci_read_field(device, PCI_INTERRUPT_LINE, 1); if (pci_remaps[pirq] >= 0x80) { if (int_line == 0xFF) { int_line = 10; - pci_write_field(device, PCI_INTERRUPT_LINE, 1, int_line); + pci_write_field(device, PCI_INTERRUPT_LINE, 1, (uint32_t) int_line); } - pci_remaps[pirq] = int_line; + pci_remaps[pirq] = (uint8_t) int_line; uint32_t out = 0; memcpy(&out, &pci_remaps, 4); pci_write_field(pci_isa, 0x60, 4, out); @@ -133,6 +133,6 @@ int pci_get_interrupt(uint32_t device) pci_write_field(device, PCI_INTERRUPT_LINE, 1, pci_remaps[pirq]); return pci_remaps[pirq]; } else { - return pci_read_field(device, PCI_INTERRUPT_LINE, 1); + return (int) pci_read_field(device, PCI_INTERRUPT_LINE, 1); } }
\ No newline at end of file diff --git a/src/kernel/smbios/smbios.c b/src/kernel/smbios/smbios.c index 967b683..2e60f6b 100644 --- a/src/kernel/smbios/smbios.c +++ b/src/kernel/smbios/smbios.c @@ -1,8 +1,6 @@ -#include <stdint.h> #include <kernel/graphics/vesa.h> #include <stddef.h> #include <kernel/smbios/smbios.h> -#include <kernel/lib/stdio.h> struct smbios_entry *smbios = 0; diff --git a/src/kernel/sound/frequency.c b/src/kernel/sound/frequency.c index 5ad76b3..5c45c60 100644 --- a/src/kernel/sound/frequency.c +++ b/src/kernel/sound/frequency.c @@ -14,13 +14,13 @@ void play_sound(uint32_t frequency) tmp = inb(0x61); if (tmp != (tmp | 3)) { - outb(0x61, tmp | 3); + outb(0x61, (uint8_t) (tmp | 3)); } } static void shut_up() { - uint8_t tmp = inb(0x61) & 0xFC; + uint8_t tmp = (uint8_t) (inb(0x61) & 0xFC); outb(0x61, tmp); } @@ -29,6 +29,6 @@ static void shut_up() void beep(uint32_t frequency, uint32_t ticks) { play_sound(frequency); - timer_wait(ticks); + timer_wait((int) ticks); shut_up(); }
\ No newline at end of file diff --git a/src/kernel/syscall/actions/sys_alloc.c b/src/kernel/syscall/actions/sys_alloc.c index 6579e0e..24abe4d 100644 --- a/src/kernel/syscall/actions/sys_alloc.c +++ b/src/kernel/syscall/actions/sys_alloc.c @@ -1,7 +1,6 @@ #include <stdint.h> -#include <kernel/lib/stdlib/liballoc.h> uint32_t sys_alloc(uint32_t count) { - return (uint32_t) umalloc(count); + return 0; // (uint32_t) umalloc(count); }
\ No newline at end of file diff --git a/src/kernel/syscall/actions/sys_free.c b/src/kernel/syscall/actions/sys_free.c index 6c3a82f..5f52564 100644 --- a/src/kernel/syscall/actions/sys_free.c +++ b/src/kernel/syscall/actions/sys_free.c @@ -1,8 +1,8 @@ #include <stdint.h> -#include <kernel/lib/stdlib/liballoc.h> +#include <kernel/memory/kheap.h> uint32_t sys_free(uint32_t ptr) { - ufree((void *) ptr); + kfree((void *) ptr); return 0; }
\ No newline at end of file diff --git a/src/kernel/syscall/actions/sys_get_pointers.c b/src/kernel/syscall/actions/sys_get_pointers.c index 554f4eb..8e34ddd 100644 --- a/src/kernel/syscall/actions/sys_get_pointers.c +++ b/src/kernel/syscall/actions/sys_get_pointers.c @@ -1,7 +1,7 @@ #include <stdint.h> #include <kernel/graphics/vesa.h> #include <kernel/graphics/font.h> -#include <kernel/lib/stdlib/liballoc.h> +#include <kernel/memory/kheap.h> struct userspace_pointers { unsigned char *fb; @@ -10,7 +10,7 @@ struct userspace_pointers { uint32_t sys_get_pointers() { - struct userspace_pointers *pointers = (struct userspace_pointers *) umalloc(sizeof(struct userspace_pointers)); + struct userspace_pointers *pointers = (struct userspace_pointers *) kmalloc(sizeof(struct userspace_pointers)); pointers->fb = fb; pointers->font = font; return (uint32_t) pointers; diff --git a/src/kernel/syscall/actions/sys_write.c b/src/kernel/syscall/actions/sys_write.c index 76d88b8..f747be8 100644 --- a/src/kernel/syscall/actions/sys_write.c +++ b/src/kernel/syscall/actions/sys_write.c @@ -10,6 +10,6 @@ uint32_t sys_write(char *buf) uint32_t sys_writec(char ch) { - writec((char) ch); + writec(ch); return 0; }
\ No newline at end of file diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c index 93abc83..367fe30 100644 --- a/src/kernel/syscall/syscall.c +++ b/src/kernel/syscall/syscall.c @@ -3,7 +3,6 @@ #include <kernel/interrupts/interrupts.h> #include <kernel/system.h> #include <kernel/lib/stdio.h> -#include <kernel/paging/paging.h> typedef uint32_t (*syscall_func)(unsigned int, ...); @@ -22,7 +21,6 @@ uint32_t (*syscalls[])() = { void syscall_handler(struct regs *r) { - paging_switch_directory(0); serial_printf("Received syscall!"); if (r->eax >= sizeof(syscalls) / sizeof(*syscalls)) @@ -35,7 +33,6 @@ void syscall_handler(struct regs *r) //serial_printf("[SYSCALL] %d (0x%x) 0x%x 0x%x 0x%x 0x%x 0x%x", r->eax, location, r->ebx, r->ecx, r->edx, r->esi, r->edi); r->eax = location(r->ebx, r->ecx, r->edx, r->esi, r->edi); - paging_switch_directory(1); } void syscalls_install() diff --git a/src/kernel/system.c b/src/kernel/system.c index c01fb46..85cadc2 100644 --- a/src/kernel/system.c +++ b/src/kernel/system.c @@ -3,8 +3,7 @@ #include <kernel/graphics/vesa.h> #include <kernel/lib/string.h> #include <kernel/lib/stdlib.h> -#include <kernel/paging/paging.h> -#include <kernel/interrupts/interrupts.h> +#include <kernel/memory/paging.h> #include <kernel/lib/stdio.h> #include <stdarg.h> diff --git a/src/kernel/system.h b/src/kernel/system.h index af33b26..9c3ae80 100644 --- a/src/kernel/system.h +++ b/src/kernel/system.h @@ -7,6 +7,11 @@ extern void ASM_KERNEL_END(); /** + * The initial stack pointer + */ +extern uint32_t STACK_TOP; + +/** * Initialize the basic features of the OS */ void init(); diff --git a/src/kernel/timer/timer.c b/src/kernel/timer/timer.c index dd4e165..cc98bc4 100644 --- a/src/kernel/timer/timer.c +++ b/src/kernel/timer/timer.c @@ -8,8 +8,8 @@ void timer_phase(int hz) { int divisor = (int) (3579545.0 / 3.0 / (double) hz); outb(0x43, 0x36); // 01 10 11 0b // CTR, RW, MODE, BCD - outb(0x40, divisor & 0xFF); - outb(0x40, divisor >> 8); + outb(0x40, (uint8_t) (divisor & 0xFF)); + outb(0x40, (uint8_t) (divisor >> 8)); } // Executed 1000 times per second |