Refactor MIA blocks

src/simudator/core/processor.py

@@ -8,8 +8,8 @@ from simudator.core.breakpoint_memory import MemoryBreakpoint
 from simudator.core.breakpoint_state import StateBreakpoint
 from simudator.core.module import Module
 from simudator.core.modules.memory import Memory
-from simudator.processor.mia.bus import Bus
-from simudator.processor.mia.micro_memory import MicroMemory
+from simudator.processor.mia.modules.bus import Bus
+from simudator.processor.mia.modules.micro_memory import MicroMemory
 
 from .signal import Signal
 

src/simudator/gui/module_graphics_item/mia/__init__.py

-from simudator.gui.module_graphics_item.mia.ar_graphic import ArGraphicsItem
-from simudator.gui.module_graphics_item.mia.asr_graphic import AsrGraphicsItem
-from simudator.gui.module_graphics_item.mia.bus_graphic import BusGraphicsItem
-from simudator.gui.module_graphics_item.mia.hr_graphic import HrGraphicsItem
-from simudator.gui.module_graphics_item.mia.mia_alu_graphic import AluGraphicsItem
-from simudator.gui.module_graphics_item.mia.mia_flag_graphic import FlagGraphicsItem
-from simudator.gui.module_graphics_item.mia.mia_grx_graphic import GrxGraphicsItem
-from simudator.gui.module_graphics_item.mia.mia_ir_graphic import IrGraphicsItem
-from simudator.gui.module_graphics_item.mia.mia_memory_graphic import (
-    MiaMemoryGraphicsItem,
-)
-from simudator.gui.module_graphics_item.mia.mia_micro_memory_graphic import (
-    MicroMemoryGraphicsItem,
-)
-from simudator.gui.module_graphics_item.mia.pc_graphic import PcGraphicsItem
-from simudator.gui.module_graphics_item.mia.supc_graphic import SupcGraphicsItem
-from simudator.gui.module_graphics_item.mia.upc_graphic import uPcGraphicsItem
-
-__all__ = [
-    "MiaMemoryGraphicsItem",
-    "MicroMemoryGraphicsItem",
-    "ArGraphicsItem",
-    "PcGraphicsItem",
-    "AsrGraphicsItem",
-    "HrGraphicsItem",
-    "SupcGraphicsItem",
-    "uPcGraphicsItem",
-    "FlagGraphicsItem",
-    "BusGraphicsItem",
-    "AluGraphicsItem",
-    "GrxGraphicsItem",
-    "IrGraphicsItem",
-]

src/simudator/processor/mia/gui/__init__.py

+from .ar_graphic import ArGraphicsItem
+from .asr_graphic import AsrGraphicsItem
+from .bus_graphic import BusGraphicsItem
+from .hr_graphic import HrGraphicsItem
+from .mia_alu_graphic import AluGraphicsItem
+from .mia_flag_graphic import FlagGraphicsItem
+from .mia_grx_graphic import GrxGraphicsItem
+from .mia_ir_graphic import IrGraphicsItem
+from .mia_memory_graphic import MiaMemoryGraphicsItem
+from .mia_micro_memory_graphic import MicroMemoryGraphicsItem
+from .pc_graphic import PcGraphicsItem
+from .supc_graphic import SupcGraphicsItem
+from .upc_graphic import uPcGraphicsItem
+
+__all__ = [
+    "MiaMemoryGraphicsItem",
+    "MicroMemoryGraphicsItem",
+    "ArGraphicsItem",
+    "PcGraphicsItem",
+    "AsrGraphicsItem",
+    "HrGraphicsItem",
+    "SupcGraphicsItem",
+    "uPcGraphicsItem",
+    "FlagGraphicsItem",
+    "BusGraphicsItem",
+    "AluGraphicsItem",
+    "GrxGraphicsItem",
+    "IrGraphicsItem",
+]

src/simudator/gui/module_graphics_item/mia/mia_grx_graphic.py → src/simudator/processor/mia/gui/mia_grx_graphic.py

@@ -9,11 +9,11 @@ from qtpy.QtWidgets import (
     QGraphicsSimpleTextItem,
 )
 
