AFUERA part2

Programs: loading, 1 fake syscall.. (bad)

.gitignore

@@ -5,3 +5,4 @@ blankos.iso
 iso/
 i386-elf-7.5.0-Linux-x86_64/
 i386-elf-7.5.0-Linux-x86_64.tar.xz
+src/initrd/*.bin

README.md

@@ -1,8 +1,8 @@
-![Screenshot_20240826_160940](https://github.com/user-attachments/assets/a4d2af98-7c7e-4a7f-a64c-31b0325d99d7)
+![BlankOSshowcase](https://github.com/user-attachments/assets/63aae4ae-1633-4981-875d-8e2627ccc25c)
 
 > [!WARNING]
-> The project is currently paused, after months of work around the subject. I've had enough for now, and I'll surely come back in some time to implement the more advanced stuff I had planned. For now, enjoy the latest alpha version.
-> This is a hobbyist operating system, and it comes without any warranty whatsoever! See the license for more info. Feedback and contributions are highly appreciated.
+> This is free and unencumbered software released into the public domain. Many things might be (are) broken.
+> The project is a hobbyist operating system, and it comes without any warranty whatsoever! See the license for more info. Feedback and contributions are highly appreciated.
 
 # BlankOS
 

docs/DEVELOPERS.md

@@ -8,16 +8,17 @@
 - Writing programs for BlankOS
 - Changing the TTY font
 - Changing the initial ramdisk content
+- Changing the framebuffer resolution
 
 ## Getting Started
 
 ### System description
 
-Blank OS runs on a monolithic kernel booted by a 3rd party bootloader; GRUB (whose executable is named `stage2_eltorito`). The kernel is compiled in ELF format. The target processor architecture is 32-bit x86. Blank OS is BIOS-independent which means it does not use Real mode BIOS functions as its routines. It rather uses in and out port communication to communicate with hardware directly (such as the keyboard) and it uses specific memory locations (for example the framebuffer to manage the screen in text mode).
+Blank OS is a megalithic kernel booted by a 3rd party bootloader, GRUB2, using the Multiboot2 specification. The kernel is compiled in ELF format. The target processor architecture is 32-bit x86. Blank OS is BIOS-independent which means it does not use Real mode BIOS functions as its routines. It rather uses in and out port communication to communicate with hardware directly (such as the keyboard) and it uses specific memory locations (for example the framebuffer to manage the screen in text mode). A linear framebuffer is requested in 1920x1080x32 mode via Multiboot and GRUB. It cannot run on other screen resolutions for now. The keyboard layout is QWERTY.
 
 ### Code structure
 
-The source code is available in folder `src`. You will find subfolders corresponding to appropriate system parts, such as the kernel, the C library (including drivers) and programs.
+The source code is available in folder `src`. You will find subfolders corresponding to appropriate system parts, such as the kernel, the C library (including drivers) and "programs", which are really just functions embedded in the kernel.
 
 ### System calls
 
@@ -29,13 +30,6 @@ No system calls are available, as the OS runs in kernel-space.
 make debug
 ```
 
-In another shell:
-
-```
-gdb kernel.elf
-(gdb) target remote localhost:1234
-```
-
 ## Emulated booting in UEFI mode (QEMU w/ OVMF)
 
 Install the OVMF firmware package by doing `sudo pacman -S ovmf` or the equivalent for your distro. Then, you can emulate the OS as if it was ran using an UEFI machine:
@@ -48,9 +42,11 @@ sudo qemu-system-i386 -drive if=pflash,format=raw,readonly=on,file=/usr/share/OV
 
 Be warned, these are not actual programs in the sense you'd expect. These are indeed functions that are called from the shell, and embedded in the kernel ELF binary. Real programs apart from the kernel are not yet a thing here, but might be one day.
 
+(Now, there is a 'beginning' of something that we could call real programs, but I still suck at making the syscalls work. One day, one day...)
+
 ### Step 1 - Making the program and the entry point
 
-To make a program for the OS, first create the appropriate C source file and header file in the `src/programs` subfolder. Name it appropriately, for example `myprogram.c`.
+To make a program for the OS, first create the appropriate C source file and header file in the `src/utils` subfolder. Name it appropriately, for example `myprogram.c`.
 
 In this file, you will put the functions your program will use. The entry point for the program should be a void function named `program_<PROGRAM_NAME>`. The entry point can either take no arguments, or use the classic argc/argv structure. 
 
@@ -63,7 +59,7 @@ void program_myprogram(int argc, char* argv[])
 ```
 
 Then, code your stuff freely. The entry point function will basically be the "main" function of your program, like in a regular C file. You can make your own header file too, for example `myprogram.h`.
-Keep in mind that the standard C library is not available here, so you'll have to use functions from the BlankOS C library, which is located in `src/libc`. Also feel free to look at the header files in `src/drivers` and `src/kernel`, there might be interesting functions in there too (managing input/output devices, the timer, etc..)
+Keep in mind that the standard C library is not available here, so you'll have to use functions from the BlankOS C library, which is located in `src/libk`. Also feel free to look at the header files in `src/drivers` and `src/kernel`, there might be interesting functions in there too (managing input/output devices, the timer, etc..)
 
 ### Step 2 - Registering the program
 
@@ -71,7 +67,7 @@ Now that your program is done, you will need to make it a part of the OS.
 
 #### General program header file registering
 
-To make the entry point function reachable from the shell, you first have to include it in the general programs header file located in `src/programs/programs.h`.
+To make the entry point function reachable from the shell, you first have to include it in the general programs header file located in `src/utils/programs.h`.
 
 Put the entry point function prototype in that file. A valid example might be:
 
@@ -93,7 +89,7 @@ Don't make your command name too long, preferably a few characters, like the oth
 
 #### Help utility registering (optional)
 
-Finally, you can add your command to the list of available commands by adding it to the `printf` call in the `src/programs/misc.c` source file, in the function `program_help()`.
+Finally, you can add your command to the list of available commands by adding it to the `printf` call in the `src/utils/misc.c` source file, in the function `program_help()`.
 
 If possible make sure that the new command name is aligned with the other ones.
 
@@ -127,3 +123,19 @@ The system loads an initial ramdisk as a simple TAR file located in `iso/boot/in
 You can add, delete, or modify this file's contents by doing that in the `src/initrd` folder. Anything in that folder will be added to the initial ramdisk and will therefore be loaded into the system.
 
 The ramdisk gets loaded as a GRUB2 module.
+
+## Changing the framebuffer resolution
+
+Locate the framebuffer request tag from the Multiboot2 header in `src/kernel/loader.s`. It should look like this:
+
+```
+  align 8
+  dw 5			; 2
+  dw 0			; 2
+  dd 20			; 4
+  dd 1920		; 4
+  dd 1080		; 4
+  dd 32			; 4
+```
+
+Change the `1920` and `1080` values with the resolution you want, according to your screen. Be aware that this might break some programs that rely on the hardcoded Full HD framebuffer value (1920x1080x32). You can also try switching the value under that,`32`, but it will break the display because the kernel is made for 32bpp.

docs/USERS.md

@@ -129,3 +129,25 @@ Lists all files present in `initrd.tar`.
 #### `cat <file>`
 
 Prints file content to terminal. Filename must be specified the same way as it is outputted when using `ls`.
+
+### Games
+
+#### `naval`
+
+Starts a simplified naval battle game with 5 ships, one position each.
+
+#### `snake <ticks>`
+
+Starts a simplified and buggy snake game. You can choose the speed by setting the `ticks` argument, or let it default to a normal speed.
+
+Controls:
+- `q` to quit
+- `wasd` to move
+
+#### `exec <binary>`
+
+Executes a binary file. Warning: this is highly broken and syscalls aren't working. It's written in a childish manner. Help is always appreciated (lol).
+
+#### `uhex <file>`
+
+Prints the hex and ASCII contents of a file.

drivers/framebuffer.c

@@ -12,21 +12,19 @@ extern char* framebuffer;
 
 void putpixel(uint32_t* fb, int pitch, int bpp, int x, int y, uint32_t color)
 {
-	if (bpp == 32) {
-		uint32_t* pixel_addr = (uint32_t*)((uint8_t*)fb + y * pitch + x *(bpp / 8));
-		*pixel_addr = color;
-	}
+	uint32_t* pixel_addr = (uint32_t*)((uint8_t*)fb + y * pitch + x *(bpp / 8));
+	*pixel_addr = color;
 }
 
 void draw_char(unsigned short int c, int cx, int cy, uint32_t fg, uint32_t bg)
 {
-	PSF_font *font = (PSF_font*)&_binary_include_fonts_UniCyr_8x16_psf_start;
+	PSF_font *font = (PSF_font*)&FONT_START;
 	int bytesperline=(font->width+7)/8;
 	if (unicode != NULL) {
 		c = unicode[c];
 	}
 
-	unsigned char* glyph = (unsigned char*)&_binary_include_fonts_UniCyr_8x16_psf_start + font->headersize + (c>0&&c<font->numglyph?c:0)*font->bytesperglyph;
+	unsigned char* glyph = (unsigned char*)&FONT_START + font->headersize + (c>0&&c<font->numglyph?c:0)*font->bytesperglyph;
 
 	int offs =
 		(cy * font->height * scanline) +
@@ -56,7 +54,7 @@ void scroll()
 {
 	serial_printf(3, "Scrolling...\r");
 	uint32_t bg_color = 0x00000000;
-	PSF_font *font = (PSF_font*)&_binary_include_fonts_UniCyr_8x16_psf_start;
+	PSF_font *font = (PSF_font*)&FONT_START;
 	
 	int line_size = font->height * scanline;
 	int framebuffer_size = scanline * font->height * (1080/font->height);

drivers/framebuffer.h

@@ -9,11 +9,16 @@
 #include <stdint.h>
 
 extern int scanline;
-extern char _binary_include_fonts_UniCyr_8x16_psf_start;
-uint16_t* unicode;
 
+#define FONT_START _binary_include_fonts_viscii10_8x16_psfu_start 
+#define FONT_END _binary_include_fonts_viscii10_8x16_psfu_start
+
+extern char FONT_START;
+extern char FONT_END;
+uint16_t* unicode;
 #define PIXEL uint32_t
 
+#define USHRT_MAX 10000
 #define PSF1_FONT_MAGIC 0x0436
 
 typedef struct {
@@ -38,5 +43,6 @@ typedef struct {
 void putpixel(uint32_t* fb, int pitch, int bpp, int x, int y, uint32_t color); 
 void draw_char(unsigned short int c, int cx, int cy, uint32_t fg, uint32_t bg);
 void scroll();
+void psf_init();
 
 #endif

drivers/serial.c

@@ -5,7 +5,7 @@
 
 #include "../kernel/io.h"
 #include "serial.h"
-#include "../libc/stdio.h"
+#include "../libk/stdio.h"
 
 int init_serial()
 {

drivers/timer.c

@@ -4,7 +4,7 @@
 // https://github.com/xamidev/blankos
 
 #include "../kernel/system.h"
-#include "../libc/stdio.h"
+#include "../libk/stdio.h"
 
 volatile unsigned long global_ticks = 0;
 

grub.cfg

@@ -1,6 +1,5 @@
 menuentry "Blank OS" {
 	insmod all_video
-	set gfxpayload=1024x768x32
 	multiboot2 /boot/kernel.elf
 	module2 /boot/initrd.tar
 	boot

kernel/gdt.c

@@ -4,7 +4,7 @@
 // https://github.com/xamidev/blankos
 
 #include "gdt.h"
-#include "../libc/stdio.h"
+#include "../libk/stdio.h"
 
 struct gdt_entry gdt[3];
 struct gdt_ptr gp;
@@ -36,9 +36,9 @@ void gdt_install()
 	gdt_set_gate(2, 0, 0xFFFFFFFF, 0x92, 0xCF);
 
 	// Ring 3
-	gdt_set_gate(3, 0, 0xFFFFFFFF, 0xFA, 0xCF);
-	gdt_set_gate(4, 0, 0xFFFFFFFF, 0xF2, 0xCF);
+	//gdt_set_gate(3, 0, 0xFFFFFFFF, 0xFA, 0xCF);
+	//gdt_set_gate(4, 0, 0xFFFFFFFF, 0xF2, 0xCF);
 
 	gdt_flush();
-	printf("[kernel] GDT gates set (ring 0 and 3), gdt=0x%x\n", &gdt);
+	printf("[kernel] GDT gates set (ring 0), gdt=0x%x\n", (unsigned int)&gdt);
 }

kernel/idt.c

@@ -5,7 +5,7 @@
 
 #include "idt.h"
 #include "system.h"
-#include "../libc/stdio.h"
+#include "../libk/stdio.h"
 
 struct idt_entry idt[256];
 struct idt_ptr idtp;
@@ -30,5 +30,5 @@ void idt_install()
 	memset(&idt, 0, sizeof(struct idt_entry)*256);
 
 	idt_load();
-	printf("[kernel] loaded IDT at idt=0x%x\n", &idt);
+	printf("[kernel] loaded IDT at idt=0x%x\n", (unsigned int)&idt);
 }

kernel/irq.c

@@ -6,7 +6,7 @@
 #include "system.h"
 #include "io.h"
 #include "idt.h"
-#include "../libc/stdio.h"
+#include "../libk/stdio.h"
 
 extern void irq0();
 extern void irq1();

kernel/isr.c

@@ -4,7 +4,7 @@
 // https://github.com/xamidev/blankos
 
 #include "system.h"
-#include "../libc/stdio.h"
+#include "../libk/stdio.h"
 #include "idt.h"
 
 extern void isr0();
@@ -116,7 +116,7 @@ void fault_handler(struct regs *r)
 {
 	if (r->int_no < 32)
 	{
-		printf("\n\n*** [Kernel panic - %s Exception] ***\nInterrupt error code %u\nedi: %x esi: %u ebp: %u esp: %u\nebx: %u edx: %u ecx: %u eax: %u\neip: %x cs:%x eflags: %x ss: %x\ngs: %x fs: %x es: %x ds: %x\nHalting!\n", exception_messages[r->int_no], r->err_code, r->edi, r->esi, r->ebp, r->esp, r->ebx, r->edx, r->ecx, r->eax, r->eip, r->cs, r->eflags, r->ss, r->gs, r->fs, r->es, r->ds);
+		colorprintf(white, red, "\n\n*** [Kernel panic - %s Exception] ***\nInterrupt error code %u\nedi: 0x%x\nesi: 0x%x\nebp: 0x%x\nesp: 0x%x\neip: 0x%x\neax: 0x%x\nebx: 0x%x\necx: 0x%x\nedx: 0x%x\ncs: 0x%x\neflags: 0x%x\nss: 0x%x\ngs: 0x%x\nfs: 0x%x\nes: 0x%x\nds: 0x%x\nHalting!\n", exception_messages[r->int_no], r->err_code, r->edi, r->esi, r->ebp, r->esp, r->eip, r->eax, r->ebx, r->ecx, r->edx, r->cs, r->eflags, r->ss, r->gs, r->fs, r->es, r->ds);
 		for (;;);
 	}
 }

kernel/kmain.c

@@ -3,19 +3,15 @@
 // Licensed under the Unlicense. See the repo below.
 // https://github.com/xamidev/blankos
 
-#include "../libc/stdio.h"
+#include "../libk/stdio.h"
 #include "../drivers/serial.h"
 #include "gdt.h"
 #include "idt.h"
 #include "system.h"
-#include "../drivers/ata.h"
 #include <stdint.h>
 #include "../drivers/framebuffer.h"
 #include "kmain.h"
 #include "multiboot2.h"
-#include "kheap.h"
-#include "initrd.h"
-#include "../programs/programs.h"
 
 void kmain(multiboot2_info *mb_info)
 {
@@ -62,14 +58,13 @@ void kmain(multiboot2_info *mb_info)
 	serial_printf(3, "Framebuffer Pitch: %u", fb_info->framebuffer_pitch);
 	serial_printf(3, "Framebuffer BPP: %u", fb_info->framebuffer_bpp);
     }
-
     printf("[kernel] multiboot2 info at 0x%x, size=%u\n", mb_info, mb_info->total_size);
-    printf("[kernel] framebuffer discovered at 0x%x\n", fb_info->framebuffer_addr);
+    printf("[kernel] framebuffer discovered at 0x%x\n", (unsigned int)fb_info->framebuffer_addr);
     printf("[kernel] fb0: width=%u, height=%u, pitch=%u, bpp=%u\n", fb_info->framebuffer_width, fb_info->framebuffer_height, fb_info->framebuffer_pitch, fb_info->framebuffer_bpp);
 
     if (mmap_tag) // memmap debug print
     {
-	printf("[kernel] found memory map tag by multiboot2\n");
+	puts("[kernel] found memory map tag by multiboot2\n");
 	struct multiboot_mmap_entry *mmap = mmap_tag->entries;
 
 	while ((uint8_t*) mmap < tags + mmap_tag->size)
@@ -77,14 +72,14 @@ void kmain(multiboot2_info *mb_info)
 		
 		if (mmap->addr != 0)
 		{
-			
-			serial_printf(3, "base addr=0x%x%x, length=0x%x%x, type=%u\n",
+			/*
+			serial_printf(3, "base addr=0x%x%x, length=0x%x%x, type=%u",
 				(uint32_t) (mmap->addr >> 32),
 				(uint32_t) (mmap->addr & 0xFFFFFFFF),
 				(uint32_t) (mmap->len >> 32),
 				(uint32_t) (mmap->len & 0xFFFFFFFF),
 				mmap->type);
-			
+			*/
 		}
 
 		mmap = (struct multiboot_mmap_entry*) ((uint8_t*)mmap + mmap_tag->entry_size);
