Skip to content

Commit 398de2e

Browse files
committed
Small SoC modifications
1 parent ab2d590 commit 398de2e

File tree

5 files changed

+28
-9
lines changed

5 files changed

+28
-9
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ root = true
66
end_of_line = lf
77
insert_final_newline = true
88
trim_trailing_whitespace = true
9-
max_line_length = off
9+
max_line_length = 100
1010
# 4 space indentation
1111
[*.{sv, svh, v, vhd}]
1212
indent_style = space
13-
indent_size = 4
13+
indent_size = 2

fpga/src/ariane_peripherals.sv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ module ariane_peripherals #(
7474
.clk_i ( clk_i ),
7575
.rst_ni ( rst_ni ),
7676
.irq_sources_i ( irq_sources ),
77-
.eip_targets_o ( irq_o ),
77+
.eip_targets_o ( ),
7878
.external_bus_io ( reg_bus )
7979
);
80-
80+
assign irq_o = '0;
8181
// ---------------
8282
// UART
8383
// ---------------
@@ -432,4 +432,4 @@ module ariane_peripherals #(
432432
assign s_axi_spi_rlast = 1'b1;
433433
assign s_axi_spi_rvalid = 1'b1;
434434
end
435-
endmodule
435+
endmodule

fpga/src/bootrom/ariane.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#size-cells = <2>;
66
compatible = "eth,ariane-bare-dev";
77
model = "eth,ariane-bare";
8-
chosen {
9-
stdout-path = "/soc/uart@10000000:115200";
10-
};
8+
// chosen {
9+
// stdout-path = "/soc/uart@10000000:115200";
10+
// };
1111
cpus {
1212
#address-cells = <1>;
1313
#size-cells = <0>;

src/decoder.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ module decoder (
108108
if (priv_lvl_i == riscv::PRIV_LVL_S && tsr_i) begin
109109
illegal_instr = 1'b1;
110110
// do not change privilege level if this is an illegal instruction
111-
instruction_o.op = ADD;
111+
instruction_o.op = ADD;
112112
end
113113
end
114114
// MRET

src/mmu.sv

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,25 @@ module mmu #(
156156
.*
157157
);
158158

159+
ila_1 i_ila_1 (
160+
.clk(clk_i), // input wire clk
161+
.probe0({req_port_o.address_tag, req_port_o.address_index}),
162+
.probe1(req_port_o.data_req), // input wire [63:0] probe1
163+
.probe2(req_port_i.data_gnt), // input wire [0:0] probe2
164+
.probe3(req_port_i.data_rdata), // input wire [0:0] probe3
165+
.probe4(req_port_i.data_rvalid), // input wire [0:0] probe4
166+
.probe5(ptw_error), // input wire [1:0] probe5
167+
.probe6(update_vaddr), // input wire [0:0] probe6
168+
.probe7(update_ptw_itlb.valid), // input wire [0:0] probe7
169+
.probe8(update_ptw_dtlb.valid), // input wire [0:0] probe8
170+
.probe9(dtlb_lu_access), // input wire [0:0] probe9
171+
.probe10(lsu_vaddr_i), // input wire [0:0] probe10
172+
.probe11(dtlb_lu_hit), // input wire [0:0] probe11
173+
.probe12(itlb_lu_access), // input wire [0:0] probe12
174+
.probe13(icache_areq_i.fetch_vaddr), // input wire [0:0] probe13
175+
.probe14(itlb_lu_hit) // input wire [0:0] probe13
176+
);
177+
159178
//-----------------------
160179
// Instruction Interface
161180
//-----------------------

0 commit comments

Comments
 (0)