diff options
| author | ducky | 2015-10-20 14:45:39 -0700 |
|---|---|---|
| committer | ducky | 2015-10-20 15:53:13 -0700 |
| commit | 032189aef5af816ec4ac72c627519e95e97fc2d7 (patch) | |
| tree | b17de6dbdaaec46b1dc9f98964da7e723eedc27a /src/main/scala/Chisel/FP.scala | |
| parent | 21caad7846c9def2a7cbccd9c9cc03c73072fba8 (diff) | |
Whitespace / comment style fixes
Diffstat (limited to 'src/main/scala/Chisel/FP.scala')
| -rw-r--r-- | src/main/scala/Chisel/FP.scala | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/src/main/scala/Chisel/FP.scala b/src/main/scala/Chisel/FP.scala index 4dd15b22..252ffdcb 100644 --- a/src/main/scala/Chisel/FP.scala +++ b/src/main/scala/Chisel/FP.scala @@ -1,32 +1,4 @@ -/* - Copyright (c) 2011, 2012, 2013, 2014 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. -*/ +// See LICENSE for license details. package Chisel import Chisel._ @@ -100,7 +72,7 @@ class Flo(dir: Direction = NO_DIR, val value:Option[FloLit] = None) extends FloB private[Chisel] def toType = "Flo" def cloneType: this.type = new Flo(dir).asInstanceOf[this.type] - def fromInt(x: Int): Flo = + def fromInt(x: Int): Flo = Flo(x.toFloat).asInstanceOf[this.type] def unary_-() = unop(FloNeg) @@ -180,7 +152,7 @@ class Dbl(dir: Direction, val value: Option[DblLit] = None) extends FloBase[Dbl] private[Chisel] def toType = "Dbl" def cloneType: this.type = new Dbl(dir).asInstanceOf[this.type] - def fromInt(x: Int): this.type = + def fromInt(x: Int): this.type = Dbl(x.toDouble).asInstanceOf[this.type] def unary_-() = unop(DblNeg) |
