tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-24 06:19:04 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

src/runtime: use garbage collector constants when we have them

Browse Source
This commit is contained in:
Damian Gryski
2022-01-27 09:59:12 -08:00
committed by Ron Evans
parent b2ccf12e98
commit 23dc861ddb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runtime/gc_conservative.go
+4 -4
View File
@@ -143,7 +143,7 @@ func (b gcBlock) findNext() gcBlock {
// State returns the current block state. // State returns the current block state.
func (b gcBlock) state() blockState { func (b gcBlock) state() blockState {
stateBytePtr := (*uint8)(unsafe.Pointer(uintptr(metadataStart) + uintptr(b/blocksPerStateByte))) stateBytePtr := (*uint8)(unsafe.Pointer(uintptr(metadataStart) + uintptr(b/blocksPerStateByte)))
return blockState(*stateBytePtr>>((b%blocksPerStateByte)*2)) % 4 return blockState(*stateBytePtr>>((b%blocksPerStateByte)*stateBits)) & blockStateMask
} }
// setState sets the current block to the given state, which must contain more // setState sets the current block to the given state, which must contain more
@@ -151,7 +151,7 @@ func (b gcBlock) state() blockState {
// from head to mark. // from head to mark.
func (b gcBlock) setState(newState blockState) { func (b gcBlock) setState(newState blockState) {
stateBytePtr := (*uint8)(unsafe.Pointer(uintptr(metadataStart) + uintptr(b/blocksPerStateByte))) stateBytePtr := (*uint8)(unsafe.Pointer(uintptr(metadataStart) + uintptr(b/blocksPerStateByte)))
*stateBytePtr |= uint8(newState << ((b % blocksPerStateByte) * 2)) *stateBytePtr |= uint8(newState << ((b % blocksPerStateByte) * stateBits))
if gcAsserts && b.state() != newState { if gcAsserts && b.state() != newState {
runtimePanic("gc: setState() was not successful") runtimePanic("gc: setState() was not successful")
} }
@@ -160,7 +160,7 @@ func (b gcBlock) setState(newState blockState) {
// markFree sets the block state to free, no matter what state it was in before. // markFree sets the block state to free, no matter what state it was in before.
func (b gcBlock) markFree() { func (b gcBlock) markFree() {
stateBytePtr := (*uint8)(unsafe.Pointer(uintptr(metadataStart) + uintptr(b/blocksPerStateByte))) stateBytePtr := (*uint8)(unsafe.Pointer(uintptr(metadataStart) + uintptr(b/blocksPerStateByte)))
*stateBytePtr &^= uint8(blockStateMask << ((b % blocksPerStateByte) * 2)) *stateBytePtr &^= uint8(blockStateMask << ((b % blocksPerStateByte) * stateBits))
if gcAsserts && b.state() != blockStateFree { if gcAsserts && b.state() != blockStateFree {
runtimePanic("gc: markFree() was not successful") runtimePanic("gc: markFree() was not successful")
} }
@@ -174,7 +174,7 @@ func (b gcBlock) unmark() {
} }
clearMask := blockStateMask ^ blockStateHead // the bits to clear from the state clearMask := blockStateMask ^ blockStateHead // the bits to clear from the state
stateBytePtr := (*uint8)(unsafe.Pointer(uintptr(metadataStart) + uintptr(b/blocksPerStateByte))) stateBytePtr := (*uint8)(unsafe.Pointer(uintptr(metadataStart) + uintptr(b/blocksPerStateByte)))
*stateBytePtr &^= uint8(clearMask << ((b % blocksPerStateByte) * 2)) *stateBytePtr &^= uint8(clearMask << ((b % blocksPerStateByte) * stateBits))
if gcAsserts && b.state() != blockStateHead { if gcAsserts && b.state() != blockStateHead {
runtimePanic("gc: unmark() was not successful") runtimePanic("gc: unmark() was not successful")
} }