diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/runtime/gc_conservative.go | 2 | ||||
| -rw-r--r-- | targets/avr.S | 9 | ||||
| -rw-r--r-- | targets/avr.json | 2 | ||||
| -rw-r--r-- | targets/avr.ld | 2 | ||||
| -rw-r--r-- | testdata/gc.go | 11 |
6 files changed, 24 insertions, 4 deletions
@@ -269,6 +269,8 @@ ifneq ($(AVR), 0) @$(MD5SUM) test.hex $(TINYGO) build -size short -o test.hex -target=digispark examples/blinky1 @$(MD5SUM) test.hex + $(TINYGO) build -size short -o test.hex -target=digispark -gc=leaking examples/blinky1 + @$(MD5SUM) test.hex endif $(TINYGO) build -size short -o test.hex -target=hifive1b examples/blinky1 @$(MD5SUM) test.hex diff --git a/src/runtime/gc_conservative.go b/src/runtime/gc_conservative.go index cff9f4f7c..41a27523e 100644 --- a/src/runtime/gc_conservative.go +++ b/src/runtime/gc_conservative.go @@ -318,7 +318,7 @@ func markRoots(start, end uintptr) { } } - for addr := start; addr != end; addr += unsafe.Sizeof(addr) { + for addr := start; addr != end; addr += unsafe.Alignof(addr) { root := *(*uintptr)(unsafe.Pointer(addr)) markRoot(addr, root) } diff --git a/targets/avr.S b/targets/avr.S index acc6a6ea9..c5881c820 100644 --- a/targets/avr.S +++ b/targets/avr.S @@ -60,3 +60,12 @@ __vector_WDT: pop r16 reti + +; This is necessary for the garbage collector. +; It returns the stack pointer as an uintptr. +.section .text.runtime.getCurrentStackPointer +.global runtime.getCurrentStackPointer +runtime.getCurrentStackPointer: + in r24, 0x3d; SPL + in r25, 0x3e; SPH + ret diff --git a/targets/avr.json b/targets/avr.json index 474790a0d..00ab6378f 100644 --- a/targets/avr.json +++ b/targets/avr.json @@ -3,7 +3,7 @@ "goos": "linux", "goarch": "arm", "compiler": "avr-gcc", - "gc": "leaking", + "gc": "conservative", "linker": "avr-gcc", "ldflags": [ "-T", "targets/avr.ld", diff --git a/targets/avr.ld b/targets/avr.ld index 179267df3..0a92e5f3c 100644 --- a/targets/avr.ld +++ b/targets/avr.ld @@ -46,3 +46,5 @@ SECTIONS /* For the memory allocator. */ _heap_start = _ebss; _heap_end = ORIGIN(RAM) + LENGTH(RAM); +_globals_start = _sdata; +_globals_end = _ebss; diff --git a/testdata/gc.go b/testdata/gc.go index b9a1ba475..eb594db6c 100644 --- a/testdata/gc.go +++ b/testdata/gc.go @@ -23,6 +23,13 @@ var scalarSlices [4][]byte var randSeeds [4]uint32 func testNonPointerHeap() { + maxSliceSize := uint32(1024) + if ^uintptr(0) <= 0xffff { + // 16-bit and lower devices, such as AVR. + // Heap size is a real issue there, while it is still useful to run + // these tests. Therefore, lower the max slice size. + maxSliceSize = 64 + } // Allocate roughly 0.5MB of memory. for i := 0; i < 1000; i++ { // Pick a random index that the optimizer can't predict. @@ -38,9 +45,9 @@ func testNonPointerHeap() { } // Allocate a randomly-sized slice, randomly sliced to be smaller. - sliceLen := randuint32() % 1024 + sliceLen := randuint32() % maxSliceSize slice := make([]byte, sliceLen) - cutLen := randuint32() % 1024 + cutLen := randuint32() % maxSliceSize if cutLen < sliceLen { slice = slice[cutLen:] } |