machine/dummy: add hooks to override peripheral methods

.circleci/config.yml

@@ -40,36 +40,66 @@ commands:
             sudo tar -C /usr/local -xf node-v10.15.1-linux-x64.tar.xz
             sudo ln -s /usr/local/node-v10.15.1-linux-x64/bin/node /usr/bin/node
             rm node-v10.15.1-linux-x64.tar.xz
+  dep:
+    steps:
+      - run:
+          name: "Install Go dependencies"
+          command: |
+            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+            dep ensure --vendor-only
   llvm-source-linux:
     steps:
       - restore_cache:
           keys:
-            - llvm-source-8-v3
+            - llvm-source-8-v2
       - run:
           name: "Fetch LLVM source"
           command: make llvm-source
       - save_cache:
-          key: llvm-source-8-v3
+          key: llvm-source-8-v2
           paths:
             - llvm
   smoketest:
     steps:
-      - run: make smoketest
+      - smoketest-no-avr
+      - run: tinygo build -size short -o test.elf -target=arduino             examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=digispark           examples/blinky1
   smoketest-no-avr:
     steps:
-      - run: make smoketest-no-avr
+      - run: tinygo build -size short -o test.elf -target=pca10040            examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=pca10040            examples/blinky2
+      - run: tinygo build             -o blinky2                              examples/blinky2 # TODO: re-enable -size flag with MachO support
+      - run: tinygo build -size short -o test.elf -target=pca10040            examples/test
+      - run: tinygo build -size short -o test.elf -target=microbit            examples/echo
+      - run: tinygo build -size short -o test.elf -target=nrf52840-mdk        examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=pca10031            examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=bluepill            examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=reelboard           examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=reelboard           examples/blinky2
+      - run: tinygo build -size short -o test.elf -target=pca10056            examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=pca10056            examples/blinky2
+      - run: tinygo build -size short -o test.elf -target=itsybitsy-m0        examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=circuitplay-express examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=stm32f4disco        examples/blinky1
+      - run: tinygo build -size short -o test.elf -target=stm32f4disco        examples/blinky2
+      - run: tinygo build             -o wasm.wasm -target=wasm               examples/wasm/export
+      - run: tinygo build             -o wasm.wasm -target=wasm               examples/wasm/main
   test-linux:
+    parameters:
+      llvm:
+        type: string
     steps:
       - checkout
       - submodules
       - apt-dependencies:
-          llvm: "-8"
+          llvm: <<parameters.llvm>>
       - install-node
       - restore_cache:
           keys:
             - go-cache-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
             - go-cache-{{ checksum "Gopkg.lock" }}
       - llvm-source-linux
+      - dep
       - run: go install .
       - run: go test -v
       - run: make gen-device -j4
@@ -106,7 +136,7 @@ commands:
       - llvm-source-linux
       - restore_cache:
           keys:
-            - llvm-build-8-linux-v5
+            - llvm-build-8-linux-v4
       - run:
           name: "Build LLVM"
           command: |
@@ -124,7 +154,7 @@ commands:
               make llvm-build
             fi
       - save_cache:
-          key: llvm-build-8-linux-v5
+          key: llvm-build-8-linux-v4
           paths:
             llvm-build
       - run:
@@ -133,6 +163,7 @@ commands:
             ln -s $PWD/llvm-build/bin/clang-8 /go/bin/clang-8
             ln -s $PWD/llvm-build/bin/ld.lld  /go/bin/ld.lld-8
             ln -s $PWD/llvm-build/bin/wasm-ld /go/bin/wasm-ld-8
+      - dep
       - run:
           name: "Test TinyGo"
           command: make test
@@ -163,23 +194,20 @@ commands:
       - run:
           name: "Install dependencies"
           command: |
-            curl https://dl.google.com/go/go1.12.5.darwin-amd64.tar.gz -o go1.12.5.darwin-amd64.tar.gz
-            sudo tar -C /usr/local -xzf go1.12.5.darwin-amd64.tar.gz
-            ln -s /usr/local/go/bin/go /usr/local/bin/go
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install go dep qemu
       - restore_cache:
           keys:
-            - llvm-source-8-macos-v3
+            - llvm-source-8-macos-v2
       - run:
           name: "Fetch LLVM source"
           command: make llvm-source
       - save_cache:
-          key: llvm-source-8-macos-v3
+          key: llvm-source-8-macos-v2
           paths:
             - llvm
       - restore_cache:
           keys:
-            - llvm-build-8-macos-v4
+            - llvm-build-8-macos-v3
       - run:
           name: "Build LLVM"
           command: |
@@ -191,13 +219,16 @@ commands:
               make llvm-build
             fi
       - save_cache:
-          key: llvm-build-8-macos-v4
+          key: llvm-build-8-macos-v3
           paths:
             llvm-build
       - run:
           name: "Create LLVM symlinks"
           command: |
             ln -s $PWD/llvm-build/bin/clang-8 /usr/local/bin/clang-8
+      - run:
+          name: "Install Go dependencies"
+          command: dep ensure --vendor-only
       - run:
           name: "Test TinyGo"
           command: make test
@@ -222,21 +253,27 @@ jobs:
   test-llvm8-go111:
     docker:
       - image: circleci/golang:1.11
+    working_directory: /go/src/github.com/tinygo-org/tinygo
     steps:
-      - test-linux
+      - test-linux:
+          llvm: "-8"
   test-llvm8-go112:
     docker:
       - image: circleci/golang:1.12
+    working_directory: /go/src/github.com/tinygo-org/tinygo
     steps:
-      - test-linux
+      - test-linux:
+          llvm: "-8"
   build-linux:
     docker:
       - image: circleci/golang:1.12
+    working_directory: /go/src/github.com/tinygo-org/tinygo
     steps:
       - build-linux
   build-macos:
     macos:
       xcode: "10.1.0"
+    working_directory: ~/go/src/github.com/tinygo-org/tinygo
     steps:
       - build-macos
 

CHANGELOG.md

@@ -1,52 +1,3 @@
-0.6.0
----
-* **command line**
-  - some portability improvements
-  - make `$GOROOT` more robust and configurable
-  - check for Clang at the Homebrew install location as fallback
-* **compiler driver**
-  - support multiple variations of LLVM commands, for non-Debian distributions
-* **compiler**
-  - improve code quality in multiple ways
-  - make panic configurable, adding trap on panic
-  - refactor many internal parts of the compiler
-  - print all errors encountered during compilation
-  - implement calling function values of a named type
-  - implement returning values from blocking functions
-  - allow larger-than-int values to be sent across a channel
-  - implement complex arithmetic
-  - improve hashmap support
-  - add debuginfo for function arguments
-  - insert nil checks on stores (increasing code size)
-  - implement volatile operations as compiler builtins
-  - add `//go:inline` pragma
-  - add build tags for the Go stdlib version
-* **cgo**
-  - implement `char`, `enum` and `void*` types
-  - support `#include` for builtin headers
-  - improve typedef/struct/enum support
-  - only include symbols that are necessary, for broader support
-  - mark external function args as `nocapture`
-  - implement support for some `#define` constants
-  - implement support for multiple CGo files in a single package
-- **standard library**
-  - `machine`: remove microbit matrix (moved to drivers repository)
-  - `machine`: refactor pins to use `Pin` type instead of `GPIO`
-  - `runtime`: print more interface types on panic, including `error`
-* **targets**
-  - `arm`: print an error on HardFault (including stack overflows)
-  - `atsamd21`: fix a bug in the ADC peripheral
-  - `atsamd21`: add support for I2S
-  - `feather-m0`: add support for this board
-  - `nrf51`: fix a bug in I2C
-  - `stm32f103xx`: fix a bug in I2C
-  - `syscall`: implement `Exit` on unix
-  - `trinket-m0`: add support for this board
-  - `wasm`: make _main_ example smaller
-  - `wasm`: don't cache wasm file in the server, for ease of debugging
-  - `wasm`: work around bug #41508 that caused a deadlock while linking
-  - `wasm`: add support for `js.FuncOf`
-
 0.5.0
 ---
 - **compiler driver**

Dockerfile

@@ -46,7 +46,7 @@ RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
     apt-get update && \
     apt-get install -y apt-utils python3 make binutils-avr gcc-avr avr-libc && \
     make gen-device-avr && \
-    apt-get remove -y python3 && \
+    apt-get remove -y python3 make && \
     apt-get autoremove -y && \
     apt-get clean
 
@@ -64,7 +64,7 @@ RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
     apt-get update && \
     apt-get install -y apt-utils python3 make clang-8 && \
     make gen-device-nrf && make gen-device-stm32 && \
-    apt-get remove -y python3 && \
+    apt-get remove -y python3 make && \
     apt-get autoremove -y && \
     apt-get clean
 
@@ -79,7 +79,7 @@ RUN cd /go/src/github.com/tinygo-org/tinygo/ && \
     apt-get update && \
     apt-get install -y apt-utils python3 make clang-8 binutils-avr gcc-avr avr-libc && \
     make gen-device && \
-    apt-get remove -y python3 && \
+    apt-get remove -y python3 make && \
     apt-get autoremove -y && \
     apt-get clean
 

Makefile

@@ -32,7 +32,7 @@ CGO_LDFLAGS=-L$(LLVM_BUILDDIR)/lib $(CLANG_LIBS) $(LLD_LIBS) $(shell $(LLVM_BUIL
 clean:
 	@rm -rf build
 
-FMT_PATHS = ./*.go cgo compiler interp ir loader src/device/arm src/examples src/machine src/os src/reflect src/runtime src/sync src/syscall
+FMT_PATHS = ./*.go compiler interp ir loader src/device/arm src/examples src/machine src/os src/reflect src/runtime src/sync src/syscall
 fmt:
 	@gofmt -l -w $(FMT_PATHS)
 fmt-check:
@@ -84,45 +84,6 @@ build/tinygo:
 test:
 	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go test -v -tags byollvm .
 
-.PHONY: smoketest smoketest-no-avr
-smoketest: smoketest-no-avr
-	tinygo build -size short -o test.elf -target=arduino             examples/blinky1
-	tinygo build -size short -o test.elf -target=digispark           examples/blinky1
-smoketest-no-avr:
-	# test all examples
-	tinygo build -size short -o test.elf -target=pca10040            examples/blinky1
-	tinygo build -size short -o test.elf -target=pca10040            examples/adc
-	tinygo build -size short -o test.elf -target=pca10040            examples/blinkm
-	tinygo build -size short -o test.elf -target=pca10040            examples/blinky2
-	tinygo build -size short -o test.elf -target=pca10040            examples/button
-	tinygo build -size short -o test.elf -target=pca10040            examples/button2
-	tinygo build -size short -o test.elf -target=pca10040            examples/echo
-	tinygo build -size short -o test.elf -target=circuitplay-express examples/i2s
-	tinygo build -size short -o test.elf -target=pca10040            examples/mcp3008
-	tinygo build -size short -o test.elf -target=microbit            examples/microbit-blink
-	tinygo build -size short -o test.elf -target=pca10040            examples/pwm
-	tinygo build -size short -o test.elf -target=pca10040            examples/serial
-	tinygo build -size short -o test.elf -target=pca10040            examples/test
-	# test all targets/boards
-	tinygo build             -o test.elf                             examples/blinky2 # TODO: re-enable -size flag with MachO support
-	tinygo build -size short -o test.elf -target=microbit            examples/echo
-	tinygo build -size short -o test.elf -target=nrf52840-mdk        examples/blinky1
-	tinygo build -size short -o test.elf -target=pca10031            examples/blinky1
-	tinygo build -size short -o test.elf -target=bluepill            examples/blinky1
-	tinygo build -size short -o test.elf -target=reelboard           examples/blinky1
-	tinygo build -size short -o test.elf -target=reelboard           examples/blinky2
-	tinygo build -size short -o test.elf -target=pca10056            examples/blinky1
-	tinygo build -size short -o test.elf -target=pca10056            examples/blinky2
-	tinygo build -size short -o test.elf -target=itsybitsy-m0        examples/blinky1
-	tinygo build -size short -o test.elf -target=feather-m0          examples/blinky1
-	tinygo build -size short -o test.elf -target=trinket-m0          examples/blinky1
-	tinygo build -size short -o test.elf -target=circuitplay-express examples/blinky1
-	tinygo build -size short -o test.elf -target=stm32f4disco        examples/blinky1
-	tinygo build -size short -o test.elf -target=stm32f4disco        examples/blinky2
-	tinygo build -size short -o test.elf -target=circuitplay-express examples/i2s
-	tinygo build             -o wasm.wasm -target=wasm               examples/wasm/export
-	tinygo build             -o wasm.wasm -target=wasm               examples/wasm/main
-
 release: build/tinygo gen-device
 	@mkdir -p build/release/tinygo/bin
 	@mkdir -p build/release/tinygo/lib/clang/include

README.md

@@ -17,8 +17,8 @@ import (
 )
 
 func main() {
-    led := machine.LED
-    led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+    led := machine.GPIO{machine.LED}
+    led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
     for {
         led.Low()
         time.Sleep(time.Millisecond * 1000)
@@ -43,16 +43,13 @@ See the [getting started instructions](https://tinygo.org/getting-started/) for
 
 You can compile TinyGo programs for microcontrollers, WebAssembly and Linux.
 
-The following 14 microcontroller boards are currently supported:
+The following microcontroller boards are currently supported:
 
 * [Adafruit Circuit Playground Express](https://www.adafruit.com/product/3333)
-* [Adafruit Feather M0](https://www.adafruit.com/product/2772)
 * [Adafruit ItsyBitsy M0](https://www.adafruit.com/product/3727)
-* [Adafruit Trinket M0](https://www.adafruit.com/product/3500)
 * [Arduino Uno](https://store.arduino.cc/arduino-uno-rev3)
-* [BBC micro:bit](https://microbit.org/)
+* [BBC:Microbit](https://microbit.org/)
 * [ST Micro STM32F103XX "Bluepill"](http://wiki.stm32duino.com/index.php?title=Blue_Pill)
-* [ST Micro STM32F407 "Discovery"](https://www.st.com/en/evaluation-tools/stm32f4discovery.html)
 * [Digispark](http://digistump.com/products/1)
 * [Nordic Semiconductor PCA10031](https://www.nordicsemi.com/eng/Products/nRF51-Dongle)
 * [Nordic Semiconductor PCA10040](https://www.nordicsemi.com/eng/Products/Bluetooth-low-energy/nRF52-DK)

cgo/cgo.go

@@ -1,695 +0,0 @@
-// Package cgo implements CGo by modifying a loaded AST. It does this by parsing
-// the `import "C"` statements found in the source code with libclang and
-// generating stub function and global declarations.
-//
-// There are a few advantages to modifying the AST directly instead of doing CGo
-// as a preprocessing step, with the main advantage being that debug information
-// is kept intact as much as possible.
-package cgo
-
-// This file extracts the `import "C"` statement from the source and modifies
-// the AST for CGo. It does not use libclang directly: see libclang.go for the C
-// source file parsing.
-
-import (
-	"go/ast"
-	"go/token"
-	"sort"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-// cgoPackage holds all CGo-related information of a package.
-type cgoPackage struct {
-	generated       *ast.File
-	generatedPos    token.Pos
-	errors          []error
-	dir             string
-	fset            *token.FileSet
-	tokenFiles      map[string]*token.File
-	missingSymbols  map[string]struct{}
-	constants       map[string]constantInfo
-	functions       map[string]*functionInfo
-	globals         map[string]globalInfo
-	typedefs        map[string]*typedefInfo
-	elaboratedTypes map[string]*elaboratedTypeInfo
-	enums           map[string]enumInfo
-}
-
-// constantInfo stores some information about a CGo constant found by libclang
-// and declared in the Go AST.
-type constantInfo struct {
-	expr *ast.BasicLit
-	pos  token.Pos
-}
-
-// functionInfo stores some information about a CGo function found by libclang
-// and declared in the AST.
-type functionInfo struct {
-	args    []paramInfo
-	results *ast.FieldList
-	pos     token.Pos
-}
-
-// paramInfo is a parameter of a CGo function (see functionInfo).
-type paramInfo struct {
-	name     string
-	typeExpr ast.Expr
-}
-
-// typedefInfo contains information about a single typedef in C.
-type typedefInfo struct {
-	typeExpr ast.Expr
-	pos      token.Pos
-}
-
-// elaboratedTypeInfo contains some information about an elaborated type
-// (struct, union) found in the C AST.
-type elaboratedTypeInfo struct {
-	typeExpr ast.Expr
-	pos      token.Pos
-}
-
-// enumInfo contains information about an enum in the C.
-type enumInfo struct {
-	typeExpr ast.Expr
-	pos      token.Pos
-}
-
-// globalInfo contains information about a declared global variable in C.
-type globalInfo struct {
-	typeExpr ast.Expr
-	pos      token.Pos
-}
-
-// cgoAliases list type aliases between Go and C, for types that are equivalent
-// in both languages. See addTypeAliases.
-var cgoAliases = map[string]string{
-	"C.int8_t":    "int8",
-	"C.int16_t":   "int16",
-	"C.int32_t":   "int32",
-	"C.int64_t":   "int64",
-	"C.uint8_t":   "uint8",
-	"C.uint16_t":  "uint16",
-	"C.uint32_t":  "uint32",
-	"C.uint64_t":  "uint64",
-	"C.uintptr_t": "uintptr",
-}
-
-// builtinAliases are handled specially because they only exist on the Go side
-// of CGo, not on the CGo side (they're prefixed with "_Cgo_" there).
-var builtinAliases = map[string]struct{}{
-	"char":      struct{}{},
-	"schar":     struct{}{},
-	"uchar":     struct{}{},
-	"short":     struct{}{},
-	"ushort":    struct{}{},
-	"int":       struct{}{},
-	"uint":      struct{}{},
-	"long":      struct{}{},
-	"ulong":     struct{}{},
-	"longlong":  struct{}{},
-	"ulonglong": struct{}{},
-}
-
-// cgoTypes lists some C types with ambiguous sizes that must be retrieved
-// somehow from C. This is done by adding some typedefs to get the size of each
-// type.
-const cgoTypes = `
-typedef char                _Cgo_char;
-typedef signed char         _Cgo_schar;
-typedef unsigned char       _Cgo_uchar;
-typedef short               _Cgo_short;
-typedef unsigned short      _Cgo_ushort;
-typedef int                 _Cgo_int;
-typedef unsigned int        _Cgo_uint;
-typedef long                _Cgo_long;
-typedef unsigned long       _Cgo_ulong;
-typedef long long           _Cgo_longlong;
-typedef unsigned long long  _Cgo_ulonglong;
-`
-
-// Process extracts `import "C"` statements from the AST, parses the comment
-// with libclang, and modifies the AST to use this information. It returns a
-// newly created *ast.File that should be added to the list of to-be-parsed
-// files. If there is one or more error, it returns these in the []error slice
-// but still modifies the AST.
-func Process(files []*ast.File, dir string, fset *token.FileSet, cflags []string) (*ast.File, []error) {
-	p := &cgoPackage{
-		dir:             dir,
-		fset:            fset,
-		tokenFiles:      map[string]*token.File{},
-		missingSymbols:  map[string]struct{}{},
-		constants:       map[string]constantInfo{},
-		functions:       map[string]*functionInfo{},
-		globals:         map[string]globalInfo{},
-		typedefs:        map[string]*typedefInfo{},
-		elaboratedTypes: map[string]*elaboratedTypeInfo{},
-		enums:           map[string]enumInfo{},
-	}
-
-	// Add a new location for the following file.
-	generatedTokenPos := p.fset.AddFile(dir+"/!cgo.go", -1, 0)
-	generatedTokenPos.SetLines([]int{0})
-	p.generatedPos = generatedTokenPos.Pos(0)
-
-	// Construct a new in-memory AST for CGo declarations of this package.
-	unsafeImport := &ast.ImportSpec{
-		Path: &ast.BasicLit{
-			ValuePos: p.generatedPos,
-			Kind:     token.STRING,
-			Value:    "\"unsafe\"",
-		},
-		EndPos: p.generatedPos,
-	}
-	p.generated = &ast.File{
-		Package: p.generatedPos,
-		Name: &ast.Ident{
-			NamePos: p.generatedPos,
-			Name:    files[0].Name.Name,
-		},
-		Decls: []ast.Decl{
-			&ast.GenDecl{
-				TokPos: p.generatedPos,
-				Tok:    token.IMPORT,
-				Specs: []ast.Spec{
-					unsafeImport,
-				},
-			},
-		},
-		Imports: []*ast.ImportSpec{unsafeImport},
-	}
-
-	// Find all C.* symbols.
-	for _, f := range files {
-		astutil.Apply(f, p.findMissingCGoNames, nil)
-	}
-	for name := range builtinAliases {
-		p.missingSymbols["_Cgo_"+name] = struct{}{}
-	}
-
-	// Find `import "C"` statements in the file.
-	for _, f := range files {
-		for i := 0; i < len(f.Decls); i++ {
-			decl := f.Decls[i]
-			genDecl, ok := decl.(*ast.GenDecl)
-			if !ok {
-				continue
-			}
-			if len(genDecl.Specs) != 1 {
-				continue
-			}
-			spec, ok := genDecl.Specs[0].(*ast.ImportSpec)
-			if !ok {
-				continue
-			}
-			path, err := strconv.Unquote(spec.Path.Value)
-			if err != nil {
-				panic("could not parse import path: " + err.Error())
-			}
-			if path != "C" {
-				continue
-			}
-			cgoComment := genDecl.Doc.Text()
-
-			pos := genDecl.Pos()
-			if genDecl.Doc != nil {
-				pos = genDecl.Doc.Pos()
-			}
-			position := fset.PositionFor(pos, true)
-			p.parseFragment(cgoComment+cgoTypes, cflags, position.Filename, position.Line)
-
-			// Remove this import declaration.
-			f.Decls = append(f.Decls[:i], f.Decls[i+1:]...)
-			i--
-		}
-
-		// Print the AST, for debugging.
-		//ast.Print(fset, f)
-	}
-
-	// Declare functions found by libclang.
-	p.addFuncDecls()
-
-	// Declare stub function pointer values found by libclang.
-	p.addFuncPtrDecls()
-
-	// Declare globals found by libclang.
-	p.addConstDecls()
-
-	// Declare globals found by libclang.
-	p.addVarDecls()
-
-	// Forward C types to Go types (like C.uint32_t -> uint32).
-	p.addTypeAliases()
-
-	// Add type declarations for C types, declared using typedef in C.
-	p.addTypedefs()
-
-	// Add elaborated types for C structs and unions.
-	p.addElaboratedTypes()
-
-	// Add enum types and enum constants for C enums.
-	p.addEnumTypes()
-
-	// Patch the AST to use the declared types and functions.
-	for _, f := range files {
-		astutil.Apply(f, p.walker, nil)
-	}
-
-	// Print the newly generated in-memory AST, for debugging.
-	//ast.Print(fset, p.generated)
-
-	return p.generated, p.errors
-}
-
-// addFuncDecls adds the C function declarations found by libclang in the
-// comment above the `import "C"` statement.
-func (p *cgoPackage) addFuncDecls() {
-	names := make([]string, 0, len(p.functions))
-	for name := range p.functions {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		fn := p.functions[name]
-		obj := &ast.Object{
-			Kind: ast.Fun,
-			Name: "C." + name,
-		}
-		args := make([]*ast.Field, len(fn.args))
-		decl := &ast.FuncDecl{
-			Name: &ast.Ident{
-				NamePos: fn.pos,
-				Name:    "C." + name,
-				Obj:     obj,
-			},
-			Type: &ast.FuncType{
-				Func: fn.pos,
-				Params: &ast.FieldList{
-					Opening: fn.pos,
-					List:    args,
-					Closing: fn.pos,
-				},
-				Results: fn.results,
-			},
-		}
-		obj.Decl = decl
-		for i, arg := range fn.args {
-			args[i] = &ast.Field{
-				Names: []*ast.Ident{
-					&ast.Ident{
-						NamePos: fn.pos,
-						Name:    arg.name,
-						Obj: &ast.Object{
-							Kind: ast.Var,
-							Name: arg.name,
-							Decl: decl,
-						},
-					},
-				},
-				Type: arg.typeExpr,
-			}
-		}
-		p.generated.Decls = append(p.generated.Decls, decl)
-	}
-}
-
-// addFuncPtrDecls creates stub declarations of function pointer values. These
-// values will later be replaced with the real values in the compiler.
-// It adds code like the following to the AST:
-//
-//     var (
-//         C.add unsafe.Pointer
-//         C.mul unsafe.Pointer
-//         // ...
-//     )
-func (p *cgoPackage) addFuncPtrDecls() {
-	if len(p.functions) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.VAR,
-		Lparen: token.NoPos,
-		Rparen: token.NoPos,
-	}
-	names := make([]string, 0, len(p.functions))
-	for name := range p.functions {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		fn := p.functions[name]
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: "C." + name + "$funcaddr",
-		}
-		valueSpec := &ast.ValueSpec{
-			Names: []*ast.Ident{&ast.Ident{
-				NamePos: fn.pos,
-				Name:    "C." + name + "$funcaddr",
-				Obj:     obj,
-			}},
-			Type: &ast.SelectorExpr{
-				X: &ast.Ident{
-					NamePos: fn.pos,
-					Name:    "unsafe",
-				},
-				Sel: &ast.Ident{
-					NamePos: fn.pos,
-					Name:    "Pointer",
-				},
-			},
-		}
-		obj.Decl = valueSpec
-		gen.Specs = append(gen.Specs, valueSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addConstDecls declares external C constants in the Go source.
-// It adds code like the following to the AST:
-//
-//     const (
-//         C.CONST_INT = 5
-//         C.CONST_FLOAT = 5.8
-//         // ...
-//     )
-func (p *cgoPackage) addConstDecls() {
-	if len(p.constants) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.CONST,
-		Lparen: token.NoPos,
-		Rparen: token.NoPos,
-	}
-	names := make([]string, 0, len(p.constants))
-	for name := range p.constants {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		constVal := p.constants[name]
-		obj := &ast.Object{
-			Kind: ast.Con,
-			Name: "C." + name,
-		}
-		valueSpec := &ast.ValueSpec{
-			Names: []*ast.Ident{&ast.Ident{
-				NamePos: constVal.pos,
-				Name:    "C." + name,
-				Obj:     obj,
-			}},
-			Values: []ast.Expr{constVal.expr},
-		}
-		obj.Decl = valueSpec
-		gen.Specs = append(gen.Specs, valueSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addVarDecls declares external C globals in the Go source.
-// It adds code like the following to the AST:
-//
-//     var (
-//         C.globalInt  int
-//         C.globalBool bool
-//         // ...
-//     )
-func (p *cgoPackage) addVarDecls() {
-	if len(p.globals) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.VAR,
-		Lparen: token.NoPos,
-		Rparen: token.NoPos,
-	}
-	names := make([]string, 0, len(p.globals))
-	for name := range p.globals {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		global := p.globals[name]
-		obj := &ast.Object{
-			Kind: ast.Var,
-			Name: "C." + name,
-		}
-		valueSpec := &ast.ValueSpec{
-			Names: []*ast.Ident{&ast.Ident{
-				NamePos: global.pos,
-				Name:    "C." + name,
-				Obj:     obj,
-			}},
-			Type: global.typeExpr,
-		}
-		obj.Decl = valueSpec
-		gen.Specs = append(gen.Specs, valueSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addTypeAliases aliases some built-in Go types with their equivalent C types.
-// It adds code like the following to the AST:
-//
-//     type (
-//         C.int8_t  = int8
-//         C.int16_t = int16
-//         // ...
-//     )
-func (p *cgoPackage) addTypeAliases() {
-	aliasKeys := make([]string, 0, len(cgoAliases))
-	for key := range cgoAliases {
-		aliasKeys = append(aliasKeys, key)
-	}
-	sort.Strings(aliasKeys)
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.TYPE,
-		Lparen: token.NoPos,
-		Rparen: token.NoPos,
-	}
-	for _, typeName := range aliasKeys {
-		goTypeName := cgoAliases[typeName]
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: typeName,
-		}
-		typeSpec := &ast.TypeSpec{
-			Name: &ast.Ident{
-				NamePos: token.NoPos,
-				Name:    typeName,
-				Obj:     obj,
-			},
-			Assign: p.generatedPos,
-			Type: &ast.Ident{
-				NamePos: token.NoPos,
-				Name:    goTypeName,
-			},
-		}
-		obj.Decl = typeSpec
-		gen.Specs = append(gen.Specs, typeSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-func (p *cgoPackage) addTypedefs() {
-	if len(p.typedefs) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.TYPE,
-	}
-	names := make([]string, 0, len(p.typedefs))
-	for name := range p.typedefs {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		typedef := p.typedefs[name]
-		typeName := "C." + name
-		isAlias := true
-		if strings.HasPrefix(name, "_Cgo_") {
-			typeName = "C." + name[len("_Cgo_"):]
-			isAlias = false // C.short etc. should not be aliased to the equivalent Go type (not portable)
-		}
-		if _, ok := cgoAliases[typeName]; ok {
-			// This is a type that also exists in Go (defined in stdint.h).
-			continue
-		}
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: typeName,
-		}
-		typeSpec := &ast.TypeSpec{
-			Name: &ast.Ident{
-				NamePos: typedef.pos,
-				Name:    typeName,
-				Obj:     obj,
-			},
-			Type: typedef.typeExpr,
-		}
-		if isAlias {
-			typeSpec.Assign = typedef.pos
-		}
-		obj.Decl = typeSpec
-		gen.Specs = append(gen.Specs, typeSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addElaboratedTypes adds C elaborated types as aliases. These are the "struct
-// foo" or "union foo" types, often used in a typedef.
-//
-// See also:
-// https://en.cppreference.com/w/cpp/language/elaborated_type_specifier
-func (p *cgoPackage) addElaboratedTypes() {
-	if len(p.elaboratedTypes) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.TYPE,
-	}
-	names := make([]string, 0, len(p.elaboratedTypes))
-	for name := range p.elaboratedTypes {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		typ := p.elaboratedTypes[name]
-		typeName := "C." + name
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: typeName,
-		}
-		typeSpec := &ast.TypeSpec{
-			Name: &ast.Ident{
-				NamePos: typ.pos,
-				Name:    typeName,
-				Obj:     obj,
-			},
-			Type: typ.typeExpr,
-		}
-		obj.Decl = typeSpec
-		gen.Specs = append(gen.Specs, typeSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// addEnumTypes adds C enums to the AST. For example, the following C code:
-//
-//     enum option {
-//         optionA,
-//         optionB = 5,
-//     };
-//
-// is translated to the following Go code equivalent:
-//
-//     type C.enum_option int32
-//
-// The constants are treated just like macros so are inserted into the AST by
-// addConstDecls.
-// See also: https://en.cppreference.com/w/c/language/enum
-func (p *cgoPackage) addEnumTypes() {
-	if len(p.enums) == 0 {
-		return
-	}
-	gen := &ast.GenDecl{
-		TokPos: token.NoPos,
-		Tok:    token.TYPE,
-	}
-	names := make([]string, 0, len(p.enums))
-	for name := range p.enums {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		typ := p.enums[name]
-		typeName := "C.enum_" + name
-		obj := &ast.Object{
-			Kind: ast.Typ,
-			Name: typeName,
-		}
-		typeSpec := &ast.TypeSpec{
-			Name: &ast.Ident{
-				NamePos: typ.pos,
-				Name:    typeName,
-				Obj:     obj,
-			},
-			Type: typ.typeExpr,
-		}
-		obj.Decl = typeSpec
-		gen.Specs = append(gen.Specs, typeSpec)
-	}
-	p.generated.Decls = append(p.generated.Decls, gen)
-}
-
-// findMissingCGoNames traverses the AST and finds all C.something names. Only
-// these symbols are extracted from the parsed C AST and converted to the Go
-// equivalent.
-func (p *cgoPackage) findMissingCGoNames(cursor *astutil.Cursor) bool {
-	switch node := cursor.Node().(type) {
-	case *ast.SelectorExpr:
-		x, ok := node.X.(*ast.Ident)
-		if !ok {
-			return true
-		}
-		if x.Name == "C" {
-			name := node.Sel.Name
-			if _, ok := builtinAliases[name]; ok {
-				name = "_Cgo_" + name
-			}
-			p.missingSymbols[name] = struct{}{}
-		}
-	}
-	return true
-}
-
-// walker replaces all "C".<something> expressions to literal "C.<something>"
-// expressions. Such expressions are impossible to write in Go (a dot cannot be
-// used in the middle of a name) so in practice all C identifiers live in a
-// separate namespace (no _Cgo_ hacks like in gc).
-func (p *cgoPackage) walker(cursor *astutil.Cursor) bool {
-	switch node := cursor.Node().(type) {
-	case *ast.CallExpr:
-		fun, ok := node.Fun.(*ast.SelectorExpr)
-		if !ok {
-			return true
-		}
-		x, ok := fun.X.(*ast.Ident)
-		if !ok {
-			return true
-		}
-		if _, ok := p.functions[fun.Sel.Name]; ok && x.Name == "C" {
-			node.Fun = &ast.Ident{
-				NamePos: x.NamePos,
-				Name:    "C." + fun.Sel.Name,
-			}
-		}
-	case *ast.SelectorExpr:
-		x, ok := node.X.(*ast.Ident)
-		if !ok {
-			return true
-		}
-		if x.Name == "C" {
-			name := "C." + node.Sel.Name
-			if _, ok := p.functions[node.Sel.Name]; ok {
-				name += "$funcaddr"
-			}
-			cursor.Replace(&ast.Ident{
-				NamePos: x.NamePos,
-				Name:    name,
-			})
-		}
-	}
-	return true
-}

commands.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"os"
 	"os/exec"
-	"runtime"
 	"strings"
 )
 
@@ -16,16 +15,6 @@ var commands = map[string][]string{
 	"wasm-ld": {"wasm-ld-8", "wasm-ld"},
 }
 
-func init() {
-	// Add the path to a Homebrew-installed LLVM 8 for ease of use (no need to
-	// manually set $PATH).
-	if runtime.GOOS == "darwin" {
-		commands["clang"] = append(commands["clang"], "/usr/local/opt/llvm/bin/clang-8")
-		commands["ld.lld"] = append(commands["ld.lld"], "/usr/local/opt/llvm/bin/ld.lld")
-		commands["wasm-ld"] = append(commands["wasm-ld"], "/usr/local/opt/llvm/bin/wasm-ld")
-	}
-}
-
 func execCommand(cmdNames []string, args ...string) error {
 	for _, cmdName := range cmdNames {
 		cmd := exec.Command(cmdName, args...)

compiler/asserts.go

@@ -42,7 +42,7 @@ func (c *Compiler) emitLookupBoundsCheck(frame *Frame, arrayLen, index llvm.Valu
 
 	// Fail: this is a nil pointer, exit with a panic.
 	c.builder.SetInsertPointAtEnd(faultBlock)
-	c.createRuntimeCall("lookupPanic", nil, "")
+	c.createRuntimeCall("lookuppanic", nil, "")
 	c.builder.CreateUnreachable()
 
 	// Ok: this is a valid pointer.
@@ -103,7 +103,7 @@ func (c *Compiler) emitSliceBoundsCheck(frame *Frame, capacity, low, high llvm.V
 
 	// Fail: this is a nil pointer, exit with a panic.
 	c.builder.SetInsertPointAtEnd(faultBlock)
-	c.createRuntimeCall("slicePanic", nil, "")
+	c.createRuntimeCall("slicepanic", nil, "")
 	c.builder.CreateUnreachable()
 
 	// Ok: this is a valid pointer.
@@ -114,11 +114,6 @@ func (c *Compiler) emitSliceBoundsCheck(frame *Frame, capacity, low, high llvm.V
 // has no effect in well-behaved programs, but makes sure no uncaught nil
 // pointer dereferences exist in valid Go code.
 func (c *Compiler) emitNilCheck(frame *Frame, ptr llvm.Value, blockPrefix string) {
-	// Check whether we need to emit this check at all.
-	if !ptr.IsAGlobalValue().IsNil() {
-		return
-	}
-
 	// Check whether this is a nil pointer.
 	faultBlock := c.ctx.AddBasicBlock(frame.fn.LLVMFn, blockPrefix+".nil")
 	nextBlock := c.ctx.AddBasicBlock(frame.fn.LLVMFn, blockPrefix+".next")
@@ -146,7 +141,7 @@ func (c *Compiler) emitNilCheck(frame *Frame, ptr llvm.Value, blockPrefix string
 
 	// Fail: this is a nil pointer, exit with a panic.
 	c.builder.SetInsertPointAtEnd(faultBlock)
-	c.createRuntimeCall("nilPanic", nil, "")
+	c.createRuntimeCall("nilpanic", nil, "")
 	c.builder.CreateUnreachable()
 
 	// Ok: this is a valid pointer.

compiler/calls.go

@@ -55,25 +55,6 @@ func (c *Compiler) expandFormalParamType(t llvm.Type) []llvm.Type {
 	}
 }
 
-// Expand an argument type to a list of offsets from the start of the object.
-// Used together with expandFormalParam to get the offset of each value from the
-// start of the non-expanded value.
-func (c *Compiler) expandFormalParamOffsets(t llvm.Type) []uint64 {
-	switch t.TypeKind() {
-	case llvm.StructTypeKind:
-		fields := c.flattenAggregateTypeOffsets(t)
-		if len(fields) <= MaxFieldsPerParam {
-			return fields
-		} else {
-			// failed to lower
-			return []uint64{0}
-		}
-	default:
-		// TODO: split small arrays
-		return []uint64{0}
-	}
-}
-
 // Equivalent of expandFormalParamType for parameter values.
 func (c *Compiler) expandFormalParam(v llvm.Value) []llvm.Value {
 	switch v.Type().TypeKind() {
@@ -111,27 +92,6 @@ func (c *Compiler) flattenAggregateType(t llvm.Type) []llvm.Type {
 	}
 }
 
-// Return the offsets from the start of the object if this object type were
-// flattened like in flattenAggregate. Used together with flattenAggregate to
-// know the start indices of each value in the non-flattened object.
-func (c *Compiler) flattenAggregateTypeOffsets(t llvm.Type) []uint64 {
-	switch t.TypeKind() {
-	case llvm.StructTypeKind:
-		fields := make([]uint64, 0, t.StructElementTypesCount())
-		for fieldIndex, field := range t.StructElementTypes() {
-			suboffsets := c.flattenAggregateTypeOffsets(field)
-			offset := c.targetData.ElementOffset(t, fieldIndex)
-			for i := range suboffsets {
-				suboffsets[i] += offset
-			}
-			fields = append(fields, suboffsets...)
-		}
-		return fields
-	default:
-		return []uint64{0}
-	}
-}
-
 // Break down a struct into its elementary types for argument passing. The value
 // equivalent of flattenAggregateType
 func (c *Compiler) flattenAggregate(v llvm.Value) []llvm.Value {

compiler/channel.go

@@ -23,41 +23,47 @@ func (c *Compiler) emitMakeChan(expr *ssa.MakeChan) (llvm.Value, error) {
 // emitChanSend emits a pseudo chan send operation. It is lowered to the actual
 // channel send operation during goroutine lowering.
 func (c *Compiler) emitChanSend(frame *Frame, instr *ssa.Send) {
+	valueType := c.getLLVMType(instr.X.Type())
 	ch := c.getValue(frame, instr.Chan)
 	chanValue := c.getValue(frame, instr.X)
+	valueSize := llvm.ConstInt(c.uintptrType, c.targetData.TypeAllocSize(chanValue.Type()), false)
+	coroutine := c.createRuntimeCall("getCoroutine", nil, "")
 
 	// store value-to-send
-	valueType := c.getLLVMType(instr.X.Type())
-	valueAlloca, valueAllocaCast, valueAllocaSize := c.createTemporaryAlloca(valueType, "chan.value")
+	c.builder.SetInsertPointBefore(coroutine.InstructionParent().Parent().EntryBasicBlock().FirstInstruction())
+	valueAlloca := c.builder.CreateAlloca(valueType, "chan.value")
+	c.builder.SetInsertPointBefore(coroutine)
+	c.builder.SetInsertPointAtEnd(coroutine.InstructionParent())
 	c.builder.CreateStore(chanValue, valueAlloca)
+	valueAllocaCast := c.builder.CreateBitCast(valueAlloca, c.i8ptrType, "chan.value.i8ptr")
 
 	// Do the send.
-	coroutine := c.createRuntimeCall("getCoroutine", nil, "")
-	valueSize := llvm.ConstInt(c.uintptrType, c.targetData.TypeAllocSize(chanValue.Type()), false)
 	c.createRuntimeCall("chanSend", []llvm.Value{coroutine, ch, valueAllocaCast, valueSize}, "")
 
-	// End the lifetime of the alloca.
-	// This also works around a bug in CoroSplit, at least in LLVM 8:
-	// https://bugs.llvm.org/show_bug.cgi?id=41742
-	c.emitLifetimeEnd(valueAllocaCast, valueAllocaSize)
+	// Make sure CoroSplit includes the alloca in the coroutine frame.
+	// This is a bit dirty, but it works (at least in LLVM 8).
+	valueSizeI64 := llvm.ConstInt(c.ctx.Int64Type(), c.targetData.TypeAllocSize(chanValue.Type()), false)
+	c.builder.CreateCall(c.getLifetimeEndFunc(), []llvm.Value{valueSizeI64, valueAllocaCast}, "")
 }
 
 // emitChanRecv emits a pseudo chan receive operation. It is lowered to the
 // actual channel receive operation during goroutine lowering.
 func (c *Compiler) emitChanRecv(frame *Frame, unop *ssa.UnOp) llvm.Value {
 	valueType := c.getLLVMType(unop.X.Type().(*types.Chan).Elem())
+	valueSize := llvm.ConstInt(c.uintptrType, c.targetData.TypeAllocSize(valueType), false)
 	ch := c.getValue(frame, unop.X)
+	coroutine := c.createRuntimeCall("getCoroutine", nil, "")
 
 	// Allocate memory to receive into.
-	valueAlloca, valueAllocaCast, valueAllocaSize := c.createTemporaryAlloca(valueType, "chan.value")
+	c.builder.SetInsertPointBefore(coroutine.InstructionParent().Parent().EntryBasicBlock().FirstInstruction())
+	valueAlloca := c.builder.CreateAlloca(valueType, "chan.value")
+	c.builder.SetInsertPointBefore(coroutine)
+	c.builder.SetInsertPointAtEnd(coroutine.InstructionParent())
+	valueAllocaCast := c.builder.CreateBitCast(valueAlloca, c.i8ptrType, "chan.value.i8ptr")
 
 	// Do the receive.
-	coroutine := c.createRuntimeCall("getCoroutine", nil, "")
-	valueSize := llvm.ConstInt(c.uintptrType, c.targetData.TypeAllocSize(valueType), false)
 	c.createRuntimeCall("chanRecv", []llvm.Value{coroutine, ch, valueAllocaCast, valueSize}, "")
 	received := c.builder.CreateLoad(valueAlloca, "chan.received")
-	c.emitLifetimeEnd(valueAllocaCast, valueAllocaSize)
-
 	if unop.CommaOk {
 		commaOk := c.createRuntimeCall("getTaskPromiseData", []llvm.Value{coroutine}, "chan.commaOk.wide")
 		commaOk = c.builder.CreateTrunc(commaOk, c.ctx.Int1Type(), "chan.commaOk")

compiler/compiler.go

@@ -30,7 +30,6 @@ func init() {
 type Config struct {
 	Triple        string   // LLVM target triple, e.g. x86_64-unknown-linux-gnu (empty string means default)
 	CPU           string   // LLVM CPU name, e.g. atmega328p (empty string means default)
-	Features      []string // LLVM CPU features
 	GOOS          string   //
 	GOARCH        string   //
 	GC            string   // garbage collection strategy
@@ -53,6 +52,7 @@ type Compiler struct {
 	dibuilder               *llvm.DIBuilder
 	cu                      llvm.Metadata
 	difiles                 map[string]llvm.Metadata
+	ditypes                 map[string]llvm.Metadata
 	machine                 llvm.TargetMachine
 	targetData              llvm.TargetData
 	intType                 llvm.Type
@@ -96,17 +96,14 @@ func NewCompiler(pkgName string, config Config) (*Compiler, error) {
 	c := &Compiler{
 		Config:  config,
 		difiles: make(map[string]llvm.Metadata),
+		ditypes: make(map[string]llvm.Metadata),
 	}
 
 	target, err := llvm.GetTargetFromTriple(config.Triple)
 	if err != nil {
 		return nil, err
 	}
-	features := ""
-	if len(config.Features) > 0 {
-		features = strings.Join(config.Features, `,`)
-	}
-	c.machine = target.CreateTargetMachine(config.Triple, config.CPU, features, llvm.CodeGenLevelDefault, llvm.RelocStatic, llvm.CodeModelDefault)
+	c.machine = target.CreateTargetMachine(config.Triple, config.CPU, "", llvm.CodeGenLevelDefault, llvm.RelocStatic, llvm.CodeModelDefault)
 	c.targetData = c.machine.CreateTargetData()
 
 	c.ctx = llvm.NewContext()
@@ -200,7 +197,7 @@ func (c *Compiler) Compile(mainPath string) []error {
 		},
 		ShouldOverlay: func(path string) bool {
 			switch path {
-			case "machine", "os", "reflect", "runtime", "runtime/volatile", "sync":
+			case "machine", "os", "reflect", "runtime", "sync":
 				return true
 			default:
 				if strings.HasPrefix(path, "device/") || strings.HasPrefix(path, "examples/") {
@@ -255,7 +252,7 @@ func (c *Compiler) Compile(mainPath string) []error {
 	// Initialize debug information.
 	if c.Debug {
 		c.cu = c.dibuilder.CreateCompileUnit(llvm.DICompileUnit{
-			Language:  0xb, // DW_LANG_C99 (0xc, off-by-one?)
+			Language:  llvm.DW_LANG_Go,
 			File:      mainPath,
 			Dir:       "",
 			Producer:  "TinyGo",
@@ -390,13 +387,6 @@ func (c *Compiler) Compile(mainPath string) []error {
 				llvm.ConstInt(c.ctx.Int32Type(), 3, false).ConstantAsMetadata(), // DWARF version
 			}),
 		)
-		c.mod.AddNamedMetadataOperand("llvm.module.flags",
-			c.ctx.MDNode([]llvm.Metadata{
-				llvm.ConstInt(c.ctx.Int32Type(), 1, false).ConstantAsMetadata(),
-				llvm.GlobalContext().MDString("Dwarf Version"),
-				llvm.ConstInt(c.ctx.Int32Type(), 4, false).ConstantAsMetadata(),
-			}),
-		)
 		c.dibuilder.Finalize()
 	}
 
@@ -560,166 +550,39 @@ func isPointer(typ types.Type) bool {
 
 // Get the DWARF type for this Go type.
 func (c *Compiler) getDIType(typ types.Type) llvm.Metadata {
-	llvmType := c.getLLVMType(typ)
-	sizeInBytes := c.targetData.TypeAllocSize(llvmType)
-	switch typ := typ.(type) {
-	case *types.Array:
-		return c.dibuilder.CreateArrayType(llvm.DIArrayType{
-			SizeInBits:  sizeInBytes * 8,
-			AlignInBits: uint32(c.targetData.ABITypeAlignment(llvmType)) * 8,
-			ElementType: c.getDIType(typ.Elem()),
-			Subscripts: []llvm.DISubrange{
-				llvm.DISubrange{
-					Lo:    0,
-					Count: typ.Len(),
-				},
-			},
-		})
-	case *types.Basic:
+	name := typ.String()
+	if dityp, ok := c.ditypes[name]; ok {
+		return dityp
+	} else {
+		llvmType := c.getLLVMType(typ)
+		sizeInBytes := c.targetData.TypeAllocSize(llvmType)
 		var encoding llvm.DwarfTypeEncoding
-		if typ.Info()&types.IsBoolean != 0 {
-			encoding = llvm.DW_ATE_boolean
-		} else if typ.Info()&types.IsFloat != 0 {
-			encoding = llvm.DW_ATE_float
-		} else if typ.Info()&types.IsComplex != 0 {
-			encoding = llvm.DW_ATE_complex_float
-		} else if typ.Info()&types.IsUnsigned != 0 {
-			encoding = llvm.DW_ATE_unsigned
-		} else if typ.Info()&types.IsInteger != 0 {
-			encoding = llvm.DW_ATE_signed
-		} else if typ.Kind() == types.UnsafePointer {
-			return c.dibuilder.CreatePointerType(llvm.DIPointerType{
-				Name:         "unsafe.Pointer",
-				SizeInBits:   c.targetData.TypeAllocSize(llvmType) * 8,
-				AlignInBits:  uint32(c.targetData.ABITypeAlignment(llvmType)) * 8,
-				AddressSpace: 0,
-			})
-		} else if typ.Info()&types.IsString != 0 {
-			return c.dibuilder.CreateStructType(llvm.Metadata{}, llvm.DIStructType{
-				Name:        "string",
-				SizeInBits:  sizeInBytes * 8,
-				AlignInBits: uint32(c.targetData.ABITypeAlignment(llvmType)) * 8,
-				Elements: []llvm.Metadata{
-					c.dibuilder.CreateMemberType(llvm.Metadata{}, llvm.DIMemberType{
-						Name:         "ptr",
-						SizeInBits:   c.targetData.TypeAllocSize(c.i8ptrType) * 8,
-						AlignInBits:  uint32(c.targetData.ABITypeAlignment(c.i8ptrType)) * 8,
-						OffsetInBits: 0,
-						Type:         c.getDIType(types.NewPointer(types.Typ[types.Byte])),
-					}),
-					c.dibuilder.CreateMemberType(llvm.Metadata{}, llvm.DIMemberType{
-						Name:         "len",
-						SizeInBits:   c.targetData.TypeAllocSize(c.uintptrType) * 8,
-						AlignInBits:  uint32(c.targetData.ABITypeAlignment(c.uintptrType)) * 8,
-						OffsetInBits: c.targetData.ElementOffset(llvmType, 1) * 8,
-						Type:         c.getDIType(types.Typ[types.Uintptr]),
-					}),
-				},
-			})
-		} else {
-			panic("unknown basic type")
+		switch typ := typ.(type) {
+		case *types.Basic:
+			if typ.Info()&types.IsBoolean != 0 {
+				encoding = llvm.DW_ATE_boolean
+			} else if typ.Info()&types.IsFloat != 0 {
+				encoding = llvm.DW_ATE_float
+			} else if typ.Info()&types.IsComplex != 0 {
+				encoding = llvm.DW_ATE_complex_float
+			} else if typ.Info()&types.IsUnsigned != 0 {
+				encoding = llvm.DW_ATE_unsigned
+			} else if typ.Info()&types.IsInteger != 0 {
+				encoding = llvm.DW_ATE_signed
+			} else if typ.Kind() == types.UnsafePointer {
+				encoding = llvm.DW_ATE_address
+			}
+		case *types.Pointer:
+			encoding = llvm.DW_ATE_address
 		}
-		return c.dibuilder.CreateBasicType(llvm.DIBasicType{
-			Name:       typ.String(),
+		// TODO: other types
+		dityp = c.dibuilder.CreateBasicType(llvm.DIBasicType{
+			Name:       name,
 			SizeInBits: sizeInBytes * 8,
 			Encoding:   encoding,
 		})
-	case *types.Chan:
-		return c.getDIType(types.NewPointer(c.ir.Program.ImportedPackage("runtime").Members["channel"].(*ssa.Type).Type()))
-	case *types.Interface:
-		return c.getDIType(c.ir.Program.ImportedPackage("runtime").Members["_interface"].(*ssa.Type).Type())
-	case *types.Map:
-		return c.getDIType(types.NewPointer(c.ir.Program.ImportedPackage("runtime").Members["hashmap"].(*ssa.Type).Type()))
-	case *types.Named:
-		return c.dibuilder.CreateTypedef(llvm.DITypedef{
-			Type: c.getDIType(typ.Underlying()),
-			Name: typ.String(),
-		})
-	case *types.Pointer:
-		return c.dibuilder.CreatePointerType(llvm.DIPointerType{
-			Pointee:      c.getDIType(typ.Elem()),
-			SizeInBits:   c.targetData.TypeAllocSize(llvmType) * 8,
-			AlignInBits:  uint32(c.targetData.ABITypeAlignment(llvmType)) * 8,
-			AddressSpace: 0,
-		})
-	case *types.Signature:
-		// actually a closure
-		fields := llvmType.StructElementTypes()
-		return c.dibuilder.CreateStructType(llvm.Metadata{}, llvm.DIStructType{
-			SizeInBits:  sizeInBytes * 8,
-			AlignInBits: uint32(c.targetData.ABITypeAlignment(llvmType)) * 8,
-			Elements: []llvm.Metadata{
-				c.dibuilder.CreateMemberType(llvm.Metadata{}, llvm.DIMemberType{
-					Name:         "context",
-					SizeInBits:   c.targetData.TypeAllocSize(fields[1]) * 8,
-					AlignInBits:  uint32(c.targetData.ABITypeAlignment(fields[1])) * 8,
-					OffsetInBits: 0,
-					Type:         c.getDIType(types.Typ[types.UnsafePointer]),
-				}),
-				c.dibuilder.CreateMemberType(llvm.Metadata{}, llvm.DIMemberType{
-					Name:         "fn",
-					SizeInBits:   c.targetData.TypeAllocSize(fields[0]) * 8,
-					AlignInBits:  uint32(c.targetData.ABITypeAlignment(fields[0])) * 8,
-					OffsetInBits: c.targetData.ElementOffset(llvmType, 1) * 8,
-					Type:         c.getDIType(types.Typ[types.UnsafePointer]),
-				}),
-			},
-		})
-	case *types.Slice:
-		fields := llvmType.StructElementTypes()
-		return c.dibuilder.CreateStructType(llvm.Metadata{}, llvm.DIStructType{
-			Name:        typ.String(),
-			SizeInBits:  sizeInBytes * 8,
-			AlignInBits: uint32(c.targetData.ABITypeAlignment(llvmType)) * 8,
-			Elements: []llvm.Metadata{
-				c.dibuilder.CreateMemberType(llvm.Metadata{}, llvm.DIMemberType{
-					Name:         "ptr",
-					SizeInBits:   c.targetData.TypeAllocSize(fields[0]) * 8,
-					AlignInBits:  uint32(c.targetData.ABITypeAlignment(fields[0])) * 8,
-					OffsetInBits: 0,
-					Type:         c.getDIType(types.NewPointer(typ.Elem())),
-				}),
-				c.dibuilder.CreateMemberType(llvm.Metadata{}, llvm.DIMemberType{
-					Name:         "len",
-					SizeInBits:   c.targetData.TypeAllocSize(c.uintptrType) * 8,
-					AlignInBits:  uint32(c.targetData.ABITypeAlignment(c.uintptrType)) * 8,
-					OffsetInBits: c.targetData.ElementOffset(llvmType, 1) * 8,
-					Type:         c.getDIType(types.Typ[types.Uintptr]),
-				}),
-				c.dibuilder.CreateMemberType(llvm.Metadata{}, llvm.DIMemberType{
-					Name:         "cap",
-					SizeInBits:   c.targetData.TypeAllocSize(c.uintptrType) * 8,
-					AlignInBits:  uint32(c.targetData.ABITypeAlignment(c.uintptrType)) * 8,
-					OffsetInBits: c.targetData.ElementOffset(llvmType, 2) * 8,
-					Type:         c.getDIType(types.Typ[types.Uintptr]),
-				}),
-			},
-		})
-	case *types.Struct:
-		elements := make([]llvm.Metadata, typ.NumFields())
-		for i := range elements {
-			field := typ.Field(i)
-			fieldType := field.Type()
-			if _, ok := fieldType.Underlying().(*types.Pointer); ok {
-				// XXX hack to avoid recursive types
-				fieldType = types.Typ[types.UnsafePointer]
-			}
-			llvmField := c.getLLVMType(fieldType)
-			elements[i] = c.dibuilder.CreateMemberType(llvm.Metadata{}, llvm.DIMemberType{
-				Name:         field.Name(),
-				SizeInBits:   c.targetData.TypeAllocSize(llvmField) * 8,
-				AlignInBits:  uint32(c.targetData.ABITypeAlignment(llvmField)) * 8,
-				OffsetInBits: c.targetData.ElementOffset(llvmType, i) * 8,
-				Type:         c.getDIType(fieldType),
-			})
-		}
-		return c.dibuilder.CreateStructType(llvm.Metadata{}, llvm.DIStructType{
-			SizeInBits:  sizeInBytes * 8,
-			AlignInBits: uint32(c.targetData.ABITypeAlignment(llvmType)) * 8,
-			Elements:    elements,
-		})
-	default:
-		panic("unknown type while generating DWARF debug type: " + typ.String())
+		c.ditypes[name] = dityp
+		return dityp
 	}
 }
 
@@ -825,9 +688,6 @@ func (c *Compiler) parseFunc(frame *Frame) {
 	if c.DumpSSA {
 		fmt.Printf("\nfunc %s:\n", frame.fn.Function)
 	}
-	if !frame.fn.LLVMFn.IsDeclaration() {
-		panic("function is already defined: " + frame.fn.LLVMFn.Name())
-	}
 	if !frame.fn.IsExported() {
 		frame.fn.LLVMFn.SetLinkage(llvm.InternalLinkage)
 		frame.fn.LLVMFn.SetUnnamedAddr(true)
@@ -836,14 +696,6 @@ func (c *Compiler) parseFunc(frame *Frame) {
 		frame.fn.LLVMFn.SetFunctionCallConv(85) // CallingConv::AVR_SIGNAL
 	}
 
-	// Some functions have a pragma controlling the inlining level.
-	switch frame.fn.Inline() {
-	case ir.InlineHint:
-		// Add LLVM inline hint to functions with //go:inline pragma.
-		inline := c.ctx.CreateEnumAttribute(llvm.AttributeKindID("inlinehint"), 0)
-		frame.fn.LLVMFn.AddFunctionAttr(inline)
-	}
-
 	// Add debug info, if needed.
 	if c.Debug {
 		if frame.fn.Synthetic == "package initializer" {
@@ -881,30 +733,15 @@ func (c *Compiler) parseFunc(frame *Frame) {
 		// Add debug information to this parameter (if available)
 		if c.Debug && frame.fn.Syntax() != nil {
 			pos := c.ir.Program.Fset.Position(frame.fn.Syntax().Pos())
-			diType := c.getDIType(param.Type())
-			dbgParam := c.dibuilder.CreateParameterVariable(frame.difunc, llvm.DIParameterVariable{
+			c.dibuilder.CreateParameterVariable(frame.difunc, llvm.DIParameterVariable{
 				Name:           param.Name(),
 				File:           c.difiles[pos.Filename],
 				Line:           pos.Line,
-				Type:           diType,
+				Type:           c.getDIType(param.Type()),
 				AlwaysPreserve: true,
 				ArgNo:          i + 1,
 			})
-			loc := c.builder.GetCurrentDebugLocation()
-			if len(fields) == 1 {
-				expr := c.dibuilder.CreateExpression(nil)
-				c.dibuilder.InsertValueAtEnd(fields[0], dbgParam, expr, loc, entryBlock)
-			} else {
-				fieldOffsets := c.expandFormalParamOffsets(llvmType)
-				for i, field := range fields {
-					expr := c.dibuilder.CreateExpression([]int64{
-						0x1000,                     // DW_OP_LLVM_fragment
-						int64(fieldOffsets[i]) * 8, // offset in bits
-						int64(c.targetData.TypeAllocSize(field.Type())) * 8, // size in bits
-					})
-					c.dibuilder.InsertValueAtEnd(field, dbgParam, expr, loc, entryBlock)
-				}
-			}
+			// TODO: set the value of this parameter.
 		}
 	}
 
@@ -1070,7 +907,6 @@ func (c *Compiler) parseInstr(frame *Frame, instr ssa.Instruction) {
 	case *ssa.Store:
 		llvmAddr := c.getValue(frame, instr.Addr)
 		llvmVal := c.getValue(frame, instr.Val)
-		c.emitNilCheck(frame, llvmAddr, "store")
 		if c.targetData.TypeAllocSize(llvmVal.Type()) == 0 {
 			// nothing to store
 			return
@@ -1281,22 +1117,17 @@ func (c *Compiler) parseCall(frame *Frame, instr *ssa.CallCommon) (llvm.Value, e
 
 	// Try to call the function directly for trivially static calls.
 	if fn := instr.StaticCallee(); fn != nil {
-		name := fn.RelString(nil)
-		switch {
-		case name == "device/arm.ReadRegister":
+		switch fn.RelString(nil) {
+		case "device/arm.ReadRegister":
 			return c.emitReadRegister(instr.Args)
-		case name == "device/arm.Asm" || name == "device/avr.Asm":
+		case "device/arm.Asm", "device/avr.Asm":
 			return c.emitAsm(instr.Args)
-		case name == "device/arm.AsmFull" || name == "device/avr.AsmFull":
+		case "device/arm.AsmFull", "device/avr.AsmFull":
 			return c.emitAsmFull(frame, instr)
-		case strings.HasPrefix(name, "device/arm.SVCall"):
+		case "device/arm.SVCall0", "device/arm.SVCall1", "device/arm.SVCall2", "device/arm.SVCall3", "device/arm.SVCall4":
 			return c.emitSVCall(frame, instr.Args)
-		case strings.HasPrefix(name, "syscall.Syscall"):
+		case "syscall.Syscall", "syscall.Syscall6", "syscall.Syscall9":
 			return c.emitSyscall(frame, instr)
-		case strings.HasPrefix(name, "runtime/volatile.Load"):
-			return c.emitVolatileLoad(frame, instr)
-		case strings.HasPrefix(name, "runtime/volatile.Store"):
-			return c.emitVolatileStore(frame, instr)
 		}
 
 		targetFunc := c.ir.GetFunction(fn)
@@ -1377,6 +1208,7 @@ func (c *Compiler) parseExpr(frame *Frame, expr ssa.Value) (llvm.Value, error) {
 	switch expr := expr.(type) {
 	case *ssa.Alloc:
 		typ := c.getLLVMType(expr.Type().Underlying().(*types.Pointer).Elem())
+		var buf llvm.Value
 		if expr.Heap {
 			size := c.targetData.TypeAllocSize(typ)
 			// Calculate ^uintptr(0)
@@ -1387,16 +1219,15 @@ func (c *Compiler) parseExpr(frame *Frame, expr ssa.Value) (llvm.Value, error) {
 			}
 			// TODO: escape analysis
 			sizeValue := llvm.ConstInt(c.uintptrType, size, false)
-			buf := c.createRuntimeCall("alloc", []llvm.Value{sizeValue}, expr.Comment)
+			buf = c.createRuntimeCall("alloc", []llvm.Value{sizeValue}, expr.Comment)
 			buf = c.builder.CreateBitCast(buf, llvm.PointerType(typ, 0), "")
-			return buf, nil
 		} else {
-			buf := c.createEntryBlockAlloca(typ, expr.Comment)
+			buf = c.builder.CreateAlloca(typ, expr.Comment)
 			if c.targetData.TypeAllocSize(typ) != 0 {
 				c.builder.CreateStore(c.getZeroValue(typ), buf) // zero-initialize var
 			}
-			return buf, nil
 		}
+		return buf, nil
 	case *ssa.BinOp:
 		x := c.getValue(frame, expr.X)
 		y := c.getValue(frame, expr.Y)
@@ -1459,12 +1290,10 @@ func (c *Compiler) parseExpr(frame *Frame, expr ssa.Value) (llvm.Value, error) {
 			// This could be done directly, but as this is a very infrequent
 			// operation it's much easier to bitcast it through an alloca.
 			resultType := c.getLLVMType(expr.Type())
-			alloca, allocaPtr, allocaSize := c.createTemporaryAlloca(value.Type(), "union.alloca")
+			alloca := c.builder.CreateAlloca(value.Type(), "")
 			c.builder.CreateStore(value, alloca)
-			bitcast := c.builder.CreateBitCast(alloca, llvm.PointerType(resultType, 0), "union.bitcast")
-			result := c.builder.CreateLoad(bitcast, "union.result")
-			c.emitLifetimeEnd(allocaPtr, allocaSize)
-			return result, nil
+			bitcast := c.builder.CreateBitCast(alloca, llvm.PointerType(resultType, 0), "")
+			return c.builder.CreateLoad(bitcast, ""), nil
 		}
 		result := c.builder.CreateExtractValue(value, expr.Field, "")
 		return result, nil
@@ -1504,13 +1333,11 @@ func (c *Compiler) parseExpr(frame *Frame, expr ssa.Value) (llvm.Value, error) {
 
 		// Can't load directly from array (as index is non-constant), so have to
 		// do it using an alloca+gep+load.
-		alloca, allocaPtr, allocaSize := c.createTemporaryAlloca(array.Type(), "index.alloca")
+		alloca := c.builder.CreateAlloca(array.Type(), "index.alloca")
 		c.builder.CreateStore(array, alloca)
 		zero := llvm.ConstInt(c.ctx.Int32Type(), 0, false)
 		ptr := c.builder.CreateInBoundsGEP(alloca, []llvm.Value{zero, index}, "index.gep")
-		result := c.builder.CreateLoad(ptr, "index.load")
-		c.emitLifetimeEnd(allocaPtr, allocaSize)
-		return result, nil
+		return c.builder.CreateLoad(ptr, "index.load"), nil
 	case *ssa.IndexAddr:
 		val := c.getValue(frame, expr.X)
 		index := c.getValue(frame, expr.Index)
@@ -1589,7 +1416,7 @@ func (c *Compiler) parseExpr(frame *Frame, expr ssa.Value) (llvm.Value, error) {
 		return c.parseMakeClosure(frame, expr)
 	case *ssa.MakeInterface:
 		val := c.getValue(frame, expr.X)
-		return c.parseMakeInterface(val, expr.X.Type(), expr.Pos()), nil
+		return c.parseMakeInterface(val, expr.X.Type(), expr.Pos())
 	case *ssa.MakeMap:
 		mapType := expr.Type().Underlying().(*types.Map)
 		llvmKeyType := c.getLLVMType(mapType.Key().Underlying())
@@ -1598,16 +1425,7 @@ func (c *Compiler) parseExpr(frame *Frame, expr ssa.Value) (llvm.Value, error) {
 		valueSize := c.targetData.TypeAllocSize(llvmValueType)
 		llvmKeySize := llvm.ConstInt(c.ctx.Int8Type(), keySize, false)
 		llvmValueSize := llvm.ConstInt(c.ctx.Int8Type(), valueSize, false)
-		sizeHint := llvm.ConstInt(c.uintptrType, 8, false)
-		if expr.Reserve != nil {
-			sizeHint = c.getValue(frame, expr.Reserve)
-			var err error
-			sizeHint, err = c.parseConvert(expr.Reserve.Type(), types.Typ[types.Uintptr], sizeHint, expr.Pos())
-			if err != nil {
-				return llvm.Value{}, err
-			}
-		}
-		hashmap := c.createRuntimeCall("hashmapMake", []llvm.Value{llvmKeySize, llvmValueSize, sizeHint}, "")
+		hashmap := c.createRuntimeCall("hashmapMake", []llvm.Value{llvmKeySize, llvmValueSize}, "")
 		return hashmap, nil
 	case *ssa.MakeSlice:
 		sliceLen := c.getValue(frame, expr.Len)
@@ -1670,16 +1488,16 @@ func (c *Compiler) parseExpr(frame *Frame, expr ssa.Value) (llvm.Value, error) {
 			llvmKeyType := c.getLLVMType(rangeVal.Type().Underlying().(*types.Map).Key())
 			llvmValueType := c.getLLVMType(rangeVal.Type().Underlying().(*types.Map).Elem())
 
-			mapKeyAlloca, mapKeyPtr, mapKeySize := c.createTemporaryAlloca(llvmKeyType, "range.key")
-			mapValueAlloca, mapValuePtr, mapValueSize := c.createTemporaryAlloca(llvmValueType, "range.value")
+			mapKeyAlloca := c.builder.CreateAlloca(llvmKeyType, "range.key")
+			mapKeyPtr := c.builder.CreateBitCast(mapKeyAlloca, c.i8ptrType, "range.keyptr")
+			mapValueAlloca := c.builder.CreateAlloca(llvmValueType, "range.value")
+			mapValuePtr := c.builder.CreateBitCast(mapValueAlloca, c.i8ptrType, "range.valueptr")
 			ok := c.createRuntimeCall("hashmapNext", []llvm.Value{llvmRangeVal, it, mapKeyPtr, mapValuePtr}, "range.next")
 
 			tuple := llvm.Undef(c.ctx.StructType([]llvm.Type{c.ctx.Int1Type(), llvmKeyType, llvmValueType}, false))
 			tuple = c.builder.CreateInsertValue(tuple, ok, 0, "")
 			tuple = c.builder.CreateInsertValue(tuple, c.builder.CreateLoad(mapKeyAlloca, ""), 1, "")
 			tuple = c.builder.CreateInsertValue(tuple, c.builder.CreateLoad(mapValueAlloca, ""), 2, "")
-			c.emitLifetimeEnd(mapKeyPtr, mapKeySize)
-			c.emitLifetimeEnd(mapValuePtr, mapValueSize)
 			return tuple, nil
 		}
 	case *ssa.Phi:
@@ -1696,7 +1514,7 @@ func (c *Compiler) parseExpr(frame *Frame, expr ssa.Value) (llvm.Value, error) {
 		default:
 			panic("unknown type in range: " + typ.String())
 		}
-		it, _, _ := c.createTemporaryAlloca(iteratorType, "range.it")
+		it := c.builder.CreateAlloca(iteratorType, "range.it")
 		c.builder.CreateStore(c.getZeroValue(iteratorType), it)
 		return it, nil
 	case *ssa.Select:
@@ -2126,12 +1944,10 @@ func (c *Compiler) parseBinOp(op token.Token, typ types.Type, x, y llvm.Value, p
 		default:
 			return llvm.Value{}, c.makeError(pos, "binop on interface: "+op.String())
 		}
-	case *types.Chan, *types.Map, *types.Pointer:
+	case *types.Map, *types.Pointer:
 		// Maps are in general not comparable, but can be compared against nil
 		// (which is a nil pointer). This means they can be trivially compared
 		// by treating them as a pointer.
-		// Channels behave as pointers in that they are equal as long as they
-		// are created with the same call to make or if both are nil.
 		switch op {
 		case token.EQL: // ==
 			return c.builder.CreateICmp(llvm.IntEQ, x, y, ""), nil

compiler/func-lowering.go

@@ -154,17 +154,17 @@ func (c *Compiler) LowerFuncValues() {
 				// What we'll do is transform the following:
 				//     rawPtr := runtime.getFuncPtr(fn)
 				//     if func.rawPtr == nil {
-				//         runtime.nilPanic()
+				//         runtime.nilpanic()
 				//     }
 				//     result := func.rawPtr(...args, func.context)
 				// into this:
 				//     if false {
-				//         runtime.nilPanic()
+				//         runtime.nilpanic()
 				//     }
 				//     var result // Phi
 				//     switch fn.id {
 				//     case 0:
-				//         runtime.nilPanic()
+				//         runtime.nilpanic()
 				//     case 1:
 				//         result = call first implementation...
 				//     case 2:
@@ -222,7 +222,7 @@ func (c *Compiler) LowerFuncValues() {
 				// The 0 case, which is actually a nil check.
 				nilBlock := llvm.InsertBasicBlock(nextBlock, "func.nil")
 				c.builder.SetInsertPointAtEnd(nilBlock)
-				c.createRuntimeCall("nilPanic", nil, "")
+				c.createRuntimeCall("nilpanic", nil, "")
 				c.builder.CreateUnreachable()
 				sw.AddCase(llvm.ConstInt(c.uintptrType, 0, false), nilBlock)
 

compiler/goroutine-lowering.go

@@ -389,20 +389,7 @@ func (c *Compiler) markAsyncFunctions() (needsScheduler bool, err error) {
 
 			c.builder.SetInsertPointBefore(inst)
 
-			var parentHandle llvm.Value
-			if f.Linkage() == llvm.ExternalLinkage {
-				// Exported function.
-				// Note that getTaskPromisePtr will panic if it is called with
-				// a nil pointer, so blocking exported functions that try to
-				// return anything will not work.
-				parentHandle = llvm.ConstPointerNull(c.i8ptrType)
-			} else {
-				parentHandle = f.LastParam()
-				if parentHandle.IsNil() || parentHandle.Name() != "parentHandle" {
-					// sanity check
-					panic("trying to make exported function async")
-				}
-			}
+			parentHandle := f.LastParam()
 
 			// Store return values.
 			switch inst.OperandsCount() {
@@ -430,7 +417,7 @@ func (c *Compiler) markAsyncFunctions() (needsScheduler bool, err error) {
 			// behavior somehow (with the unreachable instruction).
 			continuePoint := c.builder.CreateCall(coroSuspendFunc, []llvm.Value{
 				llvm.ConstNull(c.ctx.TokenType()),
-				llvm.ConstInt(c.ctx.Int1Type(), 0, false),
+				llvm.ConstInt(c.ctx.Int1Type(), 1, false),
 			}, "ret")
 			sw := c.builder.CreateSwitch(continuePoint, frame.suspendBlock, 2)
 			sw.AddCase(llvm.ConstInt(c.ctx.Int8Type(), 0, false), frame.unreachableBlock)
@@ -501,7 +488,7 @@ func (c *Compiler) markAsyncFunctions() (needsScheduler bool, err error) {
 		c.builder.SetInsertPointBefore(deadlockCall)
 		continuePoint := c.builder.CreateCall(coroSuspendFunc, []llvm.Value{
 			llvm.ConstNull(c.ctx.TokenType()),
-			llvm.ConstInt(c.ctx.Int1Type(), 0, false),
+			llvm.ConstInt(c.ctx.Int1Type(), 1, false), // final suspend
 		}, "")
 		c.splitBasicBlock(deadlockCall, llvm.NextBasicBlock(c.builder.GetInsertBlock()), "task.wakeup.dead")
 		c.builder.SetInsertPointBefore(deadlockCall)

compiler/interface.go

@@ -22,10 +22,13 @@ import (
 // value field.
 //
 // An interface value is a {typecode, value} tuple, or {i16, i8*} to be exact.
-func (c *Compiler) parseMakeInterface(val llvm.Value, typ types.Type, pos token.Pos) llvm.Value {
+func (c *Compiler) parseMakeInterface(val llvm.Value, typ types.Type, pos token.Pos) (llvm.Value, error) {
 	itfValue := c.emitPointerPack([]llvm.Value{val})
 	itfTypeCodeGlobal := c.getTypeCode(typ)
-	itfMethodSetGlobal := c.getTypeMethodSet(typ)
+	itfMethodSetGlobal, err := c.getTypeMethodSet(typ)
+	if err != nil {
+		return llvm.Value{}, nil
+	}
 	itfConcreteTypeGlobal := c.mod.NamedGlobal("typeInInterface:" + itfTypeCodeGlobal.Name())
 	if itfConcreteTypeGlobal.IsNil() {
 		typeInInterface := c.mod.GetTypeByName("runtime.typeInInterface")
@@ -38,7 +41,7 @@ func (c *Compiler) parseMakeInterface(val llvm.Value, typ types.Type, pos token.
 	itf := llvm.Undef(c.mod.GetTypeByName("runtime._interface"))
 	itf = c.builder.CreateInsertValue(itf, itfTypeCode, 0, "")
 	itf = c.builder.CreateInsertValue(itf, itfValue, 1, "")
-	return itf
+	return itf, nil
 }
 
 // getTypeCode returns a reference to a type code.
@@ -152,18 +155,18 @@ func getTypeCodeName(t types.Type) string {
 
 // getTypeMethodSet returns a reference (GEP) to a global method set. This
 // method set should be unreferenced after the interface lowering pass.
-func (c *Compiler) getTypeMethodSet(typ types.Type) llvm.Value {
+func (c *Compiler) getTypeMethodSet(typ types.Type) (llvm.Value, error) {
 	global := c.mod.NamedGlobal(typ.String() + "$methodset")
 	zero := llvm.ConstInt(c.ctx.Int32Type(), 0, false)
 	if !global.IsNil() {
 		// the method set already exists
-		return llvm.ConstGEP(global, []llvm.Value{zero, zero})
+		return llvm.ConstGEP(global, []llvm.Value{zero, zero}), nil
 	}
 
 	ms := c.ir.Program.MethodSets.MethodSet(typ)
 	if ms.Len() == 0 {
 		// no methods, so can leave that one out
-		return llvm.ConstPointerNull(llvm.PointerType(c.mod.GetTypeByName("runtime.interfaceMethodInfo"), 0))
+		return llvm.ConstPointerNull(llvm.PointerType(c.mod.GetTypeByName("runtime.interfaceMethodInfo"), 0)), nil
 	}
 
 	methods := make([]llvm.Value, ms.Len())
@@ -176,7 +179,10 @@ func (c *Compiler) getTypeMethodSet(typ types.Type) llvm.Value {
 			// compiler error, so panic
 			panic("cannot find function: " + f.LinkName())
 		}
-		fn := c.getInterfaceInvokeWrapper(f)
+		fn, err := c.getInterfaceInvokeWrapper(f)
+		if err != nil {
+			return llvm.Value{}, err
+		}
 		methodInfo := llvm.ConstNamedStruct(interfaceMethodInfoType, []llvm.Value{
 			signatureGlobal,
 			llvm.ConstPtrToInt(fn, c.uintptrType),
@@ -189,7 +195,7 @@ func (c *Compiler) getTypeMethodSet(typ types.Type) llvm.Value {
 	global.SetInitializer(value)
 	global.SetGlobalConstant(true)
 	global.SetLinkage(llvm.PrivateLinkage)
-	return llvm.ConstGEP(global, []llvm.Value{zero, zero})
+	return llvm.ConstGEP(global, []llvm.Value{zero, zero}), nil
 }
 
 // getInterfaceMethodSet returns a global variable with the method set of the
@@ -359,12 +365,12 @@ type interfaceInvokeWrapper struct {
 // the underlying value, dereferences it, and calls the real method. This
 // wrapper is only needed when the interface value actually doesn't fit in a
 // pointer and a pointer to the value must be created.
-func (c *Compiler) getInterfaceInvokeWrapper(f *ir.Function) llvm.Value {
+func (c *Compiler) getInterfaceInvokeWrapper(f *ir.Function) (llvm.Value, error) {
 	wrapperName := f.LinkName() + "$invoke"
 	wrapper := c.mod.NamedFunction(wrapperName)
 	if !wrapper.IsNil() {
 		// Wrapper already created. Return it directly.
-		return wrapper
+		return wrapper, nil
 	}
 
 	// Get the expanded receiver type.
@@ -377,7 +383,7 @@ func (c *Compiler) getInterfaceInvokeWrapper(f *ir.Function) llvm.Value {
 		// Casting a function signature to a different signature and calling it
 		// with a receiver pointer bitcasted to *i8 (as done in calls on an
 		// interface) is hopefully a safe (defined) operation.
-		return f.LLVMFn
+		return f.LLVMFn, nil
 	}
 
 	// create wrapper function
@@ -390,7 +396,7 @@ func (c *Compiler) getInterfaceInvokeWrapper(f *ir.Function) llvm.Value {
 		wrapper:      wrapper,
 		receiverType: receiverType,
 	})
-	return wrapper
+	return wrapper, nil
 }
 
 // createInterfaceInvokeWrapper finishes the work of getInterfaceInvokeWrapper,

compiler/llvm.go

@@ -22,54 +22,6 @@ func getUses(value llvm.Value) []llvm.Value {
 	return uses
 }
 
-// createEntryBlockAlloca creates a new alloca in the entry block, even though
-// the IR builder is located elsewhere. It assumes that the insert point is
-// at the end of the current block.
-func (c *Compiler) createEntryBlockAlloca(t llvm.Type, name string) llvm.Value {
-	currentBlock := c.builder.GetInsertBlock()
-	entryBlock := currentBlock.Parent().EntryBasicBlock()
-	if entryBlock.FirstInstruction().IsNil() {
-		c.builder.SetInsertPointAtEnd(entryBlock)
-	} else {
-		c.builder.SetInsertPointBefore(entryBlock.FirstInstruction())
-	}
-	alloca := c.builder.CreateAlloca(t, name)
-	c.builder.SetInsertPointAtEnd(currentBlock)
-	return alloca
-}
-
-// createTemporaryAlloca creates a new alloca in the entry block and adds
-// lifetime start infromation in the IR signalling that the alloca won't be used
-// before this point.
-//
-// This is useful for creating temporary allocas for intrinsics. Don't forget to
-// end the lifetime using emitLifetimeEnd after you're done with it.
-func (c *Compiler) createTemporaryAlloca(t llvm.Type, name string) (alloca, bitcast, size llvm.Value) {
-	alloca = c.createEntryBlockAlloca(t, name)
-	bitcast = c.builder.CreateBitCast(alloca, c.i8ptrType, name+".bitcast")
-	size = llvm.ConstInt(c.ctx.Int64Type(), c.targetData.TypeAllocSize(t), false)
-	c.builder.CreateCall(c.getLifetimeStartFunc(), []llvm.Value{size, bitcast}, "")
-	return
-}
-
-// emitLifetimeEnd signals the end of an (alloca) lifetime by calling the
-// llvm.lifetime.end intrinsic. It is commonly used together with
-// createTemporaryAlloca.
-func (c *Compiler) emitLifetimeEnd(ptr, size llvm.Value) {
-	c.builder.CreateCall(c.getLifetimeEndFunc(), []llvm.Value{size, ptr}, "")
-}
-
-// getLifetimeStartFunc returns the llvm.lifetime.start intrinsic and creates it
-// first if it doesn't exist yet.
-func (c *Compiler) getLifetimeStartFunc() llvm.Value {
-	fn := c.mod.NamedFunction("llvm.lifetime.start.p0i8")
-	if fn.IsNil() {
-		fnType := llvm.FunctionType(c.ctx.VoidType(), []llvm.Type{c.ctx.Int64Type(), c.i8ptrType}, false)
-		fn = llvm.AddFunction(c.mod, "llvm.lifetime.start.p0i8", fnType)
-	}
-	return fn
-}
-
 // getLifetimeEndFunc returns the llvm.lifetime.end intrinsic and creates it
 // first if it doesn't exist yet.
 func (c *Compiler) getLifetimeEndFunc() llvm.Value {

compiler/map.go

@@ -11,13 +11,8 @@ import (
 
 func (c *Compiler) emitMapLookup(keyType, valueType types.Type, m, key llvm.Value, commaOk bool, pos token.Pos) (llvm.Value, error) {
 	llvmValueType := c.getLLVMType(valueType)
-
-	// Allocate the memory for the resulting type. Do not zero this memory: it
-	// will be zeroed by the hashmap get implementation if the key is not
-	// present in the map.
-	mapValueAlloca, mapValuePtr, mapValueSize := c.createTemporaryAlloca(llvmValueType, "hashmap.value")
-
-	// Do the lookup. How it is done depends on the key type.
+	mapValueAlloca := c.builder.CreateAlloca(llvmValueType, "hashmap.value")
+	mapValuePtr := c.builder.CreateBitCast(mapValueAlloca, c.i8ptrType, "hashmap.valueptr")
 	var commaOkValue llvm.Value
 	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
 		// key is a string
@@ -25,24 +20,15 @@ func (c *Compiler) emitMapLookup(keyType, valueType types.Type, m, key llvm.Valu
 		commaOkValue = c.createRuntimeCall("hashmapStringGet", params, "")
 	} else if hashmapIsBinaryKey(keyType) {
 		// key can be compared with runtime.memequal
-		// Store the key in an alloca, in the entry block to avoid dynamic stack
-		// growth.
-		mapKeyAlloca, mapKeyPtr, mapKeySize := c.createTemporaryAlloca(key.Type(), "hashmap.key")
-		c.builder.CreateStore(key, mapKeyAlloca)
-		// Fetch the value from the hashmap.
-		params := []llvm.Value{m, mapKeyPtr, mapValuePtr}
+		keyAlloca := c.builder.CreateAlloca(key.Type(), "hashmap.key")
+		c.builder.CreateStore(key, keyAlloca)
+		keyPtr := c.builder.CreateBitCast(keyAlloca, c.i8ptrType, "hashmap.keyptr")
+		params := []llvm.Value{m, keyPtr, mapValuePtr}
 		commaOkValue = c.createRuntimeCall("hashmapBinaryGet", params, "")
-		c.emitLifetimeEnd(mapKeyPtr, mapKeySize)
 	} else {
-		// Not trivially comparable using memcmp.
 		return llvm.Value{}, c.makeError(pos, "only strings, bools, ints or structs of bools/ints are supported as map keys, but got: "+keyType.String())
 	}
-
-	// Load the resulting value from the hashmap. The value is set to the zero
-	// value if the key doesn't exist in the hashmap.
 	mapValue := c.builder.CreateLoad(mapValueAlloca, "")
-	c.emitLifetimeEnd(mapValuePtr, mapValueSize)
-
 	if commaOk {
 		tuple := llvm.Undef(c.ctx.StructType([]llvm.Type{llvmValueType, c.ctx.Int1Type()}, false))
 		tuple = c.builder.CreateInsertValue(tuple, mapValue, 0, "")
@@ -54,8 +40,9 @@ func (c *Compiler) emitMapLookup(keyType, valueType types.Type, m, key llvm.Valu
 }
 
 func (c *Compiler) emitMapUpdate(keyType types.Type, m, key, value llvm.Value, pos token.Pos) {
-	valueAlloca, valuePtr, valueSize := c.createTemporaryAlloca(value.Type(), "hashmap.value")
+	valueAlloca := c.builder.CreateAlloca(value.Type(), "hashmap.value")
 	c.builder.CreateStore(value, valueAlloca)
+	valuePtr := c.builder.CreateBitCast(valueAlloca, c.i8ptrType, "hashmap.valueptr")
 	keyType = keyType.Underlying()
 	if t, ok := keyType.(*types.Basic); ok && t.Info()&types.IsString != 0 {
 		// key is a string
@@ -63,15 +50,14 @@ func (c *Compiler) emitMapUpdate(keyType types.Type, m, key, value llvm.Value, p
 		c.createRuntimeCall("hashmapStringSet", params, "")
 	} else if hashmapIsBinaryKey(keyType) {
 		// key can be compared with runtime.memequal
-		keyAlloca, keyPtr, keySize := c.createTemporaryAlloca(key.Type(), "hashmap.key")
+		keyAlloca := c.builder.CreateAlloca(key.Type(), "hashmap.key")
 		c.builder.CreateStore(key, keyAlloca)
+		keyPtr := c.builder.CreateBitCast(keyAlloca, c.i8ptrType, "hashmap.keyptr")
 		params := []llvm.Value{m, keyPtr, valuePtr}
 		c.createRuntimeCall("hashmapBinarySet", params, "")
-		c.emitLifetimeEnd(keyPtr, keySize)
 	} else {
 		c.addError(pos, "only strings, bools, ints or structs of bools/ints are supported as map keys, but got: "+keyType.String())
 	}
-	c.emitLifetimeEnd(valuePtr, valueSize)
 }
 
 func (c *Compiler) emitMapDelete(keyType types.Type, m, key llvm.Value, pos token.Pos) error {
@@ -82,11 +68,11 @@ func (c *Compiler) emitMapDelete(keyType types.Type, m, key llvm.Value, pos toke
 		c.createRuntimeCall("hashmapStringDelete", params, "")
 		return nil
 	} else if hashmapIsBinaryKey(keyType) {
-		keyAlloca, keyPtr, keySize := c.createTemporaryAlloca(key.Type(), "hashmap.key")
+		keyAlloca := c.builder.CreateAlloca(key.Type(), "hashmap.key")
 		c.builder.CreateStore(key, keyAlloca)
+		keyPtr := c.builder.CreateBitCast(keyAlloca, c.i8ptrType, "hashmap.keyptr")
 		params := []llvm.Value{m, keyPtr}
 		c.createRuntimeCall("hashmapBinaryDelete", params, "")
-		c.emitLifetimeEnd(keyPtr, keySize)
 		return nil
 	} else {
 		return c.makeError(pos, "only strings, bools, ints or structs of bools/ints are supported as map keys, but got: "+keyType.String())

compiler/volatile.go

@@ -1,26 +0,0 @@
-package compiler
-
-// This file implements volatile loads/stores in runtime/volatile.LoadT and
-// runtime/volatile.StoreT as compiler builtins.
-
-import (
-	"golang.org/x/tools/go/ssa"
-	"tinygo.org/x/go-llvm"
-)
-
-func (c *Compiler) emitVolatileLoad(frame *Frame, instr *ssa.CallCommon) (llvm.Value, error) {
-	addr := c.getValue(frame, instr.Args[0])
-	c.emitNilCheck(frame, addr, "deref")
-	val := c.builder.CreateLoad(addr, "")
-	val.SetVolatile(true)
-	return val, nil
-}
-
-func (c *Compiler) emitVolatileStore(frame *Frame, instr *ssa.CallCommon) (llvm.Value, error) {
-	addr := c.getValue(frame, instr.Args[0])
-	val := c.getValue(frame, instr.Args[1])
-	c.emitNilCheck(frame, addr, "deref")
-	store := c.builder.CreateStore(val, addr)
-	store.SetVolatile(true)
-	return llvm.Value{}, nil
-}

compiler/wordpack.go

@@ -34,7 +34,7 @@ func (c *Compiler) emitPointerPack(values []llvm.Value) llvm.Value {
 		}
 		// Because packedType is a struct and we have to cast it to a *i8, store
 		// it in an alloca first for bitcasting (store+bitcast+load).
-		packedAlloc, _, _ = c.createTemporaryAlloca(packedType, "")
+		packedAlloc = c.builder.CreateAlloca(packedType, "")
 	} else {
 		// Packed data is bigger than a pointer, so allocate it on the heap.
 		sizeValue := llvm.ConstInt(c.uintptrType, size, false)
@@ -54,11 +54,7 @@ func (c *Compiler) emitPointerPack(values []llvm.Value) llvm.Value {
 	if packedHeapAlloc.IsNil() {
 		// Load value (as *i8) from the alloca.
 		packedAlloc = c.builder.CreateBitCast(packedAlloc, llvm.PointerType(c.i8ptrType, 0), "")
-		result := c.builder.CreateLoad(packedAlloc, "")
-		packedPtr := c.builder.CreateBitCast(packedAlloc, c.i8ptrType, "")
-		packedSize := llvm.ConstInt(c.ctx.Int64Type(), c.targetData.TypeAllocSize(packedAlloc.Type()), false)
-		c.emitLifetimeEnd(packedPtr, packedSize)
-		return result
+		return c.builder.CreateLoad(packedAlloc, "")
 	} else {
 		// Get the original heap allocation pointer, which already is an *i8.
 		return packedHeapAlloc
@@ -70,7 +66,7 @@ func (c *Compiler) emitPointerUnpack(ptr llvm.Value, valueTypes []llvm.Type) []l
 	packedType := c.ctx.StructType(valueTypes, false)
 
 	// Get a correctly-typed pointer to the packed data.
-	var packedAlloc, packedRawAlloc llvm.Value
+	var packedAlloc llvm.Value
 	size := c.targetData.TypeAllocSize(packedType)
 	if size == 0 {
 		// No data to unpack.
@@ -84,7 +80,7 @@ func (c *Compiler) emitPointerUnpack(ptr llvm.Value, valueTypes []llvm.Type) []l
 			return []llvm.Value{c.builder.CreatePtrToInt(ptr, valueTypes[0], "unpack.int")}
 		}
 		// Fallback: load it using an alloca.
-		packedRawAlloc, _, _ = c.createTemporaryAlloca(llvm.PointerType(c.i8ptrType, 0), "unpack.raw.alloc")
+		packedRawAlloc := c.builder.CreateAlloca(llvm.PointerType(c.i8ptrType, 0), "unpack.raw.alloc")
 		packedRawValue := c.builder.CreateBitCast(ptr, llvm.PointerType(c.i8ptrType, 0), "unpack.raw.value")
 		c.builder.CreateStore(packedRawValue, packedRawAlloc)
 		packedAlloc = c.builder.CreateBitCast(packedRawAlloc, llvm.PointerType(packedType, 0), "unpack.alloc")
@@ -108,10 +104,5 @@ func (c *Compiler) emitPointerUnpack(ptr llvm.Value, valueTypes []llvm.Type) []l
 		gep := c.builder.CreateInBoundsGEP(packedAlloc, indices, "")
 		values[i] = c.builder.CreateLoad(gep, "")
 	}
-	if !packedRawAlloc.IsNil() {
-		allocPtr := c.builder.CreateBitCast(packedRawAlloc, c.i8ptrType, "")
-		allocSize := llvm.ConstInt(c.ctx.Int64Type(), c.targetData.TypeAllocSize(c.uintptrType), false)
-		c.emitLifetimeEnd(allocPtr, allocSize)
-	}
 	return values
 }

go.mod

@@ -1,10 +0,0 @@
-module github.com/tinygo-org/tinygo
-
-go 1.11
-
-require (
-	github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
-	github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46
-	golang.org/x/tools v0.0.0-20190227180812-8dcc6e70cdef
-	tinygo.org/x/go-llvm v0.0.0-20190224120431-7707ae5d1261
-)

go.sum

@@ -1,14 +0,0 @@
-github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 h1:oMCHnXa6CCCafdPDbMh/lWRhRByN0VFLvv+g+ayx1SI=
-github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46 h1:wXG2bA8fO7Vv7lLk2PihFMTqmbT173Tje39oKzQ50Mo=
-github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46/go.mod h1:Pb6XcsXyropB9LNHhnqaknG/vEwYztLkQzVCHv8sQ3M=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190227180812-8dcc6e70cdef h1:ymc9FeDom3RIEA3coKokSllBB1hRcMT0tZ1W3Jf9Ids=
-golang.org/x/tools v0.0.0-20190227180812-8dcc6e70cdef/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-tinygo.org/x/go-llvm v0.0.0-20190224120431-7707ae5d1261 h1:rJS2Hga39YAnm7DE4qrPm6Dr/67EOojL0XPzvbEeBiw=
-tinygo.org/x/go-llvm v0.0.0-20190224120431-7707ae5d1261/go.mod h1:fv1F0BSNpxMfCL0zF3M4OPFbgYHnhtB6ST0HvUtu/LE=

interp/frame.go

@@ -184,25 +184,6 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 			lhs := fr.getLocal(inst.Operand(0)).(*LocalValue).Underlying
 			rhs := fr.getLocal(inst.Operand(1)).(*LocalValue).Underlying
 			predicate := inst.IntPredicate()
-			if predicate == llvm.IntEQ && lhs.Type().TypeKind() == llvm.PointerTypeKind {
-				// Unfortunately, the const propagation in the IR builder
-				// doesn't handle pointer compares of inttoptr values. So we
-				// implement it manually here.
-				lhsNil, ok1 := isPointerNil(lhs)
-				rhsNil, ok2 := isPointerNil(rhs)
-				if ok1 && ok2 {
-					if lhsNil && rhsNil {
-						// Both are nil, so this icmp is always evaluated to true.
-						fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstInt(fr.Mod.Context().Int1Type(), 1, false)}
-						continue
-					}
-					if lhsNil != rhsNil {
-						// Only one of them is nil, so this comparison must return false.
-						fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstInt(fr.Mod.Context().Int1Type(), 0, false)}
-						continue
-					}
-				}
-			}
 			fr.locals[inst] = &LocalValue{fr.Eval, fr.builder.CreateICmp(predicate, lhs, rhs, "")}
 		case !inst.IsAFCmpInst().IsNil():
 			lhs := fr.getLocal(inst.Operand(0)).(*LocalValue).Underlying
@@ -366,8 +347,6 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 				fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstInt(fr.Mod.Context().Int1Type(), implements, false)}
 			case callee.Name() == "runtime.nanotime":
 				fr.locals[inst] = &LocalValue{fr.Eval, llvm.ConstInt(fr.Mod.Context().Int64Type(), 0, false)}
-			case callee.Name() == "llvm.dbg.value":
-				// do nothing
 			case strings.HasPrefix(callee.Name(), "runtime.print") || callee.Name() == "runtime._panic":
 				// This are all print instructions, which necessarily have side
 				// effects but no results.
@@ -480,21 +459,17 @@ func (fr *frame) evalBasicBlock(bb, incoming llvm.BasicBlock, indent string) (re
 			}
 			thenBB := inst.Operand(1)
 			elseBB := inst.Operand(2)
-			if !cond.IsAInstruction().IsNil() {
+			if !cond.IsConstant() {
 				return nil, nil, errors.New("interp: branch on a non-constant")
-			}
-			if !cond.IsAConstantExpr().IsNil() {
-				// This may happen when the instruction builder could not
-				// const-fold some instructions.
-				return nil, nil, errors.New("interp: branch on a non-const-propagated constant expression")
-			}
-			switch cond {
-			case llvm.ConstInt(fr.Mod.Context().Int1Type(), 0, false): // false
-				return nil, []llvm.Value{thenBB}, nil // then
-			case llvm.ConstInt(fr.Mod.Context().Int1Type(), 1, false): // true
-				return nil, []llvm.Value{elseBB}, nil // else
-			default:
-				panic("branch was not true or false")
+			} else {
+				switch cond.ZExtValue() {
+				case 0: // false
+					return nil, []llvm.Value{thenBB}, nil // then
+				case 1: // true
+					return nil, []llvm.Value{elseBB}, nil // else
+				default:
+					panic("branch was not true or false")
+				}
 			}
 		case !inst.IsABranchInst().IsNil() && inst.OperandsCount() == 1:
 			// unconditional branch (goto)

interp/interp.go

@@ -18,6 +18,7 @@ type Eval struct {
 	TargetData      llvm.TargetData
 	Debug           bool
 	builder         llvm.Builder
+	dibuilder       *llvm.DIBuilder
 	dirtyGlobals    map[llvm.Value]struct{}
 	sideEffectFuncs map[llvm.Value]*sideEffectResult // cache of side effect scan results
 }
@@ -37,6 +38,7 @@ func Run(mod llvm.Module, targetData llvm.TargetData, debug bool) error {
 		dirtyGlobals: map[llvm.Value]struct{}{},
 	}
 	e.builder = mod.Context().NewBuilder()
+	e.dibuilder = llvm.NewDIBuilder(mod)
 
 	initAll := mod.NamedFunction(name)
 	bb := initAll.EntryBasicBlock()
@@ -47,6 +49,7 @@ func Run(mod llvm.Module, targetData llvm.TargetData, debug bool) error {
 	e.builder.SetInsertPointBefore(bb.FirstInstruction())
 	dummy := e.builder.CreateAlloca(e.Mod.Context().Int8Type(), "dummy")
 	e.builder.SetInsertPointBefore(dummy)
+	e.builder.SetInstDebugLocation(bb.FirstInstruction())
 	var initCalls []llvm.Value
 	for inst := bb.FirstInstruction(); !inst.IsNil(); inst = llvm.NextInstruction(inst) {
 		if inst == dummy {

interp/scan.go

@@ -35,8 +35,6 @@ func (e *Eval) hasSideEffects(fn llvm.Value) *sideEffectResult {
 		return &sideEffectResult{severity: sideEffectLimited}
 	case "runtime.interfaceImplements":
 		return &sideEffectResult{severity: sideEffectNone}
-	case "llvm.dbg.value":
-		return &sideEffectResult{severity: sideEffectNone}
 	}
 	if e.sideEffectFuncs == nil {
 		e.sideEffectFuncs = make(map[llvm.Value]*sideEffectResult)
@@ -109,16 +107,7 @@ func (e *Eval) hasSideEffects(fn llvm.Value) *sideEffectResult {
 				default:
 					panic("unreachable")
 				}
-			case llvm.Load:
-				if inst.IsVolatile() {
-					result.updateSeverity(sideEffectLimited)
-				}
-				if _, ok := e.dirtyGlobals[inst.Operand(0)]; ok {
-					if e.hasLocalSideEffects(dirtyLocals, inst) {
-						result.updateSeverity(sideEffectLimited)
-					}
-				}
-			case llvm.Store:
+			case llvm.Load, llvm.Store:
 				if inst.IsVolatile() {
 					result.updateSeverity(sideEffectLimited)
 				}

interp/utils.go

@@ -94,29 +94,3 @@ func isScalar(t llvm.Type) bool {
 		return false
 	}
 }
-
-// isPointerNil returns whether this is a nil pointer or not. The ok value
-// indicates whether the result is certain: if it is false the result boolean is
-// not valid.
-func isPointerNil(v llvm.Value) (result bool, ok bool) {
-	if !v.IsAConstantExpr().IsNil() {
-		switch v.Opcode() {
-		case llvm.IntToPtr:
-			// Whether a constant inttoptr is nil is easy to
-			// determine.
-			operand := v.Operand(0)
-			if operand.IsConstant() {
-				return operand.ZExtValue() == 0, true
-			}
-		case llvm.BitCast, llvm.GetElementPtr:
-			// These const instructions are just a kind of wrappers for the
-			// underlying pointer.
-			return isPointerNil(v.Operand(0))
-		}
-	}
-	if !v.IsAConstantPointerNull().IsNil() {
-		// A constant pointer null is always null, of course.
-		return true, true
-	}
-	return false, false // not valid
-}

ir/ir.go

@@ -33,12 +33,11 @@ type Program struct {
 type Function struct {
 	*ssa.Function
 	LLVMFn    llvm.Value
-	linkName  string     // go:linkname, go:export, go:interrupt
-	exported  bool       // go:export
-	nobounds  bool       // go:nobounds
-	flag      bool       // used by dead code elimination
-	interrupt bool       // go:interrupt
-	inline    InlineType // go:inline
+	linkName  string // go:linkname, go:export, go:interrupt
+	exported  bool   // go:export
+	nobounds  bool   // go:nobounds
+	flag      bool   // used by dead code elimination
+	interrupt bool   // go:interrupt
 }
 
 // Global variable, possibly constant.
@@ -70,22 +69,7 @@ type Interface struct {
 	Type *types.Interface
 }
 
-type InlineType int
-
-// How much to inline.
-const (
-	// Default behavior. The compiler decides for itself whether any given
-	// function will be inlined. Whether any function is inlined depends on the
-	// optimization level.
-	InlineDefault InlineType = iota
-
-	// Inline hint, just like the C inline keyword (signalled using
-	// //go:inline). The compiler will be more likely to inline this function,
-	// but it is not a guarantee.
-	InlineHint
-)
-
-// Create and initialize a new *Program from a *ssa.Program.
+// Create and intialize a new *Program from a *ssa.Program.
 func NewProgram(lprogram *loader.Program, mainPath string) *Program {
 	comments := map[string]*ast.CommentGroup{}
 	for _, pkgInfo := range lprogram.Sorted() {
@@ -295,8 +279,6 @@ func (f *Function) parsePragmas() {
 				}
 				f.linkName = parts[1]
 				f.exported = true
-			case "//go:inline":
-				f.inline = InlineHint
 			case "//go:interrupt":
 				if len(parts) != 2 {
 					continue
@@ -350,11 +332,6 @@ func (f *Function) IsInterrupt() bool {
 	return f.interrupt
 }
 
-// Return the inline directive of this function.
-func (f *Function) Inline() InlineType {
-	return f.inline
-}
-
 // Return the link name for this function.
 func (f *Function) LinkName() string {
 	if f.linkName != "" {

loader/cgo.go

@@ -0,0 +1,521 @@
+package loader
+
+// This file extracts the `import "C"` statement from the source and modifies
+// the AST for Cgo. It does not use libclang directly (see libclang.go).
+
+import (
+	"go/ast"
+	"go/token"
+	"sort"
+	"strconv"
+	"strings"
+
+	"golang.org/x/tools/go/ast/astutil"
+)
+
+// fileInfo holds all Cgo-related information of a given *ast.File.
+type fileInfo struct {
+	*ast.File
+	*Package
+	filename        string
+	functions       map[string]*functionInfo
+	globals         map[string]*globalInfo
+	typedefs        map[string]*typedefInfo
+	elaboratedTypes map[string]ast.Expr
+	importCPos      token.Pos
+	missingSymbols  map[string]struct{}
+}
+
+// functionInfo stores some information about a Cgo function found by libclang
+// and declared in the AST.
+type functionInfo struct {
+	args    []paramInfo
+	results *ast.FieldList
+}
+
+// paramInfo is a parameter of a Cgo function (see functionInfo).
+type paramInfo struct {
+	name     string
+	typeExpr ast.Expr
+}
+
+// typedefInfo contains information about a single typedef in C.
+type typedefInfo struct {
+	typeExpr ast.Expr
+}
+
+// globalInfo contains information about a declared global variable in C.
+type globalInfo struct {
+	typeExpr ast.Expr
+}
+
+// cgoAliases list type aliases between Go and C, for types that are equivalent
+// in both languages. See addTypeAliases.
+var cgoAliases = map[string]string{
+	"C.int8_t":    "int8",
+	"C.int16_t":   "int16",
+	"C.int32_t":   "int32",
+	"C.int64_t":   "int64",
+	"C.uint8_t":   "uint8",
+	"C.uint16_t":  "uint16",
+	"C.uint32_t":  "uint32",
+	"C.uint64_t":  "uint64",
+	"C.uintptr_t": "uintptr",
+}
+
+// cgoBuiltinAliases are handled specially because they only exist on the Go
+// side of CGo, not on the CGo (they're prefixed with "_Cgo_" there).
+var cgoBuiltinAliases = map[string]struct{}{
+	"char":      struct{}{},
+	"schar":     struct{}{},
+	"uchar":     struct{}{},
+	"short":     struct{}{},
+	"ushort":    struct{}{},
+	"int":       struct{}{},
+	"uint":      struct{}{},
+	"long":      struct{}{},
+	"ulong":     struct{}{},
+	"longlong":  struct{}{},
+	"ulonglong": struct{}{},
+}
+
+// cgoTypes lists some C types with ambiguous sizes that must be retrieved
+// somehow from C. This is done by adding some typedefs to get the size of each
+// type.
+const cgoTypes = `
+typedef char                _Cgo_char;
+typedef signed char         _Cgo_schar;
+typedef unsigned char       _Cgo_uchar;
+typedef short               _Cgo_short;
+typedef unsigned short      _Cgo_ushort;
+typedef int                 _Cgo_int;
+typedef unsigned int        _Cgo_uint;
+typedef long                _Cgo_long;
+typedef unsigned long       _Cgo_ulong;
+typedef long long           _Cgo_longlong;
+typedef unsigned long long  _Cgo_ulonglong;
+`
+
+// processCgo extracts the `import "C"` statement from the AST, parses the
+// comment with libclang, and modifies the AST to use this information.
+func (p *Package) processCgo(filename string, f *ast.File, cflags []string) []error {
+	info := &fileInfo{
+		File:            f,
+		Package:         p,
+		filename:        filename,
+		functions:       map[string]*functionInfo{},
+		globals:         map[string]*globalInfo{},
+		typedefs:        map[string]*typedefInfo{},
+		elaboratedTypes: map[string]ast.Expr{},
+		missingSymbols:  map[string]struct{}{},
+	}
+
+	// Find all C.* symbols.
+	f = astutil.Apply(f, info.findMissingCGoNames, nil).(*ast.File)
+	for name := range cgoBuiltinAliases {
+		info.missingSymbols["_Cgo_"+name] = struct{}{}
+	}
+
+	// Find `import "C"` statements in the file.
+	for i := 0; i < len(f.Decls); i++ {
+		decl := f.Decls[i]
+		genDecl, ok := decl.(*ast.GenDecl)
+		if !ok {
+			continue
+		}
+		if len(genDecl.Specs) != 1 {
+			continue
+		}
+		spec, ok := genDecl.Specs[0].(*ast.ImportSpec)
+		if !ok {
+			continue
+		}
+		path, err := strconv.Unquote(spec.Path.Value)
+		if err != nil {
+			panic("could not parse import path: " + err.Error())
+		}
+		if path != "C" {
+			continue
+		}
+		cgoComment := genDecl.Doc.Text()
+
+		// Stored for later use by generated functions, to use a somewhat sane
+		// source location.
+		info.importCPos = spec.Path.ValuePos
+
+		pos := info.fset.PositionFor(genDecl.Doc.Pos(), true)
+		errs := info.parseFragment(cgoComment+cgoTypes, cflags, pos.Filename, pos.Line)
+		if errs != nil {
+			return errs
+		}
+
+		// Remove this import declaration.
+		f.Decls = append(f.Decls[:i], f.Decls[i+1:]...)
+		i--
+	}
+
+	// Print the AST, for debugging.
+	//ast.Print(p.fset, f)
+
+	// Declare functions found by libclang.
+	info.addFuncDecls()
+
+	// Declare stub function pointer values found by libclang.
+	info.addFuncPtrDecls()
+
+	// Declare globals found by libclang.
+	info.addVarDecls()
+
+	// Forward C types to Go types (like C.uint32_t -> uint32).
+	info.addTypeAliases()
+
+	// Add type declarations for C types, declared using typedef in C.
+	info.addTypedefs()
+
+	// Add elaborated types for C structs and unions.
+	info.addElaboratedTypes()
+
+	// Patch the AST to use the declared types and functions.
+	f = astutil.Apply(f, info.walker, nil).(*ast.File)
+
+	return nil
+}
+
+// addFuncDecls adds the C function declarations found by libclang in the
+// comment above the `import "C"` statement.
+func (info *fileInfo) addFuncDecls() {
+	// TODO: replace all uses of importCPos with the real locations from
+	// libclang.
+	names := make([]string, 0, len(info.functions))
+	for name := range info.functions {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for _, name := range names {
+		fn := info.functions[name]
+		obj := &ast.Object{
+			Kind: ast.Fun,
+			Name: "C." + name,
+		}
+		args := make([]*ast.Field, len(fn.args))
+		decl := &ast.FuncDecl{
+			Name: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    "C." + name,
+				Obj:     obj,
+			},
+			Type: &ast.FuncType{
+				Func: info.importCPos,
+				Params: &ast.FieldList{
+					Opening: info.importCPos,
+					List:    args,
+					Closing: info.importCPos,
+				},
+				Results: fn.results,
+			},
+		}
+		obj.Decl = decl
+		for i, arg := range fn.args {
+			args[i] = &ast.Field{
+				Names: []*ast.Ident{
+					&ast.Ident{
+						NamePos: info.importCPos,
+						Name:    arg.name,
+						Obj: &ast.Object{
+							Kind: ast.Var,
+							Name: arg.name,
+							Decl: decl,
+						},
+					},
+				},
+				Type: arg.typeExpr,
+			}
+		}
+		info.Decls = append(info.Decls, decl)
+	}
+}
+
+// addFuncPtrDecls creates stub declarations of function pointer values. These
+// values will later be replaced with the real values in the compiler.
+// It adds code like the following to the AST:
+//
+//     var (
+//         C.add unsafe.Pointer
+//         C.mul unsafe.Pointer
+//         // ...
+//     )
+func (info *fileInfo) addFuncPtrDecls() {
+	if len(info.functions) == 0 {
+		return
+	}
+	gen := &ast.GenDecl{
+		TokPos: info.importCPos,
+		Tok:    token.VAR,
+		Lparen: info.importCPos,
+		Rparen: info.importCPos,
+	}
+	names := make([]string, 0, len(info.functions))
+	for name := range info.functions {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for _, name := range names {
+		obj := &ast.Object{
+			Kind: ast.Typ,
+			Name: "C." + name + "$funcaddr",
+		}
+		valueSpec := &ast.ValueSpec{
+			Names: []*ast.Ident{&ast.Ident{
+				NamePos: info.importCPos,
+				Name:    "C." + name + "$funcaddr",
+				Obj:     obj,
+			}},
+			Type: &ast.SelectorExpr{
+				X: &ast.Ident{
+					NamePos: info.importCPos,
+					Name:    "unsafe",
+				},
+				Sel: &ast.Ident{
+					NamePos: info.importCPos,
+					Name:    "Pointer",
+				},
+			},
+		}
+		obj.Decl = valueSpec
+		gen.Specs = append(gen.Specs, valueSpec)
+	}
+	info.Decls = append(info.Decls, gen)
+}
+
+// addVarDecls declares external C globals in the Go source.
+// It adds code like the following to the AST:
+//
+//     var (
+//         C.globalInt  int
+//         C.globalBool bool
+//         // ...
+//     )
+func (info *fileInfo) addVarDecls() {
+	if len(info.globals) == 0 {
+		return
+	}
+	gen := &ast.GenDecl{
+		TokPos: info.importCPos,
+		Tok:    token.VAR,
+		Lparen: info.importCPos,
+		Rparen: info.importCPos,
+	}
+	names := make([]string, 0, len(info.globals))
+	for name := range info.globals {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for _, name := range names {
+		global := info.globals[name]
+		obj := &ast.Object{
+			Kind: ast.Typ,
+			Name: "C." + name,
+		}
+		valueSpec := &ast.ValueSpec{
+			Names: []*ast.Ident{&ast.Ident{
+				NamePos: info.importCPos,
+				Name:    "C." + name,
+				Obj:     obj,
+			}},
+			Type: global.typeExpr,
+		}
+		obj.Decl = valueSpec
+		gen.Specs = append(gen.Specs, valueSpec)
+	}
+	info.Decls = append(info.Decls, gen)
+}
+
+// addTypeAliases aliases some built-in Go types with their equivalent C types.
+// It adds code like the following to the AST:
+//
+//     type (
+//         C.int8_t  = int8
+//         C.int16_t = int16
+//         // ...
+//     )
+func (info *fileInfo) addTypeAliases() {
+	aliasKeys := make([]string, 0, len(cgoAliases))
+	for key := range cgoAliases {
+		aliasKeys = append(aliasKeys, key)
+	}
+	sort.Strings(aliasKeys)
+	gen := &ast.GenDecl{
+		TokPos: info.importCPos,
+		Tok:    token.TYPE,
+		Lparen: info.importCPos,
+		Rparen: info.importCPos,
+	}
+	for _, typeName := range aliasKeys {
+		goTypeName := cgoAliases[typeName]
+		obj := &ast.Object{
+			Kind: ast.Typ,
+			Name: typeName,
+		}
+		typeSpec := &ast.TypeSpec{
+			Name: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    typeName,
+				Obj:     obj,
+			},
+			Assign: info.importCPos,
+			Type: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    goTypeName,
+			},
+		}
+		obj.Decl = typeSpec
+		gen.Specs = append(gen.Specs, typeSpec)
+	}
+	info.Decls = append(info.Decls, gen)
+}
+
+func (info *fileInfo) addTypedefs() {
+	if len(info.typedefs) == 0 {
+		return
+	}
+	gen := &ast.GenDecl{
+		TokPos: info.importCPos,
+		Tok:    token.TYPE,
+	}
+	names := make([]string, 0, len(info.typedefs))
+	for name := range info.typedefs {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for _, name := range names {
+		typedef := info.typedefs[name]
+		typeName := "C." + name
+		isAlias := true
+		if strings.HasPrefix(name, "_Cgo_") {
+			typeName = "C." + name[len("_Cgo_"):]
+			isAlias = false // C.short etc. should not be aliased to the equivalent Go type (not portable)
+		}
+		if _, ok := cgoAliases[typeName]; ok {
+			// This is a type that also exists in Go (defined in stdint.h).
+			continue
+		}
+		obj := &ast.Object{
+			Kind: ast.Typ,
+			Name: typeName,
+		}
+		typeSpec := &ast.TypeSpec{
+			Name: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    typeName,
+				Obj:     obj,
+			},
+			Type: typedef.typeExpr,
+		}
+		if isAlias {
+			typeSpec.Assign = info.importCPos
+		}
+		obj.Decl = typeSpec
+		gen.Specs = append(gen.Specs, typeSpec)
+	}
+	info.Decls = append(info.Decls, gen)
+}
+
+// addElaboratedTypes adds C elaborated types as aliases. These are the "struct
+// foo" or "union foo" types, often used in a typedef.
+//
+// See also:
+// https://en.cppreference.com/w/cpp/language/elaborated_type_specifier
+func (info *fileInfo) addElaboratedTypes() {
+	if len(info.elaboratedTypes) == 0 {
+		return
+	}
+	gen := &ast.GenDecl{
+		TokPos: info.importCPos,
+		Tok:    token.TYPE,
+	}
+	names := make([]string, 0, len(info.elaboratedTypes))
+	for name := range info.elaboratedTypes {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for _, name := range names {
+		typ := info.elaboratedTypes[name]
+		typeName := "C." + name
+		obj := &ast.Object{
+			Kind: ast.Typ,
+			Name: typeName,
+		}
+		typeSpec := &ast.TypeSpec{
+			Name: &ast.Ident{
+				NamePos: info.importCPos,
+				Name:    typeName,
+				Obj:     obj,
+			},
+			Type: typ,
+		}
+		obj.Decl = typeSpec
+		gen.Specs = append(gen.Specs, typeSpec)
+	}
+	info.Decls = append(info.Decls, gen)
+}
+
+// findMissingCGoNames traverses the AST and finds all C.something names. Only
+// these symbols are extracted from the parsed C AST and converted to the Go
+// equivalent.
+func (info *fileInfo) findMissingCGoNames(cursor *astutil.Cursor) bool {
+	switch node := cursor.Node().(type) {
+	case *ast.SelectorExpr:
+		x, ok := node.X.(*ast.Ident)
+		if !ok {
+			return true
+		}
+		if x.Name == "C" {
+			name := node.Sel.Name
+			if _, ok := cgoBuiltinAliases[name]; ok {
+				name = "_Cgo_" + name
+			}
+			info.missingSymbols[name] = struct{}{}
+		}
+	}
+	return true
+}
+
+// walker replaces all "C".<something> expressions to literal "C.<something>"
+// expressions. Such expressions are impossible to write in Go (a dot cannot be
+// used in the middle of a name) so in practice all C identifiers live in a
+// separate namespace (no _Cgo_ hacks like in gc).
+func (info *fileInfo) walker(cursor *astutil.Cursor) bool {
+	switch node := cursor.Node().(type) {
+	case *ast.CallExpr:
+		fun, ok := node.Fun.(*ast.SelectorExpr)
+		if !ok {
+			return true
+		}
+		x, ok := fun.X.(*ast.Ident)
+		if !ok {
+			return true
+		}
+		if _, ok := info.functions[fun.Sel.Name]; ok && x.Name == "C" {
+			node.Fun = &ast.Ident{
+				NamePos: x.NamePos,
+				Name:    "C." + fun.Sel.Name,
+			}
+		}
+	case *ast.SelectorExpr:
+		x, ok := node.X.(*ast.Ident)
+		if !ok {
+			return true
+		}
+		if x.Name == "C" {
+			name := "C." + node.Sel.Name
+			if _, ok := info.functions[node.Sel.Name]; ok {
+				name += "$funcaddr"
+			}
+			cursor.Replace(&ast.Ident{
+				NamePos: x.NamePos,
+				Name:    name,
+			})
+		}
+	}
+	return true
+}

loader/libclang.go

@@ -1,4 +1,4 @@
-package cgo
+package loader
 
 // This file parses a fragment of C with libclang and stores the result for AST
 // modification. It does not touch the AST itself.
@@ -47,19 +47,15 @@ CXType tinygo_clang_getCursorResultType(GoCXCursor c);
 int tinygo_clang_Cursor_getNumArguments(GoCXCursor c);
 GoCXCursor tinygo_clang_Cursor_getArgument(GoCXCursor c, unsigned i);
 CXSourceLocation tinygo_clang_getCursorLocation(GoCXCursor c);
-CXSourceRange tinygo_clang_getCursorExtent(GoCXCursor c);
 CXTranslationUnit tinygo_clang_Cursor_getTranslationUnit(GoCXCursor c);
-long long tinygo_clang_getEnumConstantDeclValue(GoCXCursor c);
-CXType tinygo_clang_getEnumDeclIntegerType(GoCXCursor c);
 
 int tinygo_clang_globals_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
 int tinygo_clang_struct_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
-int tinygo_clang_enum_visitor(GoCXCursor c, GoCXCursor parent, CXClientData client_data);
 */
 import "C"
 
-// storedRefs stores references to types, used for clang_visitChildren.
-var storedRefs refMap
+// refMap stores references to types, used for clang_visitChildren.
+var refMap RefMap
 
 var diagnosticSeverity = [...]string{
 	C.CXDiagnostic_Ignored: "ignored",
@@ -69,7 +65,7 @@ var diagnosticSeverity = [...]string{
 	C.CXDiagnostic_Fatal:   "fatal",
 }
 
-func (p *cgoPackage) parseFragment(fragment string, cflags []string, posFilename string, posLine int) {
+func (info *fileInfo) parseFragment(fragment string, cflags []string, posFilename string, posLine int) []error {
 	index := C.clang_createIndex(0, 0)
 	defer C.clang_disposeIndex(index)
 
@@ -105,7 +101,7 @@ func (p *cgoPackage) parseFragment(fragment string, cflags []string, posFilename
 		filenameC,
 		(**C.char)(cmdargsC), C.int(len(cflags)), // command line args
 		&unsavedFile, 1, // unsaved files
-		C.CXTranslationUnit_DetailedPreprocessingRecord,
+		C.CXTranslationUnit_None,
 		&unit)
 	if errCode != 0 {
 		panic("loader: failed to parse source with libclang")
@@ -113,6 +109,7 @@ func (p *cgoPackage) parseFragment(fragment string, cflags []string, posFilename
 	defer C.clang_disposeTranslationUnit(unit)
 
 	if numDiagnostics := int(C.clang_getNumDiagnostics(unit)); numDiagnostics != 0 {
+		errs := []error{}
 		addDiagnostic := func(diagnostic C.CXDiagnostic) {
 			spelling := getString(C.clang_getDiagnosticSpelling(diagnostic))
 			severity := diagnosticSeverity[C.clang_getDiagnosticSeverity(diagnostic)]
@@ -124,12 +121,12 @@ func (p *cgoPackage) parseFragment(fragment string, cflags []string, posFilename
 			filename := getString(libclangFilename)
 			if filepath.IsAbs(filename) {
 				// Relative paths for readability, like other Go parser errors.
-				relpath, err := filepath.Rel(p.dir, filename)
+				relpath, err := filepath.Rel(info.Program.Dir, filename)
 				if err == nil {
 					filename = relpath
 				}
 			}
-			p.errors = append(p.errors, &scanner.Error{
+			errs = append(errs, &scanner.Error{
 				Pos: token.Position{
 					Filename: filename,
 					Offset:   0, // not provided by clang_getPresumedLocation
@@ -149,24 +146,26 @@ func (p *cgoPackage) parseFragment(fragment string, cflags []string, posFilename
 				addDiagnostic(C.clang_getDiagnosticInSet(diagnostics, C.uint(j)))
 			}
 		}
-		return
+		return errs
 	}
 
-	ref := storedRefs.Put(p)
-	defer storedRefs.Remove(ref)
+	ref := refMap.Put(info)
+	defer refMap.Remove(ref)
 	cursor := C.tinygo_clang_getTranslationUnitCursor(unit)
 	C.tinygo_clang_visitChildren(cursor, C.CXCursorVisitor(C.tinygo_clang_globals_visitor), C.CXClientData(ref))
+
+	return nil
 }
 
 //export tinygo_clang_globals_visitor
 func tinygo_clang_globals_visitor(c, parent C.GoCXCursor, client_data C.CXClientData) C.int {
-	p := storedRefs.Get(unsafe.Pointer(client_data)).(*cgoPackage)
+	info := refMap.Get(unsafe.Pointer(client_data)).(*fileInfo)
 	kind := C.tinygo_clang_getCursorKind(c)
-	pos := p.getCursorPosition(c)
+	pos := info.getCursorPosition(c)
 	switch kind {
 	case C.CXCursor_FunctionDecl:
 		name := getString(C.tinygo_clang_getCursorSpelling(c))
-		if _, required := p.missingSymbols[name]; !required {
+		if _, required := info.missingSymbols[name]; !required {
 			return C.CXChildVisit_Continue
 		}
 		cursorType := C.tinygo_clang_getCursorType(c)
@@ -174,10 +173,8 @@ func tinygo_clang_globals_visitor(c, parent C.GoCXCursor, client_data C.CXClient
 			return C.CXChildVisit_Continue // not supported
 		}
 		numArgs := int(C.tinygo_clang_Cursor_getNumArguments(c))
-		fn := &functionInfo{
-			pos: pos,
-		}
-		p.functions[name] = fn
+		fn := &functionInfo{}
+		info.functions[name] = fn
 		for i := 0; i < numArgs; i++ {
 			arg := C.tinygo_clang_Cursor_getArgument(c, C.uint(i))
 			argName := getString(C.tinygo_clang_getCursorSpelling(arg))
@@ -187,7 +184,7 @@ func tinygo_clang_globals_visitor(c, parent C.GoCXCursor, client_data C.CXClient
 			}
 			fn.args = append(fn.args, paramInfo{
 				name:     argName,
-				typeExpr: p.makeASTType(argType, pos),
+				typeExpr: info.makeASTType(argType, pos),
 			})
 		}
 		resultType := C.tinygo_clang_getCursorResultType(c)
@@ -195,7 +192,7 @@ func tinygo_clang_globals_visitor(c, parent C.GoCXCursor, client_data C.CXClient
 			fn.results = &ast.FieldList{
 				List: []*ast.Field{
 					&ast.Field{
-						Type: p.makeASTType(resultType, pos),
+						Type: info.makeASTType(resultType, pos),
 					},
 				},
 			}
@@ -203,106 +200,25 @@ func tinygo_clang_globals_visitor(c, parent C.GoCXCursor, client_data C.CXClient
 	case C.CXCursor_StructDecl:
 		typ := C.tinygo_clang_getCursorType(c)
 		name := getString(C.tinygo_clang_getCursorSpelling(c))
-		if _, required := p.missingSymbols["struct_"+name]; !required {
+		if _, required := info.missingSymbols["struct_"+name]; !required {
 			return C.CXChildVisit_Continue
 		}
-		p.makeASTType(typ, pos)
+		info.makeASTType(typ, pos)
 	case C.CXCursor_TypedefDecl:
 		typedefType := C.tinygo_clang_getCursorType(c)
 		name := getString(C.clang_getTypedefName(typedefType))
-		if _, required := p.missingSymbols[name]; !required {
+		if _, required := info.missingSymbols[name]; !required {
 			return C.CXChildVisit_Continue
 		}
-		p.makeASTType(typedefType, pos)
+		info.makeASTType(typedefType, pos)
 	case C.CXCursor_VarDecl:
 		name := getString(C.tinygo_clang_getCursorSpelling(c))
-		if _, required := p.missingSymbols[name]; !required {
+		if _, required := info.missingSymbols[name]; !required {
 			return C.CXChildVisit_Continue
 		}
 		cursorType := C.tinygo_clang_getCursorType(c)
-		p.globals[name] = globalInfo{
-			typeExpr: p.makeASTType(cursorType, pos),
-			pos:      pos,
-		}
-	case C.CXCursor_MacroDefinition:
-		name := getString(C.tinygo_clang_getCursorSpelling(c))
-		if _, required := p.missingSymbols[name]; !required {
-			return C.CXChildVisit_Continue
-		}
-		sourceRange := C.tinygo_clang_getCursorExtent(c)
-		start := C.clang_getRangeStart(sourceRange)
-		end := C.clang_getRangeEnd(sourceRange)
-		var file, endFile C.CXFile
-		var startOffset, endOffset C.unsigned
-		C.clang_getExpansionLocation(start, &file, nil, nil, &startOffset)
-		if file == nil {
-			panic("could not find file where macro is defined")
-		}
-		C.clang_getExpansionLocation(end, &endFile, nil, nil, &endOffset)
-		if file != endFile {
-			panic("expected start and end location of a #define to be in the same file")
-		}
-		if startOffset > endOffset {
-			panic("startOffset > endOffset")
-		}
-
-		// read file contents and extract the relevant byte range
-		tu := C.tinygo_clang_Cursor_getTranslationUnit(c)
-		var size C.size_t
-		sourcePtr := C.clang_getFileContents(tu, file, &size)
-		if endOffset >= C.uint(size) {
-			panic("endOffset lies after end of file")
-		}
-		source := string(((*[1 << 28]byte)(unsafe.Pointer(sourcePtr)))[startOffset:endOffset:endOffset])
-		if !strings.HasPrefix(source, name) {
-			panic(fmt.Sprintf("expected #define value to start with %#v, got %#v", name, source))
-		}
-		value := strings.TrimSpace(source[len(name):])
-		for len(value) != 0 && value[0] == '(' && value[len(value)-1] == ')' {
-			value = strings.TrimSpace(value[1 : len(value)-1])
-		}
-		if len(value) == 0 {
-			// Pretend it doesn't exist at all.
-			return C.CXChildVisit_Continue
-		}
-		// For information about integer literals:
-		// https://en.cppreference.com/w/cpp/language/integer_literal
-		if value[0] == '"' {
-			// string constant
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.STRING, value}, pos}
-			return C.CXChildVisit_Continue
-		}
-		if value[0] == '\'' {
-			// char constant
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.CHAR, value}, pos}
-			return C.CXChildVisit_Continue
-		}
-		// assume it's a number (int or float)
-		value = strings.Replace(value, "'", "", -1) // remove ' chars
-		value = strings.TrimRight(value, "lu")      // remove llu suffixes etc.
-		// find the first non-number
-		nonnum := byte(0)
-		for i := 0; i < len(value); i++ {
-			if value[i] < '0' || value[i] > '9' {
-				nonnum = value[i]
-				break
-			}
-		}
-		// determine number type based on the first non-number
-		switch nonnum {
-		case 0:
-			// no non-number found, must be an integer
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.INT, value}, pos}
-		case 'x', 'X':
-			// hex integer constant
-			// TODO: may also be a floating point number per C++17.
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.INT, value}, pos}
-		case '.', 'e':
-			// float constant
-			value = strings.TrimRight(value, "fFlL")
-			p.constants[name] = constantInfo{&ast.BasicLit{pos, token.FLOAT, value}, pos}
-		default:
-			// unknown type, ignore
+		info.globals[name] = &globalInfo{
+			typeExpr: info.makeASTType(cursorType, pos),
 		}
 	}
 	return C.CXChildVisit_Continue
@@ -318,7 +234,7 @@ func getString(clangString C.CXString) (s string) {
 // getCursorPosition returns a usable token.Pos from a libclang cursor. If the
 // file for this cursor has not been seen before, it is read from libclang
 // (which already has the file in memory) and added to the token.FileSet.
-func (p *cgoPackage) getCursorPosition(cursor C.GoCXCursor) token.Pos {
+func (info *fileInfo) getCursorPosition(cursor C.GoCXCursor) token.Pos {
 	location := C.tinygo_clang_getCursorLocation(cursor)
 	var file C.CXFile
 	var line C.unsigned
@@ -330,7 +246,7 @@ func (p *cgoPackage) getCursorPosition(cursor C.GoCXCursor) token.Pos {
 		return token.NoPos
 	}
 	filename := getString(C.clang_getFileName(file))
-	if _, ok := p.tokenFiles[filename]; !ok {
+	if _, ok := info.tokenFiles[filename]; !ok {
 		// File has not been seen before in this package, add line information
 		// now by reading the file from libclang.
 		tu := C.tinygo_clang_Cursor_getTranslationUnit(cursor)
@@ -343,16 +259,16 @@ func (p *cgoPackage) getCursorPosition(cursor C.GoCXCursor) token.Pos {
 				lines = append(lines, i+1)
 			}
 		}
-		f := p.fset.AddFile(filename, -1, int(size))
+		f := info.fset.AddFile(filename, -1, int(size))
 		f.SetLines(lines)
-		p.tokenFiles[filename] = f
+		info.tokenFiles[filename] = f
 	}
-	return p.tokenFiles[filename].Pos(int(offset))
+	return info.tokenFiles[filename].Pos(int(offset))
 }
 
 // makeASTType return the ast.Expr for the given libclang type. In other words,
 // it converts a libclang type to a type in the Go AST.
-func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
+func (info *fileInfo) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 	var typeName string
 	switch typ.kind {
 	case C.CXType_Char_S, C.CXType_Char_U:
@@ -413,7 +329,7 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 		}
 		return &ast.StarExpr{
 			Star: pos,
-			X:    p.makeASTType(pointeeType, pos),
+			X:    info.makeASTType(pointeeType, pos),
 		}
 	case C.CXType_ConstantArray:
 		return &ast.ArrayType{
@@ -423,7 +339,7 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 				Kind:     token.INT,
 				Value:    strconv.FormatInt(int64(C.clang_getArraySize(typ)), 10),
 			},
-			Elt: p.makeASTType(C.clang_getElementType(typ), pos),
+			Elt: info.makeASTType(C.clang_getElementType(typ), pos),
 		}
 	case C.CXType_FunctionProto:
 		// Be compatible with gc, which uses the *[0]byte type for function
@@ -444,11 +360,11 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 		}
 	case C.CXType_Typedef:
 		name := getString(C.clang_getTypedefName(typ))
-		if _, ok := p.typedefs[name]; !ok {
-			p.typedefs[name] = nil // don't recurse
+		if _, ok := info.typedefs[name]; !ok {
+			info.typedefs[name] = nil // don't recurse
 			c := C.tinygo_clang_getTypeDeclaration(typ)
 			underlyingType := C.tinygo_clang_getTypedefDeclUnderlyingType(c)
-			expr := p.makeASTType(underlyingType, pos)
+			expr := info.makeASTType(underlyingType, pos)
 			if strings.HasPrefix(name, "_Cgo_") {
 				expr := expr.(*ast.Ident)
 				typeSize := C.clang_Type_getSizeOf(underlyingType)
@@ -490,9 +406,8 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 					}
 				}
 			}
-			p.typedefs[name] = &typedefInfo{
+			info.typedefs[name] = &typedefInfo{
 				typeExpr: expr,
-				pos:      pos,
 			}
 		}
 		return &ast.Ident{
@@ -503,9 +418,7 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 		underlying := C.clang_Type_getNamedType(typ)
 		switch underlying.kind {
 		case C.CXType_Record:
-			return p.makeASTType(underlying, pos)
-		case C.CXType_Enum:
-			return p.makeASTType(underlying, pos)
+			return info.makeASTType(underlying, pos)
 		default:
 			panic("unknown elaborated type")
 		}
@@ -521,26 +434,23 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 		default:
 			panic("unknown record declaration")
 		}
-		if _, ok := p.elaboratedTypes[cgoName]; !ok {
-			p.elaboratedTypes[cgoName] = nil // predeclare (to avoid endless recursion)
+		if _, ok := info.elaboratedTypes[cgoName]; !ok {
+			info.elaboratedTypes[cgoName] = nil // predeclare (to avoid endless recursion)
 			fieldList := &ast.FieldList{
 				Opening: pos,
 				Closing: pos,
 			}
-			ref := storedRefs.Put(struct {
+			ref := refMap.Put(struct {
 				fieldList *ast.FieldList
-				pkg       *cgoPackage
-			}{fieldList, p})
-			defer storedRefs.Remove(ref)
+				info      *fileInfo
+			}{fieldList, info})
+			defer refMap.Remove(ref)
 			C.tinygo_clang_visitChildren(cursor, C.CXCursorVisitor(C.tinygo_clang_struct_visitor), C.CXClientData(ref))
 			switch C.tinygo_clang_getCursorKind(cursor) {
 			case C.CXCursor_StructDecl:
-				p.elaboratedTypes[cgoName] = &elaboratedTypeInfo{
-					typeExpr: &ast.StructType{
-						Struct: pos,
-						Fields: fieldList,
-					},
-					pos: pos,
+				info.elaboratedTypes[cgoName] = &ast.StructType{
+					Struct: pos,
+					Fields: fieldList,
 				}
 			case C.CXCursor_UnionDecl:
 				if len(fieldList.List) > 1 {
@@ -570,12 +480,9 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 					}
 					fieldList.List = append([]*ast.Field{unionMarker}, fieldList.List...)
 				}
-				p.elaboratedTypes[cgoName] = &elaboratedTypeInfo{
-					typeExpr: &ast.StructType{
-						Struct: pos,
-						Fields: fieldList,
-					},
-					pos: pos,
+				info.elaboratedTypes[cgoName] = &ast.StructType{
+					Struct: pos,
+					Fields: fieldList,
 				}
 			default:
 				panic("unreachable")
@@ -585,43 +492,11 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 			NamePos: pos,
 			Name:    "C." + cgoName,
 		}
-	case C.CXType_Enum:
-		cursor := C.tinygo_clang_getTypeDeclaration(typ)
-		name := getString(C.tinygo_clang_getCursorSpelling(cursor))
-		underlying := C.tinygo_clang_getEnumDeclIntegerType(cursor)
-		if name == "" {
-			// anonymous enum
-			ref := storedRefs.Put(p)
-			defer storedRefs.Remove(ref)
-			C.tinygo_clang_visitChildren(cursor, C.CXCursorVisitor(C.tinygo_clang_enum_visitor), C.CXClientData(ref))
-			return p.makeASTType(underlying, pos)
-		} else {
-			// named enum
-			if _, ok := p.enums[name]; !ok {
-				ref := storedRefs.Put(p)
-				defer storedRefs.Remove(ref)
-				C.tinygo_clang_visitChildren(cursor, C.CXCursorVisitor(C.tinygo_clang_enum_visitor), C.CXClientData(ref))
-				p.enums[name] = enumInfo{
-					typeExpr: p.makeASTType(underlying, pos),
-					pos:      pos,
-				}
-			}
-			return &ast.Ident{
-				NamePos: pos,
-				Name:    "C.enum_" + name,
-			}
-		}
 	}
 	if typeName == "" {
-		// Report this as an error.
-		spelling := getString(C.clang_getTypeSpelling(typ))
-		p.errors = append(p.errors, scanner.Error{
-			Pos: p.fset.PositionFor(pos, true),
-			Msg: fmt.Sprintf("unknown C type: %v (libclang type kind %d)", spelling, typ.kind),
-		})
 		// Fallback, probably incorrect but at least the error points to an odd
 		// type name.
-		typeName = "C." + spelling
+		typeName = "C." + getString(C.clang_getTypeSpelling(typ))
 	}
 	return &ast.Ident{
 		NamePos: pos,
@@ -631,23 +506,23 @@ func (p *cgoPackage) makeASTType(typ C.CXType, pos token.Pos) ast.Expr {
 
 //export tinygo_clang_struct_visitor
 func tinygo_clang_struct_visitor(c, parent C.GoCXCursor, client_data C.CXClientData) C.int {
-	passed := storedRefs.Get(unsafe.Pointer(client_data)).(struct {
+	passed := refMap.Get(unsafe.Pointer(client_data)).(struct {
 		fieldList *ast.FieldList
-		pkg       *cgoPackage
+		info      *fileInfo
 	})
 	fieldList := passed.fieldList
-	p := passed.pkg
+	info := passed.info
 	if C.tinygo_clang_getCursorKind(c) != C.CXCursor_FieldDecl {
 		panic("expected field inside cursor")
 	}
 	name := getString(C.tinygo_clang_getCursorSpelling(c))
 	typ := C.tinygo_clang_getCursorType(c)
 	field := &ast.Field{
-		Type: p.makeASTType(typ, p.getCursorPosition(c)),
+		Type: info.makeASTType(typ, info.getCursorPosition(c)),
 	}
 	field.Names = []*ast.Ident{
 		&ast.Ident{
-			NamePos: p.getCursorPosition(c),
+			NamePos: info.getCursorPosition(c),
 			Name:    name,
 			Obj: &ast.Object{
 				Kind: ast.Var,
@@ -659,16 +534,3 @@ func tinygo_clang_struct_visitor(c, parent C.GoCXCursor, client_data C.CXClientD
 	fieldList.List = append(fieldList.List, field)
 	return C.CXChildVisit_Continue
 }
-
-//export tinygo_clang_enum_visitor
-func tinygo_clang_enum_visitor(c, parent C.GoCXCursor, client_data C.CXClientData) C.int {
-	p := storedRefs.Get(unsafe.Pointer(client_data)).(*cgoPackage)
-	name := getString(C.tinygo_clang_getCursorSpelling(c))
-	pos := p.getCursorPosition(c)
-	value := C.tinygo_clang_getEnumConstantDeclValue(c)
-	p.constants[name] = constantInfo{
-		expr: &ast.BasicLit{pos, token.INT, strconv.FormatInt(int64(value), 10)},
-		pos:  pos,
-	}
-	return C.CXChildVisit_Continue
-}

loader/libclang_config.go

@@ -1,6 +1,6 @@
 // +build !byollvm
 
-package cgo
+package loader
 
 /*
 #cgo linux  CFLAGS: -I/usr/lib/llvm-8/include

loader/libclang_stubs.c

@@ -49,18 +49,6 @@ CXSourceLocation tinygo_clang_getCursorLocation(CXCursor c) {
 	return clang_getCursorLocation(c);
 }
 
-CXSourceRange tinygo_clang_getCursorExtent(CXCursor c) {
-	return clang_getCursorExtent(c);
-}
-
 CXTranslationUnit tinygo_clang_Cursor_getTranslationUnit(CXCursor c) {
 	return clang_Cursor_getTranslationUnit(c);
 }
-
-long long tinygo_clang_getEnumConstantDeclValue(CXCursor c) {
-	return clang_getEnumConstantDeclValue(c);
-}
-
-CXType tinygo_clang_getEnumDeclIntegerType(CXCursor c) {
-	return clang_getEnumDeclIntegerType(c);
-}

loader/loader.go

@@ -10,8 +10,6 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
-
-	"github.com/tinygo-org/tinygo/cgo"
 )
 
 // Program holds all packages and some metadata about the program as a whole.
@@ -32,10 +30,11 @@ type Program struct {
 type Package struct {
 	*Program
 	*build.Package
-	Imports   map[string]*Package
-	Importing bool
-	Files     []*ast.File
-	Pkg       *types.Package
+	Imports    map[string]*Package
+	Importing  bool
+	Files      []*ast.File
+	tokenFiles map[string]*token.File
+	Pkg        *types.Package
 	types.Info
 }
 
@@ -108,6 +107,7 @@ func (p *Program) newPackage(pkg *build.Package) *Package {
 			Scopes:     make(map[ast.Node]*types.Scope),
 			Selections: make(map[*ast.SelectorExpr]*types.Selection),
 		},
+		tokenFiles: map[string]*token.File{},
 	}
 }
 
@@ -295,17 +295,8 @@ func (p *Package) parseFiles() ([]*ast.File, error) {
 		}
 		files = append(files, f)
 	}
-	for _, file := range p.CgoFiles {
-		path := filepath.Join(p.Package.Dir, file)
-		f, err := p.parseFile(path, parser.ParseComments)
-		if err != nil {
-			fileErrs = append(fileErrs, err)
-			continue
-		}
-		files = append(files, f)
-	}
+	clangIncludes := ""
 	if len(p.CgoFiles) != 0 {
-		clangIncludes := ""
 		if _, err := os.Stat(filepath.Join(p.TINYGOROOT, "llvm", "tools", "clang", "lib", "Headers")); !os.IsNotExist(err) {
 			// Running from the source directory.
 			clangIncludes = filepath.Join(p.TINYGOROOT, "llvm", "tools", "clang", "lib", "Headers")
@@ -313,11 +304,20 @@ func (p *Package) parseFiles() ([]*ast.File, error) {
 			// Running from the installation directory.
 			clangIncludes = filepath.Join(p.TINYGOROOT, "lib", "clang", "include")
 		}
-		generated, errs := cgo.Process(files, p.Program.Dir, p.fset, append(p.CFlags, "-I"+p.Package.Dir, "-I"+clangIncludes))
+	}
+	for _, file := range p.CgoFiles {
+		path := filepath.Join(p.Package.Dir, file)
+		f, err := p.parseFile(path, parser.ParseComments)
+		if err != nil {
+			fileErrs = append(fileErrs, err)
+			continue
+		}
+		errs := p.processCgo(path, f, append(p.CFlags, "-I"+p.Package.Dir, "-I"+clangIncludes))
 		if errs != nil {
 			fileErrs = append(fileErrs, errs...)
+			continue
 		}
-		files = append(files, generated)
+		files = append(files, f)
 	}
 	if len(fileErrs) != 0 {
 		return nil, Errors{p, fileErrs}
@@ -346,7 +346,7 @@ func (p *Package) importRecursively() error {
 	p.Importing = true
 	for _, to := range p.Package.Imports {
 		if to == "C" {
-			// Do CGo processing in a later stage.
+			// Do Cgo processing in a later stage.
 			continue
 		}
 		if _, ok := p.Imports[to]; ok {

loader/sync.go

@@ -1,4 +1,4 @@
-package cgo
+package loader
 
 import (
 	"sync"
@@ -8,17 +8,17 @@ import (
 // #include <stdlib.h>
 import "C"
 
-// refMap is a convenient way to store opaque references that can be passed to
+// RefMap is a convenient way to store opaque references that can be passed to
 // C. It is useful if an API uses function pointers and you cannot pass a Go
 // pointer but only a C pointer.
-type refMap struct {
+type RefMap struct {
 	refs map[unsafe.Pointer]interface{}
 	lock sync.Mutex
 }
 
 // Put stores a value in the map. It can later be retrieved using Get. It must
 // be removed using Remove to avoid memory leaks.
-func (m *refMap) Put(v interface{}) unsafe.Pointer {
+func (m *RefMap) Put(v interface{}) unsafe.Pointer {
 	m.lock.Lock()
 	defer m.lock.Unlock()
 	if m.refs == nil {
@@ -31,14 +31,14 @@ func (m *refMap) Put(v interface{}) unsafe.Pointer {
 
 // Get returns a stored value previously inserted with Put. Use the same
 // reference as you got from Put.
-func (m *refMap) Get(ref unsafe.Pointer) interface{} {
+func (m *RefMap) Get(ref unsafe.Pointer) interface{} {
 	m.lock.Lock()
 	defer m.lock.Unlock()
 	return m.refs[ref]
 }
 
 // Remove deletes a single reference from the map.
-func (m *refMap) Remove(ref unsafe.Pointer) {
+func (m *RefMap) Remove(ref unsafe.Pointer) {
 	m.lock.Lock()
 	defer m.lock.Unlock()
 	delete(m.refs, ref)

main.go

@@ -80,21 +80,9 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
 	if goroot == "" {
 		return errors.New("cannot locate $GOROOT, please set it manually")
 	}
-	tags := spec.BuildTags
-	major, minor := getGorootVersion(goroot)
-	if major != 1 {
-		if major == 0 {
-			return errors.New("could not read version from GOROOT: " + goroot)
-		}
-		return fmt.Errorf("expected major version 1, got go%d.%d", major, minor)
-	}
-	for i := 1; i <= minor; i++ {
-		tags = append(tags, fmt.Sprintf("go1.%d", i))
-	}
 	compilerConfig := compiler.Config{
 		Triple:        spec.Triple,
 		CPU:           spec.CPU,
-		Features:      spec.Features,
 		GOOS:          spec.GOOS,
 		GOARCH:        spec.GOARCH,
 		GC:            config.gc,
@@ -106,7 +94,7 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
 		TINYGOROOT:    root,
 		GOROOT:        goroot,
 		GOPATH:        getGopath(),
-		BuildTags:     tags,
+		BuildTags:     spec.BuildTags,
 	}
 	c, err := compiler.NewCompiler(pkgName, compilerConfig)
 	if err != nil {

src/device/arm/cortexm.s

@@ -1,21 +0,0 @@
-.syntax unified
-
-.section .text.HardFault_Handler
-.global  HardFault_Handler
-.type    HardFault_Handler, %function
-HardFault_Handler:
-    // Put the old stack pointer in the first argument, for easy debugging. This
-    // is especially useful on Cortex-M0, which supports far fewer debug
-    // facilities.
-    mov r0, sp
-
-    // Load the default stack pointer from address 0 so that we can call normal
-    // functions again that expect a working stack. However, it will corrupt the
-    // old stack so the function below must not attempt to recover from this
-    // fault.
-    movs r3, #0
-    ldr r3, [r3]
-    mov sp, r3
-
-    // Continue handling this error in Go.
-    bl handleHardFault

src/examples/adc/adc.go

@@ -11,8 +11,8 @@ import (
 func main() {
 	machine.InitADC()
 
-	led := machine.LED
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
 	sensor := machine.ADC{machine.ADC2}
 	sensor.Configure()

src/examples/blinky1/blinky1.go

@@ -8,8 +8,8 @@ import (
 )
 
 func main() {
-	led := machine.LED
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 	for {
 		led.Low()
 		time.Sleep(time.Millisecond * 500)

src/examples/blinky2/blinky2.go

@@ -16,8 +16,8 @@ func main() {
 }
 
 func led1() {
-	led := machine.LED1
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 	for {
 		println("+")
 		led.Low()
@@ -30,8 +30,8 @@ func led1() {
 }
 
 func led2() {
-	led := machine.LED2
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led := machine.GPIO{machine.LED2}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 	for {
 		println("  +")
 		led.Low()

src/examples/button/button.go

@@ -7,14 +7,14 @@ import (
 
 // This example assumes that the button is connected to pin 8. Change the value
 // below to use a different pin.
-const (
-	led    = machine.LED
-	button = machine.Pin(8)
-)
+const buttonPin = 8
 
 func main() {
-	led.Configure(machine.PinConfig{Mode: machine.PinOutput})
-	button.Configure(machine.PinConfig{Mode: machine.PinInput})
+	led := machine.GPIO{machine.LED}
+	led.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
+
+	button := machine.GPIO{buttonPin}
+	button.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT})
 
 	for {
 		if button.Get() {

src/examples/button2/button2.go

@@ -8,29 +8,29 @@ import (
 // This example assumes that you are using the pca10040 board
 
 func main() {
-	led1 := machine.LED1
-	led1.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led1 := machine.GPIO{machine.LED1}
+	led1.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
-	led2 := machine.LED2
-	led2.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led2 := machine.GPIO{machine.LED2}
+	led2.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
-	led3 := machine.LED3
-	led3.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led3 := machine.GPIO{machine.LED3}
+	led3.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
-	led4 := machine.LED4
-	led4.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	led4 := machine.GPIO{machine.LED4}
+	led4.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
-	button1 := machine.BUTTON1
-	button1.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
+	button1 := machine.GPIO{machine.BUTTON1}
+	button1.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT_PULLUP})
 
-	button2 := machine.BUTTON2
-	button2.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
+	button2 := machine.GPIO{machine.BUTTON2}
+	button2.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT_PULLUP})
 
-	button3 := machine.BUTTON3
-	button3.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
+	button3 := machine.GPIO{machine.BUTTON3}
+	button3.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT_PULLUP})
 
-	button4 := machine.BUTTON4
-	button4.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
+	button4 := machine.GPIO{machine.BUTTON4}
+	button4.Configure(machine.GPIOConfig{Mode: machine.GPIO_INPUT_PULLUP})
 
 	for {
 		led1.Set(button1.Get())

src/examples/echo/echo.go

@@ -9,9 +9,9 @@ import (
 
 // change these to test a different UART or pins if available
 var (
-	uart = machine.UART0
-	tx   = machine.UART_TX_PIN
-	rx   = machine.UART_RX_PIN
+	uart       = machine.UART0
+	tx   uint8 = machine.UART_TX_PIN
+	rx   uint8 = machine.UART_RX_PIN
 )
 
 func main() {

src/examples/i2s/i2s.go

@@ -1,25 +0,0 @@
-// Example using the i2s hardware interface on the Adafruit Circuit Playground Express
-// to read data from the onboard MEMS microphone.
-//
-package main
-
-import (
-	"machine"
-)
-
-func main() {
-	machine.I2S0.Configure(machine.I2SConfig{
-		Mode:        machine.I2SModePDM,
-		ClockSource: machine.I2SClockSourceExternal,
-		Stereo:      true,
-	})
-
-	data := make([]uint32, 64)
-
-	for {
-		// get the next group of samples
-		machine.I2S0.Read(data)
-
-		println("data", data[0], data[1], data[2], data[4], "...")
-	}
-}

src/examples/mcp3008/mcp3008.go

@@ -8,17 +8,19 @@ import (
 	"time"
 )
 
-// cs is the pin used for Chip Select (CS). Change to whatever is in use on your board.
-const cs = machine.Pin(3)
+// CS_PIN is the pin used for Chip Select (CS). Change to whatever is in use on your board.
+const CS_PIN = 3
 
 var (
 	tx          []byte
 	rx          []byte
 	val, result uint16
+	cs          machine.GPIO
 )
 
 func main() {
-	cs.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	cs = machine.GPIO{CS_PIN}
+	cs.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 
 	machine.SPI0.Configure(machine.SPIConfig{
 		Frequency: 4000000,

src/examples/microbit-blink/microbit-blink.go

@@ -9,10 +9,10 @@ import (
 // The LED matrix in the micro:bit is a multiplexed display: https://en.wikipedia.org/wiki/Multiplexed_display
 // Driver for easier control: https://github.com/tinygo-org/drivers/tree/master/microbitmatrix
 func main() {
-	ledrow := machine.LED_ROW_1
-	ledrow.Configure(machine.PinConfig{Mode: machine.PinOutput})
-	ledcol := machine.LED_COL_1
-	ledcol.Configure(machine.PinConfig{Mode: machine.PinOutput})
+	ledrow := machine.GPIO{machine.LED_ROW_1}
+	ledrow.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
+	ledcol := machine.GPIO{machine.LED_COL_1}
+	ledcol.Configure(machine.GPIOConfig{Mode: machine.GPIO_OUTPUT})
 	ledcol.Low()
 	for {
 		ledrow.Low()

src/examples/wasm/Makefile

@@ -1,15 +1,10 @@
 export: clean wasm_exec
-	tinygo build -o ./html/wasm.wasm -target wasm -no-debug ./export/wasm.go
+	tinygo build -o ./html/wasm.wasm -target wasm ./export/wasm.go
 	cp ./export/wasm.js ./html/
 	cp ./export/index.html ./html/
 
-callback: clean wasm_exec
-	tinygo build -o ./html/wasm.wasm -target wasm ./callback/wasm.go
-	cp ./callback/wasm.js ./html/
-	cp ./callback/index.html ./html/
-
 main: clean wasm_exec
-	tinygo build -o ./html/wasm.wasm -target wasm -no-debug ./main/main.go
+	tinygo build -o ./html/wasm.wasm -target wasm ./main/main.go
 	cp ./main/index.html ./html/
 
 wasm_exec:

src/examples/wasm/callback/index.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-
-<head>
-	<meta charset="utf-8" />
-	<title>Go WebAssembly</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<script src="wasm_exec.js" defer></script>
-	<script src="wasm.js" defer></script>
-</head>
-
-<body>
-	<h1>WebAssembly</h1>
-	<p>Add two numbers, using WebAssembly:</p>
-	<input type="number" id="a" value="0" /> + <input type="number" id="b" value="0" /> = <input type="number" id="result" readonly />
-</body>
-
-</html>

src/examples/wasm/callback/wasm.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"strconv"
-	"syscall/js"
-)
-
-var a, b int
-
-func main() {
-	document := js.Global().Get("document")
-	document.Call("getElementById", "a").Set("oninput", updater(&a))
-	document.Call("getElementById", "b").Set("oninput", updater(&b))
-	update()
-}
-
-func updater(n *int) js.Func {
-	return js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		*n, _ = strconv.Atoi(this.Get("value").String())
-		update()
-		return nil
-	})
-}
-
-func update() {
-	js.Global().Get("document").Call("getElementById", "result").Set("value", a+b)
-}

src/examples/wasm/callback/wasm.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const WASM_URL = 'wasm.wasm';
-
-var wasm;
-
-function init() {
-  const go = new Go();
-  if ('instantiateStreaming' in WebAssembly) {
-    WebAssembly.instantiateStreaming(fetch(WASM_URL), go.importObject).then(function (obj) {
-      wasm = obj.instance;
-      go.run(wasm);
-    })
-  } else {
-    fetch(WASM_URL).then(resp =>
-      resp.arrayBuffer()
-    ).then(bytes =>
-      WebAssembly.instantiate(bytes, go.importObject).then(function (obj) {
-        wasm = obj.instance;
-        go.run(wasm);
-      })
-    )
-  }
-}
-
-init();

src/machine/board_arduino.go

@@ -5,20 +5,20 @@ package machine
 const CPU_FREQUENCY = 16000000
 
 // LED on the Arduino
-const LED Pin = 13
+const LED = 13
 
 // ADC on the Arduino
 const (
-	ADC0 Pin = 0
-	ADC1 Pin = 1
-	ADC2 Pin = 2
-	ADC3 Pin = 3
-	ADC4 Pin = 4 // Used by TWI for SDA
-	ADC5 Pin = 5 // Used by TWI for SCL
+	ADC0 = 0
+	ADC1 = 1
+	ADC2 = 2
+	ADC3 = 3
+	ADC4 = 4 // Used by TWI for SDA
+	ADC5 = 5 // Used by TWI for SCL
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 1
-	UART_RX_PIN Pin = 0
+	UART_TX_PIN = 1
+	UART_RX_PIN = 0
 )

src/machine/board_circuitplay_express.go

@@ -17,7 +17,7 @@ const (
 	D8  = PB23
 	D9  = PA06
 	D10 = PA07
-	D11 = NoPin // does not seem to exist
+	D11 = 0xff // does not seem to exist
 	D12 = PA02
 	D13 = PA17 // PWM available
 )
@@ -80,12 +80,12 @@ var (
 	I2C0 = I2C{Bus: sam.SERCOM5_I2CM,
 		SDA:     SDA_PIN,
 		SCL:     SCL_PIN,
-		PinMode: PinSERCOM}
+		PinMode: GPIO_SERCOM}
 	// internal device
 	I2C1 = I2C{Bus: sam.SERCOM1_I2CM,
 		SDA:     SDA1_PIN,
 		SCL:     SCL1_PIN,
-		PinMode: PinSERCOMAlt}
+		PinMode: GPIO_SERCOM_ALT}
 )
 
 // SPI pins (internal flash)
@@ -99,15 +99,3 @@ const (
 var (
 	SPI0 = SPI{Bus: sam.SERCOM3_SPI}
 )
-
-// I2S pins
-const (
-	I2S_SCK_PIN = PA10
-	I2S_SD_PIN  = PA08
-	I2S_WS_PIN  = NoPin // no WS, instead uses SCK to sync
-)
-
-// I2S on the Circuit Playground Express.
-var (
-	I2S0 = I2S{Bus: sam.I2S}
-)

src/machine/board_digispark.go

@@ -3,5 +3,5 @@
 package machine
 
 const (
-	LED Pin = 1
+	LED = 1
 )

src/machine/board_feather-m0.go

@@ -1,82 +0,0 @@
-// +build sam,atsamd21,feather_m0
-
-package machine
-
-import "device/sam"
-
-// GPIO Pins
-const (
-	D0  = PA11  // UART0 RX
-	D1  = PA10  // UART0 TX
-	D2  = NoPin // does not seem to exist
-	D3  = PA09
-	D4  = PA08
-	D5  = PA15  // PWM available
-	D6  = PA20  // PWM available
-	D7  = NoPin // does not seem to exist
-	D8  = PA06
-	D9  = PA07 // PWM available
-	D10 = PA18 // can be used for PWM or UART1 TX
-	D11 = PA16 // can be used for PWM or UART1 RX
-	D12 = PA19 // PWM available
-	D13 = PA17 // PWM available
-)
-
-// Analog pins
-const (
-	A0 = PA02 // ADC/AIN[0]
-	A1 = PB08 // ADC/AIN[2]
-	A2 = PB09 // ADC/AIN[3]
-	A3 = PA04 // ADC/AIN[4]
-	A4 = PA05 // ADC/AIN[5]
-	A5 = PB02 // ADC/AIN[10]
-)
-
-const (
-	LED = D13
-)
-
-// UART0 aka USBCDC pins
-const (
-	USBCDC_DM_PIN = PA24
-	USBCDC_DP_PIN = PA25
-)
-
-// UART1 pins
-const (
-	UART_TX_PIN = D10
-	UART_RX_PIN = D11
-)
-
-// I2C pins
-const (
-	SDA_PIN = PA22 // SDA: SERCOM3/PAD[0]
-	SCL_PIN = PA23 // SCL: SERCOM3/PAD[1]
-)
-
-// I2C on the Feather M0.
-var (
-	I2C0 = I2C{Bus: sam.SERCOM3_I2CM,
-		SDA:     SDA_PIN,
-		SCL:     SCL_PIN,
-		PinMode: PinSERCOM}
-)
-
-// SPI pins
-const (
-	SPI0_SCK_PIN  = PB11 // SCK: SERCOM4/PAD[3]
-	SPI0_MOSI_PIN = PB10 // MOSI: SERCOM4/PAD[2]
-	SPI0_MISO_PIN = PA12 // MISO: SERCOM4/PAD[0]
-)
-
-// SPI on the Feather M0.
-var (
-	SPI0 = SPI{Bus: sam.SERCOM4_SPI}
-)
-
-// I2S pins
-const (
-	I2S_SCK_PIN = PA10
-	I2S_SD_PIN  = PA08
-	I2S_WS_PIN  = NoPin // TODO: figure out what this is on Feather M0.
-)

src/machine/board_itsybitsy-m0.go

@@ -59,7 +59,7 @@ var (
 	I2C0 = I2C{Bus: sam.SERCOM3_I2CM,
 		SDA:     SDA_PIN,
 		SCL:     SCL_PIN,
-		PinMode: PinSERCOM}
+		PinMode: GPIO_SERCOM}
 )
 
 // SPI pins
@@ -73,15 +73,3 @@ const (
 var (
 	SPI0 = SPI{Bus: sam.SERCOM4_SPI}
 )
-
-// I2S pins
-const (
-	I2S_SCK_PIN = PA10
-	I2S_SD_PIN  = PA08
-	I2S_WS_PIN  = NoPin // TODO: figure out what this is on ItsyBitsy M0.
-)
-
-// I2S on the ItsyBitsy M0.
-var (
-	I2S0 = I2S{Bus: sam.I2S}
-)

src/machine/board_microbit.go

@@ -7,70 +7,70 @@ const HasLowFrequencyCrystal = false
 
 // Buttons on the micro:bit (A and B)
 const (
-	BUTTON  Pin = BUTTONA
-	BUTTONA Pin = 17
-	BUTTONB Pin = 26
+	BUTTON  = BUTTONA
+	BUTTONA = 17
+	BUTTONB = 26
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 24
-	UART_RX_PIN Pin = 25
+	UART_TX_PIN = 24
+	UART_RX_PIN = 25
 )
 
 // ADC pins
 const (
-	ADC0 Pin = 3 // P0 on the board
-	ADC1 Pin = 2 // P1 on the board
-	ADC2 Pin = 1 // P2 on the board
+	ADC0 = 3 // P0 on the board
+	ADC1 = 2 // P1 on the board
+	ADC2 = 1 // P2 on the board
 )
 
 // I2C pins
 const (
-	SDA_PIN Pin = 30 // P20 on the board
-	SCL_PIN Pin = 0  // P19 on the board
+	SDA_PIN = 30 // P20 on the board
+	SCL_PIN = 0  // P19 on the board
 )
 
 // SPI pins
 const (
-	SPI0_SCK_PIN  Pin = 23 // P13 on the board
-	SPI0_MOSI_PIN Pin = 21 // P15 on the board
-	SPI0_MISO_PIN Pin = 22 // P14 on the board
+	SPI0_SCK_PIN  = 23 // P13 on the board
+	SPI0_MOSI_PIN = 21 // P15 on the board
+	SPI0_MISO_PIN = 22 // P14 on the board
 )
 
 // GPIO/Analog pins
 const (
-	P0  Pin = 3
-	P1  Pin = 2
-	P2  Pin = 1
-	P3  Pin = 4
-	P4  Pin = 5
-	P5  Pin = 17
-	P6  Pin = 12
-	P7  Pin = 11
-	P8  Pin = 18
-	P9  Pin = 10
-	P10 Pin = 6
-	P11 Pin = 26
-	P12 Pin = 20
-	P13 Pin = 23
-	P14 Pin = 22
-	P15 Pin = 21
-	P16 Pin = 16
+	P0  = 3
+	P1  = 2
+	P2  = 1
+	P3  = 4
+	P4  = 5
+	P5  = 17
+	P6  = 12
+	P7  = 11
+	P8  = 18
+	P9  = 10
+	P10 = 6
+	P11 = 26
+	P12 = 20
+	P13 = 23
+	P14 = 22
+	P15 = 21
+	P16 = 16
 )
 
 // LED matrix pins
 const (
-	LED_COL_1 Pin = 4
-	LED_COL_2 Pin = 5
-	LED_COL_3 Pin = 6
-	LED_COL_4 Pin = 7
-	LED_COL_5 Pin = 8
-	LED_COL_6 Pin = 9
-	LED_COL_7 Pin = 10
-	LED_COL_8 Pin = 11
-	LED_COL_9 Pin = 12
-	LED_ROW_1 Pin = 13
-	LED_ROW_2 Pin = 14
-	LED_ROW_3 Pin = 15
+	LED_COL_1 = 4
+	LED_COL_2 = 5
+	LED_COL_3 = 6
+	LED_COL_4 = 7
+	LED_COL_5 = 8
+	LED_COL_6 = 9
+	LED_COL_7 = 10
+	LED_COL_8 = 11
+	LED_COL_9 = 12
+	LED_ROW_1 = 13
+	LED_ROW_2 = 14
+	LED_ROW_3 = 15
 )

src/machine/board_nrf52840-mdk.go

@@ -6,27 +6,27 @@ const HasLowFrequencyCrystal = true
 
 // LEDs on the nrf52840-mdk (nRF52840 dev board)
 const (
-	LED       Pin = LED_GREEN
-	LED_GREEN Pin = 22
-	LED_RED   Pin = 23
-	LED_BLUE  Pin = 24
+	LED       = LED_GREEN
+	LED_GREEN = 22
+	LED_RED   = 23
+	LED_BLUE  = 24
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 20
-	UART_RX_PIN Pin = 19
+	UART_TX_PIN = 20
+	UART_RX_PIN = 19
 )
 
 // I2C pins (unused)
 const (
-	SDA_PIN = NoPin
-	SCL_PIN = NoPin
+	SDA_PIN = 0xff
+	SCL_PIN = 0xff
 )
 
 // SPI pins (unused)
 const (
-	SPI0_SCK_PIN  = NoPin
-	SPI0_MOSI_PIN = NoPin
-	SPI0_MISO_PIN = NoPin
+	SPI0_SCK_PIN  = 0
+	SPI0_MOSI_PIN = 0
+	SPI0_MISO_PIN = 0
 )

src/machine/board_pca10031.go

@@ -10,30 +10,30 @@ const HasLowFrequencyCrystal = true
 
 // LED on the pca10031
 const (
-	LED       Pin = LED_RED
-	LED1      Pin = LED_RED
-	LED2      Pin = LED_GREEN
-	LED3      Pin = LED_BLUE
-	LED_RED   Pin = 21
-	LED_GREEN Pin = 22
-	LED_BLUE  Pin = 23
+	LED       = LED_RED
+	LED1      = LED_RED
+	LED2      = LED_GREEN
+	LED3      = LED_BLUE
+	LED_RED   = 21
+	LED_GREEN = 22
+	LED_BLUE  = 23
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 9
-	UART_RX_PIN Pin = 11
+	UART_TX_PIN = 9
+	UART_RX_PIN = 11
 )
 
 // I2C pins (disabled)
 const (
-	SDA_PIN = NoPin
-	SCL_PIN = NoPin
+	SDA_PIN = 0xff
+	SCL_PIN = 0xff
 )
 
 // SPI pins (unused)
 const (
-	SPI0_SCK_PIN  = NoPin
-	SPI0_MOSI_PIN = NoPin
-	SPI0_MISO_PIN = NoPin
+	SPI0_SCK_PIN  = 0
+	SPI0_MOSI_PIN = 0
+	SPI0_MISO_PIN = 0
 )

src/machine/board_pca10040.go

@@ -7,47 +7,47 @@ const HasLowFrequencyCrystal = true
 
 // LEDs on the PCA10040 (nRF52832 dev board)
 const (
-	LED  Pin = LED1
-	LED1 Pin = 17
-	LED2 Pin = 18
-	LED3 Pin = 19
-	LED4 Pin = 20
+	LED  = LED1
+	LED1 = 17
+	LED2 = 18
+	LED3 = 19
+	LED4 = 20
 )
 
 // Buttons on the PCA10040 (nRF52832 dev board)
 const (
-	BUTTON  Pin = BUTTON1
-	BUTTON1 Pin = 13
-	BUTTON2 Pin = 14
-	BUTTON3 Pin = 15
-	BUTTON4 Pin = 16
+	BUTTON  = BUTTON1
+	BUTTON1 = 13
+	BUTTON2 = 14
+	BUTTON3 = 15
+	BUTTON4 = 16
 )
 
 // UART pins for NRF52840-DK
 const (
-	UART_TX_PIN Pin = 6
-	UART_RX_PIN Pin = 8
+	UART_TX_PIN = 6
+	UART_RX_PIN = 8
 )
 
 // ADC pins
 const (
-	ADC0 Pin = 3
-	ADC1 Pin = 4
-	ADC2 Pin = 28
-	ADC3 Pin = 29
-	ADC4 Pin = 30
-	ADC5 Pin = 31
+	ADC0 = 3
+	ADC1 = 4
+	ADC2 = 28
+	ADC3 = 29
+	ADC4 = 30
+	ADC5 = 31
 )
 
 // I2C pins
 const (
-	SDA_PIN Pin = 26
-	SCL_PIN Pin = 27
+	SDA_PIN = 26
+	SCL_PIN = 27
 )
 
 // SPI pins
 const (
-	SPI0_SCK_PIN  Pin = 25
-	SPI0_MOSI_PIN Pin = 23
-	SPI0_MISO_PIN Pin = 24
+	SPI0_SCK_PIN  = 25
+	SPI0_MOSI_PIN = 23
+	SPI0_MISO_PIN = 24
 )

src/machine/board_pca10056.go

@@ -6,47 +6,47 @@ const HasLowFrequencyCrystal = true
 
 // LEDs on the pca10056
 const (
-	LED  Pin = LED1
-	LED1 Pin = 13
-	LED2 Pin = 14
-	LED3 Pin = 15
-	LED4 Pin = 16
+	LED  = LED1
+	LED1 = 13
+	LED2 = 14
+	LED3 = 15
+	LED4 = 16
 )
 
 // Buttons on the pca10056
 const (
-	BUTTON  Pin = BUTTON1
-	BUTTON1 Pin = 11
-	BUTTON2 Pin = 12
-	BUTTON3 Pin = 24
-	BUTTON4 Pin = 25
+	BUTTON  = BUTTON1
+	BUTTON1 = 11
+	BUTTON2 = 12
+	BUTTON3 = 24
+	BUTTON4 = 25
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 6
-	UART_RX_PIN Pin = 8
+	UART_TX_PIN = 6
+	UART_RX_PIN = 8
 )
 
 // ADC pins
 const (
-	ADC0 Pin = 3
-	ADC1 Pin = 4
-	ADC2 Pin = 28
-	ADC3 Pin = 29
-	ADC4 Pin = 30
-	ADC5 Pin = 31
+	ADC0 = 3
+	ADC1 = 4
+	ADC2 = 28
+	ADC3 = 29
+	ADC4 = 30
+	ADC5 = 31
 )
 
 // I2C pins
 const (
-	SDA_PIN Pin = 26 // P0.26
-	SCL_PIN Pin = 27 // P0.27
+	SDA_PIN = 26 // P0.26
+	SCL_PIN = 27 // P0.27
 )
 
 // SPI pins
 const (
-	SPI0_SCK_PIN  Pin = 47 // P1.15
-	SPI0_MOSI_PIN Pin = 45 // P1.13
-	SPI0_MISO_PIN Pin = 46 // P1.14
+	SPI0_SCK_PIN  = 47 // P1.15
+	SPI0_MOSI_PIN = 45 // P1.13
+	SPI0_MISO_PIN = 46 // P1.14
 )

src/machine/board_reelboard.go

@@ -6,37 +6,37 @@ const HasLowFrequencyCrystal = true
 
 // LEDs on the reel board
 const (
-	LED        Pin = LED1
-	LED1       Pin = LED_YELLOW
-	LED2       Pin = LED_RED
-	LED3       Pin = LED_GREEN
-	LED4       Pin = LED_BLUE
-	LED_RED    Pin = 11
-	LED_GREEN  Pin = 12
-	LED_BLUE   Pin = 41
-	LED_YELLOW Pin = 13
+	LED        = LED1
+	LED1       = LED_YELLOW
+	LED2       = LED_RED
+	LED3       = LED_GREEN
+	LED4       = LED_BLUE
+	LED_RED    = 11
+	LED_GREEN  = 12
+	LED_BLUE   = 41
+	LED_YELLOW = 13
 )
 
 // User "a" button on the reel board
 const (
-	BUTTON Pin = 7
+	BUTTON = 7
 )
 
 // UART pins
 const (
-	UART_TX_PIN Pin = 6
-	UART_RX_PIN Pin = 8
+	UART_TX_PIN = 6
+	UART_RX_PIN = 8
 )
 
 // I2C pins
 const (
-	SDA_PIN Pin = 26
-	SCL_PIN Pin = 27
+	SDA_PIN = 26
+	SCL_PIN = 27
 )
 
 // SPI pins
 const (
-	SPI0_SCK_PIN  Pin = 47
-	SPI0_MOSI_PIN Pin = 45
-	SPI0_MISO_PIN Pin = 46
+	SPI0_SCK_PIN  = 47
+	SPI0_MOSI_PIN = 45
+	SPI0_MISO_PIN = 46
 )

src/machine/board_trinket.go

@@ -1,73 +0,0 @@
-// +build sam,atsamd21,trinket_m0
-
-package machine
-
-import "device/sam"
-
-// GPIO Pins
-const (
-	D0  = PA08 // PWM available
-	D1  = PA02
-	D2  = PA09 // PWM available
-	D3  = PA07 // PWM available / UART0 RX
-	D4  = PA06 // PWM available / UART0 TX
-	D13 = PA10 // LED
-)
-
-// Analog pins
-const (
-	A0 = D1
-	A1 = D2
-	A2 = D0
-	A3 = D3
-	A4 = D4
-)
-
-const (
-	LED = D13
-)
-
-// UART0 aka USBCDC pins
-const (
-	USBCDC_DM_PIN = PA24
-	USBCDC_DP_PIN = PA25
-)
-
-// UART1 pins
-const (
-	UART_TX_PIN = D4
-	UART_RX_PIN = D3
-)
-
-// SPI pins
-const (
-	SPI0_SCK_PIN  = D3
-	SPI0_MOSI_PIN = D4
-	SPI0_MISO_PIN = D2
-)
-
-// SPI on the Trinket M0.
-var (
-	SPI0 = SPI{Bus: sam.SERCOM0_SPI}
-)
-
-// I2C pins
-const (
-	SDA_PIN = D0 // SDA
-	SCL_PIN = D2 // SCL
-)
-
-// I2C on the Trinket M0.
-var (
-	I2C0 = I2C{Bus: sam.SERCOM2_I2CM,
-		SDA:     SDA_PIN,
-		SCL:     SCL_PIN,
-		PinMode: PinSERCOMAlt}
-)
-
-// I2S pins
-const (
-	I2S_SCK_PIN = PA10
-	I2S_SD_PIN  = PA08
-	I2S_WS_PIN  = NoPin // TODO: figure out what this is on Trinket M0.
-)

src/machine/i2s.go

@@ -1,54 +0,0 @@
-// +build sam
-
-// This is the definition for I2S bus functions.
-// Actual implementations if available for any given hardware
-// are to be found in its the board definition.
-//
-// For more info about I2S, see: https://en.wikipedia.org/wiki/I%C2%B2S
-//
-
-package machine
-
-type I2SMode uint8
-type I2SStandard uint8
-type I2SClockSource uint8
-type I2SDataFormat uint8
-
-const (
-	I2SModeMaster I2SMode = iota
-	I2SModeSlave
-	I2SModePDM
-)
-
-const (
-	I2StandardPhilips I2SStandard = iota
-	I2SStandardMSB
-	I2SStandardLSB
-)
-
-const (
-	I2SClockSourceInternal I2SClockSource = iota
-	I2SClockSourceExternal
-)
-
-const (
-	I2SDataFormatDefault I2SDataFormat = 0
-	I2SDataFormat8bit                  = 8
-	I2SDataFormat16bit                 = 16
-	I2SDataFormat24bit                 = 24
-	I2SDataFormat32bit                 = 32
-)
-
-// All fields are optional and may not be required or used on a particular platform.
-type I2SConfig struct {
-	SCK               Pin
-	WS                Pin
-	SD                Pin
-	Mode              I2SMode
-	Standard          I2SStandard
-	ClockSource       I2SClockSource
-	DataFormat        I2SDataFormat
-	AudioFrequency    uint32
-	MasterClockOutput bool
-	Stereo            bool
-}

src/machine/machine.go

@@ -1,36 +1,25 @@
 package machine
 
-type PinConfig struct {
-	Mode PinMode
+type GPIOConfig struct {
+	Mode GPIOMode
 }
 
-// Pin is a single pin on a chip, which may be connected to other hardware
-// devices. It can either be used directly as GPIO pin or it can be used in
-// other peripherals like ADC, I2C, etc.
-type Pin int8
+type GPIO struct {
+	Pin uint8
+}
 
-// NoPin explicitly indicates "not a pin". Use this pin if you want to leave one
-// of the pins in a peripheral unconfigured (if supported by the hardware).
-const NoPin = Pin(-1)
-
-// High sets this GPIO pin to high, assuming it has been configured as an output
-// pin. It is hardware dependent (and often undefined) what happens if you set a
-// pin to high that is not configured as an output pin.
-func (p Pin) High() {
+func (p GPIO) High() {
 	p.Set(true)
 }
 
-// Low sets this GPIO pin to low, assuming it has been configured as an output
-// pin. It is hardware dependent (and often undefined) what happens if you set a
-// pin to low that is not configured as an output pin.
-func (p Pin) Low() {
+func (p GPIO) Low() {
 	p.Set(false)
 }
 
 type PWM struct {
-	Pin Pin
+	Pin uint8
 }
 
 type ADC struct {
-	Pin Pin
+	Pin uint8
 }

src/machine/machine_atmega.go

@@ -7,102 +7,102 @@ import (
 )
 
 // Configure sets the pin to input or output.
-func (p Pin) Configure(config PinConfig) {
-	if config.Mode == PinOutput { // set output bit
-		if p < 8 {
-			avr.DDRD.SetBits(1 << uint8(p))
+func (p GPIO) Configure(config GPIOConfig) {
+	if config.Mode == GPIO_OUTPUT { // set output bit
+		if p.Pin < 8 {
+			*avr.DDRD |= 1 << p.Pin
 		} else {
-			avr.DDRB.SetBits(1 << uint8(p-8))
+			*avr.DDRB |= 1 << (p.Pin - 8)
 		}
 	} else { // configure input: clear output bit
-		if p < 8 {
-			avr.DDRD.ClearBits(1 << uint8(p))
+		if p.Pin < 8 {
+			*avr.DDRD &^= 1 << p.Pin
 		} else {
-			avr.DDRB.ClearBits(1 << uint8(p-8))
+			*avr.DDRB &^= 1 << (p.Pin - 8)
 		}
 	}
 }
 
 // Get returns the current value of a GPIO pin.
-func (p Pin) Get() bool {
-	if p < 8 {
-		val := avr.PIND.Get() & (1 << uint8(p))
+func (p GPIO) Get() bool {
+	if p.Pin < 8 {
+		val := *avr.PIND & (1 << p.Pin)
 		return (val > 0)
 	} else {
-		val := avr.PINB.Get() & (1 << uint8(p-8))
+		val := *avr.PINB & (1 << (p.Pin - 8))
 		return (val > 0)
 	}
 }
 
-func (p Pin) getPortMask() (*avr.Register8, uint8) {
-	if p < 8 {
-		return avr.PORTD, 1 << uint8(p)
+func (p GPIO) getPortMask() (*avr.RegValue, uint8) {
+	if p.Pin < 8 {
+		return avr.PORTD, 1 << p.Pin
 	} else {
-		return avr.PORTB, 1 << uint8(p-8)
+		return avr.PORTB, 1 << (p.Pin - 8)
 	}
 }
 
 // InitPWM initializes the registers needed for PWM.
 func InitPWM() {
 	// use waveform generation
-	avr.TCCR0A.SetBits(avr.TCCR0A_WGM00)
+	*avr.TCCR0A |= avr.TCCR0A_WGM00
 
 	// set timer 0 prescale factor to 64
-	avr.TCCR0B.SetBits(avr.TCCR0B_CS01 | avr.TCCR0B_CS00)
+	*avr.TCCR0B |= avr.TCCR0B_CS01 | avr.TCCR0B_CS00
 
 	// set timer 1 prescale factor to 64
-	avr.TCCR1B.SetBits(avr.TCCR1B_CS11)
+	*avr.TCCR1B |= avr.TCCR1B_CS11
 
 	// put timer 1 in 8-bit phase correct pwm mode
-	avr.TCCR1A.SetBits(avr.TCCR1A_WGM10)
+	*avr.TCCR1A |= avr.TCCR1A_WGM10
 
 	// set timer 2 prescale factor to 64
-	avr.TCCR2B.SetBits(avr.TCCR2B_CS22)
+	*avr.TCCR2B |= avr.TCCR2B_CS22
 
 	// configure timer 2 for phase correct pwm (8-bit)
-	avr.TCCR2A.SetBits(avr.TCCR2A_WGM20)
+	*avr.TCCR2A |= avr.TCCR2A_WGM20
 }
 
 // Configure configures a PWM pin for output.
 func (pwm PWM) Configure() {
 	if pwm.Pin < 8 {
-		avr.DDRD.SetBits(1 << uint8(pwm.Pin))
+		*avr.DDRD |= 1 << pwm.Pin
 	} else {
-		avr.DDRB.SetBits(1 << uint8(pwm.Pin-8))
+		*avr.DDRB |= 1 << (pwm.Pin - 8)
 	}
 }
 
 // Set turns on the duty cycle for a PWM pin using the provided value. On the AVR this is normally a
 // 8-bit value ranging from 0 to 255.
 func (pwm PWM) Set(value uint16) {
-	value8 := uint8(value >> 8)
+	value8 := value >> 8
 	switch pwm.Pin {
 	case 3:
 		// connect pwm to pin on timer 2, channel B
-		avr.TCCR2A.SetBits(avr.TCCR2A_COM2B1)
-		avr.OCR2B.Set(value8) // set pwm duty
+		*avr.TCCR2A |= avr.TCCR2A_COM2B1
+		*avr.OCR2B = avr.RegValue(value8) // set pwm duty
 	case 5:
 		// connect pwm to pin on timer 0, channel B
-		avr.TCCR0A.SetBits(avr.TCCR0A_COM0B1)
-		avr.OCR0B.Set(value8) // set pwm duty
+		*avr.TCCR0A |= avr.TCCR0A_COM0B1
+		*avr.OCR0B = avr.RegValue(value8) // set pwm duty
 	case 6:
 		// connect pwm to pin on timer 0, channel A
-		avr.TCCR0A.SetBits(avr.TCCR0A_COM0A1)
-		avr.OCR0A.Set(value8) // set pwm duty
+		*avr.TCCR0A |= avr.TCCR0A_COM0A1
+		*avr.OCR0A = avr.RegValue(value8) // set pwm duty
 	case 9:
 		// connect pwm to pin on timer 1, channel A
-		avr.TCCR1A.SetBits(avr.TCCR1A_COM1A1)
+		*avr.TCCR1A |= avr.TCCR1A_COM1A1
 		// this is a 16-bit value, but we only currently allow the low order bits to be set
-		avr.OCR1AL.Set(value8) // set pwm duty
+		*avr.OCR1AL = avr.RegValue(value8) // set pwm duty
 	case 10:
 		// connect pwm to pin on timer 1, channel B
-		avr.TCCR1A.SetBits(avr.TCCR1A_COM1B1)
+		*avr.TCCR1A |= avr.TCCR1A_COM1B1
 		// this is a 16-bit value, but we only currently allow the low order bits to be set
-		avr.OCR1BL.Set(value8) // set pwm duty
+		*avr.OCR1BL = avr.RegValue(value8) // set pwm duty
 	case 11:
 		// connect pwm to pin on timer 2, channel A
-		avr.TCCR2A.SetBits(avr.TCCR2A_COM2A1)
-		avr.OCR2A.Set(value8) // set pwm duty
+		*avr.TCCR2A |= avr.TCCR2A_COM2A1
+		*avr.OCR2A = avr.RegValue(value8) // set pwm duty
 	default:
 		panic("Invalid PWM pin")
 	}
@@ -121,19 +121,19 @@ func (i2c I2C) Configure(config I2CConfig) {
 	}
 
 	// Activate internal pullups for twi.
-	avr.PORTC.SetBits((avr.DIDR0_ADC4D | avr.DIDR0_ADC5D))
+	*avr.PORTC |= (avr.DIDR0_ADC4D | avr.DIDR0_ADC5D)
 
 	// Initialize twi prescaler and bit rate.
-	avr.TWSR.SetBits((avr.TWSR_TWPS0 | avr.TWSR_TWPS1))
+	*avr.TWSR |= (avr.TWSR_TWPS0 | avr.TWSR_TWPS1)
 
 	// twi bit rate formula from atmega128 manual pg. 204:
 	// SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR))
 	// NOTE: TWBR should be 10 or higher for master mode.
 	// It is 72 for a 16mhz board with 100kHz TWI
-	avr.TWBR.Set(uint8(((CPU_FREQUENCY / config.Frequency) - 16) / 2))
+	*avr.TWBR = avr.RegValue(((CPU_FREQUENCY / config.Frequency) - 16) / 2)
 
 	// Enable twi module.
-	avr.TWCR.Set(avr.TWCR_TWEN)
+	*avr.TWCR = avr.TWCR_TWEN
 }
 
 // Tx does a single I2C transaction at the specified address.
@@ -162,10 +162,10 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 // start starts an I2C communication session.
 func (i2c I2C) start(address uint8, write bool) {
 	// Clear TWI interrupt flag, put start condition on SDA, and enable TWI.
-	avr.TWCR.Set((avr.TWCR_TWINT | avr.TWCR_TWSTA | avr.TWCR_TWEN))
+	*avr.TWCR = (avr.TWCR_TWINT | avr.TWCR_TWSTA | avr.TWCR_TWEN)
 
 	// Wait till start condition is transmitted.
-	for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
+	for (*avr.TWCR & avr.TWCR_TWINT) == 0 {
 	}
 
 	// Write 7-bit shifted peripheral address.
@@ -179,36 +179,36 @@ func (i2c I2C) start(address uint8, write bool) {
 // stop ends an I2C communication session.
 func (i2c I2C) stop() {
 	// Send stop condition.
-	avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT | avr.TWCR_TWSTO)
+	*avr.TWCR = (avr.TWCR_TWEN | avr.TWCR_TWINT | avr.TWCR_TWSTO)
 
 	// Wait for stop condition to be executed on bus.
-	for !avr.TWCR.HasBits(avr.TWCR_TWSTO) {
+	for (*avr.TWCR & avr.TWCR_TWSTO) == 0 {
 	}
 }
 
 // writeByte writes a single byte to the I2C bus.
 func (i2c I2C) writeByte(data byte) {
 	// Write data to register.
-	avr.TWDR.Set(data)
+	*avr.TWDR = avr.RegValue(data)
 
 	// Clear TWI interrupt flag and enable TWI.
-	avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT)
+	*avr.TWCR = (avr.TWCR_TWEN | avr.TWCR_TWINT)
 
 	// Wait till data is transmitted.
-	for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
+	for (*avr.TWCR & avr.TWCR_TWINT) == 0 {
 	}
 }
 
 // readByte reads a single byte from the I2C bus.
 func (i2c I2C) readByte() byte {
 	// Clear TWI interrupt flag and enable TWI.
-	avr.TWCR.Set(avr.TWCR_TWEN | avr.TWCR_TWINT | avr.TWCR_TWEA)
+	*avr.TWCR = (avr.TWCR_TWEN | avr.TWCR_TWINT | avr.TWCR_TWEA)
 
 	// Wait till read request is transmitted.
-	for !avr.TWCR.HasBits(avr.TWCR_TWINT) {
+	for (*avr.TWCR & avr.TWCR_TWINT) == 0 {
 	}
 
-	return byte(avr.TWDR.Get())
+	return byte(*avr.TWDR)
 }
 
 // UART on the AVR.
@@ -226,32 +226,32 @@ func (uart UART) Configure(config UARTConfig) {
 	// https://www.microchip.com/webdoc/AVRLibcReferenceManual/FAQ_1faq_wrong_baud_rate.html
 	// ((F_CPU + UART_BAUD_RATE * 8L) / (UART_BAUD_RATE * 16L) - 1)
 	ps := ((CPU_FREQUENCY+config.BaudRate*8)/(config.BaudRate*16) - 1)
-	avr.UBRR0H.Set(uint8(ps >> 8))
-	avr.UBRR0L.Set(uint8(ps & 0xff))
+	*avr.UBRR0H = avr.RegValue(ps >> 8)
+	*avr.UBRR0L = avr.RegValue(ps & 0xff)
 
 	// enable RX, TX and RX interrupt
-	avr.UCSR0B.Set(avr.UCSR0B_RXEN0 | avr.UCSR0B_TXEN0 | avr.UCSR0B_RXCIE0)
+	*avr.UCSR0B = avr.UCSR0B_RXEN0 | avr.UCSR0B_TXEN0 | avr.UCSR0B_RXCIE0
 
 	// 8-bits data
-	avr.UCSR0C.Set(avr.UCSR0C_UCSZ01 | avr.UCSR0C_UCSZ00)
+	*avr.UCSR0C = avr.UCSR0C_UCSZ01 | avr.UCSR0C_UCSZ00
 }
 
 // WriteByte writes a byte of data to the UART.
 func (uart UART) WriteByte(c byte) error {
 	// Wait until UART buffer is not busy.
-	for !avr.UCSR0A.HasBits(avr.UCSR0A_UDRE0) {
+	for (*avr.UCSR0A & avr.UCSR0A_UDRE0) == 0 {
 	}
-	avr.UDR0.Set(c) // send char
+	*avr.UDR0 = avr.RegValue(c) // send char
 	return nil
 }
 
 //go:interrupt USART_RX_vect
 func handleUSART_RX() {
 	// Read register to clear it.
-	data := avr.UDR0.Get()
+	data := *avr.UDR0
 
 	// Ensure no error.
-	if !avr.UCSR0A.HasBits(avr.UCSR0A_FE0 | avr.UCSR0A_DOR0 | avr.UCSR0A_UPE0) {
+	if (*avr.UCSR0A & (avr.UCSR0A_FE0 | avr.UCSR0A_DOR0 | avr.UCSR0A_UPE0)) == 0 {
 		// Put data from UDR register into buffer.
 		UART0.Receive(byte(data))
 	}

src/machine/machine_atsamd21e18.go

@@ -1,334 +0,0 @@
-// +build sam,atsamd21,atsamd21e18
-
-// Peripheral abstraction layer for the atsamd21.
-//
-// Datasheet:
-// http://ww1.microchip.com/downloads/en/DeviceDoc/SAMD21-Family-DataSheet-DS40001882D.pdf
-//
-package machine
-
-import (
-	"device/sam"
-)
-
-// Return the register and mask to enable a given GPIO pin. This can be used to
-// implement bit-banged drivers.
-func (p Pin) PortMaskSet() (*uint32, uint32) {
-	return &sam.PORT.OUTSET0.Reg, 1 << uint8(p)
-}
-
-// Return the register and mask to disable a given port. This can be used to
-// implement bit-banged drivers.
-func (p Pin) PortMaskClear() (*uint32, uint32) {
-	return &sam.PORT.OUTCLR0.Reg, 1 << uint8(p)
-}
-
-// Set the pin to high or low.
-// Warning: only use this on an output pin!
-func (p Pin) Set(high bool) {
-	if high {
-		sam.PORT.OUTSET0.Set(1 << uint8(p))
-	} else {
-		sam.PORT.OUTCLR0.Set(1 << uint8(p))
-	}
-}
-
-// Get returns the current value of a GPIO pin.
-func (p Pin) Get() bool {
-	return (sam.PORT.IN0.Get()>>uint8(p))&1 > 0
-}
-
-// Configure this pin with the given configuration.
-func (p Pin) Configure(config PinConfig) {
-	switch config.Mode {
-	case PinOutput:
-		sam.PORT.DIRSET0.Set(1 << uint8(p))
-		// output is also set to input enable so pin can read back its own value
-		p.setPinCfg(sam.PORT_PINCFG0_INEN)
-
-	case PinInput:
-		sam.PORT.DIRCLR0.Set(1 << uint8(p))
-		p.setPinCfg(sam.PORT_PINCFG0_INEN)
-
-	case PinInputPulldown:
-		sam.PORT.DIRCLR0.Set(1 << uint8(p))
-		sam.PORT.OUTCLR0.Set(1 << uint8(p))
-		p.setPinCfg(sam.PORT_PINCFG0_INEN | sam.PORT_PINCFG0_PULLEN)
-
-	case PinInputPullup:
-		sam.PORT.DIRCLR0.Set(1 << uint8(p))
-		sam.PORT.OUTSET0.Set(1 << uint8(p))
-		p.setPinCfg(sam.PORT_PINCFG0_INEN | sam.PORT_PINCFG0_PULLEN)
-
-	case PinSERCOM:
-		if uint8(p)&1 > 0 {
-			// odd pin, so save the even pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXE_Msk
-			p.setPMux(val | (uint8(PinSERCOM) << sam.PORT_PMUX0_PMUXO_Pos))
-		} else {
-			// even pin, so save the odd pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXO_Msk
-			p.setPMux(val | (uint8(PinSERCOM) << sam.PORT_PMUX0_PMUXE_Pos))
-		}
-		// enable port config
-		p.setPinCfg(sam.PORT_PINCFG0_PMUXEN | sam.PORT_PINCFG0_DRVSTR | sam.PORT_PINCFG0_INEN)
-
-	case PinSERCOMAlt:
-		if uint8(p)&1 > 0 {
-			// odd pin, so save the even pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXE_Msk
-			p.setPMux(val | (uint8(PinSERCOMAlt) << sam.PORT_PMUX0_PMUXO_Pos))
-		} else {
-			// even pin, so save the odd pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXO_Msk
-			p.setPMux(val | (uint8(PinSERCOMAlt) << sam.PORT_PMUX0_PMUXE_Pos))
-		}
-		// enable port config
-		p.setPinCfg(sam.PORT_PINCFG0_PMUXEN | sam.PORT_PINCFG0_DRVSTR)
-
-	case PinCom:
-		if uint8(p)&1 > 0 {
-			// odd pin, so save the even pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXE_Msk
-			p.setPMux(val | (uint8(PinCom) << sam.PORT_PMUX0_PMUXO_Pos))
-		} else {
-			// even pin, so save the odd pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXO_Msk
-			p.setPMux(val | (uint8(PinCom) << sam.PORT_PMUX0_PMUXE_Pos))
-		}
-		// enable port config
-		p.setPinCfg(sam.PORT_PINCFG0_PMUXEN)
-	case PinAnalog:
-		if uint8(p)&1 > 0 {
-			// odd pin, so save the even pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXE_Msk
-			p.setPMux(val | (uint8(PinAnalog) << sam.PORT_PMUX0_PMUXO_Pos))
-		} else {
-			// even pin, so save the odd pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXO_Msk
-			p.setPMux(val | (uint8(PinAnalog) << sam.PORT_PMUX0_PMUXE_Pos))
-		}
-		// enable port config
-		p.setPinCfg(sam.PORT_PINCFG0_PMUXEN | sam.PORT_PINCFG0_DRVSTR)
-	}
-}
-
-// getPMux returns the value for the correct PMUX register for this pin.
-func (p Pin) getPMux() uint8 {
-	switch p >> 1 {
-	case 0:
-		return sam.PORT.PMUX0_0.Get()
-	case 1:
-		return sam.PORT.PMUX0_1.Get()
-	case 2:
-		return sam.PORT.PMUX0_2.Get()
-	case 3:
-		return sam.PORT.PMUX0_3.Get()
-	case 4:
-		return sam.PORT.PMUX0_4.Get()
-	case 5:
-		return sam.PORT.PMUX0_5.Get()
-	case 6:
-		return sam.PORT.PMUX0_6.Get()
-	case 7:
-		return sam.PORT.PMUX0_7.Get()
-	case 8:
-		return sam.PORT.PMUX0_8.Get()
-	case 9:
-		return sam.PORT.PMUX0_9.Get()
-	case 10:
-		return sam.PORT.PMUX0_10.Get()
-	case 11:
-		return sam.PORT.PMUX0_11.Get()
-	case 12:
-		return sam.PORT.PMUX0_12.Get()
-	case 13:
-		return sam.PORT.PMUX0_13.Get()
-	case 14:
-		return sam.PORT.PMUX0_14.Get()
-	case 15:
-		return sam.PORT.PMUX0_15.Get()
-	default:
-		return 0
-	}
-}
-
-// setPMux sets the value for the correct PMUX register for this pin.
-func (p Pin) setPMux(val uint8) {
-	switch p >> 1 {
-	case 0:
-		sam.PORT.PMUX0_0.Set(val)
-	case 1:
-		sam.PORT.PMUX0_1.Set(val)
-	case 2:
-		sam.PORT.PMUX0_2.Set(val)
-	case 3:
-		sam.PORT.PMUX0_3.Set(val)
-	case 4:
-		sam.PORT.PMUX0_4.Set(val)
-	case 5:
-		sam.PORT.PMUX0_5.Set(val)
-	case 6:
-		sam.PORT.PMUX0_6.Set(val)
-	case 7:
-		sam.PORT.PMUX0_7.Set(val)
-	case 8:
-		sam.PORT.PMUX0_8.Set(val)
-	case 9:
-		sam.PORT.PMUX0_9.Set(val)
-	case 10:
-		sam.PORT.PMUX0_10.Set(val)
-	case 11:
-		sam.PORT.PMUX0_11.Set(val)
-	case 12:
-		sam.PORT.PMUX0_12.Set(val)
-	case 13:
-		sam.PORT.PMUX0_13.Set(val)
-	case 14:
-		sam.PORT.PMUX0_14.Set(val)
-	case 15:
-		sam.PORT.PMUX0_15.Set(val)
-	}
-}
-
-// getPinCfg returns the value for the correct PINCFG register for this pin.
-func (p Pin) getPinCfg() uint8 {
-	switch p {
-	case 0:
-		return sam.PORT.PINCFG0_0.Get()
-	case 1:
-		return sam.PORT.PINCFG0_1.Get()
-	case 2:
-		return sam.PORT.PINCFG0_2.Get()
-	case 3:
-		return sam.PORT.PINCFG0_3.Get()
-	case 4:
-		return sam.PORT.PINCFG0_4.Get()
-	case 5:
-		return sam.PORT.PINCFG0_5.Get()
-	case 6:
-		return sam.PORT.PINCFG0_6.Get()
-	case 7:
-		return sam.PORT.PINCFG0_7.Get()
-	case 8:
-		return sam.PORT.PINCFG0_8.Get()
-	case 9:
-		return sam.PORT.PINCFG0_9.Get()
-	case 10:
-		return sam.PORT.PINCFG0_10.Get()
-	case 11:
-		return sam.PORT.PINCFG0_11.Get()
-	case 12:
-		return sam.PORT.PINCFG0_12.Get()
-	case 13:
-		return sam.PORT.PINCFG0_13.Get()
-	case 14:
-		return sam.PORT.PINCFG0_14.Get()
-	case 15:
-		return sam.PORT.PINCFG0_15.Get()
-	case 16:
-		return sam.PORT.PINCFG0_16.Get()
-	case 17:
-		return sam.PORT.PINCFG0_17.Get()
-	case 18:
-		return sam.PORT.PINCFG0_18.Get()
-	case 19:
-		return sam.PORT.PINCFG0_19.Get()
-	case 20:
-		return sam.PORT.PINCFG0_20.Get()
-	case 21:
-		return sam.PORT.PINCFG0_21.Get()
-	case 22:
-		return sam.PORT.PINCFG0_22.Get()
-	case 23:
-		return sam.PORT.PINCFG0_23.Get()
-	case 24:
-		return sam.PORT.PINCFG0_24.Get()
-	case 25:
-		return sam.PORT.PINCFG0_25.Get()
-	case 26:
-		return sam.PORT.PINCFG0_26.Get()
-	case 27:
-		return sam.PORT.PINCFG0_27.Get()
-	case 28:
-		return sam.PORT.PINCFG0_28.Get()
-	case 29:
-		return sam.PORT.PINCFG0_29.Get()
-	case 30:
-		return sam.PORT.PINCFG0_30.Get()
-	case 31:
-		return sam.PORT.PINCFG0_31.Get()
-	default:
-		return 0
-	}
-}
-
-// setPinCfg sets the value for the correct PINCFG register for this pin.
-func (p Pin) setPinCfg(val uint8) {
-	switch p {
-	case 0:
-		sam.PORT.PINCFG0_0.Set(val)
-	case 1:
-		sam.PORT.PINCFG0_1.Set(val)
-	case 2:
-		sam.PORT.PINCFG0_2.Set(val)
-	case 3:
-		sam.PORT.PINCFG0_3.Set(val)
-	case 4:
-		sam.PORT.PINCFG0_4.Set(val)
-	case 5:
-		sam.PORT.PINCFG0_5.Set(val)
-	case 6:
-		sam.PORT.PINCFG0_6.Set(val)
-	case 7:
-		sam.PORT.PINCFG0_7.Set(val)
-	case 8:
-		sam.PORT.PINCFG0_8.Set(val)
-	case 9:
-		sam.PORT.PINCFG0_9.Set(val)
-	case 10:
-		sam.PORT.PINCFG0_10.Set(val)
-	case 11:
-		sam.PORT.PINCFG0_11.Set(val)
-	case 12:
-		sam.PORT.PINCFG0_12.Set(val)
-	case 13:
-		sam.PORT.PINCFG0_13.Set(val)
-	case 14:
-		sam.PORT.PINCFG0_14.Set(val)
-	case 15:
-		sam.PORT.PINCFG0_15.Set(val)
-	case 16:
-		sam.PORT.PINCFG0_16.Set(val)
-	case 17:
-		sam.PORT.PINCFG0_17.Set(val)
-	case 18:
-		sam.PORT.PINCFG0_18.Set(val)
-	case 19:
-		sam.PORT.PINCFG0_19.Set(val)
-	case 20:
-		sam.PORT.PINCFG0_20.Set(val)
-	case 21:
-		sam.PORT.PINCFG0_21.Set(val)
-	case 22:
-		sam.PORT.PINCFG0_22.Set(val)
-	case 23:
-		sam.PORT.PINCFG0_23.Set(val)
-	case 24:
-		sam.PORT.PINCFG0_24.Set(val)
-	case 25:
-		sam.PORT.PINCFG0_25.Set(val)
-	case 26:
-		sam.PORT.PINCFG0_26.Set(val)
-	case 27:
-		sam.PORT.PINCFG0_27.Set(val)
-	case 28:
-		sam.PORT.PINCFG0_28.Set(val)
-	case 29:
-		sam.PORT.PINCFG0_29.Set(val)
-	case 30:
-		sam.PORT.PINCFG0_30.Set(val)
-	case 31:
-		sam.PORT.PINCFG0_31.Set(val)
-	}
-}

src/machine/machine_atsamd21g18.go

@@ -1,569 +0,0 @@
-// +build sam,atsamd21,atsamd21g18
-
-// Peripheral abstraction layer for the atsamd21.
-//
-// Datasheet:
-// http://ww1.microchip.com/downloads/en/DeviceDoc/SAMD21-Family-DataSheet-DS40001882D.pdf
-//
-package machine
-
-import (
-	"device/sam"
-)
-
-// Return the register and mask to enable a given GPIO pin. This can be used to
-// implement bit-banged drivers.
-func (p Pin) PortMaskSet() (*uint32, uint32) {
-	if p < 32 {
-		return &sam.PORT.OUTSET0.Reg, 1 << uint8(p)
-	} else {
-		return &sam.PORT.OUTSET1.Reg, 1 << uint8(p-32)
-	}
-}
-
-// Return the register and mask to disable a given port. This can be used to
-// implement bit-banged drivers.
-func (p Pin) PortMaskClear() (*uint32, uint32) {
-	if p < 32 {
-		return &sam.PORT.OUTCLR0.Reg, 1 << uint8(p)
-	} else {
-		return &sam.PORT.OUTCLR1.Reg, 1 << uint8(p-32)
-	}
-}
-
-// Set the pin to high or low.
-// Warning: only use this on an output pin!
-func (p Pin) Set(high bool) {
-	if p < 32 {
-		if high {
-			sam.PORT.OUTSET0.Set(1 << uint8(p))
-		} else {
-			sam.PORT.OUTCLR0.Set(1 << uint8(p))
-		}
-	} else {
-		if high {
-			sam.PORT.OUTSET1.Set(1 << uint8(p-32))
-		} else {
-			sam.PORT.OUTCLR1.Set(1 << uint8(p-32))
-		}
-	}
-}
-
-// Get returns the current value of a GPIO pin.
-func (p Pin) Get() bool {
-	if p < 32 {
-		return (sam.PORT.IN0.Get()>>uint8(p))&1 > 0
-	} else {
-		return (sam.PORT.IN1.Get()>>(uint8(p)-32))&1 > 0
-	}
-}
-
-// Configure this pin with the given configuration.
-func (p Pin) Configure(config PinConfig) {
-	switch config.Mode {
-	case PinOutput:
-		if p < 32 {
-			sam.PORT.DIRSET0.Set(1 << uint8(p))
-			// output is also set to input enable so pin can read back its own value
-			p.setPinCfg(sam.PORT_PINCFG0_INEN)
-		} else {
-			sam.PORT.DIRSET1.Set(1 << uint8(p-32))
-			// output is also set to input enable so pin can read back its own value
-			p.setPinCfg(sam.PORT_PINCFG0_INEN)
-		}
-
-	case PinInput:
-		if p < 32 {
-			sam.PORT.DIRCLR0.Set(1 << uint8(p))
-			p.setPinCfg(sam.PORT_PINCFG0_INEN)
-		} else {
-			sam.PORT.DIRCLR1.Set(1<<uint8(p) - 32)
-			p.setPinCfg(sam.PORT_PINCFG0_INEN)
-		}
-
-	case PinInputPulldown:
-		if p < 32 {
-			sam.PORT.DIRCLR0.Set(1 << uint8(p))
-			sam.PORT.OUTCLR0.Set(1 << uint8(p))
-			p.setPinCfg(sam.PORT_PINCFG0_INEN | sam.PORT_PINCFG0_PULLEN)
-		} else {
-			sam.PORT.DIRCLR1.Set(1<<uint8(p) - 32)
-			sam.PORT.OUTCLR1.Set(1<<uint8(p) - 32)
-			p.setPinCfg(sam.PORT_PINCFG0_INEN | sam.PORT_PINCFG0_PULLEN)
-		}
-
-	case PinInputPullup:
-		if p < 32 {
-			sam.PORT.DIRCLR0.Set(1 << uint8(p))
-			sam.PORT.OUTSET0.Set(1 << uint8(p))
-			p.setPinCfg(sam.PORT_PINCFG0_INEN | sam.PORT_PINCFG0_PULLEN)
-		} else {
-			sam.PORT.DIRCLR1.Set(1<<uint8(p) - 32)
-			sam.PORT.OUTSET1.Set(1<<uint8(p) - 32)
-			p.setPinCfg(sam.PORT_PINCFG0_INEN | sam.PORT_PINCFG0_PULLEN)
-		}
-
-	case PinSERCOM:
-		if p&1 > 0 {
-			// odd pin, so save the even pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXE_Msk
-			p.setPMux(val | (uint8(PinSERCOM) << sam.PORT_PMUX0_PMUXO_Pos))
-		} else {
-			// even pin, so save the odd pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXO_Msk
-			p.setPMux(val | (uint8(PinSERCOM) << sam.PORT_PMUX0_PMUXE_Pos))
-		}
-		// enable port config
-		p.setPinCfg(sam.PORT_PINCFG0_PMUXEN | sam.PORT_PINCFG0_DRVSTR | sam.PORT_PINCFG0_INEN)
-
-	case PinSERCOMAlt:
-		if p&1 > 0 {
-			// odd pin, so save the even pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXE_Msk
-			p.setPMux(val | (uint8(PinSERCOMAlt) << sam.PORT_PMUX0_PMUXO_Pos))
-		} else {
-			// even pin, so save the odd pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXO_Msk
-			p.setPMux(val | (uint8(PinSERCOMAlt) << sam.PORT_PMUX0_PMUXE_Pos))
-		}
-		// enable port config
-		p.setPinCfg(sam.PORT_PINCFG0_PMUXEN | sam.PORT_PINCFG0_DRVSTR)
-
-	case PinCom:
-		if p&1 > 0 {
-			// odd pin, so save the even pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXE_Msk
-			p.setPMux(val | (uint8(PinCom) << sam.PORT_PMUX0_PMUXO_Pos))
-		} else {
-			// even pin, so save the odd pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXO_Msk
-			p.setPMux(val | (uint8(PinCom) << sam.PORT_PMUX0_PMUXE_Pos))
-		}
-		// enable port config
-		p.setPinCfg(sam.PORT_PINCFG0_PMUXEN)
-	case PinAnalog:
-		if p&1 > 0 {
-			// odd pin, so save the even pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXE_Msk
-			p.setPMux(val | (uint8(PinAnalog) << sam.PORT_PMUX0_PMUXO_Pos))
-		} else {
-			// even pin, so save the odd pins
-			val := p.getPMux() & sam.PORT_PMUX0_PMUXO_Msk
-			p.setPMux(val | (uint8(PinAnalog) << sam.PORT_PMUX0_PMUXE_Pos))
-		}
-		// enable port config
-		p.setPinCfg(sam.PORT_PINCFG0_PMUXEN | sam.PORT_PINCFG0_DRVSTR)
-	}
-}
-
-// getPMux returns the value for the correct PMUX register for this pin.
-func (p Pin) getPMux() uint8 {
-	switch uint8(p) >> 1 {
-	case 0:
-		return sam.PORT.PMUX0_0.Get()
-	case 1:
-		return sam.PORT.PMUX0_1.Get()
-	case 2:
-		return sam.PORT.PMUX0_2.Get()
-	case 3:
-		return sam.PORT.PMUX0_3.Get()
-	case 4:
-		return sam.PORT.PMUX0_4.Get()
-	case 5:
-		return sam.PORT.PMUX0_5.Get()
-	case 6:
-		return sam.PORT.PMUX0_6.Get()
-	case 7:
-		return sam.PORT.PMUX0_7.Get()
-	case 8:
-		return sam.PORT.PMUX0_8.Get()
-	case 9:
-		return sam.PORT.PMUX0_9.Get()
-	case 10:
-		return sam.PORT.PMUX0_10.Get()
-	case 11:
-		return sam.PORT.PMUX0_11.Get()
-	case 12:
-		return sam.PORT.PMUX0_12.Get()
-	case 13:
-		return sam.PORT.PMUX0_13.Get()
-	case 14:
-		return sam.PORT.PMUX0_14.Get()
-	case 15:
-		return sam.PORT.PMUX0_15.Get()
-	case 16:
-		return uint8(sam.PORT.PMUX1_0.Get()>>0) & 0xff
-	case 17:
-		return uint8(sam.PORT.PMUX1_0.Get()>>8) & 0xff
-	case 18:
-		return uint8(sam.PORT.PMUX1_0.Get()>>16) & 0xff
-	case 19:
-		return uint8(sam.PORT.PMUX1_0.Get()>>24) & 0xff
-	case 20:
-		return uint8(sam.PORT.PMUX1_4.Get()>>0) & 0xff
-	case 21:
-		return uint8(sam.PORT.PMUX1_4.Get()>>8) & 0xff
-	case 22:
-		return uint8(sam.PORT.PMUX1_4.Get()>>16) & 0xff
-	case 23:
-		return uint8(sam.PORT.PMUX1_4.Get()>>24) & 0xff
-	case 24:
-		return uint8(sam.PORT.PMUX1_8.Get()>>0) & 0xff
-	case 25:
-		return uint8(sam.PORT.PMUX1_8.Get()>>8) & 0xff
-	case 26:
-		return uint8(sam.PORT.PMUX1_8.Get()>>16) & 0xff
-	case 27:
-		return uint8(sam.PORT.PMUX1_8.Get()>>24) & 0xff
-	case 28:
-		return uint8(sam.PORT.PMUX1_12.Get()>>0) & 0xff
-	case 29:
-		return uint8(sam.PORT.PMUX1_12.Get()>>8) & 0xff
-	case 30:
-		return uint8(sam.PORT.PMUX1_12.Get()>>16) & 0xff
-	case 31:
-		return uint8(sam.PORT.PMUX1_12.Get()>>24) & 0xff
-	default:
-		return 0
-	}
-}
-
-// setPMux sets the value for the correct PMUX register for this pin.
-func (p Pin) setPMux(val uint8) {
-	switch uint8(p) >> 1 {
-	case 0:
-		sam.PORT.PMUX0_0.Set(val)
-	case 1:
-		sam.PORT.PMUX0_1.Set(val)
-	case 2:
-		sam.PORT.PMUX0_2.Set(val)
-	case 3:
-		sam.PORT.PMUX0_3.Set(val)
-	case 4:
-		sam.PORT.PMUX0_4.Set(val)
-	case 5:
-		sam.PORT.PMUX0_5.Set(val)
-	case 6:
-		sam.PORT.PMUX0_6.Set(val)
-	case 7:
-		sam.PORT.PMUX0_7.Set(val)
-	case 8:
-		sam.PORT.PMUX0_8.Set(val)
-	case 9:
-		sam.PORT.PMUX0_9.Set(val)
-	case 10:
-		sam.PORT.PMUX0_10.Set(val)
-	case 11:
-		sam.PORT.PMUX0_11.Set(val)
-	case 12:
-		sam.PORT.PMUX0_12.Set(val)
-	case 13:
-		sam.PORT.PMUX0_13.Set(val)
-	case 14:
-		sam.PORT.PMUX0_14.Set(val)
-	case 15:
-		sam.PORT.PMUX0_15.Set(val)
-	case 16:
-		sam.PORT.PMUX1_0.Set(sam.PORT.PMUX1_0.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 17:
-		sam.PORT.PMUX1_0.Set(sam.PORT.PMUX1_0.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 18:
-		sam.PORT.PMUX1_0.Set(sam.PORT.PMUX1_0.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 19:
-		sam.PORT.PMUX1_0.Set(sam.PORT.PMUX1_0.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 20:
-		sam.PORT.PMUX1_4.Set(sam.PORT.PMUX1_4.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 21:
-		sam.PORT.PMUX1_4.Set(sam.PORT.PMUX1_4.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 22:
-		sam.PORT.PMUX1_4.Set(sam.PORT.PMUX1_4.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 23:
-		sam.PORT.PMUX1_4.Set(sam.PORT.PMUX1_4.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 24:
-		sam.PORT.PMUX1_8.Set(sam.PORT.PMUX1_8.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 25:
-		sam.PORT.PMUX1_8.Set(sam.PORT.PMUX1_8.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 26:
-		sam.PORT.PMUX1_8.Set(sam.PORT.PMUX1_8.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 27:
-		sam.PORT.PMUX1_8.Set(sam.PORT.PMUX1_8.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 28:
-		sam.PORT.PMUX1_12.Set(sam.PORT.PMUX1_12.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 29:
-		sam.PORT.PMUX1_12.Set(sam.PORT.PMUX1_12.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 30:
-		sam.PORT.PMUX1_12.Set(sam.PORT.PMUX1_12.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 31:
-		sam.PORT.PMUX1_12.Set(sam.PORT.PMUX1_12.Get()&^(0xff<<24) | (uint32(val) << 24))
-	}
-}
-
-// getPinCfg returns the value for the correct PINCFG register for this pin.
-func (p Pin) getPinCfg() uint8 {
-	switch p {
-	case 0:
-		return sam.PORT.PINCFG0_0.Get()
-	case 1:
-		return sam.PORT.PINCFG0_1.Get()
-	case 2:
-		return sam.PORT.PINCFG0_2.Get()
-	case 3:
-		return sam.PORT.PINCFG0_3.Get()
-	case 4:
-		return sam.PORT.PINCFG0_4.Get()
-	case 5:
-		return sam.PORT.PINCFG0_5.Get()
-	case 6:
-		return sam.PORT.PINCFG0_6.Get()
-	case 7:
-		return sam.PORT.PINCFG0_7.Get()
-	case 8:
-		return sam.PORT.PINCFG0_8.Get()
-	case 9:
-		return sam.PORT.PINCFG0_9.Get()
-	case 10:
-		return sam.PORT.PINCFG0_10.Get()
-	case 11:
-		return sam.PORT.PINCFG0_11.Get()
-	case 12:
-		return sam.PORT.PINCFG0_12.Get()
-	case 13:
-		return sam.PORT.PINCFG0_13.Get()
-	case 14:
-		return sam.PORT.PINCFG0_14.Get()
-	case 15:
-		return sam.PORT.PINCFG0_15.Get()
-	case 16:
-		return sam.PORT.PINCFG0_16.Get()
-	case 17:
-		return sam.PORT.PINCFG0_17.Get()
-	case 18:
-		return sam.PORT.PINCFG0_18.Get()
-	case 19:
-		return sam.PORT.PINCFG0_19.Get()
-	case 20:
-		return sam.PORT.PINCFG0_20.Get()
-	case 21:
-		return sam.PORT.PINCFG0_21.Get()
-	case 22:
-		return sam.PORT.PINCFG0_22.Get()
-	case 23:
-		return sam.PORT.PINCFG0_23.Get()
-	case 24:
-		return sam.PORT.PINCFG0_24.Get()
-	case 25:
-		return sam.PORT.PINCFG0_25.Get()
-	case 26:
-		return sam.PORT.PINCFG0_26.Get()
-	case 27:
-		return sam.PORT.PINCFG0_27.Get()
-	case 28:
-		return sam.PORT.PINCFG0_28.Get()
-	case 29:
-		return sam.PORT.PINCFG0_29.Get()
-	case 30:
-		return sam.PORT.PINCFG0_30.Get()
-	case 31:
-		return sam.PORT.PINCFG0_31.Get()
-	case 32: // PB00
-		return uint8(sam.PORT.PINCFG1_0.Get()>>0) & 0xff
-	case 33: // PB01
-		return uint8(sam.PORT.PINCFG1_0.Get()>>8) & 0xff
-	case 34: // PB02
-		return uint8(sam.PORT.PINCFG1_0.Get()>>16) & 0xff
-	case 35: // PB03
-		return uint8(sam.PORT.PINCFG1_0.Get()>>24) & 0xff
-	case 37: // PB04
-		return uint8(sam.PORT.PINCFG1_4.Get()>>0) & 0xff
-	case 38: // PB05
-		return uint8(sam.PORT.PINCFG1_4.Get()>>8) & 0xff
-	case 39: // PB06
-		return uint8(sam.PORT.PINCFG1_4.Get()>>16) & 0xff
-	case 40: // PB07
-		return uint8(sam.PORT.PINCFG1_4.Get()>>24) & 0xff
-	case 41: // PB08
-		return uint8(sam.PORT.PINCFG1_8.Get()>>0) & 0xff
-	case 42: // PB09
-		return uint8(sam.PORT.PINCFG1_8.Get()>>8) & 0xff
-	case 43: // PB10
-		return uint8(sam.PORT.PINCFG1_8.Get()>>16) & 0xff
-	case 44: // PB11
-		return uint8(sam.PORT.PINCFG1_8.Get()>>24) & 0xff
-	case 45: // PB12
-		return uint8(sam.PORT.PINCFG1_12.Get()>>0) & 0xff
-	case 46: // PB13
-		return uint8(sam.PORT.PINCFG1_12.Get()>>8) & 0xff
-	case 47: // PB14
-		return uint8(sam.PORT.PINCFG1_12.Get()>>16) & 0xff
-	case 48: // PB15
-		return uint8(sam.PORT.PINCFG1_12.Get()>>24) & 0xff
-	case 49: // PB16
-		return uint8(sam.PORT.PINCFG1_16.Get()>>0) & 0xff
-	case 50: // PB17
-		return uint8(sam.PORT.PINCFG1_16.Get()>>8) & 0xff
-	case 51: // PB18
-		return uint8(sam.PORT.PINCFG1_16.Get()>>16) & 0xff
-	case 52: // PB19
-		return uint8(sam.PORT.PINCFG1_16.Get()>>24) & 0xff
-	case 53: // PB20
-		return uint8(sam.PORT.PINCFG1_20.Get()>>0) & 0xff
-	case 54: // PB21
-		return uint8(sam.PORT.PINCFG1_20.Get()>>8) & 0xff
-	case 55: // PB22
-		return uint8(sam.PORT.PINCFG1_20.Get()>>16) & 0xff
-	case 56: // PB23
-		return uint8(sam.PORT.PINCFG1_20.Get()>>24) & 0xff
-	case 57: // PB24
-		return uint8(sam.PORT.PINCFG1_24.Get()>>0) & 0xff
-	case 58: // PB25
-		return uint8(sam.PORT.PINCFG1_24.Get()>>8) & 0xff
-	case 59: // PB26
-		return uint8(sam.PORT.PINCFG1_24.Get()>>16) & 0xff
-	case 60: // PB27
-		return uint8(sam.PORT.PINCFG1_24.Get()>>24) & 0xff
-	case 61: // PB28
-		return uint8(sam.PORT.PINCFG1_28.Get()>>0) & 0xff
-	case 62: // PB29
-		return uint8(sam.PORT.PINCFG1_28.Get()>>8) & 0xff
-	case 63: // PB30
-		return uint8(sam.PORT.PINCFG1_28.Get()>>16) & 0xff
-	case 64: // PB31
-		return uint8(sam.PORT.PINCFG1_28.Get()>>24) & 0xff
-	default:
-		return 0
-	}
-}
-
-// setPinCfg sets the value for the correct PINCFG register for this pin.
-func (p Pin) setPinCfg(val uint8) {
-	switch p {
-	case 0:
-		sam.PORT.PINCFG0_0.Set(val)
-	case 1:
-		sam.PORT.PINCFG0_1.Set(val)
-	case 2:
-		sam.PORT.PINCFG0_2.Set(val)
-	case 3:
-		sam.PORT.PINCFG0_3.Set(val)
-	case 4:
-		sam.PORT.PINCFG0_4.Set(val)
-	case 5:
-		sam.PORT.PINCFG0_5.Set(val)
-	case 6:
-		sam.PORT.PINCFG0_6.Set(val)
-	case 7:
-		sam.PORT.PINCFG0_7.Set(val)
-	case 8:
-		sam.PORT.PINCFG0_8.Set(val)
-	case 9:
-		sam.PORT.PINCFG0_9.Set(val)
-	case 10:
-		sam.PORT.PINCFG0_10.Set(val)
-	case 11:
-		sam.PORT.PINCFG0_11.Set(val)
-	case 12:
-		sam.PORT.PINCFG0_12.Set(val)
-	case 13:
-		sam.PORT.PINCFG0_13.Set(val)
-	case 14:
-		sam.PORT.PINCFG0_14.Set(val)
-	case 15:
-		sam.PORT.PINCFG0_15.Set(val)
-	case 16:
-		sam.PORT.PINCFG0_16.Set(val)
-	case 17:
-		sam.PORT.PINCFG0_17.Set(val)
-	case 18:
-		sam.PORT.PINCFG0_18.Set(val)
-	case 19:
-		sam.PORT.PINCFG0_19.Set(val)
-	case 20:
-		sam.PORT.PINCFG0_20.Set(val)
-	case 21:
-		sam.PORT.PINCFG0_21.Set(val)
-	case 22:
-		sam.PORT.PINCFG0_22.Set(val)
-	case 23:
-		sam.PORT.PINCFG0_23.Set(val)
-	case 24:
-		sam.PORT.PINCFG0_24.Set(val)
-	case 25:
-		sam.PORT.PINCFG0_25.Set(val)
-	case 26:
-		sam.PORT.PINCFG0_26.Set(val)
-	case 27:
-		sam.PORT.PINCFG0_27.Set(val)
-	case 28:
-		sam.PORT.PINCFG0_28.Set(val)
-	case 29:
-		sam.PORT.PINCFG0_29.Set(val)
-	case 30:
-		sam.PORT.PINCFG0_30.Set(val)
-	case 31:
-		sam.PORT.PINCFG0_31.Set(val)
-	case 32: // PB00
-		sam.PORT.PINCFG1_0.Set(sam.PORT.PINCFG1_0.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 33: // PB01
-		sam.PORT.PINCFG1_0.Set(sam.PORT.PINCFG1_0.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 34: // PB02
-		sam.PORT.PINCFG1_0.Set(sam.PORT.PINCFG1_0.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 35: // PB03
-		sam.PORT.PINCFG1_0.Set(sam.PORT.PINCFG1_0.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 36: // PB04
-		sam.PORT.PINCFG1_4.Set(sam.PORT.PINCFG1_4.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 37: // PB05
-		sam.PORT.PINCFG1_4.Set(sam.PORT.PINCFG1_4.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 38: // PB06
-		sam.PORT.PINCFG1_4.Set(sam.PORT.PINCFG1_4.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 39: // PB07
-		sam.PORT.PINCFG1_4.Set(sam.PORT.PINCFG1_4.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 40: // PB08
-		sam.PORT.PINCFG1_8.Set(sam.PORT.PINCFG1_8.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 41: // PB09
-		sam.PORT.PINCFG1_8.Set(sam.PORT.PINCFG1_8.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 42: // PB10
-		sam.PORT.PINCFG1_8.Set(sam.PORT.PINCFG1_8.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 43: // PB11
-		sam.PORT.PINCFG1_8.Set(sam.PORT.PINCFG1_8.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 44: // PB12
-		sam.PORT.PINCFG1_12.Set(sam.PORT.PINCFG1_12.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 45: // PB13
-		sam.PORT.PINCFG1_12.Set(sam.PORT.PINCFG1_12.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 46: // PB14
-		sam.PORT.PINCFG1_12.Set(sam.PORT.PINCFG1_12.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 47: // PB15
-		sam.PORT.PINCFG1_12.Set(sam.PORT.PINCFG1_12.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 48: // PB16
-		sam.PORT.PINCFG1_16.Set(sam.PORT.PINCFG1_16.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 49: // PB17
-		sam.PORT.PINCFG1_16.Set(sam.PORT.PINCFG1_16.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 50: // PB18
-		sam.PORT.PINCFG1_16.Set(sam.PORT.PINCFG1_16.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 51: // PB19
-		sam.PORT.PINCFG1_16.Set(sam.PORT.PINCFG1_16.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 52: // PB20
-		sam.PORT.PINCFG1_20.Set(sam.PORT.PINCFG1_20.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 53: // PB21
-		sam.PORT.PINCFG1_20.Set(sam.PORT.PINCFG1_20.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 54: // PB22
-		sam.PORT.PINCFG1_20.Set(sam.PORT.PINCFG1_20.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 55: // PB23
-		sam.PORT.PINCFG1_20.Set(sam.PORT.PINCFG1_20.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 56: // PB24
-		sam.PORT.PINCFG1_24.Set(sam.PORT.PINCFG1_24.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 57: // PB25
-		sam.PORT.PINCFG1_24.Set(sam.PORT.PINCFG1_24.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 58: // PB26
-		sam.PORT.PINCFG1_24.Set(sam.PORT.PINCFG1_24.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 59: // PB27
-		sam.PORT.PINCFG1_24.Set(sam.PORT.PINCFG1_24.Get()&^(0xff<<24) | (uint32(val) << 24))
-	case 60: // PB28
-		sam.PORT.PINCFG1_28.Set(sam.PORT.PINCFG1_28.Get()&^(0xff<<0) | (uint32(val) << 0))
-	case 61: // PB29
-		sam.PORT.PINCFG1_28.Set(sam.PORT.PINCFG1_28.Get()&^(0xff<<8) | (uint32(val) << 8))
-	case 62: // PB30
-		sam.PORT.PINCFG1_28.Set(sam.PORT.PINCFG1_28.Get()&^(0xff<<16) | (uint32(val) << 16))
-	case 63: // PB31
-		sam.PORT.PINCFG1_28.Set(sam.PORT.PINCFG1_28.Get()&^(0xff<<24) | (uint32(val) << 24))
-	}
-}

src/machine/machine_attiny.go

@@ -7,21 +7,21 @@ import (
 )
 
 // Configure sets the pin to input or output.
-func (p Pin) Configure(config PinConfig) {
-	if config.Mode == PinOutput { // set output bit
-		avr.DDRB.SetBits(1 << uint8(p))
+func (p GPIO) Configure(config GPIOConfig) {
+	if config.Mode == GPIO_OUTPUT { // set output bit
+		*avr.DDRB |= 1 << p.Pin
 	} else { // configure input: clear output bit
-		avr.DDRB.ClearBits(1 << uint8(p))
+		*avr.DDRB &^= 1 << p.Pin
 	}
 }
 
-func (p Pin) getPortMask() (*avr.Register8, uint8) {
-	return avr.PORTB, 1 << uint8(p)
+func (p GPIO) getPortMask() (*avr.RegValue, uint8) {
+	return avr.PORTB, 1 << p.Pin
 }
 
 // Get returns the current value of a GPIO pin.
-func (p Pin) Get() bool {
-	val := avr.PINB.Get() & (1 << uint8(p))
+func (p GPIO) Get() bool {
+	val := *avr.PINB & (1 << p.Pin)
 	return (val > 0)
 }
 

src/machine/machine_avr.go

@@ -6,21 +6,21 @@ import (
 	"device/avr"
 )
 
-type PinMode uint8
+type GPIOMode uint8
 
 const (
-	PinInput PinMode = iota
-	PinOutput
+	GPIO_INPUT = iota
+	GPIO_OUTPUT
 )
 
 // Set changes the value of the GPIO pin. The pin must be configured as output.
-func (p Pin) Set(value bool) {
+func (p GPIO) Set(value bool) {
 	if value { // set bits
 		port, mask := p.PortMaskSet()
-		port.Set(mask)
+		*port = mask
 	} else { // clear bits
 		port, mask := p.PortMaskClear()
-		port.Set(mask)
+		*port = mask
 	}
 }
 
@@ -30,9 +30,9 @@ func (p Pin) Set(value bool) {
 // Warning: there are no separate pin set/clear registers on the AVR. The
 // returned mask is only valid as long as no other pin in the same port has been
 // changed.
-func (p Pin) PortMaskSet() (*avr.Register8, uint8) {
+func (p GPIO) PortMaskSet() (*avr.RegValue, avr.RegValue) {
 	port, mask := p.getPortMask()
-	return port, port.Get() | mask
+	return port, *port | avr.RegValue(mask)
 }
 
 // Return the register and mask to disable a given port. This can be used to
@@ -41,18 +41,18 @@ func (p Pin) PortMaskSet() (*avr.Register8, uint8) {
 // Warning: there are no separate pin set/clear registers on the AVR. The
 // returned mask is only valid as long as no other pin in the same port has been
 // changed.
-func (p Pin) PortMaskClear() (*avr.Register8, uint8) {
+func (p GPIO) PortMaskClear() (*avr.RegValue, avr.RegValue) {
 	port, mask := p.getPortMask()
-	return port, port.Get() &^ mask
+	return port, *port &^ avr.RegValue(mask)
 }
 
 // InitADC initializes the registers needed for ADC.
 func InitADC() {
 	// set a2d prescaler so we are inside the desired 50-200 KHz range at 16MHz.
-	avr.ADCSRA.SetBits(avr.ADCSRA_ADPS2 | avr.ADCSRA_ADPS1 | avr.ADCSRA_ADPS0)
+	*avr.ADCSRA |= (avr.ADCSRA_ADPS2 | avr.ADCSRA_ADPS1 | avr.ADCSRA_ADPS0)
 
 	// enable a2d conversions
-	avr.ADCSRA.SetBits(avr.ADCSRA_ADEN)
+	*avr.ADCSRA |= avr.ADCSRA_ADEN
 }
 
 // Configure configures a ADCPin to be able to be used to read data.
@@ -68,16 +68,18 @@ func (a ADC) Get() uint16 {
 	// set the ADLAR bit (left-adjusted result) to get a value scaled to 16
 	// bits. This has the same effect as shifting the return value left by 6
 	// bits.
-	avr.ADMUX.Set(avr.ADMUX_REFS0 | avr.ADMUX_ADLAR | (uint8(a.Pin) & 0x07))
+	*avr.ADMUX = avr.RegValue(avr.ADMUX_REFS0 | avr.ADMUX_ADLAR | (a.Pin & 0x07))
 
 	// start the conversion
-	avr.ADCSRA.SetBits(avr.ADCSRA_ADSC)
+	*avr.ADCSRA |= avr.ADCSRA_ADSC
 
 	// ADSC is cleared when the conversion finishes
-	for ok := true; ok; ok = avr.ADCSRA.HasBits(avr.ADCSRA_ADSC) {
+	for ok := true; ok; ok = (*avr.ADCSRA & avr.ADCSRA_ADSC) > 0 {
 	}
 
-	return uint16(avr.ADCL.Get()) | uint16(avr.ADCH.Get())<<8
+	low := uint16(*avr.ADCL)
+	high := uint16(*avr.ADCH)
+	return uint16(low) | uint16(high<<8)
 }
 
 // I2C on AVR.

src/machine/machine_dummy.go

@@ -4,37 +4,85 @@ package machine
 
 // Dummy machine package, filled with no-ops.
 
-type PinMode uint8
+type GPIOMode uint8
 
 const (
-	PinInput PinMode = iota
-	PinOutput
+	GPIO_INPUT = iota
+	GPIO_OUTPUT
 )
 
 // Fake LED numbers, for testing.
-const (
-	LED  Pin = LED1
-	LED1 Pin = 0
-	LED2 Pin = 0
-	LED3 Pin = 0
-	LED4 Pin = 0
+var (
+	LED  uint8 = LED1
+	LED1 uint8 = 0
+	LED2 uint8 = 0
+	LED3 uint8 = 0
+	LED4 uint8 = 0
 )
 
 // Fake button numbers, for testing.
-const (
-	BUTTON  Pin = BUTTON1
-	BUTTON1 Pin = 0
-	BUTTON2 Pin = 0
-	BUTTON3 Pin = 0
-	BUTTON4 Pin = 0
+var (
+	BUTTON  uint8 = BUTTON1
+	BUTTON1 uint8 = 5
+	BUTTON2 uint8 = 6
+	BUTTON3 uint8 = 7
+	BUTTON4 uint8 = 8
 )
 
-func (p Pin) Configure(config PinConfig) {
+// Fake SPI interfaces, for testing.
+var (
+	SPI0 = SPI{0}
+)
+
+var (
+	GPIOConfigure func(pin uint8, config GPIOConfig)
+	GPIOSet       func(pin uint8, value bool)
+	GPIOGet       func(pin uint8) bool
+	SPIConfigure  func(bus uint8, sck uint8, mosi uint8, miso uint8)
+	SPITransfer   func(bus uint8, w uint8) uint8
+)
+
+func (p GPIO) Configure(config GPIOConfig) {
+	if GPIOConfigure != nil {
+		GPIOConfigure(p.Pin, config)
+	}
 }
 
-func (p Pin) Set(value bool) {
+func (p GPIO) Set(value bool) {
+	if GPIOSet != nil {
+		GPIOSet(p.Pin, value)
+	}
 }
 
-func (p Pin) Get() bool {
+func (p GPIO) Get() bool {
+	if GPIOGet != nil {
+		return GPIOGet(p.Pin)
+	}
 	return false
 }
+
+type SPI struct {
+	Bus uint8
+}
+
+type SPIConfig struct {
+	Frequency uint32
+	SCK       uint8
+	MOSI      uint8
+	MISO      uint8
+	Mode      uint8
+}
+
+func (spi SPI) Configure(config SPIConfig) {
+	if SPIConfigure != nil {
+		SPIConfigure(spi.Bus, config.SCK, config.MOSI, config.MISO)
+	}
+}
+
+// Transfer writes/reads a single byte using the SPI interface.
+func (spi SPI) Transfer(w byte) (byte, error) {
+	if SPITransfer != nil {
+		return SPITransfer(spi.Bus, w), nil
+	}
+	return 0, nil
+}

src/machine/machine_nrf.go

@@ -7,51 +7,51 @@ import (
 	"device/nrf"
 )
 
-type PinMode uint8
+type GPIOMode uint8
 
 const (
-	PinInput         PinMode = (nrf.GPIO_PIN_CNF_DIR_Input << nrf.GPIO_PIN_CNF_DIR_Pos) | (nrf.GPIO_PIN_CNF_INPUT_Connect << nrf.GPIO_PIN_CNF_INPUT_Pos)
-	PinInputPullup   PinMode = PinInput | (nrf.GPIO_PIN_CNF_PULL_Pullup << nrf.GPIO_PIN_CNF_PULL_Pos)
-	PinInputPulldown PinMode = PinOutput | (nrf.GPIO_PIN_CNF_PULL_Pulldown << nrf.GPIO_PIN_CNF_PULL_Pos)
-	PinOutput        PinMode = (nrf.GPIO_PIN_CNF_DIR_Output << nrf.GPIO_PIN_CNF_DIR_Pos) | (nrf.GPIO_PIN_CNF_INPUT_Disconnect << nrf.GPIO_PIN_CNF_INPUT_Pos)
+	GPIO_INPUT          = (nrf.GPIO_PIN_CNF_DIR_Input << nrf.GPIO_PIN_CNF_DIR_Pos) | (nrf.GPIO_PIN_CNF_INPUT_Connect << nrf.GPIO_PIN_CNF_INPUT_Pos)
+	GPIO_INPUT_PULLUP   = GPIO_INPUT | (nrf.GPIO_PIN_CNF_PULL_Pullup << nrf.GPIO_PIN_CNF_PULL_Pos)
+	GPIO_INPUT_PULLDOWN = GPIO_INPUT | (nrf.GPIO_PIN_CNF_PULL_Pulldown << nrf.GPIO_PIN_CNF_PULL_Pos)
+	GPIO_OUTPUT         = (nrf.GPIO_PIN_CNF_DIR_Output << nrf.GPIO_PIN_CNF_DIR_Pos) | (nrf.GPIO_PIN_CNF_INPUT_Disconnect << nrf.GPIO_PIN_CNF_INPUT_Pos)
 )
 
 // Configure this pin with the given configuration.
-func (p Pin) Configure(config PinConfig) {
+func (p GPIO) Configure(config GPIOConfig) {
 	cfg := config.Mode | nrf.GPIO_PIN_CNF_DRIVE_S0S1 | nrf.GPIO_PIN_CNF_SENSE_Disabled
 	port, pin := p.getPortPin()
-	port.PIN_CNF[pin].Set(uint32(cfg))
+	port.PIN_CNF[pin] = nrf.RegValue(cfg)
 }
 
 // Set the pin to high or low.
 // Warning: only use this on an output pin!
-func (p Pin) Set(high bool) {
+func (p GPIO) Set(high bool) {
 	port, pin := p.getPortPin()
 	if high {
-		port.OUTSET.Set(1 << pin)
+		port.OUTSET = 1 << pin
 	} else {
-		port.OUTCLR.Set(1 << pin)
+		port.OUTCLR = 1 << pin
 	}
 }
 
 // Return the register and mask to enable a given GPIO pin. This can be used to
 // implement bit-banged drivers.
-func (p Pin) PortMaskSet() (*uint32, uint32) {
+func (p GPIO) PortMaskSet() (*uint32, uint32) {
 	port, pin := p.getPortPin()
-	return &port.OUTSET.Reg, 1 << pin
+	return (*uint32)(&port.OUTSET), 1 << pin
 }
 
 // Return the register and mask to disable a given port. This can be used to
 // implement bit-banged drivers.
-func (p Pin) PortMaskClear() (*uint32, uint32) {
+func (p GPIO) PortMaskClear() (*uint32, uint32) {
 	port, pin := p.getPortPin()
-	return &port.OUTCLR.Reg, 1 << pin
+	return (*uint32)(&port.OUTCLR), 1 << pin
 }
 
 // Get returns the current value of a GPIO pin.
-func (p Pin) Get() bool {
+func (p GPIO) Get() bool {
 	port, pin := p.getPortPin()
-	return (port.IN.Get()>>pin)&1 != 0
+	return (port.IN>>pin)&1 != 0
 }
 
 // UART on the NRF.
@@ -77,10 +77,10 @@ func (uart UART) Configure(config UARTConfig) {
 	// Set TX and RX pins from board.
 	uart.setPins(UART_TX_PIN, UART_RX_PIN)
 
-	nrf.UART0.ENABLE.Set(nrf.UART_ENABLE_ENABLE_Enabled)
-	nrf.UART0.TASKS_STARTTX.Set(1)
-	nrf.UART0.TASKS_STARTRX.Set(1)
-	nrf.UART0.INTENSET.Set(nrf.UART_INTENSET_RXDRDY_Msk)
+	nrf.UART0.ENABLE = nrf.UART_ENABLE_ENABLE_Enabled
+	nrf.UART0.TASKS_STARTTX = 1
+	nrf.UART0.TASKS_STARTRX = 1
+	nrf.UART0.INTENSET = nrf.UART_INTENSET_RXDRDY_Msk
 
 	// Enable RX IRQ.
 	arm.SetPriority(nrf.IRQ_UART0, 0xc0) // low priority
@@ -99,22 +99,22 @@ func (uart UART) SetBaudRate(br uint32) {
 	// https://devzone.nordicsemi.com/f/nordic-q-a/391/uart-baudrate-register-values/2046#2046
 	rate := uint32((uint64(br/400)*uint64(400*0xffffffff/16000000) + 0x800) & 0xffffff000)
 
-	nrf.UART0.BAUDRATE.Set(rate)
+	nrf.UART0.BAUDRATE = nrf.RegValue(rate)
 }
 
 // WriteByte writes a byte of data to the UART.
 func (uart UART) WriteByte(c byte) error {
-	nrf.UART0.EVENTS_TXDRDY.Set(0)
-	nrf.UART0.TXD.Set(uint32(c))
-	for nrf.UART0.EVENTS_TXDRDY.Get() == 0 {
+	nrf.UART0.EVENTS_TXDRDY = 0
+	nrf.UART0.TXD = nrf.RegValue(c)
+	for nrf.UART0.EVENTS_TXDRDY == 0 {
 	}
 	return nil
 }
 
 func (uart UART) handleInterrupt() {
-	if nrf.UART0.EVENTS_RXDRDY.Get() != 0 {
-		uart.Receive(byte(nrf.UART0.RXD.Get()))
-		nrf.UART0.EVENTS_RXDRDY.Set(0x0)
+	if nrf.UART0.EVENTS_RXDRDY != 0 {
+		uart.Receive(byte(nrf.UART0.RXD))
+		nrf.UART0.EVENTS_RXDRDY = 0x0
 	}
 }
 
@@ -132,8 +132,8 @@ var (
 // I2CConfig is used to store config info for I2C.
 type I2CConfig struct {
 	Frequency uint32
-	SCL       Pin
-	SDA       Pin
+	SCL       uint8
+	SDA       uint8
 }
 
 // Configure is intended to setup the I2C interface.
@@ -149,27 +149,27 @@ func (i2c I2C) Configure(config I2CConfig) {
 	}
 
 	// do config
-	sclPort, sclPin := config.SCL.getPortPin()
-	sclPort.PIN_CNF[sclPin].Set((nrf.GPIO_PIN_CNF_DIR_Input << nrf.GPIO_PIN_CNF_DIR_Pos) |
+	sclPort, sclPin := GPIO{config.SCL}.getPortPin()
+	sclPort.PIN_CNF[sclPin] = (nrf.GPIO_PIN_CNF_DIR_Input << nrf.GPIO_PIN_CNF_DIR_Pos) |
 		(nrf.GPIO_PIN_CNF_INPUT_Connect << nrf.GPIO_PIN_CNF_INPUT_Pos) |
 		(nrf.GPIO_PIN_CNF_PULL_Pullup << nrf.GPIO_PIN_CNF_PULL_Pos) |
 		(nrf.GPIO_PIN_CNF_DRIVE_S0D1 << nrf.GPIO_PIN_CNF_DRIVE_Pos) |
-		(nrf.GPIO_PIN_CNF_SENSE_Disabled << nrf.GPIO_PIN_CNF_SENSE_Pos))
+		(nrf.GPIO_PIN_CNF_SENSE_Disabled << nrf.GPIO_PIN_CNF_SENSE_Pos)
 
-	sdaPort, sdaPin := config.SDA.getPortPin()
-	sdaPort.PIN_CNF[sdaPin].Set((nrf.GPIO_PIN_CNF_DIR_Input << nrf.GPIO_PIN_CNF_DIR_Pos) |
+	sdaPort, sdaPin := GPIO{config.SDA}.getPortPin()
+	sdaPort.PIN_CNF[sdaPin] = (nrf.GPIO_PIN_CNF_DIR_Input << nrf.GPIO_PIN_CNF_DIR_Pos) |
 		(nrf.GPIO_PIN_CNF_INPUT_Connect << nrf.GPIO_PIN_CNF_INPUT_Pos) |
 		(nrf.GPIO_PIN_CNF_PULL_Pullup << nrf.GPIO_PIN_CNF_PULL_Pos) |
 		(nrf.GPIO_PIN_CNF_DRIVE_S0D1 << nrf.GPIO_PIN_CNF_DRIVE_Pos) |
-		(nrf.GPIO_PIN_CNF_SENSE_Disabled << nrf.GPIO_PIN_CNF_SENSE_Pos))
+		(nrf.GPIO_PIN_CNF_SENSE_Disabled << nrf.GPIO_PIN_CNF_SENSE_Pos)
 
 	if config.Frequency == TWI_FREQ_400KHZ {
-		i2c.Bus.FREQUENCY.Set(nrf.TWI_FREQUENCY_FREQUENCY_K400)
+		i2c.Bus.FREQUENCY = nrf.TWI_FREQUENCY_FREQUENCY_K400
 	} else {
-		i2c.Bus.FREQUENCY.Set(nrf.TWI_FREQUENCY_FREQUENCY_K100)
+		i2c.Bus.FREQUENCY = nrf.TWI_FREQUENCY_FREQUENCY_K100
 	}
 
-	i2c.Bus.ENABLE.Set(nrf.TWI_ENABLE_ENABLE_Enabled)
+	i2c.Bus.ENABLE = nrf.TWI_ENABLE_ENABLE_Enabled
 	i2c.setPins(config.SCL, config.SDA)
 }
 
@@ -177,28 +177,29 @@ func (i2c I2C) Configure(config I2CConfig) {
 // It clocks out the given address, writes the bytes in w, reads back len(r)
 // bytes and stores them in r, and generates a stop condition on the bus.
 func (i2c I2C) Tx(addr uint16, w, r []byte) error {
-	i2c.Bus.ADDRESS.Set(uint32(addr))
+	i2c.Bus.ADDRESS = nrf.RegValue(addr)
 	if len(w) != 0 {
-		i2c.Bus.TASKS_STARTTX.Set(1) // start transmission for writing
+		i2c.Bus.TASKS_STARTTX = 1 // start transmission for writing
 		for _, b := range w {
 			i2c.writeByte(b)
 		}
 	}
 	if len(r) != 0 {
-		// To trigger suspend task when a byte is received
-		i2c.Bus.SHORTS.Set(nrf.TWI_SHORTS_BB_SUSPEND)
-		i2c.Bus.TASKS_STARTRX.Set(1) // re-start transmission for reading
-		for i := range r {           // read each char
+		i2c.Bus.TASKS_STARTRX = 1 // re-start transmission for reading
+		for i := range r {        // read each char
 			if i+1 == len(r) {
-				// To trigger stop task when last byte is received, set before resume task.
-				i2c.Bus.SHORTS.Set(nrf.TWI_SHORTS_BB_STOP)
+				// The 'stop' signal must be sent before reading back the last
+				// byte, so that it will be sent by the I2C peripheral right
+				// after the last byte has been read.
+				r[i] = i2c.readLastByte()
+			} else {
+				r[i] = i2c.readByte()
 			}
-			i2c.Bus.TASKS_RESUME.Set(1) // re-start transmission for reading
-			r[i] = i2c.readByte()
 		}
+	} else {
+		// Nothing to read back. Stop the transmission.
+		i2c.signalStop()
 	}
-	i2c.signalStop()
-	i2c.Bus.SHORTS.Set(nrf.TWI_SHORTS_BB_SUSPEND_Disabled)
 	return nil
 }
 
@@ -206,26 +207,36 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 // it must generate a stop condition after the next character is retrieved when
 // reading.
 func (i2c I2C) signalStop() {
-	i2c.Bus.TASKS_STOP.Set(1)
-	for i2c.Bus.EVENTS_STOPPED.Get() == 0 {
+	i2c.Bus.TASKS_STOP = 1
+	for i2c.Bus.EVENTS_STOPPED == 0 {
 	}
-	i2c.Bus.EVENTS_STOPPED.Set(0)
+	i2c.Bus.EVENTS_STOPPED = 0
 }
 
 // writeByte writes a single byte to the I2C bus.
 func (i2c I2C) writeByte(data byte) {
-	i2c.Bus.TXD.Set(uint32(data))
-	for i2c.Bus.EVENTS_TXDSENT.Get() == 0 {
+	i2c.Bus.TXD = nrf.RegValue(data)
+	for i2c.Bus.EVENTS_TXDSENT == 0 {
 	}
-	i2c.Bus.EVENTS_TXDSENT.Set(0)
+	i2c.Bus.EVENTS_TXDSENT = 0
 }
 
 // readByte reads a single byte from the I2C bus.
 func (i2c I2C) readByte() byte {
-	for i2c.Bus.EVENTS_RXDREADY.Get() == 0 {
+	for i2c.Bus.EVENTS_RXDREADY == 0 {
 	}
-	i2c.Bus.EVENTS_RXDREADY.Set(0)
-	return byte(i2c.Bus.RXD.Get())
+	i2c.Bus.EVENTS_RXDREADY = 0
+	return byte(i2c.Bus.RXD)
+}
+
+// readLastByte reads a single byte from the I2C bus, sending a stop signal
+// after it has been read.
+func (i2c I2C) readLastByte() byte {
+	for i2c.Bus.EVENTS_RXDREADY == 0 {
+	}
+	i2c.Bus.EVENTS_RXDREADY = 0
+	i2c.signalStop() // signal 'stop' now, so it is sent when reading RXD
+	return byte(i2c.Bus.RXD)
 }
 
 // SPI on the NRF.
@@ -242,9 +253,9 @@ var (
 // SPIConfig is used to store config info for SPI.
 type SPIConfig struct {
 	Frequency uint32
-	SCK       Pin
-	MOSI      Pin
-	MISO      Pin
+	SCK       uint8
+	MOSI      uint8
+	MISO      uint8
 	LSBFirst  bool
 	Mode      uint8
 }
@@ -252,7 +263,7 @@ type SPIConfig struct {
 // Configure is intended to setup the SPI interface.
 func (spi SPI) Configure(config SPIConfig) {
 	// Disable bus to configure it
-	spi.Bus.ENABLE.Set(nrf.SPI_ENABLE_ENABLE_Disabled)
+	spi.Bus.ENABLE = nrf.SPI_ENABLE_ENABLE_Disabled
 
 	// set frequency
 	var freq uint32
@@ -275,7 +286,7 @@ func (spi SPI) Configure(config SPIConfig) {
 	default:
 		freq = nrf.SPI_FREQUENCY_FREQUENCY_K500
 	}
-	spi.Bus.FREQUENCY.Set(freq)
+	spi.Bus.FREQUENCY = nrf.RegValue(freq)
 
 	var conf uint32
 
@@ -302,22 +313,22 @@ func (spi SPI) Configure(config SPIConfig) {
 		conf &^= (nrf.SPI_CONFIG_CPOL_ActiveHigh << nrf.SPI_CONFIG_CPOL_Pos)
 		conf &^= (nrf.SPI_CONFIG_CPHA_Leading << nrf.SPI_CONFIG_CPHA_Pos)
 	}
-	spi.Bus.CONFIG.Set(conf)
+	spi.Bus.CONFIG = nrf.RegValue(conf)
 
 	// set pins
 	spi.setPins(config.SCK, config.MOSI, config.MISO)
 
 	// Re-enable bus now that it is configured.
-	spi.Bus.ENABLE.Set(nrf.SPI_ENABLE_ENABLE_Enabled)
+	spi.Bus.ENABLE = nrf.SPI_ENABLE_ENABLE_Enabled
 }
 
 // Transfer writes/reads a single byte using the SPI interface.
 func (spi SPI) Transfer(w byte) (byte, error) {
-	spi.Bus.TXD.Set(uint32(w))
-	for spi.Bus.EVENTS_READY.Get() == 0 {
+	spi.Bus.TXD = nrf.RegValue(w)
+	for spi.Bus.EVENTS_READY == 0 {
 	}
-	r := spi.Bus.RXD.Get()
-	spi.Bus.EVENTS_READY.Set(0)
+	r := spi.Bus.RXD
+	spi.Bus.EVENTS_READY = 0
 
 	// TODO: handle SPI errors
 	return byte(r), nil

src/machine/machine_nrf51.go

@@ -9,13 +9,13 @@ import (
 const CPU_FREQUENCY = 16000000
 
 // Get peripheral and pin number for this GPIO pin.
-func (p Pin) getPortPin() (*nrf.GPIO_Type, uint32) {
-	return nrf.GPIO, uint32(p)
+func (p GPIO) getPortPin() (*nrf.GPIO_Type, uint8) {
+	return nrf.GPIO, p.Pin
 }
 
-func (uart UART) setPins(tx, rx Pin) {
-	nrf.UART0.PSELTXD.Set(uint32(tx))
-	nrf.UART0.PSELRXD.Set(uint32(rx))
+func (uart UART) setPins(tx, rx uint32) {
+	nrf.UART0.PSELTXD = nrf.RegValue(tx)
+	nrf.UART0.PSELRXD = nrf.RegValue(rx)
 }
 
 //go:export UART0_IRQHandler
@@ -23,13 +23,13 @@ func handleUART0() {
 	UART0.handleInterrupt()
 }
 
-func (i2c I2C) setPins(scl, sda Pin) {
-	i2c.Bus.PSELSCL.Set(uint32(scl))
-	i2c.Bus.PSELSDA.Set(uint32(sda))
+func (i2c I2C) setPins(scl, sda uint8) {
+	i2c.Bus.PSELSCL = nrf.RegValue(scl)
+	i2c.Bus.PSELSDA = nrf.RegValue(sda)
 }
 
 // SPI
-func (spi SPI) setPins(sck, mosi, miso Pin) {
+func (spi SPI) setPins(sck, mosi, miso uint8) {
 	if sck == 0 {
 		sck = SPI0_SCK_PIN
 	}
@@ -39,7 +39,7 @@ func (spi SPI) setPins(sck, mosi, miso Pin) {
 	if miso == 0 {
 		miso = SPI0_MISO_PIN
 	}
-	spi.Bus.PSELSCK.Set(uint32(sck))
-	spi.Bus.PSELMOSI.Set(uint32(mosi))
-	spi.Bus.PSELMISO.Set(uint32(miso))
+	spi.Bus.PSELSCK = nrf.RegValue(sck)
+	spi.Bus.PSELMOSI = nrf.RegValue(mosi)
+	spi.Bus.PSELMISO = nrf.RegValue(miso)
 }

src/machine/machine_nrf52.go

@@ -10,13 +10,13 @@ import (
 const CPU_FREQUENCY = 64000000
 
 // Get peripheral and pin number for this GPIO pin.
-func (p Pin) getPortPin() (*nrf.GPIO_Type, uint32) {
-	return nrf.P0, uint32(p)
+func (p GPIO) getPortPin() (*nrf.GPIO_Type, uint8) {
+	return nrf.P0, p.Pin
 }
 
-func (uart UART) setPins(tx, rx Pin) {
-	nrf.UART0.PSELTXD.Set(uint32(tx))
-	nrf.UART0.PSELRXD.Set(uint32(rx))
+func (uart UART) setPins(tx, rx uint32) {
+	nrf.UART0.PSELTXD = nrf.RegValue(tx)
+	nrf.UART0.PSELRXD = nrf.RegValue(rx)
 }
 
 //go:export UARTE0_UART0_IRQHandler
@@ -24,13 +24,13 @@ func handleUART0() {
 	UART0.handleInterrupt()
 }
 
-func (i2c I2C) setPins(scl, sda Pin) {
-	i2c.Bus.PSELSCL.Set(uint32(scl))
-	i2c.Bus.PSELSDA.Set(uint32(sda))
+func (i2c I2C) setPins(scl, sda uint8) {
+	i2c.Bus.PSELSCL = nrf.RegValue(scl)
+	i2c.Bus.PSELSDA = nrf.RegValue(sda)
 }
 
 // SPI
-func (spi SPI) setPins(sck, mosi, miso Pin) {
+func (spi SPI) setPins(sck, mosi, miso uint8) {
 	if sck == 0 {
 		sck = SPI0_SCK_PIN
 	}
@@ -40,9 +40,9 @@ func (spi SPI) setPins(sck, mosi, miso Pin) {
 	if miso == 0 {
 		miso = SPI0_MISO_PIN
 	}
-	spi.Bus.PSEL.SCK.Set(uint32(sck))
-	spi.Bus.PSEL.MOSI.Set(uint32(mosi))
-	spi.Bus.PSEL.MISO.Set(uint32(miso))
+	spi.Bus.PSEL.SCK = nrf.RegValue(sck)
+	spi.Bus.PSEL.MOSI = nrf.RegValue(mosi)
+	spi.Bus.PSEL.MISO = nrf.RegValue(miso)
 }
 
 // InitADC initializes the registers needed for ADC.
@@ -89,53 +89,53 @@ func (a ADC) Get() uint16 {
 		return 0
 	}
 
-	nrf.SAADC.RESOLUTION.Set(nrf.SAADC_RESOLUTION_VAL_12bit)
+	nrf.SAADC.RESOLUTION = nrf.SAADC_RESOLUTION_VAL_12bit
 
 	// Enable ADC.
-	nrf.SAADC.ENABLE.Set(nrf.SAADC_ENABLE_ENABLE_Enabled << nrf.SAADC_ENABLE_ENABLE_Pos)
+	nrf.SAADC.ENABLE = (nrf.SAADC_ENABLE_ENABLE_Enabled << nrf.SAADC_ENABLE_ENABLE_Pos)
 	for i := 0; i < 8; i++ {
-		nrf.SAADC.CH[i].PSELN.Set(nrf.SAADC_CH_PSELP_PSELP_NC)
-		nrf.SAADC.CH[i].PSELP.Set(nrf.SAADC_CH_PSELP_PSELP_NC)
+		nrf.SAADC.CH[i].PSELN = nrf.SAADC_CH_PSELP_PSELP_NC
+		nrf.SAADC.CH[i].PSELP = nrf.SAADC_CH_PSELP_PSELP_NC
 	}
 
 	// Configure ADC.
-	nrf.SAADC.CH[0].CONFIG.Set(((nrf.SAADC_CH_CONFIG_RESP_Bypass << nrf.SAADC_CH_CONFIG_RESP_Pos) & nrf.SAADC_CH_CONFIG_RESP_Msk) |
+	nrf.SAADC.CH[0].CONFIG = ((nrf.SAADC_CH_CONFIG_RESP_Bypass << nrf.SAADC_CH_CONFIG_RESP_Pos) & nrf.SAADC_CH_CONFIG_RESP_Msk) |
 		((nrf.SAADC_CH_CONFIG_RESP_Bypass << nrf.SAADC_CH_CONFIG_RESN_Pos) & nrf.SAADC_CH_CONFIG_RESN_Msk) |
 		((nrf.SAADC_CH_CONFIG_GAIN_Gain1_5 << nrf.SAADC_CH_CONFIG_GAIN_Pos) & nrf.SAADC_CH_CONFIG_GAIN_Msk) |
 		((nrf.SAADC_CH_CONFIG_REFSEL_Internal << nrf.SAADC_CH_CONFIG_REFSEL_Pos) & nrf.SAADC_CH_CONFIG_REFSEL_Msk) |
 		((nrf.SAADC_CH_CONFIG_TACQ_3us << nrf.SAADC_CH_CONFIG_TACQ_Pos) & nrf.SAADC_CH_CONFIG_TACQ_Msk) |
-		((nrf.SAADC_CH_CONFIG_MODE_SE << nrf.SAADC_CH_CONFIG_MODE_Pos) & nrf.SAADC_CH_CONFIG_MODE_Msk))
+		((nrf.SAADC_CH_CONFIG_MODE_SE << nrf.SAADC_CH_CONFIG_MODE_Pos) & nrf.SAADC_CH_CONFIG_MODE_Msk)
 
 	// Set pin to read.
-	nrf.SAADC.CH[0].PSELN.Set(pwmPin)
-	nrf.SAADC.CH[0].PSELP.Set(pwmPin)
+	nrf.SAADC.CH[0].PSELN = nrf.RegValue(pwmPin)
+	nrf.SAADC.CH[0].PSELP = nrf.RegValue(pwmPin)
 
 	// Destination for sample result.
-	nrf.SAADC.RESULT.PTR.Set(uint32(uintptr(unsafe.Pointer(&value))))
-	nrf.SAADC.RESULT.MAXCNT.Set(1) // One sample
+	nrf.SAADC.RESULT.PTR = nrf.RegValue(uintptr(unsafe.Pointer(&value)))
+	nrf.SAADC.RESULT.MAXCNT = 1 // One sample
 
 	// Start tasks.
-	nrf.SAADC.TASKS_START.Set(1)
-	for nrf.SAADC.EVENTS_STARTED.Get() == 0 {
+	nrf.SAADC.TASKS_START = 1
+	for nrf.SAADC.EVENTS_STARTED == 0 {
 	}
-	nrf.SAADC.EVENTS_STARTED.Set(0x00)
+	nrf.SAADC.EVENTS_STARTED = 0x00
 
 	// Start the sample task.
-	nrf.SAADC.TASKS_SAMPLE.Set(1)
+	nrf.SAADC.TASKS_SAMPLE = 1
 
 	// Wait until the sample task is done.
-	for nrf.SAADC.EVENTS_END.Get() == 0 {
+	for nrf.SAADC.EVENTS_END == 0 {
 	}
-	nrf.SAADC.EVENTS_END.Set(0x00)
+	nrf.SAADC.EVENTS_END = 0x00
 
 	// Stop the ADC
-	nrf.SAADC.TASKS_STOP.Set(1)
-	for nrf.SAADC.EVENTS_STOPPED.Get() == 0 {
+	nrf.SAADC.TASKS_STOP = 1
+	for nrf.SAADC.EVENTS_STOPPED == 0 {
 	}
-	nrf.SAADC.EVENTS_STOPPED.Set(0)
+	nrf.SAADC.EVENTS_STOPPED = 0
 
 	// Disable the ADC.
-	nrf.SAADC.ENABLE.Set(nrf.SAADC_ENABLE_ENABLE_Disabled << nrf.SAADC_ENABLE_ENABLE_Pos)
+	nrf.SAADC.ENABLE = (nrf.SAADC_ENABLE_ENABLE_Disabled << nrf.SAADC_ENABLE_ENABLE_Pos)
 
 	if value < 0 {
 		value = 0
@@ -170,21 +170,21 @@ func (pwm PWM) Set(value uint16) {
 
 			p := pwms[i]
 
-			p.PSEL.OUT[0].Set(uint32(pwm.Pin))
-			p.PSEL.OUT[1].Set(uint32(pwm.Pin))
-			p.PSEL.OUT[2].Set(uint32(pwm.Pin))
-			p.PSEL.OUT[3].Set(uint32(pwm.Pin))
-			p.ENABLE.Set(nrf.PWM_ENABLE_ENABLE_Enabled << nrf.PWM_ENABLE_ENABLE_Pos)
-			p.PRESCALER.Set(nrf.PWM_PRESCALER_PRESCALER_DIV_2)
-			p.MODE.Set(nrf.PWM_MODE_UPDOWN_Up)
-			p.COUNTERTOP.Set(16384) // frequency
-			p.LOOP.Set(0)
-			p.DECODER.Set((nrf.PWM_DECODER_LOAD_Common << nrf.PWM_DECODER_LOAD_Pos) | (nrf.PWM_DECODER_MODE_RefreshCount << nrf.PWM_DECODER_MODE_Pos))
-			p.SEQ[0].PTR.Set(uint32(uintptr(unsafe.Pointer(&pwmChannelSequence[i]))))
-			p.SEQ[0].CNT.Set(1)
-			p.SEQ[0].REFRESH.Set(1)
-			p.SEQ[0].ENDDELAY.Set(0)
-			p.TASKS_SEQSTART[0].Set(1)
+			p.PSEL.OUT[0] = nrf.RegValue(pwm.Pin)
+			p.PSEL.OUT[1] = nrf.RegValue(pwm.Pin)
+			p.PSEL.OUT[2] = nrf.RegValue(pwm.Pin)
+			p.PSEL.OUT[3] = nrf.RegValue(pwm.Pin)
+			p.ENABLE = (nrf.PWM_ENABLE_ENABLE_Enabled << nrf.PWM_ENABLE_ENABLE_Pos)
+			p.PRESCALER = nrf.PWM_PRESCALER_PRESCALER_DIV_2
+			p.MODE = nrf.PWM_MODE_UPDOWN_Up
+			p.COUNTERTOP = 16384 // frequency
+			p.LOOP = 0
+			p.DECODER = (nrf.PWM_DECODER_LOAD_Common << nrf.PWM_DECODER_LOAD_Pos) | (nrf.PWM_DECODER_MODE_RefreshCount << nrf.PWM_DECODER_MODE_Pos)
+			p.SEQ[0].PTR = nrf.RegValue(uintptr(unsafe.Pointer(&pwmChannelSequence[i])))
+			p.SEQ[0].CNT = 1
+			p.SEQ[0].REFRESH = 1
+			p.SEQ[0].ENDDELAY = 0
+			p.TASKS_SEQSTART[0] = 1
 
 			break
 		}

src/machine/machine_nrf52840.go

@@ -10,17 +10,17 @@ import (
 const CPU_FREQUENCY = 64000000
 
 // Get peripheral and pin number for this GPIO pin.
-func (p Pin) getPortPin() (*nrf.GPIO_Type, uint32) {
-	if p >= 32 {
-		return nrf.P1, uint32(p - 32)
+func (p GPIO) getPortPin() (*nrf.GPIO_Type, uint8) {
+	if p.Pin >= 32 {
+		return nrf.P1, p.Pin - 32
 	} else {
-		return nrf.P0, uint32(p)
+		return nrf.P0, p.Pin
 	}
 }
 
-func (uart UART) setPins(tx, rx Pin) {
-	nrf.UART0.PSEL.TXD.Set(uint32(tx))
-	nrf.UART0.PSEL.RXD.Set(uint32(rx))
+func (uart UART) setPins(tx, rx uint32) {
+	nrf.UART0.PSEL.TXD = nrf.RegValue(tx)
+	nrf.UART0.PSEL.RXD = nrf.RegValue(rx)
 }
 
 //go:export UARTE0_UART0_IRQHandler
@@ -28,13 +28,13 @@ func handleUART0() {
 	UART0.handleInterrupt()
 }
 
-func (i2c I2C) setPins(scl, sda Pin) {
-	i2c.Bus.PSEL.SCL.Set(uint32(scl))
-	i2c.Bus.PSEL.SDA.Set(uint32(sda))
+func (i2c I2C) setPins(scl, sda uint8) {
+	i2c.Bus.PSEL.SCL = nrf.RegValue(scl)
+	i2c.Bus.PSEL.SDA = nrf.RegValue(sda)
 }
 
 // SPI
-func (spi SPI) setPins(sck, mosi, miso Pin) {
+func (spi SPI) setPins(sck, mosi, miso uint8) {
 	if sck == 0 {
 		sck = SPI0_SCK_PIN
 	}
@@ -44,9 +44,9 @@ func (spi SPI) setPins(sck, mosi, miso Pin) {
 	if miso == 0 {
 		miso = SPI0_MISO_PIN
 	}
-	spi.Bus.PSEL.SCK.Set(uint32(sck))
-	spi.Bus.PSEL.MOSI.Set(uint32(mosi))
-	spi.Bus.PSEL.MISO.Set(uint32(miso))
+	spi.Bus.PSEL.SCK = nrf.RegValue(sck)
+	spi.Bus.PSEL.MOSI = nrf.RegValue(mosi)
+	spi.Bus.PSEL.MISO = nrf.RegValue(miso)
 }
 
 // InitADC initializes the registers needed for ADC.
@@ -93,53 +93,53 @@ func (a ADC) Get() uint16 {
 		return 0
 	}
 
-	nrf.SAADC.RESOLUTION.Set(nrf.SAADC_RESOLUTION_VAL_12bit)
+	nrf.SAADC.RESOLUTION = nrf.SAADC_RESOLUTION_VAL_12bit
 
 	// Enable ADC.
-	nrf.SAADC.ENABLE.Set(nrf.SAADC_ENABLE_ENABLE_Enabled << nrf.SAADC_ENABLE_ENABLE_Pos)
+	nrf.SAADC.ENABLE = (nrf.SAADC_ENABLE_ENABLE_Enabled << nrf.SAADC_ENABLE_ENABLE_Pos)
 	for i := 0; i < 8; i++ {
-		nrf.SAADC.CH[i].PSELN.Set(nrf.SAADC_CH_PSELP_PSELP_NC)
-		nrf.SAADC.CH[i].PSELP.Set(nrf.SAADC_CH_PSELP_PSELP_NC)
+		nrf.SAADC.CH[i].PSELN = nrf.SAADC_CH_PSELP_PSELP_NC
+		nrf.SAADC.CH[i].PSELP = nrf.SAADC_CH_PSELP_PSELP_NC
 	}
 
 	// Configure ADC.
-	nrf.SAADC.CH[0].CONFIG.Set(((nrf.SAADC_CH_CONFIG_RESP_Bypass << nrf.SAADC_CH_CONFIG_RESP_Pos) & nrf.SAADC_CH_CONFIG_RESP_Msk) |
+	nrf.SAADC.CH[0].CONFIG = ((nrf.SAADC_CH_CONFIG_RESP_Bypass << nrf.SAADC_CH_CONFIG_RESP_Pos) & nrf.SAADC_CH_CONFIG_RESP_Msk) |
 		((nrf.SAADC_CH_CONFIG_RESP_Bypass << nrf.SAADC_CH_CONFIG_RESN_Pos) & nrf.SAADC_CH_CONFIG_RESN_Msk) |
 		((nrf.SAADC_CH_CONFIG_GAIN_Gain1_5 << nrf.SAADC_CH_CONFIG_GAIN_Pos) & nrf.SAADC_CH_CONFIG_GAIN_Msk) |
 		((nrf.SAADC_CH_CONFIG_REFSEL_Internal << nrf.SAADC_CH_CONFIG_REFSEL_Pos) & nrf.SAADC_CH_CONFIG_REFSEL_Msk) |
 		((nrf.SAADC_CH_CONFIG_TACQ_3us << nrf.SAADC_CH_CONFIG_TACQ_Pos) & nrf.SAADC_CH_CONFIG_TACQ_Msk) |
-		((nrf.SAADC_CH_CONFIG_MODE_SE << nrf.SAADC_CH_CONFIG_MODE_Pos) & nrf.SAADC_CH_CONFIG_MODE_Msk))
+		((nrf.SAADC_CH_CONFIG_MODE_SE << nrf.SAADC_CH_CONFIG_MODE_Pos) & nrf.SAADC_CH_CONFIG_MODE_Msk)
 
 	// Set pin to read.
-	nrf.SAADC.CH[0].PSELN.Set(pwmPin)
-	nrf.SAADC.CH[0].PSELP.Set(pwmPin)
+	nrf.SAADC.CH[0].PSELN = nrf.RegValue(pwmPin)
+	nrf.SAADC.CH[0].PSELP = nrf.RegValue(pwmPin)
 
 	// Destination for sample result.
-	nrf.SAADC.RESULT.PTR.Set(uint32(uintptr(unsafe.Pointer(&value))))
-	nrf.SAADC.RESULT.MAXCNT.Set(1) // One sample
+	nrf.SAADC.RESULT.PTR = nrf.RegValue(uintptr(unsafe.Pointer(&value)))
+	nrf.SAADC.RESULT.MAXCNT = 1 // One sample
 
 	// Start tasks.
-	nrf.SAADC.TASKS_START.Set(1)
-	for nrf.SAADC.EVENTS_STARTED.Get() == 0 {
+	nrf.SAADC.TASKS_START = 1
+	for nrf.SAADC.EVENTS_STARTED == 0 {
 	}
-	nrf.SAADC.EVENTS_STARTED.Set(0x00)
+	nrf.SAADC.EVENTS_STARTED = 0x00
 
 	// Start the sample task.
-	nrf.SAADC.TASKS_SAMPLE.Set(1)
+	nrf.SAADC.TASKS_SAMPLE = 1
 
 	// Wait until the sample task is done.
-	for nrf.SAADC.EVENTS_END.Get() == 0 {
+	for nrf.SAADC.EVENTS_END == 0 {
 	}
-	nrf.SAADC.EVENTS_END.Set(0x00)
+	nrf.SAADC.EVENTS_END = 0x00
 
 	// Stop the ADC
-	nrf.SAADC.TASKS_STOP.Set(1)
-	for nrf.SAADC.EVENTS_STOPPED.Get() == 0 {
+	nrf.SAADC.TASKS_STOP = 1
+	for nrf.SAADC.EVENTS_STOPPED == 0 {
 	}
-	nrf.SAADC.EVENTS_STOPPED.Set(0)
+	nrf.SAADC.EVENTS_STOPPED = 0
 
 	// Disable the ADC.
-	nrf.SAADC.ENABLE.Set(nrf.SAADC_ENABLE_ENABLE_Disabled << nrf.SAADC_ENABLE_ENABLE_Pos)
+	nrf.SAADC.ENABLE = (nrf.SAADC_ENABLE_ENABLE_Disabled << nrf.SAADC_ENABLE_ENABLE_Pos)
 
 	if value < 0 {
 		value = 0
@@ -174,21 +174,21 @@ func (pwm PWM) Set(value uint16) {
 
 			p := pwms[i]
 
-			p.PSEL.OUT[0].Set(uint32(pwm.Pin))
-			p.PSEL.OUT[1].Set(uint32(pwm.Pin))
-			p.PSEL.OUT[2].Set(uint32(pwm.Pin))
-			p.PSEL.OUT[3].Set(uint32(pwm.Pin))
-			p.ENABLE.Set(nrf.PWM_ENABLE_ENABLE_Enabled << nrf.PWM_ENABLE_ENABLE_Pos)
-			p.PRESCALER.Set(nrf.PWM_PRESCALER_PRESCALER_DIV_2)
-			p.MODE.Set(nrf.PWM_MODE_UPDOWN_Up)
-			p.COUNTERTOP.Set(16384) // frequency
-			p.LOOP.Set(0)
-			p.DECODER.Set((nrf.PWM_DECODER_LOAD_Common << nrf.PWM_DECODER_LOAD_Pos) | (nrf.PWM_DECODER_MODE_RefreshCount << nrf.PWM_DECODER_MODE_Pos))
-			p.SEQ[0].PTR.Set(uint32(uintptr(unsafe.Pointer(&pwmChannelSequence[i]))))
-			p.SEQ[0].CNT.Set(1)
-			p.SEQ[0].REFRESH.Set(1)
-			p.SEQ[0].ENDDELAY.Set(0)
-			p.TASKS_SEQSTART[0].Set(1)
+			p.PSEL.OUT[0] = nrf.RegValue(pwm.Pin)
+			p.PSEL.OUT[1] = nrf.RegValue(pwm.Pin)
+			p.PSEL.OUT[2] = nrf.RegValue(pwm.Pin)
+			p.PSEL.OUT[3] = nrf.RegValue(pwm.Pin)
+			p.ENABLE = (nrf.PWM_ENABLE_ENABLE_Enabled << nrf.PWM_ENABLE_ENABLE_Pos)
+			p.PRESCALER = nrf.PWM_PRESCALER_PRESCALER_DIV_2
+			p.MODE = nrf.PWM_MODE_UPDOWN_Up
+			p.COUNTERTOP = 16384 // frequency
+			p.LOOP = 0
+			p.DECODER = (nrf.PWM_DECODER_LOAD_Common << nrf.PWM_DECODER_LOAD_Pos) | (nrf.PWM_DECODER_MODE_RefreshCount << nrf.PWM_DECODER_MODE_Pos)
+			p.SEQ[0].PTR = nrf.RegValue(uintptr(unsafe.Pointer(&pwmChannelSequence[i])))
+			p.SEQ[0].CNT = 1
+			p.SEQ[0].REFRESH = 1
+			p.SEQ[0].ENDDELAY = 0
+			p.TASKS_SEQSTART[0] = 1
 
 			break
 		}

src/machine/machine_stm32.go

@@ -4,10 +4,10 @@ package machine
 
 // Peripheral abstraction layer for the stm32.
 
-type PinMode uint8
+type GPIOMode uint8
 
 const (
-	portA Pin = iota * 16
+	portA = iota * 16
 	portB
 	portC
 	portD

src/machine/machine_stm32f103xx.go

@@ -13,25 +13,25 @@ import (
 const CPU_FREQUENCY = 72000000
 
 const (
-	PinInput       PinMode = 0 // Input mode
-	PinOutput10MHz PinMode = 1 // Output mode, max speed 10MHz
-	PinOutput2MHz  PinMode = 2 // Output mode, max speed 2MHz
-	PinOutput50MHz PinMode = 3 // Output mode, max speed 50MHz
-	PinOutput      PinMode = PinOutput2MHz
+	GPIO_INPUT        = 0 // Input mode
+	GPIO_OUTPUT_10MHz = 1 // Output mode, max speed 10MHz
+	GPIO_OUTPUT_2MHz  = 2 // Output mode, max speed 2MHz
+	GPIO_OUTPUT_50MHz = 3 // Output mode, max speed 50MHz
+	GPIO_OUTPUT       = GPIO_OUTPUT_2MHz
 
-	PinInputModeAnalog     PinMode = 0  // Input analog mode
-	PinInputModeFloating   PinMode = 4  // Input floating mode
-	PinInputModePullUpDown PinMode = 8  // Input pull up/down mode
-	PinInputModeReserved   PinMode = 12 // Input mode (reserved)
+	GPIO_INPUT_MODE_ANALOG       = 0  // Input analog mode
+	GPIO_INPUT_MODE_FLOATING     = 4  // Input floating mode
+	GPIO_INPUT_MODE_PULL_UP_DOWN = 8  // Input pull up/down mode
+	GPIO_INPUT_MODE_RESERVED     = 12 // Input mode (reserved)
 
-	PinOutputModeGPPushPull   PinMode = 0  // Output mode general purpose push/pull
-	PinOutputModeGPOpenDrain  PinMode = 4  // Output mode general purpose open drain
-	PinOutputModeAltPushPull  PinMode = 8  // Output mode alt. purpose push/pull
-	PinOutputModeAltOpenDrain PinMode = 12 // Output mode alt. purpose open drain
+	GPIO_OUTPUT_MODE_GP_PUSH_PULL   = 0  // Output mode general purpose push/pull
+	GPIO_OUTPUT_MODE_GP_OPEN_DRAIN  = 4  // Output mode general purpose open drain
+	GPIO_OUTPUT_MODE_ALT_PUSH_PULL  = 8  // Output mode alt. purpose push/pull
+	GPIO_OUTPUT_MODE_ALT_OPEN_DRAIN = 12 // Output mode alt. purpose open drain
 )
 
-func (p Pin) getPort() *stm32.GPIO_Type {
-	switch p / 16 {
+func (p GPIO) getPort() *stm32.GPIO_Type {
+	switch p.Pin / 16 {
 	case 0:
 		return stm32.GPIOA
 	case 1:
@@ -52,50 +52,50 @@ func (p Pin) getPort() *stm32.GPIO_Type {
 }
 
 // enableClock enables the clock for this desired GPIO port.
-func (p Pin) enableClock() {
-	switch p / 16 {
+func (p GPIO) enableClock() {
+	switch p.Pin / 16 {
 	case 0:
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_IOPAEN)
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_IOPAEN
 	case 1:
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_IOPBEN)
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_IOPBEN
 	case 2:
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_IOPCEN)
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_IOPCEN
 	case 3:
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_IOPDEN)
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_IOPDEN
 	case 4:
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_IOPEEN)
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_IOPEEN
 	case 5:
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_IOPFEN)
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_IOPFEN
 	case 6:
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_IOPGEN)
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_IOPGEN
 	default:
 		panic("machine: unknown port")
 	}
 }
 
 // Configure this pin with the given configuration.
-func (p Pin) Configure(config PinConfig) {
+func (p GPIO) Configure(config GPIOConfig) {
 	// Configure the GPIO pin.
 	p.enableClock()
 	port := p.getPort()
-	pin := uint8(p) % 16
-	pos := uint8(p) % 8 * 4
+	pin := p.Pin % 16
+	pos := p.Pin % 8 * 4
 	if pin < 8 {
-		port.CRL.Set((uint32(port.CRL.Get()) &^ (0xf << pos)) | (uint32(config.Mode) << pos))
+		port.CRL = stm32.RegValue((uint32(port.CRL) &^ (0xf << pos)) | (uint32(config.Mode) << pos))
 	} else {
-		port.CRH.Set((uint32(port.CRH.Get()) &^ (0xf << pos)) | (uint32(config.Mode) << pos))
+		port.CRH = stm32.RegValue((uint32(port.CRH) &^ (0xf << pos)) | (uint32(config.Mode) << pos))
 	}
 }
 
 // Set the pin to high or low.
 // Warning: only use this on an output pin!
-func (p Pin) Set(high bool) {
+func (p GPIO) Set(high bool) {
 	port := p.getPort()
-	pin := uint8(p) % 16
+	pin := p.Pin % 16
 	if high {
-		port.BSRR.Set(1 << pin)
+		port.BSRR = 1 << pin
 	} else {
-		port.BSRR.Set(1 << (pin + 16))
+		port.BSRR = 1 << (pin + 16)
 	}
 }
 
@@ -122,24 +122,24 @@ func (uart UART) Configure(config UARTConfig) {
 	switch config.TX {
 	case PB6:
 		// use alternate TX/RX pins PB6/PB7 via AFIO mapping
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_AFIOEN)
-		stm32.AFIO.MAPR.SetBits(stm32.AFIO_MAPR_USART1_REMAP)
-		PB6.Configure(PinConfig{Mode: PinOutput50MHz + PinOutputModeAltPushPull})
-		PB7.Configure(PinConfig{Mode: PinInputModeFloating})
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_AFIOEN
+		stm32.AFIO.MAPR |= stm32.AFIO_MAPR_USART1_REMAP
+		GPIO{PB6}.Configure(GPIOConfig{Mode: GPIO_OUTPUT_50MHz + GPIO_OUTPUT_MODE_ALT_PUSH_PULL})
+		GPIO{PB7}.Configure(GPIOConfig{Mode: GPIO_INPUT_MODE_FLOATING})
 	default:
 		// use standard TX/RX pins PA9 and PA10
-		UART_TX_PIN.Configure(PinConfig{Mode: PinOutput50MHz + PinOutputModeAltPushPull})
-		UART_RX_PIN.Configure(PinConfig{Mode: PinInputModeFloating})
+		GPIO{UART_TX_PIN}.Configure(GPIOConfig{Mode: GPIO_OUTPUT_50MHz + GPIO_OUTPUT_MODE_ALT_PUSH_PULL})
+		GPIO{UART_RX_PIN}.Configure(GPIOConfig{Mode: GPIO_INPUT_MODE_FLOATING})
 	}
 
 	// Enable USART1 clock
-	stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_USART1EN)
+	stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_USART1EN
 
 	// Set baud rate
 	uart.SetBaudRate(config.BaudRate)
 
 	// Enable USART1 port.
-	stm32.USART1.CR1.Set(stm32.USART_CR1_TE | stm32.USART_CR1_RE | stm32.USART_CR1_RXNEIE | stm32.USART_CR1_UE)
+	stm32.USART1.CR1 = stm32.USART_CR1_TE | stm32.USART_CR1_RE | stm32.USART_CR1_RXNEIE | stm32.USART_CR1_UE
 
 	// Enable RX IRQ.
 	arm.SetPriority(stm32.IRQ_USART1, 0xc0)
@@ -150,21 +150,21 @@ func (uart UART) Configure(config UARTConfig) {
 func (uart UART) SetBaudRate(br uint32) {
 	// first divide by PCLK2 prescaler (div 1) and then desired baudrate
 	divider := CPU_FREQUENCY / br
-	stm32.USART1.BRR.Set(divider)
+	stm32.USART1.BRR = stm32.RegValue(divider)
 }
 
 // WriteByte writes a byte of data to the UART.
 func (uart UART) WriteByte(c byte) error {
-	stm32.USART1.DR.Set(uint32(c))
+	stm32.USART1.DR = stm32.RegValue(c)
 
-	for !stm32.USART1.SR.HasBits(stm32.USART_SR_TXE) {
+	for (stm32.USART1.SR & stm32.USART_SR_TXE) == 0 {
 	}
 	return nil
 }
 
 //go:export USART1_IRQHandler
 func handleUART1() {
-	UART1.Receive(byte((stm32.USART1.DR.Get() & 0xFF)))
+	UART1.Receive(byte((stm32.USART1.DR & 0xFF)))
 }
 
 // SPI on the STM32.
@@ -183,9 +183,9 @@ var (
 // SPIConfig is used to store config info for SPI.
 type SPIConfig struct {
 	Frequency uint32
-	SCK       Pin
-	MOSI      Pin
-	MISO      Pin
+	SCK       uint8
+	MOSI      uint8
+	MISO      uint8
 	LSBFirst  bool
 	Mode      uint8
 }
@@ -198,9 +198,9 @@ type SPIConfig struct {
 // - hardware SS pin?
 func (spi SPI) Configure(config SPIConfig) {
 	// enable clock for SPI
-	stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_SPI1EN)
+	stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_SPI1EN
 
-	var conf uint32
+	var conf uint16
 
 	// set frequency
 	switch config.Frequency {
@@ -250,37 +250,37 @@ func (spi SPI) Configure(config SPIConfig) {
 	conf |= stm32.SPI_Mode_Master
 
 	// now set the configuration
-	spi.Bus.CR1.Set(conf)
+	spi.Bus.CR1 = stm32.RegValue(conf)
 
 	// init pins
 	spi.setPins(config.SCK, config.MOSI, config.MISO)
 
 	// enable SPI interface
-	spi.Bus.CR1.SetBits(stm32.SPI_CR1_SPE)
+	spi.Bus.CR1 |= stm32.SPI_CR1_SPE
 }
 
 // Transfer writes/reads a single byte using the SPI interface.
 func (spi SPI) Transfer(w byte) (byte, error) {
 	// Write data to be transmitted to the SPI data register
-	spi.Bus.DR.Set(uint32(w))
+	spi.Bus.DR = stm32.RegValue(w)
 
 	// Wait until transmit complete
-	for !spi.Bus.SR.HasBits(stm32.SPI_SR_TXE) {
+	for (spi.Bus.SR & stm32.SPI_SR_TXE) == 0 {
 	}
 
 	// Wait until receive complete
-	for !spi.Bus.SR.HasBits(stm32.SPI_SR_RXNE) {
+	for (spi.Bus.SR & stm32.SPI_SR_RXNE) == 0 {
 	}
 
 	// Wait until SPI is not busy
-	for spi.Bus.SR.HasBits(stm32.SPI_SR_BSY) {
+	for (spi.Bus.SR & stm32.SPI_SR_BSY) > 0 {
 	}
 
 	// Return received data from SPI data register
-	return byte(spi.Bus.DR.Get()), nil
+	return byte(spi.Bus.DR), nil
 }
 
-func (spi SPI) setPins(sck, mosi, miso Pin) {
+func (spi SPI) setPins(sck, mosi, miso uint8) {
 	if sck == 0 {
 		sck = SPI0_SCK_PIN
 	}
@@ -291,9 +291,9 @@ func (spi SPI) setPins(sck, mosi, miso Pin) {
 		miso = SPI0_MISO_PIN
 	}
 
-	sck.Configure(PinConfig{Mode: PinOutput50MHz + PinOutputModeAltPushPull})
-	mosi.Configure(PinConfig{Mode: PinOutput50MHz + PinOutputModeAltPushPull})
-	miso.Configure(PinConfig{Mode: PinInputModeFloating})
+	GPIO{sck}.Configure(GPIOConfig{Mode: GPIO_OUTPUT_50MHz + GPIO_OUTPUT_MODE_ALT_PUSH_PULL})
+	GPIO{mosi}.Configure(GPIOConfig{Mode: GPIO_OUTPUT_50MHz + GPIO_OUTPUT_MODE_ALT_PUSH_PULL})
+	GPIO{miso}.Configure(GPIOConfig{Mode: GPIO_INPUT_MODE_FLOATING})
 }
 
 // I2C on the STM32F103xx.
@@ -312,8 +312,8 @@ var (
 // I2CConfig is used to store config info for I2C.
 type I2CConfig struct {
 	Frequency uint32
-	SCL       Pin
-	SDA       Pin
+	SCL       uint8
+	SDA       uint8
 }
 
 // Configure is intended to setup the I2C interface.
@@ -324,26 +324,26 @@ func (i2c I2C) Configure(config I2CConfig) {
 	}
 
 	// enable clock for I2C
-	stm32.RCC.APB1ENR.SetBits(stm32.RCC_APB1ENR_I2C1EN)
+	stm32.RCC.APB1ENR |= stm32.RCC_APB1ENR_I2C1EN
 
 	// I2C1 pins
 	switch config.SDA {
 	case PB9:
 		config.SCL = PB8
 		// use alternate I2C1 pins PB8/PB9 via AFIO mapping
-		stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_AFIOEN)
-		stm32.AFIO.MAPR.SetBits(stm32.AFIO_MAPR_I2C1_REMAP)
+		stm32.RCC.APB2ENR |= stm32.RCC_APB2ENR_AFIOEN
+		stm32.AFIO.MAPR |= stm32.AFIO_MAPR_I2C1_REMAP
 	default:
 		// use default I2C1 pins PB6/PB7
 		config.SDA = SDA_PIN
 		config.SCL = SCL_PIN
 	}
 
-	config.SDA.Configure(PinConfig{Mode: PinOutput50MHz + PinOutputModeAltOpenDrain})
-	config.SCL.Configure(PinConfig{Mode: PinOutput50MHz + PinOutputModeAltOpenDrain})
+	GPIO{config.SDA}.Configure(GPIOConfig{Mode: GPIO_OUTPUT_50MHz + GPIO_OUTPUT_MODE_ALT_OPEN_DRAIN})
+	GPIO{config.SCL}.Configure(GPIOConfig{Mode: GPIO_OUTPUT_50MHz + GPIO_OUTPUT_MODE_ALT_OPEN_DRAIN})
 
 	// Disable the selected I2C peripheral to configure
-	i2c.Bus.CR1.ClearBits(stm32.I2C_CR1_PE)
+	i2c.Bus.CR1 &^= stm32.I2C_CR1_PE
 
 	// pclk1 clock speed is main frequency divided by PCK1 prescaler (div 2)
 	pclk1 := uint32(CPU_FREQUENCY / 2)
@@ -351,40 +351,40 @@ func (i2c I2C) Configure(config I2CConfig) {
 	// set freqency range to pclk1 clock speed in Mhz.
 	// aka setting the value 36 means to use 36MhZ clock.
 	pclk1Mhz := pclk1 / 1000000
-	i2c.Bus.CR2.SetBits(pclk1Mhz)
+	i2c.Bus.CR2 |= stm32.RegValue(pclk1Mhz)
 
 	switch config.Frequency {
 	case TWI_FREQ_100KHZ:
 		// Normal mode speed calculation
 		ccr := pclk1 / (config.Frequency * 2)
-		i2c.Bus.CCR.Set(ccr)
+		i2c.Bus.CCR = stm32.RegValue(ccr)
 
 		// duty cycle 2
-		i2c.Bus.CCR.ClearBits(stm32.I2C_CCR_DUTY)
+		i2c.Bus.CCR &^= stm32.I2C_CCR_DUTY
 
 		// frequency standard mode
-		i2c.Bus.CCR.ClearBits(stm32.I2C_CCR_F_S)
+		i2c.Bus.CCR &^= stm32.I2C_CCR_F_S
 
 		// Set Maximum Rise Time for standard mode
-		i2c.Bus.TRISE.Set(pclk1Mhz)
+		i2c.Bus.TRISE = stm32.RegValue(pclk1Mhz)
 
 	case TWI_FREQ_400KHZ:
 		// Fast mode speed calculation
 		ccr := pclk1 / (config.Frequency * 3)
-		i2c.Bus.CCR.Set(ccr)
+		i2c.Bus.CCR = stm32.RegValue(ccr)
 
 		// duty cycle 2
-		i2c.Bus.CCR.ClearBits(stm32.I2C_CCR_DUTY)
+		i2c.Bus.CCR &^= stm32.I2C_CCR_DUTY
 
 		// frequency fast mode
-		i2c.Bus.CCR.SetBits(stm32.I2C_CCR_F_S)
+		i2c.Bus.CCR |= stm32.I2C_CCR_F_S
 
 		// Set Maximum Rise Time for fast mode
-		i2c.Bus.TRISE.Set(((pclk1Mhz * 300) / 1000))
+		i2c.Bus.TRISE = stm32.RegValue(((pclk1Mhz * 300) / 1000))
 	}
 
 	// re-enable the selected I2C peripheral
-	i2c.Bus.CR1.SetBits(stm32.I2C_CR1_PE)
+	i2c.Bus.CR1 |= stm32.I2C_CR1_PE
 }
 
 // Tx does a single I2C transaction at the specified address.
@@ -435,11 +435,11 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Disable ACK of received data
-			i2c.Bus.CR1.ClearBits(stm32.I2C_CR1_ACK)
+			i2c.Bus.CR1 &^= stm32.I2C_CR1_ACK
 
 			// clear timeout here
 			timeout := i2cTimeout
-			for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL | stm32.I2C_SR2_BUSY) {
+			for i2c.Bus.SR2&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read clear address")
@@ -447,10 +447,10 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Generate stop condition
-			i2c.Bus.CR1.SetBits(stm32.I2C_CR1_STOP)
+			i2c.Bus.CR1 |= stm32.I2C_CR1_STOP
 
 			timeout = i2cTimeout
-			for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_RxNE) {
+			for (i2c.Bus.SR1 & stm32.I2C_SR1_RxNE) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read 1 byte")
@@ -458,17 +458,17 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Read and return data byte from I2C data register
-			r[0] = byte(i2c.Bus.DR.Get())
+			r[0] = byte(i2c.Bus.DR)
 
 			// wait for stop
 			return i2c.waitForStop()
 
 		case 2:
 			// enable pos
-			i2c.Bus.CR1.SetBits(stm32.I2C_CR1_POS)
+			i2c.Bus.CR1 |= stm32.I2C_CR1_POS
 
 			// Enable ACK of received data
-			i2c.Bus.CR1.SetBits(stm32.I2C_CR1_ACK)
+			i2c.Bus.CR1 |= stm32.I2C_CR1_ACK
 
 			// send address
 			err = i2c.sendAddress(uint8(addr), false)
@@ -478,7 +478,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 
 			// clear address here
 			timeout := i2cTimeout
-			for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL | stm32.I2C_SR2_BUSY) {
+			for i2c.Bus.SR2&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read clear address")
@@ -486,11 +486,11 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Disable ACK of received data
-			i2c.Bus.CR1.ClearBits(stm32.I2C_CR1_ACK)
+			i2c.Bus.CR1 &^= stm32.I2C_CR1_ACK
 
 			// wait for btf. we need a longer timeout here than normal.
 			timeout = 1000
-			for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
+			for (i2c.Bus.SR1 & stm32.I2C_SR1_BTF) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read 2 bytes")
@@ -498,23 +498,18 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Generate stop condition
-			i2c.Bus.CR1.SetBits(stm32.I2C_CR1_STOP)
+			i2c.Bus.CR1 |= stm32.I2C_CR1_STOP
 
 			// read the 2 bytes by reading twice.
-			r[0] = byte(i2c.Bus.DR.Get())
-			r[1] = byte(i2c.Bus.DR.Get())
+			r[0] = byte(i2c.Bus.DR)
+			r[1] = byte(i2c.Bus.DR)
 
 			// wait for stop
-			err = i2c.waitForStop()
-
-			//disable pos
-			i2c.Bus.CR1.ClearBits(stm32.I2C_CR1_POS)
-
-			return err
+			return i2c.waitForStop()
 
 		case 3:
 			// Enable ACK of received data
-			i2c.Bus.CR1.SetBits(stm32.I2C_CR1_ACK)
+			i2c.Bus.CR1 |= stm32.I2C_CR1_ACK
 
 			// send address
 			err = i2c.sendAddress(uint8(addr), false)
@@ -524,7 +519,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 
 			// clear address here
 			timeout := i2cTimeout
-			for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL | stm32.I2C_SR2_BUSY) {
+			for i2c.Bus.SR2&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read clear address")
@@ -532,11 +527,11 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Enable ACK of received data
-			i2c.Bus.CR1.SetBits(stm32.I2C_CR1_ACK)
+			i2c.Bus.CR1 |= stm32.I2C_CR1_ACK
 
 			// wait for btf. we need a longer timeout here than normal.
 			timeout = 1000
-			for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
+			for (i2c.Bus.SR1 & stm32.I2C_SR1_BTF) == 0 {
 				timeout--
 				if timeout == 0 {
 					println("I2C timeout on read 3 bytes")
@@ -545,13 +540,13 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Disable ACK of received data
-			i2c.Bus.CR1.ClearBits(stm32.I2C_CR1_ACK)
+			i2c.Bus.CR1 &^= stm32.I2C_CR1_ACK
 
 			// read the first byte
-			r[0] = byte(i2c.Bus.DR.Get())
+			r[0] = byte(i2c.Bus.DR)
 
 			timeout = 1000
-			for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
+			for (i2c.Bus.SR1 & stm32.I2C_SR1_BTF) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read 3 bytes")
@@ -559,11 +554,11 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Generate stop condition
-			i2c.Bus.CR1.SetBits(stm32.I2C_CR1_STOP)
+			i2c.Bus.CR1 |= stm32.I2C_CR1_STOP
 
 			// read the last 2 bytes by reading twice.
-			r[1] = byte(i2c.Bus.DR.Get())
-			r[2] = byte(i2c.Bus.DR.Get())
+			r[1] = byte(i2c.Bus.DR)
+			r[2] = byte(i2c.Bus.DR)
 
 			// wait for stop
 			return i2c.waitForStop()
@@ -579,7 +574,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 
 			// clear address here
 			timeout := i2cTimeout
-			for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL | stm32.I2C_SR2_BUSY) {
+			for i2c.Bus.SR2&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read clear address")
@@ -588,11 +583,11 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 
 			for i := 0; i < len(r)-3; i++ {
 				// Enable ACK of received data
-				i2c.Bus.CR1.SetBits(stm32.I2C_CR1_ACK)
+				i2c.Bus.CR1 |= stm32.I2C_CR1_ACK
 
 				// wait for btf. we need a longer timeout here than normal.
 				timeout = 1000
-				for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
+				for (i2c.Bus.SR1 & stm32.I2C_SR1_BTF) == 0 {
 					timeout--
 					if timeout == 0 {
 						println("I2C timeout on read 3 bytes")
@@ -601,12 +596,12 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 				}
 
 				// read the next byte
-				r[i] = byte(i2c.Bus.DR.Get())
+				r[i] = byte(i2c.Bus.DR)
 			}
 
 			// wait for btf. we need a longer timeout here than normal.
 			timeout = 1000
-			for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_BTF) {
+			for (i2c.Bus.SR1 & stm32.I2C_SR1_BTF) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read more than 3 bytes")
@@ -614,19 +609,19 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// Disable ACK of received data
-			i2c.Bus.CR1.ClearBits(stm32.I2C_CR1_ACK)
+			i2c.Bus.CR1 &^= stm32.I2C_CR1_ACK
 
 			// get third from last byte
-			r[len(r)-3] = byte(i2c.Bus.DR.Get())
+			r[len(r)-3] = byte(i2c.Bus.DR)
 
 			// Generate stop condition
-			i2c.Bus.CR1.SetBits(stm32.I2C_CR1_STOP)
+			i2c.Bus.CR1 |= stm32.I2C_CR1_STOP
 
 			// get second from last byte
-			r[len(r)-2] = byte(i2c.Bus.DR.Get())
+			r[len(r)-2] = byte(i2c.Bus.DR)
 
 			timeout = i2cTimeout
-			for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_RxNE) {
+			for (i2c.Bus.SR1 & stm32.I2C_SR1_RxNE) == 0 {
 				timeout--
 				if timeout == 0 {
 					return errors.New("I2C timeout on read last byte of more than 3")
@@ -634,7 +629,7 @@ func (i2c I2C) Tx(addr uint16, w, r []byte) error {
 			}
 
 			// get last byte
-			r[len(r)-1] = byte(i2c.Bus.DR.Get())
+			r[len(r)-1] = byte(i2c.Bus.DR)
 
 			// wait for stop
 			return i2c.waitForStop()
@@ -650,7 +645,7 @@ const i2cTimeout = 500
 func (i2c I2C) signalStart() error {
 	// Wait until I2C is not busy
 	timeout := i2cTimeout
-	for i2c.Bus.SR2.HasBits(stm32.I2C_SR2_BUSY) {
+	for (i2c.Bus.SR2 & stm32.I2C_SR2_BUSY) > 0 {
 		timeout--
 		if timeout == 0 {
 			return errors.New("I2C busy on start")
@@ -658,14 +653,14 @@ func (i2c I2C) signalStart() error {
 	}
 
 	// clear stop
-	i2c.Bus.CR1.ClearBits(stm32.I2C_CR1_STOP)
+	i2c.Bus.CR1 &^= stm32.I2C_CR1_STOP
 
 	// Generate start condition
-	i2c.Bus.CR1.SetBits(stm32.I2C_CR1_START)
+	i2c.Bus.CR1 |= stm32.I2C_CR1_START
 
 	// Wait for I2C EV5 aka SB flag.
 	timeout = i2cTimeout
-	for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_SB) {
+	for (i2c.Bus.SR1 & stm32.I2C_SR1_SB) == 0 {
 		timeout--
 		if timeout == 0 {
 			return errors.New("I2C timeout on start")
@@ -678,7 +673,7 @@ func (i2c I2C) signalStart() error {
 // signalStop sends a stop signal and waits for it to succeed.
 func (i2c I2C) signalStop() error {
 	// Generate stop condition
-	i2c.Bus.CR1.SetBits(stm32.I2C_CR1_STOP)
+	i2c.Bus.CR1 |= stm32.I2C_CR1_STOP
 
 	// wait for stop
 	return i2c.waitForStop()
@@ -688,7 +683,7 @@ func (i2c I2C) signalStop() error {
 func (i2c I2C) waitForStop() error {
 	// Wait until I2C is stopped
 	timeout := i2cTimeout
-	for i2c.Bus.SR1.HasBits(stm32.I2C_SR1_STOPF) {
+	for (i2c.Bus.SR1 & stm32.I2C_SR1_STOPF) > 0 {
 		timeout--
 		if timeout == 0 {
 			println("I2C timeout on wait for stop signal")
@@ -706,14 +701,14 @@ func (i2c I2C) sendAddress(address uint8, write bool) error {
 		data |= 1 // set read flag
 	}
 
-	i2c.Bus.DR.Set(uint32(data))
+	i2c.Bus.DR = stm32.RegValue(data)
 
 	// Wait for I2C EV6 event.
 	// Destination device acknowledges address
 	timeout := i2cTimeout
 	if write {
 		// EV6 which is ADDR flag.
-		for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_ADDR) {
+		for i2c.Bus.SR1&stm32.I2C_SR1_ADDR == 0 {
 			timeout--
 			if timeout == 0 {
 				return errors.New("I2C timeout on send write address")
@@ -721,7 +716,7 @@ func (i2c I2C) sendAddress(address uint8, write bool) error {
 		}
 
 		timeout = i2cTimeout
-		for !i2c.Bus.SR2.HasBits(stm32.I2C_SR2_MSL | stm32.I2C_SR2_BUSY | stm32.I2C_SR2_TRA) {
+		for i2c.Bus.SR2&(stm32.I2C_SR2_MSL|stm32.I2C_SR2_BUSY|stm32.I2C_SR2_TRA) == 0 {
 			timeout--
 			if timeout == 0 {
 				return errors.New("I2C timeout on send write address")
@@ -729,7 +724,7 @@ func (i2c I2C) sendAddress(address uint8, write bool) error {
 		}
 	} else {
 		// I2C_EVENT_MASTER_RECEIVER_MODE_SELECTED which is ADDR flag.
-		for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_ADDR) {
+		for (i2c.Bus.SR1 & stm32.I2C_SR1_ADDR) == 0 {
 			timeout--
 			if timeout == 0 {
 				return errors.New("I2C timeout on send read address")
@@ -743,13 +738,13 @@ func (i2c I2C) sendAddress(address uint8, write bool) error {
 // WriteByte writes a single byte to the I2C bus.
 func (i2c I2C) WriteByte(data byte) error {
 	// Send data byte
-	i2c.Bus.DR.Set(uint32(data))
+	i2c.Bus.DR = stm32.RegValue(data)
 
 	// Wait for I2C EV8_2 when data has been physically shifted out and
 	// output on the bus.
 	// I2C_EVENT_MASTER_BYTE_TRANSMITTED is TXE flag.
 	timeout := i2cTimeout
-	for !i2c.Bus.SR1.HasBits(stm32.I2C_SR1_TxE) {
+	for i2c.Bus.SR1&stm32.I2C_SR1_TxE == 0 {
 		timeout--
 		if timeout == 0 {
 			return errors.New("I2C timeout on write")

src/machine/machine_stm32f407.go

@@ -13,15 +13,15 @@ const CPU_FREQUENCY = 168000000
 
 const (
 	// Mode Flag
-	PinOutput        PinMode = 0
-	PinInput         PinMode = PinInputFloating
-	PinInputFloating PinMode = 1
-	PinInputPulldown PinMode = 2
-	PinInputPullup   PinMode = 3
+	GPIO_OUTPUT         = 0
+	GPIO_INPUT          = GPIO_INPUT_PULLDOWN
+	GPIO_INPUT_FLOATING = 1
+	GPIO_INPUT_PULLDOWN = 2
+	GPIO_INPUT_PULLUP   = 3
 
 	// for UART
-	PinModeUartTX PinMode = 4
-	PinModeUartRX PinMode = 5
+	GPIO_UART_TX = 4
+	GPIO_UART_RX = 5
 
 	//GPIOx_MODER
 	GPIO_MODE_INPUT          = 0
@@ -45,8 +45,8 @@ const (
 	GPIO_PULL_DOWN = 2
 )
 
-func (p Pin) getPort() *stm32.GPIO_Type {
-	switch p / 16 {
+func (p GPIO) getPort() *stm32.GPIO_Type {
+	switch p.Pin / 16 {
 	case 0:
 		return stm32.GPIOA
 	case 1:
@@ -71,83 +71,83 @@ func (p Pin) getPort() *stm32.GPIO_Type {
 }
 
 // enableClock enables the clock for this desired GPIO port.
-func (p Pin) enableClock() {
-	switch p / 16 {
+func (p GPIO) enableClock() {
+	switch p.Pin / 16 {
 	case 0:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIOAEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIOAEN
 	case 1:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIOBEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIOBEN
 	case 2:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIOCEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIOCEN
 	case 3:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIODEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIODEN
 	case 4:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIOEEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIOEEN
 	case 5:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIOFEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIOFEN
 	case 6:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIOGEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIOGEN
 	case 7:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIOHEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIOHEN
 	case 8:
-		stm32.RCC.AHB1ENR.SetBits(stm32.RCC_AHB1ENR_GPIOIEN)
+		stm32.RCC.AHB1ENR |= stm32.RCC_AHB1ENR_GPIOIEN
 	default:
 		panic("machine: unknown port")
 	}
 }
 
 // Configure this pin with the given configuration.
-func (p Pin) Configure(config PinConfig) {
+func (p GPIO) Configure(config GPIOConfig) {
 	// Configure the GPIO pin.
 	p.enableClock()
 	port := p.getPort()
-	pin := uint8(p) % 16
+	pin := p.Pin % 16
 	pos := pin * 2
 
-	if config.Mode == PinInputFloating {
-		port.MODER.Set((uint32(port.MODER.Get())&^(0x3<<pos) | (uint32(GPIO_MODE_INPUT) << pos)))
-		port.PUPDR.Set((uint32(port.PUPDR.Get())&^(0x3<<pos) | (uint32(GPIO_FLOATING) << pos)))
-	} else if config.Mode == PinInputPulldown {
-		port.MODER.Set((uint32(port.MODER.Get())&^(0x3<<pos) | (uint32(GPIO_MODE_INPUT) << pos)))
-		port.PUPDR.Set((uint32(port.PUPDR.Get())&^(0x3<<pos) | (uint32(GPIO_PULL_DOWN) << pos)))
-	} else if config.Mode == PinInputPullup {
-		port.MODER.Set((uint32(port.MODER.Get())&^(0x3<<pos) | (uint32(GPIO_MODE_INPUT) << pos)))
-		port.PUPDR.Set((uint32(port.PUPDR.Get())&^(0x3<<pos) | (uint32(GPIO_PULL_UP) << pos)))
-	} else if config.Mode == PinOutput {
-		port.MODER.Set((uint32(port.MODER.Get())&^(0x3<<pos) | (uint32(GPIO_MODE_GENERAL_OUTPUT) << pos)))
-		port.OSPEEDR.Set((uint32(port.OSPEEDR.Get())&^(0x3<<pos) | (uint32(GPIO_SPEED_HI) << pos)))
-	} else if config.Mode == PinModeUartTX {
-		port.MODER.Set((uint32(port.MODER.Get())&^(0x3<<pos) | (uint32(GPIO_MODE_ALTERNABTIVE) << pos)))
-		port.OSPEEDR.Set((uint32(port.OSPEEDR.Get())&^(0x3<<pos) | (uint32(GPIO_SPEED_HI) << pos)))
-		port.PUPDR.Set((uint32(port.PUPDR.Get())&^(0x3<<pos) | (uint32(GPIO_PULL_UP) << pos)))
+	if config.Mode == GPIO_INPUT_FLOATING {
+		port.MODER = stm32.RegValue((uint32(port.MODER)&^(0x3<<pos) | (uint32(GPIO_MODE_INPUT) << pos)))
+		port.PUPDR = stm32.RegValue((uint32(port.PUPDR)&^(0x3<<pos) | (uint32(GPIO_FLOATING) << pos)))
+	} else if config.Mode == GPIO_INPUT_PULLDOWN {
+		port.MODER = stm32.RegValue((uint32(port.MODER)&^(0x3<<pos) | (uint32(GPIO_MODE_INPUT) << pos)))
+		port.PUPDR = stm32.RegValue((uint32(port.PUPDR)&^(0x3<<pos) | (uint32(GPIO_PULL_DOWN) << pos)))
+	} else if config.Mode == GPIO_INPUT_PULLUP {
+		port.MODER = stm32.RegValue((uint32(port.MODER)&^(0x3<<pos) | (uint32(GPIO_MODE_INPUT) << pos)))
+		port.PUPDR = stm32.RegValue((uint32(port.PUPDR)&^(0x3<<pos) | (uint32(GPIO_PULL_UP) << pos)))
+	} else if config.Mode == GPIO_OUTPUT {
+		port.MODER = stm32.RegValue((uint32(port.MODER)&^(0x3<<pos) | (uint32(GPIO_MODE_GENERAL_OUTPUT) << pos)))
+		port.OSPEEDR = stm32.RegValue((uint32(port.OSPEEDR)&^(0x3<<pos) | (uint32(GPIO_SPEED_HI) << pos)))
+	} else if config.Mode == GPIO_UART_TX {
+		port.MODER = stm32.RegValue((uint32(port.MODER)&^(0x3<<pos) | (uint32(GPIO_MODE_ALTERNABTIVE) << pos)))
+		port.OSPEEDR = stm32.RegValue((uint32(port.OSPEEDR)&^(0x3<<pos) | (uint32(GPIO_SPEED_HI) << pos)))
+		port.PUPDR = stm32.RegValue((uint32(port.PUPDR)&^(0x3<<pos) | (uint32(GPIO_PULL_UP) << pos)))
 		p.setAltFunc(0x7)
-	} else if config.Mode == PinModeUartRX {
-		port.MODER.Set((uint32(port.MODER.Get())&^(0x3<<pos) | (uint32(GPIO_MODE_ALTERNABTIVE) << pos)))
-		port.PUPDR.Set((uint32(port.PUPDR.Get())&^(0x3<<pos) | (uint32(GPIO_FLOATING) << pos)))
+	} else if config.Mode == GPIO_UART_RX {
+		port.MODER = stm32.RegValue((uint32(port.MODER)&^(0x3<<pos) | (uint32(GPIO_MODE_ALTERNABTIVE) << pos)))
+		port.PUPDR = stm32.RegValue((uint32(port.PUPDR)&^(0x3<<pos) | (uint32(GPIO_FLOATING) << pos)))
 		p.setAltFunc(0x7)
 	}
 }
 
-func (p Pin) setAltFunc(af uint32) {
+func (p GPIO) setAltFunc(af uint32) {
 	port := p.getPort()
-	pin := uint8(p) % 16
+	pin := p.Pin % 16
 	pos := pin * 4
 	if pin >= 8 {
-		port.AFRH.Set(uint32(port.AFRH.Get())&^(0xF<<pos) | ((af & 0xF) << pos))
+		port.AFRH = stm32.RegValue(uint32(port.AFRH)&^(0xF<<pos) | ((af & 0xF) << pos))
 	} else {
-		port.AFRL.Set(uint32(port.AFRL.Get())&^(0xF<<pos) | ((af & 0xF) << pos))
+		port.AFRL = stm32.RegValue(uint32(port.AFRL)&^(0xF<<pos) | ((af & 0xF) << pos))
 	}
 }
 
 // Set the pin to high or low.
 // Warning: only use this on an output pin!
-func (p Pin) Set(high bool) {
+func (p GPIO) Set(high bool) {
 	port := p.getPort()
-	pin := p % 16
+	pin := p.Pin % 16
 	if high {
-		port.BSRR.Set(1 << uint8(pin))
+		port.BSRR = 1 << pin
 	} else {
-		port.BSRR.Set(1 << uint8(pin+16))
+		port.BSRR = 1 << (pin + 16)
 	}
 }
 
@@ -173,12 +173,12 @@ func (uart UART) Configure(config UARTConfig) {
 	switch config.TX {
 	default:
 		// use standard TX/RX pins PA2 and PA3
-		UART_TX_PIN.Configure(PinConfig{Mode: PinModeUartTX})
-		UART_RX_PIN.Configure(PinConfig{Mode: PinModeUartRX})
+		GPIO{UART_TX_PIN}.Configure(GPIOConfig{Mode: GPIO_UART_TX})
+		GPIO{UART_RX_PIN}.Configure(GPIOConfig{Mode: GPIO_UART_RX})
 	}
 
 	// Enable USART2 clock
-	stm32.RCC.APB1ENR.SetBits(stm32.RCC_APB1ENR_USART2EN)
+	stm32.RCC.APB1ENR |= stm32.RCC_APB1ENR_USART2EN
 
 	/*
 	  Set baud rate(115200)
@@ -195,10 +195,10 @@ func (uart UART) Configure(config UARTConfig) {
 	  | 115200   | 0x16D  |
 	  +----------+--------+
 	*/
-	stm32.USART2.BRR.Set(0x16c)
+	stm32.USART2.BRR = 0x16c
 
 	// Enable USART2 port.
-	stm32.USART2.CR1.Set(stm32.USART_CR1_TE | stm32.USART_CR1_RE | stm32.USART_CR1_RXNEIE | stm32.USART_CR1_UE)
+	stm32.USART2.CR1 = stm32.USART_CR1_TE | stm32.USART_CR1_RE | stm32.USART_CR1_RXNEIE | stm32.USART_CR1_UE
 
 	// Enable RX IRQ.
 	arm.SetPriority(stm32.IRQ_USART2, 0xc0)
@@ -207,14 +207,14 @@ func (uart UART) Configure(config UARTConfig) {
 
 // WriteByte writes a byte of data to the UART.
 func (uart UART) WriteByte(c byte) error {
-	stm32.USART2.DR.Set(uint32(c))
+	stm32.USART2.DR = stm32.RegValue(c)
 
-	for !stm32.USART2.SR.HasBits(stm32.USART_SR_TXE) {
+	for (stm32.USART2.SR & stm32.USART_SR_TXE) == 0 {
 	}
 	return nil
 }
 
 //go:export USART2_IRQHandler
 func handleUSART2() {
-	UART1.Receive(byte((stm32.USART2.DR.Get() & 0xFF)))
+	UART1.Receive(byte((stm32.USART2.DR & 0xFF)))
 }

src/machine/spi.go

@@ -1,4 +1,4 @@
-// +build nrf stm32f103xx atsamd21g18a
+// +build js,wasm nrf stm32f103xx atsamd21g18a
 
 package machine
 

src/machine/uart.go

@@ -6,8 +6,8 @@ import "errors"
 
 type UARTConfig struct {
 	BaudRate uint32
-	TX       Pin
-	RX       Pin
+	TX       uint8
+	RX       uint8
 }
 
 // To implement the UART interface for a board, you must declare a concrete type as follows:

src/machine/usb.go

@@ -484,11 +484,11 @@ const (
 // 		 RoReg8                    Reserved1[0x5];
 //   } UsbDeviceDescBank;
 type usbDeviceDescBank struct {
-	ADDR      sam.Register32
-	PCKSIZE   sam.Register32
-	EXTREG    sam.Register16
-	STATUS_BK sam.Register8
-	_reserved [5]sam.Register8
+	ADDR      sam.RegValue
+	PCKSIZE   sam.RegValue
+	EXTREG    sam.RegValue16
+	STATUS_BK sam.RegValue8
+	_reserved [5]sam.RegValue8
 }
 
 type usbDeviceDescriptor struct {

src/runtime/hashmap.go

@@ -60,20 +60,14 @@ func hashmapTopHash(hash uint32) uint8 {
 }
 
 // Create a new hashmap with the given keySize and valueSize.
-func hashmapMake(keySize, valueSize uint8, sizeHint uintptr) *hashmap {
-	numBuckets := sizeHint / 8
-	bucketBits := uint8(0)
-	for numBuckets != 0 {
-		numBuckets /= 2
-		bucketBits++
-	}
+func hashmapMake(keySize, valueSize uint8) *hashmap {
 	bucketBufSize := unsafe.Sizeof(hashmapBucket{}) + uintptr(keySize)*8 + uintptr(valueSize)*8
-	buckets := alloc(bucketBufSize * (1 << bucketBits))
+	bucket := alloc(bucketBufSize)
 	return &hashmap{
-		buckets:    buckets,
+		buckets:    bucket,
 		keySize:    keySize,
 		valueSize:  valueSize,
-		bucketBits: bucketBits,
+		bucketBits: 0,
 	}
 }
 
@@ -89,20 +83,13 @@ func hashmapLen(m *hashmap) int {
 // Set a specified key to a given value. Grow the map if necessary.
 //go:nobounds
 func hashmapSet(m *hashmap, key unsafe.Pointer, value unsafe.Pointer, hash uint32, keyEqual func(x, y unsafe.Pointer, n uintptr) bool) {
-	tophash := hashmapTopHash(hash)
-
-	if m.buckets == nil {
-		// No bucket was allocated yet, do so now.
-		m.buckets = unsafe.Pointer(hashmapInsertIntoNewBucket(m, key, value, tophash))
-		return
-	}
-
 	numBuckets := uintptr(1) << m.bucketBits
 	bucketNumber := (uintptr(hash) & (numBuckets - 1))
 	bucketSize := unsafe.Sizeof(hashmapBucket{}) + uintptr(m.keySize)*8 + uintptr(m.valueSize)*8
 	bucketAddr := uintptr(m.buckets) + bucketSize*bucketNumber
 	bucket := (*hashmapBucket)(unsafe.Pointer(bucketAddr))
-	var lastBucket *hashmapBucket
+
+	tophash := hashmapTopHash(hash)
 
 	// See whether the key already exists somewhere.
 	var emptySlotKey unsafe.Pointer
@@ -111,9 +98,9 @@ func hashmapSet(m *hashmap, key unsafe.Pointer, value unsafe.Pointer, hash uint3
 	for bucket != nil {
 		for i := uintptr(0); i < 8; i++ {
 			slotKeyOffset := unsafe.Sizeof(hashmapBucket{}) + uintptr(m.keySize)*uintptr(i)
-			slotKey := unsafe.Pointer(uintptr(unsafe.Pointer(bucket)) + slotKeyOffset)
+			slotKey := unsafe.Pointer(bucketAddr + slotKeyOffset)
 			slotValueOffset := unsafe.Sizeof(hashmapBucket{}) + uintptr(m.keySize)*8 + uintptr(m.valueSize)*uintptr(i)
-			slotValue := unsafe.Pointer(uintptr(unsafe.Pointer(bucket)) + slotValueOffset)
+			slotValue := unsafe.Pointer(bucketAddr + slotValueOffset)
 			if bucket.tophash[i] == 0 && emptySlotKey == nil {
 				// Found an empty slot, store it for if we couldn't find an
 				// existing slot.
@@ -122,7 +109,7 @@ func hashmapSet(m *hashmap, key unsafe.Pointer, value unsafe.Pointer, hash uint3
 				emptySlotTophash = &bucket.tophash[i]
 			}
 			if bucket.tophash[i] == tophash {
-				// Could be an existing key that's the same.
+				// Could be an existing value that's the same.
 				if keyEqual(key, slotKey, uintptr(m.keySize)) {
 					// found same key, replace it
 					memcpy(slotValue, value, uintptr(m.valueSize))
@@ -130,37 +117,16 @@ func hashmapSet(m *hashmap, key unsafe.Pointer, value unsafe.Pointer, hash uint3
 				}
 			}
 		}
-		lastBucket = bucket
 		bucket = bucket.next
 	}
-	if emptySlotKey == nil {
-		// Add a new bucket to the bucket chain.
-		// TODO: rebalance if necessary to avoid O(n) insert and lookup time.
-		lastBucket.next = (*hashmapBucket)(hashmapInsertIntoNewBucket(m, key, value, tophash))
+	if emptySlotKey != nil {
+		m.count++
+		memcpy(emptySlotKey, key, uintptr(m.keySize))
+		memcpy(emptySlotValue, value, uintptr(m.valueSize))
+		*emptySlotTophash = tophash
 		return
 	}
-	m.count++
-	memcpy(emptySlotKey, key, uintptr(m.keySize))
-	memcpy(emptySlotValue, value, uintptr(m.valueSize))
-	*emptySlotTophash = tophash
-}
-
-// hashmapInsertIntoNewBucket creates a new bucket, inserts the given key and
-// value into the bucket, and returns a pointer to this bucket.
-func hashmapInsertIntoNewBucket(m *hashmap, key, value unsafe.Pointer, tophash uint8) *hashmapBucket {
-	bucketBufSize := unsafe.Sizeof(hashmapBucket{}) + uintptr(m.keySize)*8 + uintptr(m.valueSize)*8
-	bucketBuf := alloc(bucketBufSize)
-	// Insert into the first slot, which is empty as it has just been allocated.
-	slotKeyOffset := unsafe.Sizeof(hashmapBucket{})
-	slotKey := unsafe.Pointer(uintptr(bucketBuf) + slotKeyOffset)
-	slotValueOffset := unsafe.Sizeof(hashmapBucket{}) + uintptr(m.keySize)*8
-	slotValue := unsafe.Pointer(uintptr(bucketBuf) + slotValueOffset)
-	m.count++
-	memcpy(slotKey, key, uintptr(m.keySize))
-	memcpy(slotValue, value, uintptr(m.valueSize))
-	bucket := (*hashmapBucket)(bucketBuf)
-	bucket.tophash[0] = tophash
-	return bucket
+	panic("todo: hashmap: grow bucket")
 }
 
 // Get the value of a specified key, or zero the value if not found.

src/runtime/panic.go

@@ -36,20 +36,16 @@ func isnil(ptr *uint8) bool {
 }
 
 // Panic when trying to dereference a nil pointer.
-func nilPanic() {
+func nilpanic() {
 	runtimePanic("nil pointer dereference")
 }
 
 // Panic when trying to acces an array or slice out of bounds.
-func lookupPanic() {
+func lookuppanic() {
 	runtimePanic("index out of range")
 }
 
 // Panic when trying to slice a slice out of bounds.
-func slicePanic() {
+func slicepanic() {
 	runtimePanic("slice out of range")
 }
-
-func blockingPanic() {
-	runtimePanic("trying to do blocking operation in exported function")
-}

src/runtime/runtime.go

@@ -10,7 +10,7 @@ const Compiler = "tinygo"
 // package.
 func initAll()
 
-// A function call to this function is replaced with one of the following,
+// A function call to this function is replaced withone of the following,
 // depending on whether the scheduler is necessary:
 //
 // Without scheduler:

src/runtime/runtime_atmega.go

@@ -17,19 +17,19 @@ func sleepWDT(period uint8) {
 	avr.Asm("cli")
 	avr.Asm("wdr")
 	// Start timed sequence.
-	avr.WDTCSR.SetBits(avr.WDTCSR_WDCE | avr.WDTCSR_WDE)
+	*avr.WDTCSR |= avr.WDTCSR_WDCE | avr.WDTCSR_WDE
 	// Enable WDT and set new timeout
-	avr.WDTCSR.SetBits(avr.WDTCSR_WDIE | period)
+	*avr.WDTCSR = avr.WDTCSR_WDIE | avr.RegValue(period)
 	avr.Asm("sei")
 
 	// Set sleep mode to idle and enable sleep mode.
 	// Note: when using something other than idle, the UART won't work
 	// correctly. This needs to be fixed, though, so we can truly sleep.
-	avr.SMCR.Set((0 << 1) | avr.SMCR_SE)
+	*avr.SMCR = (0 << 1) | avr.SMCR_SE
 
 	// go to sleep
 	avr.Asm("sleep")
 
 	// disable sleep
-	avr.SMCR.Set(0)
+	*avr.SMCR = 0
 }

src/runtime/runtime_atsamd21.go

@@ -36,12 +36,12 @@ func putchar(c byte) {
 
 func initClocks() {
 	// Set 1 Flash Wait State for 48MHz, required for 3.3V operation according to SAMD21 Datasheet
-	sam.NVMCTRL.CTRLB.SetBits(sam.NVMCTRL_CTRLB_RWS_HALF << sam.NVMCTRL_CTRLB_RWS_Pos)
+	sam.NVMCTRL.CTRLB |= (sam.NVMCTRL_CTRLB_RWS_HALF << sam.NVMCTRL_CTRLB_RWS_Pos)
 
 	// Turn on the digital interface clock
-	sam.PM.APBAMASK.SetBits(sam.PM_APBAMASK_GCLK_)
+	sam.PM.APBAMASK |= sam.PM_APBAMASK_GCLK_
 	// turn off RTC
-	sam.PM.APBAMASK.ClearBits(sam.PM_APBAMASK_RTC_)
+	sam.PM.APBAMASK &^= sam.PM_APBAMASK_RTC_
 
 	// Enable OSC32K clock (Internal 32.768Hz oscillator).
 	// This requires registers that are not included in the SVD file.
@@ -61,42 +61,42 @@ func initClocks() {
 	// SYSCTRL_OSC32K_CALIB(calib) |
 	//  SYSCTRL_OSC32K_STARTUP(0x6u) |
 	//  SYSCTRL_OSC32K_EN32K | SYSCTRL_OSC32K_ENABLE;
-	sam.SYSCTRL.OSC32K.Set((calib << sam.SYSCTRL_OSC32K_CALIB_Pos) |
+	sam.SYSCTRL.OSC32K = sam.RegValue((calib << sam.SYSCTRL_OSC32K_CALIB_Pos) |
 		(0x6 << sam.SYSCTRL_OSC32K_STARTUP_Pos) |
 		sam.SYSCTRL_OSC32K_EN32K |
 		sam.SYSCTRL_OSC32K_EN1K |
 		sam.SYSCTRL_OSC32K_ENABLE)
 	// Wait for oscillator stabilization
-	for !sam.SYSCTRL.PCLKSR.HasBits(sam.SYSCTRL_PCLKSR_OSC32KRDY) {
+	for (sam.SYSCTRL.PCLKSR & sam.SYSCTRL_PCLKSR_OSC32KRDY) == 0 {
 	}
 
 	// Software reset the module to ensure it is re-initialized correctly
-	sam.GCLK.CTRL.Set(sam.GCLK_CTRL_SWRST)
+	sam.GCLK.CTRL = sam.GCLK_CTRL_SWRST
 	// Wait for reset to complete
-	for sam.GCLK.CTRL.HasBits(sam.GCLK_CTRL_SWRST) && sam.GCLK.STATUS.HasBits(sam.GCLK_STATUS_SYNCBUSY) {
+	for (sam.GCLK.CTRL&sam.GCLK_CTRL_SWRST) > 0 && (sam.GCLK.STATUS&sam.GCLK_STATUS_SYNCBUSY) > 0 {
 	}
 
 	// Put OSC32K as source of Generic Clock Generator 1
-	sam.GCLK.GENDIV.Set((1 << sam.GCLK_GENDIV_ID_Pos) |
+	sam.GCLK.GENDIV = sam.RegValue((1 << sam.GCLK_GENDIV_ID_Pos) |
 		(0 << sam.GCLK_GENDIV_DIV_Pos))
 	waitForSync()
 
 	// GCLK_GENCTRL_ID(1) | GCLK_GENCTRL_SRC_OSC32K | GCLK_GENCTRL_GENEN;
-	sam.GCLK.GENCTRL.Set((1 << sam.GCLK_GENCTRL_ID_Pos) |
+	sam.GCLK.GENCTRL = sam.RegValue((1 << sam.GCLK_GENCTRL_ID_Pos) |
 		(sam.GCLK_GENCTRL_SRC_OSC32K << sam.GCLK_GENCTRL_SRC_Pos) |
 		sam.GCLK_GENCTRL_GENEN)
 	waitForSync()
 
 	// Use Generic Clock Generator 1 as source for Generic Clock Multiplexer 0 (DFLL48M reference)
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_DFLL48 << sam.GCLK_CLKCTRL_ID_Pos) |
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_DFLL48 << sam.GCLK_CLKCTRL_ID_Pos) |
 		(sam.GCLK_CLKCTRL_GEN_GCLK1 << sam.GCLK_CLKCTRL_GEN_Pos) |
 		sam.GCLK_CLKCTRL_CLKEN)
 	waitForSync()
 
 	// Remove the OnDemand mode, Bug http://avr32.icgroup.norway.atmel.com/bugzilla/show_bug.cgi?id=9905
-	sam.SYSCTRL.DFLLCTRL.Set(sam.SYSCTRL_DFLLCTRL_ENABLE)
+	sam.SYSCTRL.DFLLCTRL = sam.SYSCTRL_DFLLCTRL_ENABLE
 	// Wait for ready
-	for !sam.SYSCTRL.PCLKSR.HasBits(sam.SYSCTRL_PCLKSR_DFLLRDY) {
+	for (sam.SYSCTRL.PCLKSR & sam.SYSCTRL_PCLKSR_DFLLRDY) == 0 {
 	}
 
 	// Handle DFLL calibration based on info learned from Arduino SAMD implementation,
@@ -110,107 +110,107 @@ func initClocks() {
 		coarse = 0x1f
 	}
 
-	sam.SYSCTRL.DFLLVAL.SetBits(coarse << sam.SYSCTRL_DFLLVAL_COARSE_Pos)
-	sam.SYSCTRL.DFLLVAL.SetBits(0x1ff << sam.SYSCTRL_DFLLVAL_FINE_Pos)
+	sam.SYSCTRL.DFLLVAL |= sam.RegValue(coarse << sam.SYSCTRL_DFLLVAL_COARSE_Pos)
+	sam.SYSCTRL.DFLLVAL |= (0x1ff << sam.SYSCTRL_DFLLVAL_FINE_Pos)
 
 	// Write full configuration to DFLL control register
 	// SYSCTRL_DFLLMUL_CSTEP( 0x1f / 4 ) | // Coarse step is 31, half of the max value
 	// SYSCTRL_DFLLMUL_FSTEP( 10 ) |
 	// SYSCTRL_DFLLMUL_MUL( (48000) ) ;
-	sam.SYSCTRL.DFLLMUL.Set(((31 / 4) << sam.SYSCTRL_DFLLMUL_CSTEP_Pos) |
+	sam.SYSCTRL.DFLLMUL = sam.RegValue(((31 / 4) << sam.SYSCTRL_DFLLMUL_CSTEP_Pos) |
 		(10 << sam.SYSCTRL_DFLLMUL_FSTEP_Pos) |
 		(48000 << sam.SYSCTRL_DFLLMUL_MUL_Pos))
 
 	// disable DFLL
-	sam.SYSCTRL.DFLLCTRL.Set(0)
+	sam.SYSCTRL.DFLLCTRL = 0
 	waitForSync()
 
-	sam.SYSCTRL.DFLLCTRL.SetBits(sam.SYSCTRL_DFLLCTRL_MODE |
+	sam.SYSCTRL.DFLLCTRL |= sam.SYSCTRL_DFLLCTRL_MODE |
 		sam.SYSCTRL_DFLLCTRL_CCDIS |
 		sam.SYSCTRL_DFLLCTRL_USBCRM |
-		sam.SYSCTRL_DFLLCTRL_BPLCKC)
+		sam.SYSCTRL_DFLLCTRL_BPLCKC
 	// Wait for ready
-	for !sam.SYSCTRL.PCLKSR.HasBits(sam.SYSCTRL_PCLKSR_DFLLRDY) {
+	for (sam.SYSCTRL.PCLKSR & sam.SYSCTRL_PCLKSR_DFLLRDY) == 0 {
 	}
 
 	// Re-enable the DFLL
-	sam.SYSCTRL.DFLLCTRL.SetBits(sam.SYSCTRL_DFLLCTRL_ENABLE)
+	sam.SYSCTRL.DFLLCTRL |= sam.SYSCTRL_DFLLCTRL_ENABLE
 	// Wait for ready
-	for !sam.SYSCTRL.PCLKSR.HasBits(sam.SYSCTRL_PCLKSR_DFLLRDY) {
+	for (sam.SYSCTRL.PCLKSR & sam.SYSCTRL_PCLKSR_DFLLRDY) == 0 {
 	}
 
 	// Switch Generic Clock Generator 0 to DFLL48M. CPU will run at 48MHz.
-	sam.GCLK.GENDIV.Set((0 << sam.GCLK_GENDIV_ID_Pos) |
+	sam.GCLK.GENDIV = sam.RegValue((0 << sam.GCLK_GENDIV_ID_Pos) |
 		(0 << sam.GCLK_GENDIV_DIV_Pos))
 	waitForSync()
 
-	sam.GCLK.GENCTRL.Set((0 << sam.GCLK_GENCTRL_ID_Pos) |
+	sam.GCLK.GENCTRL = sam.RegValue((0 << sam.GCLK_GENCTRL_ID_Pos) |
 		(sam.GCLK_GENCTRL_SRC_DFLL48M << sam.GCLK_GENCTRL_SRC_Pos) |
 		sam.GCLK_GENCTRL_IDC |
 		sam.GCLK_GENCTRL_GENEN)
 	waitForSync()
 
 	// Modify PRESCaler value of OSC8M to have 8MHz
-	sam.SYSCTRL.OSC8M.SetBits(sam.SYSCTRL_OSC8M_PRESC_0 << sam.SYSCTRL_OSC8M_PRESC_Pos)
-	sam.SYSCTRL.OSC8M.ClearBits(1 << sam.SYSCTRL_OSC8M_ONDEMAND_Pos)
+	sam.SYSCTRL.OSC8M |= (sam.SYSCTRL_OSC8M_PRESC_0 << sam.SYSCTRL_OSC8M_PRESC_Pos)
+	sam.SYSCTRL.OSC8M &^= (1 << sam.SYSCTRL_OSC8M_ONDEMAND_Pos)
 	// Wait for oscillator stabilization
-	for !sam.SYSCTRL.PCLKSR.HasBits(sam.SYSCTRL_PCLKSR_OSC8MRDY) {
+	for (sam.SYSCTRL.PCLKSR & sam.SYSCTRL_PCLKSR_OSC8MRDY) == 0 {
 	}
 
 	// Use OSC8M as source for Generic Clock Generator 3
-	sam.GCLK.GENDIV.Set((3 << sam.GCLK_GENDIV_ID_Pos))
+	sam.GCLK.GENDIV = sam.RegValue((3 << sam.GCLK_GENDIV_ID_Pos))
 	waitForSync()
 
-	sam.GCLK.GENCTRL.Set((3 << sam.GCLK_GENCTRL_ID_Pos) |
+	sam.GCLK.GENCTRL = sam.RegValue((3 << sam.GCLK_GENCTRL_ID_Pos) |
 		(sam.GCLK_GENCTRL_SRC_OSC8M << sam.GCLK_GENCTRL_SRC_Pos) |
 		sam.GCLK_GENCTRL_GENEN)
 	waitForSync()
 
 	// Use OSC32K as source for Generic Clock Generator 2
 	// OSC32K/1 -> GCLK2 at 32KHz
-	sam.GCLK.GENDIV.Set(2 << sam.GCLK_GENDIV_ID_Pos)
+	sam.GCLK.GENDIV = sam.RegValue(2 << sam.GCLK_GENDIV_ID_Pos)
 	waitForSync()
 
-	sam.GCLK.GENCTRL.Set((2 << sam.GCLK_GENCTRL_ID_Pos) |
+	sam.GCLK.GENCTRL = sam.RegValue((2 << sam.GCLK_GENCTRL_ID_Pos) |
 		(sam.GCLK_GENCTRL_SRC_OSC32K << sam.GCLK_GENCTRL_SRC_Pos) |
 		sam.GCLK_GENCTRL_GENEN)
 	waitForSync()
 
 	// Use GCLK2 for RTC
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_RTC << sam.GCLK_CLKCTRL_ID_Pos) |
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_RTC << sam.GCLK_CLKCTRL_ID_Pos) |
 		(sam.GCLK_CLKCTRL_GEN_GCLK2 << sam.GCLK_CLKCTRL_GEN_Pos) |
 		sam.GCLK_CLKCTRL_CLKEN)
 	waitForSync()
 
 	// Set the CPU, APBA, B, and C dividers
-	sam.PM.CPUSEL.Set(sam.PM_CPUSEL_CPUDIV_DIV1)
-	sam.PM.APBASEL.Set(sam.PM_APBASEL_APBADIV_DIV1)
-	sam.PM.APBBSEL.Set(sam.PM_APBBSEL_APBBDIV_DIV1)
-	sam.PM.APBCSEL.Set(sam.PM_APBCSEL_APBCDIV_DIV1)
+	sam.PM.CPUSEL = sam.PM_CPUSEL_CPUDIV_DIV1
+	sam.PM.APBASEL = sam.PM_APBASEL_APBADIV_DIV1
+	sam.PM.APBBSEL = sam.PM_APBBSEL_APBBDIV_DIV1
+	sam.PM.APBCSEL = sam.PM_APBCSEL_APBCDIV_DIV1
 
 	// Disable automatic NVM write operations
-	sam.NVMCTRL.CTRLB.SetBits(sam.NVMCTRL_CTRLB_MANW)
+	sam.NVMCTRL.CTRLB |= sam.NVMCTRL_CTRLB_MANW
 }
 
 func initRTC() {
 	// turn on digital interface clock
-	sam.PM.APBAMASK.SetBits(sam.PM_APBAMASK_RTC_)
+	sam.PM.APBAMASK |= sam.PM_APBAMASK_RTC_
 
 	// disable RTC
-	sam.RTC_MODE0.CTRL.Set(0)
+	sam.RTC_MODE0.CTRL = 0
 	waitForSync()
 
 	// reset RTC
-	sam.RTC_MODE0.CTRL.SetBits(sam.RTC_MODE0_CTRL_SWRST)
+	sam.RTC_MODE0.CTRL |= sam.RTC_MODE0_CTRL_SWRST
 	waitForSync()
 
 	// set Mode0 to 32-bit counter (mode 0) with prescaler 1 and GCLK2 is 32KHz/1
-	sam.RTC_MODE0.CTRL.Set((sam.RTC_MODE0_CTRL_MODE_COUNT32 << sam.RTC_MODE0_CTRL_MODE_Pos) |
+	sam.RTC_MODE0.CTRL = sam.RegValue16((sam.RTC_MODE0_CTRL_MODE_COUNT32 << sam.RTC_MODE0_CTRL_MODE_Pos) |
 		(sam.RTC_MODE0_CTRL_PRESCALER_DIV1 << sam.RTC_MODE0_CTRL_PRESCALER_Pos))
 	waitForSync()
 
 	// re-enable RTC
-	sam.RTC_MODE0.CTRL.SetBits(sam.RTC_MODE0_CTRL_ENABLE)
+	sam.RTC_MODE0.CTRL |= sam.RTC_MODE0_CTRL_ENABLE
 	waitForSync()
 
 	arm.SetPriority(sam.IRQ_RTC, 0xc0)
@@ -218,7 +218,7 @@ func initRTC() {
 }
 
 func waitForSync() {
-	for sam.GCLK.STATUS.HasBits(sam.GCLK_STATUS_SYNCBUSY) {
+	for (sam.GCLK.STATUS & sam.GCLK_STATUS_SYNCBUSY) > 0 {
 	}
 }
 
@@ -250,11 +250,11 @@ func sleepTicks(d timeUnit) {
 // ticks returns number of microseconds since start.
 func ticks() timeUnit {
 	// request read of count
-	sam.RTC_MODE0.READREQ.Set(sam.RTC_MODE0_READREQ_RREQ)
+	sam.RTC_MODE0.READREQ = sam.RTC_MODE0_READREQ_RREQ
 	waitForSync()
 
-	rtcCounter := (uint64(sam.RTC_MODE0.COUNT.Get()) * 305) / 10 // each counter tick == 30.5us
-	offset := (rtcCounter - timerLastCounter)                    // change since last measurement
+	rtcCounter := (uint64(sam.RTC_MODE0.COUNT) * 305) / 10 // each counter tick == 30.5us
+	offset := (rtcCounter - timerLastCounter)              // change since last measurement
 	timerLastCounter = rtcCounter
 	timestamp += timeUnit(offset) // TODO: not precise
 	return timestamp
@@ -269,16 +269,16 @@ func timerSleep(ticks uint32) {
 	}
 
 	// request read of count
-	sam.RTC_MODE0.READREQ.Set(sam.RTC_MODE0_READREQ_RREQ)
+	sam.RTC_MODE0.READREQ = sam.RTC_MODE0_READREQ_RREQ
 	waitForSync()
 
 	// set compare value
-	cnt := sam.RTC_MODE0.COUNT.Get()
-	sam.RTC_MODE0.COMP0.Set(uint32(cnt) + (ticks * 10 / 305)) // each counter tick == 30.5us
+	cnt := sam.RTC_MODE0.COUNT
+	sam.RTC_MODE0.COMP0 = sam.RegValue(uint32(cnt) + (ticks * 10 / 305)) // each counter tick == 30.5us
 	waitForSync()
 
 	// enable IRQ for CMP0 compare
-	sam.RTC_MODE0.INTENSET.SetBits(sam.RTC_MODE0_INTENSET_CMP0)
+	sam.RTC_MODE0.INTENSET |= sam.RTC_MODE0_INTENSET_CMP0
 
 	for !timerWakeup {
 		arm.Asm("wfi")
@@ -288,17 +288,70 @@ func timerSleep(ticks uint32) {
 //go:export RTC_IRQHandler
 func handleRTC() {
 	// disable IRQ for CMP0 compare
-	sam.RTC_MODE0.INTFLAG.Set(sam.RTC_MODE0_INTENSET_CMP0)
+	sam.RTC_MODE0.INTFLAG = sam.RTC_MODE0_INTENSET_CMP0
 
 	timerWakeup = true
 }
 
+func initSERCOMClocks() {
+	// Turn on clock to SERCOM0 for UART0
+	sam.PM.APBCMASK |= sam.PM_APBCMASK_SERCOM0_
+
+	// Use GCLK0 for SERCOM0 aka UART0
+	// GCLK_CLKCTRL_ID( clockId ) | // Generic Clock 0 (SERCOMx)
+	// GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
+	// GCLK_CLKCTRL_CLKEN ;
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_SERCOM0_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
+		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
+		sam.GCLK_CLKCTRL_CLKEN)
+	waitForSync()
+
+	// Turn on clock to SERCOM1
+	sam.PM.APBCMASK |= sam.PM_APBCMASK_SERCOM1_
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_SERCOM1_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
+		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
+		sam.GCLK_CLKCTRL_CLKEN)
+	waitForSync()
+
+	// Turn on clock to SERCOM2
+	sam.PM.APBCMASK |= sam.PM_APBCMASK_SERCOM2_
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_SERCOM2_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
+		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
+		sam.GCLK_CLKCTRL_CLKEN)
+	waitForSync()
+
+	// Turn on clock to SERCOM3
+	sam.PM.APBCMASK |= sam.PM_APBCMASK_SERCOM3_
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_SERCOM3_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
+		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
+		sam.GCLK_CLKCTRL_CLKEN)
+	waitForSync()
+
+	// Turn on clock to SERCOM4
+	sam.PM.APBCMASK |= sam.PM_APBCMASK_SERCOM4_
+
+	// Use GCLK0 for SERCOM4
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_SERCOM4_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
+		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
+		sam.GCLK_CLKCTRL_CLKEN)
+	waitForSync()
+
+	// Turn on clock to SERCOM5
+	sam.PM.APBCMASK |= sam.PM_APBCMASK_SERCOM5_
+
+	// Use GCLK0 for SERCOM5
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_SERCOM5_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
+		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
+		sam.GCLK_CLKCTRL_CLKEN)
+	waitForSync()
+}
+
 func initUSBClock() {
 	// Turn on clock for USB
-	sam.PM.APBBMASK.SetBits(sam.PM_APBBMASK_USB_)
+	sam.PM.APBBMASK |= sam.PM_APBBMASK_USB_
 
 	// Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_USB << sam.GCLK_CLKCTRL_ID_Pos) |
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_USB << sam.GCLK_CLKCTRL_ID_Pos) |
 		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
 		sam.GCLK_CLKCTRL_CLKEN)
 	waitForSync()
@@ -306,10 +359,10 @@ func initUSBClock() {
 
 func initADCClock() {
 	// Turn on clock for ADC
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_ADC_)
+	sam.PM.APBCMASK |= sam.PM_APBCMASK_ADC_
 
 	// Put Generic Clock Generator 0 as source for Generic Clock Multiplexer for ADC.
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_ADC << sam.GCLK_CLKCTRL_ID_Pos) |
+	sam.GCLK.CLKCTRL = sam.RegValue16((sam.GCLK_CLKCTRL_ID_ADC << sam.GCLK_CLKCTRL_ID_Pos) |
 		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
 		sam.GCLK_CLKCTRL_CLKEN)
 	waitForSync()

src/runtime/runtime_atsamd21e18.go

@@ -1,42 +0,0 @@
-// +build sam,atsamd21,atsamd21e18
-
-package runtime
-
-import (
-	"device/sam"
-)
-
-func initSERCOMClocks() {
-	// Turn on clock to SERCOM0 for UART0
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM0_)
-
-	// Use GCLK0 for SERCOM0 aka UART0
-	// GCLK_CLKCTRL_ID( clockId ) | // Generic Clock 0 (SERCOMx)
-	// GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
-	// GCLK_CLKCTRL_CLKEN ;
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM0_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-
-	// Turn on clock to SERCOM1
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM1_)
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM1_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-
-	// Turn on clock to SERCOM2
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM2_)
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM2_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-
-	// Turn on clock to SERCOM3
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM3_)
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM3_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-}

src/runtime/runtime_atsamd21g18.go

@@ -1,60 +0,0 @@
-// +build sam,atsamd21,atsamd21g18
-
-package runtime
-
-import (
-	"device/sam"
-)
-
-func initSERCOMClocks() {
-	// Turn on clock to SERCOM0 for UART0
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM0_)
-
-	// Use GCLK0 for SERCOM0 aka UART0
-	// GCLK_CLKCTRL_ID( clockId ) | // Generic Clock 0 (SERCOMx)
-	// GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
-	// GCLK_CLKCTRL_CLKEN ;
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM0_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-
-	// Turn on clock to SERCOM1
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM1_)
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM1_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-
-	// Turn on clock to SERCOM2
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM2_)
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM2_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-
-	// Turn on clock to SERCOM3
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM3_)
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM3_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-
-	// Turn on clock to SERCOM4
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM4_)
-
-	// Use GCLK0 for SERCOM4
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM4_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-
-	// Turn on clock to SERCOM5
-	sam.PM.APBCMASK.SetBits(sam.PM_APBCMASK_SERCOM5_)
-
-	// Use GCLK0 for SERCOM5
-	sam.GCLK.CLKCTRL.Set((sam.GCLK_CLKCTRL_ID_SERCOM5_CORE << sam.GCLK_CLKCTRL_ID_Pos) |
-		(sam.GCLK_CLKCTRL_GEN_GCLK0 << sam.GCLK_CLKCTRL_GEN_Pos) |
-		sam.GCLK_CLKCTRL_CLKEN)
-	waitForSync()
-}

src/runtime/runtime_cortexm.go

@@ -41,61 +41,11 @@ func preinit() {
 }
 
 func abort() {
-	// disable all interrupts
-	arm.DisableInterrupts()
-
-	// lock up forever
 	for {
 		arm.Asm("wfi")
 	}
 }
 
-// The stack layout at the moment an interrupt occurs.
-// Registers can be accessed if the stack pointer is cast to a pointer to this
-// struct.
-type interruptStack struct {
-	R0  uintptr
-	R1  uintptr
-	R2  uintptr
-	R3  uintptr
-	R12 uintptr
-	LR  uintptr
-	PC  uintptr
-	PSR uintptr
-}
-
-// This function is called at HardFault.
-// Before this function is called, the stack pointer is reset to the initial
-// stack pointer (loaded from addres 0x0) and the previous stack pointer is
-// passed as an argument to this function. This allows for easy inspection of
-// the stack the moment a HardFault occurs, but it means that the stack will be
-// corrupted by this function and thus this handler must not attempt to recover.
-//
-// For details, see:
-// https://community.arm.com/developer/ip-products/system/f/embedded-forum/3257/debugging-a-cortex-m0-hard-fault
-// https://blog.feabhas.com/2013/02/developing-a-generic-hard-fault-handler-for-arm-cortex-m3cortex-m4/
-//go:export handleHardFault
-func handleHardFault(sp *interruptStack) {
-	print("fatal error: ")
-	if uintptr(unsafe.Pointer(sp)) < 0x20000000 {
-		print("stack overflow")
-	} else {
-		// TODO: try to find the cause of the hard fault. Especially on
-		// Cortex-M3 and higher it is possible to find more detailed information
-		// in special status registers.
-		print("HardFault")
-	}
-	print(" with sp=", sp)
-	if uintptr(unsafe.Pointer(&sp.PC)) >= 0x20000000 {
-		// Only print the PC if it points into memory.
-		// It may not point into memory during a stack overflow, so check that
-		// first before accessing the stack.
-		print(" pc=", sp.PC)
-	}
-	println()
-	abort()
-}
-
 // Implement memset for LLVM and compiler-rt.
 //go:export memset
 func libc_memset(ptr unsafe.Pointer, c byte, size uintptr) {

src/runtime/runtime_nrf.go

@@ -32,16 +32,16 @@ func init() {
 
 func initLFCLK() {
 	if machine.HasLowFrequencyCrystal {
-		nrf.CLOCK.LFCLKSRC.Set(nrf.CLOCK_LFCLKSTAT_SRC_Xtal)
+		nrf.CLOCK.LFCLKSRC = nrf.CLOCK_LFCLKSTAT_SRC_Xtal
 	}
-	nrf.CLOCK.TASKS_LFCLKSTART.Set(1)
-	for nrf.CLOCK.EVENTS_LFCLKSTARTED.Get() == 0 {
+	nrf.CLOCK.TASKS_LFCLKSTART = 1
+	for nrf.CLOCK.EVENTS_LFCLKSTARTED == 0 {
 	}
-	nrf.CLOCK.EVENTS_LFCLKSTARTED.Set(0)
+	nrf.CLOCK.EVENTS_LFCLKSTARTED = 0
 }
 
 func initRTC() {
-	nrf.RTC1.TASKS_START.Set(1)
+	nrf.RTC1.TASKS_START = 1
 	arm.SetPriority(nrf.IRQ_RTC1, 0xc0) // low priority
 	arm.EnableIRQ(nrf.IRQ_RTC1)
 }
@@ -72,7 +72,7 @@ var (
 // overflow the counter, leading to incorrect results. This might be fixed by
 // handling the overflow event.
 func ticks() timeUnit {
-	rtcCounter := uint32(nrf.RTC1.COUNTER.Get())
+	rtcCounter := uint32(nrf.RTC1.COUNTER)
 	offset := (rtcCounter - rtcLastCounter) & 0xffffff // change since last measurement
 	rtcLastCounter = rtcCounter
 	timestamp += timeUnit(offset) // TODO: not precise
@@ -85,7 +85,7 @@ type isrFlag bool
 var rtc_wakeup isrFlag
 
 func rtc_sleep(ticks uint32) {
-	nrf.RTC1.INTENSET.Set(nrf.RTC_INTENSET_COMPARE0)
+	nrf.RTC1.INTENSET = nrf.RTC_INTENSET_COMPARE0
 	rtc_wakeup = false
 	if ticks == 1 {
 		// Race condition (even in hardware) at ticks == 1.
@@ -93,7 +93,7 @@ func rtc_sleep(ticks uint32) {
 		// describes.
 		ticks = 2
 	}
-	nrf.RTC1.CC[0].Set((nrf.RTC1.COUNTER.Get() + ticks) & 0x00ffffff)
+	nrf.RTC1.CC[0] = (nrf.RTC1.COUNTER + nrf.RegValue(ticks)) & 0x00ffffff
 	for !rtc_wakeup {
 		arm.Asm("wfi")
 	}
@@ -101,7 +101,7 @@ func rtc_sleep(ticks uint32) {
 
 //go:export RTC1_IRQHandler
 func handleRTC1() {
-	nrf.RTC1.INTENCLR.Set(nrf.RTC_INTENSET_COMPARE0)
-	nrf.RTC1.EVENTS_COMPARE[0].Set(0)
+	nrf.RTC1.INTENCLR = nrf.RTC_INTENSET_COMPARE0
+	nrf.RTC1.EVENTS_COMPARE[0] = 0
 	rtc_wakeup = true
 }

src/runtime/runtime_stm32f103xx.go

@@ -21,33 +21,33 @@ func putchar(c byte) {
 
 // initCLK sets clock to 72MHz using HSE 8MHz crystal w/ PLL X 9 (8MHz x 9 = 72MHz).
 func initCLK() {
-	stm32.FLASH.ACR.SetBits(stm32.FLASH_ACR_LATENCY_2)    // Two wait states, per datasheet
-	stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_PPRE1_DIV_2)    // prescale PCLK1 = HCLK/2
-	stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_PPRE2_DIV_NONE) // prescale PCLK2 = HCLK/1
-	stm32.RCC.CR.SetBits(stm32.RCC_CR_HSEON)              // enable HSE clock
+	stm32.FLASH.ACR |= stm32.FLASH_ACR_LATENCY_2    // Two wait states, per datasheet
+	stm32.RCC.CFGR |= stm32.RCC_CFGR_PPRE1_DIV_2    // prescale PCLK1 = HCLK/2
+	stm32.RCC.CFGR |= stm32.RCC_CFGR_PPRE2_DIV_NONE // prescale PCLK2 = HCLK/1
+	stm32.RCC.CR |= stm32.RCC_CR_HSEON              // enable HSE clock
 
 	// wait for the HSEREADY flag
-	for !stm32.RCC.CR.HasBits(stm32.RCC_CR_HSERDY) {
+	for (stm32.RCC.CR & stm32.RCC_CR_HSERDY) == 0 {
 	}
 
-	stm32.RCC.CR.SetBits(stm32.RCC_CR_HSION) // enable HSI clock
+	stm32.RCC.CR |= stm32.RCC_CR_HSION // enable HSI clock
 
 	// wait for the HSIREADY flag
-	for !stm32.RCC.CR.HasBits(stm32.RCC_CR_HSIRDY) {
+	for (stm32.RCC.CR & stm32.RCC_CR_HSIRDY) == 0 {
 	}
 
-	stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_PLLSRC)   // set PLL source to HSE
-	stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_PLLMUL_9) // multiply by 9
-	stm32.RCC.CR.SetBits(stm32.RCC_CR_PLLON)        // enable the PLL
+	stm32.RCC.CFGR |= stm32.RCC_CFGR_PLLSRC   // set PLL source to HSE
+	stm32.RCC.CFGR |= stm32.RCC_CFGR_PLLMUL_9 // multiply by 9
+	stm32.RCC.CR |= stm32.RCC_CR_PLLON        // enable the PLL
 
 	// wait for the PLLRDY flag
-	for !stm32.RCC.CR.HasBits(stm32.RCC_CR_PLLRDY) {
+	for (stm32.RCC.CR & stm32.RCC_CR_PLLRDY) == 0 {
 	}
 
-	stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_SW_PLL) // set clock source to pll
+	stm32.RCC.CFGR |= stm32.RCC_CFGR_SW_PLL // set clock source to pll
 
 	// wait for PLL to be CLK
-	for !stm32.RCC.CFGR.HasBits(stm32.RCC_CFGR_SWS_PLL) {
+	for (stm32.RCC.CFGR & stm32.RCC_CFGR_SWS_PLL) == 0 {
 	}
 }
 
@@ -65,43 +65,43 @@ var timerWakeup isrFlag
 
 func initRTC() {
 	// Enable the PWR and BKP.
-	stm32.RCC.APB1ENR.SetBits(stm32.RCC_APB1ENR_PWREN | stm32.RCC_APB1ENR_BKPEN)
+	stm32.RCC.APB1ENR |= stm32.RCC_APB1ENR_PWREN | stm32.RCC_APB1ENR_BKPEN
 
 	// access to backup register
-	stm32.PWR.CR.SetBits(stm32.PWR_CR_DBP)
+	stm32.PWR.CR |= stm32.PWR_CR_DBP
 
 	// Enable LSE
-	stm32.RCC.BDCR.SetBits(stm32.RCC_BDCR_LSEON)
+	stm32.RCC.BDCR |= stm32.RCC_BDCR_LSEON
 
 	// wait until LSE is ready
-	for !stm32.RCC.BDCR.HasBits(stm32.RCC_BDCR_LSERDY) {
+	for stm32.RCC.BDCR&stm32.RCC_BDCR_LSERDY == 0 {
 	}
 
 	// Select LSE
-	stm32.RCC.BDCR.SetBits(stm32.RCC_RTCCLKSource_LSE)
+	stm32.RCC.BDCR |= stm32.RCC_RTCCLKSource_LSE
 
 	// set prescaler to "max" per datasheet
-	stm32.RTC.PRLH.Set(stm32.RTC_PRLH_PRLH_Msk)
-	stm32.RTC.PRLL.Set(stm32.RTC_PRLL_PRLL_Msk)
+	stm32.RTC.PRLH = stm32.RTC_PRLH_PRLH_Msk
+	stm32.RTC.PRLL = stm32.RTC_PRLL_PRLL_Msk
 
 	// set count to zero
-	stm32.RTC.CNTH.Set(0x0)
-	stm32.RTC.CNTL.Set(0x0)
+	stm32.RTC.CNTH = 0x0
+	stm32.RTC.CNTL = 0x0
 
 	// Enable RTC
-	stm32.RCC.BDCR.SetBits(stm32.RCC_BDCR_RTCEN)
+	stm32.RCC.BDCR |= stm32.RCC_BDCR_RTCEN
 
 	// Clear RSF
-	stm32.RTC.CRL.ClearBits(stm32.RTC_CRL_RSF)
+	stm32.RTC.CRL &^= stm32.RTC_CRL_RSF
 
 	// Wait till flag is set
-	for !stm32.RTC.CRL.HasBits(stm32.RTC_CRL_RSF) {
+	for stm32.RTC.CRL&stm32.RTC_CRL_RSF == 0 {
 	}
 }
 
 // Enable the TIM3 clock.
 func initTIM() {
-	stm32.RCC.APB1ENR.SetBits(stm32.RCC_APB1ENR_TIM3EN)
+	stm32.RCC.APB1ENR |= stm32.RCC_APB1ENR_TIM3EN
 
 	arm.SetPriority(stm32.IRQ_TIM3, 0xc3)
 	arm.EnableIRQ(stm32.IRQ_TIM3)
@@ -122,10 +122,10 @@ func sleepTicks(d timeUnit) {
 // number of ticks (microseconds) since start.
 func ticks() timeUnit {
 	// convert RTC counter from seconds to microseconds
-	timerCounter := uint64(stm32.RTC.CNTH.Get()<<16|stm32.RTC.CNTL.Get()) * 1000 * 1000
+	timerCounter := uint64(stm32.RTC.CNTH<<16|stm32.RTC.CNTL) * 1000 * 1000
 
 	// add the fractional part of current time using DIV register
-	timerCounter += uint64(0x8000-stm32.RTC.DIVL.Get()) * 31
+	timerCounter += uint64(0x8000-stm32.RTC.DIVL) * 31
 
 	// change since last measurement
 	offset := (timerCounter - timerLastCounter)
@@ -165,16 +165,16 @@ func timerSleep(ticks uint32) {
 	// The current scaling only supports a range of 100 usec to 6553 msec.
 
 	// prescale counter down from 72mhz to 10khz aka 0.1 ms frequency.
-	stm32.TIM3.PSC.Set(machine.CPU_FREQUENCY/10000 - 1) // 7199
+	stm32.TIM3.PSC = machine.CPU_FREQUENCY/10000 - 1 // 7199
 
 	// set duty aka duration
-	stm32.TIM3.ARR.Set(ticks/100 - 1) // convert from microseconds to 0.1 ms
+	stm32.TIM3.ARR = stm32.RegValue(ticks/100) - 1 // convert from microseconds to 0.1 ms
 
 	// Enable the hardware interrupt.
-	stm32.TIM3.DIER.SetBits(stm32.TIM_DIER_UIE)
+	stm32.TIM3.DIER |= stm32.TIM_DIER_UIE
 
 	// Enable the timer.
-	stm32.TIM3.CR1.SetBits(stm32.TIM_CR1_CEN)
+	stm32.TIM3.CR1 |= stm32.TIM_CR1_CEN
 
 	// wait till timer wakes up
 	for !timerWakeup {
@@ -184,12 +184,12 @@ func timerSleep(ticks uint32) {
 
 //go:export TIM3_IRQHandler
 func handleTIM3() {
-	if stm32.TIM3.SR.HasBits(stm32.TIM_SR_UIF) {
+	if (stm32.TIM3.SR & stm32.TIM_SR_UIF) > 0 {
 		// Disable the timer.
-		stm32.TIM3.CR1.ClearBits(stm32.TIM_CR1_CEN)
+		stm32.TIM3.CR1 &^= stm32.TIM_CR1_CEN
 
 		// clear the update flag
-		stm32.TIM3.SR.ClearBits(stm32.TIM_SR_UIF)
+		stm32.TIM3.SR &^= stm32.TIM_SR_UIF
 
 		// timer was triggered
 		timerWakeup = true

src/runtime/runtime_stm32f407.go

@@ -42,59 +42,58 @@ func initCLK() {
 
 	// Reset clock registers
 	// Set HSION
-	stm32.RCC.CR.SetBits(stm32.RCC_CR_HSION)
-	for !stm32.RCC.CR.HasBits(stm32.RCC_CR_HSIRDY) {
+	stm32.RCC.CR |= stm32.RCC_CR_HSION
+	for (stm32.RCC.CR & stm32.RCC_CR_HSIRDY) == 0 {
 	}
 
 	// Reset CFGR
-	stm32.RCC.CFGR.Set(0x00000000)
+	stm32.RCC.CFGR = 0x00000000
 	// Reset HSEON, CSSON and PLLON
-	stm32.RCC.CR.ClearBits(stm32.RCC_CR_HSEON | stm32.RCC_CR_CSSON | stm32.RCC_CR_PLLON)
+	stm32.RCC.CR &= 0xFEF6FFFF
 	// Reset PLLCFGR
-	stm32.RCC.PLLCFGR.Set(0x24003010)
+	stm32.RCC.PLLCFGR = 0x24003010
 	// Reset HSEBYP
-	stm32.RCC.CR.ClearBits(stm32.RCC_CR_HSEBYP)
+	stm32.RCC.CR &= 0xFFFBFFFF
 	// Disable all interrupts
-	stm32.RCC.CIR.Set(0x00000000)
+	stm32.RCC.CIR = 0x00000000
 
 	// Set up the clock
 	var startupCounter uint32 = 0
 
 	// Enable HSE
-	stm32.RCC.CR.Set(stm32.RCC_CR_HSEON)
-
+	stm32.RCC.CR = stm32.RCC_CR_HSEON
 	// Wait till HSE is ready and if timeout is reached exit
 	for {
 		startupCounter++
-		if stm32.RCC.CR.HasBits(stm32.RCC_CR_HSERDY) || (startupCounter == HSE_STARTUP_TIMEOUT) {
+		if (stm32.RCC.CR&stm32.RCC_CR_HSERDY != 0) || (startupCounter == HSE_STARTUP_TIMEOUT) {
 			break
 		}
 	}
-	if stm32.RCC.CR.HasBits(stm32.RCC_CR_HSERDY) {
+	if (stm32.RCC.CR & stm32.RCC_CR_HSERDY) != 0 {
 		// Enable high performance mode, System frequency up to 168MHz
-		stm32.RCC.APB1ENR.SetBits(stm32.RCC_APB1ENR_PWREN)
-		stm32.PWR.CR.SetBits(0x4000) // PWR_CR_VOS
+		stm32.RCC.APB1ENR |= stm32.RCC_APB1ENR_PWREN
+		stm32.PWR.CR |= 0x4000 // PWR_CR_VOS
 		// HCLK = SYSCLK / 1
-		stm32.RCC.CFGR.SetBits(0x0 << stm32.RCC_CFGR_HPRE_Pos)
+		stm32.RCC.CFGR |= (0x0 << stm32.RCC_CFGR_HPRE_Pos)
 		// PCLK2 = HCLK / 2
-		stm32.RCC.CFGR.SetBits(0x4 << stm32.RCC_CFGR_PPRE2_Pos)
+		stm32.RCC.CFGR |= (0x4 << stm32.RCC_CFGR_PPRE2_Pos)
 		// PCLK1 = HCLK / 4
-		stm32.RCC.CFGR.SetBits(0x5 << stm32.RCC_CFGR_PPRE1_Pos)
+		stm32.RCC.CFGR |= (0x5 << stm32.RCC_CFGR_PPRE1_Pos)
 		// Configure the main PLL
 		// PLL Options - See RM0090 Reference Manual pg. 95
-		stm32.RCC.PLLCFGR.Set(PLL_M | (PLL_N << 6) | (((PLL_P >> 1) - 1) << 16) |
-			(1 << stm32.RCC_PLLCFGR_PLLSRC_Pos) | (PLL_Q << 24))
+		stm32.RCC.PLLCFGR = PLL_M | (PLL_N << 6) | (((PLL_P >> 1) - 1) << 16) |
+			(1 << stm32.RCC_PLLCFGR_PLLSRC_Pos) | (PLL_Q << 24)
 		// Enable main PLL
-		stm32.RCC.CR.SetBits(stm32.RCC_CR_PLLON)
+		stm32.RCC.CR |= stm32.RCC_CR_PLLON
 		// Wait till the main PLL is ready
-		for (stm32.RCC.CR.Get() & stm32.RCC_CR_PLLRDY) == 0 {
+		for (stm32.RCC.CR & stm32.RCC_CR_PLLRDY) == 0 {
 		}
 		// Configure Flash prefetch, Instruction cache, Data cache and wait state
-		stm32.FLASH.ACR.Set(stm32.FLASH_ACR_ICEN | stm32.FLASH_ACR_DCEN | (5 << stm32.FLASH_ACR_LATENCY_Pos))
+		stm32.FLASH.ACR = stm32.FLASH_ACR_ICEN | stm32.FLASH_ACR_DCEN | (5 << stm32.FLASH_ACR_LATENCY_Pos)
 		// Select the main PLL as system clock source
-		stm32.RCC.CFGR.ClearBits(stm32.RCC_CFGR_SW0 | stm32.RCC_CFGR_SW1)
-		stm32.RCC.CFGR.SetBits(0x2 << stm32.RCC_CFGR_SW0_Pos)
-		for (stm32.RCC.CFGR.Get() & (0x3 << stm32.RCC_CFGR_SWS0_Pos)) != (0x2 << stm32.RCC_CFGR_SWS0_Pos) {
+		stm32.RCC.CFGR &^= stm32.RCC_CFGR_SW0 | stm32.RCC_CFGR_SW1
+		stm32.RCC.CFGR |= (0x2 << stm32.RCC_CFGR_SW0_Pos)
+		for (stm32.RCC.CFGR & (0x3 << stm32.RCC_CFGR_SWS0_Pos)) != (0x2 << stm32.RCC_CFGR_SWS0_Pos) {
 		}
 
 	} else {
@@ -103,7 +102,7 @@ func initCLK() {
 		}
 	}
 	// Enable the CCM RAM clock
-	stm32.RCC.AHB1ENR.SetBits(1 << 20)
+	stm32.RCC.AHB1ENR |= (1 << 20)
 
 }
 
@@ -121,7 +120,7 @@ var timerWakeup isrFlag
 
 // Enable the TIM3 clock.(sleep count)
 func initTIM3() {
-	stm32.RCC.APB1ENR.SetBits(stm32.RCC_APB1ENR_TIM3EN)
+	stm32.RCC.APB1ENR |= stm32.RCC_APB1ENR_TIM3EN
 
 	arm.SetPriority(stm32.IRQ_TIM3, 0xc3)
 	arm.EnableIRQ(stm32.IRQ_TIM3)
@@ -129,17 +128,17 @@ func initTIM3() {
 
 // Enable the TIM7 clock.(tick count)
 func initTIM7() {
-	stm32.RCC.APB1ENR.SetBits(stm32.RCC_APB1ENR_TIM7EN)
+	stm32.RCC.APB1ENR |= stm32.RCC_APB1ENR_TIM7EN
 
 	// CK_INT = APB1 x2 = 84mhz
-	stm32.TIM7.PSC.Set(84000000/10000 - 1) // 84mhz to 10khz(0.1ms)
-	stm32.TIM7.ARR.Set(10 - 1)             // interrupt per 1ms
+	stm32.TIM7.PSC = 84000000/10000 - 1     // 84mhz to 10khz(0.1ms)
+	stm32.TIM7.ARR = stm32.RegValue(10) - 1 // interrupt per 1ms
 
 	// Enable the hardware interrupt.
-	stm32.TIM7.DIER.SetBits(stm32.TIM_DIER_UIE)
+	stm32.TIM7.DIER |= stm32.TIM_DIER_UIE
 
 	// Enable the timer.
-	stm32.TIM7.CR1.SetBits(stm32.TIM_CR1_CEN)
+	stm32.TIM7.CR1 |= stm32.TIM_CR1_CEN
 
 	arm.SetPriority(stm32.IRQ_TIM7, 0xc1)
 	arm.EnableIRQ(stm32.IRQ_TIM7)
@@ -164,20 +163,20 @@ func timerSleep(ticks uint32) {
 
 	// CK_INT = APB1 x2 = 84mhz
 	// prescale counter down from 84mhz to 10khz aka 0.1 ms frequency.
-	stm32.TIM3.PSC.Set(84000000/10000 - 1) // 8399
+	stm32.TIM3.PSC = 84000000/10000 - 1 // 8399
 
 	// set duty aka duration
 	arr := (ticks / 100) - 1 // convert from microseconds to 0.1 ms
 	if arr == 0 {
 		arr = 1 // avoid blocking
 	}
-	stm32.TIM3.ARR.Set(arr)
+	stm32.TIM3.ARR = stm32.RegValue(arr)
 
 	// Enable the hardware interrupt.
-	stm32.TIM3.DIER.SetBits(stm32.TIM_DIER_UIE)
+	stm32.TIM3.DIER |= stm32.TIM_DIER_UIE
 
 	// Enable the timer.
-	stm32.TIM3.CR1.SetBits(stm32.TIM_CR1_CEN)
+	stm32.TIM3.CR1 |= stm32.TIM_CR1_CEN
 
 	// wait till timer wakes up
 	for !timerWakeup {
@@ -187,12 +186,12 @@ func timerSleep(ticks uint32) {
 
 //go:export TIM3_IRQHandler
 func handleTIM3() {
-	if stm32.TIM3.SR.HasBits(stm32.TIM_SR_UIF) {
+	if (stm32.TIM3.SR & stm32.TIM_SR_UIF) > 0 {
 		// Disable the timer.
-		stm32.TIM3.CR1.ClearBits(stm32.TIM_CR1_CEN)
+		stm32.TIM3.CR1 &^= stm32.TIM_CR1_CEN
 
 		// clear the update flag
-		stm32.TIM3.SR.ClearBits(stm32.TIM_SR_UIF)
+		stm32.TIM3.SR &^= stm32.TIM_SR_UIF
 
 		// timer was triggered
 		timerWakeup = true
@@ -201,9 +200,9 @@ func handleTIM3() {
 
 //go:export TIM7_IRQHandler
 func handleTIM7() {
-	if stm32.TIM7.SR.HasBits(stm32.TIM_SR_UIF) {
+	if (stm32.TIM7.SR & stm32.TIM_SR_UIF) > 0 {
 		// clear the update flag
-		stm32.TIM7.SR.ClearBits(stm32.TIM_SR_UIF)
+		stm32.TIM7.SR &^= stm32.TIM_SR_UIF
 		tickCount++
 	}
 }

src/runtime/runtime_unix.go

@@ -18,9 +18,6 @@ func malloc(size uintptr) unsafe.Pointer
 //go:export abort
 func abort()
 
-//go:export exit
-func exit(code int)
-
 //go:export clock_gettime
 func clock_gettime(clk_id uint, ts *timespec)
 
@@ -78,8 +75,3 @@ func monotime() uint64 {
 func ticks() timeUnit {
 	return timeUnit(monotime())
 }
-
-//go:linkname syscall_Exit syscall.Exit
-func syscall_Exit(code int) {
-	exit(code)
-}

src/runtime/runtime_wasm.go

@@ -37,16 +37,9 @@ func putchar(c byte) {
 	resource_write(stdout, &c, 1)
 }
 
-var handleEvent func()
-
 //go:linkname setEventHandler syscall/js.setEventHandler
 func setEventHandler(fn func()) {
-	handleEvent = fn
-}
-
-//go:export resume
-func resume() {
-	handleEvent()
+	// TODO
 }
 
 //go:export go_scheduler

src/runtime/scheduler.go

@@ -120,9 +120,6 @@ func setTaskPromisePtr(task *coroutine, value unsafe.Pointer) {
 // getTaskPromisePtr is a helper function to get the current .ptr field from a
 // coroutine promise.
 func getTaskPromisePtr(task *coroutine) unsafe.Pointer {
-	if task == nil {
-		blockingPanic()
-	}
 	return task.promise().ptr
 }
 

src/runtime/string.go

@@ -166,10 +166,9 @@ func decodeUTF8(s string, index uintptr) (rune, uintptr) {
 	}
 }
 
-// indexByteString returns the index of the first instance of c in s, or -1 if c
-// is not present in s.
-//go:linkname indexByteString internal/bytealg.IndexByteString
-func indexByteString(s string, c byte) int {
+// indexByte returns the index of the first instance of c in s, or -1 if c is not present in s.
+//go:linkname indexByte strings.IndexByte
+func indexByte(s string, c byte) int {
 	for i := 0; i < len(s); i++ {
 		if s[i] == c {
 			return i

src/runtime/strings_go111.go

@@ -1,12 +0,0 @@
-// +build !go1.12
-
-package runtime
-
-// indexByte provides compatibility with Go 1.11.
-// See the following:
-// https://github.com/tinygo-org/tinygo/issues/351
-// https://github.com/golang/go/commit/ad4a58e31501bce5de2aad90a620eaecdc1eecb8
-//go:linkname indexByte strings.IndexByte
-func indexByte(s string, c byte) int {
-	return indexByteString(s, c)
-}

src/runtime/volatile/volatile.go

@@ -1,34 +0,0 @@
-// Package volatile provides definitions for volatile loads and stores. These
-// are implemented as compiler builtins.
-//
-// The load operations load a volatile value. The store operations store to a
-// volatile value. The compiler will emit exactly one load or store operation
-// when possible and will not reorder volatile operations. However, the compiler
-// may move other operations across load/store operations, so make sure that all
-// relevant loads/stores are done in a volatile way if this is a problem.
-//
-// These loads and stores are commonly used to read/write values from memory
-// mapped peripheral devices. They do not provide atomicity, use the sync/atomic
-// package for that.
-//
-// For more details: https://llvm.org/docs/LangRef.html#volatile-memory-accesses
-// and https://blog.regehr.org/archives/28.
-package volatile
-
-// LoadUint8 loads the volatile value *addr.
-func LoadUint8(addr *uint8) (val uint8)
-
-// LoadUint16 loads the volatile value *addr.
-func LoadUint16(addr *uint16) (val uint16)
-
-// LoadUint32 loads the volatile value *addr.
-func LoadUint32(addr *uint32) (val uint32)
-
-// StoreUint8 stores val to the volatile value *addr.
-func StoreUint8(addr *uint8, val uint8)
-
-// StoreUint16 stores val to the volatile value *addr.
-func StoreUint16(addr *uint16, val uint16)
-
-// StoreUint32 stores val to the volatile value *addr.
-func StoreUint32(addr *uint32, val uint32)

target.go

@@ -5,13 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/user"
 	"path/filepath"
 	"runtime"
-	"strconv"
 	"strings"
 )
 
@@ -24,7 +22,6 @@ type TargetSpec struct {
 	Inherits   []string `json:"inherits"`
 	Triple     string   `json:"llvm-target"`
 	CPU        string   `json:"cpu"`
-	Features   []string `json:"features"`
 	GOOS       string   `json:"goos"`
 	GOARCH     string   `json:"goarch"`
 	BuildTags  []string `json:"build-tags"`
@@ -53,7 +50,6 @@ func (spec *TargetSpec) copyProperties(spec2 *TargetSpec) {
 	if spec2.CPU != "" {
 		spec.CPU = spec2.CPU
 	}
-	spec.Features = append(spec.Features, spec2.Features...)
 	if spec2.GOOS != "" {
 		spec.GOOS = spec2.GOOS
 	}
@@ -372,26 +368,3 @@ func isGoroot(goroot string) bool {
 	_, err := os.Stat(filepath.Join(goroot, "src", "runtime", "internal", "sys", "zversion.go"))
 	return err == nil
 }
-
-// getGorootVersion returns the major and minor version for a given GOROOT path.
-// If the goroot cannot be determined, (0, 0) is returned.
-func getGorootVersion(goroot string) (major, minor int) {
-	data, err := ioutil.ReadFile(filepath.Join(goroot, "VERSION"))
-	if err != nil {
-		return
-	}
-	s := string(data)
-	if s[:2] != "go" {
-		return
-	}
-	parts := strings.Split(s[2:], ".")
-	if len(parts) < 2 {
-		return
-	}
-
-	// Ignore the errors, strconv.Atoi will return 0 on most errors and we
-	// don't really handle errors here anyway.
-	major, _ = strconv.Atoi(parts[0])
-	minor, _ = strconv.Atoi(parts[1])
-	return
-}

targets/atsamd21e18a.json

@@ -1,15 +0,0 @@
-{
-	"inherits": ["cortex-m"],
-	"llvm-target": "armv6m-none-eabi",
-	"build-tags": ["atsamd21e18", "atsamd21", "sam"],
-	"cflags": [
-		"--target=armv6m-none-eabi",
-		"-Qunused-arguments"
-	],
-	"ldflags": [
-		"-T", "targets/atsamd21.ld"
-	],
-	"extra-files": [
-		"src/device/sam/atsamd21e18a.s"
-	]
-}

targets/cortex-m.json

@@ -19,8 +19,5 @@
 	"ldflags": [
 		"--gc-sections"
 	],
-	"extra-files": [
-		"src/device/arm/cortexm.s"
-	],
 	"gdb": "arm-none-eabi-gdb"
 }

targets/feather-m0.json

@@ -1,5 +0,0 @@
-{
-    "inherits": ["atsamd21g18a"],
-    "build-tags": ["sam", "atsamd21g18a", "feather_m0"],
-    "flash": "bossac -d -i -e -w -v -R --offset=0x2000 {hex}"
-}

targets/trinket-m0.json

@@ -1,5 +0,0 @@
-{
-    "inherits": ["atsamd21e18a"],
-    "build-tags": ["sam", "atsamd21e18a", "trinket_m0"],
-    "flash": "bossac -d -i -e -w -v -R --offset=0x2000 {hex}"
-}

targets/wasm.json

@@ -13,7 +13,6 @@
 	],
 	"ldflags": [
 		"--allow-undefined",
-		"--no-threads",
 		"--export-all"
 	],
 	"emulator":      ["node", "targets/wasm_exec.js"]