SpinalHDL 1.1.1

This commit is contained in:
Dolu1990 2017-12-30 03:36:57 +01:00
parent c3d950fb13
commit 4ed19f2cc5
2 changed files with 5 additions and 29 deletions

View File

@ -9,8 +9,8 @@ scalaVersion := "2.11.6"
EclipseKeys.withSource := true
libraryDependencies ++= Seq(
"com.github.spinalhdl" % "spinalhdl-core_2.11" % "1.1.0",
"com.github.spinalhdl" % "spinalhdl-lib_2.11" % "1.1.0",
"com.github.spinalhdl" % "spinalhdl-core_2.11" % "1.1.1",
"com.github.spinalhdl" % "spinalhdl-lib_2.11" % "1.1.1",
"org.yaml" % "snakeyaml" % "1.8"
)

View File

@ -17,35 +17,14 @@ object MuraxSim {
// def config = MuraxConfig.default.copy(onChipRamSize = 256 kB)
def config = MuraxConfig.default.copy(onChipRamSize = 4 kB, onChipRamHexFile = "src/main/ressource/hex/muraxDemo.hex")
SimConfig.allOptimisation.compile(new Murax(config)).doSim{dut =>
SimConfig.allOptimisation.compile(new Murax(config)).doSimUntilVoid{dut =>
val mainClkPeriod = (1e12/dut.config.coreFrequency.toDouble).toLong
val jtagClkPeriod = mainClkPeriod*4
val uartBaudRate = 115200
val uartBaudPeriod = (1e12/uartBaudRate).toLong
val genClock = fork{
dut.io.asyncReset #= true
dut.io.mainClk #= false
sleep(mainClkPeriod)
dut.io.asyncReset #= false
sleep(mainClkPeriod)
var cycleCounter = 0l
var lastTime = System.nanoTime()
while(true){
dut.io.mainClk #= false
sleep(mainClkPeriod/2)
dut.io.mainClk #= true
sleep(mainClkPeriod/2)
cycleCounter += 1
if(cycleCounter == 100000){
val currentTime = System.nanoTime()
// println(f"${cycleCounter/((currentTime - lastTime)*1e-9)*1e-3}%4.0f kHz")
lastTime = currentTime
cycleCounter = 0
}
}
}
val clockDomain = ClockDomain(dut.io.mainClk, dut.io.asyncReset)
clockDomain.forkStimulus(mainClkPeriod)
val tcpJtag = JtagTcp(
jtag = dut.io.jtag,
@ -89,9 +68,6 @@ object MuraxSim {
ledsFrame.repaint()
}
}
genClock.join()
}
}
}