taigrr/gopher-os
1
0
Fork 0
mirror of https://github.com/taigrr/gopher-os synced 2025-01-18 04:43:13 -08:00
Code Issues Projects Releases Wiki Activity

Change the Frame type to uintptr and remove Size/Order methods

Browse Source 
To keep the implementation portable, the Frame type had to be changed
from uint64 to uintptr. Using uintptr ensures that the frame will always
match the pointer size of the platform.
This commit is contained in:
Achilleas Anagnostopoulos 2017-05-31 14:07:13 +01:00
parent ec6ce4b70e
commit d7eb2547dd
4 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/mem/constants_amd64.go
View File

@ -3,6 +3,10 @@
package mem
const (
// PointerShift is equal to log2(unsafe.Sizeof(uintptr)). The pointer
// size for this architecture is defined as (1 << PointerShift).
PointerShift = 3
// PageShift is equal to log2(PageSize). This constant is used when
// we need to convert a physical address to a page number (shift right by PageShift)
// and vice-versa.

8
kernel/mem/pmm/bootmem_allocator_test.go
View File

@ -49,14 +49,6 @@ func TestBootMemoryAllocator(t *testing.T) {
if !frame.IsValid() {
t.Errorf("[frame %d] expected IsValid() to return true", allocFrameCount)
}
if got := frame.PageOrder(); got != mem.PageOrder(0) {
t.Errorf("[frame %d] expected allocated frame page order to be 0; got %d", allocFrameCount, got)
}
if got := frame.Size(); got != mem.PageSize {
t.Errorf("[frame %d] expected allocated frame size to be %d; got %d", allocFrameCount, mem.PageSize, got)
}
}
if allocFrameCount != totalFreeFrames {

13
kernel/mem/pmm/frame.go
View File

@ -8,7 +8,7 @@ import (
)
// Frame describes a physical memory page index.
type Frame uint64
type Frame uintptr
const (
// InvalidFrame is returned by page allocators when
@ -25,14 +25,3 @@ func (f Frame) IsValid() bool {
func (f Frame) Address() uintptr {
return uintptr(f << mem.PageShift)
}
// PageOrder returns the page order of this frame. The page order is encoded in the
// 8 MSB of the frame number.
func (f Frame) PageOrder() mem.PageOrder {
return mem.PageOrder((f >> 56) & 0xFF)
}
// Size returns the size of this frame.
func (f Frame) Size() mem.Size {
return mem.PageSize << ((f >> 56) & 0xFF)
}

8
kernel/mem/pmm/frame_test.go
View File

@ -15,17 +15,9 @@ func TestFrameMethods(t *testing.T) {
t.Errorf("[order %d] expected frame %d to be valid", order, frameIndex)
}
if got := frame.PageOrder(); got != order {
t.Errorf("[order %d] expected frame (%d, index: %d) call to PageOrder() to return %d; got %d", order, frame, frameIndex, order, got)
}
if exp, got := uintptr(frameIndex<<mem.PageShift), frame.Address(); got != exp {
t.Errorf("[order %d] expected frame (%d, index: %d) call to Address() to return %x; got %x", order, frame, frameIndex, exp, got)
}
if exp, got := mem.Size(mem.PageSize<<order), frame.Size(); got != exp {
t.Errorf("[order %d] expected frame (%d, index: %d) call to Size() to return %d; got %d", order, frame, frameIndex, exp, got)
}
}
}
}