0f65994955
In particular, the previous set of debug info only looked at one of the superscalar ways, assuming the 0th was always the next instruction, but there's a level of indirection to map ports to ways that was missed. But now we dump out both ways and more. And yes, I fully recognise the atrocity that is the type in use here... please forgive me. It doesn't help that bsc is buggy and gets confused about the structure of nested tuples[1]. Drops the commit debug output to only the low 32 bits of PCC's address and no instruction bits; as this has been committed it should be (and has always been observed to be) within bounds and, thus, fit in 32 bits when running in M-mode, with the instruction bits obtainable from the binary. I'd much rather know about potentially-dodgy speculative addresses than things we can reliably infer given the limited number of DMI registers free (though we could hijack other encodings if necessary). [1] https://github.com/B-Lang-org/bsc/issues/199
148 lines
4.5 KiB
Plaintext
148 lines
4.5 KiB
Plaintext
// Copyright (c) 2016-2020 Bluespec, Inc. All Rights Reserved
|
|
//
|
|
//-
|
|
// RVFI_DII + CHERI modifications:
|
|
// Copyright (c) 2020 Alexandre Joannou
|
|
// Copyright (c) 2020 Peter Rugg
|
|
// Copyright (c) 2020 Jonathan Woodruff
|
|
// All rights reserved.
|
|
//
|
|
// This software was developed by SRI International and the University of
|
|
// Cambridge Computer Laboratory (Department of Computer Science and
|
|
// Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
|
|
// DARPA SSITH research programme.
|
|
//
|
|
// This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
|
|
//-
|
|
|
|
package Proc_IFC;
|
|
|
|
// ================================================================
|
|
// BSV library imports
|
|
|
|
import Vector :: *;
|
|
import GetPut :: *;
|
|
import ClientServer :: *;
|
|
|
|
// ================================================================
|
|
// Project imports
|
|
|
|
import ISA_Decls :: *;
|
|
|
|
import AXI4 :: *;
|
|
import Fabric_Defs :: *;
|
|
import SoC_Map :: *;
|
|
|
|
`ifdef INCLUDE_GDB_CONTROL
|
|
import DM_CPU_Req_Rsp :: *;
|
|
`endif
|
|
|
|
`ifdef INCLUDE_TANDEM_VERIF
|
|
import ProcTypes :: *;
|
|
import Trace_Data2 :: *;
|
|
`endif
|
|
|
|
`ifdef RVFI_DII
|
|
import Types :: *;
|
|
`endif
|
|
|
|
`ifdef DEBUG_WEDGE
|
|
import CHERICap :: *;
|
|
import CHERICC_Fat :: *;
|
|
`endif
|
|
|
|
// ================================================================
|
|
// CPU interface
|
|
|
|
// Note: this Proc_IFC is similar, but not identical to CPU_IFC for Piccolo and Flute
|
|
// Specifically, it removes interfaces for software and timer,
|
|
// because the RISCY-OOO mkProc contains those elements.
|
|
|
|
interface Proc_IFC;
|
|
|
|
// ----------------
|
|
// Start the cores running
|
|
// Use toHostAddr = 0 if not monitoring tohost
|
|
method Action start (Bool running, Addr startpc, Addr tohostAddr, Addr fromhostAddr);
|
|
|
|
// ----------------
|
|
// SoC fabric connections
|
|
|
|
// Fabric master interface for memory (from LLC)
|
|
interface AXI4_Master_Synth #(Wd_MId, Wd_Addr, Wd_Data,
|
|
Wd_AW_User, Wd_W_User, Wd_B_User,
|
|
Wd_AR_User, Wd_R_User) master0;
|
|
|
|
// Fabric master interface for IO (from MMIOPlatform)
|
|
interface AXI4_Master #(Wd_MId_2x3, Wd_Addr, Wd_Data,
|
|
Wd_AW_User, Wd_W_User, Wd_B_User,
|
|
Wd_AR_User, Wd_R_User) master1;
|
|
|
|
// ----------------
|
|
// External interrupts
|
|
|
|
(* always_ready, always_enabled *)
|
|
method Action m_external_interrupt_req (Bool set_not_clear);
|
|
|
|
(* always_ready, always_enabled *)
|
|
method Action s_external_interrupt_req (Bool set_not_clear);
|
|
|
|
// ----------------
|
|
// Non-maskable interrupt
|
|
|
|
(* always_ready, always_enabled *)
|
|
method Action non_maskable_interrupt_req (Bool set_not_clear);
|
|
|
|
// ----------------
|
|
// Set core's verbosity
|
|
|
|
method Action set_verbosity (Bit #(4) verbosity);
|
|
|
|
// ----------------
|
|
// Coherent port into LLC (used by Debug Module, DMA engines, ... to read/write memory)
|
|
|
|
interface AXI4_Slave_Synth #(Wd_SId_2x3, Wd_Addr, Wd_Data,
|
|
Wd_AW_User, Wd_W_User, Wd_B_User,
|
|
Wd_AR_User, Wd_R_User) debug_module_mem_server;
|
|
|
|
`ifdef RVFI_DII
|
|
interface Toooba_RVFI_DII_Server rvfi_dii_server;
|
|
`endif
|
|
|
|
// ----------------
|
|
// Optional interface to Debug Module
|
|
|
|
`ifdef INCLUDE_GDB_CONTROL
|
|
interface Server #(Bool, Bool) hart0_run_halt_server;
|
|
interface Server #(DM_CPU_Req #(5, XLEN), DM_CPU_Rsp #(XLEN)) hart0_gpr_mem_server;
|
|
`ifdef ISA_F
|
|
interface Server #(DM_CPU_Req #(5, FLEN), DM_CPU_Rsp #(FLEN)) hart0_fpr_mem_server;
|
|
`endif
|
|
interface Server #(DM_CPU_Req #(12, XLEN), DM_CPU_Rsp #(XLEN)) hart0_csr_mem_server;
|
|
|
|
// Non-standard
|
|
interface Put #(Bit #(4)) hart0_put_other_req;
|
|
`endif
|
|
|
|
`ifdef INCLUDE_TANDEM_VERIF
|
|
// Note: this is a SupSize vector of streams of Trace_Data2 structs,
|
|
// each of which has a serialnum field. Each of the SupSize
|
|
// streams has serialnums in increasing order. Each serialnum
|
|
// appears exactly once in exactly one of the streams. Thus, the
|
|
// channels can easily be merged into a single program-order stream.
|
|
interface Vector #(SupSize, Get #(Trace_Data2)) v_to_TV;
|
|
`endif
|
|
|
|
`ifdef DEBUG_WEDGE
|
|
(* always_enabled *)
|
|
method Tuple2#(CapMem, Bit#(32)) hart0_last_inst;
|
|
(* always_enabled *)
|
|
method Tuple4#(Tuple3#(Bit#(32), Bit#(32), Bit#(32)), Tuple4#(CapMem, Bit#(32), CapMem, Bit#(32)), Tuple4#(CapMem, Bit#(32), CapMem, Bit#(32)), void) hart0_debug_rob;
|
|
`endif
|
|
|
|
endinterface
|
|
|
|
// ================================================================
|
|
|
|
endpackage
|