diff --git a/arch/x86_64/asm/cgo_stubs.s b/src/arch/x86_64/asm/cgo_stubs.s similarity index 100% rename from arch/x86_64/asm/cgo_stubs.s rename to src/arch/x86_64/asm/cgo_stubs.s diff --git a/arch/x86_64/asm/constants.inc b/src/arch/x86_64/asm/constants.inc similarity index 100% rename from arch/x86_64/asm/constants.inc rename to src/arch/x86_64/asm/constants.inc diff --git a/arch/x86_64/asm/data.s b/src/arch/x86_64/asm/data.s similarity index 100% rename from arch/x86_64/asm/data.s rename to src/arch/x86_64/asm/data.s diff --git a/arch/x86_64/asm/multiboot_header.s b/src/arch/x86_64/asm/multiboot_header.s similarity index 100% rename from arch/x86_64/asm/multiboot_header.s rename to src/arch/x86_64/asm/multiboot_header.s diff --git a/arch/x86_64/asm/rt0_32.s b/src/arch/x86_64/asm/rt0_32.s similarity index 100% rename from arch/x86_64/asm/rt0_32.s rename to src/arch/x86_64/asm/rt0_32.s diff --git a/arch/x86_64/asm/rt0_64.s b/src/arch/x86_64/asm/rt0_64.s similarity index 100% rename from arch/x86_64/asm/rt0_64.s rename to src/arch/x86_64/asm/rt0_64.s diff --git a/arch/x86_64/script/grub.cfg b/src/arch/x86_64/script/grub.cfg similarity index 100% rename from arch/x86_64/script/grub.cfg rename to src/arch/x86_64/script/grub.cfg diff --git a/arch/x86_64/script/linker.ld.in b/src/arch/x86_64/script/linker.ld.in similarity index 100% rename from arch/x86_64/script/linker.ld.in rename to src/arch/x86_64/script/linker.ld.in diff --git a/kernel/cpu/cpu_amd64.go b/src/gopheros/kernel/cpu/cpu_amd64.go similarity index 100% rename from kernel/cpu/cpu_amd64.go rename to src/gopheros/kernel/cpu/cpu_amd64.go diff --git a/kernel/cpu/cpu_amd64.s b/src/gopheros/kernel/cpu/cpu_amd64.s similarity index 100% rename from kernel/cpu/cpu_amd64.s rename to src/gopheros/kernel/cpu/cpu_amd64.s diff --git a/kernel/driver/tty/tty.go b/src/gopheros/kernel/driver/tty/tty.go similarity index 100% rename from kernel/driver/tty/tty.go rename to src/gopheros/kernel/driver/tty/tty.go diff --git a/kernel/driver/tty/vt.go b/src/gopheros/kernel/driver/tty/vt.go similarity index 97% rename from kernel/driver/tty/vt.go rename to src/gopheros/kernel/driver/tty/vt.go index edccb8e..f18cef2 100644 --- a/kernel/driver/tty/vt.go +++ b/src/gopheros/kernel/driver/tty/vt.go @@ -1,6 +1,6 @@ package tty -import "github.com/achilleasa/gopher-os/kernel/driver/video/console" +import "gopheros/kernel/driver/video/console" const ( defaultFg = console.LightGrey diff --git a/kernel/driver/tty/vt_test.go b/src/gopheros/kernel/driver/tty/vt_test.go similarity index 96% rename from kernel/driver/tty/vt_test.go rename to src/gopheros/kernel/driver/tty/vt_test.go index 844a81f..4648266 100644 --- a/kernel/driver/tty/vt_test.go +++ b/src/gopheros/kernel/driver/tty/vt_test.go @@ -1,10 +1,9 @@ package tty import ( + "gopheros/kernel/driver/video/console" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel/driver/video/console" ) func TestVtPosition(t *testing.T) { diff --git a/kernel/driver/video/console/console.go b/src/gopheros/kernel/driver/video/console/console.go similarity index 100% rename from kernel/driver/video/console/console.go rename to src/gopheros/kernel/driver/video/console/console.go diff --git a/kernel/driver/video/console/ega.go b/src/gopheros/kernel/driver/video/console/ega.go similarity index 100% rename from kernel/driver/video/console/ega.go rename to src/gopheros/kernel/driver/video/console/ega.go diff --git a/kernel/driver/video/console/ega_test.go b/src/gopheros/kernel/driver/video/console/ega_test.go similarity index 100% rename from kernel/driver/video/console/ega_test.go rename to src/gopheros/kernel/driver/video/console/ega_test.go diff --git a/kernel/error.go b/src/gopheros/kernel/error.go similarity index 100% rename from kernel/error.go rename to src/gopheros/kernel/error.go diff --git a/kernel/error_test.go b/src/gopheros/kernel/error_test.go similarity index 100% rename from kernel/error_test.go rename to src/gopheros/kernel/error_test.go diff --git a/kernel/goruntime/bootstrap.go b/src/gopheros/kernel/goruntime/bootstrap.go similarity index 96% rename from kernel/goruntime/bootstrap.go rename to src/gopheros/kernel/goruntime/bootstrap.go index ba8c693..e43e279 100644 --- a/kernel/goruntime/bootstrap.go +++ b/src/gopheros/kernel/goruntime/bootstrap.go @@ -3,12 +3,11 @@ package goruntime import ( + "gopheros/kernel" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm/allocator" + "gopheros/kernel/mem/vmm" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm/allocator" - "github.com/achilleasa/gopher-os/kernel/mem/vmm" ) var ( diff --git a/kernel/goruntime/bootstrap.s b/src/gopheros/kernel/goruntime/bootstrap.s similarity index 100% rename from kernel/goruntime/bootstrap.s rename to src/gopheros/kernel/goruntime/bootstrap.s diff --git a/kernel/goruntime/bootstrap_test.go b/src/gopheros/kernel/goruntime/bootstrap_test.go similarity index 96% rename from kernel/goruntime/bootstrap_test.go rename to src/gopheros/kernel/goruntime/bootstrap_test.go index 22a0f19..298c5d0 100644 --- a/kernel/goruntime/bootstrap_test.go +++ b/src/gopheros/kernel/goruntime/bootstrap_test.go @@ -1,15 +1,14 @@ package goruntime import ( + "gopheros/kernel" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" + "gopheros/kernel/mem/pmm/allocator" + "gopheros/kernel/mem/vmm" "reflect" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" - "github.com/achilleasa/gopher-os/kernel/mem/pmm/allocator" - "github.com/achilleasa/gopher-os/kernel/mem/vmm" ) func TestSysReserve(t *testing.T) { diff --git a/kernel/hal/hal.go b/src/gopheros/kernel/hal/hal.go similarity index 72% rename from kernel/hal/hal.go rename to src/gopheros/kernel/hal/hal.go index 0b211f9..36ea7e0 100644 --- a/kernel/hal/hal.go +++ b/src/gopheros/kernel/hal/hal.go @@ -1,9 +1,9 @@ package hal import ( - "github.com/achilleasa/gopher-os/kernel/driver/tty" - "github.com/achilleasa/gopher-os/kernel/driver/video/console" - "github.com/achilleasa/gopher-os/kernel/hal/multiboot" + "gopheros/kernel/driver/tty" + "gopheros/kernel/driver/video/console" + "gopheros/kernel/hal/multiboot" ) var ( diff --git a/kernel/hal/multiboot/multiboot.go b/src/gopheros/kernel/hal/multiboot/multiboot.go similarity index 100% rename from kernel/hal/multiboot/multiboot.go rename to src/gopheros/kernel/hal/multiboot/multiboot.go diff --git a/kernel/hal/multiboot/multiboot_test.go b/src/gopheros/kernel/hal/multiboot/multiboot_test.go similarity index 100% rename from kernel/hal/multiboot/multiboot_test.go rename to src/gopheros/kernel/hal/multiboot/multiboot_test.go diff --git a/kernel/irq/handler_amd64.go b/src/gopheros/kernel/irq/handler_amd64.go similarity index 100% rename from kernel/irq/handler_amd64.go rename to src/gopheros/kernel/irq/handler_amd64.go diff --git a/kernel/irq/handler_amd64.s b/src/gopheros/kernel/irq/handler_amd64.s similarity index 100% rename from kernel/irq/handler_amd64.s rename to src/gopheros/kernel/irq/handler_amd64.s diff --git a/kernel/irq/interrupt_amd64.go b/src/gopheros/kernel/irq/interrupt_amd64.go similarity index 95% rename from kernel/irq/interrupt_amd64.go rename to src/gopheros/kernel/irq/interrupt_amd64.go index dcab9ef..6525d3e 100644 --- a/kernel/irq/interrupt_amd64.go +++ b/src/gopheros/kernel/irq/interrupt_amd64.go @@ -1,6 +1,6 @@ package irq -import "github.com/achilleasa/gopher-os/kernel/kfmt/early" +import "gopheros/kernel/kfmt/early" // Regs contains a snapshot of the register values when an interrupt occurred. type Regs struct { diff --git a/kernel/irq/interrupt_amd64_test.go b/src/gopheros/kernel/irq/interrupt_amd64_test.go similarity index 93% rename from kernel/irq/interrupt_amd64_test.go rename to src/gopheros/kernel/irq/interrupt_amd64_test.go index 3c2d22a..750482b 100644 --- a/kernel/irq/interrupt_amd64_test.go +++ b/src/gopheros/kernel/irq/interrupt_amd64_test.go @@ -2,11 +2,10 @@ package irq import ( "bytes" + "gopheros/kernel/driver/video/console" + "gopheros/kernel/hal" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel/driver/video/console" - "github.com/achilleasa/gopher-os/kernel/hal" ) func TestRegsPrint(t *testing.T) { diff --git a/kernel/kfmt/early/early_fmt.go b/src/gopheros/kernel/kfmt/early/early_fmt.go similarity index 99% rename from kernel/kfmt/early/early_fmt.go rename to src/gopheros/kernel/kfmt/early/early_fmt.go index b24cbfe..224152c 100644 --- a/kernel/kfmt/early/early_fmt.go +++ b/src/gopheros/kernel/kfmt/early/early_fmt.go @@ -1,6 +1,6 @@ package early -import "github.com/achilleasa/gopher-os/kernel/hal" +import "gopheros/kernel/hal" var ( errMissingArg = []byte("(MISSING)") diff --git a/kernel/kfmt/early/early_fmt_test.go b/src/gopheros/kernel/kfmt/early/early_fmt_test.go similarity index 95% rename from kernel/kfmt/early/early_fmt_test.go rename to src/gopheros/kernel/kfmt/early/early_fmt_test.go index 4a004df..32440a6 100644 --- a/kernel/kfmt/early/early_fmt_test.go +++ b/src/gopheros/kernel/kfmt/early/early_fmt_test.go @@ -2,12 +2,11 @@ package early import ( "bytes" + "gopheros/kernel/driver/tty" + "gopheros/kernel/driver/video/console" + "gopheros/kernel/hal" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel/driver/tty" - "github.com/achilleasa/gopher-os/kernel/driver/video/console" - "github.com/achilleasa/gopher-os/kernel/hal" ) func TestPrintf(t *testing.T) { diff --git a/kernel/kmain/kmain.go b/src/gopheros/kernel/kmain/kmain.go similarity index 79% rename from kernel/kmain/kmain.go rename to src/gopheros/kernel/kmain/kmain.go index 631d67e..c39861e 100644 --- a/kernel/kmain/kmain.go +++ b/src/gopheros/kernel/kmain/kmain.go @@ -1,12 +1,12 @@ package kmain import ( - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/goruntime" - "github.com/achilleasa/gopher-os/kernel/hal" - "github.com/achilleasa/gopher-os/kernel/hal/multiboot" - "github.com/achilleasa/gopher-os/kernel/mem/pmm/allocator" - "github.com/achilleasa/gopher-os/kernel/mem/vmm" + "gopheros/kernel" + "gopheros/kernel/goruntime" + "gopheros/kernel/hal" + "gopheros/kernel/hal/multiboot" + "gopheros/kernel/mem/pmm/allocator" + "gopheros/kernel/mem/vmm" ) var ( diff --git a/kernel/mem/constants_amd64.go b/src/gopheros/kernel/mem/constants_amd64.go similarity index 100% rename from kernel/mem/constants_amd64.go rename to src/gopheros/kernel/mem/constants_amd64.go diff --git a/kernel/mem/mem.go b/src/gopheros/kernel/mem/mem.go similarity index 100% rename from kernel/mem/mem.go rename to src/gopheros/kernel/mem/mem.go diff --git a/kernel/mem/mem_test.go b/src/gopheros/kernel/mem/mem_test.go similarity index 100% rename from kernel/mem/mem_test.go rename to src/gopheros/kernel/mem/mem_test.go diff --git a/kernel/mem/pmm/allocator/bitmap_allocator.go b/src/gopheros/kernel/mem/pmm/allocator/bitmap_allocator.go similarity index 97% rename from kernel/mem/pmm/allocator/bitmap_allocator.go rename to src/gopheros/kernel/mem/pmm/allocator/bitmap_allocator.go index f0e8602..1030b47 100644 --- a/kernel/mem/pmm/allocator/bitmap_allocator.go +++ b/src/gopheros/kernel/mem/pmm/allocator/bitmap_allocator.go @@ -1,16 +1,15 @@ package allocator import ( + "gopheros/kernel" + "gopheros/kernel/hal/multiboot" + "gopheros/kernel/kfmt/early" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" + "gopheros/kernel/mem/vmm" "math" "reflect" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/hal/multiboot" - "github.com/achilleasa/gopher-os/kernel/kfmt/early" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" - "github.com/achilleasa/gopher-os/kernel/mem/vmm" ) var ( diff --git a/kernel/mem/pmm/allocator/bitmap_allocator_test.go b/src/gopheros/kernel/mem/pmm/allocator/bitmap_allocator_test.go similarity index 97% rename from kernel/mem/pmm/allocator/bitmap_allocator_test.go rename to src/gopheros/kernel/mem/pmm/allocator/bitmap_allocator_test.go index d1d214c..a36c80d 100644 --- a/kernel/mem/pmm/allocator/bitmap_allocator_test.go +++ b/src/gopheros/kernel/mem/pmm/allocator/bitmap_allocator_test.go @@ -1,16 +1,15 @@ package allocator import ( + "gopheros/kernel" + "gopheros/kernel/hal/multiboot" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" + "gopheros/kernel/mem/vmm" "math" "strconv" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/hal/multiboot" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" - "github.com/achilleasa/gopher-os/kernel/mem/vmm" ) func TestSetupPoolBitmaps(t *testing.T) { diff --git a/kernel/mem/pmm/allocator/bootmem.go b/src/gopheros/kernel/mem/pmm/allocator/bootmem.go similarity index 95% rename from kernel/mem/pmm/allocator/bootmem.go rename to src/gopheros/kernel/mem/pmm/allocator/bootmem.go index 86473a9..4970348 100644 --- a/kernel/mem/pmm/allocator/bootmem.go +++ b/src/gopheros/kernel/mem/pmm/allocator/bootmem.go @@ -1,11 +1,11 @@ package allocator import ( - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/hal/multiboot" - "github.com/achilleasa/gopher-os/kernel/kfmt/early" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" + "gopheros/kernel" + "gopheros/kernel/hal/multiboot" + "gopheros/kernel/kfmt/early" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" ) var ( diff --git a/kernel/mem/pmm/allocator/bootmem_test.go b/src/gopheros/kernel/mem/pmm/allocator/bootmem_test.go similarity index 96% rename from kernel/mem/pmm/allocator/bootmem_test.go rename to src/gopheros/kernel/mem/pmm/allocator/bootmem_test.go index ebc4dd7..0494d5a 100644 --- a/kernel/mem/pmm/allocator/bootmem_test.go +++ b/src/gopheros/kernel/mem/pmm/allocator/bootmem_test.go @@ -1,12 +1,11 @@ package allocator import ( + "gopheros/kernel/driver/video/console" + "gopheros/kernel/hal" + "gopheros/kernel/hal/multiboot" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel/driver/video/console" - "github.com/achilleasa/gopher-os/kernel/hal" - "github.com/achilleasa/gopher-os/kernel/hal/multiboot" ) func TestBootMemoryAllocator(t *testing.T) { diff --git a/kernel/mem/pmm/frame.go b/src/gopheros/kernel/mem/pmm/frame.go similarity index 92% rename from kernel/mem/pmm/frame.go rename to src/gopheros/kernel/mem/pmm/frame.go index b7f52e8..10d5df7 100644 --- a/kernel/mem/pmm/frame.go +++ b/src/gopheros/kernel/mem/pmm/frame.go @@ -2,9 +2,8 @@ package pmm import ( + "gopheros/kernel/mem" "math" - - "github.com/achilleasa/gopher-os/kernel/mem" ) // Frame describes a physical memory page index. diff --git a/kernel/mem/pmm/frame_test.go b/src/gopheros/kernel/mem/pmm/frame_test.go similarity index 92% rename from kernel/mem/pmm/frame_test.go rename to src/gopheros/kernel/mem/pmm/frame_test.go index cc01e53..f05968f 100644 --- a/kernel/mem/pmm/frame_test.go +++ b/src/gopheros/kernel/mem/pmm/frame_test.go @@ -1,9 +1,8 @@ package pmm import ( + "gopheros/kernel/mem" "testing" - - "github.com/achilleasa/gopher-os/kernel/mem" ) func TestFrameMethods(t *testing.T) { diff --git a/kernel/mem/size.go b/src/gopheros/kernel/mem/size.go similarity index 100% rename from kernel/mem/size.go rename to src/gopheros/kernel/mem/size.go diff --git a/kernel/mem/vmm/addr_space.go b/src/gopheros/kernel/mem/vmm/addr_space.go similarity index 93% rename from kernel/mem/vmm/addr_space.go rename to src/gopheros/kernel/mem/vmm/addr_space.go index 695168c..af40bee 100644 --- a/kernel/mem/vmm/addr_space.go +++ b/src/gopheros/kernel/mem/vmm/addr_space.go @@ -1,8 +1,8 @@ package vmm import ( - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/mem" + "gopheros/kernel" + "gopheros/kernel/mem" ) var ( diff --git a/kernel/mem/vmm/addr_space_test.go b/src/gopheros/kernel/mem/vmm/addr_space_test.go similarity index 100% rename from kernel/mem/vmm/addr_space_test.go rename to src/gopheros/kernel/mem/vmm/addr_space_test.go diff --git a/kernel/mem/vmm/constants_amd64.go b/src/gopheros/kernel/mem/vmm/constants_amd64.go similarity index 100% rename from kernel/mem/vmm/constants_amd64.go rename to src/gopheros/kernel/mem/vmm/constants_amd64.go diff --git a/kernel/mem/vmm/map.go b/src/gopheros/kernel/mem/vmm/map.go similarity index 96% rename from kernel/mem/vmm/map.go rename to src/gopheros/kernel/mem/vmm/map.go index ccfa128..1edaa5a 100644 --- a/kernel/mem/vmm/map.go +++ b/src/gopheros/kernel/mem/vmm/map.go @@ -1,12 +1,11 @@ package vmm import ( + "gopheros/kernel" + "gopheros/kernel/cpu" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/cpu" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" ) // ReservedZeroedFrame is a special zero-cleared frame allocated by the diff --git a/kernel/mem/vmm/map_test.go b/src/gopheros/kernel/mem/vmm/map_test.go similarity index 98% rename from kernel/mem/vmm/map_test.go rename to src/gopheros/kernel/mem/vmm/map_test.go index 1ecd15c..70116c1 100644 --- a/kernel/mem/vmm/map_test.go +++ b/src/gopheros/kernel/mem/vmm/map_test.go @@ -1,13 +1,12 @@ package vmm import ( + "gopheros/kernel" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" "runtime" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" ) func TestNextAddrFn(t *testing.T) { diff --git a/kernel/mem/vmm/page.go b/src/gopheros/kernel/mem/vmm/page.go similarity index 92% rename from kernel/mem/vmm/page.go rename to src/gopheros/kernel/mem/vmm/page.go index f1e9cb4..5f11aff 100644 --- a/kernel/mem/vmm/page.go +++ b/src/gopheros/kernel/mem/vmm/page.go @@ -1,6 +1,6 @@ package vmm -import "github.com/achilleasa/gopher-os/kernel/mem" +import "gopheros/kernel/mem" // Page describes a virtual memory page index. type Page uintptr diff --git a/kernel/mem/vmm/page_test.go b/src/gopheros/kernel/mem/vmm/page_test.go similarity index 94% rename from kernel/mem/vmm/page_test.go rename to src/gopheros/kernel/mem/vmm/page_test.go index 8786e97..8ad9113 100644 --- a/kernel/mem/vmm/page_test.go +++ b/src/gopheros/kernel/mem/vmm/page_test.go @@ -1,9 +1,8 @@ package vmm import ( + "gopheros/kernel/mem" "testing" - - "github.com/achilleasa/gopher-os/kernel/mem" ) func TestPageMethods(t *testing.T) { diff --git a/kernel/mem/vmm/pdt.go b/src/gopheros/kernel/mem/vmm/pdt.go similarity index 96% rename from kernel/mem/vmm/pdt.go rename to src/gopheros/kernel/mem/vmm/pdt.go index 68505cd..012ceba 100644 --- a/kernel/mem/vmm/pdt.go +++ b/src/gopheros/kernel/mem/vmm/pdt.go @@ -1,12 +1,11 @@ package vmm import ( + "gopheros/kernel" + "gopheros/kernel/cpu" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/cpu" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" ) var ( diff --git a/kernel/mem/vmm/pdt_test.go b/src/gopheros/kernel/mem/vmm/pdt_test.go similarity index 98% rename from kernel/mem/vmm/pdt_test.go rename to src/gopheros/kernel/mem/vmm/pdt_test.go index c971030..b862feb 100644 --- a/kernel/mem/vmm/pdt_test.go +++ b/src/gopheros/kernel/mem/vmm/pdt_test.go @@ -1,13 +1,12 @@ package vmm import ( + "gopheros/kernel" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" "runtime" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" ) func TestPageDirectoryTableInitAmd64(t *testing.T) { diff --git a/kernel/mem/vmm/pte.go b/src/gopheros/kernel/mem/vmm/pte.go similarity index 94% rename from kernel/mem/vmm/pte.go rename to src/gopheros/kernel/mem/vmm/pte.go index d261a76..5418a01 100644 --- a/kernel/mem/vmm/pte.go +++ b/src/gopheros/kernel/mem/vmm/pte.go @@ -1,9 +1,9 @@ package vmm import ( - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" + "gopheros/kernel" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" ) var ( diff --git a/kernel/mem/vmm/pte_test.go b/src/gopheros/kernel/mem/vmm/pte_test.go similarity index 95% rename from kernel/mem/vmm/pte_test.go rename to src/gopheros/kernel/mem/vmm/pte_test.go index 108986c..1173e64 100644 --- a/kernel/mem/vmm/pte_test.go +++ b/src/gopheros/kernel/mem/vmm/pte_test.go @@ -1,9 +1,8 @@ package vmm import ( + "gopheros/kernel/mem/pmm" "testing" - - "github.com/achilleasa/gopher-os/kernel/mem/pmm" ) func TestPageTableEntryFlags(t *testing.T) { diff --git a/kernel/mem/vmm/translate.go b/src/gopheros/kernel/mem/vmm/translate.go similarity index 92% rename from kernel/mem/vmm/translate.go rename to src/gopheros/kernel/mem/vmm/translate.go index a5d9f51..4493f32 100644 --- a/kernel/mem/vmm/translate.go +++ b/src/gopheros/kernel/mem/vmm/translate.go @@ -1,6 +1,6 @@ package vmm -import "github.com/achilleasa/gopher-os/kernel" +import "gopheros/kernel" // Translate returns the physical address that corresponds to the supplied // virtual address or ErrInvalidMapping if the virtual address does not diff --git a/kernel/mem/vmm/translate_test.go b/src/gopheros/kernel/mem/vmm/translate_test.go similarity index 97% rename from kernel/mem/vmm/translate_test.go rename to src/gopheros/kernel/mem/vmm/translate_test.go index 2f9ad78..6d7cca5 100644 --- a/kernel/mem/vmm/translate_test.go +++ b/src/gopheros/kernel/mem/vmm/translate_test.go @@ -1,11 +1,10 @@ package vmm import ( + "gopheros/kernel/mem/pmm" "runtime" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel/mem/pmm" ) func TestTranslateAmd64(t *testing.T) { diff --git a/kernel/mem/vmm/vmm.go b/src/gopheros/kernel/mem/vmm/vmm.go similarity index 94% rename from kernel/mem/vmm/vmm.go rename to src/gopheros/kernel/mem/vmm/vmm.go index 9044489..3814347 100644 --- a/kernel/mem/vmm/vmm.go +++ b/src/gopheros/kernel/mem/vmm/vmm.go @@ -1,12 +1,12 @@ package vmm import ( - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/cpu" - "github.com/achilleasa/gopher-os/kernel/irq" - "github.com/achilleasa/gopher-os/kernel/kfmt/early" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" + "gopheros/kernel" + "gopheros/kernel/cpu" + "gopheros/kernel/irq" + "gopheros/kernel/kfmt/early" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" ) var ( diff --git a/kernel/mem/vmm/vmm_test.go b/src/gopheros/kernel/mem/vmm/vmm_test.go similarity index 95% rename from kernel/mem/vmm/vmm_test.go rename to src/gopheros/kernel/mem/vmm/vmm_test.go index 030c922..bec50d4 100644 --- a/kernel/mem/vmm/vmm_test.go +++ b/src/gopheros/kernel/mem/vmm/vmm_test.go @@ -3,17 +3,16 @@ package vmm import ( "bytes" "fmt" + "gopheros/kernel" + "gopheros/kernel/cpu" + "gopheros/kernel/driver/video/console" + "gopheros/kernel/hal" + "gopheros/kernel/irq" + "gopheros/kernel/mem" + "gopheros/kernel/mem/pmm" "strings" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel" - "github.com/achilleasa/gopher-os/kernel/cpu" - "github.com/achilleasa/gopher-os/kernel/driver/video/console" - "github.com/achilleasa/gopher-os/kernel/hal" - "github.com/achilleasa/gopher-os/kernel/irq" - "github.com/achilleasa/gopher-os/kernel/mem" - "github.com/achilleasa/gopher-os/kernel/mem/pmm" ) func TestRecoverablePageFault(t *testing.T) { diff --git a/kernel/mem/vmm/walk.go b/src/gopheros/kernel/mem/vmm/walk.go similarity index 97% rename from kernel/mem/vmm/walk.go rename to src/gopheros/kernel/mem/vmm/walk.go index 8c38469..849117a 100644 --- a/kernel/mem/vmm/walk.go +++ b/src/gopheros/kernel/mem/vmm/walk.go @@ -1,9 +1,8 @@ package vmm import ( + "gopheros/kernel/mem" "unsafe" - - "github.com/achilleasa/gopher-os/kernel/mem" ) var ( diff --git a/kernel/mem/vmm/walk_test.go b/src/gopheros/kernel/mem/vmm/walk_test.go similarity index 97% rename from kernel/mem/vmm/walk_test.go rename to src/gopheros/kernel/mem/vmm/walk_test.go index ee235eb..25f1338 100644 --- a/kernel/mem/vmm/walk_test.go +++ b/src/gopheros/kernel/mem/vmm/walk_test.go @@ -1,11 +1,10 @@ package vmm import ( + "gopheros/kernel/mem" "runtime" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel/mem" ) func TestPtePtrFn(t *testing.T) { diff --git a/kernel/panic.go b/src/gopheros/kernel/panic.go similarity index 91% rename from kernel/panic.go rename to src/gopheros/kernel/panic.go index 562e3eb..a326266 100644 --- a/kernel/panic.go +++ b/src/gopheros/kernel/panic.go @@ -1,8 +1,8 @@ package kernel import ( - "github.com/achilleasa/gopher-os/kernel/cpu" - "github.com/achilleasa/gopher-os/kernel/kfmt/early" + "gopheros/kernel/cpu" + "gopheros/kernel/kfmt/early" ) var ( diff --git a/kernel/panic_test.go b/src/gopheros/kernel/panic_test.go similarity index 94% rename from kernel/panic_test.go rename to src/gopheros/kernel/panic_test.go index 6e1e6bb..68bfad8 100644 --- a/kernel/panic_test.go +++ b/src/gopheros/kernel/panic_test.go @@ -3,12 +3,11 @@ package kernel import ( "bytes" "errors" + "gopheros/kernel/cpu" + "gopheros/kernel/driver/video/console" + "gopheros/kernel/hal" "testing" "unsafe" - - "github.com/achilleasa/gopher-os/kernel/cpu" - "github.com/achilleasa/gopher-os/kernel/driver/video/console" - "github.com/achilleasa/gopher-os/kernel/hal" ) func TestPanic(t *testing.T) { diff --git a/stub.go b/src/gopheros/stub.go similarity index 89% rename from stub.go rename to src/gopheros/stub.go index 0e62711..73c6d49 100644 --- a/stub.go +++ b/src/gopheros/stub.go @@ -1,6 +1,6 @@ package main -import "github.com/achilleasa/gopher-os/kernel/kmain" +import "gopheros/kernel/kmain" var multibootInfoPtr uintptr