Remove HOS v0.16 sources

Move cross compiler to i686-elf-gcc directory.
Automatically build cross compiler using rscons subsidiary script.

.gitignore

@@ -0,0 +1,3 @@
+.rscons*
+/i686-elf-gcc/
+/build/

Functions.c

@@ -1,276 +0,0 @@
-//Functions.c
-//05/07/03 Josh Holtrop
-//for HOS
-//Modified: 10/30/03
-
-//Writes a byte out to a port
-inline void outportb(unsigned int port, unsigned char value)		// Output a byte to a port
-{
-    asm volatile ("outb %%al,%%dx"::"d" (port), "a" (value));
-};
-
-//Writes a word out to a port
-inline void outportw(unsigned int port, unsigned int value)		// Output a word to a port
-{
-    asm volatile ("outw %%ax,%%dx"::"d" (port), "a" (value));
-};
-
-//Reads a byte from a port
-inline byte inportb(unsigned short port)
-{
-	unsigned char ret_val;
-
-	asm volatile("inb %w1,%b0"
-		: "=a"(ret_val)
-		: "d"(port));
-	return ret_val;
-};
-
-//Enables (SeTs) Interrupt Flag on the processor
-inline void enable_ints()
-{
-	asm("sti");
-};
-
-//Disables (CLears) Interrupt Flag on the processor
-inline void disable_ints()
-{
-	asm("cli");
-};
-
-
-char *strcat(char *dest, char *src)
-{
-	strcpy(dest+strlen(dest), src);
-}
-
-
-//converts a binary-coded-decimal byte to its decimal equivalent
-inline byte bcd2byte(byte bcd)
-{
- 	return (10* ((bcd & 0xF0) >> 4)) + (bcd & 0x0F);
-}
-
-//converts a binary-coded-decimal byte to its decimal equivalent
-inline byte byte2bcd(byte bite)
-{
-	return ((bite / 10) << 4) | (bite % 10);
-}
-
-void	rtrim(char *str)
-{
-	str += strlen(str);	//now points to the null character at the end of the string
-	str--;
-	for (;;)
-	{
-		if ((*str == ' ') || (*str == '\t') || (*str == '\n'))
-			*str-- = 0;
-		else
-			break;
-	}
-}
-
-
-char	*ucase(char *str)
-{
-	char *ret = str;
-	for (;;)
-	{
-		if (*str == 0)
-			break;
-		if ((*str >= 'a') && (*str <= 'z'))
-			*str = (*str) - 32;
-		str++;
-	}
-	return ret;
-}
-
-
-char	*lcase(char *str)
-{
-	char *ret = str;
-	for (;;)
-	{
-		if (*str == 0)
-			break;
-		if ((*str >= 'A') && (*str <= 'Z'))
-			*str = (*str) + 32;
-		str++;
-	}
-	return ret;
-}
-
-
-//Re-maps the Programmable Interrupr Controllers so IRQ0->pic1 base address, IRG8->pic2 base address
-void remap_pics(int pic1, int pic2)
-{
-	byte	a1, a2;
-
-	a1 = inportb(PIC1_DATA);      //0x21
-	a2 = inportb(PIC2_DATA);      //0xA1
-
-	outportb(PIC1_COMMAND, ICW1_INIT+ICW1_ICW4);	//0x20, 0x10+0x01 00010001b
-	outportb(PIC2_COMMAND, ICW1_INIT+ICW1_ICW4);	//0xA0, 0x10+0x01 00010001b
-	outportb(PIC1_DATA, pic1);			//0x21, pic1
-	outportb(PIC2_DATA, pic2);			//0xA1, pic2
-	outportb(PIC1_DATA, 4);				//0x21, 0x04      00000100b
-	outportb(PIC2_DATA, 2);				//0xA1, 0x02      00000010b
-	outportb(PIC1_DATA, ICW4_8086);			//0x21, 0x01      00000001b
-	outportb(PIC2_DATA, ICW4_8086);			//0xA1, 0x01      00000001b
-
-	outportb(PIC1_DATA, a1);			//0x21
-	outportb(PIC2_DATA, a2);			//0xA1
-}
-
-//Masks interrupts on first Programmable Interrupt Controller
-inline void pic1_mask(byte mask)
-{
-	outportb(PIC1_DATA, mask);			//0x21, maskfield *OCW1*
-}
-
-//Masks interrupts on second Programmable Interrupt Controller
-inline void pic2_mask(byte mask)
-{
- 	outportb(PIC2_DATA, mask);			//0xA1, maskfield *OCW1*
-}
-
-//Restarts the computer
-inline void restart()
-{
- 	enable_ints();
- 	byte temp;
-	do
-	{
-		temp = inportb(0x64);
-		if (temp & 1)
-		inportb(0x60);
-	} while(temp & 2);
-
-
-	outportb (0x64, 0xfe);
-	for (;;)
-	{
-	}
-}
-
-//Halts (freezes) the computer
-inline void halt()
-{
- 	asm("cli");
- 	asm("hlt");
- 	while (1)
- 	;
-}
-
-//Initializes 8253 Programmable Interrupt Timer
-inline void init_timer()
-{
- 	//set timer : 2e9c = 100hz
-	outportb(0x43, 0x34);
-	outportb(0x40, 0x9c); //lsb
-	outportb(0x40, 0x2e); //msb
-}
-
-//Signals an End Of Interrupt signal to the first PIC
-inline void eoi()
-{
-	outportb(0x20, 0x20);
-}
-
-//Signals an End Of Interrupt signal to both the second and first PIC unit
-inline void eoi2()
-{
- 	outportb(0xA0, 0x20);
- 	outportb(0x20, 0x20);
-}
-
-//Returns the size of the kernel (code & data)
-// - this does not include the bss section
-// - this should be 4kb aligned per the linker script
-// - this should be the size of kernel.bin
-inline dword kernel_size()
-{
-	return (dword)(&_bss)-(dword)(&_code);
-}
-
-
-//These functions are for reading and writing various values stored on the CMOS Real Time Clock
-byte	rtc_readDay()
-{
-	outportb(0x70, 7);
-	return bcd2byte(inportb(0x71));
-}
-
-byte	rtc_readMonth()
-{
-	outportb(0x70, 8);
-	return bcd2byte(inportb(0x71));
-}
-
-byte	rtc_readYear()
-{
-	outportb(0x70, 9);
-	return bcd2byte(inportb(0x71));
-}
-
-byte	rtc_readSecond()
-{
-	outportb(0x70, 0);
-	return bcd2byte(inportb(0x71));
-}
-
-byte	rtc_readMinute()
-{
-	outportb(0x70, 2);
-	return bcd2byte(inportb(0x71));
-}
-
-byte	rtc_readHour()
-{
-	outportb(0x70, 4);
-	return bcd2byte(inportb(0x71));
-}
-
-void	rtc_setDay(byte day)
-{
-	outportb(0x70, 7);
-	outportb(0x71, byte2bcd(day));
-}
-
-void	rtc_setMonth(byte month)
-{
-	outportb(0x70, 8);
-	outportb(0x71, byte2bcd(month));
-}
-
-void	rtc_setYear(byte year)
-{
-	outportb(0x70, 9);
-	outportb(0x71, byte2bcd(year));
-}
-
-void	rtc_setSecond(byte second)
-{
-	outportb(0x70, 0);
-	outportb(0x71, byte2bcd(second));
-}
-
-void	rtc_setMinute(byte minute)
-{
-	outportb(0x70, 2);
-	outportb(0x71, byte2bcd(minute));
-}
-
-void	rtc_setHour(byte hour)
-{
-	outportb(0x70, 4);
-	outportb(0x71, byte2bcd(hour));
-}
-
-
-
-
-
-
-
-

Rsconscript

