From 825a6466ca12e6220dfb65aaa499f959caf70e6e Mon Sep 17 00:00:00 2001 From: Marno van der Maas Date: Tue, 11 Jun 2024 12:12:39 +0100 Subject: [PATCH] Cleanup comments and alignment This removes a stale to do comment and fixes the base address comment. It also aligns the module inputs and outputs. --- rtl/system/sonata_system.sv | 127 ++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 64 deletions(-) diff --git a/rtl/system/sonata_system.sv b/rtl/system/sonata_system.sv index cec3fbdf0..e01c4af95 100644 --- a/rtl/system/sonata_system.sv +++ b/rtl/system/sonata_system.sv @@ -810,72 +810,71 @@ module sonata_system #( .TSMapSize ( RevTagDepth ), .RV32B ( ibex_pkg::RV32BFull ) ) u_top_tracing ( - .clk_i (clk_sys_i), - .rst_ni(rst_core_n), - - .test_en_i (1'b0), - .scan_rst_ni(1'b1), - .ram_cfg_i (10'b0), - - .cheri_pmode_i (cheri_en), - .cheri_tsafe_en_i (cheri_en), - .cheri_err_o (cheri_err_o), - - .hart_id_i(32'b0), - // First instruction executed is at 0x0 + 0x80. - .boot_addr_i(32'h00100000), - - .instr_req_o (core_instr_req), - .instr_gnt_i (core_instr_gnt), - .instr_rvalid_i (core_instr_rvalid), - .instr_addr_o (core_instr_addr), - .instr_rdata_i (core_instr_rdata), - .instr_rdata_intg_i('0), - .instr_err_i (core_instr_err), - - .data_req_o (host_req[CoreD]), - .data_is_cap_o (), - .data_gnt_i (host_gnt[CoreD]), - .data_rvalid_i (host_rvalid[CoreD]), - .data_we_o (host_we[CoreD]), - .data_be_o (host_be[CoreD]), - .data_addr_o (host_addr[CoreD]), - .data_wdata_o (cheri_wdata), - .data_wdata_intg_o(), - .data_rdata_i (cheri_rdata), - .data_rdata_intg_i('0), - .data_err_i (host_err[CoreD]), - - // TODO fill this in once revocation is enabled. - .tsmap_cs_o (tsmap_cs), - .tsmap_addr_o (tsmap_addr), - .tsmap_rdata_i(tsmap_rdata), + .clk_i (clk_sys_i), + .rst_ni (rst_core_n), + + .test_en_i (1'b0), + .scan_rst_ni (1'b1), + .ram_cfg_i (10'b0), + + .cheri_pmode_i (cheri_en), + .cheri_tsafe_en_i (cheri_en), + .cheri_err_o (cheri_err_o), + + .hart_id_i (32'b0), + // First instruction executed is at 0x0010_0000 + 0x80. + .boot_addr_i (32'h0010_0000), + + .instr_req_o (core_instr_req), + .instr_gnt_i (core_instr_gnt), + .instr_rvalid_i (core_instr_rvalid), + .instr_addr_o (core_instr_addr), + .instr_rdata_i (core_instr_rdata), + .instr_rdata_intg_i ('0), + .instr_err_i (core_instr_err), + + .data_req_o (host_req[CoreD]), + .data_is_cap_o (), + .data_gnt_i (host_gnt[CoreD]), + .data_rvalid_i (host_rvalid[CoreD]), + .data_we_o (host_we[CoreD]), + .data_be_o (host_be[CoreD]), + .data_addr_o (host_addr[CoreD]), + .data_wdata_o (cheri_wdata), + .data_wdata_intg_o (), + .data_rdata_i (cheri_rdata), + .data_rdata_intg_i ('0), + .data_err_i (host_err[CoreD]), + + .tsmap_cs_o (tsmap_cs), + .tsmap_addr_o (tsmap_addr), + .tsmap_rdata_i (tsmap_rdata), // TODO fill this in to control hardware revocation engine. - .mmreg_corein_i (128'b0), - .mmreg_coreout_o (), - .cheri_fatal_err_o(), - - .irq_software_i(1'b0), - .irq_timer_i (timer_irq), - .irq_external_i(external_irq), - .irq_fast_i (15'b0), - .irq_nm_i (1'b0), - - .scramble_key_valid_i('0), - .scramble_key_i ('0), - .scramble_nonce_i ('0), - .scramble_req_o (), - - .debug_req_i (), - .crash_dump_o (), - .double_fault_seen_o(), - - .fetch_enable_i ('1), - .alert_minor_o (), - .alert_major_internal_o(), - .alert_major_bus_o (), - .core_sleep_o () + .mmreg_corein_i (128'b0), + .mmreg_coreout_o (), + .cheri_fatal_err_o (), + + .irq_software_i (1'b0), + .irq_timer_i (timer_irq), + .irq_external_i (external_irq), + .irq_fast_i (15'b0), + .irq_nm_i (1'b0), + + .scramble_key_valid_i ('0), + .scramble_key_i ('0), + .scramble_nonce_i ('0), + .scramble_req_o ( ), + + .debug_req_i (), + .crash_dump_o (), + .double_fault_seen_o (), + + .fetch_enable_i ('1), + .alert_minor_o ( ), + .alert_major_internal_o ( ), + .alert_major_bus_o ( ), + .core_sleep_o ( ) ); gpio #(