Reorganize emu cpu directory

src/CMakeLists.txt

@@ -58,12 +58,12 @@ set(
   app/emu/audio/spc700.cc
   app/emu/audio/dsp.cc
   app/emu/audio/internal/addressing.cc
-  app/emu/cpu/instructions.cc
-  app/emu/cpu/addressing.cc
+  app/emu/cpu/internal/instructions.cc
+  app/emu/cpu/internal/addressing.cc
+  app/emu/cpu/cpu.cc
   app/emu/video/ppu.cc
   app/emu/memory/dma.cc
   app/emu/memory/memory.cc
-  app/emu/cpu.cc
   app/emu/snes.cc
 )
 

src/app/emu/audio/apu.cc

@@ -7,7 +7,7 @@
 
 #include "app/emu/audio/dsp.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 
 namespace yaze {

src/app/emu/audio/apu.h

@@ -7,7 +7,7 @@
 
 #include "app/emu/audio/dsp.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 
 namespace yaze {

src/app/emu/cpu/cpu.h

@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "app/core/common.h"
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/internal/opcodes.h"
 #include "app/emu/debug/log.h"
-#include "app/emu/internal/opcodes.h"
 #include "app/emu/memory/memory.h"
 
 namespace yaze {

src/app/emu/cpu/internal/addressing.cc

@@ -1,4 +1,4 @@
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
 
 namespace yaze {
 namespace app {

src/app/emu/cpu/internal/instructions.cc

@@ -2,7 +2,7 @@
 #include <string>
 #include <vector>
 
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
 
 namespace yaze {
 namespace app {

src/app/emu/debug/asm_parser.h

@@ -8,7 +8,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "app/emu/internal/opcodes.h"
+#include "app/emu/cpu/internal/opcodes.h"
 
 namespace yaze {
 namespace app {

src/app/emu/debug/debugger.h

@@ -2,7 +2,7 @@
 #define YAZE_APP_EMU_DEBUG_DEBUGGER_H_
 
 #include "app/emu/audio/apu.h"
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
 #include "app/emu/video/ppu.h"
 
 namespace yaze {

src/app/emu/memory/mock_memory.h

@@ -4,8 +4,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "app/emu/clock.h"
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/cpu.h"
 #include "app/emu/memory/memory.h"
 
 using yaze::app::emu::Clock;

src/app/emu/snes.cc

@@ -9,8 +9,8 @@
 
 #include "app/emu/audio/apu.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/clock.h"
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/cpu.h"
 #include "app/emu/debug/debugger.h"
 #include "app/emu/memory/memory.h"
 #include "app/emu/video/ppu.h"

src/app/emu/snes.h

@@ -8,8 +8,8 @@
 
 #include "app/emu/audio/apu.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/clock.h"
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/cpu.h"
 #include "app/emu/debug/debugger.h"
 #include "app/emu/memory/dma.h"
 #include "app/emu/memory/memory.h"

src/app/emu/video/ppu.h

@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 #include "app/emu/video/ppu_registers.h"
 #include "app/rom.h"

test/CMakeLists.txt

@@ -22,9 +22,9 @@ add_executable(
   ../src/cli/patch.cc
   ../src/cli/command_handler.cc
   ../src/app/rom.cc
-  ../src/app/emu/cpu.cc
-  ../src/app/emu/cpu/instructions.cc
-  ../src/app/emu/cpu/addressing.cc
+  ../src/app/emu/cpu/cpu.cc
+  ../src/app/emu/cpu/internal/instructions.cc
+  ../src/app/emu/cpu/internal/addressing.cc
   ../src/app/emu/audio/internal/addressing.cc
   ../src/app/emu/audio/apu.cc
   ../src/app/emu/video/ppu.cc

test/emu/cpu_test.cc

@@ -1,11 +1,11 @@
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "app/emu/clock.h"
-#include "app/emu/internal/asm_parser.h"
-#include "app/emu/internal/opcodes.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/internal/opcodes.h"
+#include "app/emu/debug/asm_parser.h"
 #include "app/emu/memory/memory.h"
 #include "app/emu/memory/mock_memory.h"
 
@@ -4172,7 +4172,6 @@ TEST_F(CPUTest, XCESwitchBackAndForth) {
   EXPECT_FALSE(cpu.E);           // Emulation mode flag should be cleared
 }
 
-
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze

test/emu/ppu_test.cc

@@ -2,7 +2,7 @@
 
 #include <gmock/gmock.h>
 
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 #include "app/emu/memory/mock_memory.h"
 

test/room_object_test.cc

@@ -3,7 +3,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
+#include "app/emu/memory/memory.h"
 #include "app/emu/memory/mock_memory.h"
 #include "app/emu/video/ppu.h"
 #include "app/gfx/bitmap.h"
@@ -14,10 +15,10 @@ namespace test {
 
 TEST(DungeonObjectTest, RenderObjectsAsBitmaps) {
   app::ROM rom;
-  rom.LoadFromFile("/Users/scawful/Code/yaze/build/bin/zelda3.sfc");
+  //     rom.LoadFromFile("/Users/scawful/Code/yaze/build/bin/zelda3.sfc"));
+  // EXPECT_EQ(rom_status, absl::Status::ok());
 
   app::zelda3::dungeon::DungeonObjectRenderer renderer;
-
 }
 
 }  // namespace test