From 4b07c41df90ca6658251cb6b303c149f2595b8f2 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Tue, 24 May 2022 11:29:28 -0400 Subject: [PATCH] Ensure alignment of storage. --- OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm index 2f63c38e6..6e2bec4b2 100644 --- a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm +++ b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm @@ -130,7 +130,7 @@ struct TestProcessor: public CPU::MC68000Mk2::BusHandler { InstructionSet::M68k::Predecoder _decoder; - std::array _ram; + std::array _ram; std::unique_ptr _testExecutor; } @@ -138,12 +138,12 @@ struct TestProcessor: public CPU::MC68000Mk2::BusHandler { // Definitively erase any prior memory contents; // 0xce is arbitrary but hopefully easier to spot // in potential errors than e.g. 0x00 or 0xff. - _ram.fill(0xce); + _ram.fill(0xcece); // TODO: possibly, worry about resetting RAM to 0xce after tests have completed. #ifdef USE_EXECUTOR - _testExecutor = std::make_unique(_ram.data()); + _testExecutor = std::make_unique(reinterpret_cast(_ram.data())); #endif // These will accumulate a list of failing tests and associated opcodes. @@ -224,7 +224,7 @@ struct TestProcessor: public CPU::MC68000Mk2::BusHandler { - (void)testOperationClassic:(NSDictionary *)test name:(NSString *)name { struct TerminateMarker {}; - auto uniqueTest68000 = std::make_unique(_ram.data()); + auto uniqueTest68000 = std::make_unique(reinterpret_cast(_ram.data())); auto test68000 = uniqueTest68000.get(); {