m-labs · May 25, 2015 · May 27, 2015 · May 27, 2015 · May 27, 2015 · May 27, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -7,37 +7,37 @@ branches:
 sudo: false
 env:
   global:
-    - MSCDIR=$TRAVIS_BUILD_DIR/misoc
-    - PATH=$HOME/miniconda/bin:/usr/local/llvm-or1k/bin:$PATH
     - BUILD_SOC=1
     - secure: "DUk/Ihg8KbbzEgPF0qrHqlxU8e8eET9i/BtzNvFddIGX4HP/P2qz0nk3cVkmjuWhqJXSbC22RdKME9qqPzw6fJwJ6dpJ3OR6dDmSd7rewavq+niwxu52PVa+yK8mL4yf1terM7QQ5tIRf+yUL9qGKrZ2xyvEuRit6d4cFep43Ws="
 before_install:
   - mkdir -p $HOME/.mlabs
   - if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=0; fi
-  - . ./.travis/get-toolchain.sh
   - if [ $BUILD_SOC -ne 0 ]; then ./.travis/get-xilinx.sh; fi
-  - ./.travis/get-anaconda.sh
+  - . ./.travis/get-toolchain.sh
+  - . ./.travis/get-anaconda.sh
   - source $HOME/miniconda/bin/activate py34
-  - conda install pip coverage binstar migen cython
+  - conda install -q pip coverage binstar migen cython
   - pip install coveralls
 install:
   - conda build conda/artiq
-  - conda install $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
+  - conda install -q artiq --use-local
 script:
   - coverage run --source=artiq setup.py test
   - make -C doc/manual html
 after_success:
-  - binstar login --hostname $(hostname) --username $binstar_login --password $binstar_password
-  - binstar upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
+  - binstar -q login --hostname $(hostname) --username $binstar_login --password $binstar_password
+  - binstar -q upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
+  - binstar -q logout
   - coveralls
 notifications:
-  email: false
+  email:
+    recipients:
+      - rjordens@nist.gov
+    on_success: always
+    on_failure: never
   irc:
     channels:
       - chat.freenode.net#m-labs
     template:
       - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
       - "Build details : %{build_url}"
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/d26782523952bfa53814
diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-wget http://repo.continuum.io/miniconda/Miniconda3-3.7.3-Linux-x86_64.sh -O miniconda.sh
+export PATH=$HOME/miniconda/bin:$PATH
+wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
 bash miniconda.sh -b -p $HOME/miniconda
 hash -r
 conda config --set always_yes yes --set changeps1 no
@@ -9,4 +10,4 @@ conda info -a
 conda install conda-build jinja2
 conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION
 conda config --add channels fallen
-conda config --add channels https://conda.binstar.org/fallen/channel/dev
+conda config --add channels https://conda.anaconda.org/fallen/channel/dev
diff --git a/.travis/get-xilinx.sh b/.travis/get-xilinx.sh
@@ -24,12 +24,13 @@ echo "$secret" | gpg --passphrase-fd 0 Xilinx.lic.gpg
 mkdir -p ~/.Xilinx
 mv Xilinx.lic ~/.Xilinx/Xilinx.lic
 
-# Tell mibuild where Vivado is installed
-echo "MISOC_EXTRA_VIVADO_CMDLINE=\"-Ob vivado_path $HOME/Xilinx/Vivado\"" >> $HOME/.mlabs/build_settings.sh
-echo "MISOC_EXTRA_ISE_CMDLINE=\"-Ob ise_path $HOME/opt/Xilinx/\"" >> $HOME/.mlabs/build_settings.sh
-
-# Lie to Vivado by hooking the ioctl used to retrieve mac address for license verification
 git clone https://github.com/fallen/impersonate_macaddress
 make -C impersonate_macaddress
-echo "export MACADDR=$macaddress" >> $HOME/.mlabs/build_settings.sh
-echo "export LD_PRELOAD=$PWD/impersonate_macaddress/impersonate_macaddress.so" >> $HOME/.mlabs/build_settings.sh
+# Tell mibuild where Xilinx toolchains are installed
+# and feed it the mac address corresponding to the license
+cat > $HOME/.mlabs/build_settings.sh << EOF
+MISOC_EXTRA_VIVADO_CMDLINE="-Ob vivado_path $HOME/Xilinx/Vivado"
+MISOC_EXTRA_ISE_CMDLINE="-Ob ise_path $HOME/opt/Xilinx/"
+export MACADDR=$macaddress
+export LD_PRELOAD=$PWD/impersonate_macaddress/impersonate_macaddress.so
+EOF
diff --git a/artiq/__init__.py b/artiq/__init__.py
@@ -1,6 +1,5 @@
-from artiq.language.core import *
-from artiq.language.experiment import Experiment
-from artiq.language.db import *
-from artiq.language.units import check_unit
-from artiq.language.units import ps, ns, us, ms, s
-from artiq.language.units import Hz, kHz, MHz, GHz
+from artiq import language
+from artiq.language import *
+
+__all__ = []
+__all__.extend(language.__all__)
diff --git a/artiq/compiler/builtins.py b/artiq/compiler/builtins.py
@@ -72,6 +72,26 @@ def __init__(self, elt=None):
         ])
 
 class TException(types.TMono):
