summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroharboe <oharboe>2008-06-18 18:20:36 +0000
committeroharboe <oharboe>2008-06-18 18:20:36 +0000
commitf7c21b8d9c790fb8f59db5030e2b8f1a9fc96246 (patch)
tree12d1611098eafe008e434820d41b161eb8a778ff
parent24d353cdac17eca4851271c824f421e8ab5697f3 (diff)
downloadzpu-f7c21b8d9c790fb8f59db5030e2b8f1a9fc96246.zip
zpu-f7c21b8d9c790fb8f59db5030e2b8f1a9fc96246.tar.gz
Miguel Freitas <mfreitas@gmail.com>
log.txt and trace.txt currently on cvs were produced by interrupt.vhd. this patch will build example_ghdl with interrupt.vhd by default so user can compare results. adds a note about what user needs to edit to simulate helloworld.vhd without interrupts.
-rw-r--r--zpu/hdl/example/sim_small_fpga_top.vhd2
-rw-r--r--zpu/hdl/example_ghdl/ghdl_import.sh5
2 files changed, 5 insertions, 2 deletions
diff --git a/zpu/hdl/example/sim_small_fpga_top.vhd b/zpu/hdl/example/sim_small_fpga_top.vhd
index 0727bea..72b2d7b 100644
--- a/zpu/hdl/example/sim_small_fpga_top.vhd
+++ b/zpu/hdl/example/sim_small_fpga_top.vhd
@@ -159,7 +159,7 @@ begin
io_reading <= '0';
dram_ready <= '0';
- interruptcounter <= to_unsigned(32, 16);
+ interruptcounter <= to_unsigned(0, 16);
interrupt <= '0';
elsif (clk'event and clk = '1') then
diff --git a/zpu/hdl/example_ghdl/ghdl_import.sh b/zpu/hdl/example_ghdl/ghdl_import.sh
index a0ae61c..b1c2713 100644
--- a/zpu/hdl/example_ghdl/ghdl_import.sh
+++ b/zpu/hdl/example_ghdl/ghdl_import.sh
@@ -4,7 +4,10 @@
mkdir -p work
ghdl -i ${IMPORT_OPTIONS} ../../hdl/example/zpu_config.vhd
ghdl -i ${IMPORT_OPTIONS} ../../hdl/zpu4/core/zpupkg.vhd
-ghdl -i ${IMPORT_OPTIONS} ../../hdl/example/helloworld.vhd
+ghdl -i ${IMPORT_OPTIONS} ../../hdl/example/interrupt.vhd
+# to execute helloworld comment interrupt.vhd above
+# and edit sim_small_fpga_top.vhd to never assert interrupts
+#ghdl -i ${IMPORT_OPTIONS} ../../hdl/example/helloworld.vhd
ghdl -i ${IMPORT_OPTIONS} ../../hdl/zpu4/src/txt_util.vhd
ghdl -i ${IMPORT_OPTIONS} ../../hdl/zpu4/src/trace.vhd
ghdl -i ${IMPORT_OPTIONS} ../../hdl/zpu4/core/zpu_core_small.vhd
OpenPOWER on IntegriCloud