diff --git a/kernel/mem/pmm/bootmem_allocator_test.go b/kernel/mem/pmm/bootmem_allocator_test.go index 52ccd30..a7319d7 100644 --- a/kernel/mem/pmm/bootmem_allocator_test.go +++ b/kernel/mem/pmm/bootmem_allocator_test.go @@ -49,7 +49,7 @@ func TestBootMemoryAllocator(t *testing.T) { t.Errorf("[frame %d] expected frame address to be 0x%x; got 0x%x", allocFrameCount, expAddress, got) } - if !frame.IsValid() { + if !frame.Valid() { t.Errorf("[frame %d] expected IsValid() to return true", allocFrameCount) } } @@ -59,7 +59,7 @@ func TestBootMemoryAllocator(t *testing.T) { } // This allocator only works with order(0) blocks - if frame, err := alloc.AllocFrame(mem.PageOrder(1)); err != errBootAllocUnsupportedPageSize || frame.IsValid() { + if frame, err := alloc.AllocFrame(mem.PageOrder(1)); err != errBootAllocUnsupportedPageSize || frame.Valid() { t.Fatalf("expected allocator to return errBootAllocUnsupportedPageSize and an invalid frame when requested to allocate a block with order > 0; got %v, %v", err, frame) } } diff --git a/kernel/mem/pmm/frame.go b/kernel/mem/pmm/frame.go index 5b03dce..b7f52e8 100644 --- a/kernel/mem/pmm/frame.go +++ b/kernel/mem/pmm/frame.go @@ -16,8 +16,8 @@ const ( InvalidFrame = Frame(math.MaxUint64) ) -// IsValid returns true if this is a valid frame. -func (f Frame) IsValid() bool { +// Valid returns true if this is a valid frame. +func (f Frame) Valid() bool { return f != InvalidFrame } diff --git a/kernel/mem/pmm/frame_test.go b/kernel/mem/pmm/frame_test.go index 990794c..cc01e53 100644 --- a/kernel/mem/pmm/frame_test.go +++ b/kernel/mem/pmm/frame_test.go @@ -7,17 +7,20 @@ import ( ) func TestFrameMethods(t *testing.T) { - for order := mem.PageOrder(0); order < mem.PageOrder(10); order++ { - for frameIndex := uint64(0); frameIndex < 128; frameIndex++ { - frame := Frame(frameIndex | (uint64(order) << 56)) + for frameIndex := uint64(0); frameIndex < 128; frameIndex++ { + frame := Frame(frameIndex) - if !frame.IsValid() { - t.Errorf("[order %d] expected frame %d to be valid", order, frameIndex) - } + if !frame.Valid() { + t.Errorf("expected frame %d to be valid", frameIndex) + } - if exp, got := uintptr(frameIndex<