+    # All exceptions share the same internal layout:
+    #  * Pointer to the unique global with the name of the exception (str)
+    #    (which also serves as the EHABI type_info).
+    #  * File, line and column where it was raised (str, int, int).
+    #  * Message, which can contain substitutions {0}, {1} and {2} (str).
+    #  * Three 64-bit integers, parameterizing the message (int(width=64)).
+
+
+    # Keep this in sync with the function ARTIQIRGenerator.alloc_exn.
+    attributes = OrderedDict([
+        ("__name__",    TStr()),
+        ("__file__",    TStr()),
+        ("__line__",    TInt(types.TValue(32))),
+        ("__col__",     TInt(types.TValue(32))),
+        ("__message__", TStr()),
+        ("__param0__",  TInt(types.TValue(64))),
+        ("__param1__",  TInt(types.TValue(64))),
+        ("__param2__",  TInt(types.TValue(64))),
+    ])
+
     def __init__(self, name="Exception"):
         super().__init__(name)
 
@@ -170,8 +190,12 @@ def is_range(typ, elt=None):
     else:
         return types.is_mono(typ, "range")
 
-def is_exception(typ):
-    return isinstance(typ.find(), TException)
+def is_exception(typ, name=None):
+    if name is None:
+        return isinstance(typ.find(), TException)
+    else:
+        return isinstance(typ.find(), TException) and \
+            typ.name == name
 
 def is_iterable(typ):
     typ = typ.find()
@@ -189,4 +213,5 @@ def is_collection(typ):
 
 def is_allocated(typ):
     return typ.fold(False, lambda accum, typ:
-        is_list(typ) or is_str(typ) or types.is_function(typ))
+        is_list(typ) or is_str(typ) or types.is_function(typ) or
+        is_exception(typ))
diff --git a/artiq/compiler/ir.py b/artiq/compiler/ir.py
@@ -29,6 +29,13 @@ def __init__(self, inner):
 def is_option(typ):
     return isinstance(typ, TOption)
 
+class TExceptionTypeInfo(types.TMono):
+    def __init__(self):
+        super().__init__("exntypeinfo")
+
+def is_exn_typeinfo(typ):
+    return isinstance(typ, TExceptionTypeInfo)
+
 class Value:
     """
     An SSA value that keeps track of its uses.
@@ -620,7 +627,7 @@ def __init__(self, obj, attr, value, name=""):
             assert value.type == obj.type.elts[attr]
         else:
             assert value.type == obj.type.attributes[attr]
-        super().__init__([obj, value], typ, name)
+        super().__init__([obj, value], builtins.TNone(), name)
         self.attr = attr
 
     def opcode(self):
@@ -1004,7 +1011,7 @@ def __init__(self, func, args, normal, exn, name=""):
     def opcode(self):
         return "invoke"
 
-    def function(self):
+    def target_function(self):
         return self.operands[0]
 
     def arguments(self):
@@ -1038,17 +1045,24 @@ def __init__(self, name=""):
         super().__init__([], builtins.TException(), name)
         self.types = []
 
+    def clauses(self):
+        return zip(self.operands, self.types)
+
     def add_clause(self, target, typ):
         assert isinstance(target, BasicBlock)
-        assert builtins.is_exception(typ)
+        assert typ is None or builtins.is_exception(typ)
         self.operands.append(target)
-        self.types.append(typ.find())
+        self.types.append(typ.find() if typ is not None else None)
+        target.uses.add(self)
 
     def opcode(self):
         return "landingpad"
 
     def _operands_as_string(self):
         table = []
         for typ, target in zip(self.types, self.operands):
-            table.append("{} => {}".format(types.TypePrinter().name(typ), target.as_operand()))
+            if typ is None:
+                table.append("... => {}".format(target.as_operand()))
+            else:
+                table.append("{} => {}".format(types.TypePrinter().name(typ), target.as_operand()))
         return "[{}]".format(", ".join(table))
diff --git a/artiq/compiler/module.py b/artiq/compiler/module.py
@@ -33,7 +33,7 @@ def __init__(self, source_buffer, engine=None):
         escape_validator.visit(self.typedtree)
         self.artiq_ir = artiq_ir_generator.visit(self.typedtree)
         dead_code_eliminator.process(self.artiq_ir)
-        local_access_validator.process(self.artiq_ir)
+        # local_access_validator.process(self.artiq_ir)
         self.llvm_ir = llvm_ir_generator.process(self.artiq_ir)
 
     @classmethod