@@ -111,14 +106,7 @@ void kmain(multiboot2_info *mb_info)
     irq_install();
     __asm__ __volatile__("sti");
 
-    init_alloc();
-    void* ptr1 = malloc(256);
-    void* ptr2 = malloc(512);
-    printf("[debug] malloc test ptr1=0x%x, ptr2=0x%x\n", ptr1, ptr2); 
-    free(ptr1); free(ptr2);
-
     timer_install();
-    keyboard_install();
-    printf("[kernel] spawning shell...\n"); 
-    shell_install();
+    printf("Nothing to do, halting...");
+    asm("hlt");
 }

kernel/kmain.h

@@ -6,7 +6,7 @@
 #ifndef KMAIN_H
 #define KMAIN_H
 
-#define BLANK_VERSION "0.3.107-alpha"
+#define BLANK_VERSION "0.3.123-alpha"
 
 #include <stdint.h>
 

kernel/loader.s

@@ -51,6 +51,7 @@ KERNEL_STACK_SIZE equ 4096
 extern kmain
 
 loader:
+	mov esp, kernel_stack + KERNEL_STACK_SIZE
   	cli
   	push ebx
   	call kmain
@@ -211,6 +212,6 @@ irq_common_stub:
 
 section .bss
 align 4 
+
 kernel_stack:
-  	resb KERNEL_STACK_SIZE
-  	mov esp, kernel_stack + KERNEL_STACK_SIZE
+	resb KERNEL_STACK_SIZE

kernel/system.c

@@ -50,3 +50,4 @@ void panic()
 {
 	for (;;);	
 }
+

kernel/system.h

@@ -39,5 +39,7 @@ extern volatile unsigned long global_ticks;
 
 extern unsigned int g_multiboot_info_address;
 
+void syscall_handler();
+
 #endif
 

libk/ctype.c

@@ -1,4 +1,4 @@
-// Ctype implementation for blankos/libc
+// Ctype implementation for blankos/libk
 // Author: xamidev
 // Licensed under the Unlicense. See the repo below.
 // https://github.com/xamidev/blankos

libk/ctype.h

@@ -1,4 +1,4 @@
-// Ctype implementation for blankos/libc header
+// Ctype implementation for blankos/libk header
 // Author: xamidev
 // Licensed under the Unlicense. See the repo below.
 // https://github.com/xamidev/blankos

libk/stdio.c

@@ -1,4 +1,4 @@
-// Standard input/output implementation for blankos/libc
+// Standard input/output implementation for blankos/libk
 // Author: xamidev
 // Licensed under the Unlicense. See the repo below.
 // https://github.com/xamidev/blankos
@@ -39,6 +39,25 @@ void draw_cursor(uint32_t color)
 	}
 }
 
+void draw_pixel(int x, int y, uint32_t color) //high level wrapper for putpixel
+{
+	putpixel(framebuffer, scanline, 32, x, y, color);
+}
+
+void draw_square(int x, int y, uint32_t color, int size)
+{
+	int startx = x*size;
+	int starty = y*size;
+
+	for (int i=0; i<size; i++)
+	{
+		for (int j=0; j<size; j++)
+		{
+			draw_pixel(startx+i, starty+j, color);
+		}
+	}
+}
+
 void erase_cursor()
 {
 	draw_cursor(black);
@@ -463,7 +482,7 @@ int* printf_number(int* argp, int length, bool sign, int radix, int width, char
 
     return argp;
 }
-
+/*
 int getch()
 {
 	return keyboard_getchar();
@@ -492,3 +511,247 @@ void get_input(char *buffer, int size) {
 	}
 	buffer[index] = '\0';
 }
+*/
+
+void colorprintf(uint32_t fg, uint32_t bg, const char* fmt, ...)
+{
+    int* argp = (int*)&fmt;
+    int state = PRINTF_STATE_START;
+    int length = PRINTF_LENGTH_START;
+    int radix = 10;
+    bool sign = false;
+    int width = 0;
+    char pad_char = ' ';
+
+    argp++;
+    while (*fmt)
+    {
+        switch (state)
+        {
+        case PRINTF_STATE_START:
+            if (*fmt == '%')
+            {
+                state = PRINTF_STATE_LENGTH;
+                width = 0;
+                pad_char = ' ';
+            }
+            else
+            {
+                colorputc(*fmt, fg, bg);
+            }
+            break;
+
+        case PRINTF_STATE_LENGTH:
+            if (*fmt == '0')
+            {
+                pad_char = '0';
+                state = PRINTF_STATE_WIDTH;
+            }
+            else if (*fmt >= '1' && *fmt <= '9')
+            {
+                width = *fmt - '0';
+                state = PRINTF_STATE_WIDTH;
+            }
+            else if (*fmt == 'h')
+            {
+                length = PRINTF_LENGTH_SHORT;
+                state = PRINTF_STATE_SHORT;
+            }
+            else if (*fmt == 'l')
+            {
+                length = PRINTF_LENGTH_LONG;
+                state = PRINTF_STATE_LONG;
+            }
+            else
+            {
+                goto PRINTF_STATE_SPEC_;
+            }
+            break;
+
+        case PRINTF_STATE_WIDTH:
+            if (*fmt >= '0' && *fmt <= '9')
+            {
+                width = width * 10 + (*fmt - '0');
+            }
+            else
+            {
+                goto PRINTF_STATE_SPEC_;
+            }
+            break;
+
+        case PRINTF_STATE_SHORT:
+            if (*fmt == 'h')
+            {
+                length = PRINTF_LENGTH_SHORT_SHORT;
+                state = PRINTF_STATE_SPEC;
+            }
+            else
+            {
+                goto PRINTF_STATE_SPEC_;
+            }
+            break;
+
+        case PRINTF_STATE_LONG:
+            if (*fmt == 'l')
+            {
+                length = PRINTF_LENGTH_LONG_LONG;
+                state = PRINTF_STATE_SPEC;
+            }
+            else
+            {
+                goto PRINTF_STATE_SPEC_;
+            }
+            break;
+
+        case PRINTF_STATE_SPEC:
+        PRINTF_STATE_SPEC_:
+            switch (*fmt)
+            {
+            case 'c':
+                colorputc((char)*argp, fg, bg);
+                argp++;
+                break;
+            case 's':
+                colorputs(*(const char**)argp, fg, bg);
+                argp++;
+                break;
+            case '%':
+                putc('%');
+                break;
+            case 'd':
+            case 'i':
+                radix = 10;
+                sign = true;
+                argp = colorprintf_number(argp, length, sign, radix, width, pad_char, fg, bg);
+                break;
+            case 'u':
+                radix = 10;
+                sign = false;
+                argp = colorprintf_number(argp, length, sign, radix, width, pad_char, fg, bg);
+                break;
+            case 'X':
+            case 'x':
+            case 'p':
+                radix = 16;
+                sign = false;
+                argp = colorprintf_number(argp, length, sign, radix, width, pad_char, fg, bg);
+                break;
+            case 'o':
+                radix = 8;
+                sign = false;
+                argp = colorprintf_number(argp, length, sign, radix, width, pad_char, fg, bg);
+                break;
+            case 'f': {
+                double* dargp = (double*)argp;
+                double d = *(double*)dargp;
+                char buffer[64];
+                dtostrf(d, buffer, 6);
+                colorputs(buffer, fg, bg);
+                argp += 2;
+                break;
+            }
+            default:
+                break;
+            }
+            state = PRINTF_STATE_START;
+            length = PRINTF_LENGTH_START;
+            radix = 10;
+            sign = false;
+            width = 0;
+            pad_char = ' ';
+            break;
+        }
+        fmt++;
+    }
+}
+
+int* colorprintf_number(int* argp, int length, bool sign, int radix, int width, char pad_char, uint32_t fg, uint32_t bg)
+{
+    char buffer[32];
+    unsigned long long number;
+    int number_sign = 1;
+    int pos = 0;
+
+    switch (length)
+    {
+    case PRINTF_LENGTH_SHORT_SHORT:
+    case PRINTF_LENGTH_SHORT:
+    case PRINTF_LENGTH_START:
+        if (sign)
+        {
+            int n = *argp;
+            if (n < 0)
+            {
+                n = -n;
+                number_sign = -1;
+            }
+            number = (unsigned long long)n;
+        }
+        else
+        {
+            number = *(unsigned int*)argp;
+        }
+        argp++;
+        break;
+    case PRINTF_LENGTH_LONG:
+        if (sign)
+        {
+            long int n = *(long int*)argp;
+            if (n < 0)
+            {
+                n = -n;
+                number_sign = -1;
+            }
+            number = (unsigned long long)n;
+        }
+        else
+        {
+            number = *(unsigned long int*)argp;
+        }
+        argp += 2;
+        break;
+    case PRINTF_LENGTH_LONG_LONG:
+        if (sign)
+        {
+            long long int n = *(long long int*)argp;
+            if (n < 0)
+            {
+                n = -n;
+                number_sign = -1;
+            }
+            number = (unsigned long long)n;
+        }
+        else
+        {
+            number = *(unsigned long long int*)argp;
+        }
+        argp += 4;
+        break;
+    }
+
+    do
+    {
+        uint32_t rem;
+        x86_div64_32(number, radix, &number, &rem);
+        buffer[pos++] = charset[rem];
+    } while (number > 0);
+
+    if (sign && number_sign < 0)
+    {
+        buffer[pos++] = '-';
+    }
+
+    int padding = width - pos;
+
+    while (padding-- > 0)
+    {
+        colorputc(pad_char, fg, bg);
+    }
+
+    while (--pos >= 0)
+    {
+        colorputc(buffer[pos], fg, bg);
+    }
+
+    return argp;
+}

libk/stdio.h

@@ -1,4 +1,4 @@
-// Standard input/output implementation for blankos/libc header
+// Standard input/output implementation for blankos/libk header
 // Author: xamidev
 // Licensed under the Unlicense. See the repo below.
 // https://github.com/xamidev/blankos
@@ -22,8 +22,10 @@
 
 void draw_cursor(uint32_t color);
 void erase_cursor();
-
 void move_cursor(int x, int y);
+
+void draw_pixel(int x, int y, uint32_t color);
+void draw_square(int x, int y, uint32_t color, int size);
 void putchar(unsigned short int c, int x, int y, uint32_t fg, uint32_t bg);
 void puts(const char* str);
 void clear(void);
@@ -33,6 +35,8 @@ char getchar(int x, int y);
 unsigned int getcolor(int x, int y);
 void putc(char c);
 void colorputc(char c, uint32_t fg, uint32_t bg);
+void colorprintf(uint32_t fg, uint32_t bg, const char* fmt, ...);
+int* colorprintf_number(int* argp, int length, bool sign, int radix, int width, char pad_char, uint32_t fg, uint32_t bg);
 
 #define PRINTF_STATE_START 			0
 #define PRINTF_STATE_LENGTH 		1

libk/string.c

@@ -1,4 +1,4 @@
-// String operations implementation for blankos/libc
+// String operations implementation for blankos/libk
 // Author: xamidev
 // Licensed under the Unlicense. See the repo below.
 // https://github.com/xamidev/blankos
@@ -103,3 +103,32 @@ void strcat(char* dest, const char* src)
 
 	*dest = '\0';
 }