@@ -0,0 +1,166 @@
+path_prepend "i686-elf-gcc/bin"
+
+configure do
+  rscons "i686-elf-gcc.rb", "-b", "#{build_dir}/i686-elf-gcc"
+  check_c_compiler "i686-elf-gcc"
+  check_program "genext2fs"
+  check_program "grub-mkstandalone"
+  check_program "mformat", on_fail: "Install the mtools package"
+  check_program "xorriso"
+  check_cfg package: "freetype2", on_fail: "Install libfreetype-dev", use: "freetype"
+end
+
+require "tmpdir"
+
+# EFI (w/ GRUB) partition size (MiB)
+EFI_PART_SIZE = 8
+# HOS partition size (MiB)
+HOS_PART_SIZE = 4
+# Kernel default font size
+KFONT_SIZE = 15
+
+class BiosImage < Builder
+  def run(options)
+    unless @cache.up_to_date?(@target, nil, @sources, @env)
+      print_run_message("Generating BIOS boot image #{@target}", nil)
+      Dir.mktmpdir do |tmpdir|
+        # Create iso directory.
+        FileUtils.mkdir_p("#{tmpdir}/iso/boot/grub")
+        File.open("#{tmpdir}/iso/boot/grub/grub.cfg", "wb") do |fh|
+          fh.write(<<EOF)
+set default="0"
+set timeout=1
+menuentry "HOS" {
+insmod multiboot2
+multiboot2 /hos.elf
+}
+EOF
+        end
+        @sources.each do |source|
+          FileUtils.cp(source, "#{tmpdir}/iso")
+        end
+        # Build bootable GRUB image.
+        system(*%W[grub-mkrescue -o #{@target} #{tmpdir}/iso], err: "#{@env.build_root}/grub-mkrescue.log")
+      end
+      @cache.register_build(@target, nil, @sources, @env)
+    end
+    true
+  end
+end
+
+class EfiImage < Builder
+  def run(options)
+    unless @cache.up_to_date?(@target, nil, @sources, @env)
+      print_run_message("Generating EFI boot image #{@target}", nil)
+      Dir.mktmpdir do |tmpdir|
+        # Build a standalone GRUB.
+        File.open("#{tmpdir}/grub.cfg", "wb") do |fh|
+          fh.write(<<EOF)
+insmod part_gpt
+configfile (hd0,gpt2)/grub.cfg
+EOF
+        end
+        system(*%W[grub-mkstandalone -O x86_64-efi -o #{tmpdir}/BOOTX64.EFI boot/grub/grub.cfg=#{tmpdir}/grub.cfg])
+        # Create EFI partition.
+        system(*%W[dd if=/dev/zero of=#{tmpdir}/efi.part bs=1M count=#{EFI_PART_SIZE}], err: "/dev/null")
+        system(*%W[mformat -i #{tmpdir}/efi.part ::])
+        system(*%W[mmd -i #{tmpdir}/efi.part ::/EFI])
+        system(*%W[mmd -i #{tmpdir}/efi.part ::/EFI/BOOT])
+        system(*%W[mcopy -i #{tmpdir}/efi.part #{tmpdir}/BOOTX64.EFI ::/EFI/BOOT])
+        # Create ext2 HOS partition.
+        FileUtils.mkdir_p("#{tmpdir}/ext2")
+        @sources.each do |source|
+          FileUtils.cp(source, "#{tmpdir}/ext2")
+        end
+        File.open("#{tmpdir}/ext2/grub.cfg", "wb") do |fh|
+          fh.write(<<EOF)
+set default="0"
+set timeout=1
+menuentry "HOS" {
+insmod part_gpt
+insmod multiboot2
+set root=(hd0,gpt2)
+multiboot2 /hos.elf
+}
+EOF
+        end
+        system(*%W[genext2fs -b #{HOS_PART_SIZE * 1024} -d #{tmpdir}/ext2 #{tmpdir}/ext2.part])
+        # Create full disk image.
+        system(*%W[dd if=/dev/zero of=#{@target} bs=1M count=#{EFI_PART_SIZE + HOS_PART_SIZE + 2}], err: "/dev/null")
+        system(*%W[parted -s #{@target} mklabel gpt])
+        system(*%W[parted -s #{@target} mkpart efi 1MiB #{EFI_PART_SIZE + 1}MiB])
+        system(*%W[parted -s #{@target} mkpart hos #{EFI_PART_SIZE + 1}MiB #{EFI_PART_SIZE + HOS_PART_SIZE + 1}MiB])
+        system(*%W[dd if=#{tmpdir}/efi.part of=#{@target} bs=1M seek=1 conv=notrunc], err: "/dev/null")
+        system(*%W[dd if=#{tmpdir}/ext2.part of=#{@target} bs=1M seek=#{1 + EFI_PART_SIZE} conv=notrunc], err: "/dev/null")
+      end
+      @cache.register_build(@target, nil, @sources, @env)
+    end
+    true
+  end
+end
+
+class FontGen < Builder
+  def run(options)
+    if @command
+      finalize_command
+    else
+      fontgen = @vars["fontgen"]
+      @sources += [fontgen]
+      command = %W[#{fontgen} #{@sources.first} #{KFONT_SIZE} #{@target}]
+      standard_command("FontGen <target>#{@target}<reset>", command, {})
+    end
+  end
+end
+
+class Size < Builder
+  def run(options)
+    if @command
+      finalize_command
+    else
+      @vars["_SOURCES"] = @sources
+      @vars["_TARGET"] = @target
+      command = @env.build_command(%w[${SIZE} ${_SOURCES}], @vars)
+      standard_command("Size <target>#{@target}<reset>", command, stdout: @target)
+    end
+  end
+end
+
+# FontGen Environment
+fontgen_env = env "fontgen", use: "freetype" do |env|
+  env["CC"] = "gcc"
+  env.Program("^/fontgen.bin", glob("fontgen/**/*.c"))
+end
+
+# Kernel Environment
+kernel_env = env "kernel" do |env|
+  env.add_builder(EfiImage)
+  env.add_builder(BiosImage)
+  env.add_builder(FontGen)
+  env.add_builder(Size)
+  env["OBJDUMP"] = "i686-elf-objdump"
+  env["SIZE"] = "i686-elf-size"
+  env["CCFLAGS"] += %w[-ffreestanding -Wall -O2]
+  env["LDFLAGS"] += %w[-ffreestanding -nostdlib -T src/link.ld]
+  env["LDFLAGS"] += %W[-Wl,-Map,${_TARGET}.map]
+  env["LIBS"] += %w[gcc]
+  env.FontGen("^/kfont/kfont.c", "font/Hack-Regular.ttf",
+             "fontgen" => fontgen_env.expand("^/fontgen.bin"))
+  env.barrier
+  env["CPPPATH"] += ["#{env.build_root}/kfont"]
+  env.Program("^/hos.elf", glob("src/**/*.{S,c}") + ["^/kfont/kfont.c"])
+  env.depends("#{env.build_root}/hos.elf", "src/link.ld")
+  env.Disassemble("^/hos.elf.txt", "^/hos.elf")
+  env.Size("^/hos.elf.size", "^/hos.elf")
+  env.EfiImage("^/hos-efi.img", %w[^/hos.elf])
+  env.BiosImage("^/hos.img", %w[^/hos.elf])
+end
+
+task "run", desc: "Run HOS in QEMU" do
+  img = kernel_env.expand("^/hos.img")
+  sh %W[qemu-system-x86_64 -hda #{img}]
+end
+
+task "run-efi", desc: "Run HOS EFI in QEMU" do
+  img = kernel_env.expand("^/hos-efi.img")
+  sh %W[qemu-system-x86_64 -bios OVMF.fd -hda #{img}]
+end

asmfuncs.asm

@@ -1,470 +0,0 @@
-; asmfuncs.asm
-; Josh Holtrop
-; Created: 10/23/03
-; Modified: 12/25/03
-
-[extern _putc]
-[extern _console_memory]
-[extern _cursorPosition]
-[extern _video_drawConsole]
-[extern _videoMode]
-
-%macro jzfar 1
-	jnz	%%skip
-	jmp	%1
-%%skip:
-
-%endmacro
-
-;stores the parameter to the CR0 register
-;extern dword write_cr0(dword cr0);
-[global _write_cr0]
-_write_cr0:
-	push	ebp
-	mov	ebp, esp
-	mov	eax, [ebp+8]
-	mov	cr0, eax
-	pop	ebp
-	ret
-
-;returns the value in the CR0 register
-;extern dword read_cr0();
-[global _read_cr0]
-_read_cr0:
-	mov	eax, cr0;
-	ret
-
-;stores the parameter to the CR3 register
-;extern dword write_cr3(dword cr3);
-[global _write_cr3]
-_write_cr3:
-	push	ebp
-	mov	ebp, esp
-	mov	eax, [ebp+8]
-	mov	cr3, eax
-	pop	ebp
-	ret
-
-
-;returns the value in the CR2 register
-;extern dword read_cr2();
-[global _read_cr2]
-_read_cr2:
-	mov	eax, cr2;
-	ret
-
-
-
-;returns the value in the CR3 register
-;extern dword read_cr3();
-[global _read_cr3]
-_read_cr3:
-	mov	eax, cr3;
-	ret
-
-
-;compares one string to another
-;returns 0 if the strings are different
-;extern dword strcmp(char *str1, char *str2);
-[global _strcmp]
-_strcmp:
-	push	ebp
-	mov	ebp, esp
-	push	esi
-	push	edi
-
-	mov	esi, [ebp+8]
-	mov	edi, [ebp+12]
-strcmp_loop1:
-	lodsb
-	mov	ah, [edi]
-	inc	edi
-	cmp	ah, al
-	jnz	strcmp_ne
-	or	al, al
-	jz	strcmp_e
-	jmp	strcmp_loop1
-strcmp_e:
-	mov	eax, 1
-	jmp short strcmp_done
-strcmp_ne:
-	xor	eax, eax
-strcmp_done:
-
-	pop	edi
-	pop	esi
-	pop	ebp
-	ret
-
-;copies a string from the source to the destination parameter
-;extern void strcpy(char *dest, char *src);
-[global _strcpy]
-_strcpy:
-	push	ebp
-	mov	ebp, esp
-	push	esi
-	push	edi
-	mov	edi, [ebp+8]
-	mov	esi, [ebp+12]
-strcpyloop:
-	lodsb
-	stosb
-	or	al, al
-	jnz	strcpyloop
-	pop	edi
-	pop	esi
-	pop	ebp
-	ret
-
-;copies memory of n bytes from src to destination
-;extern void memcpy(dword dest, dword src, dword n);
-[global _memcpy]
-_memcpy:
-	push	ebp
-	mov	ebp, esp
-	push	esi
-	push	edi
-	push	ecx
-	mov	edi, [ebp+8]
-	mov	esi, [ebp+12]
-	mov	ecx, [ebp+16]
-
-	rep	movsb
-
-	pop	ecx
-	pop	edi
-	pop	esi
-	pop	ebp
-	ret
-
-;returns the number of characters in a string
-;extern dword strlen(char *str);
-[global _strlen]
-_strlen:
-	push	ebp
-	mov	ebp, esp
-	push	esi
-	push	ebx
-	mov	esi, [ebp+8]
-	xor	ebx, ebx
-strlenloop:
-	lodsb
-	or	al, al
-	jz	strlendone
-	inc	ebx
-	jmp	strlenloop
-strlendone:
-	mov	eax, ebx
-	pop	ebx
-	pop	esi
-	pop	ebp
-	ret
-
-;this function invalidates the page directory/table entry that
-; would be used to access the memory address given in the parameter
-;extern void invlpg(dword addr);
-[global _invlpg]
-_invlpg:
-	mov	eax, [esp+4]
-	invlpg	[eax]
-	ret
-
-
-;
-;void writeCursorPosition(word pos)
-;
-[global _writeCursorPosition]
-_writeCursorPosition:
-	push	ebp
-	mov	ebp, esp
-
-	push	eax
-	push	ebx
-	push	edx
-
-	mov	eax, [ebp+8]	;cursor position in ax
-
-	mov	bl, al
-	mov	dx, 0x03D4
-	mov	al, 0x0E
-	out	dx, al
-
-	inc	dx
-	mov	al, ah
-	out	dx, al
-
-	dec	dx
-	mov	al, 0x0F
-	out	dx, al
-
-	inc	dx
-	mov	al, bl
-	out	dx, al
-
-	pop	edx
-	pop	ebx
-	pop	eax
-	pop	ebp
-
-	ret
-
-
-;
-;word getCursorPosition()
-;
-[global _getCursorPosition]
-_getCursorPosition:
-	push	ebx
-	push	edx
-
-	xor	eax, eax
-	mov	dx, 0x03D4
-	mov	al, 0x0E
-	out	dx, al
-
-	inc	dx
-	in	al, dx
-	mov	bl, al
-
-	dec	dx
-	mov	al, 0x0F
-	out	dx, al
-
-	inc	dx
-	in	al, dx
-	mov	ah, bl
-
-	pop	edx
-	pop	ebx
-
-	ret
-
-
-;
-;void console_scroll()
-;
-[global _console_scroll]
-_console_scroll:
-	pusha
-	mov	esi, _console_memory+160
-	mov	edi, _console_memory
-	mov	ecx, 960			;(2000-80)/2
-	rep	movsd
-	mov	ax, 0x0720
-	mov	ecx, 80
-	rep	stosw
-	mov	esi, _console_memory
-	mov	edi, 0xC00B8000
-	mov	ecx, 1000
-	rep	movsd
-	mov	eax, [_videoMode]
-	cmp	eax, 0
-	jz	_console_scroll_end
-	call	_video_drawConsole
-_console_scroll_end:
-	popa
-	ret
-
-
-
-;
-;void console_cls()
-;
-[global _console_cls]
-_console_cls:
-	pusha
-	mov	edi, _console_memory
-	mov	ax, 0x0720
-	mov	ecx, 2000
-	rep	stosw
-	push	dword 0
-	call	_writeCursorPosition
-	add	esp, 4
-	mov	[_cursorPosition], dword 0
-	mov	esi, _console_memory
-	mov	edi, 0xC00B8000
-	mov	ecx, 1000
-	rep	movsd
-	popa
-	ret
-
-
-
-
-;
-;int puts(char *str)
-;
-[global _puts]
-_puts:
-	push	ebp
-	mov	ebp, esp
-	push	esi
-	push	eax
-	mov	esi, [ebp+8]			;esi = to string
-puts_loop:
-	lodsb
-	cmp	al, 0
-	jz	puts_done
-	push	eax
-	call	_putc
-	add	esp, 4
-	jmp	puts_loop
-
-puts_done:
-	pop	eax
-	pop	esi
-	pop	ebp
-	ret
-
-
-
-        
-[global _putDecu]
-_putDecu:
-	push	ebp
-	mov	ebp, esp
-	sub	esp, 24
-	mov	DWORD [ebp-4], 1
-	mov	BYTE [ebp-5], 0
-L2:
-	mov	edx, DWORD [ebp+8]
-	mov	eax, -858993459
-	mul	edx
-	mov	eax, edx
-	shr	eax, 3
-	cmp	eax, DWORD [ebp-4]
-	jae	L4
-	jmp	L3
-L4:
-	mov	eax, DWORD [ebp-4]
-	mov	edx, eax
-	sal	edx, 2
-	add	edx, eax
-	lea	eax, [edx+edx]
-	mov	DWORD [ebp-4], eax
-	jmp	L2
-L3:
-	nop
-L5:
-	cmp	DWORD [ebp-4], 1
-	ja	L7
-	jmp	L6
-L7:
-	mov	edx, DWORD [ebp+8]
-	mov	eax, edx
-	mov	edx, 0
-	div	DWORD [ebp-4]
-	mov	DWORD [ebp-12], eax
-	mov	al, BYTE [ebp-12]
-	mov	BYTE [ebp-5], al
-	mov	eax, 0
-	mov	al, BYTE [ebp-5]
-	imul	eax, DWORD [ebp-4]
-	sub	DWORD [ebp+8], eax
-	mov	edx, DWORD [ebp-4]
-	mov	eax, -858993459
-	mul	edx
-	mov	eax, edx
-	shr	eax, 3
-	mov	DWORD [ebp-4], eax
-	lea	eax, [ebp-5]
-	add	BYTE [eax], 48
-	sub	esp, 12
-	mov	eax, 0
-	mov	al, BYTE [ebp-5]
-	push	eax
-	call	_putc
-	add	esp, 16
-	jmp	L5
-L6:
-	sub	esp, 12
-	mov	al, BYTE [ebp+8]
-	add	eax, 48
-	and	eax, 255
-	push	eax
-	call	_putc
-	add	esp, 16
-	leave
-	ret
-
-
-
-
-[global _putDec]
-_putDec:
-	push	ebp
-	mov	ebp, esp
-	sub	esp, 24
-	cmp	DWORD [ebp+8], 0
-	jns	L9
-	sub	esp, 12
-	push	45
-	call	_putc
-	add	esp, 16
-	neg	DWORD [ebp+8]
-L9:
-	mov	DWORD [ebp-4], 1
-	mov	BYTE [ebp-5], 0
-L10:
-	mov	eax, DWORD [ebp+8]
-	cmp	eax, DWORD [ebp-4]
-	jae	L12
-	jmp	L11
-L12:
-	mov	eax, DWORD [ebp-4]
-	mov	edx, eax
-	sal	edx, 2
-	add	edx, eax
-	lea	eax, [edx+edx]
-	mov	DWORD [ebp-4], eax
-	jmp	L10
-L11:
-	mov	edx, DWORD [ebp-4]
-	mov	eax, -858993459
-	mul	edx
-	mov	eax, edx
-	shr	eax, 3
-	mov	DWORD [ebp-4], eax
-L13:
-	cmp	DWORD [ebp-4], 1
-	ja	L15
-	jmp	L14
-L15:
-	mov	edx, DWORD [ebp+8]
-	mov	eax, edx
-	mov	edx, 0
-	div	DWORD [ebp-4]
-	mov	DWORD [ebp-12], eax
-	mov	al, BYTE [ebp-12]
-	mov	BYTE [ebp-5], al
-	mov	eax, 0
-	mov	al, BYTE [ebp-5]
-	imul	eax, DWORD [ebp-4]
-	sub	DWORD [ebp+8], eax
-	mov	edx, DWORD [ebp-4]
-	mov	eax, -858993459
-	mul	edx
-	mov	eax, edx
-	shr	eax, 3
-	mov	DWORD [ebp-4], eax
-	lea	eax, [ebp-5]
-	add	BYTE [eax], 48
-	sub	esp, 12
-	mov	eax, 0
-	mov	al, BYTE [ebp-5]
-	push	eax
-	call	_putc
-	add	esp, 16
-	jmp	L13
-L14:
-	sub	esp, 12
-	mov	al, BYTE [ebp+8]
-	add	eax, 48
-	and	eax, 255
-	push	eax
-	call	_putc
-	add	esp, 16
-	leave
-	ret
-
-

backup.bat

@@ -1,12 +0,0 @@
-@echo off
-echo Backing up to .\Backup\%1
-
-mkdir .\Backup\%1
-
-copy *.h .\Backup\%1
-copy *.c .\Backup\%1
-copy *.inc .\Backup\%1
-copy *.asm .\Backup\%1
-copy *.ld .\Backup\%1
-copy *.bat .\Backup\%1
-

bootdef.inc

@@ -1,26 +0,0 @@
-
-%define VERSION		"0.13"			;HOS version
-
-%define BOOT_FAT_SEG	0x07E0			;right after boot sector
-%define BOOT_ROOT_SEG	0x0900			;right after FAT
-%define BOOT_KERNEL_SEG	0x0AC0			;right after ROOT_DIR
-%define BOOT_STAGE2_SEG	0x0B00			;right after KERNEL_SEG
-%define BOOT_STAGE2_ADD	0xB000			;address of stage2 to jump to, org at
-%define BOOT_KERNEL_ADD	0x106000		;final pmode kernel destination - physical
-%define BOOT_RD_ADD	0x200000		;2mb for ram disk
-
-%define BOOT_DATA_SEG	0x9000			;data gathered by stage2 loader goes here
-
-%define BOOT_HASRD	0x0000		;1
-%define BOOT_VESA	0x0002		;2 - 0 for console, otherwise VESA mode
-%define BOOT_VESA_OEM	0x0004		;258 - null-terminated OEM identification string
-%define BOOT_VESA_VBE	0x0106		;512 - copy of VESA VBEInfoBlock
-%define	BOOT_VESA_INFO	0x0306		;256 - copy of VESA ModeInfoBlock for selected mode
-%define BOOT_MEMENTRIES	0x040A		;4 - dword = number of memmap entries
-%define BOOT_MEMMAP	0x2000		;? -  memory map information
-
-
-
-%define BOOT_DRIVE	0x7C24		;1 - boot drive
-
-

c1.bat

@@ -1,2 +0,0 @@
-nasmw -f aout -o ks.o -l .\lst\kernel.lst kernel.asm
-

c2.bat

@@ -1 +0,0 @@
-gcc -ffreestanding -fno-builtin -nostdlib -nodefaultlibs -c kernel.c -o kernel.o

c3.bat

@@ -1 +0,0 @@
-nasmw -f aout -o asmfuncs.o -l .\lst\asmfuncs.lst asmfuncs.asm

cop.bat

@@ -1 +0,0 @@
-copy kernel.bin a:

cops1.bat

@@ -1,2 +0,0 @@
-rem rawrite -f stage1.bin -d a -n
-partcopy stage1.bin 0 200 -f0

cops2.bat

@@ -1 +0,0 @@
-copy stage2.bin a:

cs1.bat

@@ -1 +0,0 @@
-nasmw -f bin -o stage1.bin -l .\lst\stage1.lst stage1.asm

cs2.bat

@@ -1 +0,0 @@
-nasmw -f bin -o stage2.bin -l .\lst\stage2.lst stage2.asm

fat12.c

@@ -1,345 +0,0 @@
-// fat12.c
-// Author: Josh Holtrop
-// Created: 01/04/04
-// Modified: 01/14/04
-
-
-byte *fat12_readFile(char *fileName, DiskDevice *dd)
-{
-	char *fileNameUCase = malloc(strlen(fileName) + 1);
-	strcpy(fileNameUCase, fileName);
-	ucase(fileNameUCase);
-	dword iMadeClusterChain = getClusterChain(dd);
-	Fat12Entry fe;
-	if (fat12_getFileHandle(fileNameUCase, dd, &fe))
-	{
-		free(fileNameUCase);
-		if (iMadeClusterChain)
-		{
-			free(clusterChain);
-			clusterChain = 0;
-		}
-		return 0;
-	}
-	byte *fp = (byte *)fat12_readClusterChain(dd, &fe);
-	free(fileNameUCase);
-	if (iMadeClusterChain)
-	{
-		free(clusterChain);
-		clusterChain = 0;
-	}
-	return fp;
-}
-
-
-dword	fat12_getFileHandle(char *fileName, DiskDevice *dd, Fat12Entry *destination)
-{
- 	if (strlen(fileName) < 1)
- 		return 1;
- 	if (fileName[strlen(fileName)-1] == '/')
- 		return 2;
-	dword iMadeClusterChain = getClusterChain(dd);
-	int fileName_length = strlen(fileName);
-	int a;
-	int entries = 1;
-	for (a = 0; a < fileName_length; a++)
-	{
-		if (fileName[a] == '/')
-		{
-			fileName[a] = 0;
-			entries++;
-		}
-	}
-	char *pointer = fileName;
-	Fat12Entry *workingDirectory = 0;
-	Fat12Entry workingDir;
-	for (a = 0; a < (entries - 1); a++)
-	{
-		if (fat12_getDirectoryHandle(pointer, dd, workingDirectory, &workingDir))	//an error occurred if this returns nonzero
-		{
-			if (iMadeClusterChain)
-			{
-				free(clusterChain);
-				clusterChain = 0;
-			}
-			return 3;
-		}
-		workingDirectory = &workingDir;
-		for (;;)				//advance to the next dir name
-		{
-			pointer++;
-			if (*pointer == 0)
-			{
-				pointer++;
-				break;
-			}
-		}
-	}
-	if (fat12_getFileHandleInDirectory(pointer, dd, workingDirectory, destination))		//an error occurred if this returns nonzero
-	{
-		if (iMadeClusterChain)
-		{
-			free(clusterChain);
-			clusterChain = 0;
-		}
-		return 4;
-	}
-	if (iMadeClusterChain)
-	{
-		free(clusterChain);
-		clusterChain = 0;
-	}
-	return 0;
-}
-
-
-dword	fat12_getFileHandleInDirectory(char *fileName, DiskDevice *dd, Fat12Entry *currDir, Fat12Entry *destination)
-{
-	if (!currDir)			// we are working in the root directory
-	{
-		Fat12Entry *rootDir = malloc(14*512);		//root directory is 14 sectors long
-		vfs_readSector(dd, 19, (byte *)rootDir, 14);
-		int a;
-		for (a = 0; a < 224; a++)			//224 max root directory entries in 14 sectors
-		{
-			if (rootDir[a].fileName[0] == 0)
-				break;
-			if ((byte)rootDir[a].fileName[0] != 0xE5)
-			{
-				if ((rootDir[a].attributes & 0x18) == 0)	//this entry is a directory
-				{
-					char dirName[9];
-					char dirExt[4];
-					memcpy(dirName, rootDir[a].fileName, 8);
-					dirName[8] = 0;
-					memcpy(dirExt, rootDir[a].ext, 3);
-					dirExt[3] = 0;
-					rtrim(dirName);
-					rtrim(dirExt);
-					char dirWhole[14];
-					strcpy(dirWhole, dirName);
-					if (strlen(dirExt) > 0)			//the directory has an extension
-					{
-						strcat(dirWhole, ".");
-						strcat(dirWhole, dirExt);
-					}
-					if (strcmp(dirWhole, fileName))	//the entry found is a match
-					{
-						free(rootDir);
-						*destination = rootDir[a];
-						return 0;
-					}
-				}
-			}
-		}
-		free(rootDir);
-		return 1;	//no match found
-	}
-	dword retVal = 2;
-	dword iMadeClusterChain = getClusterChain(dd);
-	Fat12Entry *subDirectory = fat12_readClusterChain(dd, currDir);
-	if (!subDirectory)
-		return 5;
-	dword numberOfClusters = fat12_readClusterChainCount(dd, currDir);
-	int a;
-	for (a = 0; a < (numberOfClusters * 16); a++)
-	{
-		if (subDirectory[a].fileName[0] == 0)
-			break;
-		if ((byte)subDirectory[a].fileName[0] != 0xE5)
-		{
-			if ((subDirectory[a].attributes & 0x18) == 0)	//this entry is a directory
-			{
-				char dirName[9];
-				char dirExt[4];
-				memcpy(dirName, subDirectory[a].fileName, 8);
-				dirName[8] = 0;
-				memcpy(dirExt, subDirectory[a].ext, 3);
-				dirExt[3] = 0;
-				rtrim(dirName);
-				rtrim(dirExt);
-				char dirWhole[14];
-				strcpy(dirWhole, dirName);
-				if (strlen(dirExt) > 0)			//the directory has an extension
-				{
-					strcat(dirWhole, ".");
-					strcat(dirWhole, dirExt);
-				}
-				if (strcmp(dirWhole, fileName))	//the entry found is a match
-				{
-					*destination = subDirectory[a];
-					retVal = 0;
-					break;
-				}
-			}
-		}
-	}
-	free(subDirectory);
-	if (iMadeClusterChain)
-	{
-		free(clusterChain);
-		clusterChain = 0;
-	}
-	return retVal;
-}
-
-
-dword	fat12_getDirectoryHandle(char *directory, DiskDevice *dd, Fat12Entry *currDir, Fat12Entry *destination)
-{
-	if (!currDir)			// we are working in the root directory
-	{
-		Fat12Entry *rootDir = malloc(14*512);		//root directory is 14 sectors long
-		vfs_readSector(dd, 19, (byte *)rootDir, 14);
-		int a;
-		for (a = 0; a < 224; a++)			//224 max root directory entries in 14 sectors
-		{
-			if (rootDir[a].fileName[0] == 0)
-				break;
-			if ((byte)rootDir[a].fileName[0] != 0xE5)
-			{
-				if ((rootDir[a].attributes & 0x18) == 0x10)	//this entry is a directory
-				{
-					char dirName[9];
-					char dirExt[4];
-					memcpy(dirName, rootDir[a].fileName, 8);
-					dirName[8] = 0;
-					memcpy(dirExt, rootDir[a].ext, 3);
-					dirExt[3] = 0;
-					rtrim(dirName);
-					rtrim(dirExt);
-					char dirWhole[14];
-					strcpy(dirWhole, dirName);
-					if (strlen(dirExt) > 0)			//the directory has an extension
-					{
-						strcat(dirWhole, ".");
-						strcat(dirWhole, dirExt);
-					}
-					if (strcmp(dirWhole, directory))	//the entry found is a match
-					{
-						free(rootDir);
-						*destination = rootDir[a];
-						return 0;
-					}
-				}
-			}
-		}
-		free(rootDir);
-		return 1;	//no match found
-	}
-	dword retVal = 2;
-	dword iMadeClusterChain = getClusterChain(dd);
-	Fat12Entry *subDirectory = fat12_readClusterChain(dd, currDir);
-	if (!subDirectory)
-		return 5;
-	dword numberOfClusters = fat12_readClusterChainCount(dd, currDir);
-	int a;
-	for (a = 0; a < (numberOfClusters * 16); a++)
-	{
-		if (subDirectory[a].fileName[0] == 0)
-			break;
-		if ((byte)subDirectory[a].fileName[0] != 0xE5)
-		{
-			if ((subDirectory[a].attributes & 0x18) == 0x10)	//this entry is a directory
-			{
-				char dirName[9];
-				char dirExt[4];
-				memcpy(dirName, subDirectory[a].fileName, 8);
-				dirName[8] = 0;
-				memcpy(dirExt, subDirectory[a].ext, 3);
-				dirExt[3] = 0;
-				rtrim(dirName);
-				rtrim(dirExt);
-				char dirWhole[14];
-				strcpy(dirWhole, dirName);
-				if (strlen(dirExt) > 0)			//the directory has an extension
-				{
-					strcat(dirWhole, ".");
-					strcat(dirWhole, dirExt);
-				}
-				if (strcmp(dirWhole, directory))	//the entry found is a match
-				{
-					*destination = subDirectory[a];
-					retVal = 0;
-					break;
-				}
-			}
-		}
-	}
-	free(subDirectory);
-	if (iMadeClusterChain)
-	{
-		free(clusterChain);
-		clusterChain = 0;
-	}
-	return retVal;
-}
-
-
-Fat12Entry *fat12_readClusterChain(DiskDevice *dd, Fat12Entry *directory)
-{
-	dword numberOfClusters = fat12_readClusterChainCount(dd, directory);
-	if (numberOfClusters == 0)
-		return 0;
-	byte *bp = malloc(numberOfClusters * 512);
-	Fat12Entry *retVal = (Fat12Entry *)bp;
-	dword cluster = directory->firstCluster;
-	while (cluster < 0xFF0)
-	{
-		vfs_readSector(dd, cluster + 31, bp, 1);
-		cluster = fat12_getNextCluster(cluster);
-		bp += 512;
-	}
-	return retVal;
-}
-
-
-dword	fat12_readClusterChainCount(DiskDevice *dd, Fat12Entry *directory)
-{
-	dword numberOfClusters = 0;
-	dword cluster = directory->firstCluster;
-	if (cluster == 0)
-		return 0;
-	while (cluster < 0xFF0)
-	{
-		cluster = fat12_getNextCluster(cluster);
-		numberOfClusters++;
-	}
-	return numberOfClusters;
-}
-
-
-dword	fat12_getNextCluster(dword thisCluster)
-{
-	dword nextCluster = *(word *)((dword)clusterChain + ((thisCluster * 3) >> 1));
-	if (thisCluster & 0x01)		//this is an odd cluster
-		return nextCluster >> 4;
-	else				//this is an even cluster
-		return nextCluster & 0x0FFF;
-}
-
-
-dword	fat12_getFileSize(char *fileName, DiskDevice *dd)
-{
-	Fat12Entry fe;
-	if (fat12_getFileHandle(fileName, dd, &fe))
-		return 0xFFFFFFFF;
-	return fe.fileSize;
-}
-
-
-dword	getClusterChain(DiskDevice *dd)
-{
-	if (!clusterChain)
-	{
-		clusterChain = malloc(9*512);	//9 sectors for File Allocation Table (cluster chain)
-		vfs_readSector(dd, 1, clusterChain, 9);	//sectors 1 through 9 contain the first FAT
-		return 1;			//this call created the cluster chain
-	}
-	else
-		return 0;			//this call did not create the cluster chain
-}
-
-
-
-
-

fat12.h

@@ -1,58 +0,0 @@
-// fat12.h
-// Author: Josh Holtrop
-// Created: 01/04/04
-
-
-typedef struct	{
-	char	fileName[8];
-	char	ext[3];
-	byte	attributes;
-	dword	createTime;
-	word	createDate;
-	word	accessDate;
-	word	unused0;
-	word	modifiedDate;
-	word	modifiedTime;
-	word	firstCluster;
-	dword	fileSize;
-} __attribute__((packed)) Fat12Entry;
-
-typedef struct	{
-	byte	jump[3];
-	byte	sysName[8];
-	word    bytesPerSector;
-	byte	sectorsPerCluster;
-	word	reservedSectors;
-	byte	FATcount;
-	word	maxRootEntries;
-	word	totalSectors1;
-	byte	mediaDescriptor;
-	word	sectorsPerFAT;
-	word	sectorsPerTrack;
-	word	headCount;
-	dword	hiddenSectors;
-	dword	totalSectors2;
-	byte	driveNumber;
-	byte	reserved1;
-	byte	extBootSignature;
-	dword	volumeSerial;
-	char	volumeLabel[11];
-	char	fileSystemID[8];
-} __attribute__((packed)) Fat12BootSector;
-
-
-byte *fat12_readFile(char *fileName, DiskDevice *dd);
-dword	fat12_getFileHandle(char *fileName, DiskDevice *dd, Fat12Entry *destination);
-dword	fat12_getDirectoryHandle(char *directory, DiskDevice *dd, Fat12Entry *currDir, Fat12Entry *destination);
-Fat12Entry *fat12_readClusterChain(DiskDevice *dd, Fat12Entry *directory);
-dword	fat12_getFileHandleInDirectory(char *fileName, DiskDevice *dd, Fat12Entry *currDir, Fat12Entry *destination);
-dword	fat12_readClusterChainCount(DiskDevice *dd, Fat12Entry *directory);
-dword	fat12_getFileSize(char *fileName, DiskDevice *dd);
-dword	getClusterChain(DiskDevice *dd);
-dword	fat12_getNextCluster(dword thisCluster);
-
-byte	*clusterChain = 0;
-
-
-
-

fdc.c

@@ -1,9 +0,0 @@
-//fdc.c
-//Author: Josh Holtrop
-//Date: 10/30/03
-
-
-inline	void	fdc_sendDOR(byte dor)
-{
-	outportb(FDC_DOR, dor);
-}

fdc.h

@@ -1,12 +0,0 @@
-//fdc.h
-//Author: Josh Holtrop
-//Date: 10/30/03
-
-
-#define FDC_DOR 0x3f2
-#define FDC_MSR 0x3f4
-
-
-inline	void	fdc_sendDOR(byte dor);
-
-

fontgen/fontgen.c

@@ -0,0 +1,224 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <ft2build.h>
+#include <stdio.h>
+#include FT_FREETYPE_H
+#include <string.h>
+#include <strings.h>
+#include <ctype.h>
+
+#define N_CHARS 128
+
+#define round_up_26_6(val) (((val) + 63) >> 6u)
+
+int max_advance;
+int max_top = -9999;
+int min_bottom = 9999;
+int line_height;
+int baseline_offset;
+
+typedef struct {
+    int width;
+    int height;
+    int top;
+    int left;
+    uint8_t * bitmap;
+} char_info_t;
+
+static char_info_t char_infos[N_CHARS];
+
+static void load_char(FT_Face face, int char_code)
+{
+    if (FT_Load_Char(face, char_code, FT_LOAD_RENDER) != 0)
+    {
+        return;
+    }
+    int advance = round_up_26_6(face->glyph->advance.x);
+    if (advance > max_advance)
+    {
+        max_advance = advance;
+    }
+    if ((face->glyph->bitmap.width == 0) ||
+            (face->glyph->bitmap.rows == 0))
+    {
+        return;
+    }
+    char_infos[char_code].width = face->glyph->bitmap.width;
+    char_infos[char_code].height = face->glyph->bitmap.rows;
+    char_infos[char_code].top = face->glyph->bitmap_top;
+    if (char_infos[char_code].top > max_top)
+    {
+        max_top = char_infos[char_code].top;
+    }
+    int bottom = char_infos[char_code].top - char_infos[char_code].height;
+    if (bottom < min_bottom)
+    {
+        min_bottom = bottom;
+    }
+    char_infos[char_code].left = face->glyph->bitmap_left;
+    char_infos[char_code].bitmap = malloc(char_infos[char_code].width * char_infos[char_code].height);
+    memcpy(char_infos[char_code].bitmap,
+            face->glyph->bitmap.buffer,
+            char_infos[char_code].width * char_infos[char_code].height);
+}
+
+static const char * bare_header_name(const char * h_file_name)
+{
+    const char * p = rindex(h_file_name, '/');
+    if (p == NULL)
+    {
+        p = h_file_name;
+    }
+    else
+    {
+        p++;
+    }
+    return p;
+}
+
+static char * include_guard_name(const char * h_file_name)
+{
+    const char * p = bare_header_name(h_file_name);
+    char * guard_name = malloc(strlen(p) + 1);
+    strcpy(guard_name, p);
+    char * m = guard_name;
+    while (*m != '\0')
+    {
+        if ('a' <= *m && *m <= 'z')
+        {
+            *m = toupper(*m);
+        }
+        else if (('0' <= *m && *m <= '9') || ('A' <= *m && *m <= 'Z'))
+        {
+            /* no change */
+        }
+        else
+        {
+            *m = '_';
+        }
+        m++;
+    }
+    return guard_name;
+}
+
+static void generate_bytes(FILE * file, const uint8_t * bytes, int count)
+{
+    for (int i = 0; i < count; i++)
+    {
+        if (i % 8 == 0)
+        {
+            fprintf(file, "    ");
+        }
+        fprintf(file, "0x%02xu,", bytes[i]);
+        if ((i + 1) % 8 == 0)
+        {
+            fprintf(file, "\n");
+        }
+        else if (i < (count - 1))
+        {
+            fprintf(file, " ");
+        }
+    }
+    if (count % 8 != 0)
+    {
+        fprintf(file, "\n");
+    }
+}
+
+static void generate(const char * c_file_name)
+{
+    char * h_file_name = malloc(strlen(c_file_name) + 1);
+    strcpy(h_file_name, c_file_name);
+    h_file_name[strlen(h_file_name) - 1] = 'h';
+    char * guard = include_guard_name(h_file_name);
+
+    FILE * h_file = fopen(h_file_name, "wb");
+    fprintf(h_file, "#ifndef %s\n", guard);
+    fprintf(h_file, "#define %s\n\n", guard);
+    fprintf(h_file, "#include <stdint.h>\n");
+    fprintf(h_file, "typedef struct {\n    int width;\n    int height;\n    int top;\n    int left;\n    const uint8_t * bitmap;\n} fontgen_char_info_t;\n");
+    fprintf(h_file, "typedef struct {\n    int line_height;\n    int advance;\n    int baseline_offset;\n    const fontgen_char_info_t ** char_infos;\n} fontgen_font_t;\n");
+    fprintf(h_file, "extern const fontgen_font_t kfont;\n");
+    fprintf(h_file, "#endif\n");
+    fclose(h_file);
+
+    FILE * c_file = fopen(c_file_name, "wb");
+    fprintf(c_file, "#include \"%s\"\n", bare_header_name(h_file_name));
+    fprintf(c_file, "#include <stddef.h>\n");
+    for (int i = 0; i < N_CHARS; i++)
+    {
+        if (char_infos[i].width > 0)
+        {
+            fprintf(c_file, "static const uint8_t char_bitmap_%d[] = {\n", i);
+            generate_bytes(c_file, char_infos[i].bitmap, char_infos[i].width * char_infos[i].height);
+            fprintf(c_file, "};\n");
+        }
+        fprintf(c_file, "static const fontgen_char_info_t char_%d = {\n", i);
+        fprintf(c_file, "    %d,\n", char_infos[i].width);
+        fprintf(c_file, "    %d,\n", char_infos[i].height);
+        fprintf(c_file, "    %d,\n", char_infos[i].top);
+        fprintf(c_file, "    %d,\n", char_infos[i].left);
+        if (char_infos[i].width > 0)
+        {
+            fprintf(c_file, "    char_bitmap_%d,\n", i);
+        }
+        else
+        {
+            fprintf(c_file, "    NULL,\n");
+        }
+        fprintf(c_file, "};\n\n");
+    }
+    fprintf(c_file, "const fontgen_char_info_t * char_infos[] = {\n");
+    for (int i = 0; i < N_CHARS; i++)
+    {
+        fprintf(c_file, "    &char_%d,\n", i);
+    }
+    fprintf(c_file, "};\n");
+    fprintf(c_file, "const fontgen_font_t kfont = {\n");
+    fprintf(c_file, "    %d,\n", line_height);
+    fprintf(c_file, "    %d,\n", max_advance);
+    fprintf(c_file, "    %d,\n", baseline_offset);
+    fprintf(c_file, "    char_infos,\n");
+    fprintf(c_file, "};\n");
+    fclose(c_file);
+}
+
+int main(int argc, char * argv[])
+{
+    /* Expect: font file, size, out file */
+    if (argc != 4)
+    {
+        fprintf(stderr, "Incorrect arguments\n");
+        return 1;
+    }
+    const char * font_file = argv[1];
+    int size = atoi(argv[2]);
+    const char * out_file = argv[3];
+
+    FT_Library ft_library;
+    if (FT_Init_FreeType(&ft_library) != 0)
+    {
+        fprintf(stderr, "Could not initialize freetype\n");
+        return 2;
+    }
+
+    FT_Face face;
+    if (FT_New_Face(ft_library, font_file, 0, &face) != 0)
+    {
+        fprintf(stderr, "Could not open %s\n", font_file);
+        return 3;
+    }
+
+    FT_Set_Pixel_Sizes(face, 0, size);
+
+    for (int i = 0; i < N_CHARS; i++)
+    {
+        load_char(face, i);
+    }
+    line_height = round_up_26_6(face->size->metrics.height);
+    baseline_offset = (line_height - (max_top - min_bottom)) / 2 - min_bottom;
+
+    generate(out_file);
+
+    return 0;
+}

functions.h

@@ -1,46 +0,0 @@
-//functions.h
-//05/07/03 Josh Holtrop
-//for HOS
-//Modified: 10/30/03
-
-extern dword _code;
-extern dword _bss;
-extern dword _end;
-
-inline void outportb(unsigned int port, unsigned char value);
-inline void outportw(unsigned int port, unsigned int value);
-inline byte inportb(unsigned short port);
-inline void enable_ints();
-inline void disable_ints();
-inline void restart();
-inline void halt();
-void remap_pics(int pic1, int pic2);
-inline void pic1_mask(byte mask);
-inline void pic2_mask(byte mask);
-inline void eoi();
-inline void eoi2();
-inline dword kernel_size();
-inline void init_timer();
-char *strcat(char *dest, char *src);
-void	rtrim(char *str);
-char	*ucase(char *str);
-char	*lcase(char *str);
-inline byte bcd2byte(byte bcd);
-inline byte byte2bcd(byte bite);
-byte	rtc_readDay();
-byte	rtc_readMonth();
-byte	rtc_readYear();
-byte	rtc_readSecond();
-byte	rtc_readMinute();
-byte	rtc_readHour();
-void	rtc_setDay(byte dat);
-void	rtc_setMonth(byte month);
-void	rtc_setYear(byte year);
-void	rtc_setSecond(byte second);
-void	rtc_setMinute(byte minute);
-void	rtc_setHour(byte hour);
-
-
-
-
-

gccasm.bat

@@ -1 +0,0 @@
-gcc -S kernel.c -masm=intel -fno-builtin

gdt.inc

@@ -1,71 +0,0 @@
-;gdt.inc
-;Author: Josh Holtrop
-;for HOS
-;Modified: 10/30/03
-
-gdtr:
-	dw	gdt_end-gdt-1
-	dd	GDT_P
-gdt:
-	dd	0
-	dd	0
-KERNEL_CODE equ $-gdt
-	dw	0xffff	;limit 15:0
-	dw	0x0000	;base  15:0
-	db	0x00	;base  23:16
-	db	0x9A	;access ([P][DPL][1][Executable][Direction/Conforming][Writable/Readable][A])
-	db	0xCF	;flags ([G][D/B][0][0]) / limit 19:16
-	db	0x00	;base  31:24
-KERNEL_DATA equ $-gdt
-	dw	0xffff	;limit 15:0
-	dw	0x0000	;base  15:0
-	db	0x00	;base  23:16
-	db	0x92	;access ([P][DPL][1][Executable][Direction/Conforming][Writable/Readable][A])
-	db	0xCF	;flags ([G][D/B][0][0]) / limit 19:16
-	db	0x00	;base  31:24
-VESA_CODE equ $-gdt
-	dw	0xffff	;limit 15:0
-	dw	0x0000	;base  15:0
-	db	0x00	;base  23:16
-	db	0x9A	;access ([P][DPL][1][Executable][Direction/Conforming][Writable/Readable][A])
-	db	0x40	;flags ([G][D/B][0][0]) / limit 19:16
-	db	0x00	;base  31:24
-VESA_DATA equ $-gdt
-	dw	0xffff	;limit 15:0
-	dw	0x0000	;base  15:0
-	db	0x00	;base  23:16
-	db	0x92	;access ([P][DPL][1][Executable][Direction/Conforming][Writable/Readable][A])
-	db	0x40	;flags ([G][D/B][0][0]) / limit 19:16
-	db	0x00	;base  31:24
-VIDEO_TEXT equ $-gdt
-	dw	0x7FFF	;limit 15:0
-	dw	0x8000	;base  15:0
-	db	0x0B	;base  23:16
-	db	0x92	;access ([P][DPL][1][Executable][Direction/Conforming][Writable/Readable][A])
-	db	0x40	;flags ([G][D/B][0][0]) / limit 19:16
-	db	0x00	;base  31:24
-VIDEO_GRAPHICS equ $-gdt
-	dw	0xFFFF	;limit 15:0
-	dw	0x0000	;base  15:0
-	db	0x0A	;base  23:16
-	db	0x92	;access ([P][DPL][1][Executable][Direction/Conforming][Writable/Readable][A])
-	db	0x40	;flags ([G][D/B][0][0]) / limit 19:16
-	db	0x00	;base  31:24
-USER_CODE equ $-gdt
-	dw	0xffff	;limit 15:0
-	dw	0x0000	;base  15:0
-	db	0x00	;base  23:16
-	db	0xFA	;access ([P][DPL][1][Executable][Direction/Conforming][Writable/Readable][A])
-	db	0xCF	;flags ([G][D/B][0][0]) / limit 19:16
-	db	0x00	;base  31:24
-USER_DATA equ $-gdt
-	dw	0xffff	;limit 15:0
-	dw	0x0000	;base  15:0
-	db	0x00	;base  23:16
-	db	0xF2	;access ([P][DPL][1][Executable][Direction/Conforming][Writable/Readable][A])
-	db	0xCF	;flags ([G][D/B][0][0]) / limit 19:16
-	db	0x00	;base  31:24
-gdt_end:
-
-
-

getflop.bat

@@ -1 +0,0 @@
-partcopy -f0 0 168000 flop.img

i686-elf-gcc.rb

@@ -0,0 +1,75 @@
+binutils_version = "2.35"
+binutils_checksum = "1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85"
+gcc_version = "10.2.0"
+gcc_checksum = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c"
+install_path = File.expand_path("i686-elf-gcc")
+target = "i686-elf"
+path_prepend "#{install_path}/bin"
+
+configure do
+  check_c_compiler "gcc"
+  check_program "make"
+  check_program "bison"
+  check_program "flex"
+  check_program "texi2any", on_fail: "Install the texinfo package"
+  check_program "wget"
+  check_lib "gmp", on_fail: "Install the libgmp-dev package"
+  check_lib "mpc", on_fail: "Install the libmpc-dev package"
+  check_lib "mpfr", on_fail: "Install the libmpfr-dev package"
+end
+
+default do
+  unless Dir.exist?(install_path)
+    # Download archives.
+    download "https://ftp.gnu.org/gnu/binutils/binutils-#{binutils_version}.tar.xz",
+      "#{build_dir}/binutils-#{binutils_version}.tar.xz",
+      sha256sum: binutils_checksum
+
+    download "https://ftp.gnu.org/gnu/gcc/gcc-#{gcc_version}/gcc-#{gcc_version}.tar.xz",
+      "#{build_dir}/gcc-#{gcc_version}.tar.xz",
+      sha256sum: gcc_checksum
+
+    # Extract archives.
+    sh "tar", "xJf", "binutils-#{binutils_version}.tar.xz",
+      chdir: build_dir
+
+    sh "tar", "xJf", "gcc-#{gcc_version}.tar.xz",
+      chdir: build_dir
+
+    # Build binutils.
+    rm_rf "#{build_dir}/build-binutils"
+    mkdir_p "#{build_dir}/build-binutils"
+    cd "#{build_dir}/build-binutils" do
+      sh %W[../binutils-#{binutils_version}/configure
+        --target=#{target} --prefix=#{install_path} --with-sysroot --disable-nls
+        --disable-werror]
+      sh "make"
+      sh "make install"
+    end
+
+    # Build gcc.
+    rm_rf "#{build_dir}/build-gcc"
+    mkdir_p "#{build_dir}/build-gcc"
+    cd "#{build_dir}/build-gcc" do
+      sh %W[../gcc-#{gcc_version}/configure
+        --target=#{target} --prefix=#{install_path} --disable-nls
+        --enable-languages=c,c++ --without-headers]
+      sh "make all-gcc"
+      sh "make all-target-libgcc"
+      sh "make install-gcc"
+      sh "make install-target-libgcc"
+    end
+
+    # Remove archives and build directories if everything succeeded.
+    rm_f "#{build_dir}/binutils-#{binutils_version}.tar.xz"
+    rm_rf "#{build_dir}/binutils-#{binutils_version}"
+    rm_rf "#{build_dir}/build-binutils"
+    rm_f "#{build_dir}/gcc-#{gcc_version}.tar.xz"
+    rm_rf "#{build_dir}/gcc-#{gcc_version}"
+    rm_rf "#{build_dir}/build-gcc"
+  end
+end
+
+distclean do
+  rm_rf install_path
+end

idt.inc

@@ -1,111 +0,0 @@
-;idt.inc
-;Author: Josh Holtrop
-;for HOS
-;Modified: 10/30/03
-
-idtr:
-	dw	50*8-1		;size of idt
-	dd	IDT_V		;address of idt
-
-
-%macro isr_label 1
-isr_%1:
-	push	eax
-	mov	eax, %1
-	jmp	isr_main
-%endmacro
-
-isr_label	0
-isr_label	1
-isr_label	2
-isr_label	3
-isr_label	4
-isr_label	5
-isr_label	6
-isr_label	7
-isr_label	8
-isr_label	9
-isr_label	10
-isr_label	11
-isr_label	12
-isr_label	13
-isr_label	14
-isr_label	15
-isr_label	16
-isr_label	17
-isr_label	18
-isr_label	19
-isr_label	20
-isr_label	21
-isr_label	22
-isr_label	23
-isr_label	24
-isr_label	25
-isr_label	26
-isr_label	27
-isr_label	28
-isr_label	29
-isr_label	30
-isr_label	31
-isr_label	32
-isr_label	33
-isr_label	34
-isr_label	35
-isr_label	36
-isr_label	37
-isr_label	38
-isr_label	39
-isr_label	40
-isr_label	41
-isr_label	42
-isr_label	43
-isr_label	44
-isr_label	45
-isr_label	46
-isr_label	47
-isr_label	48
-isr_label	49
-
-isr_main:
-	cmp	eax, 0x30
-	jz	isr_syscall
-
-	pusha
-	push	ds
-	push	es
-
-	push	eax
-
-	call	_isr
-
-	pop	eax
-
-	pop	es
-	pop	ds
-	popa
-	pop	eax
-
-	iret
-
-
-isr_syscall:
-	pop	eax	;syscall function number
-	pusha
-	push	ds
-	push	es
-
-	push	ebx
-	call	_putc
-	add	esp, 4
-
-	pop	es
-	pop	ds
-	popa
-	iret
-
-
-
-
-
-
-

k_defines.h

@@ -1,51 +0,0 @@
-//k_defines.h
-//03/17/03 Josh Holtrop
-//Modified: 10/30/03
-
-#define	PIC1		0x20
-#define	PIC2		0xA0
-#define	PIC1_COMMAND	PIC1
-#define	PIC1_DATA	(PIC1+1)
-#define	PIC2_COMMAND	PIC2
-#define	PIC2_DATA	(PIC2+1)
-#define	PIC_EOI		0x20
-
-#define	ICW1_ICW4	0x01		/* ICW4 (not) needed */
-#define	ICW1_SINGLE	0x02		/* Single (cascade) mode */
-#define	ICW1_INTERVAL4	0x04		/* Call address interval 4 (8) */
-#define	ICW1_LEVEL	0x08		/* Level triggered (edge) mode */
-#define	ICW1_INIT	0x10		/* Initialization - required! */
-
-#define	ICW4_8086	0x01		/* 8086/88 (MCS-80/85) mode */
-#define	ICW4_AUTO	0x02		/* Auto (normal) EOI */
-#define	ICW4_BUF_SLAVE	0x08		/* Buffered mode/slave */
-#define	ICW4_BUF_MASTER	0x0C		/* Buffered mode/master */
-#define	ICW4_SFNM	0x10		/* Special fully nested (not) */
-
-#define BLUE_TXT	0x01
-#define RED_TXT		0x04
-#define WHITE_TXT	0x07
-#define CYAN_TXT	0x0B
-#define YELLOW_TXT	0x0E
-#define BRWHITE_TXT	0x0F
-
-#define FREERAM_START	0x368000	// 0x368000 is first available byte (this is right after the initrd @ 2mb, 1440kb.
-#define MAX_RAM		0x40000000	//1gb maximum RAM supported
-
-#define PID_KERNEL	0x02		//kernel's PID
-#define PID_VMM		0x03
-#define PID_USER	0x10000		//user processes' start PID
-
-typedef	unsigned char	byte;
-typedef	unsigned short	word;
-typedef	unsigned int	dword;
-
-typedef struct {
-	dword	lowdword;
-	dword	highdword;
-} __attribute__((packed)) qword;
-
-
-
-
-

kernel.asm

@@ -1,101 +0,0 @@
-;kernel.asm
-;Author: Josh Holtrop
-;Modified: 10/30/03
-
-%define GDT_P	0x100000;	;1mb physical - Global Descriptor Table space
-%define GDT_V	GDT_P+0xC0000000
-%define IDT_P	0x102000	;1mb+8kb - Interrupt Descriptor Table space
-%define IDT_V	IDT_P+0xC0000000
-%define PDBR_P	0x104000	;1mb+16kb - Page Directory Base Register (first PD)
-%define PDBR_V	PDBR_P+0xC0000000
-%define LOPT_P	0x105000	;1mb+20kb - LOw Page Table for mapping first 4mb
-%define LOPT_V	LOPT_P+0xC0000000
-%define KERNEL_P 0x106000	;1mb+24kb - the kernel's physical address
-%define KERNEL_V KERNEL_P+0xC0000000	;3gb+1mb+24kb, the virtual address of the kernel
-
-[global start]
-[extern _isr]
-[extern _k_init]
-[extern _putc]
-
-bits 32
-
-;This is where the kernel begins execution
-;At this point, the temporary gdt is set up to "map" 0xC000_0000 to 0x0.
-;We must enable paging with the first 4mb mapped 1:1 virtual:physical
-; and with the 4mb starting at 0xC000_0000 mapped to the first 4mb physical.
-;Then we can start using our "real" gdt, then unmap the lower 4mb.
-start:
-	cli					;if they weren't already off
-	
-	xor	eax, eax
-	mov	edi, PDBR_V
-	mov	ecx, 1024			;clear the PDBR
-	rep stosd
-	mov	[PDBR_V], dword LOPT_P|0x03		;store the physical address of the LOw Page Table (read/write, present)
-	mov	[PDBR_V+0xC00], dword LOPT_P|0x03	;store the physical address of the LOw Page Table (read/write, present)
-
-	mov	edi, LOPT_V
-	mov	ecx, 1024
-	mov	eax, 0x03			;starting physical address = 0x0 (read/write, present flags)
-fill_lopt_loop:					;fill the page table
-	stosd
-	add	eax, 4096			;increment next phsyical address by 4kb
-	loop	fill_lopt_loop
-
-	mov	eax, PDBR_P
-	mov	cr3, eax			;store the Page Directory Base Address
-	mov	eax, cr0
-	or	eax, 0x80000000			;set page enable bit
-	mov	cr0, eax			;now paging is active!
-
-
-	mov	edi, GDT_V
-	mov	esi, gdt
-	mov	ecx, gdt_end-gdt
-copy_gdt:
-	lodsb
-	stosb
-	loop	copy_gdt
-
-	mov	edi, IDT_V		;destination
-	mov	esi, isr_0		;address of isr0
-	mov	edx, isr_1-isr_0	;distance between isr labels
-	mov	ecx, 50			;number of isrlabels
-fill_idt:
-	mov	ebx, esi
-	mov	ax, si
-	stosw				;0 offset 15:0
-	mov	ax, KERNEL_CODE
-	stosw				;2 selector 15:0
-	mov	ax, 0x8E00
-	stosw				;4 [P][DPL][0][TYPE][0][0][0][0][0][0][0][0]
-	shr	esi, 16
-	mov	ax, si
-	stosw				;6 offset 31:16
-	mov	esi, ebx
-	add	esi, edx
-	loop	fill_idt
-	mov	word	[IDT_V+0x30*8+4], 0xEE00	;interrupt 0x30 has user priviledges
-
-	lgdt	[gdtr]			;load gdt
-	jmp	KERNEL_CODE:newgdtcontinue
-newgdtcontinue:
-	mov	ax, KERNEL_DATA
-	mov	es, ax
-	mov	ds, ax
-	mov	gs, ax
-	mov	fs, ax
-	mov	ss, ax
-	mov	esp, 0xc01ffffc		;stack just under 3gb+2mb, moves downward
-	lidt	[idtr]			;load idt
-
-	call	_k_init
-haltit:
-	hlt				;halt processor when k_init is done
-	jmp	haltit			;shouldn't get here...
-
-%include "gdt.inc"
-%include "idt.inc"
-
-

kernel.c

@@ -1,144 +0,0 @@
-//kernel.c
-//08/13/03 Josh Holtrop
-//Holtrop's Operating System
-//Version: 0.12
-//Modified: 12/30/03
-
-#include "k_defines.h"		//#DEFINE's for kernel
-
-
-#include "functions.h"		//general functions
-#include "video.h"		//video functions
-#include "mm.h"			//physical memory management functions
-#include "vmm.h"		//virtual memory management & paging functions
-#include "keyboard.h"		//generic keyboard driver & functions
-#include "mouse.h"		//generic ps/2 mouse driver & functions
-#include "fdc.h"		//Floppy Disk Controller functions
-#include "stdfont.h"		//Standard font bitmask array
-#include "kio.h"
-#include "vfs.h"
-#include "rd.h"
-#include "fat12.h"
-
-void isr(dword num);
-void k_init();
-
-/* These functions are defined in asmfuncs.asm */
-extern dword write_cr0(dword cr0);
-extern dword read_cr0();
-extern dword write_cr3(dword cr3);
-extern dword read_cr2();
-extern dword read_cr3();
-extern void writeCursorPosition(dword pos);
-extern dword getCursorPosition();
-extern void console_scroll();
-extern void console_cls();
-extern int puts(char *str);
-extern int putDec(int number);
-extern int putDecu(dword number);
-extern void strcpy(char *dest, char *src);
-extern void memcpy(void *dest, void *src, dword n);
-extern dword strlen(char *str);
-
-#include "fat12.c"
-#include "rd.c"
-#include "vfs.c"
-#include "kio.c"
-#include "fdc.c"
-#include "mouse.c"
-#include "keyboard.c"
-#include "mm.c"
-#include "vmm.c"
-#include "functions.c"
-#include "video.c"
-
-dword	timer = 0;
-
-//Main kernel initialization method
-void k_init()
-{
-		// ===== Initialization
-	fdc_sendDOR(0x0C);		//turn off floppy motor!!
-	console_cls();
-	video_init();
-	mm_init();
-	vmm_init();
-	remap_pics(0x20, 0x28);
-	init_timer();
-	mouse_init();
-	pic1_mask(0);			//unmask IRQ's 0-7
-	pic2_mask(0);			//unmask IRQ's 8-15
-	vfs_init();
-	enable_ints();
-	kbd_resetLEDs();		//after enabling interrupts!!
-	if (videoMode)
-	{
-		int p = video_mode.XResolution*video_mode.YResolution-1;
-		for (; p >= 0; p--)
-			video_psetp(p, 0x00000044);
-		video_drawConsole();
-	}
-
-	printf("HOS 0.13 - Kernel File Size: %u kb\tData Size: %u bytes\n", kernel_size()>>10, (dword)(&_end)-(dword)(&_code));
-	printf("Memory available to OS: %u MB (%u bytes)\n", mm_megabytes, mm_totalmem);
-	printf("Free memory: %u bytes (%u pages)\n", mm_freemem(), mm_freemem()>>12);
-	printf("%d/%d/%d\t%d:%d:%d\n", rtc_readMonth(), rtc_readDay(), rtc_readYear(), rtc_readHour(), rtc_readMinute(), rtc_readSecond());
-	printf("Root Directory: %s/\n", rootDevice->id);
-
-
-/*	int a;
-	byte *addr = 0;
-	for (a = 0; a < 5; a++)
-	{
-		byte *app = mm_palloc();
-		vmm_map1((dword)addr, (dword)app);
-		addr += 4096;
-	}
-
-	addr = vfs_readFile("/bin/hash.hos");
-	memcpy(0, addr, 4192);
-	asm("call 0");
-	free(addr);
-*/
-
-	dword key = 0;
-	for (;;)
-	{
-		key = kbdWaitKey();
-		if ((key & 0xFF) > 2)	//key is not a control key
-			putc(key);
-	}
-}
-
-// main Interrupt Service Routine - handles all interrupts unless caught by kernel.asm
-void isr(dword num)
-{
-	switch(num)
-	{
-	case 14:
-		printf("Page fault, CR2 = 0x%x\n", read_cr2());
-		halt();
-		break;
-	case 0x20:         		// IRQ0 - timer interrupt
-		timer++;
-		(*(byte *)(0xc00b8000))++;
-		eoi();
-		break;
-	case 0x21:  			// IRQ1 - keyboard interrupt
-		isr_keyboard();    	//isr_keybard() takes care of calling eoi()
-		break;
-	case 0x2C:			// IRQ12 - PS/2 mouse
-		isr_mouse();
-		eoi2();
-		break;
-	default:
-		printf("Interrupt %d (0x%x) Unhandled!!\n", num, num);
-		halt();
-		break;
-	}
-}
-
-
-
-
-

keyboard.c

@@ -1,254 +0,0 @@
-//Keyboard.c
-// Created: 04/17/03 Josh Holtrop
-// Modified: 10/30/03
-//for HOS
-
-#define KBD_BUFFER_LENGTH 64
-
-byte kbdFlags = 0;		//holds current keyboard flags - caps/num/scroll/shift/ctrl/alt
-byte kbdAscii = 0;		//holds ASCII value of a key pressed
-byte kbdScan = 0;		//holds the keyboard scan code of a key pressed
-
-dword kbdBuffer[KBD_BUFFER_LENGTH];	//a buffer for all keypresses
-int kbdBufferStart = 0;			//position of next key in buffer
-int kbdBufferLen = 0;			//number of keys left in the buffer
-byte kbdExt = 0;			//# of extended key codes left to input
-byte kbdExt2 = 0;                       //# of 2nd-set-extended key codes left to input
-byte ackReason = 0;		//used to record the reason why we would get an acknowledge byte (0xFA)
-
-
-//these arrays convert a keyboard scan code to an ASCII character value
-                                   //nul esc            bksp tab              lctl            lsft            rsft lalt caps F1  F2  F3  F4  F5  F6  F7  F8  F9  F10 numScrlNumPad-------                                  unknown---- F11 F12 unknown....
-const byte SCAN2ASCII[128]      = "\000\0331234567890-=\010\011qwertyuiop[]\n\001asdfghjkl;'`\001\\zxcvbnm,./\001*\001 \001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001-\001\001\001+\001\001\001\001\001\002\002\002\001\001\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002";
-const byte SCAN2ASCIISHIFT[128] = "\000\033!@#$%^&*()_+\010\011QWERTYUIOP{}\n\001ASDFGHJKL:\"~\001|ZXCVBNM<>?\001*\001 \001\001\001\001\001\001\001\001\001\001\001\001\001789-456+1230.\002\002\002\001\001\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002";
-
-//====FUNCTIONS:
-// The Keyboard Interrupt Service Routine
-void isr_keyboard()
-{
-	kbdScan = inportb(0x60);
-	//printf("\nKEYBOARD INTERRUPT: 0x%x", kbdScan);
-	byte inState = inportb(0x61);
-	outportb(0x61, inState|0x80);
-	outportb(0x61, inState);
-	
-	//printf("IRQ 1: %x\n", kbdScan);
-
-	if (kbdScan == 0xFA)	//250					//ACKnowledge
-	{
-		//printf("KBD_ACK 0x%x!\n", ackReason);
-		if (ackReason == 0xED)					//reset LEDs
-		{
-			outportb(0x60, (kbdFlags & 0x07));
-		}
-		ackReason = 0;
-	}
-	if (kbdScan == 224)						//extended key
-	{
-		kbdExt = 1;
-		eoi();
-		return;
-	}
-	if (kbdScan == 225)						//2nd-set-extended key
-	{
-		kbdExt2 = 2;
-		eoi();
-		return;
-	}
-
-//====handle control keys::
-	kbdAscii = 2;
-	switch (kbdScan)						//control keys
-	{
-		case KBD_SCAN_LSHIFT:
-			kbdFlags |= KBD_SHIFT;
-			kbdAscii = 1;
-			break;
-		case KBD_SCAN_RSHIFT:
-			kbdFlags |= KBD_SHIFT;
-			kbdAscii = 1;
-			break;
-		case KBD_SCAN_LCTRL:
-			kbdFlags |= KBD_CTRL;
-			kbdAscii = 1;
-			break;
-		case KBD_SCAN_LALT:
-			kbdFlags |= KBD_ALT;			
-			kbdAscii = 1;
-			break;
-
-		case KBD_SCAN_LSHIFT + KBD_SCAN_RELEASED:
-			kbdFlags &= (KBD_SHIFT ^ 0xFF);
-			kbdAscii = 1;
-			break;
-		case KBD_SCAN_RSHIFT + KBD_SCAN_RELEASED:
-			kbdFlags &= (KBD_SHIFT ^ 0xFF);
-			kbdAscii = 1;
-			break;
-		case KBD_SCAN_LCTRL + KBD_SCAN_RELEASED:
-			kbdFlags &= (KBD_CTRL ^ 0xFF);
-			kbdAscii = 1;
-			break;
-		case KBD_SCAN_LALT + KBD_SCAN_RELEASED:
-			kbdFlags &= (KBD_ALT ^ 0xFF);
-			kbdAscii = 1;
-			break;
-
-		case KBD_SCAN_CAPS+KBD_SCAN_RELEASED:
-			kbdFlags ^= KBD_CAPS;
-			kbdAscii = 1;
-			kbd_resetLEDs();				//update LEDs
-			break;
-		case KBD_SCAN_SCROLL+KBD_SCAN_RELEASED:
-			kbdFlags ^= KBD_SCROLL;
-			kbdAscii = 1;
-			kbd_resetLEDs();				//update LEDs
-			break;
-		case KBD_SCAN_NUM+KBD_SCAN_RELEASED:
-			kbdFlags ^= KBD_NUM;
-			kbdAscii = 1;
-			kbd_resetLEDs();				//update LEDs
-			break;
-	}
-	if (kbdAscii == 1)
-	{
-		if (kbdExt > 0)
-			kbdExt--;
-		eoi();
-		return;
-	}
-//====determine ASCII value of key::
-	if (kbdExt > 0)						//extended key, kbdScan holds extended key
-	{
-		kbdExt--;
-		kbdAscii = 1;
-		switch (kbdScan)
-		{
-			case KBD_SCANE_ENTER:
-				kbdAscii = '\n';	break;
-			case 53:				// '/' character (divide on numpad)
-				kbdAscii = '/';		break;
-		}
-	}
-	else if (kbdExt2 > 0)					//extended key 2
-	{
-		kbdExt2--;
-//		if (kbdScan == 69)				// (pause|break)
-//			kbdAscii = 2;				//flag ascii value of 1 means control character (pausebreak)
-//		else
-			kbdAscii = 2;				//flag ascii value of 2 means ignore key (or unknown value)
-	}
-	else							//not an extended key
-	{
-			// if letter key
-		if (((kbdScan >= 16) && (kbdScan <= 25)) || ((kbdScan >= 30) && (kbdScan <= 38)) || ((kbdScan >= 44) && (kbdScan <= 50)))
-		{
-			// if caps and shift are different (either one pressed, not both)
-			if (((kbdFlags & KBD_SHIFT) != 0) & ((kbdFlags & KBD_CAPS) != 0))
-				kbdAscii = SCAN2ASCII[kbdScan & 0x7F];
-			else if (((kbdFlags & KBD_SHIFT) == 0) & ((kbdFlags & KBD_CAPS) == 0))
-				kbdAscii = SCAN2ASCII[kbdScan & 0x7F];
-			else
-				kbdAscii = SCAN2ASCIISHIFT[kbdScan & 0x7F];
-		}
-			// if numpad key
-		else if ((kbdScan >= 71) && (kbdScan <= 83))
-		{
-			// if numlock on
-			if (kbdFlags & KBD_NUM)
-				kbdAscii = SCAN2ASCIISHIFT[kbdScan & 0x7F];
-			else
-				kbdAscii = SCAN2ASCII[kbdScan & 0x7F];
-		}
-			// other key
-		else
-		{
-			if ((kbdFlags & KBD_SHIFT) != 0)
-				kbdAscii = SCAN2ASCIISHIFT[kbdScan & 0x7F];
-			else
-				kbdAscii = SCAN2ASCII[kbdScan & 0x7F];
-		}
-	}
-
-//====do something with key::
-//	printf("kbdScan == %d\nkbdAscii == %d\nkbdFlags == %d\n", kbdScan, kbdAscii, kbdFlags);
-	if ((kbdScan == 83) && (kbdFlags & KBD_CTRL) && (kbdFlags & KBD_ALT))
-	{
-		printf("Initiating reboot.");
-		restart();
-	}
-	if (kbdAscii == 2)							//unknown key / ignore key
-	{
-		eoi();
-		return;
-	}
-	if (kbdScan < KBD_SCAN_RELEASED)					//a key was pressed, save it
-	{
-		if (kbdBufferLen >= KBD_BUFFER_LENGTH)				//no key slots available
-		{
-			eoi();
-			return;
-		}
-		else
-		{
-			kbdBuffer[(kbdBufferStart+kbdBufferLen++)%KBD_BUFFER_LENGTH] = (dword) ((kbdFlags << 16) | (kbdScan << 8) | kbdAscii);
-//			printf("S:%d\tL:%d\tR:%x\n", kbdBufferStart, kbdBufferLen, kbdBuffer[kbdBufferStart]);
-		}
-	}
-
-	eoi();
-
-}
-
-//Switches the case of an ASCII character
-/*inline byte (byte asciiCode)
-{
-	if ((asciiCode >= 'A') & (asciiCode <= 'Z'))
-		return (asciiCode + ('a' - 'A'));
-	if ((asciiCode >= 'a') & (asciiCode <= 'z'))
-		return (asciiCode - ('a' - 'A'));
-	return asciiCode;
-}*/
-
-//Gets a key from the buffer, returns 0 if no keys available, returns immediately
-dword kbdGetKey()
-{
-	if (kbdBufferLen == 0)					//buffer empty
-		return 0;
-	dword retVal = kbdBuffer[kbdBufferStart];
-	kbdBufferStart++;
-	kbdBufferLen--;
-	if (kbdBufferStart >= KBD_BUFFER_LENGTH)
-		kbdBufferStart = 0;
-	return retVal;
-}
-
-//Gets a key from the buffer, if no keys available, waits for one to be entered
-dword kbdWaitKey()
-{
-	for (;;)
-	{
-		if (kbdBufferLen != 0)					//buffer empty
-			break;
-	}		
-	dword retVal = kbdBuffer[kbdBufferStart];
-	kbdBufferStart++;
-	kbdBufferLen--;
-	if (kbdBufferStart >= KBD_BUFFER_LENGTH)
-		kbdBufferStart = 0;
-	return retVal;
-}
-
-//Resets the keyboard LEDs to reflect the current state of the num lock, caps lock, and scroll lock bits
-inline void kbd_resetLEDs()
-{
-	outportb(0x60, 0xED);
-	//outportb(0x60, (kbdFlags & 0x07));
-	ackReason = 0xED;
-}
-
-
-
-
-
-

keyboard.h

@@ -1,47 +0,0 @@
-//Keyboard.h
-// Created: 04/17/03 Josh Holtrop
-// Modified: 05/07/03
-//for HOS
-
-#define KBD_SCROLL 0x01
-#define KBD_NUM 0x02
-#define KBD_CAPS 0x04
-#define KBD_SHIFT 0x10
-#define KBD_CTRL 0x20
-#define KBD_ALT 0x40
-
-#define KBD_SCAN_RELEASED 128
-
-#define KBD_SCAN_LCTRL 29
-#define KBD_SCAN_LSHIFT 42
-#define KBD_SCAN_RSHIFT 54
-#define KBD_SCAN_LALT 56
-#define KBD_SCAN_SCROLL 70
-#define KBD_SCAN_CAPS 58
-#define KBD_SCAN_NUM 69
-
-#define KBD_SCANE_PRINTSCREEN 55
-#define KBD_SCANE_INS 82
-#define KBD_SCANE_HOME 71
-#define KBD_SCANE_PGUP 73
-#define KBD_SCANE_DEL 83
-#define KBD_SCANE_END 79
-#define KBD_SCANE_PGDN 81
-#define KBD_SCANE_ENTER 28
-
-#define KBD_SCANE_NULL 42
-
-
-
-//====PROTOTYPES:
-
-void isr_keyboard();
-inline void kbd_resetLEDs();
-inline byte kbd_ascii(dword keycode);
-inline byte kbd_scancode(dword keycode);
-inline byte kbd_flags(dword keycode);
-inline byte switchCase(byte asciiCode);
-dword kbdGetKey();
-dword kbdWaitKey();
-
-

kio.c

@@ -1,133 +0,0 @@
-
-//kio.c
-// Author: Josh Holtrop
-// Created: 12/25/03
-// Modified: 12/25/03
-
-
-// This is the main output routine, it uses a format string and a variable
-//  number of arguments to print formatted text
-void	printf(char *fmt, ...)
-{
-	dword *params = ((dword *)(&fmt)) + 1;		//points to the first paramater
-	int i;
-	int special = 0;
-	for (i = 0; ; i++)
-	{
-		if (special)
-		{
-			special = 0;
-			switch (fmt[i])
-			{
-			case 0:
-				return;
-			case '%':
-				putc('%');
-				break;
-			case 's': case 'S':
-				puts((char *)*params);
-				params++;
-				break;
-			case 'c': case 'C':
-				putc(*params);
-				params++;
-				break;
-			case 'd': case 'D':
-				putDec(*params);
-				params++;
-				break;
-			case 'u': case 'U':
-				putDecu(*params);
-				params++;
-				break;
-			case 'x': case 'X':
-				putHex(*params);
-				params++;
-				break;
-			}
-		}
-		else
-		{
-			switch (fmt[i])
-			{
-			case '%':
-				special = 1;
-				break;
-			case 0:
-				return;
-			default:
-				putc(fmt[i]);
-			}
-		}
-	}
-}
-
-
-// This function draws a single character
-void	putc(dword chr)
-{
- 	char charac = (char)chr;
-	word *vidmem = (word *)0xC00B8000;
-	if (charac == '\n')
-	{
-		if (cursorPosition % 80)
-			cursorPosition = cursorPosition + 80 - (cursorPosition % 80);
-		else
-			cursorPosition += 80;
-	}
-	else if (charac == '\t')
-	{
-		if (cursorPosition % 8)
-			cursorPosition = cursorPosition + 8 - (cursorPosition % 8);
-		else
-			cursorPosition += 8;
-	}
-	else
-	{
-		if (videoMode)
-		{
-			console_memory[cursorPosition] = charac | 0x0700;
-			video_drawConsoleChar(cursorPosition);
-		}
-		else
-		{
-			console_memory[cursorPosition] = charac | 0x0700;
-			vidmem[cursorPosition] = charac | 0x0700;
-		}
-		cursorPosition++;
-	}
-	if (cursorPosition >= 2000)
-	{
-		console_scroll();
-		cursorPosition = 2000-80;
-		if (videoMode)
-			video_drawConsole();
-	}
-	if (!videoMode)
-		writeCursorPosition(cursorPosition);
-}
-
-
-// This function displays a number in hexadecimal
-int putHex(dword number)
-{
-	int hitNum = 0;
-	int i;
-	for (i = 7; i >= 0; i--)
-	{
-		dword val = (number >> (i*4)) & 0xF;
-		if ((val != 0) || (i == 0))
-			hitNum = 1;
-		if (hitNum)
-		{
-			val = val + '0';
-			if (val > '9')
-				val = val + ('A' - '9' - 1);
-			putc(val);
-		}
-	}
-}
-
-
-
-

kio.h

@@ -1,15 +0,0 @@
-//kio.h
-// Author: Josh Holtrop
-// Created: 12/25/03
-// Modified: 12/25/03
-
-
-
-void	printf(char *fmt, ...);
-void	putc(dword chr);
-int	putHex(dword number);
-
-
-dword	cursorPosition = 0;		//Caches the current cursor position
-
-

link.bat

@@ -1 +0,0 @@
-ld -nodefaultlibs -nostdlib -T link.ld -o kernel.bin -Map .\lst\LDout.doc ks.o kernel.o asmfuncs.o

link.ld

@@ -1,22 +0,0 @@
-OUTPUT_FORMAT("binary")
-ENTRY(start)
-SECTIONS
-{
-  .text  0xC0106000 : {
-    code = .; _code = .; __code = .;
-    *(.text)
-    . = ALIGN(4096);
-  }
-  .data  : {
-    data = .; _data = .; __data = .;
-    *(.data)
-    . = ALIGN(4096);
-  }
-  .bss  :
-  {
-    bss = .; _bss = .; __bss = .;
-    *(.bss)
-    . = ALIGN(4096);
-  }
-  end = .; _end = .; __end = .;
-}

mm.c

@@ -1,121 +0,0 @@
-// mm.c
-// Author: Josh Holtrop
-// Created: 09/01/03
-// Modified: 12/28/03
-
-//The total amount of physical memory available (bytes)
-#define BITMAP_SIZE	0x20000
-dword	mm_totalmem = 0;
-dword	mm_megabytes;
-byte	page_bitmap[BITMAP_SIZE];		//used to store a bit for each page that is used, 0 if available
-					//0x20000*(8 bits/byte)=0x100000 pages in 4gb total
-
-//This function initializes the memory manager's linked list, filling it with the
-// memory areas returned by bios interrupt 0x8E20
-void	mm_init()
-{
-	dword	memmap_entries = *(dword *)0xC009040A;
-	memmap_entry	*maps = (memmap_entry *) 0xC0092000;
-	dword a;
- 	for (a = 0; a < BITMAP_SIZE; a++)
- 	{
- 		page_bitmap[a] = 0xFF;	//all pages used
- 	}
-	for (a = 0; a < memmap_entries; a++)
-	{
-		if (maps[a].attributes == 1)		// (1) mem free to OS
-		{
-			mm_totalmem += maps[a].limit.lowdword;
-			if  ((maps[a].base.lowdword + maps[a].limit.lowdword) >= (FREERAM_START+4096))	//goes past where we start freeram
-			{
-				if (maps[a].base.lowdword < FREERAM_START)
-				{
-					mm_pfreen(FREERAM_START, (maps[a].limit.lowdword - (FREERAM_START - maps[a].base.lowdword)) >> 12);
-				}
-				else
-				{
-					mm_pfreen(maps[a].base.lowdword, maps[a].limit.lowdword >> 12);	//set the appropriate bits as "free" in the page bitmap
-				}
-			}
-		}
-	}
-	if (mm_totalmem % 0x100000)
-		mm_megabytes = (mm_totalmem >> 20) + 1;
-	else
-		mm_megabytes = mm_totalmem >> 20;
-}
-
-
-// This function frees a certain number of pages starting at the address
-//  specified in base for a length of pages pages
-void	mm_pfreen(dword base, dword pages)
-{
-	dword a;
-	dword max = base + (pages << 12);
-	for (a = base; a < max; a += 4096)
-	{
-		mm_pfree(a);
-	}
-}
-
-
-// This function frees a single page
-void	mm_pfree(dword base)
-{
-//	dword pageNumber = base >> 12;	// >>12 == /4096
-	dword byteNumber = base >> 15;	//pageNumber >> 3;	//pageNumber/8
-	dword bitNumber = (base >> 12) % 8; //pageNumber % 8;
-	page_bitmap[byteNumber] = page_bitmap[byteNumber] & ((0x01 << bitNumber) ^ 0xFF);
-}
-
-
-// This function allocates a single page, returning its physical address
-void	*mm_palloc()
-{
-	dword bite;
-	for (bite = 0; bite < BITMAP_SIZE; bite++)
-	{
-		if (page_bitmap[bite] != 0xFF)	//there is an available page within this 8-page region
-		{
-			int bit;
-			for (bit = 0; bit < 8; bit++)
-			{
-				if (!(page_bitmap[bite] & (1 << bit)))	//this bite/bit combination is available
-				{
-					page_bitmap[bite] = page_bitmap[bite] | (1 << bit);	//set page as used
-					return (void *)((bite << 15) | (bit << 12));
-				}
-			}
-		}
-	}
-	return 0;	//no free page
-}
-
-
-// This function reports the number of bytes of free physical memory
-dword	mm_freemem()
-{
-	dword a;
-	dword pages = 0;
-	for (a = 0; a < BITMAP_SIZE; a++)
-	{
-		int bit;
-		for (bit = 0; bit < 8; bit++)
-		{
-			if (!(page_bitmap[a] & (1 << bit)))
-				pages++;
-		}
-	}
-	return pages << 12;
-}
-
-
-
-
-
-
-
-
-
-
-

mm.h

@@ -1,21 +0,0 @@
-
-
-typedef struct {
-	qword	base;
-	qword	limit;
-	dword	attributes;
-} __attribute__((packed)) memmap_entry;
-
-
-
-void	mm_init();
-void	mm_pfreen(dword base, dword pages);
-void	mm_pfree(dword base);
-void	*mm_palloc();
-dword	mm_freemem();
-
-
-
-
-
-

mouse.c

@@ -1,60 +0,0 @@
-// mouse.c
-// 10/03/03
-// Author: Josh Holtrop
-
-
-//This method initializes the ps/2 mouse
-void mouse_init()
-{
-	outportb(0x64, 0x20);		//tell keyboard controller we are going to read keyboard controller command byte
-	byte temp = inportb(0x60);	//read keyboard controller command byte
-	outportb(0x64, 0x60);		//tell keyboard controller we are going to write keyboard controller command byte
-	outportb(0x60, 0x03 | (temp&0x40));	//write keyboard controller command byte: enable mouse/keyboard ints, include original XLATE bit from temp (bit6)
-
- 	outportb(0x64, 0xA8);	//enable mouse port
-
-	outportb(0x64, 0xD4);	//send command to mouse, not kbd
-	outportb(0x60, 0xF4);	//enable data reporting
-	
-	mouse_x = video_mode.XResolution >> 1;
-	mouse_y = video_mode.YResolution >> 1;
-
-	//outportb(0x64, 0xD4);
-	//outportb(0x60, 0xE7);	//scaling 2:1
-}
-
-
-//This method is called when a mouse interrupt occurs
-void isr_mouse()
-{
-	byte inb = inportb(0x60);	//read mouse byte
-	if ((inb == 0xFA) && (mouse_bytesRead < 1))		//ACK
-		return;
-	mouse_inbuffer[mouse_bytesRead] = inb;
-	mouse_bytesRead++;
-	if (mouse_bytesRead == 3)	//complete packet received
-	{
-		mouse_bytesRead = 0;
-		int adjx = (char) mouse_inbuffer[1];
-		int adjy = (char) mouse_inbuffer[2];
-		mouse_x += adjx;
-		mouse_y -= adjy;						//-= because screen y coordinates are opposite mouse y coordinates
-		if (mouse_x < 0)
-			mouse_x = 0;
-		if (mouse_x >= video_mode.XResolution)
-			mouse_x = video_mode.XResolution - 1;
-		if (mouse_y < 0)
-			mouse_y = 0;
-		if (mouse_y >= video_mode.YResolution)
-			mouse_y = video_mode.YResolution - 1;
-		if (mouse_inbuffer[0] & 0x01)	//left button
-			video_pset(mouse_x, mouse_y, 0x00FF8800);
-		else
-			video_pset(mouse_x, mouse_y, 0x00FFFFFF);
-	}
-}
-
-
-
-
-

mouse.h

@@ -1,17 +0,0 @@
-// mouse.h
-// 10/03/03
-// Author: Josh Holtrop
-
-
-int mouse_x;
-int mouse_y;
-int mouse_bytesRead = 0;
-byte mouse_inbuffer[16];
-
-void mouse_init();
-void isr_mouse();
-
-
-
-
-

rd.c

@@ -1,14 +0,0 @@
-// rd.c
-// Author: Josh Holtrop
-// Created: 12/31/03
-// Modified: 01/04/04
-
-
-byte	*rd_readSector(DiskDevice *rd, dword sector, byte *dest)
-{
-	memcpy(dest, (void *)(rd->location + (sector * 512)), 512);
-	return dest;
-}
-
-
-

rd.h

@@ -1,9 +0,0 @@
-// rd.h
-// Author: Josh Holtrop
-// Created: 12/31/03
-// Modified: 01/04/04
-
-
-byte	*rd_readSector(DiskDevice *rd, dword sector, byte *dest);
-
-

readme.txt

@@ -0,0 +1,89 @@
+HOS - Holtrop's Operating System
+--------------------------------
+
+HOS is (in the process of becoming) a 32-bit, protected mode, graphical, multitasking operating system.
+It was written by me, Josh Holtrop, with help from a few others along the way.
+
+
+Goals: (A = accomplished, P = in progress, T = todo)
+----------------------------------------------------
+(A) Custom bootloader to load kernel from FAT-formatted boot media, options for video mode/ram disk
+(A) Multiboot compliance - kernel can be loaded by GRUB
+(A) 32-bit protected mode environment
+(A) VESA Support for graphics modes
+(A) PS/2 keyboard & mouse drivers
+(A) Utilize x86's paging architecture for virtual memory management
+
+(P) Console Manager
+(P) VFS abstraction layer for a single file system
+(P) ram disk driver
+(P) devfs file system driver
+(P) ext2 file system support
+
+(T) vfat file system support
+(T) Multitasking support
+(T) HASH command shell
+(T) Window Manager
+(T) Various other utilities/applications
+(T) Hard Drive (ATA) driver
+(T) cdrom (ATAPI) driver
+
+
+Change Log
+----------
+0.16
+12/16/04 - initrd going to be loaded as a gzipped ext2 image (kernel module) - faster loading!
+
+0.15
+07/10/04 - Multiboot support added, loadable by GRUB
+
+0.14
+05/21/04 - C++ support in kernel, can use classes & templates
+04/04/04 - video_line function for diagonal lines
+03/16/04 - new VFS design with support for a loop device
+03/01/04 - Thanks to Ben Meyer for helping me get a Makefile working and building on linux to work!
+
+0.13
+01/26/04 - functions added to read/write CMOS clock date and time
+01/19/04 - fixed bug GDTR/IDTR pointing to physical rather than linear table base address
+01/07/04 - fixed bug not reading sectors correctly from floppy
+12/28/03 - fixed bug not storing eax on interrupt
+12/25/03 - fixed bug in mm_palloc()
+12/25/03 - incorporated output functions as regular functions rather than as part of a linked library
+12/23/03 - re-written physical memory manager using bitmap instead of stack
+12/22/03 - kernel relocated to 3gb linear / 1mb+24kb physical to allow for app. address space
+
+0.12
+12/21/03 - sample bmp loader tested, works (tests loading a kernel of size ~ 932kb)
+12/20/03 - GDT/IDT now located at 1mb physical, before kernel
+10/30/03 - turns floppy motor off
+10/30/03 - keyboard LEDs working
+10/29/03 - paging functions working
+10/15/03 - physical memory management page allocators working
+
+0.11
+10/09/03 - PS/2 mouse driver
+
+0.10
+09/11/03 - Rewritten C and assembly kernel with VESA GUI mode support, keyboard driver
+
+0.05
+05/14/03 - HGUI24/HGUI32 commands finished for testing GUI on both 24bpp and 32bpp graphics cards
+05/14/03 - first web release!
+
+0.04
+03/09/03 - added VM shortcut command
+03/09/03 - press up to fill retrieve last inputted command for Nate Scholten
+03/08/03 - press clear to clear console input
+03/07/03 - added "shortcut" commands PC, IC, ? for Nate Scholten
+03/06/03 - added PROMPTC, INPUTC commands
+
+0.03
+12/30/02 - Command Line Interface working, accepting basic commands
+
+0.02
+12/11/02 - Assembly bootsector can load stage2 ("console")
+
+0.01
+12/01/02 - Real mode assembly bootsector boots from floppy disk successfully
+

src/boot.S

@@ -0,0 +1,18 @@
+.global hos_start
+.type hos_start, @function
+hos_start:
+    /* Set stack pointer. */
+    mov $_stack_end, %esp
+ 
+    /* Jump to C. */
+    push $0
+    push $0
+    push $0
+    push %ebx
+    call hos_main
+ 
+    cli
+1:  hlt
+    jmp 1b
+ 
+.size hos_start, . - hos_start

src/fb.c

@@ -0,0 +1,116 @@
+#include "fb.h"
+#include <stddef.h>
+#include "mem.h"
+
+static struct {
+    uint32_t * addr;
+    uint32_t width;
+    uint32_t height;
+    uint32_t pitch;
+} fb;
+
+static inline uint32_t build_pixel(uint8_t r, uint8_t g, uint8_t b)
+{
+    return (r << 16u) | (g << 8u) | b;
+}
+
+static inline void fb_set_pixel(int x, int y, uint8_t r, uint8_t g, uint8_t b)
+{
+    fb.addr[fb.pitch * y + x] = build_pixel(r, g, b);
+}
+
+void fb_clear(void)
+{
+    memset32(fb.addr, 0u, fb.pitch * fb.height);
+}
+
+void fb_init(uint32_t * addr, uint32_t width, uint32_t height, uint32_t pitch)
+{
+    fb.addr = addr;
+    fb.width = width;
+    fb.height = height;
+    fb.pitch = pitch / 4u;
+    fb_clear();
+}
+
+uint32_t * fb_addr(void)
+{
+    return fb.addr;
+}
+
+bool fb_ready(void)
+{
+    return fb.addr != NULL;
+}
+
+uint32_t fb_width(void)
+{
+    return fb.width;
+}
+
+uint32_t fb_height(void)
+{
+    return fb.height;
+}
+
+void fb_blend_alpha8(const uint8_t * bitmap, int width, int height, int pitch, int x, int y, uint8_t r, uint8_t g, uint8_t b)
+{
+    if (((x + width) <= 0) || (x >= (int)fb.width) || ((y + height) <= 0) || (y >= (int)fb.height))
+    {
+        return;
+    }
+    if (x < 0)
+    {
+        width += x;
+        bitmap += (-x);
+        x = 0;
+    }
+    if (y < 0)
+    {
+        height += y;
+        bitmap += ((-y) * pitch);
+        y = 0;
+    }
+    if ((x + width) > (int)fb.width)
+    {
+        width = (int)fb.width - x;
+    }
+    if ((y + height) > (int)fb.height)
+    {
+        height = (int)fb.height - y;
+    }
+    uint32_t * target = &fb.addr[fb.pitch * y + x];
+    for (int row = 0; row < height; row++)
+    {
+        for (int col = 0; col < width; col++)
+        {
+            uint32_t alpha = bitmap[col];
+            uint32_t current_pixel = target[col];
+            uint8_t cr = (current_pixel >> 16u) & 0xFFu;
+            uint8_t cg = (current_pixel >> 8u) & 0xFFu;
+            uint8_t cb = current_pixel & 0xFFu;
+            uint8_t pr = alpha * r / 255u;
+            uint8_t pg = alpha * g / 255u;
+            uint8_t pb = alpha * b / 255u;
+            uint32_t current_alpha = 255u - alpha;
+            uint32_t pixel = build_pixel(
+                    pr + current_alpha * cr / 255u,
+                    pg + current_alpha * cg / 255u,
+                    pb + current_alpha * cb / 255u);
+            target[col] = pixel;
+        }
+        bitmap += pitch;
+        target += fb.pitch;
+    }
+}
+
+void fb_fill(int x, int y, int width, int height, uint8_t r, uint8_t g, uint8_t b)
+{
+    uint32_t * target = &fb.addr[fb.pitch * y + x];
+    uint32_t pixel = build_pixel(r, g, b);
+    for (int row = 0; row < height; row++)
+    {
+        memset32(target, pixel, width);
+        target += fb.pitch;
+    }
+}

src/fb.h

@@ -0,0 +1,16 @@
+#ifndef FB_H
+#define FB_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+void fb_init(uint32_t * addr, uint32_t width, uint32_t height, uint32_t pitch);
+bool fb_ready(void);
+uint32_t * fb_addr(void);
+uint32_t fb_width(void);
+uint32_t fb_height(void);
+void fb_blend_alpha8(const uint8_t * bitmap, int width, int height, int pitch, int x, int y, uint8_t r, uint8_t g, uint8_t b);
+void fb_fill(int x, int y, int width, int height, uint8_t r, uint8_t g, uint8_t b);
+void fb_clear(void);
+
+#endif

src/fb_text.c

@@ -0,0 +1,11 @@
+#include "fb_text.h"
+#include "kfont.h"
+#include "fb.h"
+
+void fb_text_render_char(int c, int x, int y, uint8_t r, uint8_t g, uint8_t b)
+{
+    const fontgen_char_info_t * char_info = kfont.char_infos[c];
+    y += kfont.line_height - kfont.baseline_offset - char_info->top;
+    x += char_info->left;
+    fb_blend_alpha8(char_info->bitmap, char_info->width, char_info->height, char_info->width, x, y, r, g, b);
+}

src/fb_text.h

@@ -0,0 +1,8 @@
+#ifndef FB_TEXT_H
+#define FB_TEXT_H
+
+#include <stdint.h>
+
+void fb_text_render_char(int c, int x, int y, uint8_t r, uint8_t g, uint8_t b);
+
+#endif

src/gdt.S

@@ -0,0 +1,16 @@
+.global gdt_set
+.extern gdtr
+.type gdt_set, @function
+gdt_set:
+    lgdt gdtr
+    jmp $0x8, $gdt_set_reload
+gdt_set_reload:
+    mov $0x10, %ax
+    mov %ax, %ds
+    mov %ax, %es
+    mov %ax, %fs
+    mov %ax, %gs
+    mov %ax, %ss
+    ret
+
+.size gdt_set, . - gdt_set

src/gdt.c

@@ -0,0 +1,20 @@
+#include "gdt.h"
+
+static const gdt_entry_t gdt_entries[] = {
+    /* Null descriptor */
+    0u,
+    /* Code segment for kernel */
+    gdt_build_entry(0u, 0xFFFFFu, 1u, 0u, 1u, 1u, 0u, 1u, 0u, 1u, 1u, 0u),
+    /* Data segment for kernel */
+    gdt_build_entry(0u, 0xFFFFFu, 1u, 0u, 1u, 0u, 0u, 1u, 0u, 1u, 1u, 0u),
+};
+
+gdtr_t gdtr;
+
+void gdt_init(void)
+{
+    gdtr.size = sizeof(gdt_entries);
+    gdtr.offset_lower = (uintptr_t)gdt_entries & 0xFFFFu;
+    gdtr.offset_upper = (uintptr_t)gdt_entries >> 16u;
+    gdt_set();
+}

src/gdt.h

@@ -0,0 +1,34 @@
+#ifndef GDT_H
+#define GDT_H
+
+#include <stdint.h>
+
+typedef struct {
+    uint16_t size;
+    uint16_t offset_lower;
+    uint16_t offset_upper;
+    uint16_t _reserved;
+} gdtr_t;
+
+typedef uint64_t gdt_entry_t;
+#define gdt_build_entry(base, limit, pr, privl, s, ex, dc, rw, ac, gr, sz, l) \
+    (gdt_entry_t)( \
+            (((gdt_entry_t)base << 32) & 0xFF00000000000000ull) | /* Base 0:15 */ \
+            (((gdt_entry_t)gr & 0x1u) << 55) | /* Granularity (0 = bytes, 1 = blocks) */ \
+            (((gdt_entry_t)sz & 0x1u) << 54) | /* Size (0 = 16-bit, 1 = 32-bit) */ \
+            (((gdt_entry_t)l & 0x1u) << 53) | /* L flag (x86_64 code) */ \
+            (((gdt_entry_t)limit << 32) & 0x000F000000000000ull) | /* Limit 16:19 */ \
+            (((gdt_entry_t)pr & 0x1u) << 47) | /* Present flag */ \
+            (((gdt_entry_t)privl & 0x3u) << 45) | /* Privilege (ring level) */ \
+            (((gdt_entry_t)s & 0x1u) << 44) | /* Type (0 = system, 1 = code/data) */ \
+            (((gdt_entry_t)ex & 0x1u) << 43) | /* Executable flag */ \
+            (((gdt_entry_t)dc & 0x1u) << 42) | /* Direction/Conforming */ \
+            (((gdt_entry_t)rw & 0x1u) << 41) | /* Readable/Writable */ \
+            (((gdt_entry_t)ac & 0x1u) << 40) | /* Accessed flag */ \
+            (((gdt_entry_t)base << 16) & 0x000000FFFFFF0000ull) | /* Base 0:23 */ \
+             ((gdt_entry_t)limit & 0x000000000000FFFFull)) /* Limit 0:15 */
+
+void gdt_init(void);
+void gdt_set(void);
+
+#endif

src/hos_main.c

@@ -0,0 +1,25 @@
+#include <stdint.h>
+#include "fb.h"
+#include "mbinfo.h"
+#include "klog.h"
+#include "gdt.h"
+#include "mm.h"
+
+void hos_main(uint32_t mbinfo_addr)
+{
+    gdt_init();
+    if (!mbinfo_init(mbinfo_addr))
+    {
+        return;
+    }
+    if (!fb_ready())
+    {
+        return;
+    }
+    klog_init();
+    klog_printf("Welcome to HOS!\n");
+    mm_init();
+    mbinfo_load();
+    klog_printf("Found %dKB of usable RAM\n", mm_get_total_ram() / 1024u);
+    klog_printf("Kernel is %dKB at 0x%x\n", mm_get_kernel_size() / 1024u, mm_get_kernel_address());
+}

src/hos_printf.c

@@ -0,0 +1,281 @@
+#include "hos_printf.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "string.h"
+
+static size_t format_dec(char * buffer, int32_t v)
+{
+    size_t sz = 0u;
+    bool printing = false;
+    if (v < 0)
+    {
+        buffer[sz++] = '-';
+        v = -v;
+    }
+    for (int32_t div = 1000000000; div >= 1; div /= 10)
+    {
+        int32_t digit = v / div;
+        v %= div;
+        if ((digit != 0) || (div == 1))
+        {
+            printing = true;
+        }
+        if (printing)
+        {
+            buffer[sz++] = digit + '0';
+        }
+    }
+    return sz;
+}
+
+static size_t format_dec64(char * buffer, int64_t v)
+{
+    size_t sz = 0u;
+    bool printing = false;
+    if (v < 0)
+    {
+        buffer[sz++] = '-';
+        v = -v;
+    }
+    for (int64_t div = 1000000000000000000; div >= 1; div /= 10)
+    {
+        int64_t digit = v / div;
+        v %= div;
+        if ((digit != 0) || (div == 1))
+        {
+            printing = true;
+        }
+        if (printing)
+        {
+            buffer[sz++] = digit + '0';
+        }
+    }
+    return sz;
+}
+
+static size_t format_udec(char * buffer, int32_t v)
+{
+    size_t sz = 0u;
+    for (int32_t div = 1000000000u; div >= 1u; div /= 10u)
+    {
+        int32_t digit = v / div;
+        v %= div;
+        if ((digit != 0) || (sz > 0u) || (div == 1))
+        {
+            buffer[sz++] = digit + '0';
+        }
+    }
+    return sz;
+}
+
+static size_t format_udec64(char * buffer, uint64_t v)
+{
+    size_t sz = 0u;
+    for (uint64_t div = 10000000000000000000u; div >= 1u; div /= 10u)
+    {
+        uint64_t digit = v / div;
+        v %= div;
+        if ((digit != 0) || (sz > 0u) || (div == 1))
+        {
+            buffer[sz++] = digit + '0';
+        }
+    }
+    return sz;
+}
+
+static size_t format_hex(char * buffer, uint32_t v, bool upper)
+{
+    const char upper_hex[] = "0123456789ABCDEF";
+    const char lower_hex[] = "0123456789abcdef";
+    size_t sz = 0u;
+    for (int i = 28; i >= 0; i -= 4)
+    {
+        uint8_t n = (v >> i) & 0xFu;
+        if ((sz > 0u) || (n != 0u) || (i == 0))
+        {
+            buffer[sz] = upper ? upper_hex[n] : lower_hex[n];
+            sz++;
+        }
+    }
+    return sz;
+}
+
+static size_t format_hex64(char * buffer, uint64_t v, bool upper)
+{
+    const char upper_hex[] = "0123456789ABCDEF";
+    const char lower_hex[] = "0123456789abcdef";
+    size_t sz = 0u;
+    for (int i = 60; i >= 0; i -= 4)
+    {
+        uint8_t n = (v >> i) & 0xFu;
+        if ((sz > 0u) || (n != 0u) || (i == 0))
+        {
+            buffer[sz] = upper ? upper_hex[n] : lower_hex[n];
+            sz++;
+        }
+    }
+    return sz;
+}
+
+static void pad_write(const stream_t * stream, const char * data, size_t length, bool leading_zero, bool left_just, size_t width)
+{
+    if (left_just)
+    {
+        stream->write(data, length);
+        while (length < width)
+        {
+            stream->write1(' ');
+            length++;
+        }
+    }
+    else
+    {
+        char fill = leading_zero ? '0' : ' ';
+        size_t l = length;
+        while (l < width)
+        {
+            stream->write1(fill);
+            l++;
+        }
+        stream->write(data, length);
+    }
+}
+
+void hos_vprintf(const stream_t * stream, const char * fmt, va_list va)
+{
+    bool in_conv = false;
+    char c;
+    char buffer[22];
+    size_t width;
+    bool leading_zero;
+    bool left_just;
+    bool long_flag;
+    size_t length;
+    while ((c = *fmt))
+    {
+        if (in_conv)
+        {
+            switch (c)
+            {
+            case '%':
+                stream->write1('%');
+                break;
+            case 'X':
+                {
+                    if (long_flag)
+                    {
+                        uint64_t v = va_arg(va, uint64_t);
+                        length = format_hex(buffer, v, true);
+                    }
+                    else
+                    {
+                        uint32_t v = va_arg(va, uint32_t);
+                        length = format_hex(buffer, v, true);
+                    }
+                    pad_write(stream, buffer, length, leading_zero, left_just, width);
+                }
+                break;
+            case 'c':
+                {
+                    char ch = va_arg(va, int);
+                    pad_write(stream, &ch, 1u, leading_zero, left_just, width);
+                }
+                break;
+            case 'd':
+                {
+                    if (long_flag)
+                    {
+                        int64_t v = va_arg(va, int64_t);
+                        length = format_dec64(buffer, v);
+                    }
+                    else
+                    {
+                        int32_t v = va_arg(va, int32_t);
+                        length = format_dec(buffer, v);
+                    }
+                    pad_write(stream, buffer, length, leading_zero, left_just, width);
+                }
+                break;
+            case 's':
+                {
+                    const char * s = va_arg(va, const char *);
+                    pad_write(stream, s, strlen(s), leading_zero, left_just, width);
+                }
+                break;
+            case 'u':
+                {
+                    if (long_flag)
+                    {
+                        uint64_t v = va_arg(va, uint64_t);
+                        length = format_udec64(buffer, v);
+                    }
+                    else
+                    {
+                        uint32_t v = va_arg(va, uint32_t);
+                        length = format_udec(buffer, v);
+                    }
+                    pad_write(stream, buffer, length, leading_zero, left_just, width);
+                }
+                break;
+            case 'x':
+                {
+                    if (long_flag)
+                    {
+                        uint64_t v = va_arg(va, uint64_t);
+                        length = format_hex64(buffer, v, false);
+                    }
+                    else
+                    {
+                        uint32_t v = va_arg(va, uint32_t);
+                        length = format_hex(buffer, v, false);
+                    }
+                    pad_write(stream, buffer, length, leading_zero, left_just, width);
+                }
+                break;
+            }
+            in_conv = false;
+        }
+        else if (c == '%')
+        {
+            in_conv = true;
+            width = 0u;
+            leading_zero = false;
+            left_just = false;
+            long_flag = false;
+            if (fmt[1] == '-')
+            {
+                left_just = true;
+                fmt++;
+            }
+            if (fmt[1] == '0')
+            {
+                leading_zero = true;
+                fmt++;
+            }
+            while (('0' <= fmt[1]) && (fmt[1] <= '9'))
+            {
+                width *= 10u;
+                width += (fmt[1] - '0');
+                fmt++;
+            }
+            if (fmt[1] == 'l')
+            {
+                long_flag = true;
+                fmt++;
+            }
+        }
+        else
+        {
+            stream->write1(c);
+        }
+        fmt++;
+    }
+}
+
+void hos_printf(const stream_t * stream, const char * fmt, ...)
+{
+    va_list va;
+    va_start(va, fmt);
+    hos_vprintf(stream, fmt, va);
+    va_end(va);
+}

src/hos_printf.h

@@ -0,0 +1,10 @@
+#ifndef HOS_PRINTF_H
+#define HOS_PRINTF_H
+
+#include "stream.h"
+#include <stdarg.h>
+
+void hos_vprintf(const stream_t * stream, const char * fmt, va_list va);
+void hos_printf(const stream_t * stream, const char * fmt, ...);
+
+#endif

src/klog.c

@@ -0,0 +1,103 @@
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <stdarg.h>
+#include "klog.h"
+#include "kfont.h"
+#include "fb.h"
+#include "fb_text.h"
+#include "stream.h"
+#include "hos_printf.h"
+#include "mem.h"
+
+static struct {
+    size_t console_width;
+    size_t console_height;
+    size_t x;
+    size_t y;
+    bool need_shift;
+} klog;
+
+static void shift_line(void)
+{
+    uint32_t * fb = fb_addr();
+    uint32_t w = fb_width();
+    size_t console_fb_line_words = w * kfont.line_height;
+    for (size_t row = 0u; row < klog.console_height; row++)
+    {
+        memcpy32(fb, fb + console_fb_line_words, console_fb_line_words);
+        fb += console_fb_line_words;
+    }
+    fb_fill(0, kfont.line_height * (klog.console_height - 1u), w, kfont.line_height, 0u, 0x2Cu, 0x55u);
+}
+
+static void klog_fb_write1(char c)
+{
+    if (klog.need_shift)
+    {
+        shift_line();
+        klog.need_shift = false;
+    }
+    if (c == '\n')
+    {
+        if (klog.y == (klog.console_height - 1u))
+        {
+            klog.need_shift = true;
+        }
+        else
+        {
+            klog.y++;
+        }
+        klog.x = 0u;
+    }
+    else
+    {
+        int px = klog.x * kfont.advance;
+        int py = klog.y * kfont.line_height;
+        fb_text_render_char(c, px, py, 0xFFu, 0x80u, 0u);
+        klog.x++;
+        if (klog.x == klog.console_width)
+        {
+            if (klog.y == (klog.console_height - 1u))
+            {
+                klog.need_shift = true;
+            }
+            else
+            {
+                klog.y++;
+            }
+            klog.x = 0u;
+        }
+    }
+}
+
+static void klog_fb_write(const char * src, size_t length)
+{
+    for (size_t i = 0u; i < length; i++)
+    {
+        klog_fb_write1(src[i]);
+    }
+}
+
+static const stream_t klog_fb_stream = {
+    klog_fb_write,
+    klog_fb_write1,
+};
+
+void klog_init(void)
+{
+    klog.console_width = fb_width() / kfont.advance;
+    klog.console_height = fb_height() / kfont.line_height;
+    klog.x = 0u;
+    klog.y = 0u;
+    klog.need_shift = false;
+    fb_fill(0, 0, fb_width(), fb_height(), 0u, 0x2Cu, 0x55u);
+}
+
+void klog_printf(const char * fmt, ...)
+{
+    va_list va;
+    va_start(va, fmt);
+    hos_vprintf(&klog_fb_stream, fmt, va);
+    va_end(va);
+}

src/klog.h

@@ -0,0 +1,7 @@
+#ifndef KLOG_H
+#define KLOG_H
+
+void klog_init(void);
+void klog_printf(const char * fmt, ...);
+
+#endif

src/link.ld

@@ -0,0 +1,41 @@
+ENTRY(hos_start)
+
+SECTIONS
+{
+    . = 1M;
+    _hos_mem_start = .;
+
+    .text BLOCK(4K) : ALIGN(4K)
+    {
+        *(.multiboot)
+        *(.text)
+    }
+
+    .rodata BLOCK(4K) : ALIGN(4K)
+    {
+        *(.rodata)
+    }
+
+    .data BLOCK(4K) : ALIGN(4K)
+    {
+        *(.data)
+    }
+
+    _stack_size = 16K;
+    .stack (NOLOAD) : ALIGN(4K)
+    {
+        _stack_start = .;
+        . = . + _stack_size;
+        _stack_end = .;
+    }
+
+    .bss BLOCK(4K) : ALIGN(4K)
+    {
+        *(COMMON)
+        *(.bss)
+    }
+
+    . = ALIGN(4K);
+
+    _hos_mem_end = .;
+}

src/mbinfo.c

@@ -0,0 +1,100 @@
+#include "multiboot2.h"
+#include "fb.h"
+#include "mem.h"
+#include <stdint.h>
+#include "klog.h"
+#include "mm.h"
+
+static uint32_t mbinfo[2048];
+
+static void mbinfo_process_tag(const multiboot2_info_tag_t * tag)
+{
+    switch (tag->type)
+    {
+    case MULTIBOOT2_INFO_BOOT_COMMAND_LINE:
+        {
+            multiboot2_info_boot_command_line_t * cl =
+                (multiboot2_info_boot_command_line_t *)tag;
+            klog_printf("Kernel boot command line: '%s'\n", cl->string);
+        }
+        break;
+
+    case MULTIBOOT2_INFO_BOOT_LOADER_NAME:
+        {
+            multiboot2_info_boot_loader_name_t * bln =
+                (multiboot2_info_boot_loader_name_t *)tag;
+            klog_printf("Boot loader: '%s'\n", bln->string);
+        }
+        break;
+
+    case MULTIBOOT2_INFO_MEMORY_MAP:
+        {
+            multiboot2_info_memory_map_t * mmap_info =
+                (multiboot2_info_memory_map_t *)tag;
+            size_t sz = sizeof(mmap_info->header) +
+                sizeof(mmap_info->entry_size) +
+                sizeof(mmap_info->entry_version);
+            multiboot2_info_memory_map_entry_t * entry = &mmap_info->entries[0];
+            for (;;)
+            {
+                sz += mmap_info->entry_size;
+                if (sz > mmap_info->header.size)
+                {
+                    break;
+                }
+                if (entry->type == MULTIBOOT2_MEMORY_MAP_TYPE_RAM)
+                {
+                    klog_printf("Memory region %16lx : %16lx\n",
+                            entry->base_addr,
+                            entry->length);
+                    mm_register_ram_region(entry->base_addr, entry->length);
+                }
+                entry = (multiboot2_info_memory_map_entry_t *)((uintptr_t)entry + mmap_info->entry_size);
+            }
+        }
+        break;
+
+    case MULTIBOOT2_INFO_FRAMEBUFFER_INFO:
+        {
+            multiboot2_info_framebuffer_info_t * fbinfo =
+                (multiboot2_info_framebuffer_info_t *)tag;
+            fb_init((uint32_t *)(uintptr_t)fbinfo->framebuffer_addr,
+                    fbinfo->framebuffer_width,
+                    fbinfo->framebuffer_height,
+                    fbinfo->framebuffer_pitch);
+        }
+        break;
+    }
+}
+
+static void process_tags(const multiboot2_info_tag_t * tag, bool init)
+{
+    while (tag->type != 0u)
+    {
+        if ((init && (tag->type == MULTIBOOT2_INFO_FRAMEBUFFER_INFO)) ||
+                (!init && (tag->type != MULTIBOOT2_INFO_FRAMEBUFFER_INFO)))
+        {
+            mbinfo_process_tag(tag);
+        }
+        tag = multiboot2_info_next_tag(tag);
+    }
+}
+
+bool mbinfo_init(uint32_t mbinfo_addr)
+{
+    multiboot2_info_header_t * mbinfo_header = (multiboot2_info_header_t *)mbinfo_addr;
+    if (mbinfo_header->total_size <= sizeof(mbinfo))
+    {
+        memcpy32(mbinfo, mbinfo_header, mbinfo_header->total_size / 4u);
+        multiboot2_info_tag_t * tag = (multiboot2_info_tag_t *)(mbinfo + sizeof(multiboot2_info_header_t) / 4u);
+        process_tags(tag, true);
+        return true;
+    }
+    return false;
+}
+
+void mbinfo_load(void)
+{
+    multiboot2_info_tag_t * tag = (multiboot2_info_tag_t *)(mbinfo + sizeof(multiboot2_info_header_t) / 4u);
+    process_tags(tag, false);
+}

src/mbinfo.h

@@ -0,0 +1,10 @@
+#ifndef MBINFO_H
+#define MBINFO_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+bool mbinfo_init(uint32_t mbinfo_addr);
+void mbinfo_load(void);
+
+#endif

src/mem.h

@@ -0,0 +1,49 @@
+#ifndef MEM_H
+#define MEM_H
+
+#include <stddef.h>
+
+static inline void memcpy(void * dest, const void * src, size_t n)
+{
+    uint32_t r0, r1, r2;
+    __asm__ __volatile__ (
+            "cld\n\t"
+            "rep movsb"
+            : "=&c" (r0), "=&S" (r1), "=&D" (r2)
+            : "2" (dest), "1" (src), "0" (n)
+            : "memory");
+}
+
+static inline void memcpy32(void * dest, const void * src, size_t count)
+{
+    uint32_t r0, r1, r2;
+    __asm__ __volatile__ (
+            "cld\n\t"
+            "rep movsd"
+            : "=&c" (r0), "=&S" (r1), "=&D" (r2)
+            : "2" (dest), "1" (src), "0" (count)
+            : "memory");
+}
+
+static inline void * memmove(void * dest, const void * src, size_t count)
+{
+    return __builtin_memmove(dest, src, count);
+}
+
+static inline void * memset(void * dest, int val, size_t count)
+{
+    return __builtin_memset(dest, val, count);
+}
+
+static inline void memset32(void * dest, uint32_t val, size_t count)
+{
+    uint32_t r0, r1;
+    __asm__ __volatile__ (
+            "cld\n\t"
+            "rep stosl"
+            : "=&c" (r0), "=&D" (r1)
+            : "a" (val), "1" (dest), "0" (count)
+            : "memory");
+}
+
+#endif

src/mm.c

@@ -0,0 +1,91 @@
+#include "mm.h"
+
+typedef struct mm_page_entry_s {
+    size_t count;
+    struct mm_page_entry_s * next;
+} mm_region_entry_t;
+
+static mm_region_entry_t * mm_next_free_region;
+static size_t mm_free_pages;
+static size_t mm_total_ram;
+static size_t kernel_start_address;
+static size_t kernel_size;
+
+extern uint8_t _hos_mem_start;
+extern uint8_t _hos_mem_end;
+
+static void mm_add_ram_region(size_t base, size_t size)
+{
+    mm_region_entry_t * region = (mm_region_entry_t *)base;
+    size_t pages = size / PAGE_SIZE;
+    region->count = pages;
+    region->next = mm_next_free_region;
+    mm_next_free_region = region;
+    mm_total_ram += size;
+    mm_free_pages = pages;
+}
+
+void mm_register_ram_region(uint64_t base, size_t size)
+{
+    /* Ignore any RAM region above 4GB. */
+    if (base >= 0x100000000ull)
+    {
+        return;
+    }
+    if ((base + size) > 0x100000000ull)
+    {
+        size = (size_t)(0x100000000ull - base);
+    }
+    size_t end_address = mm_page_floor((size_t)base + size);
+    size_t start_address = mm_page_ceil(base);
+    size = end_address - start_address;
+    if (size < PAGE_SIZE)
+    {
+        return;
+    }
+    size_t kernel_end_address = kernel_start_address + kernel_size;
+    /* Add regions before and after kernel RAM. */
+    if (start_address < kernel_start_address)
+    {
+        /* RAM region begins before kernel RAM. */
+        size_t this_sz = size;
+        if ((start_address + this_sz) > kernel_start_address)
+        {
+            this_sz = kernel_start_address - start_address;
+        }
+        mm_add_ram_region(start_address, this_sz);
+    }
+    if ((start_address + size) > kernel_end_address)
+    {
+        /* RAM region ends after kernel RAM. */
+        size_t this_sz = size;
+        if (start_address < kernel_end_address)
+        {
+            this_sz = (start_address + size) - kernel_end_address;
+            start_address = kernel_end_address;
+        }
+        mm_add_ram_region(start_address, this_sz);
+    }
+}
+
+void mm_init(void)
+{
+    kernel_start_address = mm_page_floor((size_t)&_hos_mem_start);
+    kernel_size = mm_page_ceil((size_t)&_hos_mem_end - kernel_start_address);
+    mm_total_ram = kernel_size;
+}
+
+size_t mm_get_total_ram(void)
+{
+    return mm_total_ram;
+}
+
+size_t mm_get_kernel_address(void)
+{
+    return kernel_start_address;
+}
+
+size_t mm_get_kernel_size(void)
+{
+    return kernel_size;
+}

src/mm.h

@@ -0,0 +1,25 @@
+#ifndef MM_H
+#define MM_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+#define PAGE_SIZE 4096u
+
+static inline size_t mm_page_floor(size_t bytes)
+{
+    return bytes & ~(PAGE_SIZE - 1u);
+}
+
+static inline size_t mm_page_ceil(size_t bytes)
+{
+    return (bytes + PAGE_SIZE - 1u) & ~(PAGE_SIZE - 1u);
+}
+
+void mm_init(void);
+void mm_register_ram_region(uint64_t base, size_t size);
+size_t mm_get_total_ram(void);
+size_t mm_get_kernel_address(void);
+size_t mm_get_kernel_size(void);
+
+#endif

src/multiboot2.h

@@ -0,0 +1,127 @@
+#ifndef MULTIBOOT2_H
+#define MULTIBOOT2_H
+
+#include <stdint.h>
+
+#define MULTIBOOT2_MAGIC 0xE85250D6u
+#define MULTIBOOT2_ARCHITECTURE_I386 0u
+
+typedef struct {
+    uint32_t magic;
+    uint32_t architecture;
+    uint32_t header_length;
+    uint32_t checksum;
+} multiboot2_header_t;
+#define multiboot2_header(magic, architecture, header_length) \
+    {(magic), (architecture), (header_length), (uint32_t)(0x100000000u - (magic) - (architecture) - (header_length))}
+#define multiboot2_header_default() \
+    multiboot2_header(MULTIBOOT2_MAGIC, MULTIBOOT2_ARCHITECTURE_I386, sizeof(multiboot2_header_t))
+
+typedef struct {
+    uint16_t type;
+    uint16_t flags;
+    uint32_t size;
+} multiboot2_tag_t;
+#define multiboot2_end_tag() {0u, 0u, 8u}
+
+typedef struct {
+    multiboot2_tag_t header;
+    uint32_t width;
+    uint32_t height;
+    uint32_t depth;
+    uint32_t _padding;
+} multiboot2_framebuffer_tag_t;
+#define multiboot2_framebuffer_tag(width, height, depth) \
+    {{5u, 0u, 20u}, width, height, depth}
+
+#define MULTIBOOT2_INFO_TAG_ALIGNMENT 8u
+#define MULTIBOOT2_INFO_BOOT_COMMAND_LINE 1u
+#define MULTIBOOT2_INFO_BOOT_LOADER_NAME 2u
+#define MULTIBOOT2_INFO_MODULES 3u
+#define MULTIBOOT2_INFO_BASIC_MEMORY_INFO 4u
+#define MULTIBOOT2_INFO_BIOS_BOOT_DEVICE 5u
+#define MULTIBOOT2_INFO_MEMORY_MAP 6u
+#define MULTIBOOT2_INFO_VBE_INFO 7u
+#define MULTIBOOT2_INFO_FRAMEBUFFER_INFO 8u
+#define MULTIBOOT2_INFO_ELF_SYMBOLS 9u
+#define MULTIBOOT2_INFO_APM_TABLE 10u
+#define MULTIBOOT2_INFO_EFI_32BIT_SYSTEM_TABLE_POINTER 11u
+#define MULTIBOOT2_INFO_EFI_64BIT_SYSTEM_TABLE_POINTER 12u
+#define MULTIBOOT2_INFO_SMBIOS_TABLES 13u
+#define MULTIBOOT2_INFO_ACPI_OLD_RSDP 14u
+#define MULTIBOOT2_INFO_NETWORKING_INFO 16u
+#define MULTIBOOT2_INFO_EFI_MEMORY_MAP 17u
+#define MULTIBOOT2_INFO_EFI_BOOT_SERVICES_NOT_TERMINATED 18u
+#define MULTIBOOT2_INFO_EFI_32BIT_IMAGE_HANDLE_POINTER 19u
+#define MULTIBOOT2_INFO_EFI_64BIT_IMAGE_HANDLE_POINTER 20u
+#define MULTIBOOT2_INFO_IMAGE_LOAD_BASE_PHYSICAL_ADDRESS 21u
+
+typedef struct {
+    uint32_t total_size;
+    uint32_t _reserved;
+} multiboot2_info_header_t;
+
+typedef struct {
+    uint32_t type;
+    uint32_t size;
+} multiboot2_info_tag_t;
+#define multiboot2_info_next_tag(current_tag) \
+    (multiboot2_info_tag_t *)(((uintptr_t)current_tag + current_tag->size + MULTIBOOT2_INFO_TAG_ALIGNMENT - 1u) & ~(MULTIBOOT2_INFO_TAG_ALIGNMENT - 1u))
+
+typedef struct {
+    multiboot2_info_tag_t header;
+    char string[];
+} multiboot2_info_boot_command_line_t;
+
+typedef struct {
+    multiboot2_info_tag_t header;
+    char string[];
+} multiboot2_info_boot_loader_name_t;
+
+typedef struct {
+    multiboot2_info_tag_t header;
+    uint32_t mem_lower;
+    uint32_t mem_upper;
+} multiboot2_info_basic_memory_info_t;
+
+#define MULTIBOOT2_MEMORY_MAP_TYPE_RAM 1u
+#define MULTIBOOT2_MEMORY_MAP_TYPE_ACPI 3u
+#define MULTIBOOT2_MEMORY_MAP_TYPE_PRESERVE 4u
+#define MULTIBOOT2_MEMORY_MAP_TYPE_DEFECTIVE 5u
+
+typedef struct {
+    uint64_t base_addr;
+    uint64_t length;
+    uint32_t type;
+    uint32_t _reserved;
+} multiboot2_info_memory_map_entry_t;
+
+typedef struct {
+    multiboot2_info_tag_t header;
+    uint32_t entry_size;
+    uint32_t entry_version;
+    multiboot2_info_memory_map_entry_t entries[];
+} multiboot2_info_memory_map_t;
+
+typedef struct {
+    multiboot2_info_tag_t header;
+    uint16_t vbe_mode;
+    uint16_t vbe_interface_set;
+    uint16_t vbe_interface_off;
+    uint16_t vbe_interface_len;
+    uint8_t vbe_control_info[512];
+    uint8_t vbe_mode_info[256];
+} multiboot2_info_vbe_info_t;
+
+typedef struct {
+    multiboot2_info_tag_t header;
+    uint64_t framebuffer_addr;
+    uint32_t framebuffer_pitch;
+    uint32_t framebuffer_width;
+    uint32_t framebuffer_height;
+    uint8_t framebuffer_bpp;
+    uint8_t framebuffer_type;
+    uint8_t _reserved;
+} multiboot2_info_framebuffer_info_t;
+
+#endif

src/multiboot_header.c

@@ -0,0 +1,12 @@
+#include "multiboot2.h"
+
+/* Multiboot2 Header. */
+struct {
+    multiboot2_header_t header;
+    multiboot2_framebuffer_tag_t framebuffer_tag;
+    multiboot2_tag_t end_tag;
+} multiboot_header __attribute__((section(".multiboot"))) = {
+    multiboot2_header_default(),
+    multiboot2_framebuffer_tag(1600u, 900u, 32u),
+    multiboot2_end_tag(),
+};

src/stream.h

@@ -0,0 +1,12 @@
+#ifndef STREAM_H
+#define STREAM_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+typedef struct {
+    void (*write)(const char * src, size_t length);
+    void (*write1)(char c);
+} stream_t;
+
+#endif

src/string.h

@@ -0,0 +1,26 @@
+#ifndef STRING_H
+#define STRING_H
+
+#include <stddef.h>
+
+static inline size_t strlen(const char * s)
+{
+    size_t r = 0u;
+    while (*s++ != (char)0)
+    {
+        r++;
+    }
+    return r;
+}
+
+static inline char * strcpy(char * dest, const char * src)
+{
+    return __builtin_strcpy(dest, src);
+}
+
+static inline char * strncpy(char * dest, const char * src, size_t n)
+{
+    return __builtin_strncpy(dest, src, n);
+}
+
+#endif

stage1.asm

@@ -1,228 +0,0 @@
-
-%include "bootdef.inc"
-
-[bits 16]
-
-org 0x7c00
-
-	jmp short start
-
-; --------------------------------------------------
-; data portion of the "DOS BOOT RECORD"
-; ----------------------------------------------------------------------
-brINT13Flag     DB      90H             ; 0002h - 0EH for INT13 AH=42 READ
-brOEM           DB      'MSDOS5.0'      ; 0003h - OEM ID - Windows 95B
-brBPS           DW      512             ; 000Bh - Bytes per sector
-brSPC           DB      1               ; 000Dh - Sector per cluster
-brSc_b4_fat	DW      1               ; 000Eh - Reserved sectors
-brFATs          DB      2               ; 0010h - FAT copies
-brRootEntries   DW      0E0H		; 0011h - Root directory entries
-brSectorCount   DW      2880		; 0013h - Sectors in volume, < 32MB
-brMedia         DB      240		; 0015h - Media descriptor
-brSPF           DW      9               ; 0016h - Sectors per FAT
-brSc_p_trk	DW      18              ; 0018h - Sectors per head/track
-brHPC           DW      2		; 001Ah - Heads per cylinder
-brSc_b4_prt	DD      0               ; 001Ch - Hidden sectors
-brSectors       DD      0	        ; 0020h - Total number of sectors
-brDrive		DB      0               ; 0024h - Physical drive no.
-		DB      0               ; 0025h - Reserved (FAT32)
-		DB      29H             ; 0026h - Extended boot record sig (FAT32)
-brSerialNum     DD      404418EAH       ; 0027h - Volume serial number
-brLabel         DB      'Holtrops OS'   ; 002Bh - Volume label
-brFSID          DB      'FAT12   '      ; 0036h - File System ID
-;------------------------------------------------------------------------
-
-start:
-	jmp	0:jmphere		;ensure that cs=0 and ip=0x7c00...
-jmphere:
-	;dl=drive number, save it!
-	xor	ax, ax
-	mov	ds, ax
-	mov	[brDrive], dl
-	cli
-	mov	ss, ax
-	mov	sp, 0x7Bfe		;right under boot sector
-	sti
-
-	mov	ax, 0xb800
-	mov	ds, ax
-	mov	es, ax
-
-	xor	di, di
-	mov	ax, 0x0700
-	mov	cx, 2000
-cls:
-	stosw
-	loop	cls
-
-enable_a20:
-	in	al, 0x64
-	test	al, 2
-	jnz	enable_a20
-	mov	al, 0xD1
-	out	0x64, al
-ea20_2:	in	al, 0x64
-	and	ax, byte 2
-	jnz	ea20_2
-	mov	al, 0xDF
-	out	0x60, al
-
-unreal:
-	xor	ax, ax
-	mov	es, ax
-	mov	ds, ax
-
-	lgdt	[gdtr]		;load gdt
-	cli
-	push	es
-	push	ds		;save segment values
-	mov	ebx, cr0
-	inc	bl
-	mov	cr0, ebx	;pmode!
-	mov	ax, KERNEL_DATA
-	mov	es, ax
-	mov	ds, ax		;load segment limits
-	dec	bl
-	mov	cr0, ebx	;back to real mode!
-	pop	ds
-	pop	es		;segments back, with 4gb limits!
-	sti
-
-;now lets read in the FAT and root directory so we can search for the stage2 file...
-	mov	ax, 0x0209		;FAT1
-	mov	cx, 0x0002
-	xor	dh, dh
-	mov	dl, [brDrive]
-	mov	bx, BOOT_FAT_SEG
-	mov	es, bx
-	xor	bx, bx
-	int	0x13
-
-	mov	ax, 0x020E		;root directory
-	mov	cx, 0x0002		;cyl/sect
-	mov	dh, 0x01		;head
-	mov	dl, [brDrive]		;drive
-	mov	bx, BOOT_ROOT_SEG
-	mov	es, bx
-	xor	bx, bx
-	int	0x13
-
-;k now read root directory
-	mov	bx, BOOT_ROOT_SEG
-	mov	ds, bx
-	xor	si, si			;k now ds:si points to beginning of root directory
-	mov	es, si
-	mov	cx, 224			;max root entries
-loop_compare:
-	mov	di, stage2
-	push	cx
-	push	si			;save pointer to root dir entry
-	mov	cx, 11
-loop_name:
-	cmpsb
-	loopz	loop_name
-	jnz	goon			;cx didn't get to zero, bad file
-	pop	si
-	pop	cx
-	jmp	found_file		;good file, ds:si points to start of root directory entry
-goon:
-	pop	si
-	pop	cx
-	add	si, 32
-	loop	loop_compare
-
-error:
-	jmp	$			;halt! no kernel file found!
-
-found_file:				;ds:si points to root dir entry
-	xor	ax, ax
-	mov	gs, ax
-	mov	ax, BOOT_STAGE2_SEG
-	mov	es, ax
-
-	mov	ax, [ds:si+26]
-	mov	bx, BOOT_FAT_SEG
-	mov	ds, bx			;ds points to beginning of FAT
-	xor	di, di
-
-readstage2_loop:
-	cmp	ax, 0xff7
-	jg	readstage2_done
-	inc	di
-	push	ax
-	call	getCHSfromCluster
-	mov	ax, 0x0201
-	mov	dl, [gs:BOOT_DRIVE]
-	xor	bx, bx
-	int	0x13
-	mov	bx, es
-	add	bx, 0x0020
-	mov	es, bx
-	pop	ax			;current logical cluster #
-
-	mov	cx, ax			;cx=logical cluster
-	mov	dx, 3
-	mul	dx
-	shr	ax, 1			;ax=logical cluster * 3 / 2
-	mov	si, ax
-	test	cl, 1			;is bit0 set?
-	jnz	odd_cluster
-even_cluster:
-	lodsw
-	and	ax, 0x0fff
-	jmp	got_cluster
-odd_cluster:
-	lodsw
-	shr	ax, 4
-got_cluster:
-	jmp	readstage2_loop
-
-readstage2_done:
-
-	jmp	0:BOOT_STAGE2_ADD
-
-;------------------------------------------------------
-getCHSfromCluster:
-	;input: ax=lba of sector on floppy (0-2879)
-	add	ax, 31			;convert logical cluster# to lba#
-	xor	dx, dx			;lba->chs
-	mov	bx, 18
-	div	bx
-	inc	dx
-	mov	cl, dl			;sector# (1-18)
-	xor	dx, dx
-	mov	bx, 2
-	div	bx
-	mov	ch, al			;cylinder# (0-79)
-	mov	dh, dl			;head# (0-1)
-	ret
-
-
-;-------------------------------------------------------
-gdtr:
-	dw	gdt_end-gdt-1
-	dd	gdt
-gdt:
-	dd	0
-	dd	0
-
-KERNEL_DATA equ $-gdt
-	db	0xff		;segment 16 = 4gb data
-	db	0xff
-	db	0x00
-	db	0x00
-	db	0x00
-	db	0x92
-	db	0xcf		;cf
-	db	0x00
-
-gdt_end:
-
-
-
-stage2:	db	"STAGE2  BIN"
-
-times 510-($-$$)	db 0
-
-db	0x55, 0xaa
-

stage2.asm

@@ -1,971 +0,0 @@
-
-%include "bootdef.inc"
-
-%define VESA_MODEINFO_SEG 0x0120
-%define VESA_MODELIST_SEG 0x0140
-%define GOOD_MODELIST_SEG 0x0160
-
-[bits 16]
-
-org BOOT_STAGE2_ADD
-
-
-;k now read root directory
-	mov	bx, BOOT_ROOT_SEG
-	mov	ds, bx
-	xor	si, si			;k now ds:si points to beginning of root directory
-	mov	es, si
-	mov	cx, 224			;max root entries
-loop_compare:
-	mov	di, kernel
-	push	cx
-	push	si			;save pointer to root dir entry
-	mov	cx, 11
-loop_name:
-	cmpsb
-	loopz	loop_name
-	jnz	goon			;cx didn't get to zero, bad file
-	pop	si
-	pop	cx
-	jmp	found_file		;good file, ds:si points to start of root directory entry
-goon:
-	pop	si
-	add	si, 32
-	pop	cx
-	loop	loop_compare
-
-error:
-	jmp	$			;halt! no kernel file found!
-
-found_file:				;ds:si points to root dir entry of kernel file
-	xor	ax, ax
-	mov	gs, ax
-	mov	ax, [ds:si+26]
-	mov	bx, BOOT_FAT_SEG
-	mov	ds, bx			;ds points to beginning of FAT
-	mov	edi, BOOT_KERNEL_ADD
-
-readkernel_loop:
-	cmp	ax, 0xff7
-	jg	readkernel_done
-	push	ax
-	call	getCHSfromCluster
-	mov	ax, 0x0201
-	mov	dl, [gs:BOOT_DRIVE]
-	mov	bx, BOOT_KERNEL_SEG
-	mov	es, bx
-	xor	bx, bx
-	int	0x13
-	mov	cx, 256
-	xor	ax, ax
-	mov	es, ax
-	mov	esi, BOOT_KERNEL_SEG*16
-copykernel_loop:
-	mov	ax, [es:esi]
-	mov	[es:edi], ax
-	inc	esi
-	inc	esi
-	inc	edi
-	inc	edi
-	loop	copykernel_loop
-
-	pop	ax			;current logical cluster #
-
-	mov	cx, ax			;cx=logical cluster
-	mov	dx, 3
-	mul	dx
-	shr	ax, 1			;ax=logical cluster * 3 / 2
-	mov	si, ax
-	test	cl, 1			;is bit0 set?
-	jnz	odd_cluster
-even_cluster:
-	lodsw
-	and	ax, 0x0fff
-	jmp	got_cluster
-odd_cluster:
-	lodsw
-	shr	ax, 4
-got_cluster:
-	jmp	readkernel_loop
-
-;------------------------------------------------------
-readkernel_done:			;-------------put more real mode init stuff here!
-					;----ask to load RD from floppy
-	mov	ax, 0xb800
-	mov	es, ax
-	xor	ax, ax
-	mov	ds, ax
-	xor	di, di
-	mov	cx, 2000
-	mov	ax, 0x0700
-cls_loop:
-	stosw
-	loop	cls_loop
-
-	mov	dx, 0x3d4		;move cursor off screen...
-	mov	al, 0x0e
-	out	dx, al
-	inc	dx
-	mov	al, 0xff
-	out	dx, al
-	dec	dx
-	mov	al, 0x0f
-	out	dx, al
-	inc	dx
-	out	dx, al
-
-	xor	di, di
-	mov	si, txt_welcome
-	mov	ah, 0x1f
-	call	puts
-
-	mov	di, 160
-	mov	si, txt_rd1
-	mov	ah, 7
-	call	puts
-
-	mov	si, txt_rd2
-	mov	di, 160*2
-	call	puts
-
-	mov	di, 160*3
-	mov	si, txt_input
-	call	puts
-
-get_rd:
-	xor	ax, ax
-	int	0x16
-	cmp	al, '1'
-	jz	got_rd
-	cmp	al, '2'
-	jnz	get_rd
-got_rd:	
-	stosb
-	sub	al, '1'
-	push	ds
-	mov	bx, BOOT_DATA_SEG		;segment for data to send kernel
-	mov	ds, bx
-	mov	[ds:BOOT_HASRD], al
-	pop	ds				;ds=0
-	cmp	al, 0				;dont load rd
-	jnz	yes_rd
-	jmp	no_rd
-yes_rd:
-	mov	cx, 80
-	mov	edi, 0xb8000+160*4
-filler_loop:                                    ;draw a red bar
-	mov	word [ds:edi], 0x0400+177
-	inc	edi
-	inc	edi
-	loop	filler_loop
-
-	mov	cx, 80				;80 cylinders to read
-	xor	si, si                          ;start at cylinder 0
-	mov	edi, BOOT_RD_ADD		;ram disk address
-read_cylinder:
-	push	cx
-	
-	mov	bx, 0x0100			;read sectors from head 0
-	mov	es, bx
-	xor	bx, bx                          ;es:bx = data buffer for read
-	mov	ax, 0x0212			;ah = int 0x13 function 2, al = number of sectors to read
-	mov	cx, si                          ;what cyl. we are on is now in cx
-	mov	ch, cl				;ch = cyl. number
-	mov	cl, 1                           ;cl = sector number 1-63
-	xor	dx, dx				;dh = head number
-	mov	dl, [gs:BOOT_DRIVE]             ;dl = drive number
-	int	0x13
-
-	mov	bx, 0x0100			;now read sectors from head 1
-	mov	es, bx
-	mov	bx, 9216                        ;es:bx = data buffer for read
-	mov	ax, 0x0212			;ah = int 0x13 function 2, al = number of sectors to read
-	mov	cx, si                          ;what cyl. we are on is now in cx
-	mov	ch, cl				;ch = cyl. number
-	mov	cl, 1                           ;cl = sector number 1-63
-	mov	dh, 1				;dh = head number
-	mov	dl, [gs:BOOT_DRIVE]             ;dl = drive number
-	int	0x13
-
-	mov	ebx, 0xb8000
-	add	bx, si
-	shl	bl, 1
-	mov	word [ds:ebx+160*4], 0x0200+219
-
-	push	si
-	mov	esi, 0x1000
-	mov	cx, 0x2400
-copydisk_loop:
-	mov	ax, [ds:esi]
-	inc	esi
-	inc	esi
-	mov	[ds:edi], ax
-	inc	edi
-	inc	edi
-	loop	copydisk_loop
-
-	pop	si				;what cylinder# we are on...
-	inc	si
-	pop	cx
-	loop	read_cylinder
-
-;------------------------------------------------------
-no_rd:
-	mov	ax, BOOT_DATA_SEG
-	mov	es, ax
-	mov	di, BOOT_MEMMAP			;store memmap info in es:di for kernel
-	xor	edx, edx
-	mov	ax, 0x0100
-	mov	ds, ax
-	xor	ebx, ebx
-getmemmap_loop:
-	push	es
-	push	di
-	push	edx
-	mov	ax, 0x0100			;get memory map
-	mov	es, ax
-	xor	di, di
-	mov	eax, 0x0000E820
-	mov	ecx, 0x00000014
-	;mov	ebx, 0x00000000
-	mov	edx, 0x534D4150			;'SMAP'
-	int	0x15
-	jc	getmemmap_carry
-	cmp	eax, 0x534D4150			;eax should be 'SMAP' on return...
-	jnz	getmemmap_error
-	cmp	ebx, 0
-	jz	getmemmap_done
-
-	pop	edx				;now, copy memmap entry to es:di on the stack
-	pop	di
-	pop	es
-	xor	si, si
-	mov	cx, 20
-getmemmap_copymem_loop:
-	lodsb
-	stosb
-	loop	getmemmap_copymem_loop
-	inc	edx
-	jmp	getmemmap_loop
-
-getmemmap_error:
-	mov	ax, 0xb800
-	mov	es, ax
-	mov	di, 160*24
-	xor	ax, ax
-	mov	ds, ax
-	mov	si, txt_memerror
-	mov	ah, 0x04
-	call	puts
-	hlt
-	jmp	$
-
-getmemmap_carry:
-	dec	edx
-getmemmap_done:
-	pop	edx
-	pop	di
-	pop	es
-
-	xor	si, si
-	mov	cx, 20
-getmemmap_done_copymem_loop:
-	lodsb
-	stosb
-	loop	getmemmap_done_copymem_loop
-	inc	edx
-
-	mov	di, BOOT_MEMENTRIES
-	mov	[es:di], edx			;save # of memmap entries for kernel
-
-						;on to vesa info...
-	xor	ax, ax
-	mov	gs, ax
-	mov	ds, ax
-	mov	ax, 0xb800
-	mov	es, ax
-	mov	di, 160
-	mov	cx, 2000-80
-	mov	ax, 0x0700
-cls_vesa_loop:
-	stosw
-	loop	cls_vesa_loop
-	mov	si, txt_vesa
-	mov	di, 160*1
-	mov	ah, 7
-	call	puts
-
-	push	di
-	mov	ax, 0x0100
-	mov	es, ax
-	xor	di, di
-	mov	dword [es:di], "2EBV"
-	mov	ax, 0x4F00
-
-	int	0x10
-	pop	di
-	cmp	ax, 0x004F
-	jz	vesa_good
-	mov	si, txt_novesa
-	mov	ax, 0xb800
-	mov	es, ax
-	mov	ah, 7
-	call	puts
-	mov	ax, BOOT_DATA_SEG
-	mov	ds, ax
-	mov	word [ds:BOOT_VESA], 0
-	jmp	vesa_done
-vesa_good:
-	mov	ax, 0xb800
-	mov	es, ax
-	mov	ax, 0x0100
-	mov	ds, ax
-	xor	si, si
-	mov	bx, [4]
-	mov	al, bh
-	call	puthex
-	mov	al, '.'
-	stosb
-	mov	al, 7
-	stosb
-	mov	al, bl
-	call	puthex
-	add	di, 4
-	cmp	bh, 2
-	jge	vesa_good2
-	xor	ax, ax
-	mov	ds, ax
-	mov	si, txt_vesaold
-	mov	ah, 7
-	call	puts
-	mov	ax, BOOT_DATA_SEG
-	mov	ds, ax
-	mov	word [ds:BOOT_VESA], 0
-	jmp	vesa_done
-vesa_good2:
-	mov	ebx, [6]			;something like 0x00000E60
-	mov	edx, [14]
-	mov	si, bx
-	shr	ebx, 16
-	mov	ds, bx				;ds:si points to null-terminated OEM identification string
-	mov	ah, 2
-	push	si
-	call	puts
-	pop	si
-	mov	ax, BOOT_DATA_SEG
-	mov	es, ax
-	mov	di, BOOT_VESA_OEM
-vesa_copyoem:
-	lodsb
-	stosb
-	or	al, al
-	jnz	vesa_copyoem
-	mov	ax, 0x0100
-	mov	ds, ax
-	xor	si, si
-	mov	di, BOOT_VESA_VBE
-	mov	cx, 512
-vesa_copyvbe:
-	lodsb
-	stosb
-	loop	vesa_copyvbe
-
-	mov	si, dx
-	shr	edx, 16
-	mov	ds, dx				;ds:si points to video mode list
-	mov	ax, VESA_MODELIST_SEG
-	mov	es, ax
-	xor	di, di
-vesa_copymodes:
-	lodsw
-	stosw
-	cmp	ax, 0xffff
-	jnz	vesa_copymodes
-
-	mov	ax, GOOD_MODELIST_SEG
-	mov	es, ax
-	xor	di, di
-	mov	cx, 256
-	mov	ax, 0xffff
-clear_good_mode_list_loop:
-	stosw
-	loop	clear_good_mode_list_loop
-
-	mov	ax, VESA_MODELIST_SEG
-	mov	ds, ax
-	xor	si, si				;ds:si points to video mode list where we can edit it :)
-	mov	ax, GOOD_MODELIST_SEG
-	mov	es, ax
-	xor	di, di
-	xor	dx, dx				;dx=what good mode # we are on
-vesa_readmodeinfo_loop:
-	lodsw
-	cmp	ax, 0xffff
-	jz	vesa_endofmodes
-	push	ax				;save mode#
-	call	checkmode
-	cmp	ax, 0
-	jz	vesa_readmodeinfo_good
-	pop	ax
-	jmp	vesa_readmodeinfo_loop
-vesa_readmodeinfo_good:
-	pop	ax				;restore mode#
-	stosw
-	call	vesa_showmodeinfo
-	inc	dx
-	jmp	vesa_readmodeinfo_loop
-
-vesa_endofmodes:				;here we have a list of good modes at GOOD_MODELIST_SEG:0
-	xor	ax, ax
-	mov	ds, ax
-	mov	si, txt_consolemode
-	mov	ax, 0xb800
-	mov	es, ax
-	mov	di, 160*2
-	mov	ah, 7
-	call	puts
-	mov	di, 160*3
-	mov	cx, dx
-	mov	al, 'b'
-vesa_displaylabels:
-	stosb
-	push	ax
-	mov	al, 7
-	stosb
-	mov	al, '.'
-	stosb
-	mov	al, 7
-	stosb
-	pop	ax
-	inc	al
-	add	di, 160-4
-	loop	vesa_displaylabels		;done drawing screen of VESA choices, now ask for one
-						;valid options are 'a' through (al-1)
-	mov	bl, al
-	xor	ax, ax
-	mov	ds, ax
-	mov	di, 160*24
-	mov	si, txt_input
-	mov	ah, 14
-	call	puts
-vesa_getchoice:
-	xor	ax, ax
-	int	0x16
-	cmp	al, 'a'
-	jl	vesa_getchoice
-	cmp	al, bl
-	jge	vesa_getchoice
-	stosb
-	push	ax
-	mov	al, 14
-	stosb
-	pop	ax
-	xor	ah, ah
-	sub	ax, 'a'
-	cmp	ax, 0
-	jz	vesa_consolemode_only
-	mov	cx, ax				;cx holds good mode# (1=first good vesa mode)
-	dec	cx
-	mov	ax, GOOD_MODELIST_SEG
-	mov	ds, ax
-	shl	cx, 1
-	mov	si, cx				;ds:si points to word containing selected mode#
-	lodsw
-	mov	cx, ax
-	mov	dx, ax				;cx and dx hold mode#
-
-	mov	ax, VESA_MODEINFO_SEG
-	mov	es, ax
-	xor	di, di
-	mov	ax, 0x4F01
-	int	0x10
-	call	checkvesa
-
-	mov	ax, VESA_MODEINFO_SEG
-	mov	ds, ax
-	xor	si, si
-	mov	ax, BOOT_DATA_SEG
-	mov	es, ax
-	mov	di, BOOT_VESA_INFO
-	mov	cx, 256
-vesa_copymodeinfo_loop:
-	lodsb
-	stosb
-	loop	vesa_copymodeinfo_loop		;store ModeInfoBlock for current
-
-	mov	[es:BOOT_VESA], dx		;store mode# for kernel
-
-;	mov	ax, 0xb800
-;	mov	es, ax
-;	xor	di, di
-;	mov	al, dh
-;	call	puthex2
-;	mov	al, dl
-;	call	puthex2
-
-	mov	bx, dx
-	or	bx, 0x4000			;set "use LFB" bit of mode#
-	mov	ax, 0x4F02
-	int	0x10				;switch to graphics mode!!!
-	call	checkvesa
-
-	jmp	vesa_done
-
-vesa_consolemode_only:
-	mov	ax, BOOT_DATA_SEG
-	mov	es, ax
-	mov	word [es:BOOT_VESA], 0
-
-	jmp	vesa_done
-
-;------------------------------------------------------
-vesa_showmodeinfo:
-	pusha
-	push	es
-	push	ds
-	mov	ax, VESA_MODEINFO_SEG
-	mov	ds, ax
-	xor	si, si
-	mov	ax, 0xb800
-	mov	es, ax
-
-	mov	cx, dx
-
-	mov	ax, 160
-	mul	dx				;ax=160*mod#
-	add	ax, 160*3+6			;offset first line of modes and room on left for label
-	mov	di, ax
-
-	mov	ax, [ds:18]
-	call	console_putDec
-	add	di, 10
-	mov	al, 'x'
-	call	console_putChar
-	inc	di
-	inc	di
-	mov	ax, [ds:20]
-	call	console_putDec
-	add	di, 10
-	mov	al, 'x'
-	call	console_putChar
-	inc	di
-	inc	di
-	xor	ah, ah
-	mov	al, [ds:25]
-	call	console_putDec
-	add	di, 8
-	mov	al, [ds:0]
-	test	al, 0x80
-	jz	vesa_showmodeinfo_done
-	mov	al, 'L'
-	call	console_putChar
-	mov	al, 'F'
-	call	console_putChar
-	mov	al, 'B'
-	call	console_putChar
-	inc	di
-	inc	di
-	mov	ebx, [ds:40]
-	mov	eax, ebx
-	shr	eax, 24
-	call	puthex2
-	mov	eax, ebx
-	shr	eax, 16
-	call	puthex2
-	mov	al, bh
-	call	puthex2
-	mov	al, bl
-	call	puthex2
-vesa_showmodeinfo_done:
-	pop	ds
-	pop	es
-	popa
-	ret
-
-;------------------------------------------------------
-checkmode:
-	push	bx
-	push	cx
-	push	dx
-	push	es
-	push	ds
-	push	di
-	push	si
-	mov	cx, ax				;cx=modenumber
-	mov	ax, VESA_MODEINFO_SEG
-	mov	es, ax
-	xor	di, di
-	mov	ax, 0x4F01
-	int	0x10
-	call	checkvesa
-	xor	di, di				;es:di -> ModeInfoBlock struc
-	mov	ax, [es:di]			;ModeAttributes
-	test	al, 1				;mode supported
-	jz	vesa_modenogood
-	test	al, 8				;color mode
-	jz	vesa_modenogood
-	test	al, 0x10			;graphics mode
-	jz	vesa_modenogood
-	test	al, 0x80			;Linear Frame Buffer supported
-	jz	vesa_modenogood
-	mov	al, [es:di+25]			;BitsPerPixel
-	cmp	al, 16
-	jz	vesa_bppok
-	cmp	al, 24
-	jz	vesa_bppok
-	cmp	al, 32
-	jnz	vesa_modenogood
-vesa_bppok:
-	mov	ax, [es:di+18]			;XResolution
-	mov	bx, [es:di+20]			;YResolution
-	cmp	ax, 640				;640x480
-	jnz	res_goon1
-	cmp	bx, 480
-	jnz	vesa_modenogood
-	jmp	vesa_modegood
-res_goon1:
-	cmp	ax, 800
-	jnz	res_goon2
-	cmp	bx, 600
-	jnz	vesa_modenogood
-	jmp	vesa_modegood
-res_goon2:
-	cmp	ax, 1024
-	jnz	res_goon3
-	cmp	bx, 768
-	jnz	vesa_modenogood
-	jmp	vesa_modegood
-res_goon3:
-	cmp	ax, 1280
-	jnz	res_goon4
-	cmp	bx, 1024
-	jz	vesa_modegood
-	cmp	bx, 960
-	jz	vesa_modegood
-	jmp	vesa_modenogood
-res_goon4:
-	cmp	ax, 1600
-	jnz	vesa_modenogood
-	cmp	bx, 1200
-	jnz	vesa_modenogood
-vesa_modegood:
-	pop	si
-	pop	di
-	pop	ds
-	pop	es
-	pop	dx
-	pop	cx
-	pop	bx
-	xor	ax, ax
-	ret
-vesa_modenogood:
-	pop	si
-	pop	di
-	pop	ds
-	pop	es
-	pop	dx
-	pop	cx
-	pop	bx
-	mov	ax, 0xffff
-	ret
-
-;------------------------------------------------------
-vesa_done:
-
-;	xor	ax, ax				;wait for keypress...
-;	int	0x16
-
-	jmp	go_pm
-
-;------------------------------------------------------
-puts:
-	lodsb
-	or	al, al
-	jz	puts_done
-	stosb
-	mov	al, ah
-	stosb
-	jmp	puts
-puts_done:
-	ret
-
-;------------------------------------------------------
-checkvesa:
-	cmp	ax, 0x004F
-	jnz	vesaerror
-	ret
-vesaerror:
-	mov	ax, 0xb800
-	mov	es, ax
-	xor	ax, ax
-	mov	ds, ax
-	mov	si, txt_vesaerror
-	mov	di, 160*24
-	mov	ah, 4
-	call	puts
-	cli
-	hlt
-
-;-------Function console_putDec
-;input:
-; AX = number to display
-;output:
-; number written in decimal to es:di
-console_putDec:
-	pusha
-	xor	dx, dx
-	xor	bh, bh			;no characters written yet
-	mov	cx, 10000
-	div	cx			;ax=quotiont, dx=remainder
-	add	ax, '0'
-	cmp	ax, '0'
-	je	.goon1
-	call	console_putChar
-	mov	bh, 1
-
-.goon1:
-	mov	ax, dx			;load remainder to ax
-	xor	dx, dx
-	mov	cx, 1000
-	div	cx			;ax=quotiont, dx=remainder
-	add	ax, '0'
-	cmp	ax, '0'
-	je	.goon11
-	call	console_putChar
-	mov	bh, 1
-	jmp	.goon2
-.goon11:
-	cmp	bh, 0
-	je	.goon2
-	call	console_putChar
-
-.goon2:
-	mov	ax, dx			;load remainder to ax
-	xor	dx, dx
-	mov	cx, 100
-	div	cx			;ax=quotiont, dx=remainder
-	add	ax, '0'
-	cmp	ax, '0'
-	je	.goon21
-	call	console_putChar
-	mov	bh, 1
-	jmp	.goon3
-.goon21:
-	cmp	bh, 0
-	je	.goon3
-	call	console_putChar
-
-.goon3:
-	mov	ax, dx			;load remainder to ax
-	xor	dx, dx
-	mov	cx, 10
-	div	cx			;ax=quotiont, dx=remainder
-	add	ax, '0'
-	cmp	ax, '0'
-	je	.goon31
-	call	console_putChar
-	mov	bh, 1
-	jmp	.goon4
-.goon31:
-	cmp	bh, 0
-	je	.goon4
-	call	console_putChar
-.goon4:					;here dx contains last remainder
-	mov	ax, dx
-	add	ax, '0'
-	call	console_putChar
-
-	popa
-	ret
-
-;------------------------------------------------------
-console_putChar:
-	stosb
-	mov	al, 7
-	stosb
-	ret
-
-;------------------------------------------------------
-puthex:
-	;es:di points to video memory
-	;al holds hex value
-
-	push	ax
-	mov	ah, al
-	shr	ax, 4
-	and	al, 0x0F
-	add	al, '0'
-	cmp	al, '9'
-	jle	puthex_goon1
-	add	al, 'A'-'9'-1
-puthex_goon1:
-	cmp	al, '0'
-	jz	puthex_skipzero
-	stosb
-	mov	al, 7
-	stosb
-puthex_skipzero:
-	pop	ax
-	push	ax
-	and	al, 0x0F
-	add	al, '0'
-	cmp	al, '9'
-	jle	puthex_goon2
-	add	al, 'A'-'9'-1
-puthex_goon2:
-	stosb
-	mov	al, 7
-	stosb
-	pop	ax
-	ret
-
-;------------------------------------------------------
-puthex2:
-	;es:di points to video memory, always displays 2 characters!
-	;al holds hex value
-
-	push	ax
-	mov	ah, al
-	shr	ax, 4
-	and	al, 0x0F
-	add	al, '0'
-	cmp	al, '9'
-	jle	puthex2_goon1
-	add	al, 'A'-'9'-1
-puthex2_goon1:
-	stosb
-	mov	al, 7
-	stosb
-	pop	ax
-	push	ax
-	and	al, 0x0F
-	add	al, '0'
-	cmp	al, '9'
-	jle	puthex2_goon2
-	add	al, 'A'-'9'-1
-puthex2_goon2:
-	stosb
-	mov	al, 7
-	stosb
-	pop	ax
-	ret
-
-;------------------------------------------------------
-txt_welcome: db	"                             Welcome to HOS v", VERSION, "!                              ", 0
-txt_rd1: db	"1. Do not load an initial ram disk", 0
-txt_rd2: db	"2. Load initial ram disk from floppy", 0
-txt_input: db	"Enter your selection: ", 0
-txt_vesa: db	"VESA version: ", 0
-txt_vesaerror: db "VESA function call error! Halting system!", 0
-txt_novesa: db	"VESA not found. Starting in console mode...", 0
-txt_vesaold: db	"VESA version 2.0 required. Starting in console mode...", 0
-txt_consolemode: db "a. Console mode only.", 0
-txt_memerror: db "Extended Memory Map information unavailable! Halting system...", 0
-
-;------------------------------------------------------
-getCHSfromCluster:
-	;input: ax=lba of sector on floppy (0-2879)
-	add	ax, 31			;convert logical cluster# to lba#
-	xor	dx, dx			;lba->chs
-	mov	bx, 18
-	div	bx
-	inc	dx
-	mov	cl, dl			;sector# (1-18)
-	xor	dx, dx
-	mov	bx, 2
-	div	bx
-	mov	ch, al			;cylinder# (0-79)
-	mov	dh, dl			;head# (0-1)
-	ret
-
-
-;-------------------------------------------------------
-gdtr:
-	dw	gdt_end-gdt-1
-	dd	gdt
-gdt:
-	dd	0
-	dd	0
-
-KERNEL_CODE equ $-gdt
-	db	0xff		;limit	7:0
-	db	0xff		;limit	15:8
-	db	0x00		;base	7:0
-	db	0x00		;base	15:8
-	db	0x00		;base	23:16
-	db	0x9a		;access
-	db	0xcf		;flags / limit 19:16
-	db	0x00		;base	31:24
-
-KERNEL_DATA equ $-gdt
-	db	0xff		;segment 16 = 4gb data
-	db	0xff
-	db	0x00
-	db	0x00
-	db	0x00
-	db	0x92
-	db	0xcf
-	db	0x00
-
-gdt_end:
-
-
-;-------------------------------------------------------
-gdtr32:
-	dw	gdt_end32-gdt32-1
-	dd	gdt32
-gdt32:
-	dd	0
-	dd	0
-
-	;a base of 0x4000_0000, when added to 0xC000_0000 will produce 0x0000_0000 physical before paging in effect
-KERNEL_CODE32 equ $-gdt32
-	db	0xff		;limit	7:0
-	db	0xff		;limit	15:8
-	db	0x00		;base	7:0
-	db	0x00		;base	15:8
-	db	0x00		;base	23:16
-	db	0x9a		;access
-	db	0xcf		;flags / limit 19:16
-	db	0x40		;base	31:24
-
-KERNEL_DATA32 equ $-gdt32
-	db	0xff		;segment 16 = 4gb data
-	db	0xff
-	db	0x00
-	db	0x00
-	db	0x00
-	db	0x92
-	db	0xcf
-	db	0x40
-
-gdt_end32:
-
-;------------------------------------------------------
-go_pm:
-	xor	ax, ax
-	mov	ds, ax
-	lgdt	[gdtr]
-	cli
-	mov	eax, cr0
-	inc	eax
-	mov	cr0, eax
-
-	jmp	KERNEL_CODE:pmode
-
-bits 32
-pmode:
-	lgdt	[gdtr32]
-	jmp	KERNEL_CODE32:pmode_offsetted+0xC0000000
-
-pmode_offsetted:
-	mov	ax, KERNEL_DATA32
-	mov	es, ax
-	mov	ds, ax
-	mov	fs, ax
-	mov	gs, ax
-	jmp	KERNEL_CODE:BOOT_KERNEL_ADD+0xC0000000
-
-kernel:	db	"KERNEL  BIN", 0
-
-

stdfont.h

@@ -1,258 +0,0 @@
-const byte stdfont[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x80, 0xC0, 0xE0, 0xF0, 0xE0, 0xC0, 0x80, 
-	0x00, 0x08, 0x18, 0x38, 0x78, 0x38, 0x18, 0x08, 
-	0x00, 0x20, 0x70, 0xA8, 0x20, 0xA8, 0x70, 0x20, 
-	0x00, 0xA0, 0xA0, 0xA0, 0xA0, 0x00, 0xA0, 0xA0, 
-	0x00, 0x78, 0xA8, 0xA8, 0x78, 0x28, 0x28, 0x68, 
-	0x00, 0x78, 0x80, 0x70, 0x88, 0x70, 0x08, 0xF0, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xF8, 
-	0x00, 0x20, 0x70, 0xA8, 0x20, 0xA8, 0x70, 0xF8, 
-	0x00, 0x20, 0x70, 0xA8, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x20, 0x20, 0x20, 0x20, 0xA8, 0x70, 0x20, 
-	0x00, 0x00, 0x20, 0x10, 0xF8, 0x10, 0x20, 0x00, 
-	0x00, 0x00, 0x20, 0x40, 0xF8, 0x40, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x90, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x70, 0xF8, 0xF8, 0x00, 0x00, 
-	0x00, 0x00, 0xF8, 0xF8, 0x70, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x20, 0x20, 0x20, 0x00, 0x20, 0x20, 
-	0x00, 0x50, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x50, 0xF8, 0x50, 0x50, 0x50, 0xF8, 0x50, 
-	0x00, 0x20, 0x78, 0xA0, 0x70, 0x28, 0xF0, 0x20, 
-	0x00, 0x00, 0x08, 0x90, 0x20, 0x48, 0x80, 0x00, 
-	0x00, 0x20, 0x50, 0x50, 0x20, 0x58, 0x90, 0x68, 
-	0x00, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 
-	0x00, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 
-	0x00, 0x00, 0xA8, 0x70, 0xF8, 0x70, 0xA8, 0x00, 
-	0x00, 0x00, 0x20, 0x20, 0xF8, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 
-	0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 
-	0x00, 0x70, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 
-	0x00, 0x20, 0x60, 0xA0, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x70, 0x88, 0x08, 0x10, 0x20, 0x40, 0xF8, 
-	0x00, 0x70, 0x88, 0x08, 0x10, 0x08, 0x88, 0x70, 
-	0x00, 0x30, 0x50, 0x90, 0x90, 0xF8, 0x10, 0x10, 
-	0x00, 0xF8, 0x80, 0x80, 0xF8, 0x08, 0x88, 0x70, 
-	0x00, 0x38, 0x40, 0x80, 0xF0, 0x88, 0x88, 0x70, 
-	0x00, 0xF8, 0x08, 0x10, 0x20, 0x40, 0x40, 0x40, 
-	0x00, 0x70, 0x88, 0x88, 0x70, 0x88, 0x88, 0x70, 
-	0x00, 0x70, 0x88, 0x88, 0x78, 0x08, 0x10, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x40, 
-	0x00, 0x10, 0x20, 0x40, 0x80, 0x40, 0x20, 0x10, 
-	0x00, 0x00, 0x00, 0xF0, 0x00, 0xF0, 0x00, 0x00, 
-	0x00, 0x80, 0x40, 0x20, 0x10, 0x20, 0x40, 0x80, 
-	0x00, 0x70, 0x88, 0x08, 0x10, 0x20, 0x00, 0x20, 
-	0x00, 0x70, 0x88, 0x88, 0xB8, 0xB0, 0x80, 0x78, 
-	0x00, 0x70, 0x88, 0x88, 0xF8, 0x88, 0x88, 0x88, 
-	0x00, 0xF0, 0x88, 0x88, 0xF0, 0x88, 0x88, 0xF0, 
-	0x00, 0x70, 0x88, 0x80, 0x80, 0x80, 0x88, 0x70, 
-	0x00, 0xF0, 0x88, 0x88, 0x88, 0x88, 0x88, 0xF0, 
-	0x00, 0xF8, 0x80, 0x80, 0xF0, 0x80, 0x80, 0xF8, 
-	0x00, 0xF8, 0x80, 0x80, 0xF0, 0x80, 0x80, 0x80, 
-	0x00, 0x70, 0x88, 0x80, 0xB8, 0x88, 0x88, 0x70, 
-	0x00, 0x88, 0x88, 0x88, 0xF8, 0x88, 0x88, 0x88, 
-	0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0x60, 
-	0x00, 0x88, 0x90, 0xA0, 0xC0, 0xA0, 0x90, 0x88, 
-	0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xF8, 
-	0x00, 0x88, 0xD8, 0xA8, 0x88, 0x88, 0x88, 0x88, 
-	0x00, 0x88, 0xC8, 0xE8, 0xB8, 0x98, 0x88, 0x88, 
-	0x00, 0x70, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 
-	0x00, 0xF0, 0x88, 0x88, 0xF0, 0x80, 0x80, 0x80, 
-	0x00, 0x70, 0x88, 0x88, 0x88, 0xA8, 0x98, 0x70, 
-	0x00, 0xF0, 0x88, 0x88, 0xF0, 0xA0, 0x90, 0x88, 
-	0x00, 0x70, 0x88, 0x80, 0x70, 0x08, 0x88, 0x70, 
-	0x00, 0xF8, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 
-	0x00, 0x88, 0x88, 0x88, 0x88, 0x88, 0x50, 0x20, 
-	0x00, 0x88, 0x88, 0x88, 0x88, 0x88, 0xA8, 0x50, 
-	0x00, 0x88, 0x50, 0x20, 0x20, 0x50, 0x88, 0x88, 
-	0x00, 0x88, 0x88, 0x50, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0xF8, 0x08, 0x10, 0x20, 0x40, 0x80, 0xF8, 
-	0x00, 0x70, 0x40, 0x40, 0x40, 0x40, 0x40, 0x70, 
-	0x00, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x08, 0x00, 
-	0x00, 0xE0, 0x20, 0x20, 0x20, 0x20, 0x20, 0xE0, 
-	0x00, 0x20, 0x50, 0x88, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 
-	0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x70, 0x08, 0x78, 0x88, 0x78, 
-	0x00, 0x80, 0x80, 0xF0, 0x88, 0x88, 0x88, 0xF0, 
-	0x00, 0x00, 0x00, 0x70, 0x88, 0x80, 0x88, 0x70, 
-	0x00, 0x08, 0x08, 0x78, 0x88, 0x88, 0x88, 0x78, 
-	0x00, 0x00, 0x00, 0x70, 0x88, 0xF8, 0x80, 0x78, 
-	0x00, 0x30, 0x40, 0x40, 0xE0, 0x40, 0x40, 0x40, 
-	0x00, 0x00, 0x00, 0x78, 0x88, 0x78, 0x08, 0x70, 
-	0x00, 0x80, 0x80, 0xF0, 0x88, 0x88, 0x88, 0x88, 
-	0x00, 0x20, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x10, 0x00, 0x10, 0x10, 0x10, 0x90, 0x60, 
-	0x00, 0x80, 0x80, 0x90, 0xA0, 0xC0, 0xA0, 0x90, 
-	0x00, 0xC0, 0x40, 0x40, 0x40, 0x40, 0x40, 0xE0, 
-	0x00, 0x00, 0x00, 0xD0, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0x00, 0x00, 0x00, 0xF0, 0x88, 0x88, 0x88, 0x88, 
-	0x00, 0x00, 0x00, 0x70, 0x88, 0x88, 0x88, 0x70, 
-	0x00, 0x00, 0x00, 0xF0, 0x88, 0xF0, 0x80, 0x80, 
-	0x00, 0x00, 0x00, 0x78, 0x88, 0x78, 0x08, 0x38, 
-	0x00, 0x00, 0x00, 0x70, 0x48, 0x40, 0x40, 0x40, 
-	0x00, 0x00, 0x00, 0x78, 0x80, 0x70, 0x08, 0xF0, 
-	0x00, 0x40, 0x40, 0xE0, 0x40, 0x40, 0x40, 0x20, 
-	0x00, 0x00, 0x00, 0x88, 0x88, 0x88, 0x88, 0x78, 
-	0x00, 0x00, 0x00, 0x88, 0x88, 0x88, 0x50, 0x20, 
-	0x00, 0x00, 0x00, 0x88, 0x88, 0x88, 0xA8, 0x50, 
-	0x00, 0x00, 0x00, 0x88, 0x50, 0x20, 0x50, 0x88, 
-	0x00, 0x00, 0x00, 0x88, 0x88, 0x78, 0x08, 0xF0, 
-	0x00, 0x00, 0x00, 0xF8, 0x10, 0x20, 0x40, 0xF8, 
-	0x00, 0x30, 0x40, 0x40, 0x80, 0x40, 0x40, 0x30, 
-	0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0xC0, 0x20, 0x20, 0x10, 0x20, 0x20, 0xC0, 
-	0x00, 0x00, 0x68, 0x90, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x70, 0x88, 0x88, 0xF8, 0x88, 0x88, 0x88, 
-	0x00, 0xF8, 0x88, 0x80, 0xF0, 0x88, 0x88, 0xF0, 
-	0x00, 0xF0, 0x88, 0x88, 0xF0, 0x88, 0x88, 0xF0, 
-	0x00, 0xF8, 0x48, 0x40, 0x40, 0x40, 0x40, 0xE0, 
-	0x00, 0xF0, 0x50, 0x50, 0x50, 0x50, 0x78, 0x88, 
-	0x00, 0xF8, 0x80, 0x80, 0xF0, 0x80, 0x80, 0xF8, 
-	0x00, 0xA8, 0xA8, 0x70, 0x20, 0x70, 0xA8, 0xA8, 
-	0x00, 0x70, 0x88, 0x08, 0x30, 0x08, 0x88, 0x70, 
-	0x00, 0x88, 0x98, 0xA8, 0xA8, 0xA8, 0xC8, 0x88, 
-	0x00, 0xA8, 0xC8, 0x98, 0xA8, 0xA8, 0xC8, 0x88, 
-	0x00, 0x88, 0x90, 0xA0, 0xC0, 0xA0, 0x90, 0x88, 
-	0x00, 0xF8, 0x50, 0x50, 0x50, 0x50, 0x50, 0x90, 
-	0x00, 0x88, 0xD8, 0xA8, 0x88, 0x88, 0x88, 0x88, 
-	0x00, 0x88, 0x88, 0x88, 0xF8, 0x88, 0x88, 0x88, 
-	0x00, 0x70, 0x88, 0x88, 0x88, 0x88, 0x88, 0x70, 
-	0x00, 0xF8, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x00, 0xF0, 0x88, 0x88, 0xF0, 0x80, 0x80, 0x80, 
-	0x00, 0x70, 0x88, 0x80, 0x80, 0x80, 0x88, 0x70, 
-	0x00, 0xF8, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x88, 0x88, 0x88, 0x50, 0x20, 0x40, 0x80, 
-	0x00, 0x70, 0x20, 0xF8, 0xA8, 0xF8, 0x20, 0x70, 
-	0x00, 0x88, 0x88, 0x50, 0x20, 0x50, 0x88, 0x88, 
-	0x00, 0x88, 0x88, 0x88, 0x88, 0x88, 0xF8, 0x08, 
-	0x00, 0x88, 0x88, 0x88, 0xF8, 0x08, 0x08, 0x38, 
-	0x00, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xF8, 
-	0x00, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xF8, 0x08, 
-	0x00, 0xC0, 0x40, 0x40, 0x78, 0x48, 0x48, 0x78, 
-	0x00, 0x88, 0x88, 0xC8, 0xA8, 0xA8, 0xA8, 0xE8, 
-	0x00, 0x80, 0x80, 0xF0, 0x88, 0x88, 0x88, 0xF0, 
-	0x00, 0xF0, 0x88, 0x08, 0x78, 0x08, 0x88, 0xF0, 
-	0x00, 0x90, 0xA8, 0xA8, 0xE8, 0xA8, 0xA8, 0x90, 
-	0x00, 0x78, 0x88, 0x88, 0x78, 0x28, 0x48, 0x88, 
-	0x00, 0x00, 0x70, 0x08, 0x78, 0x88, 0x88, 0x78, 
-	0x00, 0x00, 0xF8, 0x80, 0xF0, 0x88, 0x88, 0xF0, 
-	0x00, 0x00, 0xF0, 0x88, 0xF0, 0x88, 0x88, 0xF0, 
-	0x00, 0x00, 0xF8, 0x48, 0x48, 0x40, 0x40, 0xE0, 
-	0x00, 0x00, 0x78, 0x50, 0x50, 0x50, 0x70, 0x88, 
-	0x00, 0x00, 0x70, 0x88, 0xF8, 0x80, 0x88, 0x70, 
-	0x00, 0x00, 0xA8, 0x70, 0x20, 0x70, 0xA8, 0xA8, 
-	0x00, 0x00, 0x00, 0xF0, 0x88, 0x30, 0x88, 0x70, 
-	0x00, 0x00, 0x88, 0x98, 0xA8, 0xC8, 0x88, 0x88, 
-	0x00, 0x50, 0x20, 0x88, 0x98, 0xA8, 0xC8, 0x88, 
-	0x00, 0x00, 0x88, 0x90, 0xA0, 0xE0, 0x90, 0x88, 
-	0x00, 0x00, 0xF8, 0x48, 0x48, 0x48, 0x48, 0xC8, 
-	0x00, 0x00, 0x88, 0xD8, 0xA8, 0x88, 0x88, 0x88, 
-	0x00, 0x00, 0x88, 0x88, 0xF8, 0x88, 0x88, 0x88, 
-	0x00, 0x00, 0x70, 0x88, 0x88, 0x88, 0x88, 0x70, 
-	0x00, 0x00, 0xF8, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x70, 0x50, 0x70, 0x08, 0x78, 0x88, 0x78, 
-	0x00, 0x88, 0x00, 0x70, 0x08, 0x78, 0x88, 0x78, 
-	0x00, 0x88, 0x00, 0x70, 0x88, 0x88, 0x88, 0x70, 
-	0x00, 0x88, 0x00, 0x88, 0x88, 0x88, 0x88, 0x78, 
-	0x00, 0x90, 0x00, 0xF0, 0x80, 0xE0, 0x80, 0xF0, 
-	0x00, 0x00, 0x70, 0x48, 0x70, 0x48, 0x48, 0xF0, 
-	0x00, 0x88, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x88, 0x00, 0x70, 0x88, 0xF8, 0x80, 0x78, 
-	0x00, 0x70, 0x50, 0x70, 0x88, 0xF8, 0x88, 0x88, 
-	0x00, 0x88, 0x70, 0x88, 0x88, 0xF8, 0x88, 0x88, 
-	0x00, 0x88, 0x70, 0x88, 0x88, 0x88, 0x88, 0x70, 
-	0x00, 0x88, 0x00, 0x88, 0x88, 0x88, 0x88, 0x78, 
-	0x00, 0x88, 0xF8, 0x80, 0xE0, 0x80, 0x80, 0xF8, 
-	0x00, 0x40, 0x20, 0x70, 0x88, 0xF8, 0x80, 0x78, 
-	0x00, 0x10, 0x20, 0x70, 0x88, 0xF8, 0x80, 0x78, 
-	0x00, 0x20, 0x50, 0x70, 0x88, 0xF8, 0x80, 0x78, 
-	0x00, 0x40, 0x20, 0x70, 0x08, 0x78, 0x88, 0x78, 
-	0x00, 0x20, 0x50, 0x00, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x20, 0x10, 0x88, 0x88, 0x88, 0x88, 0x78, 
-	0x00, 0x00, 0x00, 0x70, 0x80, 0x80, 0x70, 0x20, 
-	0x00, 0x70, 0x88, 0x40, 0xF0, 0x40, 0x40, 0xF8, 
-	0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x88, 0x88, 0x88, 0xF0, 0x80, 0x80, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0xF0, 0x88, 0x88, 0xF0, 0x80, 0x80, 
-	0x00, 0x00, 0x70, 0x88, 0x80, 0x80, 0x88, 0x70,
-	0x00, 0x00, 0xF8, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x00, 0x00, 0x88, 0x88, 0x50, 0x20, 0x40, 0x80, 
-	0x00, 0x00, 0x70, 0x20, 0xF8, 0xF8, 0x20, 0x70, 
-	0x00, 0x00, 0x88, 0x50, 0x20, 0x50, 0x88, 0x88, 
-	0x00, 0x00, 0x88, 0x88, 0x88, 0x88, 0xF8, 0x08, 
-	0x00, 0x00, 0x88, 0x88, 0x88, 0xF8, 0x08, 0x38, 
-	0x00, 0x00, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xF8, 
-	0x00, 0x00, 0xA8, 0xA8, 0xA8, 0xA8, 0xF8, 0x08, 
-	0x00, 0x00, 0xC0, 0x40, 0x70, 0x48, 0x48, 0x70, 
-	0x00, 0x00, 0x88, 0x88, 0xC8, 0xA8, 0xA8, 0xE8, 
-	0x00, 0x00, 0x80, 0x80, 0xF0, 0x88, 0x88, 0xF0, 
-	0x00, 0x00, 0x70, 0x88, 0x38, 0x08, 0x88, 0x70, 
-	0x00, 0x00, 0x90, 0xA8, 0xA8, 0xE8, 0xA8, 0x90, 
-	0x00, 0x00, 0x38, 0x48, 0x48, 0x38, 0x28, 0x48, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00	};
-

vfs.c

@@ -1,91 +0,0 @@
-// vfs.c
-// Author: Josh Holtrop
-// Created: 12/31/03
-// Modified: 01/04/04
-
-
-void	vfs_init()
-{
-	firstDiskDevice = malloc(sizeof(DiskDevice));
-	firstDiskDevice->type = VFS_DISK_FD;
-	firstDiskDevice->fileSystem = VFS_FS_FAT12;
-	firstDiskDevice->location = VFS_LOC_FD0;
-	firstDiskDevice->link = 0;
-	strcpy(firstDiskDevice->id, "fd0");
-	rootDevice = firstDiskDevice;
-	if (*(byte *)0xC0090000)			// the user chose to load an initial ram disk from the floppy
-	{
-		DiskDevice *rd = malloc(sizeof(DiskDevice));
-		firstDiskDevice->link = (dword)rd;
-		rd->type = VFS_DISK_RD;
-		rd->fileSystem = VFS_FS_FAT12;
-		rd->location = 0xC0200000;
-		rd->link = 0;
-		strcpy(rd->id, "rd0");
-		rootDevice = rd;
-	}
-}
-
-
-byte *vfs_readFile(char *fileName)
-{
-	DiskDevice *dd;
-	dword	fileStartPosition;
-	if (fileName[0] == '/')
-	{
-		dd = rootDevice;
-		fileStartPosition = 1;
-	}
-	else
-	{
-		if (strlen(fileName) < 5)	//not a long enough file name
-			return 0;
-		if (!((fileName[3] == ':') && (fileName[4] == '/')))	//if we aren't using the root directory, then there must be a 3 character device explicitly specified
-			return 0;					// followed by a colon and then a slash
-		char device[4];
-		memcpy(device, fileName, 3);	//copy the 3 digit device id to device
-		device[3] = 0;			//null-terminating character for device string
-		dd = vfs_getDiskDeviceByID(device);
-		if (!dd)			//the specified device was not found
-			return 0;
-		fileStartPosition = 5;
-	}
-	switch (dd->fileSystem)
-	{
-	case VFS_FS_FAT12:
-		return fat12_readFile(fileName+fileStartPosition, dd);
-	}
-	return 0;
-}
-
-
-byte *vfs_readSector(DiskDevice *dd, dword sector, byte *dest, dword sectors)
-{
-	byte	*origDest = dest;
-	switch (dd->type)
-	{
-	case VFS_DISK_RD:
-		for (; sectors > 0; sectors--, dest += 512, sector++)
-			rd_readSector(dd, sector, dest);
-		return origDest;
-	}
-	return 0;
-}
-
-
-DiskDevice *vfs_getDiskDeviceByID(char *id)
-{
-	DiskDevice *dd = firstDiskDevice;
-	for (;;)
-	{
-		if (strcmp(dd->id, id))
-			return dd;
-		dd = (DiskDevice *)dd->link;
-		if (!dd)
-			break;
-	}
-	return 0;
-}
-
-
-

vfs.h

@@ -1,33 +0,0 @@
-// vfs.h
-// Author: Josh Holtrop
-// Created: 12/31/03
-// Modified: 01/04/04
-
-
-#define	VFS_DISK_RD	1
-#define	VFS_DISK_FD	2
-#define	VFS_DISK_HD	3
-
-#define	VFS_FS_FAT12	1
-
-#define	VFS_LOC_FD0	1
-
-
-typedef struct	{
-	dword	type;
-	dword	fileSystem;
-	dword	location;
-	dword	link;
-	char	id[4];
-} __attribute__((packed)) DiskDevice;
-
-
-void	vfs_init();
-byte *vfs_readFile(char *fileName);
-byte *vfs_readSector(DiskDevice *dd, dword sector, byte *dest, dword sectors);
-DiskDevice *vfs_getDiskDeviceByID(char *id);
-
-DiskDevice *rootDevice = 0;
-DiskDevice *firstDiskDevice = 0;
-
-

video.c

@@ -1,176 +0,0 @@
-//video.c
-// 08/13/03 Josh Holtrop
-// Modified: 11/12/03
-
-
-//Initialized the video mode information block video_mode and allocated double-buffer memory for graphics display
-void	video_init()
-{
-	videoMode = *(word *)0xC0090002;
-
-        if (!videoMode)	//we are in console mode
-		return;
-
-	video_mode = *(ModeInfoBlock *) 0xC0090306;
-
-	switch(video_mode.BitsPerPixel)
-	{
-	case 16:
-		video_psetp = &video_psetp16;
-		break;
-	case 24:
-		video_psetp = &video_psetp24;
-		break;
-	case 32:
-		video_psetp = &video_psetp32;
-	}
-}
-
-//Renders a character using stdfont[] as a bitmask
-void	video_renderChar(int x, int y, int character, dword color)
-{
-	int charpos = (character & 0xFF) * 8;
-	int row;
-	int col;
-	for (row = 0; row < 8; row++)
-	{
-		for (col = 0; col < 5; col++)
-		{
-			if ((stdfont[charpos+row] >> (col+3)) & 0x01)
-				video_pset(x+(5-col), y+row, color);
-		}
-	}
-}
-
-//Draws a horizontal line
-void	video_horiz(int y, int x1, int x2, dword color)
-{
-	if (x1 > x2)
-	{
-		int tmp = x2;
-		x2 = x1;
-		x1 = tmp;		//x2 >= x1 now
-	}
-	if (x2 < 0)
-		return;
-	if (x1 > video_mode.XResolution)
-		return;
-	if (x1 < 0)
-		x1 = 0;
-	if (x2 > video_mode.XResolution)
-		x2 = video_mode.XResolution;
-	int pixel = y*video_mode.XResolution+x1;
-	for (; x1 <= x2; x1++)
-	{
-		video_psetp(pixel++, color);
-	}
-}
-
-//Draws a vertical line
-void	video_vert(int x, int y1, int y2, dword color)
-{
-	if (y1 > y2)
-	{
-		int tmp = y2;
-		y2 = y1;
-		y1 = tmp;		//y2 >= y1 now
-	}
-	if (y2 < 0)
-		return;
-	if (y1 > video_mode.YResolution)
-		return;
-	if (y1 < 0)
-		y1 = 0;
-	if (y2 > video_mode.YResolution)
-		y2 = video_mode.YResolution;
-	int pixel = y1*video_mode.XResolution+x;
-	for (; y1 <= y2; y1++)
-	{
-		video_psetp(pixel, color);
-		pixel+=video_mode.XResolution;
-	}
-}
-
-//Draws a rectangle
-void	video_rect(int x1, int y1, int x2, int y2, dword color)
-{
-	video_horiz(y1, x1, x2, color);
-	video_horiz(y2, x1, x2, color);
-	video_vert(x1, y1, y2, color);
-	video_vert(x2, y1, y2, color);
-}
-
-//Draws a filled rectangle
-void	video_rectf(int x1, int y1, int x2, int y2, dword color)
-{
-	if (y2 < y1)
-	{
-		int tmp = y2;
-		y2 = y1;
-		y1 = tmp;
-	}
-	for (; y1 <= y2; y1++)
-		video_horiz(y1, x1, x2, color);
-}
-
-//Draws a single pixel
-inline void video_pset(int x, int y, dword color)
-{
-	if ((x < 0) || (x > video_mode.XResolution) || (y < 0) || (y > video_mode.YResolution))
-		return;
-	video_psetp(y*video_mode.XResolution+x, color);
-}
-
-//Draws a pixel at the specified pixel position
-void	video_psetp16(int pixel, dword color)
-{
-	vid_ptr16[pixel] = ((color&0xFF)>>3) | ((((color>>8)&0xFF)>>2)<<5) | ((((color>>16)&0xFF)>>3)<<11);
-}
-
-//Draws a pixel at the specified pixel position
-void	video_psetp24(int pixel, dword color)
-{
-	vid_ptr24[pixel*3] = color & 0xFF;
-	vid_ptr24[pixel*3+1] = (color>>8) & 0xFF;
-	vid_ptr24[pixel*3+2] = (color>>16) & 0xFF;
-}
-
-//Draws a pixel at the specified pixel position
-void	video_psetp32(int pixel, dword color)
-{
-	vid_ptr32[pixel] = color;
-}
-
-//Dummy function to not draw anything if there is no graphical mode enabled
-void	video_psetpnull(int pixel, dword color) {}
-
-
-// This function draws a simple "console" window in graphical mode to display text
-void	video_drawConsole()
-{
-	video_rectf(9, 9, 490, 260, 0);
-	video_rect(8, 8, 491, 261, 0x00777777);
-	int x, y;
-	for (x = 0; x < 80; x++)
-	{
-		for (y = 0; y < 25; y++)
-		{
-			video_renderChar(x*6+10, y*10+10, console_memory[y*80+x], 0x00FFFFFF);
-		}
-	}
-}
-
-
-// This function draws a "console" character to the graphical video screen
-void	video_drawConsoleChar(dword position)
-{
- 	int x = position % 80;
- 	int y = position / 80;
-	video_renderChar(x*6+10, y*10+10, console_memory[y*80+x], 0x00FFFFFF);
-}
-
-
-
-
-
-

video.h

@@ -1,72 +0,0 @@
-//video.h
-// 08/18/03 Josh Holtrop
-// Modified: 12/28/03
-
-void	video_init();
-void	video_horiz(int y, int x1, int x2, dword color);
-void	video_vert(int x, int y1, int y2, dword color);
-void	video_rect(int x1, int y1, int x2, int y2, dword color);
-void	video_rectf(int x1, int y1, int x2, int y2, dword color);
-inline void video_pset(int x, int y, dword color);
-void	video_psetp16(int pixel, dword color);
-void	video_psetp24(int pixel, dword color);
-void	video_psetp32(int pixel, dword color);
-void	video_psetpnull(int pixel, dword color);
-void	video_renderChar(int x, int y, int character, dword color);
-void	video_drawConsole();
-void	video_drawConsoleChar(dword position);
-
-
-typedef struct{
-	word	ModeAttributes;
-	byte	WinAAttributes;
-	byte	WinBAttributes;
-	word	WinGranularity;
-	word	WinSize;
-	word	WinASegment;
-	word	WinBSegment;
-	dword	WinFuncPtr;
-	word	BytesPerScanLine;
-
-	word	XResolution;
-	word	YResolution;
-	byte	XCharSize;
-	byte	YCharSize;
-	byte	NumberOfPlanes;
-	byte	BitsPerPixel;
-	byte	NumberOfBanks;
-	byte	MemoryModel;
-	byte	BankSize;
-	byte	NumberOfImagePages;
-	byte	Reserved1;
-
-	byte	RedMaskSize;
-	byte	RedFieldPosition;
-	byte	GreenMaskSize;
-	byte	GreenFieldPosition;
-	byte	BlueMaskSize;
-	byte	BlueFieldPosition;
-	byte	RsvdMaskSize;
-	byte	RsvdFieldPosition;
-	byte	DirectColorModeInfo;
-
-	dword	PhysBasePtr;
-	dword	OffScreenMemOffset;
-	word	OffScreenMemSize;
-	byte	Reserved[206];
-} ModeInfoBlock;
-
-
-ModeInfoBlock	video_mode;
-dword	videoMode = 0;			//what video mode # we are in, 0 for console mode
-word	*vid_ptr16 = (word *)0xF0000000;
-byte	*vid_ptr24 = (byte *)0xF0000000;
-dword	*vid_ptr32 = (dword *)0xF0000000;
-word	console_memory[2000];		//holds a copy of the console's memory
-void (*video_psetp)(int, dword) = video_psetpnull;	//function pointer to set a pixel
-
-
-
-
-
-

vmm.c

@@ -1,354 +0,0 @@
-// vmm.c
-// Author: Josh Holtrop
-// Date: 09/30/03
-// Rewritten from scratch: 12/23/03
-// Modified: 12/30/03
-
-
-// This is the initialization procedure for the Virtual Memory Manager
-//  It sets up the final page directory/page table setup and maps video memory, if present
-void	vmm_init()
-{
-	dword *pageTables = (dword *)0xC0104000;	//this is the location of the page directory
-	pageTables[0x3FF] = 0x104000|0x03;		//the last page directory entry points to the page directory itself
-	pageTables[0] = 0;
-	invlpg(0);
-	if (videoMode)	//we are in a graphical mode
-	{
-		dword vidPages = video_mode.XResolution * video_mode.YResolution * (video_mode.BitsPerPixel >> 3);
-		if (vidPages % 4096)
-			vidPages = (vidPages >> 12) + 1;
-		else
-			vidPages = (vidPages >> 12);
-		vmm_mapn(0xF0000000, video_mode.PhysBasePtr, vidPages);
-	}
-	dword firstHeapEntryBlock = (dword)mm_palloc();
-	vmm_map1((dword)firstHeapEntry, firstHeapEntryBlock);
-	HeapEntryBlock *heb = (HeapEntryBlock *)firstHeapEntry;
-	vmm_heb_init(heb);
-	heb->entry[0].base = (dword)firstHeapEntry;	//start of kernel's heap memory
-	heb->entry[0].size = 4096;			//the first HeapEntryBlock is 1 page long
-	heb->entry[0].attributes = VMM_HE_HEB;		//this is a HeapEntryBlock
-	heb->entry[1].base = (dword)firstHeapEntry+4096;	//this is the start of the rest of the kernel's heap memory
-	heb->entry[1].size = 0x10000000-4096;		//the rest of the kernel's heap memory: 256mb - 4kb
-	heb->entry[1].attributes = VMM_HE_HOLE;		//this is a hold - an unmapped section of heap memory
-}
-
-
-// This function initialzes a Heap Entry Block to unused entries linked together
-void	vmm_heb_init(HeapEntryBlock *heb)
-{
-	int a;
-	for (a = 0; a < 256; a++)
-	{
-		heb->entry[a].base = 0;
-		heb->entry[a].size = 0;
-		heb->entry[a].attributes = VMM_HE_UNUSED;
-		heb->entry[a].link = (dword)&(heb->entry[a+1]);
-	}
-	heb->entry[255].link = 0;
-}
-
-
-// This function maps a virtual address to a physical address using the page directory / page table
-void	vmm_map1(dword virt, dword physical)
-{
-	dword pde = virt >> 22;
-	dword pte = (virt & 0x003FF000) >> 12;
-	dword *pageTables = (dword *)0xC0104000;	//this is the location of the page directory
-	if (!(pageTables[pde] & 0x01))		//the page directory entry does not exist, we must allocate a page for it
-	{
-		dword *newpagetable = mm_palloc();
-		pageTables[pde] = ((dword)newpagetable) | 0x03;
-		invlpg(virt);
-		dword *newpteptr = (dword *)(0xFFC00000 | (pde << 12));	//points to first dword of newly allocated page table
-		int a;
-		for (a = 0; a < 1024; a++)
-		{
-			newpteptr[a] = 0;
-		}
-	}
-	dword *pteptr = (dword *)(0xFFC00000 | (pde << 12) | (pte << 2));
-	*pteptr = physical | 0x03;
-	invlpg(virt);
-}
-
-
-// This function maps a variable number of pages in a row
-void	vmm_mapn(dword virt, dword physical, dword n)
-{
-	for (; n > 0; n--)
-	{
-		vmm_map1(virt, physical);
-		virt += 4096;
-		physical += 4096;
-	}
-}
-
-
-// This function removes the virtual address's entry in the page directory / page table
-void	vmm_unmap1(dword virt)
-{
-	dword *pteptr = (dword *)(0xFFC00000 | ((virt & 0xFFC00000) >> 10) | ((virt & 0x003FF000) >> 10));
-	*pteptr = 0;
- 	invlpg(virt);
-}
-
-
-// This function removes multiple pages' entries
-void	vmm_unmapn(dword virt, dword n)
-{
-	for (; n > 0; n--)
-	{
-		vmm_unmap1(virt);
-		virt += 4096;
-	}
-}
-
-
-// Virtual Memory allocator function
-void	*malloc(dword bytes)
-{
- 	if (bytes % VMM_MALLOC_GRANULARITY)
- 		bytes = bytes + VMM_MALLOC_GRANULARITY - (bytes % VMM_MALLOC_GRANULARITY);
-	void *attempt = vmm_getFreeChunk(bytes);
-	if (attempt)
-		return attempt;
-	if(vmm_moreCore(bytes))
-		return 0;			//we could not get any more heap memory
-	return vmm_getFreeChunk(bytes);
-}
-
-
-// This function returns a pointer if a free chunk of memory exists
-void	*vmm_getFreeChunk(dword bytes)
-{
-	HeapEntry *he = firstHeapEntry;
-	for (;;)
-	{
-		if (he->attributes == VMM_HE_FREE)
-		{
-			if (he->size > bytes)
-			{
-				HeapEntry *nhe = vmm_nextHeapEntry();
-				nhe->base = he->base;
-				nhe->size = bytes;
-				nhe->attributes = VMM_HE_USED;
-				he->base += bytes;
-				he->size -= bytes;
-				return (void *)(nhe->base);
-			}
-			if (he->size == bytes)
-			{
-				he->attributes = VMM_HE_USED;
-				return (void *)(he->base);
-			}
-		}
-		he = (HeapEntry *)he->link;
-		if (!he)
-			break;
-	}
-	return 0;
-}
-
-
-// This function coalesces any two adjacent heap entries into one entry
-void	vmm_coalesceHeapEntry(HeapEntry *he)
-{
-	if (!(he->attributes == VMM_HE_FREE || he->attributes == VMM_HE_HOLE))
-		return;
-	if (he->size == 0)
-	{
-		he->attributes = VMM_HE_UNUSED;
-		return;
-	}
-	HeapEntry *hec = firstHeapEntry;
-	for (;;)
-	{
-		if (hec->attributes == he->attributes)
-		{
-			if ((hec->base + hec->size) == he->base)	//hec ends where he begins
-			{
-				he->base = hec->base;
-				he->size += hec->size;
-				hec->attributes = VMM_HE_UNUSED;
-			}
-			if ((he->base + he->size) == hec->base)		//he ends where hec begins
-			{
-				he->size += hec->size;
-				hec->attributes = VMM_HE_UNUSED;
-			}
-		}
-		hec = (HeapEntry *)hec->link;
-		if (!hec)
-			break;
-	}
-}
-
-
-// This function retrieves more physical memory for the heap
-int	vmm_moreCore(dword bytes)
-{
-	dword pages = (bytes >> 12) + 1;
-	bytes = pages << 12;
-	HeapEntry *he = vmm_getFirstHoleHeapEntry(bytes);
-	dword virt = he->base;
-	for (; pages > 0; pages--)
-	{
-		dword phys = (dword)mm_palloc();
-		if (!phys)
-			return 1;
-		vmm_map1(virt, phys);
-		virt += 4096;
-	}
-	if (he->size == bytes)
-	{
-		he->attributes = VMM_HE_FREE;
-		vmm_coalesceHeapEntry(he);
-	}
-	else
-	{
-		HeapEntry *nhe = vmm_nextHeapEntry();
-		nhe->base = he->base;
-		nhe->size = bytes;
-		nhe->attributes = VMM_HE_FREE;
-		he->base += bytes;
-		he->size -= bytes;
-		vmm_coalesceHeapEntry(nhe);
-	}
-	return 0;
-}
-
-
-// This function returns the next available heap entry, creates more entries if we are running low
-HeapEntry *vmm_nextHeapEntry()
-{
-	if (vmm_heapEntriesLeft() < 10)
-		vmm_addHeapEntryBlock();
-	return vmm_getFirstUnusedHeapEntry();
-}
-
-
-// This function creates a new block (page) of heap entries (256)
-void	vmm_addHeapEntryBlock()
-{
-	HeapEntry *he = vmm_getFirstHoleHeapEntry(4096);
-	HeapEntry *newBlock = vmm_getFirstUnusedHeapEntry();
-	dword heb = (dword)mm_palloc();
-	vmm_map1(he->base, heb);
-	vmm_heb_init((HeapEntryBlock *)he->base);
-	HeapEntry *lhe = vmm_getLastHeapEntry();
-	if (he->size == 4096)
-	{
-		he->attributes = VMM_HE_HEB;
-		lhe->link = (dword)he->base;
-	}
-	else
-	{
-		newBlock->base = he->base;
-		newBlock->size = 4096;
-		newBlock->attributes = VMM_HE_HEB;
-		he->base += 4096;
-		he->size -= 4096;
-		lhe->link = (dword)newBlock->base;
-	}
-	return;
-}
-
-
-// This function returns the last heap entry in the linked list, useful for setting
-//  its link field to point to the first entry of a newly allocated list
-HeapEntry *vmm_getLastHeapEntry()
-{
-	HeapEntry *he = firstHeapEntry;
-	for (;;)
-	{
-		if (he->link == 0)
-			return he;
-		he = (HeapEntry *)he->link;
-	}
-}
-
-
-// This function returns the first heap entry corresponding to a memory "hole"
-HeapEntry *vmm_getFirstHoleHeapEntry(dword minBytes)
-{
-	HeapEntry *he = firstHeapEntry;
-	for (;;)
-	{
-		if ((he->attributes == VMM_HE_HOLE) && (he->size >= minBytes))
-			return he;
-		he = (HeapEntry *)he->link;
-		if (!he)
-			break;
-	}
-	return 0;
-}
-
-
-// This function returns the first heap entry that is not being used
-HeapEntry *vmm_getFirstUnusedHeapEntry()
-{
-	HeapEntry *he = firstHeapEntry;
-	for (;;)
-	{
-		if (he->attributes == VMM_HE_UNUSED)
-			return he;
-		he = (HeapEntry *)he->link;
-		if (!he)
-			break;
-	}
-	return 0;
-}
-
-
-// This function returns the number of heap entries available for use
-dword	vmm_heapEntriesLeft()
-{
- 	HeapEntry *he = firstHeapEntry;
- 	dword entries = 0;
- 	for (;;)
- 	{
- 		if (he->attributes == VMM_HE_UNUSED)
- 			entries++;
- 		he = (HeapEntry *)he->link;
- 		if (!he)
- 			break;
- 	}
-	return entries;
-}
-
-
-// This function "frees" an area of memory previously allocated with malloc()
-int	free(void *ptr)
-{
-	HeapEntry *he = vmm_getHeapEntryByBase((dword)ptr);
-	if (!he)
-		return 1;	//a heap entry starting at the given address was not found
-	he->attributes = VMM_HE_FREE;
-	vmm_coalesceHeapEntry(he);
-	return 0;
-}
-
-
-// This function scans the heap entry linked list for an entry that begins at the given address
-HeapEntry *vmm_getHeapEntryByBase(dword base)
-{
-	HeapEntry *he = firstHeapEntry;
-	for (;;)
-	{
-		if (he->base == base)
-			return he;
-		he = (HeapEntry *)he->link;
-		if (!he)
-			break;
-	}
-	return 0;
-}
-
-
-
-
-
-
-

vmm.h

@@ -1,55 +0,0 @@
-// vmm.h
-// Author: Josh Holtrop
-// Date: 09/30/03
-// Rewritten from scratch: 12/23/03
-// Modified: 12/30/03
-
-
-#define	VMM_HE_UNUSED	0		//available entry
-#define	VMM_HE_FREE	1		//free section of memory
-#define	VMM_HE_USED	2		//used section of memory
-#define	VMM_HE_HOLE	3		//a "hole" (unmapped) section of virtual memory
-#define	VMM_HE_HEB	4		//HeapEntryBlock
-
-#define	VMM_MALLOC_GRANULARITY	4	//granularity for all memory requests
-
-typedef struct {
-	dword	base;			//virtual base address
-	dword	size;			//size in bytes
-	dword	attributes;		//free/used/hole
-	dword	link;			//link to next HeapEntry
-} __attribute__((packed)) HeapEntry;
-
-
-typedef struct {
-	HeapEntry	entry[256];	//256 HeapEntry objects = 4kb (1 page)
-} __attribute__((packed)) HeapEntryBlock;
-
-
-void	vmm_init();
-void   *malloc(dword bytes);
-int	free(void *ptr);
-void	vmm_map1(dword virt, dword physical);
-void	vmm_mapn(dword virt, dword physical, dword n);
-void	vmm_unmap1(dword virt);
-void	vmm_unmapn(dword virt, dword n);
-void	vmm_heb_init(HeapEntryBlock *heb);
-void	*vmm_getFreeChunk(dword bytes);
-HeapEntry *vmm_nextHeapEntry();
-dword	vmm_heapEntriesLeft();
-HeapEntry *vmm_getLastHeapEntry();
-HeapEntry *vmm_getFirstUnusedHeapEntry();
-HeapEntry *vmm_getFirstHoleHeapEntry(dword minBytes);
-void	vmm_addHeapEntryBlock();
-int	vmm_moreCore(dword bytes);
-void	vmm_coalesceHeapEntry(HeapEntry *he);
-HeapEntry *vmm_getHeapEntryByBase(dword base);
-
-
-HeapEntry *firstHeapEntry = (HeapEntry *)0xD0000000;	//this is where heap memory starts
-
-
-
-
-
-