summaryrefslogtreecommitdiff
path: root/lib/nes/sys
diff options
context:
space:
mode:
Diffstat (limited to 'lib/nes/sys')
-rw-r--r--lib/nes/sys/cartridge.cc4
-rw-r--r--lib/nes/sys/cartridge.hh4
-rw-r--r--lib/nes/sys/controller.cc4
-rw-r--r--lib/nes/sys/controller.hh4
-rw-r--r--lib/nes/sys/cpu.cc4
-rw-r--r--lib/nes/sys/cpu.hh4
-rw-r--r--lib/nes/sys/mapper.cc4
-rw-r--r--lib/nes/sys/mapper.hh4
-rw-r--r--lib/nes/sys/nes.cc4
-rw-r--r--lib/nes/sys/nes.hh6
-rw-r--r--lib/nes/sys/ppu.cc4
-rw-r--r--lib/nes/sys/ppu.hh10
-rw-r--r--lib/nes/sys/types/address.hh4
-rw-r--r--lib/nes/sys/types/button-mask.hh4
-rw-r--r--lib/nes/sys/types/cycle-count.hh4
-rw-r--r--lib/nes/sys/types/snapshot.hh4
-rw-r--r--lib/nes/sys/types/status.hh4
17 files changed, 42 insertions, 34 deletions
diff --git a/lib/nes/sys/cartridge.cc b/lib/nes/sys/cartridge.cc
index d60ea8b..9697185 100644
--- a/lib/nes/sys/cartridge.cc
+++ b/lib/nes/sys/cartridge.cc
@@ -2,7 +2,7 @@
#include "nes/sys/types/status.hh"
#include <fstream>
-namespace nes
+namespace nes::sys
{
cartridge::cartridge(status const status)
: status_{ status }
@@ -65,4 +65,4 @@ namespace nes
return from_data(data.data(), data.size());
}
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/cartridge.hh b/lib/nes/sys/cartridge.hh
index a8b61a2..d82af84 100644
--- a/lib/nes/sys/cartridge.hh
+++ b/lib/nes/sys/cartridge.hh
@@ -6,7 +6,7 @@
#include <vector>
#include <string_view>
-namespace nes
+namespace nes::sys
{
enum class name_table_arrangement
{
@@ -75,4 +75,4 @@ namespace nes
private:
explicit cartridge(status);
};
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/controller.cc b/lib/nes/sys/controller.cc
index 910ef57..92dd897 100644
--- a/lib/nes/sys/controller.cc
+++ b/lib/nes/sys/controller.cc
@@ -1,6 +1,6 @@
#include "nes/sys/controller.hh"
-namespace nes
+namespace nes::sys
{
auto controller::read() -> std::uint8_t
{
@@ -15,4 +15,4 @@ namespace nes
strobing_ = value & 1;
if (strobing_) { index_ = 0; }
}
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/controller.hh b/lib/nes/sys/controller.hh
index 441e236..d3a32fd 100644
--- a/lib/nes/sys/controller.hh
+++ b/lib/nes/sys/controller.hh
@@ -2,7 +2,7 @@
#include "nes/sys/types/button-mask.hh"
-namespace nes
+namespace nes::sys
{
class controller
{
@@ -27,4 +27,4 @@ namespace nes
auto read() -> std::uint8_t;
auto write(std::uint8_t) -> void;
};
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/cpu.cc b/lib/nes/sys/cpu.cc
index 84fbe78..8b05f66 100644
--- a/lib/nes/sys/cpu.cc
+++ b/lib/nes/sys/cpu.cc
@@ -4,7 +4,7 @@
#include "nes/sys/cartridge.hh"
#include "nes/sys/types/snapshot.hh"
-namespace nes
+namespace nes::sys
{
cpu::cpu(ppu& ppu, cartridge& cartridge, controller& controller_1, controller& controller_2)
: ppu_{ ppu }
@@ -1422,4 +1422,4 @@ namespace nes
write8(addr + 0, low);
write8(addr + 1, high);
}
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/cpu.hh b/lib/nes/sys/cpu.hh
index d0901c0..2702c20 100644
--- a/lib/nes/sys/cpu.hh
+++ b/lib/nes/sys/cpu.hh
@@ -4,7 +4,7 @@
#include "nes/sys/types/address.hh"
#include "nes/sys/types/status.hh"
-namespace nes
+namespace nes::sys
{
class ppu;
class controller;
@@ -297,4 +297,4 @@ namespace nes
template<>
auto fetch_operand<addressing_mode::immediate>(force_page_crossing) -> operand<addressing_mode::immediate>;
};
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/mapper.cc b/lib/nes/sys/mapper.cc
index 4951966..fc6ec6c 100644
--- a/lib/nes/sys/mapper.cc
+++ b/lib/nes/sys/mapper.cc
@@ -1,7 +1,7 @@
#include "nes/sys/mapper.hh"
#include "nes/sys/cartridge.hh"
-namespace nes
+namespace nes::sys
{
namespace
{
@@ -169,4 +169,4 @@ namespace nes
}
}
}
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/mapper.hh b/lib/nes/sys/mapper.hh
index e196b25..5db198b 100644
--- a/lib/nes/sys/mapper.hh
+++ b/lib/nes/sys/mapper.hh
@@ -3,7 +3,7 @@
#include "nes/sys/types/address.hh"
#include "nes/sys/types/status.hh"
-namespace nes
+namespace nes::sys
{
class cartridge;
@@ -29,4 +29,4 @@ namespace nes
protected:
explicit mapper() = default;
};
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/nes.cc b/lib/nes/sys/nes.cc
index 1504100..6caf6de 100644
--- a/lib/nes/sys/nes.cc
+++ b/lib/nes/sys/nes.cc
@@ -3,7 +3,7 @@
#include "nes/common/display.hh"
#include "nes/common/rgb.hh"
-namespace nes
+namespace nes::sys
{
nes::nes(cartridge cartridge, display& display)
: cartridge_{ std::move(cartridge) }
@@ -59,4 +59,4 @@ namespace nes
ppu_.build_snapshot(res);
return res;
}
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/nes.hh b/lib/nes/sys/nes.hh
index b421a5f..4e0fd63 100644
--- a/lib/nes/sys/nes.hh
+++ b/lib/nes/sys/nes.hh
@@ -9,6 +9,10 @@
namespace nes
{
class display;
+} // namespace nes
+
+namespace nes::sys
+{
struct snapshot;
/// The main console abstraction.
@@ -44,4 +48,4 @@ namespace nes
auto get_snapshot() -> snapshot;
};
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/ppu.cc b/lib/nes/sys/ppu.cc
index 2a5f01c..00cddbe 100644
--- a/lib/nes/sys/ppu.cc
+++ b/lib/nes/sys/ppu.cc
@@ -7,7 +7,7 @@
#include "nes/common/rgb.hh"
#include "nes/common/debug.hh"
-namespace nes
+namespace nes::sys
{
ppu::ppu(cpu& cpu, cartridge& cartridge, display& display)
: cpu_{ cpu }
@@ -694,4 +694,4 @@ namespace nes
default: return rgb::from_hex(0x000000);
}
}
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/ppu.hh b/lib/nes/sys/ppu.hh
index b1b8842..cdca0ae 100644
--- a/lib/nes/sys/ppu.hh
+++ b/lib/nes/sys/ppu.hh
@@ -4,11 +4,15 @@
namespace nes
{
+ class display;
+ class rgb;
+} // namespace nes
+
+namespace nes::sys
+{
class address;
class cpu;
class cartridge;
- class display;
- class rgb;
struct snapshot;
class ppu
@@ -276,4 +280,4 @@ namespace nes
auto ref_color(color_index) -> color&;
auto resolve_color(color) const -> rgb;
};
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/types/address.hh b/lib/nes/sys/types/address.hh
index c2e1352..dde9c94 100644
--- a/lib/nes/sys/types/address.hh
+++ b/lib/nes/sys/types/address.hh
@@ -2,7 +2,7 @@
#include <cstdint>
-namespace nes
+namespace nes::sys
{
/// An address on the NES (for simplicity, we share the same type for CPU and PPU, even though the PPU only uses
/// 14 bit addresses).
@@ -71,4 +71,4 @@ namespace nes
{
return address{ static_cast<std::uint16_t>(a.get_absolute() % b) };
}
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/types/button-mask.hh b/lib/nes/sys/types/button-mask.hh
index 94c6a2b..64be0b6 100644
--- a/lib/nes/sys/types/button-mask.hh
+++ b/lib/nes/sys/types/button-mask.hh
@@ -2,7 +2,7 @@
#include <cstdint>
-namespace nes
+namespace nes::sys
{
/// Buttons pressed on a controller.
class button_mask
@@ -41,4 +41,4 @@ namespace nes
inline constexpr auto left = button_mask::from_raw_value(1 << 6);
inline constexpr auto right = button_mask::from_raw_value(1 << 7);
} // namespace buttons
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/types/cycle-count.hh b/lib/nes/sys/types/cycle-count.hh
index f1a4a7e..95ce9e5 100644
--- a/lib/nes/sys/types/cycle-count.hh
+++ b/lib/nes/sys/types/cycle-count.hh
@@ -2,7 +2,7 @@
#include <chrono>
-namespace nes
+namespace nes::sys
{
/// A cycle count that can be used for multiple components.
///
@@ -84,4 +84,4 @@ namespace nes
constexpr auto operator*(std::uint64_t const a, cycle_count const b) -> cycle_count { return cycle_count{ a * b.get_units() }; }
constexpr auto operator*(cycle_count const a, std::uint64_t const b) -> cycle_count { return cycle_count{ a.get_units() * b }; }
constexpr auto operator/(cycle_count const a, cycle_count const b) -> std::uint64_t { return a.get_units() / b.get_units(); }
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/types/snapshot.hh b/lib/nes/sys/types/snapshot.hh
index 683e862..3b1b3b4 100644
--- a/lib/nes/sys/types/snapshot.hh
+++ b/lib/nes/sys/types/snapshot.hh
@@ -4,7 +4,7 @@
#include <vector>
#include <cstdint>
-namespace nes
+namespace nes::sys
{
/// System snapshot used for comparison with a reference implementation.
struct snapshot
@@ -60,4 +60,4 @@ namespace nes
}
inline auto operator!=(snapshot const& a, snapshot const& b) -> bool { return !(a == b); }
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
diff --git a/lib/nes/sys/types/status.hh b/lib/nes/sys/types/status.hh
index 64f5969..c622ffb 100644
--- a/lib/nes/sys/types/status.hh
+++ b/lib/nes/sys/types/status.hh
@@ -1,6 +1,6 @@
#pragma once
-namespace nes
+namespace nes::sys
{
/// A status code.
enum class status
@@ -33,4 +33,4 @@ namespace nes
return "(invalid)";
}
-} // namespace nes \ No newline at end of file
+} // namespace nes::sys \ No newline at end of file
generated by cgit v1.3.1 (git 2.54.0) at 2026-11-10 10:53:06 +0000