Fixes to enable make checkstyle

DCO 1.1 Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
bu-icsg · Mar 10, 2017 · f2a893a · f2a893a
1 parent 9854580
commit f2a893a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 166 deletions.
diff --git a/Makefile b/Makefile
@@ -70,6 +70,8 @@ default: all
 
 all: tests nets
 
+SBT ?= sbt
+SBT_FLAGS ?=
 checkstyle:
 	env ROCKETCHIP_ADDONS=$(ROCKETCHIP_ADDONS) $(SBT) $(SBT_FLAGS) scalastyle test:scalastyle
 

diff --git a/project/build.scala b/project/build.scala
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 resolvers += "simplytyped" at "http://simplytyped.github.io/repo/releases"
 
-addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.7.0")
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")
 

diff --git a/scalastyle-config.xml b/scalastyle-config.xml
@@ -1,22 +1,22 @@
 <scalastyle>
  <name>Scalastyle standard configuration</name>
- <check level="warning" class="org.scalastyle.file.FileTabChecker" enabled="true"></check>
+ <check level="error" class="org.scalastyle.file.FileTabChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.file.FileLengthChecker" enabled="true">
   <parameters>
    <parameter name="maxFileLength"><![CDATA[800]]></parameter>
   </parameters>
  </check>
  <check level="warning" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true">
   <parameters>
-   <parameter name="header"><![CDATA[// See LICENSE for license details.]]></parameter>
+   <parameter name="header"><![CDATA[// See LICENSE.IBM for license details.]]></parameter>
   </parameters>
  </check>
  <check level="warning" class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.file.WhitespaceEndOfLineChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.file.FileLineLengthChecker" enabled="true">
   <parameters>
-   <parameter name="maxLineLength"><![CDATA[120]]></parameter>
+   <parameter name="maxLineLength"><![CDATA[80]]></parameter>
    <parameter name="tabSize"><![CDATA[4]]></parameter>
   </parameters>
  </check>
@@ -48,23 +48,17 @@
  </check>
  <check level="warning" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="true">
   <parameters>
-   <parameter name="ignore"><![CDATA[-1,0,1,2,8,10,16]]></parameter>
+   <parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter>
   </parameters>
  </check>
  <check level="warning" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"></check>
- <check level="warning" class="org.scalastyle.scalariform.ReturnChecker" enabled="false"></check>
- <check level="warning" class="org.scalastyle.scalariform.NullChecker" enabled="false"></check>
- <check level="warning" class="org.scalastyle.scalariform.NoCloneChecker" enabled="false"></check>
+ <check level="warning" class="org.scalastyle.scalariform.ReturnChecker" enabled="true"></check>
+ <check level="warning" class="org.scalastyle.scalariform.NullChecker" enabled="true"></check>
+ <check level="warning" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.scalariform.StructuralTypeChecker" enabled="true"></check>
- <check level="warning" class="org.scalastyle.file.RegexChecker" enabled="true">
-  <parameters>
-   <parameter name="regex"><![CDATA[;(\r|)\n]]></parameter>
-  </parameters>
-  <customMessage>No lines ending with a ;</customMessage>
- </check>
  <check level="warning" class="org.scalastyle.file.RegexChecker" enabled="true">
   <parameters>
    <parameter name="regex"><![CDATA[println]]></parameter>
@@ -96,7 +90,6 @@
  <check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="true">
   <parameters>
    <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*$]]></parameter>
-   <parameter name="ignoreRegex"><![CDATA[^(\+[&%]?|\-[&%]?|\*|/|%|&|\||\^|<|>|\|\||&&|:=|<>|<=|>=|!=|===|<<|>>|##|unary_(~|\-%?|!))$]]></parameter>
   </parameters>
  </check>
  <check level="warning" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true">

diff --git a/scalastyle-test-config.xml b/scalastyle-test-config.xml
diff --git a/src/main/scala/standalone/DebugTests.scala b/src/main/scala/standalone/DebugTests.scala
@@ -9,7 +9,8 @@ import xfiles.XFilesUserRequests
 
 class DebugTester(implicit p: Parameters) extends XFilesTester()(p) {
   // val s_INIT :: s_WRITE :: s_READ :: s_DONE :: Nil = Enum(UInt(), 4)
-  // val t_ECHO :: t_UTLW :: t_UTLR :: t_L1R :: t_L1W :: t_V2P :: Nil = Enum(UInt(), 6)
+  // val t_ECHO :: t_UTLW :: t_UTLR :: t_L1R :: t_L1W :: t_V2P :: Nil =
+  //   Enum(UInt(), 6)
   // val lastTest = t_UTLR
 
   // val state = Reg(init = s_INIT)
@@ -36,12 +37,12 @@ class DebugTester(implicit p: Parameters) extends XFilesTester()(p) {
   //   test := test + UInt(1)
   //   val r = dut.io.resp.bits.data
   //   switch (test) {
-  //     is (t_ECHO) { assert (r === UInt(data(0)), "XFiles did not echo sent data") }
+  //     is (t_ECHO) { assert(r===UInt(data(0)), "XFiles did not echo sent data") }
   //     is (t_L1W)  { }
   //     is (t_L1R)  { }
   //     is (t_V2P)  { }
   //     is (t_UTLW) { }
-  //     is (t_UTLR) { assert (r === UInt(data(2)), "XFiles read wrong data over AUTL") }
+  //     is (t_UTLR) { assert(r===UInt(data(2)), "XFiles bad read over AUTL") }
   //   }
   // }
 

diff --git a/src/main/scala/xfiles/TransactionTable.scala b/src/main/scala/xfiles/TransactionTable.scala
@@ -97,13 +97,14 @@ class XFilesTransactionTable(implicit p: Parameters) extends XFilesModule()(p)
   def getCmdAsid() = { cmd.bits.rs1(asidWidth + tidWidth - 1, tidWidth) }
   def getCmdTid() = { cmd.bits.rs1(tidWidth - 1, 0) }
 
-  def getRespCode() = { io.backend.rocc.resp.bits.data(xLen - 1, xLen - respCodeWidth) }
+  val roccRespBits = io.backend.rocc.resp.bits.data
+  def getRespCode() = { roccRespBits(xLen - 1, xLen - respCodeWidth) }
   def getRespTid() = {
     val offset = xLen - respCodeWidth
-    io.backend.rocc.resp.bits.data(offset - 1, offset - tidWidth) }
+    roccRespBits(offset - 1, offset - tidWidth) }
   def getRespAsid() = {
     val offset = xLen - respCodeWidth - tidWidth
-    io.backend.rocc.resp.bits.data(offset - 1, offset - asidWidth) }
+    roccRespBits(offset - 1, offset - asidWidth) }
 
   val numEntries = transactionTableNumEntries
 
@@ -123,7 +124,8 @@ class XFilesTransactionTable(implicit p: Parameters) extends XFilesModule()(p)
   val arbiter = Module(new RRArbiter(Bool(), numEntries)).io
 
   val idxFree = table.indexWhere(isFree(_: TableEntry))
-  val hasFree = table.exists(isFree(_: TableEntry)) && idxFree < io.status.ttable_entries
+  val hasFree = (
+    table.exists(isFree(_: TableEntry)) && idxFree < io.status.ttable_entries )
 
   val newRequest = cmd.fire() & funct === t_USR_NEW_REQUEST.U
   val writeData = cmd.fire() & funct === t_USR_WRITE_DATA.U