XHCI: set dcbaap

This will be needed for USB (XHCI controller driver).

Rsconscript

@@ -11,12 +11,13 @@ configure do
   check_c_compiler
   check_program "mformat", on_fail: "Install the mtools package"
   check_program "parted"
+  check_program "pkg-config"
   check_cfg package: "freetype2", on_fail: "Install libfreetype-dev", use: "freetype"
   sh %w[git submodule update --init]
 end
 
 # Kernel default font size.
-KFONT_SIZE = 18
+KFONT_SIZE = 16
 
 # One kilobyte.
 KB = 1024
@@ -113,10 +114,8 @@ hulk_env = env "hulk", use: %w[ldc2 x86_64-elf-gcc] do |env|
     -avx512bw
     -avx512cd
     -avx512dq
-    -avx512er
     -avx512f
     -avx512ifma
-    -avx512pf
     -avx512vbmi
     -avx512vbmi2
     -avx512vl
@@ -132,11 +131,11 @@ hulk_env = env "hulk", use: %w[ldc2 x86_64-elf-gcc] do |env|
     -sse4a
     -ssse3
   ]
-  env["DFLAGS"] += %W[-mtriple=x86_64-unknown-elf -mattr=#{cpu_attrs.join(",")} --betterC -release -O3 --wi --enable-cross-module-inlining -code-model=large]
+  env["DFLAGS"] += %W[-g -mtriple=x86_64-unknown-elf -mattr=#{cpu_attrs.join(",")} --betterC -release -O3 --wi --enable-cross-module-inlining -code-model=kernel --disable-red-zone]
   env["D_IMPORT_PATH"] += %w[src]
   env["D_IMPORT_PATH"] << env.expand("^/src")
   env["LD"] = "x86_64-elf-gcc"
-  env["LDFLAGS"] += %w[-nostdlib -Tsrc/hulk/hulk.ld -Wl,--gc-sections -Wl,-Map,${_TARGET}.map]
+  env["LDFLAGS"] += %w[-g -nostdlib -Tsrc/hulk/hulk.ld -Wl,--gc-sections -Wl,-Map,${_TARGET}.map -Wl,--no-warn-rwx-segments]
   env["LDCMD"] = %w[${LD} -o ${_TARGET} ${LDFLAGS} ${_SOURCES} ${LIBDIRPREFIX}${LIBPATH} ${LIBLINKPREFIX}${LIBS}]
   env["OBJDUMP"] = "x86_64-elf-objdump"
   env["OBJCOPY"] = "x86_64-elf-objcopy"
@@ -171,10 +170,10 @@ hello_env = env "hello", use: %w[ldc2 x86_64-w64-mingw32-gcc] do |env|
   env.Object("^/hulk_bin.o", "^/hulk_bin.S")
   env.depends("^/hulk_bin.o", hulk_env.expand("^/hulk.bin"))
   env["sources"] << "^/hulk_bin.o"
-  env["DFLAGS"] += %w[-mtriple=x86_64-unknown-windows-coff --betterC -release -O3 --wi --enable-cross-module-inlining]
+  env["DFLAGS"] += %w[-g -mtriple=x86_64-unknown-windows-coff --betterC -release -O3 --wi --enable-cross-module-inlining --disable-red-zone]
   env["D_IMPORT_PATH"] += %w[src uefi-d/source]
   env["LD"] = "x86_64-w64-mingw32-gcc"
-  env["LDFLAGS"] += %w[-nostdlib -Wl,-dll -shared -Wl,--subsystem,10 -e efi_main -Wl,-Map,${_TARGET}.map]
+  env["LDFLAGS"] += %w[-g -nostdlib -Wl,-dll -shared -Wl,--subsystem,10 -e efi_main -Wl,-Map,${_TARGET}.map]
   env["LDCMD"] = %w[${LD} -o ${_TARGET} ${LDFLAGS} ${_SOURCES} ${LIBDIRPREFIX}${LIBPATH} ${LIBLINKPREFIX}${LIBS}]
   env["OBJDUMP"] = "x86_64-w64-mingw32-objdump"
   env.Program("^/HOS.EFI", "${sources}")
@@ -194,11 +193,15 @@ task "run", desc: "Run HOS in QEMU" do
   ovmf = "OVMF.fd"
   if File.exist?("/usr/share/edk2/x64/OVMF.fd")
     ovmf = "/usr/share/edk2/x64/OVMF.fd"
+  elsif File.exist?("/usr/share/edk2/x64/OVMF.4m.fd")
+    ovmf = "/usr/share/edk2/x64/OVMF.4m.fd"
   end
   sh %W[
     qemu-system-x86_64
     -machine q35
+    -m 128M
     -cpu max
+    -smp cpus=4
     -serial file:qemu/serial.out
     -bios #{ovmf}
     -drive file=qemu/HOS.img,format=raw

src/fontgen/fontgen.c

@@ -192,24 +192,24 @@ int main(int argc, char * argv[])
     {
         if ((char_infos[i].width < 0) || (char_infos[i].width > max_advance))
         {
-            fprintf(stderr, "Error: invalid character %d width: %d\n", i, char_infos[i].width);
+            fprintf(stderr, "Error: invalid character %d width: %d (max advance %d)\n", i, char_infos[i].width, max_advance);
             return false;
         }
         if ((char_infos[i].height < 0) || (char_infos[i].height > line_height))
         {
-            fprintf(stderr, "Error: invalid character %d height: %d\n", i, char_infos[i].height);
+            fprintf(stderr, "Error: invalid character %d height: %d (line height %d)\n", i, char_infos[i].height, line_height);
             return false;
         }
         if ((char_infos[i].left < 0) || (char_infos[i].left >= max_advance))
         {
-            fprintf(stderr, "Error: invalid character %d left: %d\n", i, char_infos[i].left);
+            fprintf(stderr, "Error: invalid character %d left: %d (max advance %d)\n", i, char_infos[i].left, max_advance);
             return false;
         }
         /* Adjust character top to be index downward from top of font box. */
         char_infos[i].top = line_height - baseline_offset - char_infos[i].top;
         if ((char_infos[i].top < 0) || (char_infos[i].top >= line_height))
         {
-            fprintf(stderr, "Error: invalid character %d top: %d\n", i, char_infos[i].top);
+            fprintf(stderr, "Error: invalid character %d top: %d (line height %d)\n", i, char_infos[i].top, line_height);
             return false;
         }
         if ((char_infos[i].left + char_infos[i].width) > max_advance)

src/hello/console.d

@@ -33,9 +33,9 @@ struct Console
      */
     public static void writef(string s, va_list args)
     {
-        hulk.writef.writef(s, args, function void(ubyte ch) {
+        hulk.writef.writefv(function void(ubyte ch) {
                     Console.write(ch);
-                });
+                }, s, args);
     }
 
     /**

src/hello/hello.d

@@ -419,6 +419,8 @@ private bool map_hulk(PageTable * pt_base)
     {
         return false;
     }
+    /* Zero BSS region. */
+    memset64(cast(void *)bootinfo().bss_phys, 0u, hulk_bss_size() / 8);
     /* Map HULK stack. */
     virt = hulk_virt_stack_top() - hulk_stack_size();
     if (!map4kregion(virt, bootinfo().stack_phys, hulk_stack_size(), pt_base))

src/hulk/acpi.d

@@ -6,119 +6,51 @@ module hulk.acpi;
 import hulk.hurl;
 import hulk.klog;
 import hulk.memory;
+import hulk.hurl.a1;
 
 struct Acpi
 {
-    private static uint signature(string s)
+    /**
-    {
+     * List of ACPI tables.
-        return s[0] | (s[1] << 8) | (s[2] << 16) | (s[3] << 24);
+     */
-    }
+    private static __gshared Header *[] tables;
 
-    enum uint APIC_SIGNATURE = signature("APIC");
-    enum uint MCFG_SIGNATURE = signature("MCFG");
     enum uint XSDT_SIGNATURE = signature("XSDT");
 
-    static align(4) struct Header
+    /**
+     * ACPI table header structure.
+     */
+    public static struct Header
     {
         uint signature;
         uint length;
         ubyte revision;
         ubyte checksum;
         char[6] oemid;
-        ulong oemtableid;
+        char[8] oemtableid;
         uint oem_revision;
         uint creator_id;
         uint creator_revision;
     }
 
+    /**
+     * XSDT table.
+     */
     static struct XSDT
     {
         Header header;
         /* Table pointers are not ulong-aligned! They begin at offset 36. */
         align(4) ulong[1] tables;
     }
+    static assert(XSDT.tables.offsetof == 36);
 
-    static struct MADT
+    /**
-    {
+     * Initialize ACPI.
-        static struct Entry
+     */
-        {
-            enum LOCAL_APIC_ADDRESS_OVERRIDE = 5;
-
-            ubyte type;
-            ubyte length;
-        }
-
-        Header header;
-        uint local_apic_address;
-        uint flags;
-
-        void initialize()
-        {
-            apic_address = local_apic_address;
-            Klog.writefln("Found 32-bit APIC address: 0x%x", apic_address);
-            const(void) * end = cast(const(void) *)(&this) + header.length;
-            const(Entry) * entry = cast(const(Entry) *)(cast(ulong)&this + MADT.sizeof);
-            while (entry < end)
-            {
-                entry = cast(const(Entry) *)(cast(size_t)entry + entry.length);
-                if (entry.type == Entry.LOCAL_APIC_ADDRESS_OVERRIDE)
-                {
-                    /* Found a 64-bit Local APIC Address Override entry. */
-                    Klog.writefln("Found 64-bit APIC address: 0x%x", apic_address);
-                    memcpy(cast(void *)&apic_address, cast(const(void) *)entry + 4u, apic_address.sizeof);
-                }
-            }
-        }
-    }
-
-    static struct MCFG
-    {
-        /* PCI Segment Group Memory Area Descriptor. */
-        static struct SGMADesc
-        {
-            uint[2] base_address_a;
-            ushort pci_segment_group_number;
-            ubyte start_pci_bus_number;
-            ubyte end_pci_bus_number;
-            uint _reserved;
-
-            public @property ulong base_address() const
-            {
-                return base_address_a[0] | (cast(ulong)base_address_a[1] << 32);
-            }
-        }
-        static assert(SGMADesc.sizeof == 16);
-        static assert(SGMADesc.alignof == 4);
-
-        Header header;
-        uint[2] _reserved;
-        SGMADesc[0] sgma_descs;
-
-        void initialize()
-        {
-            Klog.writefln("MCFG length = %u", header.length);
-            size_t n_sgma_descs = (header.length - MCFG.sgma_descs.offsetof) / MCFG.SGMADesc.sizeof;
-            Klog.writefln("# SGMA descriptors = %u", (header.length - MCFG.sgma_descs.offsetof) / MCFG.SGMADesc.sizeof);
-            for (size_t i = 0; i < n_sgma_descs; i++)
-            {
-                Klog.writefln("SGMA %u: SG %u; Bus %u-%u; addr %p",
-                        i,
-                        sgma_descs[i].pci_segment_group_number,
-                        sgma_descs[i].start_pci_bus_number,
-                        sgma_descs[i].end_pci_bus_number,
-                        sgma_descs[i].base_address);
-            }
-        }
-    }
-
-    public __gshared ulong apic_address;
-
-    public __gshared MADT * madt;
-
-    public __gshared MCFG * mcfg;
-
     public static void initialize(ulong acpi_xsdt_phys)
     {
+        Klog.writefln("\a3Initializing ACPI");
+
         /* Map the XSDT header. */
         map_table(acpi_xsdt_phys, PAGE_SIZE);
         const(XSDT) * xsdt = cast(const(XSDT) *)acpi_xsdt_phys;
@@ -133,38 +65,62 @@ struct Acpi
             map_table(acpi_xsdt_phys, xsdt.header.length);
         }
         size_t n_entries = (xsdt.header.length - xsdt.header.sizeof) / xsdt.tables[0].sizeof;
+        Header ** table_pointers = cast(Header **)A1.allocate(n_entries * (Header *).sizeof);
+        tables = table_pointers[0..n_entries];
         for (size_t i = 0u; i < n_entries; i++)
         {
             ulong address = xsdt.tables[i];
             map_table(address, PAGE_SIZE);
-            const(Header) * header = cast(const(Header) *)address;
+            Header * header = cast(Header *)address;
             uint length = header.length;
             if (length > PAGE_SIZE)
             {
                 map_table(address, length);
             }
+            tables[i] = header;
             uint signature = header.signature;
-            Klog.writefln("Found ACPI table %08x (%c%c%c%c)",
+            Klog.writefln("Found ACPI table '%c%c%c%c' at %p",
-                    signature,
                     signature & 0xFFu,
                     (signature >> 8u) & 0xFFu,
                     (signature >> 16u) & 0xFFu,
-                    (signature >> 24u) & 0xFFu);
+                    (signature >> 24u) & 0xFFu,
-            if (signature == APIC_SIGNATURE)
+                    address);
-            {
-                madt = cast(MADT *)address;
-                madt.initialize();
-            }
-            else if (signature == MCFG_SIGNATURE)
-            {
-                mcfg = cast(MCFG *)address;
-                mcfg.initialize();
-            }
         }
     }
 
+    /**
+     * Get pointer to ACPI table by name.
+     *
+     * @param name
+     *   Table name.
+     */
+    public static Header * get_table(string name)
+    {
+        uint signature = signature(name);
+        foreach (table; tables)
+        {
+            if (table.signature == signature)
+            {
+                return table;
+            }
+        }
+        Klog.fatal_error("Could not find requested ACPI table");
+        return null;
+    }
+
+    /**
+     * Map an ACPI table.
+     */
     private static void map_table(ulong address, ulong length)
     {
-        Hurl.identity_map_range(address, length, PT_DISABLE_CACHE | PT_NO_EXECUTE);
+        Hurl.identity_map_range(address, length, PT_WRITABLE | PT_DISABLE_CACHE | PT_NO_EXECUTE);
+    }
+
+    /**
+     * Convert table signature from string to 32-bit unsigned integer.
+     */
+    private static uint signature(string s)
+    {
+        return s[0] | (s[1] << 8) | (s[2] << 16) | (s[3] << 24);
     }
 }

src/hulk/apic.d

@@ -3,18 +3,255 @@
  */
 module hulk.apic;
 
-import hulk.klog;
 import hulk.hurl;
 import hulk.acpi;
-import hulk.idt;
+import hulk.him;
 import hulk.rtc;
+import hulk.pit;
+import hulk.klog;
+import hulk.memory;
 
 struct Apic
 {
+    private enum DEBUG = false;
+    private enum DEFAULT_IO_APIC_ADDRESS = 0xFEC0_0000u;
     private enum uint PERIODIC_MODE = 0x2_0000u;
 
+    private enum ulong IRQ_PIT = 0u;
     private enum ulong IRQ_RTC = 8u;
 
+    /**
+     * MADT ACPI table structure.
+     */
+    static struct MADT
+    {
+        /**
+         * MADT table entry header.
+         */
+        static struct Entry
+        {
+            enum PROCESSOR_LOCAL_APIC = 0;
+            enum IO_APIC = 1;
+            enum IO_APIC_INTERRUPT_SOURCE_OVERRIDE = 2;
+            enum IO_APIC_NMI_SOURCE = 3;
+            enum LOCAL_APIC_NMI = 4;
+            enum LOCAL_APIC_ADDRESS_OVERRIDE = 5;
+            enum PROCESSOR_LOCAL_X2APIC = 9;
+
+            ubyte type;
+            ubyte length;
+        }
+
+        /**
+         * Processor Local APIC.
+         */
+        static struct Entry0
+        {
+            Entry header;
+            ubyte acpi_processor_id;
+            ubyte apic_id;
+            uint flags;
+        }
+        static assert(Entry0.sizeof == 8);
+
+        /**
+         * I/O APIC.
+         */
+        static struct Entry1
+        {
+            Entry header;
+            ubyte io_apic_id;
+            ubyte _reserved;
+            uint io_apic_address;
+            uint global_system_interrupt_base;
+        }
+        static assert(Entry1.sizeof == 12);
+
+        /**
+         * IO/APIC Interrupt Source Override.
+         */
+        static struct Entry2
+        {
+            Entry header;
+            ubyte bus_source;
+            ubyte irq_source;
+            uint global_system_interrupt;
+            ushort flags;
+            ushort _reserved;
+        }
+        static assert(Entry2.sizeof == 12);
+
+        /**
+         * IO/APIC Non-maskable interrupt source.
+         */
+        static struct Entry3
+        {
+            Entry header;
+            ubyte nmi_source;
+            ubyte _reserved;
+            ushort flags;
+            ubyte[4] global_system_interrupt;
+        }
+        static assert(Entry3.sizeof == 10);
+
+        /**
+         * Local APIC Non-maskable interrupts.
+         */
+        static struct Entry4
+        {
+            Entry header;
+            ubyte acpi_processor_id;
+            ubyte[2] flags;
+            ubyte lint_nr;
+        }
+        static assert(Entry4.sizeof == 6);
+
+        /**
+         * Local APIC Address Override.
+         */
+        static struct Entry5
+        {
+            Entry header;
+            ushort _reserved;
+            ubyte[8] local_apic_address;
+        }
+        static assert(Entry5.sizeof == 12);
+
+        /**
+         * Processor Local x2APIC.
+         */
+        static struct Entry9
+        {
+            Entry header;
+            ushort _reserved;
+            uint local_x2apic_id;
+            uint flags;
+            uint acpi_id;
+        }
+        static assert(Entry9.sizeof == 16);
+
+        Acpi.Header header;
+        uint local_apic_address;
+        uint flags;
+
+        static assert(MADT.sizeof == 0x2C);
+
+        /**
+         * Scan the MADT table.
+         */
+        public void scan()
+        {
+            apic_registers = cast(ApicRegisters *)local_apic_address;
+            const(void) * end = cast(const(void) *)(&this) + header.length;
+            const(Entry) * entry = cast(const(Entry) *)(cast(ulong)&this + MADT.sizeof);
+            bool first_io_apic = true;
+            size_t n_cpus = 0u;
+            while (entry < end)
+            {
+                if (DEBUG)
+                {
+                    Klog.writefln("MADT entry type %u, length %u", entry.type, entry.length);
+                }
+                switch (entry.type)
+                {
+                case Entry.PROCESSOR_LOCAL_APIC:
+                    Entry0 * e = cast(Entry0 *)entry;
+                    n_cpus++;
+                    if (DEBUG)
+                    {
+                        Klog.writefln("  ACPI processor ID: %u, APIC ID: %u, Flags: 0x%x",
+                                e.acpi_processor_id, e.apic_id, e.flags);
+                    }
+                    break;
+
+                case Entry.IO_APIC:
+                    Entry1 * e = cast(Entry1 *)entry;
+                    if (first_io_apic)
+                    {
+                        io_apic_registers = cast(IoApicRegisters *)e.io_apic_address;
+                        first_io_apic = false;
+                    }
+                    if (DEBUG)
+                    {
+                        Klog.writefln("  I/O APIC ID: %u, I/O APIC Address: 0x%x, GSIB: %u",
+                                e.io_apic_id, e.io_apic_address, e.global_system_interrupt_base);
+                    }
+                    break;
+
+                case Entry.IO_APIC_INTERRUPT_SOURCE_OVERRIDE:
+                    Entry2 * e = cast(Entry2 *)entry;
+                    if (e.global_system_interrupt < INT_APIC_COUNT)
+                    {
+                        irq_redirects[e.irq_source] = cast(ubyte)e.global_system_interrupt;
+                    }
+                    else
+                    {
+                        Klog.writefln("Warning: unexpected interrupt source override global system interrupt value: %u", e.global_system_interrupt);
+                    }
+                    if (DEBUG)
+                    {
+                        Klog.writefln("  Bus %u IRQ %u GSI %u Flags: 0x%x",
+                                e.bus_source, e.irq_source, e.global_system_interrupt, e.flags);
+                    }
+                    break;
+
+                case Entry.IO_APIC_NMI_SOURCE:
+                    Entry3 * e = cast(Entry3 *)entry;
+                    if (DEBUG)
+                    {
+                        uint global_system_interrupt;
+                        memcpy(&global_system_interrupt, &e.global_system_interrupt, 4u);
+                        Klog.writefln("  NMI Source: %u, Flags: 0x%x, GSI: %u",
+                                e.nmi_source, e.flags, global_system_interrupt);
+                    }
+                    break;
+
+                case Entry.LOCAL_APIC_NMI:
+                    Entry4 * e = cast(Entry4 *)entry;
+                    if (DEBUG)
+                    {
+                        ushort flags;
+                        memcpy(&flags, &e.flags, 2u);
+                        Klog.writefln("  ACPI Processor ID: %u, Flags: 0x%x, LINT#: %u",
+                                e.acpi_processor_id, flags, e.lint_nr);
+                    }
+                    break;
+
+                case Entry.LOCAL_APIC_ADDRESS_OVERRIDE:
+                    Entry5 * e = cast(Entry5 *)entry;
+                    if (DEBUG)
+                    {
+                        memcpy(&apic_registers, &e.local_apic_address, 8u);
+                        Klog.writefln("  Local APIC Address: 0x%x", apic_registers);
+                    }
+                    break;
+
+                case Entry.PROCESSOR_LOCAL_X2APIC:
+                    Entry9 * e = cast(Entry9 *)entry;
+                    if (DEBUG)
+                    {
+                        Klog.writefln("  x2APIC ID: %u, Flags: 0x%x, ACPI ID: %u",
+                                e.local_x2apic_id, e.flags, e.acpi_id);
+                    }
+                    break;
+
+                default:
+                    break;
+                }
+
+                /* Move to next entry. */
+                entry = cast(const(Entry) *)(cast(size_t)entry + entry.length);
+            }
+            if (n_cpus > 0u)
+            {
+                Klog.writefln("%u CPU(s) found", n_cpus);
+            }
+        }
+    }
+
+    /**
+     * APIC register structure.
+     */
     static struct ApicRegister
     {
         public uint value;
@@ -23,6 +260,9 @@ struct Apic
         private ubyte[12] _padding;
     }
 
+    /**
+     * APIC registers.
+     */
     static struct ApicRegisters
     {
         ApicRegister[2] _reserved0;
@@ -55,59 +295,87 @@ struct Apic
         ApicRegister divide_configuration;
     }
 
+    /**
+     * I/O APIC registers.
+     */
     static struct IoApicRegisters
     {
         ApicRegister address;
         ApicRegister data;
     }
 
+    alias ISRHandler = void function();
     private static __gshared ApicRegisters * apic_registers;
     private static __gshared IoApicRegisters * io_apic_registers;
+    private static __gshared ISRHandler[INT_APIC_COUNT] irq_handlers;
+    private static __gshared ubyte[INT_APIC_COUNT] irq_redirects;
 
+    /**
+     * Initialize APIC.
+     */
     public static void initialize()
     {
-        apic_registers = cast(ApicRegisters *)Acpi.apic_address;
+        Klog.writefln("\a3Initializing APIC");
-        io_apic_registers = cast(IoApicRegisters *)0xFEC0_0000u;
+        io_apic_registers = cast(IoApicRegisters *)DEFAULT_IO_APIC_ADDRESS;
+        for (ubyte i = 0u; i < INT_APIC_COUNT; i++)
+        {
+            irq_redirects[i] = i;
+        }
+        MADT * madt = cast(MADT *)Acpi.get_table("APIC");
+        madt.scan();
+        Klog.writefln("APIC found at %p", apic_registers);
+        Klog.writefln("I/O APIC found at %p", io_apic_registers);
         Hurl.map(cast(ulong)apic_registers, cast(ulong)apic_registers,
                 PT_WRITABLE | PT_WRITE_THROUGH | PT_DISABLE_CACHE | PT_NO_EXECUTE);
         Hurl.map(cast(ulong)io_apic_registers, cast(ulong)io_apic_registers,
                 PT_WRITABLE | PT_WRITE_THROUGH | PT_DISABLE_CACHE | PT_NO_EXECUTE);
-        Klog.writefln("LAPIC ID: 0x%08x", apic_registers.lapic_id.value);
-        Klog.writefln("LAPIC version: 0x%08x", apic_registers.lapic_version.value);
         /* Enable local APIC to receive interrupts and set spurious interrupt
          * vector to 0xFF. */
-        apic_registers.spurious_interrupt_vector.value = 0x100u | Idt.INT_APIC_SPURIOUS;
+        apic_registers.spurious_interrupt_vector.value = 0x100u | INT_APIC_SPURIOUS;
-        apic_registers.lvt_timer.value = Idt.INT_APIC_TIMER;
+        apic_registers.lvt_timer.value = INT_APIC_TIMER;
-        apic_registers.lvt_lint[0].value = Idt.INT_APIC_LINT0;
+        apic_registers.lvt_lint[0].value = INT_APIC_LINT0;
-        apic_registers.lvt_lint[1].value = Idt.INT_APIC_LINT1;
+        apic_registers.lvt_lint[1].value = INT_APIC_LINT1;
+        /* Enable PIT interrupt. */
+        configure_io_apic_irq(IRQ_PIT, &Pit.isr);
         /* Enable RTC interrupt. */
-        configure_io_apic_irq(IRQ_RTC, Idt.INT_APIC_BASE + IRQ_RTC);
+        configure_io_apic_irq(IRQ_RTC, &Rtc.isr);
     }
 
-    private static void configure_io_apic_irq(size_t io_apic_irq, size_t interrupt_id)
+    /**
+     * Configure routing for an I/O APIC IRQ.
+     */
+    private static void configure_io_apic_irq(size_t orig_irq, ISRHandler isr_handler)
     {
-        ulong entry = interrupt_id;
+        size_t io_apic_irq = irq_redirects[orig_irq];
+        ulong entry = INT_APIC_BASE + io_apic_irq;
         io_apic_registers.address.value = cast(uint)(0x10u + io_apic_irq * 2u);
         io_apic_registers.data.value = entry & 0xFFFF_FFFFu;
         io_apic_registers.address.value = cast(uint)(0x10u + io_apic_irq * 2u + 1u);
         io_apic_registers.data.value = entry >> 32u;
+        irq_handlers[io_apic_irq] = isr_handler;
     }
 
+    /**
+     * Signal APIC end of interrupt.
+     */
     public static void eoi()
     {
         apic_registers.eoi.value = 0u;
     }
 
+    /**
+     * APIC interrupt handler.
+     */
     public static void isr(ulong vector)
     {
-        switch (vector)
+        ulong io_apic_irq = vector - INT_APIC_BASE;
+        if ((io_apic_irq < INT_APIC_COUNT) && (irq_handlers[io_apic_irq] != null))
         {
-        case Idt.INT_APIC_BASE + IRQ_RTC:
+            irq_handlers[io_apic_irq]();
-            Rtc.isr();
+        }
-            break;
+        else
-
+        {
-        default:
+            Klog.writefln("Unhandled APIC ISR %u", vector);
-            break;
         }
         eoi();
     }

src/hulk/console.d

@@ -5,6 +5,9 @@ module hulk.console;
 
 import hulk.fb;
 import hulk.kfont;
+import hulk.ver;
+import hulk.rtc;
+import hulk.writef;
 
 /**
  * Represent the HULK console.
@@ -13,25 +16,44 @@ import hulk.kfont;
  */
 struct Console
 {
-    /** Console width in text columns. */
+    /** Border color. */
+    private enum BORDER_COLOR = 0xFF8000u;
+
+    /** Heading color. */
+    private enum HEADING_COLOR = 0x0066FFu;
+
+    /** Console page width in text columns. */
     private static __gshared size_t m_width;
 
-    /** Console height in text rows. */
+    /** Console page height in text rows. */
     private static __gshared size_t m_height;
 
-    /** Current console cursor X position. */
+    /** Current console page. */
+    private static __gshared size_t m_page;
+
+    /** Current page cursor X position. */
     private static __gshared size_t m_x;
 
-    /** Current console cursor Y position. */
+    /** Current page cursor Y position. */
     private static __gshared size_t m_y;
 
+    /** Number of delayed newline characters. */
+    private static __gshared size_t m_newlines;
+
+    /** Active console escape code. */
+    private static __gshared char m_escape_code;
+
+    /** Flag to indicate the previous character was an escape character. */
+    private static __gshared bool m_escape;
+
     /**
      * Initialize the console.
      */
     public static void initialize()
     {
-        m_width = Fb.width / Kfont.advance;
+        size_t fb_console_height = Fb.height - Kfont.line_height - 1;
-        m_height = Fb.height / Kfont.line_height;
+        m_width = (Fb.width - 1) / 2 / Kfont.advance;
+        m_height = fb_console_height / Kfont.line_height;
     }
 
     /**
@@ -40,17 +62,99 @@ struct Console
     public static void clear()
     {
         Fb.clear();
+        m_page = 0u;
         m_x = 0u;
         m_y = 0u;
+        draw();
     }
 
     /**
-     * Write a character to the console.
+     * Write a character to the console (buffer newlines).
      *
      * @param ch Character to write.
      */
     public static void write(char ch)
     {
+        if (ch == '\n')
+        {
+            render_heading_end();
+            m_escape_code = 0u;
+            m_newlines++;
+        }
+        else
+        {
+            dowrite(ch);
+        }
+    }
+
+    private static void render_heading_start()
+    {
+        if ('0' <= m_escape_code && m_escape_code <= '9' && m_x < (m_width - 1))
+        {
+            size_t heading_level = m_escape_code - ('0' - 1);
+            size_t nx = m_x + heading_level;
+            if (nx >= m_width)
+            {
+                nx = m_width - 1;
+            }
+            size_t hx = fb_x(m_page, m_x);
+            size_t hy = fb_y(m_y) + Kfont.line_height / 2 - 1;
+            size_t hwidth = (nx - m_x - 1) * Kfont.advance + Kfont.advance / 2 - 1;
+            Fb.rect(hx, hy, hwidth, 2, HEADING_COLOR);
+            Fb.rect(hx + hwidth, fb_y(m_y) + Kfont.line_height / 8,
+                    2, Kfont.line_height * 3 / 4, HEADING_COLOR);
+            m_x = nx;
+        }
+    }
+
+    private static void render_heading_end()
+    {
+        if ('0' <= m_escape_code && m_escape_code <= '9' && m_x < (m_width - 1))
+        {
+            size_t heading_level = m_escape_code - ('0' - 1);
+            size_t nx = m_x + heading_level;
+            if (nx >= m_width)
+            {
+                nx = m_width - 1;
+            }
+            size_t hwidth = (nx - m_x - 1) * Kfont.advance + Kfont.advance / 2 - 1;
+            size_t hx = fb_x(m_page, nx) - hwidth;
+            size_t hy = fb_y(m_y) + Kfont.line_height / 2 - 1;
+            Fb.rect(hx, hy, hwidth, 2, HEADING_COLOR);
+            Fb.rect(hx - 2, fb_y(m_y) + Kfont.line_height / 8,
+                    2, Kfont.line_height * 3 / 4, HEADING_COLOR);
+            m_x = nx;
+        }
+    }
+
+    /**
+     * Write a character to the console (no newline buffering).
+     *
+     * @param ch Character to write.
+     */
+    private static void dowrite(char ch)
+    {
+        if (m_newlines != 0u)
+        {
+            size_t newlines = m_newlines;
+            m_newlines = 0u;
+            for (size_t i = 0u; i < newlines; i++)
+            {
+                dowrite('\n');
+            }
+        }
+        if (m_escape)
+        {
+            m_escape_code = ch;
+            render_heading_start();
+            m_escape = false;
+            return;
+        }
+        if (ch == '\a')
+        {
+            m_escape = true;
+            return;
+        }
         if (ch == '\n')
         {
             m_x = 0u;
@@ -58,7 +162,7 @@ struct Console
         }
         else
         {
-            render_char(m_x, m_y, ch);
+            render_char(fb_x(m_page, m_x), fb_y(m_y), ch);
             m_x++;
             if (m_x == m_width)
             {
@@ -68,14 +172,42 @@ struct Console
         }
         if (m_y == m_height)
         {
-            m_y--;
+            if (m_page == 0u)
-            Fb.copy_rows_up(fb_y(1u),
+            {
-                    (m_height - 1u) * Kfont.line_height,
+                m_page = 1u;
-                    Kfont.line_height);
+                m_x = 0u;
-            Fb.rect(0u, fb_y(m_height - 1u), fb_x(m_width), Kfont.line_height, 0u);
+                m_y = 0u;
+            }
+            else
+            {
+                m_y--;
+                shift_rows();
+            }
         }
     }
 
+    /**
+     * Shift console rows.
+     */
+    private static void shift_rows()
+    {
+        /* Shift up page 0 */
+        Fb.copy_rect(fb_x(0u, 0u), fb_y(1u),
+                m_width * Kfont.advance, (m_height - 1u) * Kfont.line_height,
+                fb_x(0u, 0u), fb_y(0u));
+        /* Copy page 1 first row to page 0 last row. */
+        Fb.copy_rect(fb_x(1u, 0u), fb_y(0u),
+                m_width * Kfont.advance, Kfont.line_height,
+                fb_x(0u, 0u), fb_y(m_height - 1u));
+        /* Shift up page 1 */
+        Fb.copy_rect(fb_x(1u, 0u), fb_y(1u),
+                m_width * Kfont.advance, (m_height - 1u) * Kfont.line_height,
+                fb_x(1u, 0u), fb_y(0u));
+        /* Erase page 1 last row. */
+        Fb.rect(fb_x(1u, 0u), fb_y(m_height - 1u),
+                m_width * Kfont.advance, Kfont.line_height, 0u);
+    }
+
     /**
      * Render a character.
      *
@@ -85,23 +217,60 @@ struct Console
      */
     private static void render_char(size_t x, size_t y, char ch)
     {
+        if (ch > 127)
+        {
+            ch = 0u;
+        }
         const(CharInfo) * ci = &Kfont.chars[ch];
-        Fb.blit_alpha_bitmap(fb_x(x) + ci.left, fb_y(y) + ci.top, ci.bitmap, ci.width, ci.height);
+        Fb.blit_alpha_bitmap(x + ci.left, y + ci.top, ci.bitmap, ci.width, ci.height);
     }
 
     /**
-     * Get the framebuffer X coordinate corresponding to the console X position.
+     * Get the framebuffer X coordinate corresponding to the console page X position.
      */
-    private static size_t fb_x(size_t x)
+    private static size_t fb_x(size_t page, size_t x)
     {
-        return x * Kfont.advance;
+        return x * Kfont.advance + page * (m_width * Kfont.advance + 1);
     }
 
     /**
-     * Get the framebuffer Y coordinate corresponding to the console Y position.
+     * Get the framebuffer Y coordinate corresponding to the console page Y position.
      */
     private static size_t fb_y(size_t y)
     {
-        return y * Kfont.line_height;
+        return (y + 1) * Kfont.line_height + 1;
+    }
+
+    /**
+     * Draw console.
+     */
+    private static draw()
+    {
+        static __gshared string header_text = "Welcome to HOS v" ~ VERSION ~ "!";
+        Fb.rect(0u, Kfont.line_height, Fb.width, 1, BORDER_COLOR);
+        Fb.rect(m_width * Kfont.advance, Kfont.line_height, 1, Fb.height - Kfont.line_height, BORDER_COLOR);
+        size_t x = 0;
+        foreach (c; header_text)
+        {
+            render_char(x, 0, c);
+            x += Kfont.advance;
+        }
+        update_header();
+    }
+
+    /**
+     * Update console header.
+     */
+    public static update_header()
+    {
+        __gshared uint x;
+        x = Fb.width - 8 * Kfont.advance;
+        Fb.rect(x - 1, 0, 1, Kfont.line_height, BORDER_COLOR);
+        Fb.rect(x, 0, Fb.width - x, Kfont.line_height, 0);
+        Rtc.time rtc_time = Rtc.read_rtc_time();
+        writef(function(ubyte ch) {
+                render_char(x, 0, ch);
+                x += Kfont.advance;
+                }, "%02u:%02u:%02u", rtc_time.hour, rtc_time.minute, rtc_time.second);
     }
 }

src/hulk/cpu.d

@@ -57,6 +57,7 @@ enum ulong XCR0_PKRU = 0x100u;
 /** @} */
 
 /** MSR register numbers. @{ */
+enum uint MSR_PAT = 0x277u;
 enum uint MSR_EFER = 0xC000_0080u;
 /** @} */
 
@@ -185,6 +186,14 @@ void write_cr4(ulong v)
     __asm("mov $0, %cr4", "r", v);
 }
 
+ulong read_rflags()
+{
+    return __asm!ulong(`
+            pushf
+            mov (%rsp), %rax
+            add $$8, %rsp`, "={rax}");
+}
+
 ulong rdmsr(uint msr)
 {
     return __asm!ulong(`
@@ -245,3 +254,8 @@ void cpuid1(uint * ebx, uint * ecx, uint * edx)
 {
     __asm("cpuid", "=*{ebx},=*{ecx},=*{edx},{eax}", ebx, ecx, edx, 1u);
 }
+
+void swint(ubyte swint_id)()
+{
+    mixin(`__asm("int $$`, cast(int)cast(uint)swint_id, `", "");`);
+}

src/hulk/fb.d

@@ -199,6 +199,34 @@ struct Fb
                 (m_stride * height));
     }
 
+    /**
+     * Copy a rectangle in the framebuffer.
+     *
+     * @param sx X coordinate of left of source rectangle.
+     * @param sy Y coordinate of top of source rectangle.
+     * @param width Width of rectangle to copy.
+     * @param height Height of rectangle to copy.
+     * @param dx X coordinate of left of destination rectangle.
+     * @param dy Y coordinate of top of destination rectangle.
+     */
+    static void copy_rect(size_t sx, size_t sy, size_t width, size_t height,
+            size_t dx, size_t dy)
+    {
+        size_t dest_buffer_index = buffer_index(dx, dy);
+        size_t src_buffer_index = buffer_index(sx, sy);
+        for (size_t y = 0u; y < height; y++)
+        {
+            memcpy32(&m_buffer1[dest_buffer_index],
+                     &m_buffer1[src_buffer_index],
+                     width);
+            memcpy32(&m_device_buffer[dest_buffer_index],
+                     &m_buffer1[dest_buffer_index],
+                     width);
+            dest_buffer_index += m_stride;
+            src_buffer_index += m_stride;
+        }
+    }
+
     /**
      * Return the buffer index for the given X and Y coordinates.
      *

src/hulk/him.d

@@ -0,0 +1,329 @@
+/**
+ * HULK Interrupt Manager.
+ */
+module hulk.him;
+
+import hulk.gdt;
+import ldc.llvmasm;
+import hulk.fb;
+import hulk.console;
+import hulk.klog;
+import hulk.apic;
+import hulk.cpu;
+import hulk.kfont;
+import hulk.thread;
+
+/** Number if Interrupt Service Routines. */
+private enum N_ISRS = 256;
+
+/** Interrupt stack frame indices. */
+public static enum
+{
+    ISF_RBP,
+    ISF_R15,
+    ISF_R14,
+    ISF_R13,
+    ISF_R12,
+    ISF_R11,
+    ISF_R10,
+    ISF_R9,
+    ISF_R8,
+    ISF_RDI,
+    ISF_RSI,
+    ISF_RDX,
+    ISF_RCX,
+    ISF_RBX,
+    ISF_RAX,
+    ISF_ERROR_CODE,
+    ISF_RIP,
+    ISF_CS,
+    ISF_RFLAGS,
+    ISF_RSP,
+    ISF_SS,
+    ISF_COUNT,
+}
+
+private static __gshared string[ISF_COUNT] ISF_NAMES = [
+    "RBP",
+    "R15",
+    "R14",
+    "R13",
+    "R12",
+    "R11",
+    "R10",
+    "R9",
+    "R8",
+    "RDI",
+    "RSI",
+    "RDX",
+    "RCX",
+    "RBX",
+    "RAX",
+    "Error Code",
+    "RIP",
+    "CS",
+    "RFLAGS",
+    "RSP",
+    "SS",
+];
+
+/** Interrupt IDs. @{ */
+public enum ulong INT_PAGE_FAULT = 0x0Eu;
+
+/* The I/O APIC is configured to map IRQ 0 to interrupt 64 (0x40). */
+public enum ulong INT_APIC_BASE = 0x40u; /* IRQ 0 */
+public enum ulong INT_APIC_COUNT = 24u;
+
+public enum ulong INT_APIC_TIMER = 0x70u;
+public enum ulong INT_APIC_LINT0 = 0x71u;
+public enum ulong INT_APIC_LINT1 = 0x72u;
+public enum ulong INT_KERNEL_SWINT = 0x80u;
+public enum ulong INT_APIC_SPURIOUS = 0xFFu;
+/** @} */
+
+static foreach(isr; 0 .. N_ISRS)
+{
+    mixin(`private extern(C) void isr_`, isr, `();`);
+}
+
+private string isrs_list(int index = 0)()
+{
+    static if (index < 256)
+    {
+        return "&isr_" ~ index.stringof ~ ",\n" ~ isrs_list!(index + 1)();
+    }
+    else
+    {
+        return "";
+    }
+}
+
+mixin(`private static __gshared extern(C) void function()[N_ISRS] isrs = [`,
+        isrs_list(),
+        `];`);
+
+/** Interrupt suspend level (0 when interrupts are enabled). */
+private __gshared size_t interrupt_suspend_level;
+
+/** Interrupt nest level (0 when not in an interrupt handler). */
+private __gshared size_t interrupt_level;
+
+/**
+ * Suspend interrupts.
+ *
+ * This function disables interrupts. Calls can be nested and interrupts will
+ * be enabled only when the outermost pair of
+ * suspend_interrupts()/resume_interrupts() is complete.
+ */
+void suspend_interrupts()
+{
+    if (interrupt_level == 0)
+    {
+        cli();
+        interrupt_suspend_level++;
+    }
+}
+
+/**
+ * Resume interrupts.
+ *
+ * Calls can be nested and interrupts will be enabled only when the outermost
+ * pair of suspend_interrupts()/resume_interrupts() is complete.
+ */
+void resume_interrupts()
+{
+    if (interrupt_level == 0)
+    {
+        interrupt_suspend_level--;
+        if (interrupt_suspend_level == 0)
+        {
+            sti();
+        }
+    }
+}
+
+struct Him
+{
+    /**
+     * IDT descriptor entry type.
+     */
+    struct descriptor_t
+    {
+        ulong[2] descriptor;
+
+        this(T)(size_t index, ulong dpl, bool trap, T offset)
+        {
+            descriptor[0] =
+                0x0000_8E_00_0000_0000u |
+                ((cast(ulong)offset & 0xFFFF_0000u) << 32u) |
+                (dpl << 45u) |
+                ((trap ? 1uL : 0uL) << 40u) |
+                (Gdt.SELECTOR_KERNEL_CODE << 16u) |
+                (cast(ulong)offset & 0xFFFFu);
+            descriptor[1] = cast(ulong)offset >> 32u;
+        }
+    }
+
+    /**
+     * IDTR register format.
+     */
+    struct idtr_t
+    {
+        ushort limit;
+        align(2) ulong offset;
+    }
+    static assert(idtr_t.sizeof == 10u);
+
+    private static __gshared idtr_t idtr;
+    private static __gshared align(0x10) descriptor_t[N_ISRS] idt;
+    static assert(idt.sizeof == (N_ISRS * 16u));
+
+    public static void initialize()
+    {
+        set_isrs();
+        idtr.limit = idt.sizeof - 1u;
+        idtr.offset = cast(ulong)&idt;
+        lidt(&idtr);
+    }
+
+    private static void lidt(idtr_t * idtr)
+    {
+        __asm("lidt $0", "*m", idtr);
+    }
+
+    private static void set_isrs()
+    {
+        static bool isr_has_error_code(size_t isr)
+        {
+            return (isr == 8) ||
+                ((10 <= isr) && (isr <= 14)) ||
+                (isr == 17) ||
+                (isr == 21) ||
+                (isr == 29) ||
+                (isr == 30);
+        }
+
+        static bool isr_is_trap(size_t isr)
+        {
+            return (isr < 32u) && (isr != 2u);
+        }
+
+        __asm("jmp 1f", "");
+        static foreach(isr; 0 .. N_ISRS)
+        {
+            mixin("__asm(`isr_", isr, ":
+                " ~ (isr_has_error_code(isr) ? "" : "pushq $$0") ~ "
+                pushq %rax
+                mov $$", isr, ", %rax
+                jmp isr_common`, ``);");
+        }
+
+        __asm(`isr_common:
+            pushq %rbx
+            pushq %rcx
+            pushq %rdx
+            pushq %rsi
+            pushq %rdi
+            pushq %r8
+            pushq %r9
+            pushq %r10
+            pushq %r11
+            pushq %r12
+            pushq %r13
+            pushq %r14
+            pushq %r15
+            pushq %rbp
+            mov %rsp, %rbp
+            mov %rsp, %rsi
+            and $$0xFFFFFFFFFFFFFFF0, %rsp
+            mov %rsp, %rdx
+            mov %rax, %rdi
+            movabs $$isr, %rax
+            callq *%rax
+            mov %rax, %rsp
+            popq %rbp
+            popq %r15
+            popq %r14
+            popq %r13
+            popq %r12
+            popq %r11
+            popq %r10
+            popq %r9
+            popq %r8
+            popq %rdi
+            popq %rsi
+            popq %rdx
+            popq %rcx
+            popq %rbx
+            popq %rax
+            add $$8, %rsp
+            iretq
+            1:`, ``);
+
+        for (size_t isr = 0; isr < N_ISRS; isr++)
+        {
+            idt[isr] = descriptor_t(isr, 0u, isr_is_trap(isr), isrs[isr]);
+        }
+    }
+
+}
+
+/**
+ * Interrupt service routine.
+ *
+ * This function returns the stack pointer of the thread to execute when
+ * returning from this function.
+ */
+public extern(C) ulong * isr(ulong vector, ulong * stack_frame, ulong * rsp)
+{
+    interrupt_level++;
+    if (interrupt_level == 1)
+    {
+        Thread.current_thread.stack_pointer = stack_frame;
+    }
+    if ((vector >= INT_APIC_BASE) && (vector < (INT_APIC_BASE + INT_APIC_COUNT)))
+    {
+        Apic.isr(vector);
+    }
+    else
+    {
+        switch (vector)
+        {
+        case INT_APIC_TIMER:
+        case INT_APIC_LINT0:
+        case INT_APIC_LINT1:
+        case INT_APIC_SPURIOUS:
+            Apic.isr(vector);
+            break;
+
+        case INT_KERNEL_SWINT:
+            Thread.handle_swint(stack_frame);
+            break;
+
+        default:
+            Fb.rect(0, 0, Fb.width, Kfont.line_height, 0xCC0000u);
+            Klog.writefln("\n **** Unhandled ISR %u ****", vector);
+            for (size_t i = 0u; i < ISF_COUNT; i++)
+            {
+                Klog.writef(ISF_NAMES[i]);
+                Klog.writefln(" = 0x%x", stack_frame[i]);
+            }
+            Klog.writefln("CR2 = 0x%p", read_cr2());
+            __asm("cli", "");
+            for (;;)
+            {
+                __asm("hlt", "");
+            }
+        }
+    }
+    Thread.current_thread = Thread.current_thread.list_next;
+    interrupt_level--;
+    if (interrupt_level == 0)
+    {
+        return Thread.current_thread.stack_pointer;
+    }
+    else
+    {
+        return rsp;
+    }
+}

src/hulk/hippo.d

@@ -7,21 +7,38 @@
  */
 module hulk.hippo;
 
+import hulk.hurl;
+import hulk.klog;
+
 struct Hippo
 {
     /**
-     * Linked list node entry for a physical page.
+     * Linked list node entry for a single page.
      */
     private static struct PhysicalPage
     {
         PhysicalPage * next;
     }
 
+    /**
+     * Linked list node entry for a region.
+     */
+    private static struct Region
+    {
+        ulong size;
+        Region * next;
+    }
+
     /**
      * Linked list of free physical pages.
      */
     private static __gshared PhysicalPage * free_pages;
 
+    /**
+     * Linked list of free regions.
+     */
+    private static __gshared Region * regions;
+
     /**
      * Number of free physical pages.
      */
@@ -48,22 +65,154 @@ struct Hippo
     public static void * allocate_page()
     {
         PhysicalPage * pp;
-        if (free_pages != null)
+        if (free_pages !is null)
         {
             pp = free_pages;
             free_pages = free_pages.next;
             m_n_free_pages--;
         }
+        else if (regions !is null)
+        {
+            pp = cast(PhysicalPage *)(cast(ulong)regions + regions.size - PAGE_SIZE);
+            regions.size -= PAGE_SIZE;
+            if (regions.size == 0)
+            {
+                regions = regions.next;
+            }
+            m_n_free_pages--;
+        }
         return cast(void *)pp;
     }
 
+    /**
+     * Free a physical memory region.
+     */
+    public static void free_region(T)(T start, ulong size)
+    {
+        if (size == PAGE_SIZE)
+        {
+            free_page(start);
+            return;
+        }
+
+        if (regions is null)
+        {
+            /* The free regions list is empty. Append this new region. */
+            regions = cast(Region *)start;
+            regions.size = size;
+            regions.next = null;
+        }
+        else if (size < regions.size)
+        {
+            /* The new region is smaller than the first one in the list.
+             * Add the new region to the beginning of the list. */
+            Region * new_region = cast(Region *)start;
+            new_region.size = size;
+            new_region.next = regions;
+            regions = new_region;
+        }
+        else
+        {
+            /* Find the last free region that is smaller than this one. */
+            Region * region = regions;
+            while (region.next !is null && region.next.size < size)
+            {
+                region = region.next;
+            }
+
+            /* Add the new region after this entry. */
+            Region * new_region = cast(Region *)start;
+            new_region.size = size;
+            new_region.next = region.next;
+            region.next = new_region;
+        }
+
+        m_n_free_pages += size >> 12;
+    }
+
+    /**
+     * Allocate a region with the given size and alignment.
+     *
+     * @param size Region size.
+     * @param alignment Region alignment.
+     */
+    public static void * allocate_aligned_region(ulong size, ulong alignment)
+    {
+        Region ** regionp = &regions;
+        for (;;)
+        {
+            Region * region = *regionp;
+            if (region is null)
+            {
+                break;
+            }
+
+            /* The size of the region must be large enough */
+            if (region.size >= size)
+            {
+                /* The alignment contstraint must be satisfied. */
+                if ((cast(ulong)region & (alignment - 1)) == 0)
+                {
+                    /* The region start address happens to already be aligned. */
+                    if (region.size > size)
+                    {
+                        /* Region found is larger that needed. */
+                        Region * new_region = cast(Region *)(cast(ulong)region + size);
+                        new_region.size = region.size - size;
+                        new_region.next = region.next;
+                        *regionp = new_region;
+                        return region;
+                    }
+                    else
+                    {
+                        /* Region happens to be the size requested. */
+                        *regionp = region.next;
+                        return region;
+                    }
+                }
+                else
+                {
+                    /* This region is large enough but not aligned. See if an
+                     * aligned subregion can be found at the end. */
+                    ulong start = (cast(ulong)region + region.size - size) & ~(alignment - 1);
+                    if (start > cast(ulong)region)
+                    {
+                        /* The aligned subregion does fit in this region. */
+                        region.size = (start - cast(ulong)region);
+                        ulong region_end = cast(ulong)region + region.size;
+                        if (region_end > (start + size))
+                        {
+                            /* There is another region following the aligned
+                             * subregion that we must reclaim. */
+                            free_region(start + size, region_end - (start + size));
+                        }
+                        return cast(void *)start;
+                    }
+                }
+            }
+
+            regionp = &region.next;
+        }
+        return null;
+    }
+
     /**
      * Get the number of free pages.
      *
      * @return The number of free pages.
      */
-    public @property size_t n_free_pages() const
+    public static @property size_t n_free_pages()
     {
         return m_n_free_pages;
     }
+
+    public static void dump_regions()
+    {
+        Region * region = regions;
+        while (region !is null)
+        {
+            Klog.writefln("HIPPO free region: %p %uKB", region, region.size >> 10);
+            region = region.next;
+        }
+    }
 }

src/hulk/hulk.d

@@ -14,7 +14,7 @@ import hulk.hurl;
 import hulk.hippo;
 import hulk.pci;
 import hulk.gdt;
-import hulk.idt;
+import hulk.him;
 import hulk.cpu;
 import ldc.llvmasm;
 import hulk.pic;
@@ -22,6 +22,11 @@ import hulk.acpi;
 import hulk.apic;
 import hulk.rtc;
 import hulk.serial;
+import hulk.usb;
+import hulk.pit;
+import hulk.time;
+import hulk.test;
+import hulk.thread;
 
 extern extern(C) __gshared ubyte _hulk_bss_size;
 
@@ -29,7 +34,7 @@ extern extern(C) __gshared ubyte _hulk_bss_size;
 private __gshared HulkHeader hulk_header = {
     &_hulk_bss_size, /* hulk_bss_size */
     &hulk_start, /* entry */
-    16u * 1024u, /* stack_size */
+    Thread.STACK_SIZE, /* stack_size */
     Hurl.HULK_BASE, /* virt_base */
     Hurl.HULK_STACK_TOP, /* virt_stack_top */
     Hurl.HULK_FRAMEBUFFER, /* virt_fb_buffer */
@@ -55,11 +60,12 @@ private void initialize_cpu()
  */
 void hulk_start()
 {
-    cli();
+    suspend_interrupts();
+
     initialize_cpu();
     Serial.initialize();
     Gdt.initialize();
-    Idt.initialize();
+    Him.initialize();
     Fb.initialize(cast(uint *)Hurl.HULK_FRAMEBUFFER,
             cast(uint *)hulk_header.bootinfo.fb_buffer1_phys,
             hulk_header.bootinfo.fb.width,
@@ -69,18 +75,40 @@ void hulk_start()
     Console.clear();
     Klog.initialize();
 
-    Klog.writefln("Welcome to HULK, the HOS UltraLight Kernel!");
+    Klog.writefln("\a5Welcome to HULK, the HOS UltraLight Kernel!");
 
     Hurl.initialize(&hulk_header);
     Pic.initialize();
     Acpi.initialize(hulk_header.bootinfo.acpi_xsdt_phys);
     Apic.initialize();
     Rtc.initialize();
+    Pit.initialize();
     Pci.initialize();
-    sti();
+    Thread.initialize();
 
+    resume_interrupts();
+
+    Usb.initialize();
+
+    /* Run kernel tests. */
+    Test.run();
+    Klog.writefln("\a5HULK Initialization Complete!");
+//    Thread.start(&th);
+//    Time.msleep(1);
+//    Time.msleep(500);
+//    Klog.writefln("Main thread!");
+    /* Idle loop. */
     for (;;)
     {
         hlt();
     }
 }
+
+void th()
+{
+    for (;;)
+    {
+        Klog.writefln("Hello from thread.");
+        Time.msleep(1000);
+    }
+}

src/hulk/hulk.ld

@@ -1,6 +1,6 @@
 SECTIONS
 {
-    . = 0xFFFF800000000000;
+    . = 0xFFFFFFFF80000000;
     _hulk_mem_start = .;
     _hulk_header_start = .;
 

src/hulk/hurl/a1.d

@@ -7,6 +7,7 @@ import hulk.hurl;
 import hulk.hippo;
 import hulk.util;
 import hulk.pagetable;
+import hulk.memory;
 
 /**
  * The A1 memory allocator is a one-shot memory allocator for kernel memory
@@ -48,6 +49,8 @@ struct A1
             current_limit += PAGE_SIZE;
         }
 
+        memset64(cast(void *)address, 0, size / 8);
+
         return cast(void *)address;
     }
 

src/hulk/hurl/hurl.d

@@ -18,16 +18,16 @@ import hulk.util;
 struct Hurl
 {
     /** HULK base address. */
-    enum ulong HULK_BASE = 0xFFFF_8000_0000_0000u;
+    enum ulong HULK_BASE = 0xFFFF_FFFF_8000_0000u;
 
     /** HULK stack top address. */
-    enum ulong HULK_STACK_TOP = 0xFFFF_8001_0000_0000u;
+    enum ulong HULK_STACK_TOP = 0xFFFF_FFFF_9000_0000u;
 
     /** HULK framebuffer address. */
-    enum ulong HULK_FRAMEBUFFER = 0xFFFF_8001_0000_0000u;
+    enum ulong HULK_FRAMEBUFFER = 0xFFFF_FFFF_9000_0000u;
 
     /** A1 allocator range base address. */
-    enum ulong A1_BASE = 0xFFFF_8002_0000_0000u;
+    enum ulong A1_BASE = 0xFFFF_FFFF_A000_0000u;
 
     /**
      * Pointer to the base page table.
@@ -91,7 +91,7 @@ struct Hurl
         map_range(HULK_FRAMEBUFFER,
                 cast(ulong)header.bootinfo.fb.buffer,
                 header.bootinfo.fb.height * header.bootinfo.fb.stride * 4u,
-                PT_WRITABLE | PT_NO_EXECUTE);
+                PT_PAT | PT_WRITABLE | PT_NO_EXECUTE);
         /* Map framebuffer buffer1. */
         map_range(cast(ulong)header.bootinfo.fb_buffer1_phys,
                 cast(ulong)header.bootinfo.fb_buffer1_phys,
@@ -157,13 +157,14 @@ struct Hurl
         size_t usable_memory;
         size_t physical_address_limit;
         const(size_t) fb_size = round_up_power_2(header.bootinfo.fb.height * header.bootinfo.fb.stride * 4u, PAGE_SIZE);
-        ulong[2][2] reserved = [
+        ulong[2][2] reserved_regions = [
             [header.bootinfo.hulk_phys, LinkerAddresses.hulk_binary_size],
             [cast(ulong)header.bootinfo.fb.buffer, fb_size],
         ];
-        for (size_t ri = 0u; ri < reserved.length; ri++)
+        for (size_t ri = 0u; ri < reserved_regions.length; ri++)
         {
-            reserved[ri][1] += reserved[ri][0];
+            Klog.writefln("Reserved region %p %uKB", reserved_regions[ri][0], reserved_regions[ri][1] >> 10);
+            reserved_regions[ri][1] += reserved_regions[ri][0];
         }
         for (size_t bii = 0u; bii < header.bootinfo.memory_map_count; bii++)
         {
@@ -171,32 +172,21 @@ struct Hurl
                 (header.bootinfo.memory_map[bii].type == BootInfo.MemoryRegion.Type.Conventional))
             {
                 ulong phys = header.bootinfo.memory_map[bii].base;
-                ulong phys_end = phys + header.bootinfo.memory_map[bii].size;
+                ulong size = header.bootinfo.memory_map[bii].size;
+                ulong phys_end = phys + size;
                 if (phys_end > physical_address_limit)
                 {
                     physical_address_limit = phys_end;
                 }
                 usable_memory += header.bootinfo.memory_map[bii].size;
-                while (phys < phys_end)
+                add_region(phys, size, reserved_regions);
-                {
-                    bool is_reserved = false;
-                    for (size_t ri = 0u; ri < reserved.length; ri++)
-                    {
-                        if ((reserved[ri][0] <= phys) && (phys < reserved[ri][1]))
-                        {
-                            is_reserved = true;
-                            break;
-                        }
-                    }
-                    if (!is_reserved)
-                    {
-                        Hippo.free_page(phys);
-                    }
-                    phys += PAGE_SIZE;
-                }
             }
         }
 
+        /* Set PAT4 to indicate Write Combining so we can set the PAT bit in a
+         * page table entry to use Write Combining for that page. */
+        wrmsr(MSR_PAT, (rdmsr(MSR_PAT) & 0xFFFF_FF00_FFFF_FFFFu) | 0x0000_0001_0000_0000u);
+
         /*
          * Now that we have available physical pages to allocate from, we can
          * build new page tables to replace the bootloader page tables.
@@ -219,6 +209,60 @@ struct Hurl
         usable_memory += fb_size;
         Klog.writefln("Usable memory: %uKB", usable_memory >> 10u);
         Klog.writefln("Kernel size: %uKB", (LinkerAddresses.hulk_binary_size + LinkerAddresses.hulk_bss_size + header.stack_size) >> 10u);
+        Klog.writefln("Free pages: %u", Hippo.n_free_pages);
+//        Hippo.dump_regions();
+    }
+
+    /**
+     * Add a region of available physical memory.
+     *
+     * @param start Start address of region.
+     * @param size Size of region.
+     * @param reserved_regions List of reserved regions to exclude.
+     */
+    private static void add_region(ulong start, ulong size, ulong[2][] reserved_regions)
+    {
+        ulong end = start + size;
+        bool split;
+
+        /* Skip empty regions. */
+        if (size == 0)
+        {
+            return;
+        }
+
+        for (size_t rri = 0; rri < reserved_regions.length; rri++)
+        {
+            /* Skip this region if it is entirely within a reserved region. */
+            if (reserved_regions[rri][0] <= start && reserved_regions[rri][1] >= end)
+            {
+                return;
+            }
+
+            /* Check if the region is partly reserved but the beginning is free. */
+            if (reserved_regions[rri][0] > start && reserved_regions[rri][0] < end)
+            {
+                split = true;
+                add_region(start, reserved_regions[rri][0] - start, reserved_regions);
+            }
+
+            /* Check if the region is partly reserved but the end is free. */
+            if (reserved_regions[rri][1] > start && reserved_regions[rri][1] < end)
+            {
+                split = true;
+                add_region(reserved_regions[rri][1], end - reserved_regions[rri][1], reserved_regions);
+            }
+
+            if (split)
+            {
+                return;
+            }
+        }
+
+        /* If a region makes it here, it did not overlap with any reserved
+         * region, so the entire region can be used. */
+//        Klog.writefln("HURL: freeing region %p %uKB", start, size >> 10);
+        Hippo.free_region(start, size);
     }
 
     public static void map(ulong virtual, ulong physical, ulong flags)

src/hulk/idt.d

@@ -1,133 +0,0 @@
-/**
- * IDT (Interrupt Descriptor Table) functionality.
- */
-module hulk.idt;
-
-import hulk.gdt;
-import ldc.llvmasm;
-import hulk.fb;
-import hulk.console;
-import hulk.klog;
-import hulk.apic;
-
-struct Idt
-{
-    /* The I/O APIC is configured to map IRQ 0 to interrupt 64 (0x40). */
-    public static enum ulong INT_APIC_BASE = 0x40u; /* IRQ 0 */
-    public static enum ulong INT_APIC_COUNT = 24u;
-
-    public static enum ulong INT_APIC_TIMER = 0x70u;
-    public static enum ulong INT_APIC_LINT0 = 0x71u;
-    public static enum ulong INT_APIC_LINT1 = 0x72u;
-    public static enum ulong INT_APIC_SPURIOUS = 0xFFu;
-
-    struct idtr_t
-    {
-        ushort limit;
-        align(2) ulong offset;
-    }
-    static assert(idtr_t.sizeof == 10u);
-
-    alias descriptor_t = ulong[2];
-
-    static __gshared align(0x10) descriptor_t[256] idt;
-    static assert(idt.sizeof == (256u * 16u));
-    static __gshared idtr_t idtr;
-
-    public static void initialize()
-    {
-        set_isrs();
-        idtr.limit = idt.sizeof - 1u;
-        idtr.offset = cast(ulong)&idt;
-        lidt(&idtr);
-    }
-
-    private static void lidt(idtr_t * idtr)
-    {
-        __asm("lidt $0", "*m", idtr);
-    }
-
-    private static bool isr_has_error_code(size_t isr)
-    {
-        return (isr == 8) ||
-            ((10 <= isr) && (isr <= 14)) ||
-            (isr == 17) ||
-            (isr == 21) ||
-            (isr == 29) ||
-            (isr == 30);
-    }
-
-    private static bool isr_is_trap(size_t isr)
-    {
-        return (isr < 32u) && (isr != 2u);
-    }
-
-    private static void set_isrs()
-    {
-        ulong isr_address;
-        static foreach(isr; 0 .. 256)
-        {
-            mixin("isr_address = __asm!ulong(`
-                movabs $$1f, %rax
-                jmp 2f
-                1:
-                pushq %rdi
-                pushq %rsi
-                pushq %rax
-                mov $$", isr, ", %rdi
-                " ~ (isr_has_error_code(isr) ? "mov 0x18(%rsp), %rsi" : "") ~ "
-                movabs $$isr, %rax
-                callq *%rax
-                popq %rax
-                popq %rsi
-                popq %rdi
-                " ~ (isr_has_error_code(isr) ? "add $$8, %rsp" : "") ~ "
-                iretq
-                2:`, `={rax}`);");
-            mixin("set_descriptor(", isr, ", 0u, " ~
-                    (isr_is_trap(isr) ? "true" : "false") ~ ", isr_address);");
-        }
-    }
-
-    private static void set_descriptor(size_t index, ulong dpl, bool trap, ulong offset)
-    {
-        idt[index][0] =
-            0x0000_8E_00_0000_0000u |
-            ((offset & 0xFFFF_0000u) << 32u) |
-            (dpl << 45u) |
-            ((trap ? 1uL : 0uL) << 40u) |
-            (Gdt.SELECTOR_KERNEL_CODE << 16u) |
-            (offset & 0xFFFFu);
-        idt[index][1] = offset >> 32u;
-    }
-}
-
-public extern(C) void isr(ulong vector, ulong arg)
-{
-    if ((vector >= Idt.INT_APIC_BASE) && (vector < (Idt.INT_APIC_BASE + Idt.INT_APIC_COUNT)))
-    {
-        Apic.isr(vector);
-    }
-    else
-    {
-        switch (vector)
-        {
-        case Idt.INT_APIC_TIMER:
-        case Idt.INT_APIC_LINT0:
-        case Idt.INT_APIC_LINT1:
-        case Idt.INT_APIC_SPURIOUS:
-            Apic.isr(vector);
-            break;
-
-        default:
-            Console.clear();
-            Fb.clear(0xFF8000u);
-            Klog.writefln("ISR %u, 0x%x", vector, arg);
-            __asm("cli", "");
-            for (;;)
-            {
-                __asm("hlt", "");
-            }
-        }
-    }
-}

src/hulk/klog.d

@@ -40,9 +40,9 @@ struct Klog
      */
     public static void writef(string s, va_list args)
     {
-        hulk.writef.writef(s, args, function void(ubyte ch) {
+        hulk.writef.writefv(function void(ubyte ch) {
                     Console.write(ch);
-                });
+                }, s, args);
     }
 
     /**

src/hulk/list.d

@@ -0,0 +1,100 @@
+/**
+ * Linked list functionality.
+ */
+module hulk.list;
+
+/**
+ * Linked list mixin.
+ */
+mixin template List(T)
+{
+    /**
+     * Next item in linked list.
+     */
+    T * list_next;
+
+    /**
+     * Previous item in linked list.
+     */
+    T * list_prev;
+
+    /**
+     * Initialize linked list fields.
+     */
+    public void list_init()
+    {
+        list_next = &this;
+        list_prev = &this;
+    }
+
+    /**
+     * Add this item after another in a list.
+     */
+    public void list_insert_after(T * item)
+    {
+        list_next = item.list_next;
+        list_prev = item;
+        item.list_next = &this;
+        list_next.list_prev = &this;
+    }
+
+    /**
+     * Add this item before another in a list.
+     */
+    public void list_insert_before(T * item)
+    {
+        list_next = item;
+        list_prev = item.list_prev;
+        item.list_prev = &this;
+        list_prev.list_next = &this;
+    }
+
+    /**
+     * Remove this item from the list.
+     */
+    public void list_remove()
+    {
+        list_next.list_prev = list_prev;
+        list_prev.list_next = list_next;
+        list_init();
+    }
+
+    /**
+     * Get the number of items in this list.
+     */
+    public @property size_t list_count() const
+    {
+        size_t count = 1;
+        const(T) * item = &this;
+        while (item.list_next != &this)
+        {
+            count++;
+            item = item.list_next;
+        }
+        return count;
+    }
+
+    /**
+     * Allow foreach iteration through this linked list.
+     */
+    public int opApply(scope int delegate(T *) dg)
+    {
+        T * item = &this;
+        T * last = item.list_prev;
+        for (;;)
+        {
+            T * next = item.list_next;
+            int result = dg(item);
+            if (result != 0)
+            {
+                return result;
+            }
+            if (item == last)
+            {
+                break;
+            }
+            item = next;
+        }
+        return 0;
+    }
+}

src/hulk/pagetable.d

@@ -11,7 +11,8 @@ enum ulong PT_WRITE_THROUGH = 0x8u;
 enum ulong PT_DISABLE_CACHE = 0x10u;
 enum ulong PT_ACCESSED = 0x20u;
 enum ulong PT_DIRTY = 0x40u;
-enum ulong PT_HUGE_PAGE = 0x80u;
+enum ulong PT_PAT = 0x80u; /* Page table entry bit. */
+enum ulong PT_HUGE_PAGE = 0x80u; /* Page directory entry bit. */
 enum ulong PT_GLOBAL = 0x100u;
 enum ulong PT_NO_EXECUTE = 0x8000_0000_0000_0000u;
 /** @} */

src/hulk/pci.d

@@ -1,3 +1,6 @@
+/**
+ * PCI (Peripheral Component Interconnect) functionality.
+ */
 module hulk.pci;
 
 import hulk.cpu;
@@ -6,62 +9,164 @@ import hulk.hurl;
 import hulk.hurl.a1;
 import hulk.range;
 import hulk.usb.xhci;
+import hulk.acpi;
+import hulk.list;
 
 struct Pci
 {
-    /* IO address for PCI configuration address. */
+    /** IO address for PCI configuration address. */
     enum IO_ADDR_CONFIG_ADDRESS = 0xCF8u;
 
-    /* IO address for PCI configuration data. */
+    /** IO address for PCI configuration data. */
     enum IO_ADDR_CONFIG_DATA = 0xCFCu;
 
-    struct Address
+    /** Maximum number of devices on a bus. */
+    enum MAX_DEVICES_PER_BUS = 32;
+
+    /** Maximum number of functions on a devices. */
+    enum MAX_FUNCTIONS_PER_DEVICE = 8;
+
+    /** XHCI controller device type. */
+    enum XHCI_CONTROLLER = Type(0x0Cu, 0x03u, 0x30u);
+
+    /**
+     * MCFG ACPI table structure.
+     */
+    static struct MCFG
     {
-        /** Bus number (0-255). */
+        /* PCI Segment Group Memory Area Descriptor. */
-        ubyte bus_nr;
+        static struct SGMADesc
+        {
+            uint[2] base_address_a;
+            ushort pci_segment_group_number;
+            ubyte start_pci_bus_number;
+            ubyte end_pci_bus_number;
+            uint _reserved;
 
-        /** Device number (0-31). */
+            public @property ulong base_address() const
-        ubyte device_nr;
+            {
+                return base_address_a[0] | (cast(ulong)base_address_a[1] << 32);
+            }
+        }
+        static assert(SGMADesc.sizeof == 16);
+        static assert(SGMADesc.alignof == 4);
 
-        /** Function number (0-7). */
+        Acpi.Header header;
-        ubyte function_nr;
+        uint[2] _reserved;
+        SGMADesc[0] sgma_descs;
+
+        size_t n_sgma_descs()
+        {
+            return (header.length - MCFG.sgma_descs.offsetof) / MCFG.SGMADesc.sizeof;
+        }
     }
 
-    struct Device
+    /**
+     * PCI device address (bus number, device number, function number).
+     */
+    struct Address
     {
+        uint address;
+        alias address this;
+
+        this(ubyte bus_nr, ubyte device_nr, ubyte function_nr)
+        {
+            this.address = (bus_nr << 16u) | (device_nr << 8u) | function_nr;
+        }
+
+        /**
+         * Bus number (0-255).
+         */
+        public @property ubyte bus_nr() const
+        {
+            return cast(ubyte)(address >> 16u);
+        }
+
+        /**
+         * Device number (0-31).
+         */
+        public @property ubyte device_nr() const
+        {
+            return cast(ubyte)(address >> 8u);
+        }
+
+        /**
+         * Function number (0-7).
+         */
+        public @property ubyte function_nr() const
+        {
+            return cast(ubyte)address;
+        }
+    }
+
+    /**
+     * PCI device type (class ID, subclass ID, interface ID).
+     */
+    struct Type
+    {
+        uint type;
+        alias type this;
+
+        this(ubyte class_id, ubyte subclass_id, ubyte interface_id)
+        {
+            this.type = (class_id << 16u) | (subclass_id << 8u) | interface_id;
+        }
+
+        /**
+         * Class ID.
+         */
+        public @property ubyte class_id() const
+        {
+            return cast(ubyte)(type >> 16u);
+        }
+
+        /**
+         * Subclass ID.
+         */
+        public @property ubyte subclass_id() const
+        {
+            return cast(ubyte)(type >> 8u);
+        }
+
+        /**
+         * Interface ID.
+         */
+        public @property ubyte interface_id() const
+        {
+            return cast(ubyte)type;
+        }
+    }
+
+    /**
+     * PCI device object.
+     */
+    static struct Device
+    {
+        Configuration * config;
         Address address;
-        ushort vendor_id;
+        Type type;
-        ushort device_id;
-        ubyte class_id;
-        ubyte subclass_id;
-        ubyte if_id;
         bool multifunction;
-        ubyte header_type;
         Range[6] memory_ranges;
 
-        void initialize(Address address, ushort vendor_id, ushort device_id)
+        mixin List!Device;
+
+        void initialize(Address address, Configuration * config)
         {
+            list_init();
+            this.config = config;
             this.address = address;
-            this.vendor_id = vendor_id;
+            type = Type(config.class_id, config.subclass_id, config.interface_id);
-            this.device_id = device_id;
-            uint reg2 = read_config_register(address, 2u);
-            class_id = (reg2 >> 24u) & 0xFFu;
-            subclass_id = (reg2 >> 16u) & 0xFFu;
-            if_id = (reg2 >> 8u) & 0xFFu;
             Klog.writefln("Found PCI device %04x:%04x (%02x:%02x:%02x) at %02u:%02u.%u",
-                    vendor_id, device_id,
+                    config.vendor_id, config.device_id,
-                    class_id, subclass_id, if_id,
+                    type.class_id, type.subclass_id, type.interface_id,
                     address.bus_nr, address.device_nr, address.function_nr);
-            uint reg3 = read_config_register(address, 3u);
+            multifunction = (address.function_nr == 0u) && ((config.header_type & 0x80u) != 0u);
-            header_type = (reg3 >> 16u) & 0x7Fu;
+            ubyte header_type = config.header_type & 0x7Fu;
-            multifunction = (address.function_nr == 0u) && ((reg3 & (1u << 23u)) != 0u);
 
             if (header_type == 0u)
             {
                 map_memory_regions();
             }
-
-            spawn_device_instance();
         }
 
         private void map_memory_regions()
@@ -69,10 +174,10 @@ struct Pci
             size_t range_index;
             uint[2] r;
             uint[2] s;
-            for (uint reg_no = 4u; reg_no <= 9u; reg_no++)
+            for (uint bar_idx = 0u; bar_idx < config.header0.base_addresses.length; bar_idx++)
             {
                 /* Read the BAR. */
-                r[0] = read_config_register(address, reg_no);
+                r[0] = config.header0.base_addresses[bar_idx];
                 /* Skip zeroed BARs. */
                 if (r[0] == 0u)
                 {
@@ -90,11 +195,11 @@ struct Pci
                     /* 32-bit region. */
                     r[1] = 0u;
                 }
-                else if ((bar_type == 2u) && (reg_no < 9u))
+                else if ((bar_type == 2u) && (bar_idx < 5u))
                 {
                     /* 64-bit region. */
                     is_64bit = true;
-                    r[1] = read_config_register(address, reg_no + 1);
+                    r[1] = config.header0.base_addresses[bar_idx + 1];
                 }
                 else
                 {
@@ -102,14 +207,14 @@ struct Pci
                 }
 
                 /* Determine the region length. */
-                write_config_register(address, reg_no, 0xFFFF_FFFFu);
+                config.header0.base_addresses[bar_idx] = 0xFFFF_FFFFu;
-                s[0] = read_config_register(address, reg_no);
+                s[0] = config.header0.base_addresses[bar_idx];
-                write_config_register(address, reg_no, r[0]);
+                config.header0.base_addresses[bar_idx] = r[0];
                 if (is_64bit)
                 {
-                    write_config_register(address, reg_no + 1, 0xFFFF_FFFFu);
+                    config.header0.base_addresses[bar_idx + 1] = 0xFFFF_FFFFu;
-                    s[1] = read_config_register(address, reg_no + 1);
+                    s[1] = config.header0.base_addresses[bar_idx + 1];
-                    write_config_register(address, reg_no + 1, r[1]);
+                    config.header0.base_addresses[bar_idx + 1] = r[1];
                 }
                 else
                 {
@@ -118,61 +223,22 @@ struct Pci
                 ulong mm_region_address = (cast(ulong)r[0] & 0xFFFF_FFF0u) | (cast(ulong)r[1] << 32u);
                 ulong length = ~((cast(ulong)s[0] & 0xFFFF_FFF0u) | (cast(ulong)s[1] << 32u)) + 1u;
                 ulong flags = (r[0] & 0x8) != 0u ? PT_WRITE_THROUGH : 0u;
-                Hurl.identity_map_range(mm_region_address, length, flags);
+                Hurl.identity_map_range(mm_region_address, length, PT_WRITABLE | flags);
                 memory_ranges[range_index].address = mm_region_address;
                 memory_ranges[range_index].length = length;
                 range_index++;
                 if (is_64bit)
                 {
-                    reg_no++;
+                    bar_idx++;
                 }
             }
         }
-
-        private void spawn_device_instance()
-        {
-            switch (class_id)
-            {
-            case SerialBusController.ID:
-                switch (subclass_id)
-                {
-                case SerialBusController.USBController.ID:
-                    switch (if_id)
-                    {
-                    case SerialBusController.USBController.XHCIController.ID:
-                        XHCI.build(&this);
-                        break;
-
-                    default:
-                        break;
-                    }
-                    break;
-
-                default:
-                    break;
-                }
-                break;
-
-            default:
-                break;
-            }
-        }
     }
 
-    struct SerialBusController
+    /**
-    {
+     * Device list.
-        enum ID = 0x0Cu;
+     */
-
+    public static __gshared Device * devices;
-        struct USBController
-        {
-            enum ID = 0x03u;
-
-            struct XHCIController
-            {
-                enum ID = 0x30u;
-            }
-        }
-    }
 
     private static uint read_config_register(Address address, uint register_id)
     {
@@ -196,20 +262,164 @@ struct Pci
         out32(IO_ADDR_CONFIG_DATA, value);
     }
 
-    private static void scan(Address address)
+    static struct Configuration
     {
-        ulong reg0 = read_config_register(address, 0u);
+        static struct HeaderType0
-        if (reg0 != 0xFFFFFFFFu)
+        {
+            ushort vendor_id;
+            ushort device_id;
+            ushort command;
+            ushort status;
+            ubyte revision_id;
+            ubyte interface_id;
+            ubyte subclass_id;
+            ubyte class_id;
+            ubyte cache_line_size;
+            ubyte latency_timer;
+            ubyte header_type;
+            ubyte bist;
+
+            uint[6] base_addresses;
+            uint cardbus_cis_pointer;
+            ushort subsystem_vendor_id;
+            ushort subsystem_id;
+            uint expansion_rom_base_address;
+            ubyte capabilities_pointer;
+            ubyte[7] _reserved;
+            ubyte interrupt_line;
+            ubyte interrupt_pin;
+            ubyte min_grant;
+            ubyte max_latency;
+        }
+
+        /**
+         * PCI configuration format for header type 1 (PCI-to-PCI bridge).
+         */
+        static struct HeaderType1
+        {
+            ushort vendor_id;
+            ushort device_id;
+            ushort command;
+            ushort status;
+            ubyte revision_id;
+            ubyte interface_id;
+            ubyte subclass_id;
+            ubyte class_id;
+            ubyte cache_line_size;
+            ubyte latency_timer;
+            ubyte header_type;
+            ubyte bist;
+
+            uint[2] base_addresses;
+            ubyte primary_bus_nr;
+            ubyte secondary_bus_nr;
+            ubyte subordinate_bus_nr;
+            ubyte secondary_latency_timer;
+            ubyte io_base;
+            ubyte io_limit;
+            ushort secondary_status;
+            ushort memory_base;
+            ushort memory_limit;
+            ushort prefetchable_memory_base;
+            ushort prefetchable_memory_limit;
+            uint prefetchable_base_high;
+            uint prefetchable_limit_high;
+            ushort io_base_high;
+            ushort io_limit_high;
+            ubyte capability_pointer;
+            ubyte[3] _reserved;
+            uint expansion_rom_base_address;
+            ubyte interrupt_line;
+            ubyte interrupt_pin;
+            ushort bridge_control;
+        }
+
+        /**
+         * PCI configuration format for header type 2 (PCI-to-CardBus bridge).
+         */
+        static struct HeaderType2
+        {
+            ushort vendor_id;
+            ushort device_id;
+            ushort command;
+            ushort status;
+            ubyte revision_id;
+            ubyte interface_id;
+            ubyte subclass_id;
+            ubyte class_id;
+            ubyte cache_line_size;
+            ubyte latency_timer;
+            ubyte header_type;
+            ubyte bist;
+
+            uint cardbus_base_address;
+            ubyte capability_list_offset;
+            ubyte _reserved;
+            ushort secondary_status;
+            ubyte pci_bus_nr;
+            ubyte cardbus_bus_nr;
+            ubyte subordinate_bus_nr;
+            ubyte cardbus_latency_timer;
+            uint base_address_0;
+            uint memory_limit_0;
+            uint base_address_1;
+            uint memory_limit_1;
+            uint io_base_address_0;
+            uint io_limit_0;
+            uint io_base_address_1;
+            uint io_limit_1;
+            ubyte interrupt_line;
+            ubyte interrupt_pin;
+            ushort bridge_control;
+            ushort subsystem_device_id;
+            ushort subsystem_vendor_id;
+            uint legacy_base_address;
+        }
+
+        union
+        {
+            struct
+            {
+                ushort vendor_id;
+                ushort device_id;
+                ushort command;
+                ushort status;
+                ubyte revision_id;
+                ubyte interface_id;
+                ubyte subclass_id;
+                ubyte class_id;
+                ubyte cache_line_size;
+                ubyte latency_timer;
+                ubyte header_type;
+                ubyte bist;
+            }
+            HeaderType0 header0;
+            HeaderType1 header1;
+            HeaderType2 header2;
+        }
+    }
+
+    private static void scan(ubyte bus_nr, ubyte device_nr, ubyte function_nr, ulong config_address)
+    {
+        Configuration * config = cast(Configuration *)config_address;
+        if (config.vendor_id != 0xFFFFu)
         {
-            ushort vendor_id = reg0 & 0xFFFFu;
-            ushort device_id = (reg0 >> 16u) & 0xFFFFu;
             Device * device = A1.allocate!Device();
-            device.initialize(address, vendor_id, device_id);
+            if (devices == null)
+            {
+                devices = device;
+            }
+            else
+            {
+                device.list_insert_before(devices);
+            }
+            device.initialize(Address(bus_nr, device_nr, function_nr), config);
             if (device.multifunction)
             {
-                for (address.function_nr = 1u; address.function_nr < 8u; address.function_nr++)
+                for (function_nr = 1u; function_nr < MAX_FUNCTIONS_PER_DEVICE; function_nr++)
                 {
-                    scan(address);
+                    config_address += PAGE_SIZE;
+                    scan(bus_nr, device_nr, function_nr, config_address);
                 }
             }
         }
@@ -217,14 +427,26 @@ struct Pci
 
     public static void initialize()
     {
-        Klog.writefln("Scanning PCI devices...");
+        Klog.writefln("\a3Initializing PCI");
-        for (uint bus_nr = 0u; bus_nr < 256u; bus_nr++)
+        MCFG * mcfg = cast(MCFG *)Acpi.get_table("MCFG");
+        size_t n_sgma_descs = mcfg.n_sgma_descs;
+        for (size_t i = 0u; i < n_sgma_descs; i++)
         {
-            for (ubyte device_nr = 0u; device_nr < 32u; device_nr++)
+            MCFG.SGMADesc * sgma_desc = &mcfg.sgma_descs[i];
+            ulong base_address = sgma_desc.base_address;
+            uint start_pci_bus = sgma_desc.start_pci_bus_number;
+            uint end_pci_bus = sgma_desc.end_pci_bus_number;
+            ulong n_buses = (end_pci_bus - start_pci_bus) + 1u;
+            ulong map_length = PAGE_SIZE * MAX_FUNCTIONS_PER_DEVICE * MAX_DEVICES_PER_BUS * n_buses;
+            Hurl.identity_map_range(base_address, map_length, PT_WRITABLE | PT_DISABLE_CACHE | PT_NO_EXECUTE);
+            for (uint bus_nr = start_pci_bus; bus_nr <= end_pci_bus; bus_nr++)
             {
-                scan(Address(cast(ubyte)bus_nr, device_nr, 0u));
+                for (ubyte device_nr = 0u; device_nr < MAX_DEVICES_PER_BUS; device_nr++)
+                {
+                    ulong device_address = base_address + ((bus_nr - start_pci_bus) * (MAX_DEVICES_PER_BUS * MAX_FUNCTIONS_PER_DEVICE) + device_nr * MAX_FUNCTIONS_PER_DEVICE) * PAGE_SIZE;
+                    scan(cast(ubyte)bus_nr, device_nr, 0u, device_address);
+                }
             }
         }
-        Klog.writefln("PCI scan complete.");
     }
 }

src/hulk/pit.d

@@ -5,12 +5,14 @@ module hulk.pit;
 
 import hulk.cpu;
 import hulk.klog;
+import hulk.console;
+import hulk.time;
 
 struct Pit
 {
     /** PIT input frequency in 1/1000 Hz. */
     private enum ulong PIT_FREQUENCY_1000HZ = 1_193_181_667u;
-    private enum ulong TARGET_INTERRUPT_HZ = 100u;
+    private enum ulong TARGET_INTERRUPT_HZ = 1000u;
     private enum ulong TARGET_INTERRUPT_1000HZ = TARGET_INTERRUPT_HZ * 1000u;
     private enum ulong PIT_DIVIDER = (PIT_FREQUENCY_1000HZ + TARGET_INTERRUPT_1000HZ / 2u) / TARGET_INTERRUPT_1000HZ;
 
@@ -30,6 +32,7 @@ struct Pit
 
     public static void initialize()
     {
+        Klog.writefln("\a3Initializing PIT");
         out8(PORT_MC, MC_CH_0 | MC_LO_HI | MC_RATE_GENERATOR | MC_BINARY);
         out8(PORT_CH_0, PIT_DIVIDER & 0xFFu);
         out8(PORT_CH_0, PIT_DIVIDER >> 8u);
@@ -37,6 +40,6 @@ struct Pit
 
     public static void isr()
     {
-        Klog.writefln("PIT ISR");
+        Time.ms_isr();
     }
 }

src/hulk/rtc.d

@@ -5,6 +5,7 @@ module hulk.rtc;
 
 import hulk.cpu;
 import hulk.klog;
+import hulk.console;
 
 struct Rtc
 {
@@ -43,6 +44,8 @@ struct Rtc
 
     public static void initialize()
     {
+        Klog.writefln("\a3Initializing RTC");
+
         /* Enable IRQ 8 to receive RTC interrupts. */
         ubyte sr_b = read_register(REG_SR_B, true);
         write_register(REG_SR_B, sr_b | SR_B_ENABLE_IRQ, true);
@@ -51,13 +54,12 @@ struct Rtc
         rtc_24hour_mode = (sr_b & SR_B_24HOUR) != 0u;
         rtc_binary_mode = (sr_b & SR_B_BINARY) != 0u;
 
-        /* Read the current system time. */
-        time t = read_rtc_time();
-        Klog.writefln("System time is 20%02u-%02u-%02u %02u:%02u:%02u",
-                t.year, t.month, t.day, t.hour, t.minute, t.second);
-
         /* Send EOI to enable more RTC interrupts and re-enable NMIs. */
         eoi();
+
+        time t = Rtc.read_rtc_time();
+        Klog.writefln("System time is 20%02u-%02u-%02u %02u:%02u:%02u",
+                t.year, t.month, t.day, t.hour, t.minute, t.second);
     }
 
     private static ubyte read_register(ubyte register, bool disable_nmi = false)
@@ -81,16 +83,15 @@ struct Rtc
     public static void isr()
     {
         static __gshared ulong count;
-        static __gshared ulong seconds;
         count++;
         if ((count % 1024) == 0u)
         {
-            seconds++;
+            Console.update_header();
         }
         eoi();
     }
 
-    private static time read_rtc_time()
+    public static time read_rtc_time()
     {
         time[2] times;
         size_t reads;

src/hulk/serial.d

@@ -40,9 +40,9 @@ struct Serial
      */
     public static void writef(string s, va_list args)
     {
-        hulk.writef.writef(s, args, function void(ubyte ch) {
+        hulk.writef.writefv(function void(ubyte ch) {
                     Serial.write(ch);
-                });
+                }, s, args);
     }
 
     /**

src/hulk/test.d

@@ -0,0 +1,139 @@
+/**
+ * Kernel tests.
+ */
+module hulk.test;
+
+import hulk.klog;
+import hulk.list;
+import hulk.time;
+import hulk.hurl.a1;
+import core.volatile;
+
+struct Test
+{
+    /**
+     * Run tests.
+     */
+    public static void run()
+    {
+        Klog.writefln("\a3Running kernel tests");
+        test_pit();
+        test_list();
+        Klog.writefln("\a3Kernel tests complete");
+    }
+
+    private static void test_pit()
+    {
+        Klog.writefln("Testing PIT...");
+        /* Check that PIT millisecond interrupt is firing. */
+        size_t uptime = Time.uptime();
+        while (Time.uptime() <= uptime)
+        {
+        }
+    }
+
+    private static void test_list()
+    {
+        Klog.writefln("Testing list...");
+
+        struct S
+        {
+            size_t v;
+            mixin List!S;
+            void initialize()
+            {
+                list_init();
+            }
+        }
+
+        S * s1 = A1.allocate!S();
+        s1.initialize();
+        s1.v = 33;
+        assert_eq(1, s1.list_count);
+        S * s2 = A1.allocate!S();
+        s2.initialize();
+        s2.v = 42;
+        s2.list_insert_after(s1);
+        S * s3 = A1.allocate!S();
+        s3.initialize();
+        s3.v = 55;
+        s3.list_insert_before(s1);
+        size_t count;
+        assert_eq(3, s1.list_count);
+        assert_eq(3, s2.list_count);
+        assert_eq(3, s3.list_count);
+        foreach (entry; *s1)
+        {
+            switch (count)
+            {
+            case 0:
+                assert_eq(33, entry.v);
+                break;
+            case 1:
+                assert_eq(42, entry.v);
+                break;
+            case 2:
+                assert_eq(55, entry.v);
+                break;
+            case 3:
+                assert_eq(0, 1);
+                break;
+            default:
+                break;
+            }
+            count++;
+        }
+        foreach (entry; *s3)
+        {
+            if (entry.v == 33)
+            {
+                entry.list_remove();
+            }
+        }
+        assert_eq(2, s3.list_count);
+        count = 0;
+        foreach (entry; *s3)
+        {
+            switch (count)
+            {
+            case 0:
+                assert_eq(55, entry.v);
+                break;
+            case 1:
+                assert_eq(42, entry.v);
+                break;
+            case 2:
+                assert_eq(0, 1);
+                break;
+            default:
+                break;
+            }
+            count++;
+        }
+        foreach (entry; *s2)
+        {
+            if (entry.v == 42)
+            {
+                entry.list_remove();
+            }
+        }
+        assert_eq(1, s2.list_count);
+        assert_eq(1, s3.list_count);
+    }
+
+    private static void assert_eq(T)(T first, T second, size_t line_number = __LINE__)
+    {
+        if (first != second)
+        {
+            Klog.fatal_error("Assertion failed! %x != %x (line %u)", first, second, line_number);
+        }
+    }
+
+    private static void assert_neq(T)(T first, T second, size_t line_number = __LINE__)
+    {
+        if (first == second)
+        {
+            Klog.fatal_error("Assertion failed! %x == %x (line %u)", first, second, line_number);
+        }
+    }
+}

src/hulk/thread.d

@@ -0,0 +1,143 @@
+/**
+ * Kernel thread functionality.
+ */
+module hulk.thread;
+
+import hulk.hurl.a1;
+import hulk.him;
+import hulk.gdt;
+import hulk.memory;
+import hulk.list;
+import hulk.cpu;
+import hulk.hurl;
+import ldc.llvmasm;
+
+struct Thread
+{
+    /* TODO: currently kernel thread stack size is fixed. */
+    enum STACK_SIZE = 16 * 1024;
+
+    enum ulong INT_TCTRL_YIELD = 0;
+
+    /** Interrupt stack template. */
+    static immutable __gshared ulong[ISF_COUNT] interrupt_stack_template = [
+        0x16161616_16161616u, /* RBP */
+        0x15151515_15151515u, /* R15 */
+        0x14141414_14141414u, /* R14 */
+        0x13131313_13131313u, /* R13 */
+        0x12121212_12121212u, /* R12 */
+        0x11111111_11111111u, /* R11 */
+        0x10101010_10101010u, /* R10 */
+        0x09090909_09090909u, /* R9 */
+        0x08080808_08080808u, /* R8 */
+        0x06060606_06060606u, /* RDI */
+        0x05050505_05050505u, /* RSI */
+        0x04040404_04040404u, /* RDX */
+        0x03030303_03030303u, /* RCX */
+        0x02020202_02020202u, /* RBX */
+        0x01010101_01010101u, /* RAX */
+        0u, /* Error Code */
+        0u, /* RIP */
+        Gdt.SELECTOR_KERNEL_CODE, /* CS */
+        0u, /* RFLAGS */
+        0u, /* RSP */
+        Gdt.SELECTOR_KERNEL_DATA, /* SS */
+    ];
+
+    /** List of all runnable kernel threads. */
+    private static __gshared Thread * runnable_threads;
+
+    /** Currently executing kernel thread. */
+    static __gshared Thread * current_thread;
+
+    /** Current kernel thread stack pointer. */
+    ulong * stack_pointer;
+    static assert(stack_pointer.offsetof == 0);
+
+    /** Base address of kernel thread stack. */
+    void * stack_addr;
+
+    mixin List!Thread;
+
+    /**
+     * Initialize a kernel thread.
+     */
+    public void initialize(void function() fn)
+    {
+        list_init();
+        suspend_interrupts();
+        list_insert_after(current_thread);
+        resume_interrupts();
+        stack_addr = A1.allocate(STACK_SIZE);
+        ulong * stack_top = cast(ulong *)(stack_addr + STACK_SIZE);
+        stack_pointer = stack_top - ISF_COUNT;
+        memcpy64(stack_pointer, &interrupt_stack_template[0], ISF_COUNT);
+        stack_pointer[ISF_RIP] = cast(ulong)fn;
+        stack_pointer[ISF_RFLAGS] = read_rflags();
+        stack_pointer[ISF_RSP] = cast(ulong)stack_top;
+    }
+
+    /**
+     * Initialize first kernel thread.
+     */
+    public void initialize_first_thread()
+    {
+        list_init();
+        runnable_threads = &this;
+        stack_addr = cast(void *)(Hurl.HULK_STACK_TOP - STACK_SIZE);
+    }
+
+    /**
+     * Initialize kernel threading.
+     */
+    public static void initialize()
+    {
+        Thread * thread = A1.allocate!Thread();
+        thread.initialize_first_thread();
+        current_thread = thread;
+    }
+
+    /**
+     * Create and start a kernel thread.
+     *
+     * TODO: fn must not return.
+     * TODO: threads are always runnable.
+     * TODO: threads cannot be destroyed.
+     */
+    public static Thread * start(void function() fn)
+    {
+        Thread * thread = A1.allocate!Thread();
+        thread.initialize(fn);
+        swint(INT_TCTRL_YIELD);
+        return thread;
+    }
+
+    /**
+     * Trigger a thread management software interrupt.
+     */
+    public static void swint(T1)(T1 v1)
+    {
+        mixin(`__asm("int $$`, cast(int)INT_KERNEL_SWINT, `", "{rax}", v1);`);
+    }
+
+    /**
+     * Handle a thread management software interrupt.
+     *
+     * This function is called in interrupt context.
+     *
+     * @param stack_frame
+     *   Pointer to the stack frame.
+     */
+    public static void handle_swint(ulong * stack_frame)
+    {
+        switch (stack_frame[ISF_RAX])
+        {
+        case INT_TCTRL_YIELD:
+            Thread.current_thread = Thread.current_thread.list_next;
+            break;
+
+        default:
+            break;
+        }
+    }
+}

src/hulk/time.d

@@ -0,0 +1,42 @@
+/**
+ * Time functionality.
+ */
+module hulk.time;
+
+import hulk.volatile;
+
+struct Time
+{
+    /** System uptime (ms). */
+    private static __gshared Volatile!ulong s_uptime;
+
+    /**
+     * Millisecond ISR.
+     */
+    public static void ms_isr()
+    {
+        s_uptime++;
+    }
+
+    /**
+     * Get system uptime (ms).
+     */
+    public static @property ulong uptime()
+    {
+        return s_uptime;
+    }
+
+    /**
+     * Sleep for the given amount of time (ms).
+     *
+     * @param count
+     *   Number of milliseconds to sleep for.
+     */
+    public static void msleep(ulong count)
+    {
+        ulong wait_for = uptime() + count + 1;
+        while (uptime() < wait_for)
+        {
+        }
+    }
+}

src/hulk/usb/package.d

@@ -0,0 +1,3 @@
+module hulk.usb;
+
+public import hulk.usb.usb;

src/hulk/usb/usb.d

@@ -0,0 +1,24 @@
+/**
+ * USB (Universal Serial Bus) functionality.
+ */
+module hulk.usb.usb;
+
+import hulk.klog;
+import hulk.usb.xhci;
+import hulk.pci;
+
+struct Usb
+{
+    public static void initialize()
+    {
+        Klog.writefln("\a3Initializing USB");
+
+        foreach (pci_device; *Pci.devices)
+        {
+            if (pci_device.type == Pci.XHCI_CONTROLLER)
+            {
+                XHCI.build(pci_device);
+            }
+        }
+    }
+}

src/hulk/usb/xhci.d

@@ -9,69 +9,344 @@
 module hulk.usb.xhci;
 
 import hulk.pci;
+import hulk.hurl;
 import hulk.hurl.a1;
+import hulk.hippo;
 import hulk.klog;
+import hulk.time;
+import hulk.volatile;
 
 struct XHCI
 {
     /**
      * Located at PCI base address.
+     *
+     * All are read-only.
      */
     struct CapabilityRegisters
     {
-        ubyte capability_length;
+        /**
+         * Offset from beginning of capability registers to beginning of
+         * operational registers.
+         */
+        Volatile!ubyte capability_length;
+
         ubyte _reserved01;
-        ushort hci_version;
+
-        uint[3] hcs_params;
+        /**
-        uint hcc_params1;
+         * Interface version number supported (psuedo-BSD).
-        uint doorbell_offset;
+         */
-        uint rts_offset;
+        Volatile!ushort hci_version;
-        uint hcc_params2;
+
+        /**
+         * HCSPARAMS1.
+         * 7:0 number of device slots (MaxSlots)
+         * 18:8 number of interrupters (MaxIntrs)
+         * 23:19 reserved
+         * 31:24 number of ports (MaxPorts)
+         */
+        Volatile!uint hcs_params1;
+
+        @property ubyte max_slots()
+        {
+            return this.hcs_params1 & 0xFFu;
+        }
+
+        /**
+         * 3:0 isochronous scheduling threshold (IST)
+         * 7:4 event ring segment table max (ERST Max)
+         * 20:8 reserved
+         * 25:21 max scratchpad buffers (high 5 bits; xHCI v1.1+)
+         * 26 scratchpad restore (SPR)
+         * 31:27 max scratchpad buffers (low 5 bits)
+         */
+        Volatile!uint hcs_params2;
+
+        @property size_t max_scratchpad_buffers()
+        {
+            uint v = this.hcs_params2;
+            return (v >> 27u) | ((v >> (21 - 5)) & 0x3E0u);
+        }
+
+        /**
+         * 7:0 U1 device exit latency
+         * 15:8 reserved
+         * 31:16 U2 device exit latency
+         */
+        Volatile!uint hcs_params3;
+
+        /**
+         * 0 64-bit addressing capability (AC64)
+         * 1 BW negotiation capability (BNC)
+         * 2 context size (CSZ)
+         * 3 port power control (PPC)
+         * 4 port indicators (PIND)
+         * 5 light HC reset capability (LHRC)
+         * 6 latency tolerance messaging capability (LTC)
+         * 7 no secondary SID support (NSS)
+         * 8 parse all event data (PAE; xHCI v1.1+)
+         * 9 stopped - short packet capability (SPC; xHCI v1.1+)
+         * 10 stopped EDTLA capability (SEC; xHCI v1.1+)
+         * 11 continuous frame ID capability (CFC; xHCI v1.1+)
+         * 15:12 maximum primary stream array size (MaxPSASize)
+         * 31:16 xHCI extended capabilities pointer (xECP)
+         *   offset in 32-bit words from base of capability registers to base
+         *   of capabilities list
+         */
+        Volatile!uint hcc_params1;
+
+        /**
+         * 1:0 reserved
+         * 31:2 doorbell array offset in 32-bit words
+         *   offset in 32-bit words from base of capability registers to the
+         *   doorbell array
+         */
+        Volatile!uint doorbell_offset;
+
+        /**
+         * 4:0 reserved
+         * 31:5 runtime register space offset
+         */
+        Volatile!uint rts_offset;
+
+        /**
+         * 0 U3 entry capability (U3C)
+         * 1 ConfigEP command max exit latency too large (CMC)
+         * 2 force save context capability (FSC)
+         * 3 compliance transition capability (CTC)
+         * 4 large ESIT payload capability (LEC)
+         * 5 configuration information capability (CIC)
+         * 6 extended TBC capability (ETC)
+         * 7 extended TBC TRB status capability (ETC_TSC)
+         * 8 get/set extended property capability (GSC; xHCI v1.1+)
+         * 9 virtualization based trusted I/O capability (VTC; xHCI v1.2+)
+         * 31:10 reserved
+         */
+        Volatile!uint hcc_params2;
+
+        /**
+         * 11:0 reserved
+         * 31:12 VTIO register space offset (xHCI v1.2+)
+         */
+        Volatile!uint vtios_offset;
     }
-    static assert(CapabilityRegisters.sizeof == 0x20u);
+    static assert(CapabilityRegisters.sizeof == 0x24u);
 
     /**
      * Located at offset capability_length from PCI base address.
      */
     struct OperationalRegisters
     {
-        uint usb_command;
+        /**
-        uint usb_status;
+         * 0 run/stop (RS)
-        uint page_size;
+         * 1 host controller reset (HCRST)
+         * 2 interrupter enable (INTE)
+         * 3 host system error enable (HSEE)
+         * 6:4 reserved
+         * 7 light host controller reset (LHCRST)
+         * 8 controller save state (CSS)
+         * 9 controller restore state (CRS)
+         * 10 enable wrap event (EWE)
+         * 11 enable U3 MFINDEX stop (UE3S)
+         * 12 stopped short packet enable (SPE; xHCI v1.1+)
+         * 13 CEM enable (CME; xHCI v1.1+)
+         * 14 extended TBC enable (ETE; xHCI v1.2+)
+         * 15 extended TBC TRB status enable (TSC_EN; xHCI v1.2+)
+         * 16 VTIO enable (VTIOE; xHCI v1.2+)
+         * 31:17 reserved
+         */
+        Volatile!uint usb_command;
+
+        /**
+         * 0 HCHalted
+         * 1 reserved
+         * 2 Host System Error (HSE)
+         * 3 Event Interrupt (EINT)
+         * 4 Port Change Detected (PCD)
+         * 7:5 reserved
+         * 8 Save State Status (SSS)
+         * 9 Restore State Status (RSS)
+         * 10 Save/Restore Error (SRE)
+         * 11 Controller Not Ready (CNR)
+         * 12 Host Controller Error (HCE)
+         * 31:13 reserved
+         */
+        Volatile!uint usb_status;
+
+        /**
+         * 15:0 Page Size (actual page size is 2^(x+12))
+         * 31:16 reserved
+         */
+        Volatile!uint page_size;
+
         uint[2] _reserved01;
-        uint dn_ctrl;
+
-        ulong cr_ctrl;
+        /**
+         * 15:0 Notification Enable
+         * 31:16 reserved
+         */
+        Volatile!uint dn_ctrl;
+
+        /**
+         * 0 Ring Cycle State (RCS)
+         * 1 Command Stop (CS)
+         * 2 Command Abort (CA)
+         * 3 Command Ring Running (CRR)
+         * 5:4 reserved
+         * 63:6 Command Ring Pointer
+         */
+        Volatile!ulong cr_ctrl;
+
         uint[4] _reserved02;
-        ulong dcbaap;
+
-        uint config;
+        /**
+         * 5:0 reserved
+         * 63:6 Device Context Base Address Array Pointer
+         */
+        Volatile!ulong dcbaap;
+
+        /**
+         * 7:0 Max Device Slots Enabled (MaxSlotsEn)
+         * 8 U3 Entry Enable (U3E; xHCI v1.1+)
+         * 9 Configuration Information Enable (CIE; xHCI v1.1+)
+         * 31:10 reserved
+         */
+        Volatile!uint config;
+
         uint _reserved03;
     }
     static assert(OperationalRegisters.sizeof == 0x40u);
 
     /**
      * Located at offset 0x400 from start of Operational Registers.
+     *
+     * There is one set of these registers for each port of the root hub.
      */
     struct PortRegisters
     {
-        uint portsc;
+        /**
-        uint portpmsc;
+         * Port Status and Control
-        uint portli;
+         *
-        uint porthlpmc;
+         * 0 Current Connect Status
+         * 1 Port Enabled/Disabled
+         * 2 reserved
+         * 3 Over-current active
+         * 4 Port Reset
+         * 8:5 Port Link State
+         * 9 Port Power
+         * 13:10 Port Speed
+         * 15:14 Port Indicator Control
+         * 16 Port Link State Write Strobe
+         * 17 Connect Status Change
+         * 18 Port Enable/Disable Change
+         * 19 Warm Port Reset Change
+         * 20 Over-current Change
+         * 21 Port Reset Change
+         * 22 Port Link State Change
+         * 23 Port Config Error Change
+         * 24 Cold Attach Status
+         * 25 Wake on Connect Enable
+         * 26 Wake on Disconnect Enable
+         * 27 Wake on Over-current Enable
+         * 29:28 reserved
+         * 30 Device Removable
+         * 31 Warm Port Reset
+         */
+        Volatile!uint portsc;
+
+        /**
+         * Port Power Management Status and Control
+         */
+        Volatile!uint portpmsc;
+
+        /**
+         * Port Link Info
+         */
+        Volatile!uint portli;
+
+        /**
+         * Port Hardware LPM Control (xHCI v1.1+)
+         */
+        Volatile!uint porthlpmc;
     }
     static assert(PortRegisters.sizeof == 0x10u);
 
+    /**
+     * Located at offset rts_offset from PCI base address.
+     */
     struct RuntimeRegisters
     {
-        uint mfindex;
+        /**
+         * Microframe index. Incremented by controller each microframe.
+         */
+        Volatile!uint mfindex;
+
         uint[7] _reserved01;
-        uint ir;
+
+        /**
+         * Interrupter register sets.
+         */
+        InterrupterRegister[0] ir;
     }
 
+    /**
+     * Interrupter register set.
+     *
+     * A copy of this register set is present for each interrupter.
+     */
+    struct InterrupterRegister
+    {
+        /**
+         * Interrupter Management Register.
+         * 0 Interrupt Pending (IP)
+         * 1 Interrupt Enable
+         * 31:2 reserved
+         */
+        Volatile!uint imr;
+
+        /**
+         * Interrupter Moderation.
+         * 15:0 Interrupt Moderation Interval
+         * 31:16 Interrupt Moderation Counter
+         */
+        Volatile!uint im;
+
+        /**
+         * Event Ring Segment Table Size.
+         * 15:0 Event Ring Segment Table Size
+         * 31:16 reserved
+         */
+        Volatile!uint ersts;
+
+        uint reserved;
+
+        /**
+         * Event Ring Segment Table Base Address.
+         * 5:0 reserved
+         * 63:6 Event Ring Segment Table Base Address
+         */
+        Volatile!ulong erstba;
+
+        /**
+         * Event Ring Dequeue Pointer.
+         * 2:0 Dequeue ERST Segment Index
+         * 3 Event Handler Busy
+         * 63:4 Event Ring Dequeue Pointer
+         */
+        Volatile!ulong erdp;
+    }
+
+    /**
+     * Located at offset doorbell_offset from PCI base address.
+     *
+     * The number of these is given by HCSPARAMS1.MaxSlots + 1 (for the command
+     * ring).
+     */
     struct DoorbellRegister
     {
-        ubyte target;
+        Volatile!ubyte target;
         ubyte _reserved01;
-        ushort task_id;
+        Volatile!ushort task_id;
     }
     static assert(DoorbellRegister.sizeof == 4u);
 
@@ -87,10 +362,166 @@ struct XHCI
         Klog.writefln("Found XHCI controller at address %p", base_address);
         m_capability_registers = cast(CapabilityRegisters *)base_address;
         m_operational_registers = cast(OperationalRegisters *)(base_address + m_capability_registers.capability_length);
-        /* TODO: confirm if 0x400 offset is from m_operation_registers or base_address. */
         m_port_registers = cast(PortRegisters *)(cast(void *)m_operational_registers + 0x400);
         m_runtime_registers = cast(RuntimeRegisters *)(base_address + m_capability_registers.rts_offset);
         m_doorbell_registers = cast(DoorbellRegister *)(base_address + m_capability_registers.doorbell_offset);
+        dump_extended_capabilities();
+        if (!reset())
+        {
+            Klog.writefln("XHCI controller failed to initialize");
+            return;
+        }
+
+        /* Allocate memory for various controller data structures. */
+        ubyte * page = cast(ubyte *)Hippo.allocate_page();
+        /* Device Context Index: 2K */
+        void ** device_context_index = cast(void **)page;
+        /* Input Control Context: 64 bytes */
+        void * input_control_context = &page[2048];
+        /* Slot Context: 64 bytes */
+        void * slot_context = &page[2048 + 64];
+        /* Endpoint Context: 64 bytes */
+        void * endpoint_context = &page[2048 + 64 + 64];
+        /* Stream Context: 16 bytes */
+        void * stream_context = &page[2048 + 64 + 64 + 64];
+        /* Stream Array (Linear): 1M */
+        void * stream_array_linear = Hippo.allocate_aligned_region(1024 * 1024, PAGE_SIZE);
+        /* Stream Array (Pri/Sec): 4K */
+        void * stream_array_pri_sec = Hippo.allocate_page();
+        /* Transfer Ring Segments: 64K */
+        void * transfer_ring_segments = Hippo.allocate_aligned_region(64 * 1024, 64 * 1024);
+        /* Command Ring Segments: 64K */
+        void * command_ring_segments = Hippo.allocate_aligned_region(64 * 1024, 64 * 1024);
+        /* Event Ring Segments: 64K */
+        void * event_ring_segments = Hippo.allocate_aligned_region(64 * 1024, 64 * 1024);
+        /* Event Ring Segment Table: 512K */
+        void * event_ring_segment_table = Hippo.allocate_aligned_region(512 * 1024, PAGE_SIZE);
+        /* Scratchpad Buffer Array: 248 bytes */
+        void ** scratchpad_buffer_array = cast(void **)Hippo.allocate_aligned_region(2 * PAGE_SIZE, PAGE_SIZE);
+
+        size_t n_scratchpad_buffers = m_capability_registers.max_scratchpad_buffers;
+        for (size_t i = 0u; i < n_scratchpad_buffers; i++)
+        {
+            void * scratchpad_buffer = Hippo.allocate_page();
+            scratchpad_buffer_array[i] = scratchpad_buffer;
+        }
+
+        device_context_index[0] = scratchpad_buffer_array;
+
+        size_t max_slots = m_capability_registers.max_slots;
+        for (size_t i = 0u; i < max_slots; i++)
+        {
+            void * addr;
+            if ((i & 1) == 0)
+            {
+                page = cast(ubyte *)Hippo.allocate_page();
+                addr = page;
+            }
+            else
+            {
+                addr = &page[2048];
+            }
+            device_context_index[1 + i] = addr;
+        }
+
+        m_operational_registers.dcbaap = cast(ulong)device_context_index;
+        /* TODO: write cr_ctrl. */
+        /+ TODO:
+        m_operational_registers.config = m_capability_registers.hcs_params1 & 0xFu;
+        m_operational_registers.dn_ctrl = 1u << 1u;
+        +/
+        /* TODO: set up interrupt register set. */
+        Klog.writefln("XHCI controller initialization successful");
+    }
+
+    private void dump_extended_capabilities()
+    {
+        size_t ext_cap_off = (m_capability_registers.hcc_params1 >> 16u);
+        if (ext_cap_off != 0u)
+        {
+            Klog.writefln("Extended capabilities:");
+            uint * extended_capabilities = cast(uint *)m_capability_registers + ext_cap_off;
+            for (;;)
+            {
+                uint ec0 = extended_capabilities[0];
+                size_t next_offset = (ec0 >> 8u) & 0xFFu;
+                size_t len = next_offset;
+                if (len < 1u)
+                {
+                    len = 1u;
+                }
+                ubyte type = ec0 & 0xFFu;
+                if (type == 2u)
+                {
+                    len = 4u;
+                }
+                for (size_t i = 0u; i < len; i++)
+                {
+                    uint ecv = extended_capabilities[i];
+                    Klog.writef(" %02X %02X %02X %02X",
+                            ecv & 0xFFu,
+                            (ecv >> 8u) & 0xFFu,
+                            (ecv >> 16u) & 0xFFu,
+                            (ecv >> 24u) & 0xFFu);
+                }
+                Klog.writef("\n");
+                if (next_offset == 0u)
+                {
+                    break;
+                }
+                extended_capabilities += next_offset;
+            }
+        }
+    }
+
+    private bool reset()
+    {
+        /* Clear run/stop bit. */
+        m_operational_registers.usb_command &= ~0x1u;
+
+        /* Wait for HCHalted bit to be set. */
+        enum halt_timeout = 40u;
+        for (size_t halt_timeout_counter = 0u;;)
+        {
+            Time.msleep(1u);
+
+            if ((m_operational_registers.usb_status & 1u) != 0u)
+            {
+                break;
+            }
+
+            halt_timeout_counter++;
+            if (halt_timeout_counter >= halt_timeout)
+            {
+                Klog.writefln("XHCI controller failed to halt");
+                return false;
+            }
+        }
+
+        /* Set HC reset bit. */
+        m_operational_registers.usb_command |= (1u << 1u);
+
+        /* Wait for controller to be ready. */
+        enum reset_timeout = 100u;
+        for (size_t reset_timeout_counter = 0u;;)
+        {
+            Time.msleep(1u);
+
+            if (((m_operational_registers.usb_command & (1u << 1u)) == 0u) &&
+                ((m_operational_registers.usb_status & (1u << 11u)) == 0u))
+            {
+                break;
+            }
+
+            reset_timeout_counter++;
+            if (reset_timeout_counter >= reset_timeout)
+            {
+                Klog.writefln("XHCI controller failed to reset");
+                return false;
+            }
+        }
+
+        return true;
     }
 
     static void build(Pci.Device * pci_device)

src/hulk/ver.d

@@ -0,0 +1,3 @@
+module hulk.ver;
+
+enum VERSION = "0.18.0";

src/hulk/volatile.d

@@ -0,0 +1,35 @@
+module hulk.volatile;
+
+import core.volatile;
+
+struct Volatile(T)
+{
+    private T value;
+
+    public @property T read()
+    {
+        return volatileLoad(&value);
+    }
+    alias read this;
+
+    public void opAssign(T value)
+    {
+        volatileStore(&this.value, value);
+    }
+
+    public T opUnary(string s)()
+    {
+        T v = read();
+        mixin(s ~ "v;");
+        volatileStore(&this.value, v);
+        return v;
+    }
+
+    public T opOpAssign(string s)(T rhs)
+    {
+        T v = read();
+        mixin("v " ~ s ~ "= rhs;");
+        volatileStore(&this.value, v);
+        return v;
+    }
+}

src/hulk/writef.d

@@ -10,13 +10,13 @@ alias ch_out_fn = void function(ubyte);
 /**
  * Format a string and write characters to the given output function.
  *
+ * @param ch_out Character output function.
  * @param s Format string.
  * @param args Variable arguments structure.
- * @param ch_out Character output function.
  *
  * @return Number of characters written.
  */
-size_t writef(string s, va_list args, ch_out_fn ch_out)
+size_t writefv(ch_out_fn ch_out, string s, va_list args)
 {
     size_t length_written;
     bool escape = false;
@@ -90,6 +90,23 @@ size_t writef(string s, va_list args, ch_out_fn ch_out)
     return length_written;
 }
 
+/**
+ * Format a string and write characters to the given output function.
+ *
+ * @param ch_out Character output function.
+ * @param s Format string.
+ *
+ * @return Number of characters written.
+ */
+extern(C) size_t writef(ch_out_fn ch_out, string s, ...)
+{
+    va_list args;
+    va_start(args, s);
+    size_t rv = writefv(ch_out, s, args);
+    va_end(args);
+    return rv;
+}
+
 /**
  * Format a value in hexadecimal to the given output function.
  *

x86_64-elf-gcc.rb

@@ -1,8 +1,8 @@
 project_name "x86_64-elf-gcc"
-binutils_version = "2.35"
+binutils_version = "2.41"
-binutils_checksum = "1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85"
+binutils_checksum = "ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450"
-gcc_version = "10.2.0"
+gcc_version = "13.2.0"
-gcc_checksum = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c"
+gcc_checksum = "e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da"
 install_path = File.expand_path("x86_64-elf-gcc")
 target = "x86_64-elf"
 path_prepend "#{install_path}/bin"