Started making an ASCII font

Changed __uitoa order of arguments from
  src,base,target
to
  src,target,base
Also returns target in EAX

.gitignore

@@ -1,5 +1,8 @@
 *.elf
 *.o
 *.img
+*.bin
 mnt/
 build/
+bx_enh_dbg.ini
+serial.out

Makefile

@@ -1,27 +1,46 @@
-all: build/kernel-i386.elf
+all: start32.bin
 clean:
-	-@rm build/*.o build/*.elf 2> /dev/null || true
+	-@rm *.bin 2> /dev/null || true
 
-build/start32.o: build/ src/start32.asm
-	nasm -felf32 src/start32.asm -o build/start32.o
-build/kernel-i386.elf: build/start32.o
-	tcc -m32 -nostdlib -Wl,-Ttext,0x100000 -o build/kernel-i386.elf src/*.c build/start32.o
-image: build/kernel-i386.elf mount
-	cp build/kernel-i386.elf mnt/
+start32.bin: src/*
+	fasm src/start32.asm start32.bin
+image: start32.bin mount grub-cfg roska.img mnt/roska/
+	cp start32.bin mnt/roska/
 	sync
 
-qemu-multiboot: build/kernel-i386.elf
-	qemu-system-i386 -kernel build/kernel-i386.elf -serial stdio
-qemu-image: image
-	qemu-system-i386 koalemos.img -serial stdio
-
-mount: koalemos.img mnt/
+qemu-run: image roska.img
+	qemu-system-i386 roska.img -serial stdio
+bochs-run: image roska.img
+	touch serial.out
+	bochs -qf bochsrc.txt
+mount: roska.img mnt/
 	@if ! mountpoint -q "mnt/"; then \
-		sudo mount -o loop,offset=1048576,umask=177,dmask=022,uid=$(shell id -u),gid=$(shell id -g) koalemos.img mnt/; \
+		sudo mount -o loop,offset=1048576,umask=177,dmask=022,uid=$(shell id -u),gid=$(shell id -g) roska.img mnt/; \
 	fi;
 umount:
-	@sudo umount mnt
+	@if mountpoint -q "mnt/"; then \
+		sudo umount mnt/; \
+	fi;
 mnt/:
-	@mkdir mnt
+	@mkdir -p mnt
+mnt/roska/: mount roska.img
+	@mkdir -p mnt/roska
 build/:
 	@mkdir build
+
+roska.img: mnt/
+	dd if=/dev/zero of=roska.img bs=1k count=16128
+	echo 'type=83' | sudo sfdisk roska.img
+	sudo losetup /dev/loop0 roska.img
+	sudo losetup /dev/loop1 roska.img -o1048576
+	sudo mkdosfs -F32 -f 2 /dev/loop1
+	sudo mount /dev/loop1 mnt/
+	sudo grub-install --target=i386-pc --root-directory=mnt --boot-directory=mnt/boot --no-floppy --modules="normal part_msdos multiboot" /dev/loop0
+	sudo umount mnt/
+	sudo losetup -d /dev/loop1
+	sudo losetup -d /dev/loop0
+grub-cfg: grub.cfg mount
+	cp grub.cfg mnt/boot/grub/grub.cfg
+lo-unsetup: umount
+	sudo losetup -d /dev/loop1
+	sudo losetup -d /dev/loop0

README.md

@@ -1,9 +1,11 @@
-# KoalemOS
-Multiboot compatible stupid useless OS-like project.
+# rOSka
+Multiboot compatible stupid useless OS-like project that is literally trash.
 ## Compatibility
-32bit x86 legacy BIOS system
+- 32bit x86 compatible CPU required
+- Booting is done with a MultiBoot compatible bootloader (for example Grub)
+- Linear framebuffer graphics with 8bits per channel (any 8bit divisible
+  bitdepth should work but is undefined behaviour, probably funny colours lol)
+- At some point tested with an old Pentium III (legacy BIOS) and a Ryzen 7 in
+  EFI mode. Currently aiming to support both systems.
 ## Building
-NASM and TinyCCompiler are used.
-TCC might need manual compilation for 32bit crosscompilation
-on 64bit systems.
-Just download the source and `make cross` or something.
+FASM is used as the assembler.

bochsrc.txt

@@ -0,0 +1,14 @@
+display_library:	x, options="gui_debug"
+magic_break:	enabled=1
+romimage:	file=$BXSHARE/BIOS-bochs-legacy
+vgaromimage:	file=$BXSHARE/VGABIOS-lgpl-latest
+clock:	sync=realtime
+cpu:	ips=4294967295, reset_on_triple_fault=false
+megs:	128
+ata0:	enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
+ata0-master:	type=disk, mode=flat, path=roska.img, cylinders=32, heads=16, spt=63
+boot:	disk
+
+# Use `bximage` to get disk geometry
+# Serial is piped to serial.out for your `tail`ing sweetness
+com1:	enabled=1, mode=file, dev=serial.out

grub.cfg

@@ -0,0 +1,3 @@
+menuentry "rOSka" {
+   multiboot /roska/start32.bin
+}

src/font.asm

@@ -0,0 +1,89 @@
+;;; Resolution: 8x16
+kfontbasicascii:
+	;; 0	NULL
+	db 11001100b
+	db 11001100b
+	db 00110011b
+	db 00110011b
+	db 11001100b
+	db 11001100b
+	db 00110011b
+	db 00110011b
+	db 11001100b
+	db 11001100b
+	db 00110011b
+	db 00110011b
+	db 11001100b
+	db 11001100b
+	db 00110011b
+	db 00110011b
+	;; 1-31 control characters
+	rb 30*16
+	;; 32	Space
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	;; 33	!
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00011000b
+	db 00011000b
+	db 00011000b
+	db 00011000b
+	db 00011000b
+	db 00011000b
+	db 00011000b
+	db 00011000b
+	db 00000000b
+	db 00000000b
+	db 00011000b
+	db 00011000b
+	db 00000000b
+	;; 34	"
+	db 00000000b
+	db 01100110b
+	db 01100110b
+	db 01100110b
+	db 01100110b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	;; 35	#
+	db 00000000b
+	db 00000000b
+	db 00000000b
+	db 01100110b
+	db 01100110b
+	db 11111111b
+	db 11111111b
+	db 01100110b
+	db 01100110b
+	db 11111111b
+	db 11111111b
+	db 01100110b
+	db 01100110b
+	db 00000000b
+	db 00000000b
+	db 00000000b

src/framebuffer.asm

@@ -0,0 +1,72 @@
+macro kputpixel x*, y*, r*, g*, b* {
+	push b		;b
+	push g		;g
+	push r		;r
+	push y		;y
+	push x		;x
+	call putpixel
+	add esp, 4*5
+}
+
+;; x, y, r, g, b
+putpixel:
+	push ebp
+	mov ebp, esp
+
+	push ebx
+	push edi
+
+	; check pixel is in screen
+	mov ebx, [ebp+12]	;y
+	cmp ebx, [mbootinfo.fb_height]
+	jge .done
+	mov ecx, [ebp+8]	;x
+	cmp ecx, [mbootinfo.fb_width]
+	jge .done
+
+	; Destination
+	mov edi, [mbootinfo.fb_addr]
+	mov eax, [mbootinfo.fb_pitch]
+	mul dword ebx   ;y
+	add edi, eax
+
+	mov eax, ecx   ;x
+	movzx ecx, byte [mbootinfo.fb_bytespp]
+	mul ecx
+	add edi, eax
+
+
+
+	; Poke videomemory
+	xor eax, eax
+	mov ebx, [ebp+16]
+	mov cl, [mbootinfo.fb_rpos]
+	shl ebx, cl
+	or eax, ebx
+
+	mov ebx, [ebp+20]
+	mov cl, [mbootinfo.fb_gpos]
+	shl ebx, cl
+	or eax, ebx
+
+	mov ebx, [ebp+24]
+	mov cl, [mbootinfo.fb_bpos]
+	shl ebx, cl
+	or eax, ebx
+
+	cmp [mbootinfo.fb_bpp], 32
+	jne .bpp24
+	stosd
+	jmp .done
+.bpp24:
+	stosb
+	shr eax, 8
+	stosb
+	shr eax, 8
+	stosb
+.done:
+	pop edi
+	pop ebx
+
+	pop ebp
+	ret

src/framebuffer.c

@@ -1,24 +0,0 @@
-#include "framebuffer.h"
-
-static unsigned long fb_address;
-static unsigned long fb_pitch;
-static unsigned short fb_width, fb_height;
-static unsigned char fb_bpp, fb_bytespp;
-static unsigned char fb_rpos, fb_bpos, fb_gpos;
-
-void initfb(unsigned long addr, unsigned short w, unsigned short h, unsigned char bpp, unsigned long pitch, unsigned char rpos, unsigned char gpos, unsigned char bpos) {
-	fb_address = addr;
-	fb_pitch = pitch;
-	fb_width = w;
-	fb_height = h;
-	fb_bpp = bpp;
-	fb_bytespp = bpp/8;
-	fb_rpos = rpos;
-	fb_gpos = gpos;
-	fb_bpos = bpos;
-}
-
-void putpixel(unsigned short x, unsigned short y, unsigned char r, unsigned char g, unsigned char b, unsigned char a) {
-	if (x>fb_width || y> fb_height) return;
-	*((unsigned long *)(fb_address + y*fb_pitch + x*fb_bytespp)) = r<<fb_rpos | g<<fb_gpos | b<<fb_bpos;
-}

src/framebuffer.h

@@ -1,7 +0,0 @@
-#ifndef _FRAMEBUFFER_H
-#define _FRAMEBUFFER_H 1
-
-void initfb(unsigned long addr, unsigned short w, unsigned short h, unsigned char bpp, unsigned long pitch, unsigned char rpos, unsigned char gpos, unsigned char bpos);
-void putpixel(unsigned short x, unsigned short y,  unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-
-#endif

src/itoa.asm

@@ -0,0 +1,109 @@
+;; Modified from: https://gist.github.com/SplittyDev/8e728627012e57ac0deac196660014fb
+
+; __itoa(src int, target addr, base)
+;target address returned in EAX
+;EBX, EBP, ESP preserved as our calling convention,
+;refer to docs or something
+
+;
+; Routine to convert a 32-bit integer to a string.
+;
+; EAX: Source integer
+; EBX: Target address
+; ECX: Base
+;
+; Internal register layout:
+; start:
+; EAX: Source integer
+; ECX: Target address
+; EDX: Base
+; checknegative:
+; EAX: Source integer
+; EBX: Target address (original)
+; ECX: Target address (active)
+; divrem:
+; EAX: Source integer
+; ECX: Target address (active)
+; EDX: Base / Result
+; reverse:
+; EBX: Target address (original)
+; ECX: Target address (active)
+; EDX: Target address (temporary)
+;
+; return:
+; put original target at EAX
+; (we trust this blindly)
+
+macro kuitoa src*, dest*, base* {
+	push base
+	push dest
+	push src
+	call __uitoa
+	add esp, 3*4
+}
+
+__uitoa:
+.start:
+	push ebp
+	mov ebp, esp
+
+	push ebx
+
+	mov eax, [ebp+8]
+	mov ebx, [ebp+12]
+	mov ecx, [ebp+16]
+
+	mov edx, ecx
+	mov ecx, ebx
+;.checknegative:
+;    test eax, eax
+;    jns .divrem
+;    mov byte [ecx], 0x2D
+;    inc ecx
+;    mov ebx, ecx
+;    neg eax
+.divrem:
+	push edx
+	push ecx
+	mov ecx, edx
+	xor edx, edx
+	div ecx
+	mov byte dl, [__itoacvt + edx]
+	pop ecx
+	mov byte [ecx], dl
+	pop edx
+	inc ecx
+	cmp eax, 0x00
+	jne .divrem
+	mov byte [ecx], 0x00
+	dec ecx
+.reverse:
+	cmp ebx, ecx
+	jge .end
+	mov byte dl, [ebx]
+	mov byte al, [ecx]
+	mov byte [ebx], al
+	mov byte [ecx], dl
+	inc ebx
+	dec ecx
+	jmp .reverse
+.end:
+	pop ebx
+
+	mov eax, [ebp+12]	; Return target address
+	pop ebp
+	ret
+
+;
+; Conversion table for __itoa.
+; Works for bases [2 ... 36].
+;
+__itoacvt:
+	db '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+;
+; Buffer to store the result of __itoa in.
+;
+align 64
+__itoabuf32:
+	rb 36

src/kernel.c

@@ -1,83 +0,0 @@
-#include "multiboot.h"
-#include "framebuffer.h"
-#include "serial.h"
-#include "xtoa.h"
-
-static inline void outb(unsigned short port, unsigned char val) {
-	asm volatile ("outb %0, %1" : : "a"(val), "Nd"(port) : "memory");
-}
-static inline unsigned char inb(unsigned short port) {
-	unsigned char ret;
-	asm volatile("inb %1, %0" : "=a"(ret) : "Nd"(port) : "memory");
-	return ret;
-}
-
-void kmain (unsigned int mbootmagick, multiboot_info_t* mbootinfo) {
-
-	// Cursor disabling
-	outb(0x3D4, 0x0A);
-	outb(0x3D5, 0x20);
-
-	int serial_initialized = serial_init();
-	serial_write_string("\n=== KoalemOS ===\n");
-
-	// Check multiboot header
-	if (mbootmagick != MULTIBOOT_BOOTLOADER_MAGIC) {
-		return;
-	}
-
-	serial_write_string("\nMultiboot flags: ");
-	serial_write_string(itoa(mbootinfo->flags, 2));
-
-	// Check videomode
-	if (mbootinfo->flags & MULTIBOOT_INFO_VBE_INFO) {
-		serial_write_string("\nVBE Mode: 0x");
-		serial_write_string(itoa(mbootinfo->vbe_mode, 16));
-	}
-
-	if (!(mbootinfo->flags & MULTIBOOT_INFO_FRAMEBUFFER_INFO)) {
-		serial_write_string("\nVideo info not available");
-		return;
-	}
-
-	serial_write_string("\nFramebuffer: ");
-	serial_write_string("\n  Address: 0x");
-	serial_write_string(ultoa(mbootinfo->framebuffer_addr, 16));
-
-	serial_write_string("\n  Dimensions: ");
-	serial_write_string(itoa(mbootinfo->framebuffer_width, 10));
-	serial_write_string("X");
-	serial_write_string(itoa(mbootinfo->framebuffer_height, 10));
-	serial_write_string("x");
-	serial_write_string(itoa(mbootinfo->framebuffer_bpp, 10));
-	serial_write_string("\n  Pitch: ");
-	serial_write_string(itoa(mbootinfo->framebuffer_pitch, 10));
-	serial_write_string("\n  RPos:");
-	serial_write_string(itoa(mbootinfo->framebuffer_red_field_position, 10));
-	serial_write_string("\n  GPos:");
-	serial_write_string(itoa(mbootinfo->framebuffer_green_field_position, 10));
-	serial_write_string("\n  BPos:");
-	serial_write_string(itoa(mbootinfo->framebuffer_blue_field_position, 10));
-
-	serial_write_string("\nMemory: ");
-	serial_write_string("\n  lower: ");
-	serial_write_string(uitoa(mbootinfo->mem_lower, 10));
-	serial_write_string(" k");
-	serial_write_string("\n  upper: ");
-	serial_write_string(uitoa(mbootinfo->mem_upper/1024, 10));
-	serial_write_string(" M");
-
-	initfb(mbootinfo->framebuffer_addr, mbootinfo->framebuffer_width, mbootinfo->framebuffer_height, mbootinfo->framebuffer_bpp, mbootinfo->framebuffer_pitch, mbootinfo->framebuffer_red_field_position, mbootinfo->framebuffer_green_field_position, mbootinfo->framebuffer_blue_field_position);
-	int x, y, i;
-	unsigned char c = 0;
-	for(;;) {
-		for(y=0; y < mbootinfo->framebuffer_height; y++) {
-			for(x=0; x < mbootinfo->framebuffer_width; x++) {
-				putpixel(x, y, c, c, c, 0xff);
-			}
-		}
-		c+=4;
-	}
-
-	serial_write_string("\nExecution finished, halting...");
-}

src/mbootinfo.asm

@@ -0,0 +1,119 @@
+mbootgetinfo:
+	push ebp
+	mov ebp, esp
+	push esi
+	push edi
+	cld
+
+	mov eax, [ebp+8]
+	cmp eax, 0x2badb002
+	jne mbootnomagic
+
+	mov edx, [ebp+12]
+	mov eax, [edx]
+	mov [mbootinfo.flags], eax
+
+	;; Get memoryinformation
+	test eax, 1b
+	jz mbootnomeminfo
+	mov eax, [edx+4]
+	mov [mbootinfo.mem_lower], eax
+	mov eax, [edx+8]
+	mov [mbootinfo.mem_upper], eax
+
+	;; Get videoinformation
+	test [mbootinfo.flags], (1 shl 02)
+	jz mbootnovideoinfo
+
+	mov esi, edx
+	add esi, 88
+	mov eax, [esi]
+	mov [mbootinfo.fb_addr], eax
+	add esi, 8
+
+	mov eax, [esi]
+	mov [mbootinfo.fb_pitch], eax
+	add esi, 4
+
+	mov eax, [esi]
+	mov [mbootinfo.fb_width], eax
+	add esi, 4
+
+	mov eax, [esi]
+	mov [mbootinfo.fb_height], eax
+	add esi, 4
+
+	mov al, [esi]
+	mov [mbootinfo.fb_bpp], al
+	inc esi
+
+	mov al, [esi]
+	cmp al, 1
+	jne mbootunsupportedfbtype
+	mov [mbootinfo.fb_type], al
+	inc esi
+
+	;garbage?
+	add esi, 2
+	;; r/g/b positions and masks
+	mov ecx, 6
+	mov edi, mbootinfo.fb_rpos
+	rep movsb
+
+.bytesppcalc:
+	xor eax, eax
+	mov al, [mbootinfo.fb_bpp]
+	mov edx, 8
+	div dl
+	mov [mbootinfo.fb_bytespp], al
+.done:
+	pop edi
+	pop esi
+	pop ebp
+	ret
+
+
+mbootnomagic:
+	push .msg
+	call serialwrite
+	jmp hang
+.msg db "No multiboot magic!", 10, 0
+mbootnomeminfo:
+	push .msg
+	call serialwrite
+	jmp hang
+.msg db "No memoryinfo!", 10, 0
+mbootnovideoinfo:
+	push .msg
+	call serialwrite
+	jmp hang
+.msg db "No videoryinfo!", 10, 0
+mbootunsupportedfbtype:
+	push .msg
+	call serialwrite
+	jmp hang
+.msg db "Unsupported framebuffer type: only direct RGB is supported!", 10, 0
+mbootunsupportedfbbpp:
+	push .msg
+	call serialwrite
+	jmp hang
+.msg db "Unsupported bitdepth: only 24 and 32 bpp supported!", 10, 0
+
+
+mbootinfo:
+	.flags dd 0
+	.mem_lower dd 0
+	.mem_upper dd 0
+	.fb_addr dd 0
+	.fb_pitch dd 0
+	.fb_width dd 0
+	.fb_height dd 0
+	.fb_bpp db 0
+	.fb_type db 0
+	.fb_rpos db 0
+	.fb_rmasksize db 0
+	.fb_gpos db 0
+	.fb_gmasksize db 0
+	.fb_bpos db 0
+	.fb_bmasksize db 0
+	.fb_bytespp db 0

src/multiboot.h

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

src/roskalogoraw.asm

@@ -0,0 +1,32 @@
+jmp roskalogofileskip
+roskalogo:
+	db 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff
+	db 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	db 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff
+	db 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff
+	.w db 84
+	.h db 27
+roskalogofileskip:

src/serial.asm

@@ -0,0 +1,90 @@
+SERIAL_PORT equ 0x3f8
+serialinitialized db 0
+
+; Write null terminated string in address str_pointer to serial
+macro serw [str_pointer*] {
+	push str_pointer
+	call serialwrite
+	add esp, 4
+}
+
+serialinit:
+	;Disable ints
+	mov dx, SERIAL_PORT+1
+	mov al, 0x00
+	out dx, al
+
+	;Enable DLAB baud divisor and set 3 (38400 baud)
+	mov al, 0x80
+	mov dx, SERIAL_PORT+3
+	out dx, al
+	;Baud divisor lo byte
+	mov al, 0x03
+	mov dx, SERIAL_PORT
+	out dx, al
+	;Baud divisor hi byte
+	mov al, 0x00
+	mov dx, SERIAL_PORT+1
+	out dx, al
+
+	;8bits, no parity, one stop bit
+	mov al, 0x03
+	mov dx, SERIAL_PORT+3
+	out dx, al
+
+	;Enable+clear FIFO, 14-byte threshold
+	mov al, 0xc7
+	mov dx, SERIAL_PORT+2
+	out dx, al
+
+	;IRQs enabled, RTS/DSR set
+	mov al, 0x0b
+	mov dx, SERIAL_PORT+4
+	out dx, al
+
+	;Set loopback for test purposes
+	mov al, 0x1e
+	out dx, al
+
+	;; Check if serial is workie
+	mov al, 0xae
+	mov dx, SERIAL_PORT
+	out dx, al
+	in al, dx
+	cmp al, 0xae
+	jne .end
+	;; Set serial to normal operation
+	mov dx, SERIAL_PORT+4
+	mov al, 0x0f
+	out dx, al
+	mov [serialinitialized], 1
+.end:
+	ret
+.errormsg db "Serial init failed", 0
+
+serialwrite:
+	cmp [serialinitialized], 0
+	je .notinitialized
+	push ebp
+	mov ebp, esp
+	push esi
+	cld
+	mov esi, [ebp+8]
+.loop:
+	mov dx, SERIAL_PORT+5
+.wait:
+	in al, dx
+	and al, 0x20
+	jz .wait
+	lodsb
+	or al, al
+	jz .done
+	mov dx, SERIAL_PORT
+	out dx, al
+	jmp .loop
+.done:
+	pop esi
+	pop ebp
+	ret
+.notinitialized:
+	ret

src/serial.c

@@ -1,49 +0,0 @@
-#include "serial.h"
-#define PORT 0x3f8 // COM1
-
-static inline void outb(unsigned short port, unsigned char val) {
-	asm volatile ("outb %0, %1" : : "a"(val), "Nd"(port) : "memory");
-}
-static inline unsigned char inb(unsigned short port) {
-	unsigned char ret;
-	asm volatile("inb %1, %0" : "=a"(ret) : "Nd"(port) : "memory");
-	return ret;
-}
-
-int serial_init() {
-	outb(PORT + 1, 0x00); // Disable all interrupts
-	outb(PORT + 3, 0x80); // Enable DLAB (set baud rate divisor)
-	outb(PORT + 0, 0x03); // Set divisor to 3 (lo byte) 38400 baud
-	outb(PORT + 1, 0x00); //                  (hi byte)
-	outb(PORT + 3, 0x03); // 8 bits, no parity, one stop bit
-	outb(PORT + 2, 0xC7); // Enable FIFO, clear them, with 14-byte threshold
-	outb(PORT + 4, 0x0B); // IRQs enabled, RTS/DSR set
-	outb(PORT + 4, 0x1E); // Set in loopback mode, test the serial chip
-	outb(PORT + 0, 0xAE); // Test serial chip (send byte 0xAE and check if serial
-		// returns same byte)
-
-		// Check if serial is faulty (i.e: not same byte as sent)
-		if (inb(PORT + 0) != 0xAE) {
-			return 1;
-		}
-
-		// If serial is not faulty set it in normal operation mode
-		// (not-loopback with IRQs enabled and OUT#1 and OUT#2 bits enabled)
-		outb(PORT + 4, 0x0F);
-		return 0;
-	}
-	static int serial_is_transmit_empty() { return inb(PORT + 5) & 0x20; }
-
-	static void serial_write_char(char chr) {
-		while (serial_is_transmit_empty() == 0);
-		outb(PORT, chr);
-	}
-	
-	void serial_write_string(const char* text) {
-		int i = 0;
-		while(text[i]) {
-			serial_write_char(text[i]);
-			i++;
-		}
-
-	}

src/serial.h

@@ -1,7 +0,0 @@
-#ifndef HEADER_SERIAL
-#define HEADER_SERIAL
-
-int serial_init(void);
-void serial_write_string(const char* text);
-
-#endif

src/start32.asm

@@ -1,47 +1,162 @@
-MULTIBOOT_HEADER_MAGIC      equ 0x1BADB002
-MULTIBOOT_PAGE_ALIGN        equ 1 << 0
-MULTIBOOT_MEMORY_INFO       equ 1 << 1
-MULTIBOOT_VIDEO_REQUEST     equ 0 << 2
-MULTIBOOT_AOUT_KLUDGE       equ 0 << 16
-MULTIBOOT_HEADER_FLAGS      equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_REQUEST
-MULTIBOOT_HEADER_FLAGS      equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_REQUEST | MULTIBOOT_AOUT_KLUDGE
-MULTIBOOT_CHECKSUM          equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
+format binary
+use32
+org 0x100000
 
-section .multiboot
-align 4
-	dd MULTIBOOT_HEADER_MAGIC
-	dd MULTIBOOT_HEADER_FLAGS
-	dd MULTIBOOT_CHECKSUM
-	dd 0	; header address
-	dd 0	; load address
-	dd 0	; load end address
-	dd 0	; bss end address
-	dd 0	; entry address
+MB_HEADER_MAGIC      equ 0x1BADB002
+MB_PAGE_ALIGN        equ (1 shl 0)
+MB_MEMORY_INFO       equ (1 shl 1)
+MB_VIDEO_REQUEST     equ (1 shl 2)
+MB_AOUT_KLUDGE       equ (1 shl 16)
+MB_HEADER_FLAGS      equ MB_PAGE_ALIGN or MB_MEMORY_INFO or MB_VIDEO_REQUEST
+MB_HEADER_FLAGS      equ MB_PAGE_ALIGN or MB_MEMORY_INFO or MB_VIDEO_REQUEST or MB_AOUT_KLUDGE
+MB_CHECKSUM          equ -(MB_HEADER_MAGIC + MB_HEADER_FLAGS)
+
+VWIDTH  equ 640
+VHEIGHT equ 480
+VDEPTH  equ 32
+
+multiboot:
+	dd MB_HEADER_MAGIC
+	dd MB_HEADER_FLAGS
+	dd MB_CHECKSUM
+	dd multiboot	; header address
+	dd 0x100000	; load address
+	dd bss_start	; load end address
+	dd bss_end	; bss end address
+	dd start	; entry address
 	dd 0	; video mode_type (0:fb, 1:txt) (set flags[2]!)
-	dd 1024	; video width
-	dd 768	; video height
-	dd 32	; video depth
+	dd VWIDTH	; video width
+	dd VHEIGHT	; video height
+	dd VDEPTH	; video depth
 
-section .bss
-align 16
-	stack_bottom:
-	resb 16384
-	stack_top:
+; Includes yayyy
+include "src/serial.asm"
+include "src/mbootinfo.asm"
+include "src/itoa.asm"
+include "src/framebuffer.asm"
+include "src/roskalogoraw.asm"
 
-section .text
-	global  _start
-	extern   kmain
-
-_start:
+start:
 	; Setup stack
+	mov ebp, stack_top
 	mov esp, stack_top
 
-	; Call the main kernel function.
 	push ebx
 	push eax
-	call kmain
 
-.hang:
+	call serialinit
+
+	serw stuff.bootmsg
+
+	call mbootgetinfo
+	add esp, 2*4
+
+	sub esp, 36	;Reserve stack for return
+	mov ebx, esp	;Store str buff addr
+
+	kuitoa [mbootinfo.fb_addr], ebx, 16
+	serw stuff.fbaddrmsgpfx, ebx
+
+	kuitoa [mbootinfo.fb_width], ebx, 10
+	serw stuff.fbdimensionsmsgpfx, ebx, stuff.x
+
+	kuitoa [mbootinfo.fb_height], ebx, 10
+	serw ebx, stuff.x
+
+	movzx eax, byte [mbootinfo.fb_bpp]
+	kuitoa eax, ebx, 10
+	serw ebx
+
+
+	movzx eax, byte [mbootinfo.fb_rpos]
+	kuitoa eax, ebx, 10
+	serw stuff.rpostxt, ebx
+
+	movzx eax, byte [mbootinfo.fb_gpos]
+	kuitoa eax, ebx, 10
+	serw stuff.gpostxt, ebx
+
+	movzx eax, byte [mbootinfo.fb_bpos]
+	kuitoa eax, ebx, 10
+	serw stuff.bpostxt, ebx
+
+
+	movzx eax, byte [mbootinfo.fb_rmasksize]
+	kuitoa eax, ebx, 10
+	serw stuff.rmasksizetxt, ebx
+
+	movzx eax, byte [mbootinfo.fb_gmasksize]
+	kuitoa eax, ebx, 10
+	serw stuff.gmasksizetxt, ebx
+
+	movzx eax, byte [mbootinfo.fb_bmasksize]
+	kuitoa eax, ebx, 10
+	serw stuff.bmasksizetxt, ebx
+
+	add esp, 36	;Clean reserved uitoa return string from stack
+
+	; Draw a green test pixel to bottom-right
+	kputpixel VWIDTH-1, VHEIGHT-1, 0x00, 0xff, 0x00
+
+; Draw a predefined logo in magenta to top-left
+rOSkalogodraw:
+	mov esi, roskalogo
+	mov eax, 0	;Brightness
+	mov ebx, 0	;y
+	mov ecx, 0	;x
+.loop:
+	lodsb
+
+	push ecx
+	push eax
+	kputpixel ecx, ebx, eax, 0x00, eax
+	pop eax
+	pop ecx
+
+	inc ecx
+	cmp byte cl, [roskalogo.w]
+	jne .loop
+	mov ecx, 0
+	inc ebx
+	cmp byte bl, [roskalogo.h]
+	jne .loop
+.done:
+jmp hang
+
+
+
+hang:
+	serw .msg
 	cli
+.loop:
 	hlt
-	jmp .hang
+	jmp .loop
+.msg db 10, "Halting...", 10, 0
+
+stuff:
+	.bootmsg db 10, "=== rOSka ===", 10, 0
+	.fbaddrmsgpfx db 10, "Framebuffer address: 0x", 0
+	.fbdimensionsmsgpfx db 10, "Framebuffer dimensions: ", 0
+	.x db "x", 0
+
+
+	.rpostxt db 10, "rPos: ", 0
+	.gpostxt db 10, "gPos: ", 0
+	.bpostxt db 10, "bPos: ", 0
+	.rmasksizetxt db 10, "rMaskSize: ", 0
+	.gmasksizetxt db 10, "gMaskSize: ", 0
+	.bmasksizetxt db 10, "bMaskSize: ", 0
+
+align 4096
+bss_start:
+;align 4096
+;pagedir:
+;	rb 4096
+;align 4096
+;pagetable1:
+;	rb 4096
+align 4096
+stack_bottom:
+rb 16384
+stack_top:
+bss_end:

src/vga.c

@@ -1,97 +0,0 @@
-#include "vga.h"
-#define VGA_WIDTH 80
-#define VGA_HEIGHT 25
-#define VGA_MEM_ADDR 0xb8000
-#define CURSOR_HOME (VGA_HEIGHT-1)*VGA_WIDTH
-#define CURSOR_CHR  177;
-
-unsigned int cursor_loc = CURSOR_HOME;
-unsigned char fgcolor;
-unsigned char bgcolor;
-unsigned short blank;
-
-static unsigned char vga_entry_color(enum vga_color fg, enum vga_color bg) {
-	return fg | bg << 4;
-}
-unsigned short vga_blank_entry() {
-	return vga_entry_color(fgcolor, bgcolor) << 8;
-}
-void draw_cursor(void) {
-	*((unsigned char *)VGA_MEM_ADDR + cursor_loc * 2) = CURSOR_CHR;
-	*((unsigned char *)VGA_MEM_ADDR+1 + cursor_loc * 2) = vga_entry_color(fgcolor, bgcolor);
-}
-
-void vga_set_color(enum vga_color fg, enum vga_color bg) {
-	fgcolor = fg;
-	bgcolor = bg;
-}
-void vga_init(enum vga_color fg, enum vga_color bg) {
-	vga_set_color(fg, bg);
-	blank = vga_blank_entry();
-	cls();
-}
-void cls(void) {
-	int i;
-	for (i=0; i<VGA_HEIGHT*VGA_WIDTH;i++) {
-		*((unsigned short *) VGA_MEM_ADDR+i) = blank;
-	}
-}
-void scroll(void) {
-	int y;
-	int x;
-	*((unsigned short *) VGA_MEM_ADDR+cursor_loc) = blank;
-	for (y=0;y<VGA_HEIGHT;y++) {
-		for (x = 0;x<VGA_WIDTH;x++) {
-			*((unsigned short *) VGA_MEM_ADDR+y*VGA_WIDTH+x) = *((unsigned short *) VGA_MEM_ADDR+(y+1)*VGA_WIDTH+x);
-		}
-	}
-	for (x=0;x<VGA_WIDTH;x++) {
-		*((unsigned short *) VGA_MEM_ADDR+CURSOR_HOME+x) = blank;
-	}
-	cursor_loc = CURSOR_HOME;
-	draw_cursor();
-}
-void putchar(unsigned char chr) {
-	if (chr == '\n') {
-		scroll();
-		return;
-	}
-	*((unsigned char *) VGA_MEM_ADDR+cursor_loc * 2) = chr;
-	*((unsigned char *) VGA_MEM_ADDR+1+cursor_loc * 2) = vga_entry_color(fgcolor, bgcolor);
-	cursor_loc++;
-	if (cursor_loc >= VGA_HEIGHT*VGA_WIDTH) {
-		scroll();
-	}
-	draw_cursor();
-}
-
-void vga_write(const char* text) {
-	int i = 0;
-	while(text[i]) {
-		putchar(text[i]);
-		i++;
-	}
-}
-void vga_write_color( const char* text, enum vga_color fg, enum vga_color bg) {
-	unsigned char prevfg = fgcolor;
-	unsigned char prevbg = bgcolor;
-	vga_set_color(fg, bg);
-	vga_write(text);
-	fgcolor = prevfg;
-	bgcolor = prevbg;
-}
-void vga_write_line(const char* text) {
-	if (cursor_loc != CURSOR_HOME) {
-		scroll();
-	}
-	vga_write(text);
-	scroll();
-}
-void vga_write_line_color(const char* text, enum vga_color fg, enum vga_color bg) {
-	unsigned char prevfg = fgcolor;
-	unsigned char prevbg = bgcolor;
-	vga_set_color(fg, bg);
-	vga_write_line(text);
-	fgcolor = prevfg;
-	bgcolor = prevbg;
-}

src/vga.h

@@ -1,24 +0,0 @@
-#ifndef HEADER_VGA
-#define HEADER_VGA
-
-enum vga_color {
-	VGA_COLOR_BLACK = 0,
-	VGA_COLOR_BLUE = 1,
-	VGA_COLOR_GREEN = 2,
-	VGA_COLOR_CYAN = 3,
-	VGA_COLOR_RED = 4,
-	VGA_COLOR_MAGENTA = 5,
-	VGA_COLOR_ORANGE = 6,
-	VGA_COLOR_GREY = 7,
-	VGA_COLOR_GRAY = 7,
-};
-
-void cls(void);
-void vga_init(enum vga_color fg, enum vga_color bg);
-
-void vga_write(const char* text);
-void vga_write_color( const char* text, enum vga_color fg, enum vga_color bg);
-void vga_write_line(const char* text);
-void vga_write_line_color( const char* text, enum vga_color fg, enum vga_color bg);
-
-#endif

src/xtoa.c

@@ -1,100 +0,0 @@
-#include "xtoa.h"
-char* itoa(int value, int base) {
-	char* result;
-
-	// check that the base if valid
-	if (base < 2 || base > 36) { *result = '\0'; return result; }
-
-	char* ptr = result, *ptr1 = result, tmp_char;
-	int tmp_value;
-
-	do {
-		tmp_value = value;
-		value /= base;
-		*ptr++ = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz" [35 + (tmp_value - value * base)];
-	} while ( value );
-	
-	// Apply negative sign
-	if (tmp_value < 0) *ptr++ = '-';
-	*ptr-- = '\0';
-	while(ptr1 < ptr) {
-		tmp_char = *ptr;
-		*ptr--= *ptr1;
-		*ptr1++ = tmp_char;
-	}
-	return result;
-}
-char* uitoa(unsigned int value, int base) {
-	char* result;
-
-	// check that the base if valid
-	if (base < 2 || base > 36) { *result = '\0'; return result; }
-
-	char* ptr = result, *ptr1 = result, tmp_char;
-	int tmp_value;
-
-	do {
-		tmp_value = value;
-		value /= base;
-		*ptr++ = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz" [35 + (tmp_value - value * base)];
-	} while ( value );
-
-
-	*ptr-- = '\0';
-	while(ptr1 < ptr) {
-		tmp_char = *ptr;
-		*ptr--= *ptr1;
-		*ptr1++ = tmp_char;
-	}
-	return result;
-}
-char* ltoa(long value, int base) {
-	char* result;
-
-	// check that the base if valid
-	if (base < 2 || base > 36) { *result = '\0'; return result; }
-
-	char* ptr = result, *ptr1 = result, tmp_char;
-	int tmp_value;
-
-	do {
-		tmp_value = value;
-		value /= base;
-		*ptr++ = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz" [35 + (tmp_value - value * base)];
-	} while ( value );
-
-	// Apply negative sign
-	if (tmp_value < 0) *ptr++ = '-';
-	*ptr-- = '\0';
-	while(ptr1 < ptr) {
-		tmp_char = *ptr;
-		*ptr--= *ptr1;
-		*ptr1++ = tmp_char;
-	}
-	return result;
-}
-char* ultoa(unsigned long value, int base) {
-	char* result;
-
-	// check that the base if valid
-	if (base < 2 || base > 36) { *result = '\0'; return result; }
-
-	char* ptr = result, *ptr1 = result, tmp_char;
-	int tmp_value;
-
-	do {
-		tmp_value = value;
-		value /= base;
-		*ptr++ = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz" [35 + (tmp_value - value * base)];
-	} while ( value );
-
-	// Apply negative sign
-	//if (tmp_value < 0) *ptr++ = '-';
-	*ptr-- = '\0';
-	while(ptr1 < ptr) {
-		tmp_char = *ptr;
-		*ptr--= *ptr1;
-		*ptr1++ = tmp_char;
-	}
-	return result;
-}

src/xtoa.h

@@ -1,9 +0,0 @@
-#ifndef HEADER_XTOA
-#define HEADER_XTOA
-
-char* itoa(int value, int base);
-char* uitoa(unsigned int value, int base);
-char* ltoa(long value, int base);
-char* ultoa(unsigned long value, int base);
-
-#endif