diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..c33f4bd77c5be7b0d6bef9c76af6d4727f898be8 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,14 @@ +before_script: + - apt-get update || echo joj + - apt-get install build-essential -y + - apt-get install zlib1g-dev + - dpkg -i debs/gnat-4.8-base_4.8.2-8ubuntu3_amd64.deb + - dpkg -i debs/libmpc2_0.9-4_amd64.deb + - dpkg -i debs/libgnat-4.8_4.8.2-8ubuntu3_amd64.deb + - dpkg -i debs/ghdl_0.33-1jessie1_amd64.deb || apt-get install -f -y + - dpkg -i debs/ghdl_0.33-1jessie1_amd64.deb +make: + script: + - make all + tags: + - debian diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..91cda80c1b4ff997c53c2ca28e0cdeb282fc07d4 --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +all: + ghdl -a --ieee=synopsys -fexplicit *.vhd + ghdl -e --ieee=synopsys -fexplicit TB_MAIN_PROCESSOR + ./tb_main_processor --stop-time=300ns --vcd=tb.vcd + +gtk: all + gtkwave tb.vcd + +clean: + rm *.o *.cf *.vcd diff --git a/mem.vhd b/mem.vhd index 7bb4b5ed6e19b3f42e84fad41d2db4b255b1e7a4..303775138d434b59a42d3f221664ad91a263ee1b 100644 --- a/mem.vhd +++ b/mem.vhd @@ -44,7 +44,7 @@ begin begin if reset = '1' then - ram <= ((others => (others=>'0'))); + ram <= (others => (others=>'0')); elsif clk'event and clk = '1' then if memwrite = '1' then