diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/LICENSE.txt | 26 | ||||
| -rw-r--r-- | src/main/scala/Chisel/CoreUtil.scala | 4 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/LICENSE.txt b/src/LICENSE.txt new file mode 100644 index 00000000..4e91b752 --- /dev/null +++ b/src/LICENSE.txt @@ -0,0 +1,26 @@ +Chisel3 license terms + +Copyright (c) 2014 - 2016 The Regents of the University of +California (Regents). 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 + two paragraphs of disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + two paragraphs of disclaimer in the documentation and/or other materials + provided with the distribution. + * Neither the name of the Regents nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. +IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, +ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF +REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF +ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION +TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. diff --git a/src/main/scala/Chisel/CoreUtil.scala b/src/main/scala/Chisel/CoreUtil.scala index 0dc90c29..829fa8ed 100644 --- a/src/main/scala/Chisel/CoreUtil.scala +++ b/src/main/scala/Chisel/CoreUtil.scala @@ -51,8 +51,8 @@ object assert { when (!Builder.dynamicContext.currentModule.get.reset) { when(!cond) { message match { - case Some(str) => printf(s"Assertion failed: $line: $str\n") - case None => printf(s"Assertion failed: $line\n") + case Some(str) => printf(s"Assertion failed: $str\n at $line\n") + case None => printf(s"Assertion failed\n at $line\n") } pushCommand(Stop(Node(Builder.dynamicContext.currentModule.get.clock), 1)) } |