Fixed another printk bug.

LICENSE

@@ -0,0 +1,351 @@
+
+   NOTICE! This version of the GPL is the only version which applies to
+ BRaDOS. Any former or later version does not apply unless explicitly stated
+ elsewhere!
+
+ Also, this license does not apply to software which runs under and/or makes
+ system calls to BRaDOS.
+
+ -L. Bradley LaBoon
+
+ -----------------------------------------------------------------------------
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Makefile

@@ -0,0 +1,34 @@
+# Build environment
+PREFIX	?= /usr/local/cross
+ARCH	?= i586-elf
+GNU	?= $(PREFIX)/$(ARCH)/bin/$(ARCH)
+
+# Source files
+SOURCES_ASM	:= arch/$(ARCH)/boot.s
+SOURCES_C	:= arch/$(ARCH)/multiboot.c driver/video/vga.c kernel/brados.c kernel/printk.c lib/string.c
+
+# Object files
+OBJS	:= $(patsubst %.s,%.o,$(SOURCES_ASM))
+OBJS	+= $(patsubst %.c,%.o,$(SOURCES_C))
+
+# Build flags
+CFLAGS = -std=gnu99 -ffreestanding -Iinclude/ -O2 -Wall -Wextra
+LDFLAGS = -ffreestanding -O2 -nostdlib
+
+# Build rules
+all: brados.bin
+.PHONY: all clean
+
+brados.bin: $(OBJS) arch/$(ARCH)/linker.ld
+	$(GNU)-gcc -T arch/$(ARCH)/linker.ld -o $@ $(LDFLAGS) $(OBJS) -lgcc
+
+clean:
+	rm -f $(OBJS) brados.bin
+
+# C
+%.o: %.c Makefile
+	$(GNU)-gcc -c $< -o $@ $(CFLAGS)
+
+# Assembly
+%.o: %.s Makefile
+	$(GNU)-as $< -o $@

README

@@ -1,5 +1,9 @@
 Welcome to BRaDOS!
 
 BRaDOS is my personal OS project which I will be working on as I feel like it.
-The main purpose of the project is for me to learn about OS developement, as
+The main purpose of the project is for me to learn about OS developement.
-it's something I am interested in.
+
+For the most part, this project will do things the way Linux does things, with
+changes as I see fit. While I will make every attempt to ensure that the master
+git branch only contains compilable code, I make no guarantees. Use of this OS
+is entirely at your own risk.

arch/arm-none-eabi/boot.s

@@ -0,0 +1,33 @@
+.section ".text.boot"
+
+.globl Start
+Start:
+	// Setup the stack
+	mov	sp, #0x8000
+	
+	// Clear out bss
+	ldr	r4, =_bss_start
+	ldr	r9, =_bss_end
+	mov	r5, #0
+	mov	r6, #0
+	mov	r7, #0
+	mov	r8, #0
+	b	2f
+
+1:
+	// Store multiple at r4
+	stmia	r4!, {r5-r8}
+
+2:
+	// If we are still below bss_end, loop
+	cmp	r4, r9
+	blo	1b
+	
+	// Call brados_main
+	ldr	r3, =brados_main
+	blx	r3
+
+halt:
+	// Halt
+	wfe
+	b	halt

arch/arm-none-eabi/linker.ld

@@ -0,0 +1,42 @@
+ENTRY(Start)
+
+SECTIONS
+{
+	/* Starts at LOADER_ADDR */
+	. = 0x8000;
+	_start = .;
+	_text_start = .;
+	.text :
+	{
+		KEEP(*(.text.boot))
+		*(.text)
+	}
+	. = ALIGN(4096);
+	_text_end = .;
+	
+	_rodata_start = .;
+	.rodata :
+	{
+		*(.rodata)
+	}
+	. = ALIGN(4096);
+	_rodata_end = .;
+	
+	_data_start = .;
+	.data :
+	{
+		*(.data)
+	}
+	. = ALIGN(4096);
+	_data_end = .;
+	
+	_bss_start = .;
+	.bss :
+	{
+		bss = .;
+		*(.bss)
+	}
+	. = ALIGN(4096);
+	_bss_end = .;
+	_end = .;
+}

arch/arm-none-eabi/multiboot.c

@@ -0,0 +1,13 @@
+#include <stdint.h>
+
+#include <multiboot.h>
+
+uint32_t multiboot_getAddress()
+{
+	return 0;
+}
+
+uint32_t multiboot_getMagic()
+{
+	return 0;
+}

arch/i586-elf/boot.s

