Skip to content

Commit 0eb80e4

Browse files
rdaumrdaum
committed
Split repository up into a multi-crate structure
Separate simulator from assembly/compilation code.
1 parent ba3cbe1 commit 0eb80e4

14 files changed

Lines changed: 72 additions & 52 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
target/
22
artifacts/
33
*.vcd
4+
.idea/

‎Cargo.lock‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
[package]
2-
name = "tta-sim"
3-
version = "0.1.0"
4-
edition = "2021"
5-
6-
[lib]
7-
name = "tta_sim"
8-
path = "src/lib.rs"
9-
10-
[[bin]]
11-
name = "tta-sim"
12-
path = "src/main.rs"
13-
14-
[dependencies]
15-
marlin = { version = "0.7.2", features = ["verilog"] }
16-
tokio = { version = "1.0", features = ["full"] }
17-
eyre = "0.6"
18-
camino = "1.1"
19-
env_logger = "0.10"
20-
21-
[dev-dependencies]
22-
proptest = "1.4"
1+
[workspace]
2+
members = ["crates/tta-asm", "crates/tta-sim"]
3+
resolver = "2"

‎crates/tta-asm/Cargo.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[package]
2+
name = "tta-asm"
3+
version = "0.1.0"
4+
edition = "2021"
5+
6+
[lib]
7+
name = "tta_asm"

src/assembler.rs renamed to crates/tta-asm/src/assembler.rs

File renamed without changes.

src/dataflow.rs renamed to crates/tta-asm/src/dataflow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ impl Emitter {
345345
} else {
346346
self.output.push(
347347
instr()
348-
.src_mem_op(*addr, crate::AccessWidth::Word, 0)
348+
.src_mem_op(*addr, crate::assembler::AccessWidth::Word, 0)
349349
.dst(Unit::UNIT_REGISTER).di(reg),
350350
);
351351
}
@@ -411,7 +411,7 @@ impl Emitter {
411411
self.output.push(
412412
instr()
413413
.src(Unit::UNIT_REGISTER).si(reg)
414-
.dst_mem_op(*addr, crate::AccessWidth::Word, 0),
414+
.dst_mem_op(*addr, crate::assembler::AccessWidth::Word, 0),
415415
);
416416
}
417417
}

‎crates/tta-asm/src/lib.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
pub mod assembler;
2+
pub mod dataflow;
3+
4+
pub use assembler::{instr, AccessWidth, ALUOp, Instr, RegMode, Unit};

‎crates/tta-sim/Cargo.toml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[package]
2+
name = "tta-sim"
3+
version = "0.1.0"
4+
edition = "2021"
5+
6+
[lib]
7+
name = "tta_sim"
8+
9+
[[bin]]
10+
name = "tta-sim"
11+
path = "src/main.rs"
12+
13+
[dependencies]
14+
tta-asm = { path = "../tta-asm" }
15+
marlin = { version = "0.7.2", features = ["verilog"] }
16+
tokio = { version = "1.0", features = ["full"] }
17+
eyre = "0.6"
18+
camino = "1.1"
19+
env_logger = "0.10"
20+
21+
[dev-dependencies]
22+
proptest = "1.4"

src/lib.rs renamed to crates/tta-sim/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
pub mod assembler;
2-
pub mod dataflow;
31
pub mod simulator;
42

5-
pub use assembler::{instr, AccessWidth, ALUOp, Instr, RegMode, Unit};
3+
// Re-export tta-asm so downstream users only need one dependency.
4+
pub use tta_asm::{self, assembler, dataflow, instr, AccessWidth, ALUOp, Instr, RegMode, Unit};
5+
66
pub use simulator::{
77
create_simtop_runtime, create_tta_runtime, test_basic_reset_sequence, SimTop, SimTopHarness,
88
SramSim, TtaTestbench,

src/main.rs renamed to crates/tta-sim/src/main.rs

File renamed without changes.

0 commit comments

Comments
 (0)