Skip to content

Commit 64fd3b1

Browse files
committed
Update ci.yml
1 parent d40f86a commit 64fd3b1

File tree

10 files changed

+15
-25
lines changed

10 files changed

+15
-25
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,21 @@ on:
88

99
jobs:
1010
build:
11-
1211
runs-on: ubuntu-latest
13-
1412
steps:
1513
- uses: actions/checkout@v3
1614
- name: Set up Python
1715
uses: actions/setup-python@v5
1816
with:
1917
python-version: '3.x'
20-
- name: install dependencies
18+
- name: Install python dependencies
2119
run: |
22-
sudo apt install nasm
2320
python -m pip install --upgrade pip
2421
pip install -r requirements.txt
25-
- name: Install iverilog
26-
run: |
27-
git clone https://github.com/steveicarus/iverilog.git
28-
cd iverilog
29-
./autogen.sh
30-
./configure
31-
make
32-
make install
33-
cd ..
22+
- name: Install iverilog
23+
run: |
24+
sudo apt-get update
25+
sudo apt-get install iverilog
3426
- name: make test
3527
run: make test
3628
- name: make

emulator/module/clock.v

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,4 @@ module CLOCK(
5151

5252
assign clk[0:3] = hw_clk[0:3];
5353
assign is_stage[0:3] = _is_stage[0:3];
54-
endmodule;
55-
54+
endmodule

emulator/module/mblock/mblock.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ module MBLOCK(output[31:0] out,
3232
MUX_8_2 m2(.value(out[23:16]), .A(out0[23:16]), .B(out1[23:16]), .D(out3[23:16]), .S(selector[1:0]));
3333
MUX_8_2 m3(.value(out[31:24]), .A(out0[31:24]), .B(out1[31:24]), .D(out3[31:24]), .S(selector[1:0]));
3434

35-
endmodule;
35+
endmodule

emulator/module/mblock/mconst.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ module MCONST(
66
assign out[31:16] = 16'b0000000000000000;
77
assign out[15:0] = in[15:0];
88

9-
endmodule;
9+
endmodule

emulator/module/mblock/ram.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ module RAM_32bit_16aline(output[31:0] out,
1212
end
1313
assign out = mem[address];
1414

15-
endmodule;
15+
endmodule

emulator/module/mblock/rom.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module _ROM_32bit_16aline(
1313

1414
assign out = buffer[address];
1515

16-
endmodule;
16+
endmodule
1717

1818
module ROM_BOOT(
1919
output[31:0] out,
@@ -23,4 +23,4 @@ module ROM_BOOT(
2323
_ROM_32bit_16aline #(.filename("emulator/module/mblock/rom_boot.bin"))
2424
dut(.out(out),
2525
.address(address));
26-
endmodule;
26+
endmodule

emulator/module/mblock_mux.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ module MBLOCK_MUX(output[31:0] mblock_address,
5353
MUX_8_2 m2(.value(mblock_address[23:16]), .A(address0[23:16]), .B(address1[23:16]), ,C(address2[23:16]), .D(address3[23:16]), .S(mblock_selector[1:0]));
5454
MUX_8_2 m3(.value(mblock_address[31:24]), .A(address0[31:24]), .B(address1[31:24]), ,C(address2[31:24]), .D(address3[31:24]), .S(mblock_selector[1:0]));
5555

56-
endmodule;
56+
endmodule

emulator/module/pc_next.v

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,4 @@ module PC_NEXT(
3434
.out(program_counter),
3535
.in(program_counter_next),
3636
.clk(clk));
37-
endmodule;
38-
37+
endmodule

emulator/module/stage0_ins_resolver.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ module INS_RESOLVER(output[7:0] v0, v1, v2, op,
1111
assign v2[7:0] = full_ins[23:16];
1212
assign op[7:0] = full_ins[31:24];
1313

14-
endmodule;
14+
endmodule

emulator/module/stage1or2_store.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ module FETCH_AND_STORE(output[31:0] value,
44

55
flipflop32 f(.out(value[31:0]), .in(in[31:0]), .clk(clk));
66

7-
endmodule;
7+
endmodule

0 commit comments

Comments
 (0)