@@ -1,40 +1,43 @@
-# Declare constants for creating a multiboot header
+# Declare constants for creating a multiboot header
-.set ALIGN,	1<<0
+.set ALIGN,	1<<0
-.set MEMINFO,	1<<1
+.set MEMINFO,	1<<1
-.set FLAGS,	ALIGN | MEMINFO
+.set FLAGS,	ALIGN | MEMINFO
-.set MAGIC,	0x1BADB002
+.set MAGIC,	0x1BADB002
-.set CHECKSUM,	-(MAGIC + FLAGS)
+.set CHECKSUM,	-(MAGIC + FLAGS)
-
+
-# Declare multiboot header
+# Declare multiboot header
-.section .multiboot
+.section .multiboot
-.align 4
+.align 4
-.long MAGIC
+.long MAGIC
-.long FLAGS
+.long FLAGS
-.long CHECKSUM
+.long CHECKSUM
-
+
-# Create a 16 KiB stack
+# Create a 16 KiB stack
-.section .bootstrap_stack
+.section .bootstrap_stack
-stack_bottom:
+stack_bottom:
-.skip 16384
+.skip 16384
-stack_top:
+stack_top:
-
+
-# Kernel entry point
+# Kernel entry point
-.section .text
+.section .text
-.global _start
+.global _start
-.type _start, @function
+.type _start, @function
-_start:
+_start:
-	# We are now in kernel mode!
+	# We are now in kernel mode!
-	# Setup the stack
+	# Setup the stack
-	movl $stack_top, %esp
+	movl $stack_top, %esp
-	
+	
-	# Call the main kernel function
+	# Push the multiboot information onto the stack
-	call brados_main
+	push %ebx
-	
+	push %eax
-	# In case the function returns, enter an endless loop
+	# Call the main kernel function
-	cli
+	call brados_main
-	hlt
+	
-.Lhang:
+	# In case the function returns, enter an endless loop
-	jmp .Lhang
+	cli
-
+	hlt
-# Set the size of the _start symbol for debugging
+.Lhang:
-.size _start, . - _start
+	jmp .Lhang
+
+# Set the size of the _start symbol for debugging
+.size _start, . - _start

arch/i586-elf/linker.ld

@@ -1,38 +1,38 @@
-/* Kernel entry point */
+/* Kernel entry point */
-ENTRY(_start)
+ENTRY(_start)
-
+
-/* Define the locations of the object file sections */
+/* Define the locations of the object file sections */
-SECTIONS
+SECTIONS
-{
+{
-	/* Sections begin at 1 MiB */
+	/* Sections begin at 1 MiB */
-	. = 1M;
+	. = 1M;
-	
+	
-	/* The multiboot header needs to come first, followed by program code */
+	/* The multiboot header needs to come first, followed by program code */
-	.text BLOCK(4K) : ALIGN(4K)
+	.text BLOCK(4K) : ALIGN(4K)
-	{
+	{
-		*(.multiboot)
+		*(.multiboot)
-		*(.text)
+		*(.text)
-	}
+	}
-	
+	
-	/* Read-only data */
+	/* Read-only data */
-	.rodata BLOCK(4K) : ALIGN(4K)
+	.rodata BLOCK(4K) : ALIGN(4K)
-	{
+	{
-		*(.rodata)
+		*(.rodata)
-	}
+	}
-	
+	
-	/* Initialized read-write data */
+	/* Initialized read-write data */
-	.data BLOCK(4K) : ALIGN(4K)
+	.data BLOCK(4K) : ALIGN(4K)
-	{
+	{
-		*(.data)
+		*(.data)
-	}
+	}
-	
+	
-	/* Uninitialized read-write data and stack */
+	/* Uninitialized read-write data and stack */
-	.bss BLOCK(4K) : ALIGN(4K)
+	.bss BLOCK(4K) : ALIGN(4K)
-	{
+	{
-		*(COMMON)
+		*(COMMON)
-		*(.bss)
+		*(.bss)
-		*(.bootstrap_stack)
+		*(.bootstrap_stack)
-	}
+	}
-	
+	
-	/* Add other sections here */
+	/* Add other sections here */
-}
+}

arch/i586-elf/multiboot.c

@@ -0,0 +1,23 @@
+#include <stdint.h>
+
+#include <multiboot.h>
+
+uint32_t multiboot_getAddress()
+{
+	uint32_t address = 0;
+	__asm__(
+		"movl %%ebx, %0;"
+		:"=r"(address)
+	);
+	return address;
+}
+
+uint32_t multiboot_getMagic()
+{
+	uint32_t magic = 0;
+	__asm__(
+		"movl %%eax, %0;"
+		:"=r"(magic)
+	);
+	return magic;
+}

driver/video/vga.c

