move MemoryInterface and related types to crate::main_memory_and_io

crates/cpu/src/fetch.rs

@@ -8,6 +8,10 @@ use crate::{
         CpuConfigLog2FetchWidthInBytes, CpuConfigLog2L1ICacheLineCount,
         CpuConfigMaxFetchesInFlight, PhantomConstCpuConfig,
     },
+    main_memory_and_io::{
+        MemoryInterface, MemoryOperationErrorKind, MemoryOperationFinish,
+        MemoryOperationFinishKind, MemoryOperationKind, MemoryOperationStart,
+    },
     next_pc::{
         FETCH_BLOCK_ID_WIDTH, NextPcToFetchInterface, NextPcToFetchInterfaceInner, ResetStatus,
         ResetSteps, SimValueDefault,
@@ -22,51 +26,6 @@ use fayalite::{
 };
 use std::{collections::VecDeque, fmt};
 
-#[hdl]
-pub enum MemoryOperationKind {
-    Read,
-    Write,
-}
-
-#[hdl(no_static)]
-pub struct MemoryOperationStart<C: PhantomConstGet<CpuConfig> + PhantomConstCpuConfig> {
-    pub kind: MemoryOperationKind,
-    pub addr: UInt<64>,
-    pub write_data: ArrayType<UInt<8>, CpuConfigFetchWidthInBytes<C>>,
-    pub fetch_block_id: UInt<{ FETCH_BLOCK_ID_WIDTH }>, // for debugging
-    pub config: C,
-}
-
-#[hdl]
-pub enum MemoryOperationErrorKind {
-    Generic,
-}
-
-#[hdl]
-pub enum MemoryOperationFinishKind {
-    Success(MemoryOperationKind),
-    Error(MemoryOperationErrorKind),
-}
-
-#[hdl(no_static)]
-pub struct MemoryOperationFinish<C: PhantomConstGet<CpuConfig> + PhantomConstCpuConfig> {
-    pub kind: MemoryOperationFinishKind,
-    pub read_data: ArrayType<UInt<8>, CpuConfigFetchWidthInBytes<C>>,
-    pub config: C,
-}
-
-#[hdl(no_static)]
-pub struct MemoryInterface<C: PhantomConstGet<CpuConfig> + PhantomConstCpuConfig> {
-    pub start: ReadyValid<MemoryOperationStart<C>>,
-    #[hdl(flip)]
-    pub finish: ReadyValid<MemoryOperationFinish<C>>,
-    /// for debugging
-    #[hdl(flip)]
-    pub next_fetch_block_ids:
-        HdlOption<ArrayVec<UInt<{ FETCH_BLOCK_ID_WIDTH }>, CpuConfigMaxFetchesInFlight<C>>>,
-    pub config: C,
-}
-
 #[hdl(no_static)]
 pub struct FetchToDecodeInterfaceInner<C: PhantomConstGet<CpuConfig> + PhantomConstCpuConfig> {
     pub start_pc: UInt<64>,

crates/cpu/src/lib.rs

@@ -4,6 +4,7 @@ pub mod config;
 pub mod decoder;
 pub mod fetch;
 pub mod instruction;
+pub mod main_memory_and_io;
 pub mod next_pc;
 pub mod powerisa_instructions_xml;
 pub mod reg_alloc;

crates/cpu/src/main_memory_and_io.rs

@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// See Notices.txt for copyright information
+
+use crate::{
+    config::{
+        CpuConfig, CpuConfigFetchWidthInBytes, CpuConfigMaxFetchesInFlight, PhantomConstCpuConfig,
+    },
+    next_pc::FETCH_BLOCK_ID_WIDTH,
+    util::array_vec::ArrayVec,
+};
+use fayalite::{prelude::*, util::ready_valid::ReadyValid};
+
+#[hdl]
+pub enum MemoryOperationKind {
+    Read,
+    Write,
+}
+
+#[hdl(no_static)]
+pub struct MemoryOperationStart<C: PhantomConstGet<CpuConfig> + PhantomConstCpuConfig> {
+    pub kind: MemoryOperationKind,
+    pub addr: UInt<64>,
+    pub write_data: ArrayType<UInt<8>, CpuConfigFetchWidthInBytes<C>>,
+    pub fetch_block_id: UInt<{ FETCH_BLOCK_ID_WIDTH }>, // for debugging
+    pub config: C,
+}
+
+#[hdl]
+pub enum MemoryOperationErrorKind {
+    Generic,
+}
+
+#[hdl]
+pub enum MemoryOperationFinishKind {
+    Success(MemoryOperationKind),
+    Error(MemoryOperationErrorKind),
+}
+
+#[hdl(no_static)]
+pub struct MemoryOperationFinish<C: PhantomConstGet<CpuConfig> + PhantomConstCpuConfig> {
+    pub kind: MemoryOperationFinishKind,
+    pub read_data: ArrayType<UInt<8>, CpuConfigFetchWidthInBytes<C>>,
+    pub config: C,
+}
+
+#[hdl(no_static)]
+pub struct MemoryInterface<C: PhantomConstGet<CpuConfig> + PhantomConstCpuConfig> {
+    pub start: ReadyValid<MemoryOperationStart<C>>,
+    #[hdl(flip)]
+    pub finish: ReadyValid<MemoryOperationFinish<C>>,
+    /// for debugging
+    #[hdl(flip)]
+    pub next_fetch_block_ids:
+        HdlOption<ArrayVec<UInt<{ FETCH_BLOCK_ID_WIDTH }>, CpuConfigMaxFetchesInFlight<C>>>,
+    pub config: C,
+}

crates/cpu/tests/fetch.rs

@@ -3,10 +3,10 @@
 
 use cpu::{
     config::{CpuConfig, UnitConfig},
-    fetch::{
+    fetch::{FetchToDecodeInterface, FetchToDecodeInterfaceInner, fetch},
-        FetchToDecodeInterface, FetchToDecodeInterfaceInner, MemoryInterface,
+    main_memory_and_io::{
-        MemoryOperationErrorKind, MemoryOperationFinish, MemoryOperationFinishKind,
+        MemoryInterface, MemoryOperationErrorKind, MemoryOperationFinish,
-        MemoryOperationKind, MemoryOperationStart, fetch,
+        MemoryOperationFinishKind, MemoryOperationKind, MemoryOperationStart,
     },
     next_pc::{FETCH_BLOCK_ID_WIDTH, NextPcToFetchInterface, NextPcToFetchInterfaceInner},
     unit::UnitKind,