From 43c062225ccf88ef05d51a3c2fccb9f57e8a12c9 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Wed, 21 Feb 2024 12:32:42 +0200
Subject: Fix module issues

---
 Makefile                          |  2 +-
 atk16_emu/cli.py                  |  3 +--
 atk16_emu/emu.py                  | 22 +---------------------
 atk16_emu/test/test_opcode_alr.py |  4 ++--
 atk16_emu/test/test_opcode_hlt.py |  4 ++--
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index 00973b7..b11d03b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ bytecode-compile:
 
 # make emu in=rom.bin
 emu:
-	$(py) atk16_emu/cli.py $(in)
+	$(py) -m atk16_emu.cli $(in)
 
 # make test
 test:
diff --git a/atk16_emu/cli.py b/atk16_emu/cli.py
index dd06f67..2e4721d 100644
--- a/atk16_emu/cli.py
+++ b/atk16_emu/cli.py
@@ -1,6 +1,6 @@
 import sys
 from dataclasses import dataclass
-from emu import Machine
+from .emu import Machine
 
 @dataclass
 class Options:
@@ -47,4 +47,3 @@ machine = Machine()
 machine.load_rom_image(rom_image)
 machine.reset()
 machine.run_until_halted()
-print(machine.get_system_state())
diff --git a/atk16_emu/emu.py b/atk16_emu/emu.py
index 3c16116..680cb71 100644
--- a/atk16_emu/emu.py
+++ b/atk16_emu/emu.py
@@ -1,7 +1,7 @@
 import random
 from typing import Literal
 from dataclasses import dataclass
-from atk16_emu.opcodes import *
+from .opcodes import *
 
 class Register:
   def __init__(self, bits: int):
@@ -212,23 +212,3 @@ class Machine:
       # TODO: Implement other opcodes
 
     raise ValueError(f"Invalid instruction: {instr:>16b}")
-
-  def get_system_state(self):
-    return {
-      "running": self.running,
-
-      "ra": self.ra.value,
-      "rb": self.rb.value,
-      "rc": self.rc.value,
-      "rd": self.rd.value,
-      "re": self.re.value,
-      "rf": self.rf.value,
-      "rg": self.rg.value,
-      "rh": self.rh.value,
-
-      "pc": self.pc.value,
-      "fr": self.fr,
-
-      #"rom": self.rom.memory,
-      #"ram": self.ram.memory,
-    }
diff --git a/atk16_emu/test/test_opcode_alr.py b/atk16_emu/test/test_opcode_alr.py
index c54d70e..8561ff6 100644
--- a/atk16_emu/test/test_opcode_alr.py
+++ b/atk16_emu/test/test_opcode_alr.py
@@ -1,5 +1,5 @@
-from atk16_emu.emu import Machine
-from atk16_emu.test.utils import make_rom
+from ..emu import Machine
+from .utils import make_rom
 
 def test_alr_s0_small_unsigned():
   machine = Machine()
diff --git a/atk16_emu/test/test_opcode_hlt.py b/atk16_emu/test/test_opcode_hlt.py
index 5cae888..6991042 100644
--- a/atk16_emu/test/test_opcode_hlt.py
+++ b/atk16_emu/test/test_opcode_hlt.py
@@ -1,5 +1,5 @@
-from atk16_emu.emu import Machine
-from atk16_emu.test.utils import make_rom
+from ..emu import Machine
+from .utils import make_rom
 
 def test_hlt():
   machine = Machine()
-- 
cgit v1.3