@@ -0,0 +1,111 @@
+#include <stddef.h>
+#include <stdint.h>
+
+#include <brados/string.h>
+#include <video/vga.h>
+
+// Create a VGA color
+uint8_t make_color(enum vga_color fg, enum vga_color bg)
+{
+	return fg | bg << 4;
+}
+
+// Create a VGA character
+uint16_t make_vgaEntry(char c, uint8_t color)
+{
+	uint16_t c16 = c;
+	uint16_t color16 = color;
+	return c16 | color16 << 8;
+}
+
+// Initialize a VGA term
+void term_init(struct vgastate *state)
+{
+	state->term_row = state->term_col = 0;
+	state->term_color = make_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
+	state->term_buf = (uint16_t *) VGA_BUF;
+	
+	for (size_t y = 0; y < VGA_HEIGHT; y++) {
+		for (size_t x = 0; x < VGA_WIDTH; x++) {
+			const size_t index = y * VGA_WIDTH + x;
+			state->term_buf[index] = make_vgaEntry(' ', state->term_color);
+		}
+	}
+}
+
+// Write a character to a VGA term
+void term_putChar(struct vgastate *state, char c)
+{
+	if (c == '\n')
+		state->term_col = VGA_WIDTH - 1;
+	else
+		term_putEntryAt(state, c, state->term_color, state->term_col, state->term_row);
+	
+	if (++state->term_col == VGA_WIDTH) {
+		state->term_col = 0;
+		if (++state->term_row == VGA_HEIGHT) {
+			state->term_row--;
+			term_scroll(state);
+		}
+	}
+}
+
+// Place a character in a VGA term's buffer
+void term_putEntryAt(struct vgastate *state, char c, uint8_t color, size_t x, size_t y)
+{
+	const size_t index = y * VGA_WIDTH + x;
+	state->term_buf[index] = make_vgaEntry(c, color);
+}
+
+// Scroll the term down 1 line
+void term_scroll(struct vgastate *state)
+{
+	// Move each row up
+	for (size_t y = 1; y < VGA_HEIGHT; y++) {
+		for (size_t x = 0; x < VGA_WIDTH; x++) {
+			const size_t index = y * VGA_WIDTH + x;
+			const size_t indexBelow = (y - 1) * VGA_WIDTH + x;
+			state->term_buf[indexBelow] = state->term_buf[index];
+		}
+	}
+	
+	// Clear the last line
+	for (size_t x = 0; x < VGA_WIDTH; x++) {
+		const size_t index = (VGA_HEIGHT - 1) * VGA_WIDTH + x;
+		state->term_buf[index] = ' ';
+	}
+}
+
+// Set VGA term color
+void term_setColor(struct vgastate *state, uint8_t color)
+{
+	state->term_color = color;
+}
+
+// Test various VGA functionality
+void term_test(struct vgastate *term)
+{
+	// Test line wrapping
+	term_writeStr(term, "Welcome to the desert of the real. I thought what I'd do was I'd pretend I was one of those deaf mutes.\n\n");
+	
+	// Test colors
+	term_setColor(term, make_color(VGA_COLOR_BLACK, VGA_COLOR_WHITE));
+	term_writeStr(term, "This text should be inverse.\n");
+	term_setColor(term, make_color(VGA_COLOR_LIGHT_BLUE, VGA_COLOR_GREEN));
+	term_writeStr(term, "This text should be colorful.\n\n");
+	
+	// Test scrolling
+	term_setColor(term, make_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK));
+	for (size_t i = 0; i < 20; i++) {
+		term_writeStr(term, "Printing some lines.\n");
+		for (volatile size_t j = 0; j < 100000000; j++);
+	}
+}
+
+// Write a string to a VGA term
+void term_writeStr(struct vgastate *state, const char *data)
+{
+	size_t dataLen = strlen(data);
+	for (size_t i = 0; i < dataLen; i++)
+		term_putChar(state, data[i]);
+}

include/brados/printk.h

@@ -0,0 +1,8 @@
+#ifndef __brados_printk_h__
+#define __brados_printk_h__
+
+#include <video/vga.h>
+
+int printk(struct vgastate *term, const char *fmt, ...);
+
+#endif

include/brados/string.h

@@ -0,0 +1,8 @@
+#ifndef __brados_string_h__
+#define __brados_string_h__
+
+#include <stddef.h>
+
+size_t strlen(const char *str);
+
+#endif

include/multiboot.h

@@ -0,0 +1,79 @@
+#ifndef __brados_multiboot_h__
+#define __brados_multiboot_h__
+
+#include <stdint.h>
+
+// For more information on this structure, see:
+// http://www.gnu.org/software/grub/manual/multiboot/multiboot.html
+struct multiboot_header {
+	// Indicates the presence and validity of other fields
+	uint32_t flags;
+	
+	// Present if bit 0 in 'flags' is set
+	uint32_t mem_lower;
+	uint32_t mem_upper;
+	
+	// Present if bit 1 in 'flags' is set
+	uint32_t boot_device;
+	
+	// Present if bit 2 in 'flags' is set
+	uint32_t cmdline;
+	
+	// Present if bit 3 in 'flags' is set
+	uint32_t mods_count;
+	uint32_t mods_addr;
+	
+	// Present if bits 4 or 5 are present in 'flags'
+	// NOTE: Bits 4 and 5 are mutually exclusive. Bit 4 indicates fields
+	// related to a.out kernel images, while bit 5 indicated fields related
+	// to ELF kernel images. Since BRaDOS is an ELF kernel, the bit 5 field
+	// names will be used.
+	uint32_t shdr_num;	// "tabsize" for an a.out kernel
+	uint32_t shdr_size;	// "strsize" for an a.out kernel
+	uint32_t shdr_addr;	// "addr" for an a.out kernel
+	uint32_t shdr_shndx;	// "reserved" for an a.out kernel
+	
+	// Present if bit 6 in 'flags' is set
+	uint32_t mmap_length;
+	uint32_t mmap_addr;
+	
+	// Present if bit 7 in 'flags' is set
+	uint32_t drives_length;
+	uint32_t drives_addr;
+	
+	// Present if bit 8 in 'flags' is set
+	uint32_t config_table;
+	
+	// Present if bit 9 in 'flags' is set
+	uint32_t boot_loader_name;
+	
+	// Present if bit 10 in 'flags' is set
+	uint32_t apm_table;
+	
+	// Present if bit 11 in 'flags' is set
+	uint32_t vbe_control_info;
+	uint32_t vbe_mode_info;
+	uint16_t vbe_mode;
+	uint16_t vbe_interface_seg;
+	uint16_t vbe_interface_off;
+	uint16_t vbe_interface_len;
+};
+
+struct multiboot_mmap {
+	uint32_t size;
+	uint64_t base_addr;
+	uint64_t length;
+	uint32_t type;
+};
+
+struct multiboot_mod {
+	uint32_t mod_start;
+	uint32_t mod_end;
+	uint32_t string;
+	uint32_t reserved;
+};
+
+uint32_t multiboot_getAddress();
+uint32_t multiboot_getMagic();
+
+#endif

