Merge pull request #7 from harrysarson/prep-release

Prep release v0.3.1
physical-computation · Apr 1, 2019 · 20aa2b4 · 20aa2b4
2 parents becfd7c + a4a14bc
commit 20aa2b4
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,8 @@ language: rust
 rust:
   - stable
   - beta
-  - nightly
 
 matrix:
-  allow_failures:
-    - rust: nightly
   fast_finish: true
 
 cache:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Changelog
 
-## [0.4.0] - unreleased
+## [0.3.1] - unreleased
 
 - Use cargo workspaces to organise `narvie`'s crates.
+- Use Travis CI to build distributable binaries.
 
 ## [0.3.0] - 2019-03-29
 

diff --git a/README.md b/README.md
@@ -6,8 +6,11 @@ Only UNIX systems have been tested.
 
 ## Installation
 
-* [Download Rustup and install Rust](https://www.rust-lang.org/tools/install).
-* Run `$ cargo install narvie-cli`.
+Either [download a pre-built narvie binary (ubuntu linux)](https://github.com/physical-computation/narvie/releases/latest/download/narvie-cli) or build using cargo:
+
+1. [Download Rustup and install Rust](https://www.rust-lang.org/tools/install).
+2. [Install verilator](https://www.veripool.org/projects/verilator/wiki/Installing). Version 3.916 is recommended.
+3. Run `$ cargo install narvie-cli`.
 
 ## Running
 

diff --git a/documentation/eurosys2019/abstract.pdf b/documentation/eurosys2019/abstract.pdf
diff --git a/documentation/eurosys2019/poster.pdf b/documentation/eurosys2019/poster.pdf
diff --git a/processor/build.rs b/processor/build.rs
@@ -29,10 +29,10 @@ verilator \
 --cc $VERILATOR_SRC/top_sim.v $MODULES $SAIL/config.vlt \
 -I$UART_RX \
 --prefix Vnarvie \
---cc $VERILATOR_SRC/main.c $VERILATOR_SRC/testbench.c $VERILATOR_SRC/uartsim.c \
+--cc $VERILATOR_SRC/main.cpp $VERILATOR_SRC/testbench.cpp $VERILATOR_SRC/uartsim.cpp \
 --exe \
 -Mdir $OUT_DIR \
--CFLAGS "-std=c++11 -g -O3 -fPIC"
+-CFLAGS "-std=c++11 -g -O3 -fPIC -Wall -Werror"
 
 make -j -f Vnarvie.mk
 cp Vnarvie__ALL.a libvnarvie.a

diff --git a/processor/simulator-src/main.c → processor/simulator-src/main.cpp b/processor/simulator-src/main.c → processor/simulator-src/main.cpp
diff --git a/processor/simulator-src/testbench.c → processor/simulator-src/testbench.cpp b/processor/simulator-src/testbench.c → processor/simulator-src/testbench.cpp
@@ -17,7 +17,7 @@ void NarvieSimulator_init(NarvieSimulator *simulator, Vnarvie *core, UartSimulat
 	simulator->txStart = 0;
 }
 
-int NarvieSimulator_tick(NarvieSimulator *simulator)
+void NarvieSimulator_tick(NarvieSimulator *simulator)
 {
 	simulator->core->rx = UartSimulator_tick(simulator->uart, simulator->core->tx);
 

diff --git a/processor/simulator-src/testbench.h b/processor/simulator-src/testbench.h
@@ -27,7 +27,7 @@ extern "C"
 	} NarvieSimulator;
 
 	void NarvieSimulator_init(NarvieSimulator *simulator, Vnarvie *core, UartSimulator *uart);
-	int NarvieSimulator_tick(NarvieSimulator *simulator);
+	void NarvieSimulator_tick(NarvieSimulator *simulator);
 	void main_loop(int (*write)(uint8_t, void *), int (*try_read)(uint8_t *, void *), void *read_write_state);
 
 #ifdef __cplusplus

diff --git a/processor/simulator-src/uartsim.c → processor/simulator-src/uartsim.cpp b/processor/simulator-src/uartsim.c → processor/simulator-src/uartsim.cpp
@@ -25,7 +25,7 @@ void UartSimulator_init(UartSimulator *simulator, int (*write)(uint8_t, void *),
 
 int UartSimulator_tick(UartSimulator *simulator, int i_tx)
 {
-        int o_rx = 1, nr = 0;
+        int o_rx = 1;
 
         if ((!i_tx) && (simulator->last_tx))
                 simulator->rx_changectr = 0;
@@ -85,9 +85,7 @@ int UartSimulator_tick(UartSimulator *simulator, int i_tx)
                 uint8_t buf;
                 if (simulator->try_read(&buf, simulator->read_write_state) == 0)
                 {
-                        simulator->tx_data = (-1 << (8 + 0 + 1))
-                                             // << nstart_bits
-                                             | ((buf << 1) & 0x01fe);
+                        simulator->tx_data = ~0 | (buf << 1);
                         simulator->tx_busy = (1 << (8 + 0 + 1 + 1)) - 1;
                         simulator->tx_state = TXDATA;
                         o_rx = 0;

diff --git a/src/main.rs b/src/main.rs