diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-03 20:41:22 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-03 20:41:22 +0100 |
| commit | 1b32dfecc4fd1c9d9d024bb053c43ea17021cc65 (patch) | |
| tree | a52a6527a6dd0f34f07f61c20b77b42c1d8ff720 /cpu | |
| parent | 1ff268ab13dd299c4cdc1e379df5397bd6a394e3 (diff) | |
| download | SystDigit-Projet-1b32dfecc4fd1c9d9d024bb053c43ea17021cc65.tar.gz SystDigit-Projet-1b32dfecc4fd1c9d9d024bb053c43ea17021cc65.zip | |
Monitor now works correctly.
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/Makefile | 4 | ||||
| -rw-r--r-- | cpu/example_cpu.ml | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/cpu/Makefile b/cpu/Makefile index ed59bb5..a39375b 100644 --- a/cpu/Makefile +++ b/cpu/Makefile @@ -8,10 +8,10 @@ SIM=../csim/csim MON=../monitor/mon all: _build/cpu_opt.dumb - $(MON) $(SIM) -n 8 -rom ROM0 prog_rom0.rom $< + $(MON) $(SIM) -rom ROM0 prog_rom0.rom $< %.sim: _build/%.dumb - $(SIM) $< + $(SIM) -n 12 $< _build/%.dumb _build/%.snet _build/%_opt.dumb _build/%_opt.snet: _build/%.net $(SCHED) $< diff --git a/cpu/example_cpu.ml b/cpu/example_cpu.ml index 2d60bec..e626cae 100644 --- a/cpu/example_cpu.ml +++ b/cpu/example_cpu.ml @@ -10,10 +10,13 @@ let sumz n i = let p = let width = 16 in - let sum, r = sumz width (get "in") in + let sum, r = sumz width (get "input") in program - [ "in", width ] - [ "out", width, sum; - "r", 1, r ] + [ "input", width; + "ser_in", 8 ] + [ "output", width, sum; + "r", 1, r; + "ser_busy", 1, (const "0"); + "ser_out", 8, get "ser_in"; ] let () = Netlist_gen.print stdout p |