include/video/vga.h

@@ -0,0 +1,50 @@
+#ifndef __brados_video_vga_h__
+#define __brados_video_vga_h__
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define VGA_BUF 0xB8000
+
+#define VGA_WIDTH	80
+#define VGA_HEIGHT	24
+
+// VGA State
+struct vgastate {
+	size_t term_row, term_col;
+	uint8_t term_color;
+	uint16_t *term_buf;
+};
+
+// Color constants
+enum vga_color
+{
+	VGA_COLOR_BLACK = 0,
+	VGA_COLOR_BLUE = 1,
+	VGA_COLOR_GREEN = 2,
+	VGA_COLOR_CYAN = 3,
+	VGA_COLOR_RED = 4,
+	VGA_COLOR_MAGENTA = 5,
+	VGA_COLOR_BROWN = 6,
+	VGA_COLOR_LIGHT_GREY = 7,
+	VGA_COLOR_DARK_GREY = 8,
+	VGA_COLOR_LIGHT_BLUE = 9,
+	VGA_COLOR_LIGHT_GREEN = 10,
+	VGA_COLOR_LIGHT_CYAN = 11,
+	VGA_COLOR_LIGHT_RED = 12,
+	VGA_COLOR_LIGHT_MAGENTA = 13,
+	VGA_COLOR_LIGHT_BROWN = 14,
+	VGA_COLOR_WHITE = 15
+};
+
+uint8_t make_color(enum vga_color fg, enum vga_color bg);
+uint16_t make_vgaEntry(char c, uint8_t color);
+void term_init(struct vgastate *state);
+void term_putChar(struct vgastate *state, char c);
+void term_putEntryAt(struct vgastate *state, char c, uint8_t color, size_t x, size_t y);
+void term_scroll(struct vgastate *state);
+void term_setColor(struct vgastate *state, uint8_t color);
+void term_test(struct vgastate *term);
+void term_writeStr(struct vgastate *state, const char *data);
+
+#endif

kernel/brados.c