-from simudator.gui.module_graphics_item.mia.bus_graphic import BusGraphicsItem
 from simudator.gui.module_graphics_item.module_graphics_item import ModuleGraphicsItem
 from simudator.gui.orientation import Orientation
 from simudator.gui.port_graphics_item import PortGraphicsItem
-from simudator.processor.mia.mia_grx import GRX
+from simudator.processor.mia.gui.bus_graphic import BusGraphicsItem
+from simudator.processor.mia.modules.mia_grx import GRX
 
 
 class GrxGraphicsItem(ModuleGraphicsItem):

src/simudator/gui/module_graphics_item/mia/mia_memory_graphic.py → src/simudator/processor/mia/gui/mia_memory_graphic.py

@@ -12,11 +12,9 @@ from qtpy.QtWidgets import (
 from simudator.core.modules import Memory
 from simudator.gui.color_scheme import ColorScheme as CS
 from simudator.gui.module_graphics_item.memory_graphic import MemoryGraphicsItem
-from simudator.gui.module_graphics_item.mia.mia_memory_content_dialog import (
-    MiaMemoryContentDialog,
-)
 from simudator.gui.orientation import Orientation
 from simudator.gui.port_graphics_item import PortGraphicsItem
+from simudator.processor.mia.gui.mia_memory_content_dialog import MiaMemoryContentDialog
 
 
 class MiaMemoryWindow(QWidget):

src/simudator/gui/module_graphics_item/mia/mia_micro_memory_graphic.py → src/simudator/processor/mia/gui/mia_micro_memory_graphic.py

 from qtpy.QtWidgets import QGraphicsRectItem, QGraphicsSimpleTextItem
 
-from simudator.gui.module_graphics_item.mia.mia_memory_graphic import (
-    MiaMemoryGraphicsItem,
-)
 from simudator.gui.orientation import Orientation
 from simudator.gui.port_graphics_item import PortGraphicsItem
-from simudator.processor.mia.micro_memory import MicroMemory
+from simudator.processor.mia.gui.mia_memory_graphic import MiaMemoryGraphicsItem
+from simudator.processor.mia.modules.micro_memory import MicroMemory
 
 
 class MicroMemoryGraphicsItem(MiaMemoryGraphicsItem):

src/simudator/processor/mia/mia.py

@@ -5,7 +5,7 @@ from simudator.core.modules import Flag
 from simudator.core.modules.register import IntegerRegister
 from simudator.core.processor import Processor, Signal
 from simudator.gui.gui import GUI
-from simudator.gui.module_graphics_item.mia import (
+from simudator.processor.mia.gui import (
     AluGraphicsItem,
     ArGraphicsItem,
     AsrGraphicsItem,
@@ -20,23 +20,23 @@ from simudator.gui.module_graphics_item.mia import (
     SupcGraphicsItem,
     uPcGraphicsItem,
 )
-from simudator.processor.mia.alu import ALU
-from simudator.processor.mia.ar import AR
-from simudator.processor.mia.asr import ASR
-from simudator.processor.mia.bus import Bus
-from simudator.processor.mia.hr import HR
-from simudator.processor.mia.ir import IR
-from simudator.processor.mia.lc import LC
-from simudator.processor.mia.mia_grx import GRX
-from simudator.processor.mia.mia_memory import MiaMemory
-from simudator.processor.mia.micro_memory import MicroMemory
-from simudator.processor.mia.micro_pc import MicroPC
+from simudator.processor.mia.modules.alu import ALU
+from simudator.processor.mia.modules.ar import AR
+from simudator.processor.mia.modules.asr import ASR
+from simudator.processor.mia.modules.bus import Bus
+from simudator.processor.mia.modules.hr import HR
+from simudator.processor.mia.modules.ir import IR
+from simudator.processor.mia.modules.lc import LC
+from simudator.processor.mia.modules.mia_grx import GRX
+from simudator.processor.mia.modules.mia_memory import MiaMemory
+from simudator.processor.mia.modules.micro_memory import MicroMemory
+from simudator.processor.mia.modules.micro_pc import MicroPC
 
 # Using a bare expect is generally bad code practice,
 # howere here we want to load the default layout if
 # anything goes wrong with loading the selected one,
 # we dont care about what went wrong
-from simudator.processor.mia.pc import PC
+from simudator.processor.mia.modules.pc import PC
 
 
 class MIA_CPU(Processor):