update code

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 build-*/
 *.swp
+*.swo
 *~
 tags
 TAGS
@@ -13,12 +14,17 @@ blk.bin
 *.dSYM
 scripts/toolpaths.local
 clang-format
+compile_commands.json
+.vscode
 *_BACKUP_*
 *_REMOTE_*
 *_LOCAL_*
 *_BASE_*
 *.sublime-*
+/benchmarks/
+/infra/.recipe_deps
 /out*
-/prebuilt/downloads/*
+/prebuilt/downloads/
 /prebuilt/config.mk
 /prebuilt/config.mk.bak
+/AnalysisResult/

.travis.yml

@@ -0,0 +1,27 @@
+language: c
+script: ./scripts/travis-builds.sh
+env:
+    # full magenta kernel + user space builds
+    - PROJECT=magenta-pc-x86-64
+    - PROJECT=magenta-qemu-arm64
+    - PROJECT=magenta-rpi3-arm64
+    - PROJECT=magenta-hikey960-arm64
+
+    # kernel only, no-magenta builds
+    - PROJECT=pc-x86-64-test
+    - PROJECT=qemu-virt-a53-test
+
+sudo: required
+dist: trusty
+
+cache:
+    directories:
+    - prebuilt/downloads
+    - prebuilt/configs
+
+notifications:
+    irc:
+        channels:
+            - "chat.freenode.net#fuchsia-bot"
+        skip_join: true
+        use_notice: true

LICENSE

@@ -1,9 +1,16 @@
-The Magenta Kernel (kernel/...) is under the MIT License, a copy of which
-may be found in kernel/LICENSE
+The Magenta Kernel (kernel/...) and the Magenta Scripts (scripts/...)
+are under an MIT-style license, copies of which may be found in
+kernel/LICENSE and scripts/LICENSE.
 
-The Magenta System (system/...) is under the Apache 2 License, a copy of
-which may be found in system/LICENSE
+The Third Party Components (third_party/...) are under various
+licenses (of the BSD, MIT, or Zlib style), which may be found in the
+root directory of each component, respectively.
 
-The Third Party Components (third_party/...) are under various licenses
-(of the BSD, MIT, or Zlib style), which may be found in the root directory
-of each component, respectively.
+All other components and materials, including the Magenta System
+(system/...) and Bootloader (bootloader/...), are under a BSD-style
+license, copies of which may be found in system/LICENSE and
+bootloader/LICENSE.
+
+The PATENTS file, which may be found in the same directories as the
+LICENSE files, provides additional license rights and conditions
+relating to patents.

PATENTS

@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Fuchsia project.
+
+Google hereby grants to you a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this
+section) patent license to make, have made, use, offer to sell, sell,
+import, transfer, and otherwise run, modify and propagate the contents
+of this implementation of Fuchsia, where such license applies only to
+those patent claims, both currently owned by Google and acquired in
+the future, licensable by Google that are necessarily infringed by
+this implementation. This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation. If you or your agent or exclusive licensee institute
+or order or agree to the institution of patent litigation or any other
+patent enforcement activity against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that this
+implementation of Fuchsia constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of
+Fuchsia shall terminate as of the date such litigation is filed.

README.md

@@ -1,8 +1,40 @@
-# MAGENTA REPOSITORY
+# Magenta
 
-Welcome to the Magenta repository.
+Magenta is the core platform that powers the Fuchsia OS.  Magenta is
+composed of a microkernel (source in kernel/...) as well as a small
+set of userspace services, drivers, and libraries (source in system/...)
+necessary for the system to boot, talk to hardware, load userspace
+processes and run them, etc.  Fuchsia builds a much larger OS on top
+of this foundation.
 
-The documentation is divided into
+The canonical Magenta Git repository is located
+at: https://fuchsia.googlesource.com/magenta
 
-+ [Magenta](docs/index.md) specific.
-+ [LK](docs/lk/index.md) specific.
+A read-only mirror of the code is present
+at: https://github.com/fuchsia-mirror/magenta
+
+The Magenta Kernel provides syscalls to manage processes, threads,
+virtual memory, inter-process communication, waiting on object state
+changes, and locking (via futexes).
+
+Currently there are some temporary syscalls that have been used for early
+bringup work, which will be going away in the future as the long term
+syscall API/ABI surface is finalized.  The expectation is that there will
+be 10s, not 100s of syscalls.
+
+Magenta syscalls are generally non-blocking.  The wait (one, many, set)
+family of syscalls, ioport reads, and thread sleep being the notable
+exceptions.
+
+This page is a non-comprehensive index of the magenta documentation.
+
++ [Getting Started](docs/getting_started.md)
++ [Contributing Patches](docs/contributing.md)
++ [Testing](docs/testing.md)
++ [Hacking notes](docs/hacking.md)
++ [Relationship with LK](docs/mg_and_lk.md)
++ [Kernel Objects](docs/kernel_objects.md)
++ [Process Objects](docs/objects/process.md)
++ [Thread Objects](docs/objects/thread.md)
++ [Handles](docs/handles.md)
++ [System Calls](docs/syscalls.md)

bootloader/LICENSE

@@ -0,0 +1,27 @@
+Copyright 2017 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+   * Neither the name of Google Inc. nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bootloader/NOTES.txt

@@ -0,0 +1,42 @@
+Intel Visual BIOS (on NUC) and netboot
+--------------------------------------
+This will netboot EFI apps, provided you have a DHCP server which is
+setup to give the BIOS the IP of a tftp server and a filename to grab
+from there.
+
+You must disable legacy boot for the EFI netboot option to appear.  If
+you check the "keep retrying forever" option, when your app exits, the
+BIOS will try to download it from the tftp server again, making for a
+quick build/download/test cycle
+
+
+Making tftpd work on Ubuntu with IPv4
+-------------------------------------
+sudo apt-get install tftpd-hpa
+
+Optionally make it easy to copy files to the server without sudo:
+sudo chown `who` /var/lib/tftpdboot 
+
+Edit /etc/default/tftpd-hpa so it looks more like:
+TFTP_USERNAME="tftp"
+TFTP_DIRECTORY="/var/lib/tftpboot"
+TFTP_ADDRESS=":69"
+TFTP_OPTIONS="--secure -4 -v -v -v"
+
+Removing the [::] and adding the -4 make it work reliably on IPv4 for me.
+The several -v's make it chattier in syslog which is handy if you're not
+sure the test machine is actually trying to grab files.
+
+QEMU Tips
+-------------------------------------
+USB-ETH Adapters:
+- For ASIX chipset usb adapters if you have permission issues copy the udev rules in scripts/ to /etc/udev/rules.d/
+
+E1000 local networking bridge:
+- You can create a network interface using the Linux tun/tap network device named “qemu” for the
+  qemu-e1000 target. Qemu does not need to be run with any special privileges for this, but you need
+  to create a persistent tun/tap device ahead of time (which does require you be root):
+
+  sudo apt-get install uml-utilities
+  sudo tunctl -u $USER -t qemu
+  sudo ifconfig qemu up

bootloader/README.txt

@@ -0,0 +1,35 @@
+What is This?
+-------------
+
+This project contains some experiments in software that runs on UEFI
+firmware for the purpose of exploring UEFI development and bootloader
+development.
+
+Since UEFI images are in PE32+ file format, we require that our binaries be
+position independent executables with no relocations. For the most part this
+does not require any extra effort on x86-64, but it does mean that you cannot
+statically initialize any variables that hold an address. (These addresses may
+be assigned at runtime however.)
+
+
+External Dependencies
+---------------------
+
+qemu-system-x86_64 is needed to test in emulation
+gnu parted and mtools are needed to generate the disk.img for Qemu
+
+
+Useful Resources & Documentation
+--------------------------------
+
+ACPI & UEFI Specifications
+http://www.uefi.org/specifications
+
+Intel 64 and IA-32 Architecture Manuals
+http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html
+
+Tianocore UEFI Open Source Community
+(Source for OVMF, EDK II Dev Environment, etc)
+http://www.tianocore.org/
+https://github.com/tianocore
+

bootloader/build.mk

@@ -0,0 +1,108 @@
+# Copyright 2016 The Fuchsia Authors
+#
+# Use of this source code is governed by a MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+
+ifeq ($(call TOBOOL,$(USE_CLANG)),true)
+EFI_CC		:= $(CLANG_TOOLCHAIN_PREFIX)clang
+EFI_LD		:= $(CLANG_TOOLCHAIN_PREFIX)lld-link
+else
+EFI_CC		:= $(TOOLCHAIN_PREFIX)gcc
+EFI_LD		:= $(TOOLCHAIN_PREFIX)ld
+endif
+
+EFI_CFLAGS	:= -fshort-wchar -fno-stack-protector -mno-red-zone
+EFI_CFLAGS	+= -Wall -std=c99
+EFI_CFLAGS	+= -ffreestanding -nostdinc -I$(LOCAL_DIR)/include -I$(LOCAL_DIR)/src
+EFI_CFLAGS	+= -Isystem/public -Isystem/private
+ifeq ($(call TOBOOL,$(USE_CLANG)),true)
+EFI_CFLAGS	+= --target=x86_64-windows-msvc
+else
+EFI_CFLAGS	+= -fPIE
+endif
+
+ifeq ($(call TOBOOL,$(USE_CLANG)),true)
+EFI_LDFLAGS	:= /subsystem:efi_application /entry:efi_main /libpath:out
+else
+EFI_LINKSCRIPT	:= $(LOCAL_DIR)/build/efi-x86-64.lds
+EFI_LDFLAGS	:= -nostdlib -T $(EFI_LINKSCRIPT) -pie -Lout
+endif
+
+EFI_SECTIONS	:= .text .data .reloc
+EFI_SECTIONS	:= $(patsubst %,-j %,$(EFI_SECTIONS))
+
+EFI_SO          := $(BUILDDIR)/bootloader/bootx64.so
+EFI_BOOTLOADER  := $(BUILDDIR)/bootloader/bootx64.efi
+
+# Bootloader sources
+EFI_SOURCES := \
+    $(LOCAL_DIR)/src/osboot.c \
+    $(LOCAL_DIR)/src/cmdline.c \
+    $(LOCAL_DIR)/src/magenta.c \
+    $(LOCAL_DIR)/src/legacy.c \
+    $(LOCAL_DIR)/src/misc.c \
+    $(LOCAL_DIR)/src/netboot.c \
+    $(LOCAL_DIR)/src/netifc.c \
+    $(LOCAL_DIR)/src/inet6.c \
+    $(LOCAL_DIR)/src/pci.c \
+    $(LOCAL_DIR)/src/framebuffer.c \
+    $(LOCAL_DIR)/src/device_id.c \
+
+# libxefi sources
+EFI_SOURCES += \
+    $(LOCAL_DIR)/lib/efi/guids.c \
+    $(LOCAL_DIR)/lib/xefi.c \
+    $(LOCAL_DIR)/lib/loadfile.c \
+    $(LOCAL_DIR)/lib/console-printf.c \
+    $(LOCAL_DIR)/lib/ctype.c \
+    $(LOCAL_DIR)/lib/printf.c \
+    $(LOCAL_DIR)/lib/stdlib.c \
+    $(LOCAL_DIR)/lib/string.c \
+
+EFI_OBJS := $(patsubst $(LOCAL_DIR)/%.c,$(BUILDDIR)/bootloader/%.o,$(EFI_SOURCES))
+EFI_DEPS := $(patsubst %.o,%.d,$(EFI_OBJS))
+
+$(BUILDDIR)/bootloader/%.o : $(LOCAL_DIR)/%.c
+	@$(MKDIR)
+	$(call BUILDECHO,compiling $@)
+	$(NOECHO)$(EFI_CC) -MMD -MP -o $@ -c $(EFI_CFLAGS) $<
+
+ifeq ($(call TOBOOL,$(USE_CLANG)),true)
+
+$(EFI_BOOTLOADER): $(EFI_OBJS)
+	@$(MKDIR)
+	$(call BUILDECHO,linking $@)
+	$(NOECHO)$(EFI_LD) /out:$@ $(EFI_LDFLAGS) $^
+
+else
+
+$(EFI_SO): $(EFI_OBJS)
+	@$(MKDIR)
+	$(call BUILDECHO,linking $@)
+	$(NOECHO)$(EFI_LD) -o $@ $(EFI_LDFLAGS) $^
+	$(NOECHO)if ! $(READELF) -r $@ | grep -q 'no relocations'; then \
+	    echo "error: $@ has relocations"; \
+	    $(READELF) -r $@; \
+	    rm $@; \
+	    exit 1;\
+	fi
+
+# TODO: update this to build other ARCHes
+$(EFI_BOOTLOADER): $(EFI_SO)
+	@$(MKDIR)
+	$(call BUILDECHO,building $@)
+	$(NOECHO)$(OBJCOPY) --target=pei-x86-64 --subsystem 10 $(EFI_SECTIONS) $< $@
+	$(NOECHO)if [ "`$(NM) $< | grep ' U '`" != "" ]; then echo "error: $<: undefined symbols"; $(NM) $< | grep ' U '; rm $<; exit 1; fi
+
+endif
+
+GENERATED += $(EFI_BOOTLOADER)
+EXTRA_BUILDDEPS += $(EFI_BOOTLOADER)
+
+.PHONY: gigaboot
+gigaboot: $(EFI_BOOTLOADER)
+
+-include $(EFI_DEPS)