@@ -1,156 +1,59 @@
-#include <stddef.h>
+#include <stddef.h>
-#include <stdint.h>
+#include <stdint.h>
-
+
-// Make sure we are using the right compiler
+#include <brados/printk.h>
-#if defined(__linux__)
+#include <brados/string.h>
-#error "You are using the wrong compiler."
+#include <video/vga.h>
-#endif
+#include <multiboot.h>
-
+
-// Color constants
+// Make sure we are using the right compiler
-enum vga_color
+#if defined(__linux__)
-{
+#error "You are using the wrong compiler."
-	COLOR_BLACK = 0,
+#endif
-	COLOR_BLUE = 1,
+
-	COLOR_GREEN = 2,
+// Main kernel function
-	COLOR_CYAN = 3,
+void brados_main(uint32_t multiMagic, uint32_t multiAddr)
-	COLOR_RED = 4,
+{
-	COLOR_MAGENTA = 5,
+	// Initialize VGA terminal
-	COLOR_BROWN = 6,
+	struct vgastate term;
-	COLOR_LIGHT_GREY = 7,
+	term_init(&term);
-	COLOR_DARK_GREY = 8,
+	
-	COLOR_LIGHT_BLUE = 9,
+	// Welcome message
-	COLOR_LIGHT_GREEN = 10,
+	printk(&term, "Welcome to BRaDOS!\n");
-	COLOR_LIGHT_CYAN = 11,
+	printk(&term, "written by L. Bradley LaBoon\n\n");
-	COLOR_LIGHT_RED = 12,
+	
-	COLOR_LIGHT_MAGENTA = 13,
+	// Get multiboot info
-	COLOR_LIGHT_BROWN = 14,
+	if (multiMagic != 0x2BADB002) {
-	COLOR_WHITE = 15
+		printk(&term, "Error! Multiboot header not present. Quitting.\n");
-};
+		return;
-
+	}
-// Create a VGA color
+	struct multiboot_header *multiHead = (struct multiboot_header *) multiAddr;
-uint8_t make_color(enum vga_color fg, enum vga_color bg)
+	if ((multiHead->flags >> 6) % 2 != 1) {
-{
+		printk(&term, "Error! Memory map not available from bootloader. Quitting.\n");
-	return fg | bg << 4;
+		return;
-}
+	}
-
+	struct multiboot_mmap *memmap = (struct multiboot_mmap *) multiHead->mmap_addr;
-// Create a VGA character
+	
-uint16_t make_vgaEntry(char c, uint8_t color)
+	// Print memory map
-{
+	printk(&term, "Memory map:\n");
-	uint16_t c16 = c;
+	int numEntries = multiHead->mmap_length / sizeof(struct multiboot_mmap);
-	uint16_t color16 = color;
+	uint64_t lastAddr = 0;
-	return c16 | color16 << 8;
+	for (int i = 0; i < numEntries; i++) {
-}
+		if (memmap[i].base_addr != lastAddr) {
-
+			printk(&term, "%#llx - %#llx: Unknown\n", lastAddr, memmap[i].base_addr - 1);
-// Calculate the length of a string
+			lastAddr = memmap[i].base_addr;
-size_t strlen(const char *str)
+		}
-{
+		
-	size_t len = 0;
+		printk(&term, "%#llx - %#llx: ", memmap[i].base_addr, memmap[i].base_addr + memmap[i].length - 1);
-	while (str[len] != 0)
+		if (memmap[i].type == 1)
-		len++;
+			printk(&term, "Available\n");
-	return len;
+		else
-}
+			printk(&term, "Reserved\n");
-
+		
-static const size_t VGA_WIDTH = 80;
+		lastAddr = memmap[i].base_addr + memmap[i].length;
-static const size_t VGA_HEIGHT = 24;
+	}
-
+	
-size_t term_row, term_col;
+	
-uint8_t term_color;
+	// Done
-uint16_t *term_buf;
+	printk(&term, "\nDone.");
-
+}
-// Initialize the terminal
-void term_init()
-{
-	term_row = term_col = 0;
-	term_color = make_color(COLOR_LIGHT_GREY, COLOR_BLACK);
-	term_buf = (uint16_t *) 0xB8000;
-	
-	for (size_t y = 0; y < VGA_HEIGHT; y++) {
-		for (size_t x = 0; x < VGA_WIDTH; x++) {
-			const size_t index = y * VGA_WIDTH + x;
-			term_buf[index] = make_vgaEntry(' ', term_color);
-		}
-	}
-}
-
-// Set the terminal color
-void term_setColor(uint8_t color)
-{
-	term_color = color;
-}
-
-// Place a character in the buffer
-void term_putEntryAt(char c, uint8_t color, size_t x, size_t y)
-{
-	const size_t index = y * VGA_WIDTH + x;
-	term_buf[index] = make_vgaEntry(c, color);
-}
-
-// Scroll down 1 line
-void term_scroll()
-{
-	for (size_t y = 1; y < VGA_HEIGHT; y++) {
-		for (size_t x = 0; x < VGA_WIDTH; x++) {
-			const size_t index = y * VGA_WIDTH + x;
-			const size_t indexBelow = (y - 1) * VGA_WIDTH + x;
-			term_buf[indexBelow] = term_buf[index];
-		}
-	}
-	
-	for (size_t x = 0; x < VGA_WIDTH; x++) {
-		const size_t index = (VGA_HEIGHT - 1) * VGA_WIDTH + x;
-		term_buf[index] = ' ';
-	}
-}
-
-// Write a character to the terminal
-void term_putChar(char c)
-{
-	if (c == '\n')
-		term_col = VGA_WIDTH - 1;
-	else
-		term_putEntryAt(c, term_color, term_col, term_row);
-	
-	if (++term_col == VGA_WIDTH) {
-		term_col = 0;
-		if (++term_row == VGA_HEIGHT) {
-			term_row--;
-			term_scroll();
-		}
-	}
-}
-
-// Write a string to the terminal
-void term_writeStr(const char *data)
-{
-	size_t dataLen = strlen(data);
-	for (size_t i = 0; i < dataLen; i++)
-		term_putChar(data[i]);
-}
-
-// Main kernel function
-void brados_main()
-{
-	term_init();
-	
-	// Test printing and newlines
-	term_writeStr("Welcome to BRaDOS!\n");
-	term_writeStr("written by L. Bradley LaBoon\n\n");
-	
-	// Test line wrapping
-	term_writeStr("The Laughing Man always says: 'I thought what I'd do was I'd pretend I was one of those deaf mutes.'\n\n");
-	
-	// Test colors
-	term_setColor(make_color(COLOR_BLACK, COLOR_WHITE));
-	term_writeStr("This text should be inverse.\n");
-	term_setColor(make_color(COLOR_LIGHT_BLUE, COLOR_GREEN));
-	term_writeStr("This text should be colorful.\n\n");
-	
-	// Test scrolling
-	term_setColor(make_color(COLOR_LIGHT_GREY, COLOR_BLACK));
-	for (size_t i = 0; i < 20; i++) {
-		term_writeStr("Printing some lines.\n");
-		for (size_t j = 0; j < 100000000; j++);
-	}
-	
-	term_writeStr("Done.");
-}

kernel/printk.c

