WIP: support for WiFi on the ESP32-C3

builder/ar.go

@@ -5,6 +5,7 @@ import (
  "debug/elf"
  "encoding/binary"
  "errors"
+ "fmt"
  "io"
  "os"
  "path/filepath"
@@ -49,7 +50,7 @@ func makeArchive(archivePath string, objs []string) error {
  // Read the symbols and add them to the symbol table.
  dbg, err := elf.NewFile(objfile)
  if err != nil {
- return err
+ return fmt.Errorf("failed to open file %s: %w", objpath, err)
  }
  symbols, err := dbg.Symbols()
  if err != nil {
@@ -61,9 +62,8 @@ func makeArchive(archivePath string, objs []string) error {
  // Don't include local symbols (STB_LOCAL).
  continue
  }
- if elf.ST_TYPE(symbol.Info) != elf.STT_FUNC {
+ if elf.ST_TYPE(symbol.Info) != elf.STT_FUNC && elf.ST_TYPE(symbol.Info) != elf.STT_OBJECT {
  // Not a function.
- // TODO: perhaps globals variables should also be included?
  continue
  }
  // Include in archive.

builder/picolibc.go

@@ -12,7 +12,17 @@ var Picolibc = Library{
  name: "picolibc",
  cflags: func() []string {
  picolibcDir := filepath.Join(goenv.Get("TINYGOROOT"), "lib/picolibc/newlib/libc")
- return []string{"-Werror", "-Wall", "-std=gnu11", "-D_COMPILING_NEWLIB", "-nostdlibinc", "-Xclang", "-internal-isystem", "-Xclang", picolibcDir + "/include", "-I" + picolibcDir + "/tinystdio", "-I" + goenv.Get("TINYGOROOT") + "/lib/picolibc-include"}
+ return []string{
+ "-Werror",
+ "-Wall",
+ "-std=gnu11",
+ "-D_COMPILING_NEWLIB",
+ "-DTINY_STDIO",
+ "-nostdlibinc",
+ "-Xclang", "-internal-isystem", "-Xclang", picolibcDir + "/include",
+ "-I" + picolibcDir + "/tinystdio",
+ "-I" + goenv.Get("TINYGOROOT") + "/lib/picolibc-include",
+ }
  },
  sourceDir: "lib/picolibc/newlib/libc",
  sources: func(target string) []string {
@@ -21,6 +31,105 @@ var Picolibc = Library{
 }
 
 var picolibcSources = []string{
+ "../../../picolibc-stdio.c",
+
+ "tinystdio/asprintf.c",
+ "tinystdio/atod_engine.c",
+ "tinystdio/atod_ryu.c",
+ "tinystdio/atof_engine.c",
+ "tinystdio/atof_ryu.c",
+ //"tinystdio/atold_engine.c", // have_long_double and not long_double_equals_double
+ "tinystdio/clearerr.c",
+ "tinystdio/compare_exchange.c",
+ "tinystdio/dtoa_data.c",
+ "tinystdio/dtoa_engine.c",
+ "tinystdio/dtoa_ryu.c",
+ "tinystdio/ecvtbuf.c",
+ "tinystdio/ecvt.c",
+ "tinystdio/ecvt_data.c",
+ "tinystdio/ecvtfbuf.c",
+ "tinystdio/ecvtf.c",
+ "tinystdio/ecvtf_data.c",
+ "tinystdio/exchange.c",
+ //"tinystdio/fclose.c", // posix-io
+ "tinystdio/fcvtbuf.c",
+ "tinystdio/fcvt.c",
+ "tinystdio/fcvtfbuf.c",
+ "tinystdio/fcvtf.c",
+ "tinystdio/fdevopen.c",
+ //"tinystdio/fdopen.c", // posix-io
+ "tinystdio/feof.c",
+ "tinystdio/ferror.c",
+ "tinystdio/fflush.c",
+ "tinystdio/fgetc.c",
+ "tinystdio/fgets.c",
+ "tinystdio/fileno.c",
+ "tinystdio/filestrget.c",
+ "tinystdio/filestrputalloc.c",
+ "tinystdio/filestrput.c",
+ //"tinystdio/fopen.c", // posix-io
+ "tinystdio/fprintf.c",
+ "tinystdio/fputc.c",
+ "tinystdio/fputs.c",
+ "tinystdio/fread.c",
+ "tinystdio/fscanf.c",
+ "tinystdio/fseek.c",
+ "tinystdio/ftell.c",
+ "tinystdio/ftoa_data.c",
+ "tinystdio/ftoa_engine.c",
+ "tinystdio/ftoa_ryu.c",
+ "tinystdio/fwrite.c",
+ "tinystdio/gcvtbuf.c",
+ "tinystdio/gcvt.c",
+ "tinystdio/gcvtfbuf.c",
+ "tinystdio/gcvtf.c",
+ "tinystdio/getchar.c",
+ "tinystdio/gets.c",
+ "tinystdio/matchcaseprefix.c",
+ "tinystdio/perror.c",
+ //"tinystdio/posixiob.c", // posix-io
+ //"tinystdio/posixio.c", // posix-io
+ "tinystdio/printf.c",
+ "tinystdio/putchar.c",
+ "tinystdio/puts.c",
+ "tinystdio/ryu_divpow2.c",
+ "tinystdio/ryu_log10.c",
+ "tinystdio/ryu_log2pow5.c",
+ "tinystdio/ryu_pow5bits.c",
+ "tinystdio/ryu_table.c",
+ "tinystdio/ryu_umul128.c",
+ "tinystdio/scanf.c",
+ "tinystdio/setbuf.c",
+ "tinystdio/setvbuf.c",
+ //"tinystdio/sflags.c", // posix-io
+ "tinystdio/snprintf.c",
+ "tinystdio/snprintfd.c",
+ "tinystdio/snprintff.c",
+ "tinystdio/sprintf.c",
+ "tinystdio/sprintfd.c",
+ "tinystdio/sprintff.c",
+ "tinystdio/sscanf.c",
+ "tinystdio/strfromd.c",
+ "tinystdio/strfromf.c",
+ "tinystdio/strtod.c",
+ "tinystdio/strtod_l.c",
+ "tinystdio/strtof.c",
+ //"tinystdio/strtold.c", // have_long_double and not long_double_equals_double
+ //"tinystdio/strtold_l.c", // have_long_double and not long_double_equals_double
+ "tinystdio/ungetc.c",
+ "tinystdio/vasprintf.c",
+ "tinystdio/vfiprintf.c",
+ "tinystdio/vfiscanf.c",
+ "tinystdio/vfprintf.c",
+ "tinystdio/vfprintff.c",
+ "tinystdio/vfscanf.c",
+ "tinystdio/vfscanff.c",
+ "tinystdio/vprintf.c",
+ "tinystdio/vscanf.c",
+ "tinystdio/vsnprintf.c",
+ "tinystdio/vsprintf.c",
+ "tinystdio/vsscanf.c",
+
  "string/bcmp.c",
  "string/bcopy.c",
  "string/bzero.c",

cgo/cgo.go

@@ -447,11 +447,11 @@ func makePathsAbsolute(args []string, packagePath string) {
  args[i] = filepath.Join(packagePath, arg)
  }
  }
- if arg == "-I" || arg == "-L" {
+ if arg == "-I" || arg == "-L" || arg == "-T" {
  nextIsPath = true
  continue
  }
- if strings.HasPrefix(arg, "-I") || strings.HasPrefix(arg, "-L") {
+ if strings.HasPrefix(arg, "-I") || strings.HasPrefix(arg, "-L") || strings.HasPrefix(arg, "-T") {
  path := arg[2:]
  if !filepath.IsAbs(path) {
  args[i] = arg[:2] + filepath.Join(packagePath, path)

cgo/libclang.go

@@ -196,7 +196,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: p.makeDecayingASTType(argType, pos),
  })
  }
  resultType := C.tinygo_clang_getCursorResultType(c)
@@ -391,6 +391,41 @@ func (p *cgoPackage) addErrorAt(position token.Position, msg string) {
  })
 }
 
+// makeDecayingASTType does the same as makeASTType but takes care of decaying
+// types (arrays in function parameters, etc). It is otherwise identical to
+// makeASTType.
+func (p *cgoPackage) makeDecayingASTType(typ C.CXType, pos token.Pos) ast.Expr {
+ // Strip typedefs, if any.
+ underlyingType := typ
+ if underlyingType.kind == C.CXType_Typedef {
+ c := C.tinygo_clang_getTypeDeclaration(typ)
+ underlyingType = C.tinygo_clang_getTypedefDeclUnderlyingType(c)
+ // TODO: support a chain of typedefs. At the moment, it seems to get
+ // stuck in an endless loop when trying to get to the most underlying
+ // type.
+ }
+ // Check for decaying type. An example would be an array type in a
+ // parameter. This declaration:
+ // void foo(char buf[6]);
+ // is the same as this one:
+ // void foo(char *buf);
+ // But this one:
+ // void bar(char buf[6][4]);
+ // equals this:
+ // void bar(char *buf[4]);
+ // so not all array dimensions should be stripped, just the first one.
+ // TODO: there are more kinds of decaying types.
+ if underlyingType.kind == C.CXType_ConstantArray {
+ // Apply type decaying.
+ pointeeType := C.clang_getElementType(underlyingType)
+ return &ast.StarExpr{
+ Star: pos,
+ X: p.makeASTType(pointeeType, pos),
+ }
+ }
+ return p.makeASTType(typ, pos)
+}
+
 // 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 {

cgo/security.go

@@ -140,6 +140,7 @@ var validLinkerFlags = []*regexp.Regexp{
  re(`-F([^@\-].*)`),
  re(`-l([^@\-].*)`),
  re(`-L([^@\-].*)`),
+ re(`-T([^@\-].*)`),
  re(`-O`),
  re(`-O([^@\-].*)`),
  re(`-f(no-)?(pic|PIC|pie|PIE)`),
@@ -209,6 +210,7 @@ var validLinkerFlagsWithNextArg = []string{
  "-F",
  "-l",
  "-L",
+ "-T",
  "-framework",
  "-isysroot",
  "--sysroot",

compileopts/config.go

@@ -201,12 +201,20 @@ func (c *Config) RP2040BootPatch() bool {
 // preprocessing.
 func (c *Config) CFlags() []string {
  var cflags []string
+ // Compatibility CFlags.
+ cflags = append(cflags, "-I"+filepath.Join(goenv.Get("TINYGOROOT"), "src/compat/freertos/include"))
+ // CFlags for the target.
  for _, flag := range c.Target.CFlags {
  cflags = append(cflags, strings.ReplaceAll(flag, "{root}", goenv.Get("TINYGOROOT")))
  }
  if c.Target.Libc == "picolibc" {
  root := goenv.Get("TINYGOROOT")
- cflags = append(cflags, "-nostdlibinc", "-Xclang", "-internal-isystem", "-Xclang", filepath.Join(root, "lib", "picolibc", "newlib", "libc", "include"))
+ picolibcDir := filepath.Join(root, "lib", "picolibc", "newlib", "libc")
+ cflags = append(cflags,
+ "-nostdlibinc",
+ "-Xclang", "-internal-isystem", "-Xclang", filepath.Join(picolibcDir, "include"),
+ "-Xclang", "-internal-isystem", "-Xclang", filepath.Join(picolibcDir, "tinystdio"),
+ )
  cflags = append(cflags, "-I"+filepath.Join(root, "lib/picolibc-include"))
  }
  // Always emit debug information. It is optionally stripped at link time.

lib/picolibc-stdio.c

@@ -0,0 +1,12 @@
+#include <stdio.h>
+
+// Defined in the runtime package. Writes to the default console (usually, the
+// first UART or an USB-CDC device).
+int runtime_putchar(char, FILE*);
+
+// Define stdin, stdout, and stderr as a single object.
+// This object must not reside in ROM.
+static FILE __stdio = FDEV_SETUP_STREAM(runtime_putchar, NULL, NULL, _FDEV_SETUP_WRITE);
+
+// Define the underlying structs for stdin, stdout, and stderr.
+FILE *const __iob[3] = { &__stdio, &__stdio, &__stdio };

loader/goroot.go

@@ -220,6 +220,7 @@ func needsSyscallPackage(buildTags []string) bool {
 func pathsToOverride(needsSyscallPackage bool) map[string]bool {
  paths := map[string]bool{
  "/": true,
+ "compat/": false,
  "crypto/": true,
  "crypto/rand/": false,
  "device/": false,

src/compat/freertos/freertos.c

@@ -0,0 +1,6 @@
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+void freertos_callFunction(void (*function)(void *), void *parameter) {
+ function(parameter);
+}