+
+size_t strnlen(const char* str, size_t max_len)
+{
+	size_t len = 0;
+	while (*str && len < max_len)
+	{
+		len++;
+		str++;
+	}
+	return len;
+}
+
+void strncat(char* dest, const char* src, size_t n)
+{
+	while (*dest)
+	{
+		dest++;
+	}
+
+	while (*src && n > 0)
+	{
+		*dest = *src;
+		dest++;
+		src++;
+		n--;
+	}
+
+	*dest = '\0';
+}

libk/string.h

@@ -1,4 +1,4 @@
-// String operations implementation for blankos/libc header
+// String operations implementation for blankos/libk header
 // Author: xamidev
 // Licensed under the Unlicense. See the repo below.
 // https://github.com/xamidev/blankos
@@ -6,11 +6,16 @@
 #ifndef STRING_H
 #define STRING_H
 
+#include "../kernel/system.h"
+
 int strlen(const char* str);
 int strcmp(const char* str1, const char* str2);
 char* strtok(char* str, const char* delimiter);
 int atoi(char* str);
 void strcat(char* dest, const char* src);
 
+// Safer functions
+size_t strnlen(const char* str, size_t max_len);
+void strncat(char* dest, const char* src, size_t n);
 
 #endif

link.ld

@@ -3,7 +3,7 @@ ENTRY(loader)
 SECTIONS {
   /* Address to load at; 2MB */
 
-  /*. = 2M;*/
+  . = 2M;
 
   .multiboot_header ALIGN(4K) : {
   	*(.multiboot_header)

makefile

@@ -1,42 +1,42 @@
 CC = i386-elf-7.5.0-Linux-x86_64/bin/i386-elf-gcc
-CFLAGS = -ffreestanding -g -Wall -Wextra -Wno-builtin-declaration-mismatch -c -I src/
+CFLAGS = -ffreestanding -g -Wall -Wextra -mno-sse -mno-mmx -mno-avx -march=i386 -c -I .
+LD = ld
 LDFLAGS = -T link.ld -melf_i386
 AS = nasm
 ASFLAGS = -f elf
+AR = i386-elf-7.5.0-Linux-x86_64/bin/i386-elf-ar
 
-SRC_DIR = src
-KERNEL_DIR = $(SRC_DIR)/kernel
-LIBC_DIR = $(SRC_DIR)/libc
-PROGRAMS_DIR = $(SRC_DIR)/programs
-DRIVERS_DIR = $(SRC_DIR)/drivers
+KERNEL_DIR = kernel
+libk_DIR = libk
+DRIVERS_DIR = drivers
 INCLUDE_DIR = include
 FONTS_DIR = $(INCLUDE_DIR)/fonts
 OBJ_DIR = build
 
-C_SOURCES = $(wildcard $(KERNEL_DIR)/*.c) $(wildcard $(LIBC_DIR)/*.c) $(wildcard $(PROGRAMS_DIR)/*.c) $(wildcard $(DRIVERS_DIR)/*.c)
-ASM_SOURCES = $(wildcard $(KERNEL_DIR)/*.s) $(wildcard $(LIBC_DIR)/*.s) $(wildcard $(PROGRAMS_DIR)/*.s) $(wildcard $(DRIVERS_DIR)/*.s)
+C_SOURCES = $(wildcard $(KERNEL_DIR)/*.c) $(wildcard $(libk_DIR)/*.c) $(wildcard $(DRIVERS_DIR)/*.c)
+ASM_SOURCES = $(wildcard $(KERNEL_DIR)/*.s) $(wildcard $(libk_DIR)/*.s) $(wildcard $(DRIVERS_DIR)/*.s)
 
-OBJECTS = $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(C_SOURCES:.c=.o) $(ASM_SOURCES:.s=.o)) 
+OBJECTS = $(patsubst %, $(OBJ_DIR)/%, $(C_SOURCES:.c=.o) $(ASM_SOURCES:.s=.o)) 
 
 TOOLCHAIN_SRC = https://newos.org/toolchains/i386-elf-7.5.0-Linux-x86_64.tar.xz
 TOOLCHAIN_FILE = i386-elf-7.5.0-Linux-x86_64.tar.xz
 
-FONT_OBJ = $(OBJ_DIR)/fonts/UniCyr_8x16.o
-FONT_SRC = $(FONTS_DIR)/UniCyr_8x16.psf
+FONT_OBJ = $(OBJ_DIR)/fonts/viscii10-8x16.o
+FONT_SRC = $(FONTS_DIR)/viscii10-8x16.psfu
 
 all: $(OBJ_DIR) kernel.elf
 
 $(OBJ_DIR):
 	mkdir -p $(OBJ_DIR)
-	mkdir -p $(OBJ_DIR)/kernel $(OBJ_DIR)/libc $(OBJ_DIR)/programs $(OBJ_DIR)/drivers $(OBJ_DIR)/fonts
+	mkdir -p $(OBJ_DIR)/kernel $(OBJ_DIR)/libk $(OBJ_DIR)/drivers $(OBJ_DIR)/fonts $(OBJ_DIR)/programs
 	
 kernel.elf: $(OBJECTS) $(FONT_OBJ)
-	ld $(LDFLAGS) $(OBJECTS) $(FONT_OBJ) -o kernel.elf
+	$(LD) $(LDFLAGS) $(OBJECTS) $(FONT_OBJ) -o kernel.elf
 
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
+$(OBJ_DIR)/%.o: %.c
 	$(CC) $(CFLAGS) $< -o $@
 
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.s
+$(OBJ_DIR)/%.o: %.s
 	$(AS) $(ASFLAGS) $< -o $@
 
 $(FONT_OBJ): $(FONT_SRC) | $(OBJ_DIR)/fonts
@@ -49,16 +49,11 @@ toolchain:
 	wget $(TOOLCHAIN_SRC)
 	tar xf $(TOOLCHAIN_FILE)
 
-iso: kernel.elf initrd
+iso: kernel.elf
 	cp kernel.elf iso/boot/kernel.elf
 	cp grub.cfg iso/boot/grub/grub.cfg
 	grub-mkrescue iso -o blankos.iso	
 
-initrd:
-	mkdir -p iso/boot/grub
-	tar -cf $(OBJ_DIR)/initrd.tar -C $(SRC_DIR)/initrd .
-	cp $(OBJ_DIR)/initrd.tar iso/boot
-
 run: iso
 	qemu-system-i386 -drive file=blankos.iso,format=raw
 
@@ -66,5 +61,4 @@ debug:
 	./debug.sh
 
 clean:
-	rm -rf $(OBJ_DIR) kernel.elf blankos.iso $(TOOLCHAIN_FILE)
-
+	rm -rf $(OBJ_DIR) kernel.elf blankos.iso $(TOOLCHAIN_FILE) initrd/*.bin

src/drivers/ata.c

@@ -1,62 +0,0 @@
-// ATA PIO driver implementation
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include <stdint.h>
-#include "../kernel/io.h"
-#include "../libc/stdio.h"
-#include "ata.h"
-
-static inline uint16_t inw(uint16_t port) {
-    uint16_t result;
-    asm volatile("inw %1, %0" : "=a"(result) : "dN"(port));
-    return result;
-}
-
-static inline void outw(uint16_t port, uint16_t data) {
-    asm volatile("outw %1, %0" : : "dN"(port), "a"(data));
-}
-
-void ata_wait_bsy() {
-    while (inb(ATA_PRIMARY_IO + ATA_REG_STATUS) & ATA_SR_BSY);
-}
-
-void ata_wait_drq() {
-    while (!(inb(ATA_PRIMARY_IO + ATA_REG_STATUS) & ATA_SR_DRQ));
-}
-
-void ata_select_drive(uint8_t drive) {
-    outb(ATA_PRIMARY_IO + ATA_REG_HDDEVSEL, 0xE0 | (drive << 4));
-}
-
-void ata_read_sector(uint32_t lba, uint8_t* buffer) {
-    ata_wait_bsy();
-    ata_select_drive(0);
-
-    outb(ATA_PRIMARY_IO + ATA_REG_SECCOUNT0, 1);
-    outb(ATA_PRIMARY_IO + ATA_REG_LBA0, (uint8_t)lba);
-    outb(ATA_PRIMARY_IO + ATA_REG_LBA1, (uint8_t)(lba >> 8));
-    outb(ATA_PRIMARY_IO + ATA_REG_LBA2, (uint8_t)(lba >> 16));
-    outb(ATA_PRIMARY_IO + ATA_REG_HDDEVSEL, 0xE0 | ((lba >> 24) & 0x0F));
-
-    outb(ATA_PRIMARY_IO + ATA_REG_COMMAND, ATA_CMD_READ_PIO);
-
-    ata_wait_bsy();
-    ata_wait_drq();
-
-    for (int i = 0; i < 256; i++) {
-        ((uint16_t*)buffer)[i] = inw(ATA_PRIMARY_IO + ATA_REG_DATA);
-    }
-}
-
-// Works only w/o paging
-void test_read_sector() {
-    uint8_t buffer[512];
-    ata_read_sector(0, buffer);
-
-    for (int i = 0; i < 512; i++) {
-        if (i%25==0) puts("\n");
-	printf("%02x ", buffer[i]);
-    }
-}

src/drivers/ata.h

@@ -1,35 +0,0 @@
-// ATA PIO driver implementation header
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef ATA_H
-#define ATA_H
-
-#include <stdint.h>
-
-#define ATA_PRIMARY_IO 		0x1F0
-#define ATA_PRIMARY_CTRL 	0x3F6
-#define ATA_CMD_READ_PIO	0x20
-#define ATA_CMD_WRITE_PIO 	0x30
-#define ATA_IDENTIFY 		0xEC
-
-#define ATA_REG_DATA 		0x00
-#define ATA_REG_ERROR 		0x01
-#define ATA_REG_SECCOUNT0 	0x02
-#define ATA_REG_LBA0 		0x03
-#define ATA_REG_LBA1 		0x04
-#define ATA_REG_LBA2 		0x05
-#define ATA_REG_HDDEVSEL 	0x06
-#define ATA_REG_COMMAND 	0x07
-#define ATA_REG_STATUS 		0x07
-
-#define ATA_SR_BSY 		    0x80
-#define ATA_SR_DRDY 		0x40
-#define ATA_SR_DRQ 		    0x08
-#define ATA_SR_ERR 		    0x01
-
-void ata_read_sector(uint32_t lba, uint8_t* buffer);
-void test_read_sector();
-
-#endif

src/drivers/kb.c

@@ -1,142 +0,0 @@
-// Keyboard driver
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../kernel/io.h"
-#include "../libc/stdio.h"
-#include "../kernel/system.h"
-#include "kb.h"
-
-unsigned char kbdus[128] =
-{
-    0,  27, '1', '2', '3', '4', '5', '6', '7', '8',	/* 9 */
-    '9', '0', '-', '=', '\b',	/* Backspace */
-    '\t',			/* Tab */
-    'q', 'w', 'e', 'r',	/* 19 */
-    't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',	/* Enter key */
-    0,			/* 29   - Control */
-    'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';',	/* 39 */
-    '\'', '`',   0,		/* Left shift */
-    '\\', 'z', 'x', 'c', 'v', 'b', 'n',			/* 49 */
-    'm', ',', '.', '/',   0,				/* Right shift */
-    '*',
-    0,	/* Alt */
-    ' ',	/* Space bar */
-    0,	/* Caps lock */
-    0,	/* 59 - F1 key ... > */
-    0,   0,   0,   0,   0,   0,   0,   0,
-    0,	/* < ... F10 */
-    0,	/* 69 - Num lock*/
-    0,	/* Scroll Lock */
-    0,	/* Home key */
-    0,	/* Up Arrow */
-    0,	/* Page Up */
-    '-',
-    0,	/* Left Arrow */
-    0,
-    0,	/* Right Arrow */
-    '+',
-    0,	/* 79 - End key*/
-    0,	/* Down Arrow */
-    0,	/* Page Down */
-    0,	/* Insert Key */
-    0,	/* Delete Key */
-    0,   0,   0,
-    0,	/* F11 Key */
-    0,	/* F12 Key */
-    0,	/* All other keys are undefined */
-};
-
-unsigned char kbdus_shift[128] =
-{
-    0,  27, '!', '@', '#', '$', '%', '^', '&', '*',	/* 9 */
-    '(', ')', '_', '+', '\b',	/* Backspace */
-    '\t',			/* Tab */
-    'Q', 'W', 'E', 'R',	/* 19 */
-    'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n',	/* Enter key */
-    0,			/* 29   - Control */
-    'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':',	/* 39 */
-    '"', '~',   0,		/* Left shift */
-    '|', 'Z', 'X', 'C', 'V', 'B', 'N',			/* 49 */
-    'M', '<', '>', '?',   0,				/* Right shift */
-    '*',
-    0,	/* Alt */
-    ' ',	/* Space bar */
-    0,	/* Caps lock */
-    0,	/* 59 - F1 key ... > */
-    0,   0,   0,   0,   0,   0,   0,   0,
-    0,	/* < ... F10 */
-    0,	/* 69 - Num lock*/
-    0,	/* Scroll Lock */
-    0,	/* Home key */
-    0,	/* Up Arrow */
-    0,	/* Page Up */
-    '-',
-    0,	/* Left Arrow */
-    0,
-    0,	/* Right Arrow */
-    '+',
-    0,	/* 79 - End key*/
-    0,	/* Down Arrow */
-    0,	/* Page Down */
-    0,	/* Insert Key */
-    0,	/* Delete Key */
-    0,   0,   0,
-    0,	/* F11 Key */
-    0,	/* F12 Key */
-    0,	/* All other keys are undefined */
-};
-
-static char keyboard_buffer[KEYBOARD_BUFFER_SIZE];
-static unsigned int keyboard_buffer_start = 0;
-static unsigned int keyboard_buffer_end = 0;
-static int shift_pressed = 0;
-
-void keyboard_handler()
-{
-	unsigned char scancode;
-
-	scancode = inb(0x60);
-
-	if (scancode & 0x80)
-	{
-		if (scancode == LEFT_SHIFT_RELEASED || scancode == RIGHT_SHIFT_RELEASED) {
-			shift_pressed = 0;
-		}
-	}
-	else 
-	{
-		if (scancode == LEFT_SHIFT_PRESSED || scancode == RIGHT_SHIFT_PRESSED) {
-			shift_pressed = 1;
-		} else {
-			char c;
-			if (shift_pressed) {
-				c = kbdus_shift[scancode];
-			} else {
-				c = kbdus[scancode];
-			}
-		
-			if (c)
-			{
-				keyboard_buffer[keyboard_buffer_end] = c;
-				keyboard_buffer_end = (keyboard_buffer_end+1) % KEYBOARD_BUFFER_SIZE;
-			}
-		}
-	}
-}
-
-void keyboard_install()
-{
-	irq_install_handler(1, keyboard_handler);
-	printf("[keyboard] installed irq handler\n");
-}
-
-char keyboard_getchar()
-{
-	while (keyboard_buffer_start == keyboard_buffer_end);
-
-	char c = keyboard_buffer[keyboard_buffer_start];
-	keyboard_buffer_start = (keyboard_buffer_start+1) % KEYBOARD_BUFFER_SIZE;
-	return c;
-}

src/drivers/kb.h

@@ -1,18 +0,0 @@
-// Keyboard driver header
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef KB_H
-#define KB_H
-
-#define KEYBOARD_BUFFER_SIZE    256
-
-#define LEFT_SHIFT_PRESSED      0x2A
-#define RIGHT_SHIFT_PRESSED     0x36
-#define LEFT_SHIFT_RELEASED     0xAA
-#define RIGHT_SHIFT_RELEASED    0xB6
-
-char keyboard_getchar();
-
-#endif

src/drivers/rtc.c

@@ -1,64 +0,0 @@
-// Real-time clock driver implementation for better PRNG
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include <stdint.h>
-#include "rtc.h"
-#include "../kernel/io.h"
-#include "../libc/stdio.h"
-
-uint8_t rtc_read_register(uint8_t reg)
-{
-	outb(0x70, reg);
-	return inb(0x71);
-}
-
-uint8_t bcd_to_bin(uint8_t bcd)
-{
-	return ((bcd/16)*10) + (bcd%16);
-}
-
-int rtc_is_updating()
-{
-	outb(0x70, 0x0A);
-	return (inb(0x71) & 0x80);
-}
-
-void rtc_read_time(rtc_time_t *time)
-{
-	while (rtc_is_updating());
-
-	time->seconds = rtc_read_register(0x00);
-	time->minutes = rtc_read_register(0x02);
-	time->hours = rtc_read_register(0x04);
-	time->day = rtc_read_register(0x06);
-	time->month = rtc_read_register(0x07);
-	time->year = rtc_read_register(0x08);
-
-	outb(0x70, 0x0B);
-	uint8_t registerB = inb(0x71);
-
-	if (!(registerB & 0x04))
-	{
-		time->seconds = bcd_to_bin(time->seconds);
-		time->minutes = bcd_to_bin(time->minutes);
-		time->hours = bcd_to_bin(time->hours);
-		time->day = bcd_to_bin(time->day);
-		time->month = bcd_to_bin(time->month);
-		time->year = bcd_to_bin(time->year);
-	}
-}
-
-void print_time(const rtc_time_t *time)
-{
-	printf("%02d/%02d/%02d %02d:%02d:%02d\n", time->day, time->month, time->year, time->hours, time->minutes, time->seconds);
-}
-
-long time_seed()
-{
-	rtc_time_t* time = {0};
-	rtc_read_time(time);
-	
-	return time->day + time->month + time->year + time->hours + time->minutes + time->seconds;	
-}

src/drivers/rtc.h

@@ -1,23 +0,0 @@
-// Real-time clock driver implementation header for better PRNG
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef RTC_H
-#define RTC_H
-
-typedef struct
-{
-	uint8_t seconds;
-	uint8_t minutes;
-	uint8_t hours;
-	uint8_t day;
-	uint8_t month;
-	uint8_t year;
-} rtc_time_t;
-
-void rtc_read_time(rtc_time_t *time);
-long time_seed();
-void print_time(const rtc_time_t *time);
-
-#endif

src/initrd/hello.bf

@@ -1 +0,0 @@
--[------->+<]>-.-[->+++++<]>++.+++++++..+++.[--->+<]>-----.---[->+++<]>.-[--->+<]>---.+++.------.--------.

src/initrd/hello.txt

@@ -1 +0,0 @@
-hello, ramdisk world!

src/initrd/welcome.txt

@@ -1,37 +0,0 @@
-***********************
-* Welcome to BlankOS! *
-***********************
-
-Congratulations, you've entered my small world!
-
-You can try all the commands, try tweaking stuff like explained
-in the DEVELOPERS.md file, and even contribute if you got the
-guts. lol.
-
-Don't look too much at the code, it's badly designed, but hey,
-that's my first OS project so I find it kinda cool.
-
-There's no paging, ring 3, processes... I am not smart enough
-for all this modern stuff. Let's keep it simple and stay in 
-ring0, without processes, maybe one day there'll be more
-advanced features, but not today.
-
-** Why am I doing this?
-
-I wanted to explore the world of low-level programing.
-As I had only 1 year of experience in C, it was super challenging
-especially at the beginning, and I needed much time to understand
-even the most basic things around OSDev.
-
-I'll backup the project on archival media once it'll be at a good
-enough point; I think it's cool to leave a trace of my passage on
-Earth.
-
-** Easter eggs
-
-To make the exploration a bit funnier, I hid some easter eggs
-around. You can try to find them if you have time to lose.
-
-** Ravtzn
-
-Jub xabjf? Znlor fbzrguvat'f uvqqra va gurer...

src/kernel/initrd.c

@@ -1,144 +0,0 @@
-// Initial TAR ramdisk kernel module 
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../libc/stdio.h"
-#include <stdint.h>
-#include "../libc/string.h"
-#include "initrd.h"
-#include "system.h"
-
-static unsigned int octal_to_int(const char* str, size_t size)
-{
-	unsigned int result = 0;
-	while (*str && size-- > 0)
-	{
-		result = (result << 3) | (*str - '0');
-		str++;
-	}
-	return result;
-}
-
-uint32_t tar_parse_size(const char* in)
-{
-	uint32_t size = 0;
-	while (*in >= '0' && *in <= '7')
-	{
-		size = (size*8) + (*in - '0');
-		in++;
-	}
-	return size;
-}
-
-void tar_find_file(uint8_t *tar_start, const char* filename)
-{
-	uint8_t *ptr = tar_start;
-
-	while (1)
-	{
-		tar_header_t *header = (tar_header_t*)ptr;
-
-		if (header->filename[0] == '\0')
-		{
-			puts("[tar] EOF\n");
-			break;
-		}
-
-		unsigned int filesize = octal_to_int(header->size, 11);
-
-		if (strcmp(header->filename, filename) == 0)
-		{
-			printf("[tar] found file '%s', size=%u bytes\n", header->filename, filesize);
-
-			uint8_t *file_data = ptr+TAR_BLOCK_SIZE;
-			printf("[tar] content of '%s':\n", filename);
-			for (unsigned int i=0; i<filesize; i++)
-			{
-				putc(file_data[i]);
-			}
-			puts("\n");
-			return;
-		}
-
-		ptr += TAR_BLOCK_SIZE + ((filesize + TAR_BLOCK_SIZE-1) / TAR_BLOCK_SIZE) * TAR_BLOCK_SIZE;
-	}
-
-	printf("[tar] file '%s' not found\n", filename);
-}
-
-void ls_initrd(uint8_t* initrd, int verbose)
-{
-	tar_header_t *header = (tar_header_t*)initrd;
-	
-	if (verbose)
-	{
-		puts("Size       Type  Filename\n");
-	}
-
-	while (header->filename[0] != '\0')
-	{
-		if (!verbose)
-		{
-			printf("%s\n", header->filename);
-		} else {
-			printf("%7d\t%c\t %s\n", header->size, header->typeflag, header->filename);
-		}
-
-		uint32_t size = tar_parse_size(header->size);
-		uint32_t next_file_offset = ((size+TAR_BLOCK_SIZE-1)/TAR_BLOCK_SIZE)*TAR_BLOCK_SIZE;
-		header = (tar_header_t*)((uint8_t*)header + next_file_offset + TAR_BLOCK_SIZE);
-	}
-}
-
-void cat_initrd(uint8_t* initrd, const char* filename)
-{
-	tar_header_t *header = (tar_header_t*)initrd;
-
-	while (header->filename[0] != '\0')
-	{
-		if (strcmp(header->filename, filename) == 0)
-		{
-			uint32_t size = tar_parse_size(header->size);
-			uint8_t* file_content = (uint8_t*)header + 512;
-
-			for (uint32_t i=0; i<size; i++) putc(file_content[i]);
-			return;
-		}
-
-		uint32_t next_file_offset = ((tar_parse_size(header->size)+TAR_BLOCK_SIZE-1)/TAR_BLOCK_SIZE)*TAR_BLOCK_SIZE;
-		header = (tar_header_t*)((uint8_t*)header + next_file_offset + TAR_BLOCK_SIZE);
-	}
-
-	printf("File '%s' not found\n", filename);
-}
-
-int tar_file_to_buffer(uint8_t* initrd, const char* filename, char* buffer)
-{
-	uint8_t* current_block = initrd;
-
-	while (1)
-	{
-		if (current_block[0] == '\0')
-		{
-			//puts("[tar] EOF\n");
-			return -1;
-		}
-
-		const char* file_name = (const char*)current_block;
-		uint32_t file_size = tar_parse_size((const char*)(current_block+124));
-
-		if (strcmp(file_name, filename) == 0)
-		{
-			uint8_t* file_data = current_block + TAR_BLOCK_SIZE;
-			memcpy(buffer, file_data, file_size);
-			buffer[file_size] = '\0';
-			return 0;
-		}
-
-		uint32_t total_size = ((file_size + TAR_BLOCK_SIZE - 1) / TAR_BLOCK_SIZE) * TAR_BLOCK_SIZE;
-		current_block += TAR_BLOCK_SIZE + total_size;
-	}
-	printf("[tar] file '%s' not found\n", filename);
-	return -1;
-}

src/kernel/initrd.h

@@ -1,38 +0,0 @@
-// Initial TAR ramdisk kernel module header 
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef INITRD_H
-#define INITRD_H
-
-#define TAR_BLOCK_SIZE 512
-
-#include "system.h"
-
-typedef struct
-{
-	char filename[100];
-	char mode[8];
-	char owner[8];
-	char group[8];
-	char size[12];
-	char mtime[12];
-	char checksum[8];
-	char typeflag;
-	char linkname[100];
-	char magic[6];
-	char version[2];
-	char uname[32];
-	char gname[32];
-	char devmajor[8];
-	char devminor[8];
-	char prefix[155];
-} tar_header_t;
-
-void tar_find_file(uint8_t *tar_start, const char* filename);
-void ls_initrd(uint8_t* initrd, int verbose);
-void cat_initrd(uint8_t* initrd, const char* filename);
-int tar_file_to_buffer(uint8_t* initrd, const char* filename, char* buffer);
-
-#endif

src/kernel/kheap.c

@@ -1,64 +0,0 @@
-// Kernel heap management
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "kheap.h"
-#include <stdint.h>
-#include "system.h"
-
-// Free list allocator
-
-static uint8_t heap[HEAP_SIZE];
-static block_t* free_list = NULL;
-
-void init_alloc()
-{
-	free_list = (block_t*)heap;
-	free_list->size = HEAP_SIZE-sizeof(block_t);
-	free_list->next = NULL;
-}
-
-void* malloc(size_t size)
-{
-	block_t* prev = NULL;
-	block_t* curr = free_list;
-
-	while (curr != NULL)
-	{
-		if (curr->size >= size)
-		{
-			if (curr->size > (size_t)(size + sizeof(block_t)))
-			{
-				block_t* new_block = (block_t*)((uint8_t*)curr + sizeof(block_t) + size);
-				new_block->size = curr->size - size - sizeof(block_t);
-				new_block->next = curr->next;
-				curr->size = size;
-				curr->next = new_block;
-			}
-
-			if (prev == NULL)
-			{
-				free_list = curr->next;
-			} else {
-				prev->next = curr->next;
-			}
-
-			return (void*)((uint8_t*)curr + sizeof(block_t));
-		}
-
-		prev = curr;
-		curr = curr->next;
-	}
-
-	return NULL;
-}
-
-void free(void* ptr)
-{
-	if (ptr == NULL) return;
-
-	block_t* block_to_free = (block_t*)((uint8_t*)ptr - sizeof(block_t));
-	block_to_free->next = free_list;
-	free_list = block_to_free;
-}

src/kernel/kheap.h

@@ -1,25 +0,0 @@
-// Kernel heap management header
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef KHEAP_H
-#define KHEAP_H
-
-#include <stdint.h>
-#include "system.h"
-
-typedef struct block
-{
-	size_t size;
-	struct block* next;
-} block_t;
-
-#define HEAP_SIZE 1024*1024	// 1MB malloc-able
-
-
-void init_alloc();
-void* malloc(size_t size);
-void free(void* ptr);
-
-#endif

src/kernel/shell.c

@@ -1,173 +0,0 @@
-// Basic shell and commands kernel module
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "system.h"
-#include "../libc/stdio.h"
-#include "../libc/string.h"
-#include "../programs/programs.h"
-#include "../libc/crypto.h"
-#include <stdint.h>
-#include "../drivers/rtc.h"
-#include "kmain.h"
-
-#define BUFFER_SIZE 256
-#define MAX_COMMANDS 64
-#define MAX_ARGS     64
-
-// Splash screen: esthetic stuff.
-char* motd[] =
-{
-	"I should be root, really.",
-	"Not watching you!",
-	"Now in 2D!",
-	"Supercalifragilisticexpialidocious!",
-	"Tylko jedno w glowie mam!",
-	"Greetings, magic poppy!",
-	"I'm stuck in this kernel's shell, get me out!",
-	"And now, solve that equation!",
-	"Powered by TCC Incorporated.",
-	"Compiled at 69, CoquaineBaule Ave.",
-	"Shouldn't we be, uh, doing something?",
-	"We are the florists, we pick the plants!",
-	"Lalalalala, I pick the plants!",
-	"Woah, we're half-way there...",
-	"The CROU will never die!",
-	"Technoblade never dies!",
-	"Hi. My name is Guitar.",
-	"space station No. 9",
-	"May the orange juice be with you !",
-	"Bloody grated carrots!",
-	"Good night, kiddos...",
-	"I like trains",
-	"I fear planes",
-	"Bruteforce.exe",
-	"Ohayogozaimasu!",
-};
-
-int motd_size = sizeof(motd)/sizeof(motd[0]);
-
-bool do_splash = true;
-
-void splash()
-{ 
-	int random = randint(time_seed());
-	char* motd_pick = motd[random%motd_size];
-	cowsay(motd_pick, red, black);
-	puts("        ");
-	colorputs("blankOS", black, white);
-	puts(" ");
-	colorputs(BLANK_VERSION, red, black);
-	puts("\n");
-	
-
-	puts("        Time: ");
-	rtc_time_t time;
-	rtc_read_time(&time);
-	print_time(&time);
-	puts("\n");
-}
-
-typedef void (*command_func_t)(int argc, char *argv[]);
-
-typedef struct
-{
-	const char* name;
-	command_func_t function;
-} shell_command_t;
-
-shell_command_t shell_commands[MAX_COMMANDS];
-int command_count = 0;
-
-void register_command(const char* name, command_func_t function)
-{
-	if (command_count < MAX_COMMANDS)
-	{
-		shell_commands[command_count].name = name;
-		shell_commands[command_count].function = function;
-		command_count++;
-	}
-}
-
-command_func_t find_command(const char* name)
-{
-	for (int i=0; i < command_count; i++)
-	{
-		if (strcmp(name, shell_commands[i].name) == 0) 
-			return shell_commands[i].function;
-	}
-	return 0;
-}
-
-int parse_input(char* input, char* argv[], int max_args)
-{
-	int argc = 0;
-	char* token = strtok(input, " ");
-	while (token != NULL && argc < max_args - 1)
-	{
-		argv[argc++] = token;
-		token = strtok(NULL, " ");
-	}
-	argv[argc] = NULL;
-	return argc;
-}
-
-void shell_install()
-{
-  if (do_splash == true)
-  {
-	do_splash = false;
-  	splash();
-  }
-  
-  register_command("help", program_help);
-  register_command("panic", program_panic);
-  register_command("words", program_words);
-  register_command("primes", program_primes);
-  register_command("rainbow", program_rainbow);
-  register_command("clear", program_clear);
-  register_command("math", program_math);
-  register_command("bf", program_bf);
-  register_command("uptime", program_uptime);
-  register_command("echo", program_echo);
-  register_command("sysinfo", program_sysinfo);
-  register_command("conway", program_conway);
-  register_command("rot13", program_rot13);
-  register_command("morse", program_morse);
-  register_command("cowsay", program_cowsay);
-  register_command("time", program_time);
-  register_command("read", program_read);
-  register_command("reboot", program_reboot);
-  register_command("pi", program_pi);
-  register_command("ls", program_ls);
-  register_command("cat", program_cat);
-  register_command("bmp", program_bmp);
-
-  for (;;)
-  {
-    char input_buffer[BUFFER_SIZE];
-    char* argv[MAX_ARGS];
-
-    // Prompt
-    colorputs("root", blue, black);
-    colorputs("@", white, black);
-    colorputs("blankos", green, black);
-    colorputs("~$ ", white, black);
-
-    get_input(input_buffer, BUFFER_SIZE);
-    puts("\n");
-    
-    int argc = parse_input(input_buffer, argv, MAX_ARGS);
-
-    if (argc == 0) continue;
-
-    command_func_t command = find_command(argv[0]);
-    if (command)
-    {
-	    command(argc, argv);
-    } else {
-	    printf("Unknown command %s\n", argv[0]);
-    }
-  }
-}

src/kernel/sysinfo.c

@@ -1,16 +0,0 @@
-// System information kernel module
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../libc/stdio.h"
-#include "../libc/string.h"
-
-void cpuid(int code, unsigned int* a, unsigned int* d)
-{
-	asm volatile("cpuid"
-			: "=a"(*a), "=d"(*d)
-			: "a"(code)
-			: "ecx", "ebx");
-}
-

src/kernel/sysinfo.h

@@ -1,11 +0,0 @@
-// System information kernel module header
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef SYSINFO_H
-#define SYSINFO_H
-
-void cpuid(int code, unsigned int* a, unsigned int* d);
-
-#endif

src/libc/crypto.c

@@ -1,48 +0,0 @@
-// Cryptography routines for blankos/libc
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "crypto.h"
-#include <stdint.h>
-
-int lcg(int seed)
-{
-	int x = seed;
-
-	// Constants (ZX81 LCG)
-	int a = 75;
-	int c = 74;
-	long m = 65537;
-
-	for (int i=0; i<10; i++)
-	{
-		x = (a*x + c) % m;
-	}
-
-	return x;
-}
-
-int randint(int seed)
-{
-	int x = lcg(seed);
-	return x;
-}
-
-static uint32_t next = 1;
-
-uint32_t rand()
-{
-	next = next * 1103515245 + 12345;
-	return (next/65536) % 32768;
-}
-
-float rand_float()
-{
-	return rand() / 32767.0f;
-}
-
-void srand(uint32_t seed)
-{
-	next = seed;
-}

src/libc/crypto.h

@@ -1,19 +0,0 @@
-// Cryptography routines for blankos/libc header
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef CRYPTO_H
-#define CRYPTO_H
-
-#define RAND_MAX 1024
-
-#include <stdint.h>
-
-int lcg(int seed);
-int randint(int seed);
-uint32_t rand();
-float rand_float();
-void srand(uint32_t seed);
-
-#endif

src/programs/bf.c

@@ -1,74 +0,0 @@
-// Simple brainfuck interpreter program
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../kernel/system.h"
-#include "../libc/stdio.h"
-#include "../kernel/kmain.h"
-#include "../kernel/initrd.h"
-
-#define BUF_SIZE 256
-
-void brainfuck(char* input)
-{
-	unsigned char tape[30000] = {0};
-	unsigned char* ptr = tape;
-	char current_char;
-	size_t i;
-	size_t loop;
-
-	for (i=0; input[i] != 0; i++)
-	{
-		current_char = input[i];
-		if (current_char == '>') {
-			++ptr;
-		} else if (current_char == '<') {
-			--ptr;
-		} else if (current_char == '+') {
-			++*ptr;
-		} else if (current_char == '-') {
-			--*ptr;
-		} else if (current_char == '.') {
-			putc(*ptr);
-		} else if (current_char == ',') {
-			*ptr = keyboard_getchar();
-		} else if (current_char == '[') {
-			continue;
-		} else if (current_char == ']' && *ptr) {
-			loop = 1;
-			while (loop > 0)
-			{
-				current_char = input[--i];
-				if (current_char == '[') {
-					loop--;
-				} else if (current_char == ']') {
-					loop++;
-				}
-			}
-		}
-	}
-}
-
-void program_bf(int argc, char* argv[])
-{
-	if (argc == 1)
-	{
-		char input_buffer[BUF_SIZE];
-		puts("Brainfuck code? ");
-		get_input(input_buffer, BUF_SIZE);
-		brainfuck(input_buffer);
-		puts("\n");
-	} else if (argc == 2) {
-		// Read file content into buffer, then interpret it
-		char input_buffer[BUF_SIZE];
-		int read = tar_file_to_buffer((uint8_t*)initrd_addr, argv[1], input_buffer);
-		if (read == 0)
-		{
-			brainfuck(input_buffer);
-			puts("\n");
-		} else {
-			printf("Could not find file '%s'\n", argv[1]);
-		}
-	}
-}

src/programs/bmp.c

@@ -1,100 +0,0 @@
-// Bitmap image renderer
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../kernel/kmain.h"
-#include <stdint.h>
-#include "../kernel/initrd.h"
-#include "../drivers/framebuffer.h"
-#include "../libc/stdio.h"
-#include "../drivers/serial.h"
-
-#pragma pack(push, 1)
-typedef struct
-{
-	uint16_t bfType;
-	uint32_t bfSize;
-	uint16_t bfReserved1;
-	uint16_t bfReserved2;
-	uint32_t bfOffBits;
-} BMPHeader;
-
-typedef struct
-{
-	uint32_t biSize;
-	int32_t  biWidth;
-	int32_t  biHeight;
-	uint16_t biPlanes;
-	uint16_t biBitCount;
-	uint32_t biCompression;
-	uint32_t biSizeImage;
-	int32_t  biXPelsPerMeter;
-	int32_t  biYPelsPerMeter;
-	uint32_t biClrUsed;
-	uint32_t biClrImportant;
-} BMPInfoHeader;
-#pragma pack(pop)
-
-void display_bmp(uint32_t* fb, int pitch, int bpp, uint8_t* initrd, const char* filename)
-{
-	// Should use dynamic allocation when heap works
-	// Cannot go more than ~500k size for buffer
-	// Fail zone 450k->470k
-	// So right now the max should be 400kb img size
-	char buffer[400*1000];
-	int file_status = tar_file_to_buffer(initrd, filename, buffer);
-
-	if (file_status != 0)
-	{
-		printf("Error loading file '%s'\n", filename);
-		return;
-	}
-
-	BMPHeader* bmp_header = (BMPHeader*)buffer;
-	BMPInfoHeader* bmp_info = (BMPInfoHeader*) (buffer+sizeof(BMPHeader));
-
-	if (bmp_header->bfType != 0x4D42)
-	{
-		printf("'%s' is not a valid BMP file\n", filename);
-		return;
-	}
-
-	int width = bmp_info->biWidth;
-	int height = bmp_info->biHeight;
-	int pixel_offset = bmp_header->bfOffBits;
-
-	printf("%d-bit BMP, width: %d, height: %d, pixel offset: %d\n", bmp_info->biBitCount, bmp_info->biWidth, bmp_info->biHeight, bmp_header->bfOffBits);	
-	erase_cursor();
-	uint8_t* pixel_data = (uint8_t*)(buffer + pixel_offset);
-
-	int cursor_y = (get_cursor_y()+1)*16;
-	serial_printf(3, "cursor_y=%d\n", cursor_y);
-
-	for (int y=cursor_y; y<height+cursor_y; y++)
-	{
-		for (int x=0; x<width; x++)
-		{
-			int index = (x+(height-y-1+cursor_y)*width)*3;
-			uint8_t blue = pixel_data[index];
-			uint8_t green = pixel_data[index+1];
-			uint8_t red = pixel_data[index+2];
-
-			uint32_t color = (0xFF << 24) | (red << 16) | (green << 8) | blue;
-			putpixel(fb, pitch, bpp, x, y, color);
-		}
-	}
-
-	// Update cursor pos after image drawing
-	move_cursor(get_cursor_x(), get_cursor_y()+(height/16)+2);
-}
-
-void program_bmp(int argc, char* argv[])
-{
-	if (argc < 2)
-	{
-		puts("Usage: bmp <file>\n"); 
-		return;
-	}
-	display_bmp(framebuffer, pitch, bpp, (uint8_t*)initrd_addr, argv[1]);
-}

src/programs/ciphers.c

@@ -1,160 +0,0 @@
-// Cipher programs
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../libc/stdio.h"
-#include "ciphers.h"
-#include "../libc/string.h"
-#include <stdint.h>
-
-void rot13(char* input, char* output)
-{
-	int i = 0;
-
-	while (input[i] != '\0')
-	{
-		char c = input[i];
-
-		if (c >= 'a' && c <= 'z') {
-			output[i] = ((c - 'a' + 13) % 26) + 'a';
-		} else if (c >= 'A' && c <= 'Z') {
-			output[i] = ((c - 'A' + 13) % 26) + 'A';
-		} else {
-			output[i] = c;
-		}
-
-		i++;
-	}
-	output[i] = '\0';
-}
-
-void program_rot13(int argc, char* argv[])
-{
-	if (argc < 2)
-	{
-		printf("Usage: %s <string>\n", argv[0]);
-		return;
-	}
-
-	char input_buffer[BUFFER_SIZE] = {0};
-	char output[BUFFER_SIZE] = {0};
-
-	for (int i=1; i<argc; i++)
-	{
-		strcat(input_buffer, argv[i]);
-		if (i<argc-1)
-		{
-			strcat(input_buffer, " ");
-		}
-	}
-	rot13(input_buffer, output);
-	printf("%s\n", output);
-}
-
-const char* morse_alphabet[] = {
-    ".-",   // A
-    "-...", // B
-    "-.-.", // C
-    "-..",  // D
-    ".",    // E
-    "..-.", // F
-    "--.",  // G
-    "....", // H
-    "..",   // I
-    ".---", // J
-    "-.-",  // K
-    ".-..", // L
-    "--",   // M
-    "-.",   // N
-    "---",  // O
-    ".--.", // P
-    "--.-", // Q
-    ".-.",  // R
-    "...",  // S
-    "-",    // T
-    "..-",  // U
-    "...-", // V
-    ".--",  // W
-    "-..-", // X
-    "-.--", // Y
-    "--.."  // Z
-};
-
-const char* morse_digits[] = {
-    "-----", // 0
-    ".----", // 1
-    "..---", // 2
-    "...--", // 3
-    "....-", // 4
-    ".....", // 5
-    "-....", // 6
-    "--...", // 7
-    "---..", // 8
-    "----."  // 9
-};
-
-void to_morse(const char* input, char* output) {
-    int i = 0;
-    int pos = 0;
-    
-    while (input[i] != '\0') {
-        char c = input[i];
-        
-        if (c >= 'a' && c <= 'z') {
-            const char* morse_code = morse_alphabet[c - 'a'];
-            int j = 0;
-            while (morse_code[j] != '\0') {
-                output[pos++] = morse_code[j++];
-            }
-        } else if (c >= 'A' && c <= 'Z') {
-            const char* morse_code = morse_alphabet[c - 'A'];
-            int j = 0;
-            while (morse_code[j] != '\0') {
-                output[pos++] = morse_code[j++];
-            }
-        } else if (c >= '0' && c <= '9') {
-            const char* morse_code = morse_digits[c - '0'];
-            int j = 0;
-            while (morse_code[j] != '\0') {
-                output[pos++] = morse_code[j++];
-            }
-        } else if (c == ' ') {
-            output[pos++] = ' ';
-        }
-
-        output[pos++] = ' ';
-        i++;
-    }
-    
-    if (pos > 0) {
-        output[pos - 1] = '\0';
-    } else {
-        output[pos] = '\0'; 
-    }
-}
-
-void program_morse(int argc, char* argv[]) {
-    
-    if (argc < 2)
-    {
-	printf("Usage: %s <string>\n", argv[0]);
-	return;
-    }
-	
-    char output[512]; 
-    char message[BUFFER_SIZE];
-
-    for (int i=1; i<argc; i++)
-    {
-	strcat(message, argv[i]);
-	if (i < argc-1)
-	{
-		strcat(message, " ");
-	}
-    }
-
-    to_morse(message, output);
-    printf("%s\n", output);
-}
-

src/programs/ciphers.h

@@ -1,11 +0,0 @@
-// Cipher programs header
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef CIPHERS_H
-#define CIPHERS_H
-
-#define BUFFER_SIZE 256
-
-#endif

src/programs/conway.c

@@ -1,136 +0,0 @@
-// Conway's Game of Life program
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "conway.h"
-#include "../libc/stdio.h"
-#include "../kernel/system.h"
-#include "../libc/crypto.h"
-#include <stdint.h>
-#include "../drivers/serial.h"
-#include "../libc/string.h"
-
-void print_grid(const unsigned char grid[X][Y])
-{
-	clear();
-	for (int i=0; i<X; i++)
-	{
-		for (int j=0; j<Y; j++)
-		{
-			if (grid[i][j] == LIVE) {
-			       putc(35);
-			} else {
-	       		       putc(32);
-			}		       
-		}
-	}
-}
-
-int count_live_neighbors(const unsigned char grid[X][Y], int i, int j)
-{
-	int live_neighbors = 0;
-
-	for (int x=-1; x<=1; x++)
-	{
-		for (int y=-1; y<=1; y++)
-		{
-			if (x==0 && y==0) continue;
-
-			int ni = i+x;
-			int nj = j+y;
-
-			if (ni >= 0 && ni < X && nj >= 0)
-			{
-				if (grid[ni][nj] == LIVE) live_neighbors++;
-			}
-		}
-	}
-	return live_neighbors;
-}
-
-void grid_new_generation(unsigned char grid[X][Y], unsigned char temp[X][Y])
-{
-	for (int i=0; i<X; i++)
-	{
-		for (int j=0; j<Y; j++)
-		{
-			int cell = grid[i][j];
-			int live_neighbors = count_live_neighbors(grid, i, j);
-
-			if (cell == LIVE)
-			{
-				switch(live_neighbors)
-				{
-					case 2:
-					case 3:
-						temp[i][j] = LIVE;
-						break;
-					default:
-						temp[i][j] = DEAD;
-						break;
-				}
-			}
-			else if (cell == DEAD && live_neighbors == 3)
-			{
-				temp[i][j] = LIVE;
-			}
-		}
-	}
-
-	for (int i=0; i<X; i++)
-	{
-		for (int j=0; j<Y; j++)
-		{
-			grid[i][j] = temp[i][j];
-			temp[i][j] = DEAD;
-		}
-	}
-}
-
-void soup(unsigned char grid[X][Y])
-{
-	srand(global_ticks);
-	for (int i=0; i<X; i++)
-	{
-		for (int j=0; j<Y; j++)
-		{
-			grid[i][j] = rand_float() > SOUP_PROB ? LIVE : DEAD; 
-		}
-	}
-}
-
-void program_conway(int argc, char* argv[])
-{
-	clear();
-	unsigned char grid[X][Y] = {0};
-	unsigned char temp[X][Y] = {0};
-
-	if (argc == 1)
-	{
-		soup(grid);
-	} else if (argc == 2 && strcmp(argv[1], "-g") == 0) {
-		grid[1][2] = LIVE;
-		grid[2][3] = LIVE;
-		grid[3][1] = LIVE;
-		grid[3][2] = LIVE;
-		grid[3][3] = LIVE;	
-	} else if (argc == 2 && strcmp(argv[1], "-l") == 0) {
-		grid[10][3] = LIVE; grid[10][4] = LIVE; grid[10][5] = LIVE; grid[10][6] = LIVE;
-		grid[11][2] = LIVE; grid[11][6] = LIVE;
-		grid[12][6] = LIVE;
-		grid[13][2] = LIVE; grid[13][5] = LIVE;
-	}
-
-	print_grid(grid);
-	puts("generation 0");
-	for (int i=1; i<GENERATIONS; i++)
-	{
-		grid_new_generation(grid, temp);
-		delay(DELAY);
-		clear();
-		print_grid(grid);
-		printf("generation %d", i);
-	}
-	
-}

src/programs/conway.h

@@ -1,23 +0,0 @@
-// Conway's Game of Life program header
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef CONWAY_H
-#define CONWAY_H
-
-#define X 66
-#define Y 240
-
-#define GENERATIONS 100
-#define DEAD 0
-#define LIVE 1
-#define SOUP_PROB 0.7
-#define DELAY 10
-
-void print_grid(const unsigned char grid[X][Y]);
-int count_live_neighbors(const unsigned char grid[X][Y], int i, int j);
-void grid_new_generation(unsigned char grid[X][Y], unsigned char temp[X][Y]);
-void soup(unsigned char grid[X][Y]);
-
-#endif

src/programs/cowsay.c

@@ -1,72 +0,0 @@
-// Cowsay-like program
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../libc/stdio.h"
-#include "../libc/string.h"
-
-#define MAX_MSG_LEN 128
-
-const char* cow =
-"        \\   ^__^\n"
-"         \\  (oo)\\_______\n"
-"            (__)\\       )\\/\\\n"
-"                ||----w |\n"
-"                ||     ||\n";
-
-void print_bubble(const char* message)
-{
-	int len = strlen(message);
-	puts(" ");
-	for (int i=0; i<len+2; i++)
-	{
-		puts("_");
-	}
-	puts("\n");
-
-	printf("< %s >\n", message);
-
-	puts(" ");
-	for (int i=0; i<len+2; i++)
-	{
-		puts("-");
-	}
-	puts("\n");
-}
-
-void cowsay(char* msg, uint32_t fg, uint32_t bg)
-{
-	print_bubble(msg);
-	colorputs(cow, fg, bg);
-}
-
-void program_cowsay(int argc, char* argv[])
-{
-	if (argc < 2)
-	{
-		printf("Usage: %s <message>\n", argv[0]);
-		return;
-	}
-
-	char message[MAX_MSG_LEN];
-	message[0] = '\0';
-
-	for (int i=1; i<argc; i++)
-	{
-		if (strlen(message) + strlen(argv[i]) + 1 < MAX_MSG_LEN)
-		{
-			strcat(message, argv[i]);
-			if (i < argc-1)
-			{
-				strcat(message, " ");
-			}
-		} else {
-			puts("Too long message.\n");
-			return;
-		}
-	}
-
-	print_bubble(message);
-	printf("%s", cow);
-}

src/programs/fs.c

@@ -1,30 +0,0 @@
-// Filesystem utilities (for initrd)
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../kernel/initrd.h"
-#include "../kernel/kmain.h"
-#include "../libc/stdio.h"
-#include "../libc/string.h"
-
-void program_ls(int argc, char* argv[])
-{
-	if (argc == 1)
-	{
-		ls_initrd((uint8_t*)initrd_addr, 0);
-	} else if (argc == 2 && strcmp(argv[1], "-l") == 0) {
-		ls_initrd((uint8_t*)initrd_addr, 1);
-	}
-}
-
-// Basic cat just to read, no concatenation here
-void program_cat(int argc, char* argv[]) 
-{
-	if (argc != 2)
-	{
-		puts("Usage: cat <file>\n");
-		return;
-	}
-	cat_initrd((uint8_t*)initrd_addr, argv[1]);
-}

src/programs/math.c

@@ -1,245 +0,0 @@
-// Basic math expression lexer and parser program
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include <stdint.h>
-#include "../kernel/system.h"
-#include "../libc/stdio.h"
-#include "../libc/ctype.h"
-
-#define BUFFER_SIZE 256
-
-typedef enum
-{
-	TOKEN_NUMBER,
-	TOKEN_PLUS,
-	TOKEN_MINUS,
-	TOKEN_MULTIPLY,
-	TOKEN_DIVIDE,
-	TOKEN_LPAREN,
-	TOKEN_RPAREN,
-	TOKEN_END
-} TokenType;
-
-typedef struct
-{
-	TokenType type;
-	double value;
-} Token;
-
-typedef struct
-{
-	const char *text;
-	size_t pos;
-	Token current_token;
-} Lexer;
-
-void lexer_init(Lexer *lexer, const char *text)
-{
-	lexer->text = text;
-	lexer->pos = 0;
-	lexer->current_token.type = TOKEN_END;
-	lexer->current_token.value = 0;
-}
-
-void lexer_advance(Lexer *lexer)
-{
-	lexer->pos++;
-}
-
-char lexer_peek(const Lexer *lexer)
-{
-	return lexer->text[lexer->pos];
-}
-
-bool lexer_is_at_end(const Lexer *lexer)
-{
-	return lexer->text[lexer->pos] == '\0';
-}
-
-Token lexer_get_next_token(Lexer *lexer)
-{
-	while (!lexer_is_at_end(lexer))
-	{
-		char current_char = lexer_peek(lexer);
-
-		if (isspace(current_char)) {
-			lexer_advance(lexer);
-			continue;
-		}
-
-		if (isdigit(current_char)) {
-			double value = 0;
-			while (isdigit(current_char))
-			{
-				value = value * 10 + (current_char - '0');
-				lexer_advance(lexer);
-				current_char = lexer_peek(lexer);
-			}
-				if (current_char == '.')
-				{
-					lexer_advance(lexer);
-					double decimal_place = 0.1;
-					while (isdigit(lexer_peek(lexer))) 
-					{
-						value += decimal_place * (lexer_peek(lexer)-'0');
-						decimal_place *= 0.1;
-						lexer_advance(lexer);
-					}
-				}
-				lexer->current_token.type = TOKEN_NUMBER;
-				lexer->current_token.value = value;
-				return lexer->current_token;
-		}
-
-		if (current_char == '+')
-		{
-			lexer_advance(lexer);
-			lexer->current_token.type = TOKEN_PLUS;
-			return lexer->current_token;
-		}
-
-		if (current_char == '-') 
-		{
-			lexer_advance(lexer);
-			lexer->current_token.type = TOKEN_MINUS;
-			return lexer->current_token;
-		}
-
-		if (current_char == '*')
-		{
-			lexer_advance(lexer);
-			lexer->current_token.type = TOKEN_MULTIPLY;
-			return lexer->current_token;
-		}
-
-		if (current_char == '/')
-		{
-			lexer_advance(lexer);
-			lexer->current_token.type = TOKEN_DIVIDE;
-			return lexer->current_token;
-		}
-
-		if (current_char == '(')
-		{
-			lexer_advance(lexer);
-			lexer->current_token.type = TOKEN_LPAREN;
-			return lexer->current_token;
-		}
-
-		if (current_char == ')')
-		{
-			lexer_advance(lexer);
-			lexer->current_token.type = TOKEN_RPAREN;
-			return lexer->current_token;
-		}
-
-		printf("\nUnknown character %c\n", current_char);
-		shell_install();
-	}
-	
-	lexer->current_token.type = TOKEN_END;
-	return lexer->current_token;
-}
-
-typedef struct
-{
-	Lexer lexer;
-	Token current_token;
-} Parser;
-
-void parser_init(Parser *parser, const char *text)
-{
-	lexer_init(&parser->lexer, text);
-	parser->current_token = lexer_get_next_token(&parser->lexer);
-}
-
-void parser_eat(Parser *parser, TokenType type)
-{
-	if (parser->current_token.type == type)
-	{
-		parser->current_token = lexer_get_next_token(&parser->lexer);
-	} else {
-		printf("\nUnexpected token %d\n", parser->current_token.type);
-		shell_install();
-	}
-}
-
-double parser_factor(Parser *parser);
-double parser_term(Parser *parser);
-double parser_expression(Parser *parser);
-
-double parser_factor(Parser *parser)
-{
-	Token token = parser->current_token;
-	if (token.type == TOKEN_NUMBER)
-	{
-		parser_eat(parser, TOKEN_NUMBER);
-		return token.value;
-	} else if (token.type == TOKEN_LPAREN) {
-		parser_eat(parser, TOKEN_LPAREN);
-		double result = parser_expression(parser);
-		parser_eat(parser, TOKEN_RPAREN);
-		return result;
-	} else {
-		printf("\nUnexpected token in factor %d\n", token.type);
-		shell_install();
-	}
-	return -1;
-}
-
-double parser_term(Parser *parser)
-{
-	double result = parser_factor(parser);
-
-	while (parser->current_token.type == TOKEN_MULTIPLY || parser->current_token.type == TOKEN_DIVIDE)
-	{
-		Token token = parser->current_token;
-		if (token.type == TOKEN_MULTIPLY) 
-		{
-			parser_eat(parser, TOKEN_MULTIPLY);
-			result *= parser_factor(parser);
-		} else if (token.type == TOKEN_DIVIDE) {
-			parser_eat(parser, TOKEN_DIVIDE);
-			result /= parser_factor(parser);
-		}
-	}
-	return result;
-}
-
-double parser_expression(Parser *parser)
-{
-	double result = parser_term(parser);
-
-	while (parser->current_token.type == TOKEN_PLUS || parser->current_token.type == TOKEN_MINUS) 
-	{
-		Token token = parser->current_token;
-		if (token.type == TOKEN_PLUS)
-		{
-			parser_eat(parser, TOKEN_PLUS);
-			result += parser_term(parser);
-		} else if (token.type == TOKEN_MINUS) {
-			parser_eat(parser, TOKEN_MINUS);
-			result -= parser_term(parser);
-		}
-	}
-	return result;
-}
-
-double parse(const char* text)
-{
-	Parser parser;
-	parser_init(&parser, text);
-	double result = parser_expression(&parser);
-	return result;
-}
-
-void program_math()
-{
-	char input_buffer[BUFFER_SIZE];
-	puts("Expression? ");
-	get_input(input_buffer, BUFFER_SIZE);
-	double result = parse(input_buffer);
-	printf("\n%f\n", result);
-}

src/programs/misc.c

@@ -1,145 +0,0 @@
-// Miscellaneous small programs
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../libc/stdio.h"
-#include "../kernel/system.h"
-#include "../libc/string.h"
-#include "../drivers/framebuffer.h"
-#include "../drivers/ata.h"
-#include "../drivers/rtc.h"
-#include "../kernel/io.h"
-
-// Print a rainbow colorful text for testing
-
-#define BUF_SIZE 256
-#define COLORS 20
-
-void program_rainbow(int argc, char* argv[])
-{
-	if (argc < 2)
-	{
-		printf("Usage: %s <string>\n", argv[0]);
-		return;
-	}
-	
-	char input_buffer[BUF_SIZE] = {0};
-	for (int i=1; i<argc; i++)
-	{
-		strcat(input_buffer, argv[i]);
-		if (i<argc-1)
-		{
-			strcat(input_buffer, " ");
-		}
-	}
-
-	enum Colors colors[] = {
-        	white, black, red, green, blue, yellow,
-        	cyan, magenta, orange, purple, brown,
-        	gray, pink, lime, navy, teal, maroon,
-        	olive, silver, gold, indigo, violet,
-        	coral, turquoise, salmon, chocolate,
-        	khaki, lavender, beige
-    	};
-	int colors_count = sizeof(colors)/sizeof(colors[0]);
-
-	for (int i=0; i<colors_count-1; i++)
-	{
-		colorputs(input_buffer, colors[i], colors[i+1]);
-		puts("\n");
-	}	
-}
-
-// Clear the terminal
-
-#define ROWS 25
-
-void program_clear()
-{	
-	clear();
-}
-
-// Get uptime in ticks
-
-void program_uptime()
-{
-	int ticks = uptime();
-	double seconds = ticks/18.2065; // PIT channel 0 freq
-	printf("%d ticks\t%f seconds\n", ticks, seconds);
-}
-
-// Get help
-
-void program_help()
-{
-	printf("help\tpanic\twords\tprimes\trainbow\tclear\nmath\tbf\t   uptime   echo\t  sysinfo\tconway\nrot13   morse\tcowsay   time\t  read\t   reboot\npi\t  ls\t   cat\t  bmp\n");
-}
-
-// Panic
-
-void program_panic()
-{
-	asm volatile("int $0x13");
-}
-
-// Output input
-
-void program_echo(int argc, char* argv[])
-{
-	for (int i=1; i<argc; i++)
-	{
-		puts(argv[i]);
-		if (i < argc-1) {
-			putc(' ');
-		}
-	}
-	puts("\n");
-}
-
-// Get current RTC time
-
-void program_time()
-{
-	rtc_time_t time;
-	rtc_read_time(&time);
-	puts("Current RTC time: ");
-	print_time(&time);
-	puts("\n");
-}
-
-// Read a sector
-
-void program_read(int argc, char* argv[])
-{
-	if (argc < 2)
-	{
-		printf("Usage: %s <sector>\n", argv[0]);
-	} else if (argc == 2)
-	{
-		uint8_t buffer[512];
-		ata_read_sector(atoi(argv[1]), buffer);
-		
-		for (int i=0; i<512; i++)
-		{
-			if (i%50==0) puts("\n"); // hardcoded = bad
-			printf("%02x ", buffer[i]);
-		}
-		puts("\n");
-	} else
-	{
-		puts("Invalid argument number\n");
-	}
-}
-
-// Reboots the machine (might just shutdown)
-
-void program_reboot()
-{
-	puts("Rebooting...\n");
-	
-	while(inb(0x64) & 0x02);
-	outb(0x64, 0xFE);
-
-	while (1) asm volatile("hlt");
-}

src/programs/pi.c

@@ -1,34 +0,0 @@
-// Program for Pi computation using Leibniz series
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../libc/stdio.h"
-#include "../libc/string.h"
-
-void program_pi(int argc, char* argv[])
-{
-	if (argc < 2)
-	{
-		printf("Usage: %s <terms>\n", argv[0]);
-		return;
-	}
-
-	double pi = 0.0;
-	int terms = atoi(argv[1]);
-	
-	for (int i=0; i<terms; i++)
-	{
-		double term = 1.0/(2*i+1);
-		if (i%2 == 0)
-		{
-			pi += term;
-		} else {
-			pi -= term;
-		}
-	}
-
-	pi *= 4;
-
-	printf("%f\n", pi);
-}

src/programs/primes.c

@@ -1,44 +0,0 @@
-// Prime number computation program
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include <stdint.h>
-#include "../libc/stdio.h"
-#include "../kernel/system.h"
-#include "../libc/string.h"
-
-#define PRIMES_MAX 1000000
-
-bool isPrime(int n)
-{
-	if (n == 1 || n == 0) return false;
-	for (int i=2; i<= n/2; i++) if (n%i == 0) return false;
-	return true;
-}
-
-void program_primes(int argc, char* argv[])
-{
-	int primes_max;
-	
-	if (argc == 1)
-	{
-		primes_max = PRIMES_MAX;
-	} else if (argc == 2)
-	{
-		primes_max = atoi(argv[1]);
-	}
-
-	for (long long x=0; x<primes_max; x++)
-	{	
-		if (isPrime(x) && x != 3301)
-		{
-				printf("%d ", x);	
-		} else if(x == 3301)
-		{
-				colorputs("3301 ", red, black);
-		}
-		delay(1);
-	}
-	puts("\n");
-}

src/programs/programs.h

@@ -1,43 +0,0 @@
-// Global program entry points header
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#ifndef PROGRAMS_H
-#define PROGRAMS_H
-
-void program_words();
-void program_primes();
-void program_math();
-void program_bf();
-void program_sysinfo();
-
-void get_cpuid();
-void get_meminfo(unsigned int multiboot_info_address); // to be fixed: cannot get full memory map (sysinfo -v)
-void program_conway();
-void program_cowsay();
-void cowsay(); // Splash screen
-void program_pi();
-
-// Ciphers
-void program_rot13();
-void program_morse();
-
-// Misc
-void program_rainbow();
-void program_clear();
-void program_uptime();
-void program_panic();
-void program_help();
-void program_echo();
-void program_time();
-void program_read();
-void program_reboot();
-
-// Filesystem (initrd)
-void program_ls();
-void program_cat();
-
-void program_bmp();
-
-#endif

src/programs/sysinfo.c

@@ -1,85 +0,0 @@
-// System information program
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../kernel/sysinfo.h"
-#include "../libc/stdio.h"
-#include "../kernel/system.h"
-#include "../libc/string.h"
-
-extern unsigned int multiboot_info_address;
-
-typedef struct multiboot_memory_map
-{
-	unsigned int size;
-	unsigned int base_addr_low;
-	unsigned int base_addr_high;
-	unsigned int length_low;
-	unsigned int length_high;
-	unsigned int type;
-} multiboot_memory_map_t;
-
-void get_cpuid()
-{
-	// CPUid
-
-	unsigned int eax, edx;
-	char vendor[13];
-	unsigned int* v = (unsigned int*)vendor;
-
-	asm volatile("cpuid"
-			: "=b"(v[0]), "=d"(v[1]), "=c"(v[2])
-			: "a"(0));
-	vendor[12] = '\0';
-
-	cpuid(1, &eax, &edx);
-	unsigned int model = (eax >> 4) & 0xF;
-	unsigned int family = (eax >> 8) & 0xF;
-
-	printf("CPU information\n\tvendor:   %s\n\tfamily:   %u\n\tmodel:    %u\n\tfeatures: 0x%x\n", vendor, family, model, edx);
-}
-
-// Not really working anymore as it was made for multiboot1, now using multiboot2
-void get_meminfo(unsigned int multiboot_info_address, int verbose)
-{
-	// RAM
-	
-	unsigned int mem_lower = *((unsigned int*)(multiboot_info_address + 4));
-	unsigned int mem_upper = *((unsigned int*)(multiboot_info_address + 8));
-
-	printf("RAM information\n\tLower memory: %u KB\n\tUpper memory: %u KB\n", mem_lower, mem_upper);
-
-	if (verbose)
-	{
-		multiboot_memory_map_t* mmap = (multiboot_memory_map_t*)*((unsigned int*)(multiboot_info_address + 44));
-		printf("Memory map:\nBase addr          | Length             | Type\n----------------------------------------------------\n");
-
-		while ((unsigned int)mmap < multiboot_info_address + *((unsigned int*)(multiboot_info_address + 40)))
-		{
-			/*	
-			if (mmap->length_high != 0 && mmap->length_low != 0)
-			{*/
-				printf("0x%x%x | 0x%x%x | %u\n",
-					mmap->base_addr_high, mmap->base_addr_low,
-					mmap->length_high, mmap->length_low,
-					mmap->type);
-			//}
-			
-			mmap = (multiboot_memory_map_t*)((unsigned int)mmap + mmap->size + sizeof(unsigned int));
-		}
-	}
-}
-
-void program_sysinfo(int argc, char* argv[])
-{
-	if (argc == 1)
-	{
-		get_cpuid();
-		get_meminfo(g_multiboot_info_address, 0);
-	} else if (argc == 2 && strcmp(argv[1], "-v") == 0)
-	{	
-		get_cpuid();
-		get_meminfo(g_multiboot_info_address, 1);
-	}
-}

src/programs/words.c

@@ -1,217 +0,0 @@
-// Pseudo-random word generation program
-// Author: xamidev
-// Licensed under the Unlicense. See the repo below.
-// https://github.com/xamidev/blankos
-
-#include "../libc/stdio.h"
-#include "../libc/crypto.h"
-#include "../kernel/system.h"
-#include "../libc/string.h"
-
-// Small dictionary
-
-char* words[] =
-{
-	// A
-	"I", "us", "they", "my",
-	"a", "an", "is", "are", "for", "while", "not", "none", "yes", "no",
-	"absolutely", "addition", "additive", "afternoon", "architect", "ask",
-	"ability", "above", "absence", "academy", "account", "achieve", "acquire",
-	"adapt", "admit", "adventure", "affection", "agenda", "agreement", "airport",
-	"alert", "alibi", "alive", "allow", "almond", "alphabet", "always",
-
-	// B
-	"be", "blindfold", "brilliant", "boy", "bring", "buddy",
-	"balance", "bamboo", "band", "banjo", "bank", "banner", "barrel",
-	"basic", "battery", "beach", "beacon", "beard", "behavior", "believe",
-	"belt", "benefit", "berry", "bicycle", "bingo", "biology", "birthday",
-	"biscuit", "bitter", "blanket", "blizzard", "blossom", "blueprint", "board",
-
-	// C
-	"career", "caterpillar", "change", "cheeky", "chop",
-	"cabin", "cactus", "camera", "candle", "candy", "canoe", "canvas",
-	"capital", "captain", "caravan", "carbon", "carpet", "cartoon", "castle",
-	"casual", "catalog", "catch", "category", "celebrate", "ceremony", "certain",
-	"chain", "chair", "chamber", "charge", "charity", "cheese", "chef",
-
-	// D
-	"decide", "demonstrate", "draw", "druggist",
-	"daisy", "dance", "danger", "daring", "database", "debate", "decade",
-	"decline", "decorate", "decrease", "dedicate", "defeat", "defend", "define",
-	"degree", "delight", "delivery", "demand", "dentist", "deny", "depart",
-	"depth", "describe", "deserve", "desire", "destroy", "develop", "device",
-
-	// E
-	"eagle", "ear", "effort", "evening",
-	"early", "earn", "earth", "ease", "east", "easy", "echo",
-	"eclipse", "economy", "edge", "edit", "educate", "effect", "effort",
-	"egg", "eight", "either", "elder", "elect", "elegant", "element",
-	"elephant", "elevator", "elite", "embark", "embrace", "emerge", "emotion",
-
-	// F
-	"fabric", "famous", "fuse",
-	"face", "factor", "fail", "fair", "fall", "false", "fame",
-	"family", "fancy", "fantasy", "farewell", "farm", "fashion", "fast",
-	"fault", "favor", "feather", "feature", "federal", "feedback", "feeling",
-	"female", "fence", "festival", "fever", "fiber", "fiction", "field",
-
-	// G
-	"generation", "generous", "girl", "gypsy", "grip",
-	"gallery", "game", "garage", "garden", "garlic", "gas", "gate",
-	"gather", "general", "genius", "gentle", "genuine", "geography", "gesture",
-	"ghost", "giant", "gift", "giggle", "ginger", "giraffe", "glance",
-	"glass", "globe", "glory", "glove", "glue", "goal", "gold",
-
-	// H
-	"habit", "handsome", "helmet", "help", "horror",
-	"hair", "half", "hammer", "hand", "handle", "hang", "happen",
-	"harbor", "hard", "harm", "harvest", "hat", "hate", "have",
-	"head", "health", "heart", "heat", "heaven", "heavy", "hedge",
-	"height", "hello", "heritage", "hero", "hesitate", "hidden", "high",
-
-	// I
-	"insist", "inventor", "itself", "ivory",
-	"ice", "idea", "ideal", "identify", "ignore", "ill", "image",
-	"imagine", "impact", "import", "impress", "improve", "impulse", "inch",
-	"include", "income", "increase", "index", "industry", "infant", "inform",
-	"insect", "inside", "inspire", "install", "instead", "insult", "intact",
-
-	// J
-	"jog", "joint", "joke", "judge",
-	"jacket", "jaguar", "jail", "jam", "january", "jar", "jazz",
-	"jealous", "jeans", "jelly", "jewel", "job", "join", "journey",
-	"joy", "judge", "juice", "jump", "jungle", "junior", "justice",
-	"just", "justify", "juggle", "juice", "jumper", "junction", "jury",
-
-	// K
-	"karate", "kebab", "kitchen",
-	"kangaroo", "keen", "keep", "kettle", "key", "keyboard", "kick",
-	"kid", "kidney", "king", "kiss", "kite", "knee", "knife",
-	"knit", "knock", "knot", "know", "knowledge", "koala", "kudos",
-	"keen", "kernel", "kit", "kitten", "knack", "knight", "knock",
-
-	// L
-	"lamb", "lawnmower", "left", "lock",
-	"label", "labor", "lace", "ladder", "lady", "lake", "lamp",
-	"land", "language", "large", "laser", "last", "later", "laugh",
-	"launch", "law", "layer", "lead", "leaf", "learn", "least",
-	"leather", "leave", "lecture", "legal", "legend", "lemon", "length",
-
-	// M
-	"math", "medicine", "most",
-	"machine", "magnet", "mail", "main", "major", "make", "male",
-	"manage", "mango", "manner", "manual", "map", "marble", "march",
-	"mark", "market", "marriage", "master", "match", "material", "matter",
-	"maximum", "mayor", "meal", "mean", "measure", "media", "memory",
-
-	// N
-	"noodles", "nowadays", "nowhere",
-	"nail", "name", "narrow", "nation", "native", "nature", "navy",
-	"near", "neat", "necessary", "neck", "need", "negative", "neglect",
-	"neither", "nerve", "nest", "net", "network", "neutral", "never",
-	"new", "news", "next", "nice", "night", "noble", "noise",
-
-	// O
-	"ocean", "older", "ounce",
-	"object", "observe", "obtain", "occasion", "occupy", "occur", "ocean",
-	"offer", "office", "often", "oil", "old", "olive", "olympic",
-	"omit", "once", "one", "onion", "online", "only", "open",
-	"opera", "opinion", "oppose", "option", "orange", "orbit", "order",
-
-	// P
-	"part", "pathetic", "pastime",
-	"pace", "package", "page", "pain", "paint", "pair", "palm",
-	"panel", "panic", "paper", "parent", "park", "part", "party",
-	"pass", "path", "patient", "pattern", "pause", "peace", "peak",
-	"pen", "pencil", "people", "pepper", "perfect", "perform", "permit",
-
-	// Q
-	"quite", "quits", "quotation",
-	"quality", "quantity", "quarter", "queen", "query", "quest", "quick",
-	"quiet", "quilt", "quit", "quote", "quiz", "quota", "quiver",
-	"quirky", "quaint", "quake", "qualification", "qualify", "quark", "quartz",
-	"queue", "quench", "question", "quote", "quiver", "quorum", "quote",
-
-	// R
-	"race", "raise", "reality",
-	"rabbit", "race", "radio", "rain", "raise", "random", "range",
-	"rapid", "rare", "rate", "rather", "ratio", "reach", "react",
-	"read", "ready", "real", "reason", "rebel", "recall", "receive",
-	"recipe", "record", "recover", "reduce", "refer", "reflect", "reform",
-
-	// S
-	"safe", "scare", "screen",
-	"sack", "sail", "salad", "salt", "same", "sample", "sand",
-	"save", "scale", "scan", "scar", "scene", "school", "science",
-	"score", "scratch", "scream", "screen", "script", "search", "season",
-	"seat", "second", "secret", "section", "secure", "see", "seed",
-
-	// T
-	"taught", "temple", "that", "this",
-	"table", "tackle", "tail", "take", "tale", "talent", "talk",
-	"tank", "tape", "target", "task", "taste", "tax", "teach",
-	"team", "tear", "technology", "telephone", "television", "temperature", "tend",
-	"tennis", "tent", "term", "test", "text", "thank", "theory",
-
-	// U
-	"unable", "unkind", "usual",
-	"umbrella", "unable", "uncle", "under", "undo", "unfair", "unfold",
-	"union", "unique", "unit", "universe", "unknown", "unless", "unlike",
-	"unlock", "until", "unusual", "update", "upgrade", "upon", "upper",
-	"upset", "urban", "urge", "use", "usual", "utility", "utter",
-
-	// V
-	"velvet", "vivid", "vote",
-	"vacuum", "valid", "valley", "value", "vampire", "van", "vase",
-	"vast", "vault", "vector", "vehicle", "velvet", "vendor", "venture",
-	"verb", "verify", "version", "vessel", "veteran", "veto", "vibrate",
-	"victory", "video", "view", "village", "violin", "virtue", "virus",
-
-	// W
-	"we", "warm", "watch",
-	"wage", "wait", "walk", "wall", "wander", "want", "war",
-	"wash", "waste", "watch", "water", "wave", "way", "wealth",
-	"weapon", "wear", "weather", "weave", "wedding", "week", "weight",
-	"welcome", "well", "west", "wheel", "when", "whisper", "white",
-
-	// X
-	"xylophone",
-	"xenon", "xenophobia", "xerox", "xmas", "x-ray", "xylophone", "xylem",
-
-	// Y
-	"yolk", "young", "your",
-	"yard", "yarn", "year", "yell", "yellow", "yes", "yesterday",
-	"yet", "yield", "yogurt", "yoke", "youth", "yawn", "yearn",
-	"yacht", "yummy", "yogurt", "yoga", "yardstick", "yonder", "yummy",
-
-	// Z
-	"zebra", "zodiac", "zucchini",
-	"zero", "zone", "zoo", "zoom", "zeal", "zip", "zigzag",
-	"zenith", "zest", "zipper", "zombie", "zonal", "zinc", "zephyr"
-};
-
-int words_size = sizeof(words)/sizeof(words[0]);
-
-// Generates random words
-void program_words(int argc, char* argv[])
-{
-	int amount;
-
-	if (argc == 1)
-	{
-		amount = 10;
-	} else if (argc == 2)
-	{
-		amount = atoi(argv[1]);
-	}
-
-	for (int i=0; i<amount; i++)
-	{
-		int random = randint(global_ticks);
-		char* word = words[random%words_size];
-		//printf("Global ticks: %d\nRandom integer: %d\nWord: %s\n", global_ticks, random, word);
-		printf("%s ", word);
-		delay(10);
-	}
-	puts("\n");
-}