@@ -0,0 +1,596 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <brados/printk.h>
+#include <brados/string.h>
+#include <video/vga.h>
+
+const char *BASE16 = "0123456789ABCDEF";
+const char *BASE16L = "0123456789abcdef";
+
+// Print an unsigned number as a string; return the number of characters printed
+static int printNum(struct vgastate *term, uintmax_t num, unsigned int base, const char *digits)
+{
+	if (base > strlen(digits))
+		return 0;
+	
+	int numPrinted = 0;
+	int digit = num % base;
+	if (num >= base)
+		numPrinted += printNum(term, num / base, base, digits);
+	term_putChar(term, digits[digit]);
+	numPrinted++;
+	return numPrinted;
+}
+
+// Determines the printed length of a number
+static unsigned int numLen(uintmax_t num, unsigned int base)
+{
+	unsigned int len = 1;
+	while (num >= base) {
+		len++;
+		num /= base;
+	}
+	
+	return len;
+}
+
+// Print a formatted string to the given terminal
+int printk(struct vgastate *term, const char *fmt, ...)
+{
+	int numPrinted = 0;
+	va_list args;
+	va_start(args, fmt);
+	
+	// The bits of 'mode' explained:
+	// 0: Whether we are printing characters normally or parsing the format
+	// 1: Whether we are still parsing flags
+	// 2: Whether we are looking at width or precision (have we seen a .)
+	// 3: + flag
+	// 4: space flag
+	// 5: - flag
+	// 6: # flag
+	// 7: 0 flag
+	uint8_t mode = 0;
+	int length = 0;
+	unsigned int width = 0, precision = 0;
+	
+	for (size_t i = 0; i < strlen(fmt); i++) {
+		if (mode % 2 == 0) {
+			// Begin parsing format if we reach a '%'
+			if (fmt[i] == '%') {
+				mode |= 0x01;
+			// Or just print the character if we're not parsing
+			} else {
+				term_putChar(term, fmt[i]);
+				numPrinted++;
+			}
+			
+			continue;
+		}
+		
+		switch (fmt[i]) {
+		case '%':
+			// Print a percent sign
+			term_putChar(term, '%');
+			numPrinted++;
+			mode = 0;
+			break;
+		case '+':
+			// Set the plus flag
+			if ((mode >> 1) % 2 == 0)
+				mode |= 0x08;
+			
+			break;
+		case ' ':
+			// Set the space flag
+			if ((mode >> 1) % 2 == 0)
+				mode |= 0x10;
+			
+			break;
+		case '-':
+			// Set the left-align flag
+			if ((mode >> 1) % 2 == 0)
+				mode |= 0x20;
+			
+			break;
+		case '#':
+			// Set the alternate flag
+			if ((mode >> 1) % 2 == 0)
+				mode |= 0x40;
+			
+			break;
+		case '0':
+			// Set the zero-pad flag
+			if ((mode >> 1) % 2 == 0)
+				mode |= 0x80;
+			// Next digit in width specifier
+			else if ((mode >> 2) % 2 == 0)
+				width *= 10;
+			// Next digit in precision specifier
+			else
+				precision *= 10;
+			
+			break;
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			// Next digit in width specifier
+			if ((mode >> 2) % 2 == 0) {
+				mode |= 0x02;
+				width *= 10;
+				width += (fmt[i] - 48); // 0 = ascii 48
+			// Next digit in precision specifier
+			} else {
+				precision *= 10;
+				precision += (fmt[i] - 48);
+			}
+			
+			break;
+		case '.':
+			// Delimit width and precision
+			if ((mode >> 2) % 2 == 0)
+				mode |= 0x06;
+			
+			break;
+		case 'h':
+			// Denotes a short or char argument
+			mode |= 0x06;
+			length--;
+			break;
+		case 'l':
+			// Denotes a long or long long argument
+			mode |= 0x06;
+			length++;
+			break;
+		case 'z':
+			// Denotes a size_t argument
+			mode |= 0x06;
+			length = 3;
+			break;
+		case 'j':
+			// Denotes a intmax_t argument
+			mode |= 0x06;
+			length = 4;
+			break;
+		case 't':
+			// Denotes a ptrdiff_t argument
+			mode |= 0x06;
+			length = 5;
+			break;
+		// Print a signed integer
+		case 'd':
+		case 'i': {
+			intmax_t num;
+			uintmax_t unum;
+			
+			// Pull the argument from the list
+			switch (length) {
+				case 1:
+					num = va_arg(args, long);
+					break;
+				case 2:
+					num = va_arg(args, long long);
+					break;
+				case 3:
+					num = va_arg(args, size_t);
+					break;
+				case 4:
+					num = va_arg(args, intmax_t);
+					break;
+				case 5:
+					num = va_arg(args, ptrdiff_t);
+					break;
+				default:
+					num = va_arg(args, int);
+					break;
+			}
+			
+			// Get unsigned version
+			if (num < 0)
+				unum = num * -1;
+			else
+				unum = num;
+			
+			// Get the length of the printed number
+			unsigned int len = numLen(unum, 10);
+			
+			// Get the length of the printed number with formatting
+			unsigned int flen = len;
+			if (precision > len)
+				flen += (precision - len);
+			if (num < 0)
+				flen++;
+			if (num >= 0 && (mode >> 3) + (mode >> 4) > 0)
+				flen++;
+			
+			// If specified, print preceding space padding
+			if ((mode >> 5) % 2 == 0) {
+				if (precision > 0 || (mode >> 7) % 2 == 0) {
+					for (int j = width - flen; j > 0; j--) {
+						term_putChar(term, ' ');
+						numPrinted++;
+					}
+				}
+			}
+			
+			// If specified print the sign
+			if (num < 0) {
+				term_putChar(term, '-');
+				numPrinted++;
+			} else if ((mode >> 3) % 2 == 1) {
+				term_putChar(term, '+');
+				numPrinted++;
+			} else if ((mode >> 4) % 2 == 1) {
+				term_putChar(term, ' ');
+				numPrinted++;
+			}
+			
+			// If specified, print the precision 0s
+			if (precision > 0) {
+				for (int j = precision - len; j > 0; j--) {
+					term_putChar(term, '0');
+					numPrinted++;
+				}
+			} else if ((mode >> 7) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, '0');
+					numPrinted++;
+				}
+			}
+			
+			// Print the number
+			numPrinted += printNum(term, unum, 10, BASE16);
+			
+			// If specified, print succeeding spaces
+			if ((mode >> 5) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, ' ');
+					numPrinted++;
+				}
+			}
+			
+			mode = 0;
+			break;
+		// Print an unsigned integer
+		} case 'u': {
+			uintmax_t num;
+			
+			// Pull the argument from the list
+			switch (length) {
+				case 1:
+					num = va_arg(args, unsigned long);
+					break;
+				case 2:
+					num = va_arg(args, unsigned long long);
+					break;
+				case 3:
+					num = va_arg(args, size_t);
+					break;
+				case 4:
+					num = va_arg(args, intmax_t);
+					break;
+				case 5:
+					num = va_arg(args, ptrdiff_t);
+					break;
+				default:
+					num = va_arg(args, unsigned int);
+					break;
+			}
+			
+			// Get the length of the printed number
+			unsigned int len = numLen(num, 10);
+			
+			// Get the length of the printed number with formatting
+			unsigned int flen = len;
+			if (precision > len)
+				flen += (precision - len);
+			if ((mode >> 3) % 2 == 1 || (mode >> 4) % 2 == 1)
+				flen++;
+			
+			// If specified, print preceding space padding
+			if ((mode >> 5) % 2 == 0) {
+				if (precision > 0 || (mode >> 7) % 2 == 0) {
+					for (int j = width - flen; j > 0; j--) {
+						term_putChar(term, ' ');
+						numPrinted++;
+					}
+				}
+			}
+			
+			// If specified print the sign
+			if ((mode >> 3) % 2 == 1) {
+				term_putChar(term, '+');
+				numPrinted++;
+			} else if ((mode >> 4) % 2 == 1) {
+				term_putChar(term, ' ');
+				numPrinted++;
+			}
+			
+			// If specified, print the precision 0s
+			if (precision > 0) {
+				for (int j = precision - len; j > 0; j--) {
+					term_putChar(term, '0');
+					numPrinted++;
+				}
+			} else if ((mode >> 7) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, '0');
+					numPrinted++;
+				}
+			}
+			
+			// Print the number
+			numPrinted += printNum(term, num, 10, BASE16);
+			
+			// If specified, print succeeding spaces
+			if ((mode >> 5) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, ' ');
+					numPrinted++;
+				}
+			}
+			
+			mode = 0;
+			break;
+		// Print an unsigned integer in hexadecimal
+		} case 'x':
+		case 'X': {
+			uintmax_t num;
+			
+			// Pull the argument from the list
+			switch (length) {
+				case 1:
+					num = va_arg(args, unsigned long);
+					break;
+				case 2:
+					num = va_arg(args, unsigned long long);
+					break;
+				case 3:
+					num = va_arg(args, size_t);
+					break;
+				case 4:
+					num = va_arg(args, intmax_t);
+					break;
+				case 5:
+					num = va_arg(args, ptrdiff_t);
+					break;
+				default:
+					num = va_arg(args, unsigned int);
+					break;
+			}
+			
+			// Get the length of the printed number
+			unsigned int len = numLen(num, 16);
+			
+			// Get the length of the printed number with formatting
+			unsigned int flen = len;
+			if (precision > len)
+				flen += (precision - len);
+			if ((mode >> 3) % 2 == 1 || (mode >> 4) % 2 == 1)
+				flen++;
+			if ((mode >> 6) % 2 == 1)
+				flen += 2;
+			
+			// If specified, print preceding space padding
+			if ((mode >> 5) % 2 == 0) {
+				if (precision > 0 || (mode >> 7) % 2 == 0) {
+					for (int j = width - flen; j > 0; j--) {
+						term_putChar(term, ' ');
+						numPrinted++;
+					}
+				}
+			}
+			
+			// If specified print the sign
+			if ((mode >> 3) % 2 == 1) {
+				term_putChar(term, '+');
+				numPrinted++;
+			} else if ((mode >> 4) % 2 == 1) {
+				term_putChar(term, ' ');
+				numPrinted++;
+			}
+			
+			// If specified, print the 0x
+			if ((mode >> 6) % 2 == 1) {
+				term_putChar(term, '0');
+				if (fmt[i] == 'x')
+					term_putChar(term, 'x');
+				else
+					term_putChar(term, 'X');
+				numPrinted += 2;
+			}
+			
+			// If specified, print the precision 0s
+			if (precision > 0) {
+				for (int j = precision - len; j > 0; j--) {
+					term_putChar(term, '0');
+					numPrinted++;
+				}
+			} else if ((mode >> 7) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, '0');
+					numPrinted++;
+				}
+			}
+			
+			// Print the number
+			if (fmt[i] == 'x')
+				numPrinted += printNum(term, num, 16, BASE16L);
+			else
+				numPrinted += printNum(term, num, 16, BASE16);
+			
+			// If specified, print succeeding spaces
+			if ((mode >> 5) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, ' ');
+					numPrinted++;
+				}
+			}
+			
+			mode = 0;
+			break;
+		// Print an unsigned integer in octal
+		} case 'o': {
+			uintmax_t num;
+			
+			// Pull the argument from the list
+			switch (length) {
+				case 1:
+					num = va_arg(args, unsigned long);
+					break;
+				case 2:
+					num = va_arg(args, unsigned long long);
+					break;
+				case 3:
+					num = va_arg(args, size_t);
+					break;
+				case 4:
+					num = va_arg(args, intmax_t);
+					break;
+				case 5:
+					num = va_arg(args, ptrdiff_t);
+					break;
+				default:
+					num = va_arg(args, unsigned int);
+					break;
+			}
+			
+			// Get the length of the printed number
+			unsigned int len = numLen(num, 8);
+			
+			// Get the length of the printed number with formatting
+			unsigned int flen = len;
+			if (precision > len)
+				flen += (precision - len);
+			if ((mode >> 3) % 2 == 1 || (mode >> 4) % 2 == 1)
+				flen++;
+			if ((mode >> 6) % 2 == 1)
+				flen++;
+			
+			// If specified, print preceding space padding
+			if ((mode >> 5) % 2 == 0) {
+				if (precision > 0 || (mode >> 7) % 2 == 0) {
+					for (int j = width - flen; j > 0; j--) {
+						term_putChar(term, ' ');
+						numPrinted++;
+					}
+				}
+			}
+			
+			// If specified print the sign
+			if ((mode >> 3) % 2 == 1) {
+				term_putChar(term, '+');
+				numPrinted++;
+			} else if ((mode >> 4) % 2 == 1) {
+				term_putChar(term, ' ');
+				numPrinted++;
+			}
+			
+			// If specified, print the 0x
+			if ((mode >> 6) % 2 == 1) {
+				term_putChar(term, '0');
+				numPrinted++;
+			}
+			
+			// If specified, print the precision 0s
+			if (precision > 0) {
+				for (int j = precision - len; j > 0; j--) {
+					term_putChar(term, '0');
+					numPrinted++;
+				}
+			} else if ((mode >> 7) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, '0');
+					numPrinted++;
+				}
+			}
+			
+			// Print the number
+			numPrinted += printNum(term, num, 8, BASE16);
+			
+			// If specified, print succeeding spaces
+			if ((mode >> 5) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, ' ');
+					numPrinted++;
+				}
+			}
+			
+			mode = 0;
+			break;
+		// Print a string
+		} case 's': {
+			char *s = va_arg(args, char *);
+			term_writeStr(term, s);
+			numPrinted += strlen(s);
+			mode = 0;
+			break;
+		// Print a character
+		} case 'c':
+			if (mode % 2 == 0)
+				term_putChar(term, 'c');
+			else
+				term_putChar(term, (char) va_arg(args, int));
+			
+			numPrinted++;
+			mode = 0;
+			break;
+		// Print a pointer
+		case 'p': {
+			uintmax_t num = va_arg(args, void *);
+			
+			// Get the length of the printed number
+			unsigned int len = numLen(num, 16);
+			unsigned int flen = len + 2;
+			precision = sizeof(void *) * 2; // A byte is 2 hex chars
+			
+			// If specified, print preceding space padding
+			if ((mode >> 5) % 2 == 0) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, ' ');
+					numPrinted++;
+				}
+			}
+			
+			term_putChar(term, '0');
+			term_putChar(term, 'x');
+			numPrinted += 2;
+			
+			// If specified, print the precision 0s
+			for (int j = precision - len; j > 0; j--) {
+				term_putChar(term, '0');
+				numPrinted++;
+			}
+			
+			// Print the number
+			numPrinted += printNum(term, num, 16, BASE16);
+			
+			// If specified, print succeeding spaces
+			if ((mode >> 5) % 2 == 1) {
+				for (int j = width - flen; j > 0; j--) {
+					term_putChar(term, ' ');
+					numPrinted++;
+				}
+			}
+			
+			mode = 0;
+			break;
+		} default:
+			term_putChar(term, fmt[i]);
+			numPrinted++;
+			mode = 0;
+			break;
+		}
+	}
+	
+	va_end(args);
+	return numPrinted;
+}

lib/string.c

@@ -0,0 +1,12 @@
+#include <stddef.h>
+
+#include <brados/string.h>
+
+// Find the length of a string
+size_t strlen(const char *str)
+{
+	size_t len = 0;
+	while (str[len] != 0)
+		len++;
+	return len;
+}