From 367cb1789d22731797e3a8a64f7504b81bb636c3 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 3 Jan 2021 16:37:35 -0500 Subject: [PATCH] Starts building an x86 test. --- .../Clock Signal.xcodeproj/project.pbxproj | 6 ++ .../Mac/Clock SignalTests/x86DecoderTests.mm | 66 +++++++++++++++++++ Processors/Decoders/x86/x86.cpp | 3 + 3 files changed, 75 insertions(+) create mode 100644 OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 7abbafd64..b51a45e98 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -867,6 +867,8 @@ 4BEE149A227FC0EA00133682 /* IWM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE1498227FC0EA00133682 /* IWM.cpp */; }; 4BEE1EC022B5E236000A26A6 /* MacGCRTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE1EBF22B5E236000A26A6 /* MacGCRTests.mm */; }; 4BEE1EC122B5E2FD000A26A6 /* Encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD67DCE209BF27B00AB2146 /* Encoder.cpp */; }; + 4BEE4BD425A26E2B00011BD2 /* x86DecoderTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE4BD325A26E2B00011BD2 /* x86DecoderTests.mm */; }; + 4BEE4BE125A26F8100011BD2 /* x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B3F76AD25A0196100178AEC /* x86.cpp */; }; 4BEEE6BD20DC72EB003723BF /* CompositeOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BEEE6BB20DC72EA003723BF /* CompositeOptions.xib */; }; 4BEF6AAA1D35CE9E00E73575 /* DigitalPhaseLockedLoopBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BEF6AA91D35CE9E00E73575 /* DigitalPhaseLockedLoopBridge.mm */; }; 4BEF6AAC1D35D1C400E73575 /* DPLLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BEF6AAB1D35D1C400E73575 /* DPLLTests.swift */; }; @@ -1807,6 +1809,7 @@ 4BEE1498227FC0EA00133682 /* IWM.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = IWM.cpp; sourceTree = ""; }; 4BEE1499227FC0EA00133682 /* IWM.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = IWM.hpp; sourceTree = ""; }; 4BEE1EBF22B5E236000A26A6 /* MacGCRTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MacGCRTests.mm; sourceTree = ""; }; + 4BEE4BD325A26E2B00011BD2 /* x86DecoderTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = x86DecoderTests.mm; sourceTree = ""; }; 4BEEE6BC20DC72EA003723BF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Clock Signal/Base.lproj/CompositeOptions.xib"; sourceTree = SOURCE_ROOT; }; 4BEF6AA81D35CE9E00E73575 /* DigitalPhaseLockedLoopBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DigitalPhaseLockedLoopBridge.h; sourceTree = ""; }; 4BEF6AA91D35CE9E00E73575 /* DigitalPhaseLockedLoopBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DigitalPhaseLockedLoopBridge.mm; sourceTree = ""; }; @@ -3485,6 +3488,7 @@ 4BE76CF822641ED300ACD6FA /* QLTests.mm */, 4B2AF8681E513FC20027EE29 /* TIATests.mm */, 4B1D08051E0F7A1100763741 /* TimeTests.mm */, + 4BEE4BD325A26E2B00011BD2 /* x86DecoderTests.mm */, 4BB73EB81B587A5100552FC2 /* Info.plist */, 4BC9E1ED1D23449A003FCEE4 /* 6502InterruptTests.swift */, 4B92EAC91B7C112B00246143 /* 6502TimingTests.swift */, @@ -4967,6 +4971,7 @@ 4B4F477C253530B7004245B8 /* Jeek816Tests.swift in Sources */, 4B778F0F23A5EC560000D260 /* PCMTrack.cpp in Sources */, 4B778F1123A5EC650000D260 /* FileHolder.cpp in Sources */, + 4BEE4BE125A26F8100011BD2 /* x86.cpp in Sources */, 4B778EFC23A5EB8B0000D260 /* AcornADF.cpp in Sources */, 4B778F2023A5EDCE0000D260 /* HFV.cpp in Sources */, 4B778F3323A5F0FB0000D260 /* MassStorageDevice.cpp in Sources */, @@ -5047,6 +5052,7 @@ 4B778F2123A5EDD50000D260 /* TrackSerialiser.cpp in Sources */, 4B049CDD1DA3C82F00322067 /* BCDTest.swift in Sources */, 4B778F3923A5F11C0000D260 /* Shifter.cpp in Sources */, + 4BEE4BD425A26E2B00011BD2 /* x86DecoderTests.mm in Sources */, 4B778F3623A5F1040000D260 /* Target.cpp in Sources */, 4B1D08061E0F7A1100763741 /* TimeTests.mm in Sources */, 4B778F3D23A5F1750000D260 /* ncr5380.cpp in Sources */, diff --git a/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm b/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm new file mode 100644 index 000000000..4dab3defb --- /dev/null +++ b/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm @@ -0,0 +1,66 @@ +// +// x86DecoderTests.m +// Clock Signal +// +// Created by Thomas Harte on 03/01/2021. +// Copyright 2021 Thomas Harte. All rights reserved. +// + +#import + +#include +#include +#include "../../../Processors/Decoders/x86/x86.hpp" + +namespace { + using Operation = CPU::Decoder::x86::Operation; + using Instruction = CPU::Decoder::x86::Instruction; +} + +@interface x86DecoderTests : XCTestCase +@end + +/*! + Tests PowerPC decoding by throwing a bunch of randomly-generated + word streams and checking that the result matches what I got from a + disassembler elsewhere. +*/ +@implementation x86DecoderTests { + std::vector instructions; +} + +// MARK: - Specific instruction asserts. + +/* ... TODO ... */ + +// MARK: - Decoder + +- (void)decode:(const std::initializer_list &)stream { + CPU::Decoder::x86::Decoder decoder(CPU::Decoder::x86::Model::i8086); + + // Start with a very dumb implementation: post one byte at a time. + instructions.clear(); + for(auto item: stream) { + const auto next = decoder.decode(&item, 1); + if(next.size() > 0) { + instructions.push_back(next); + } + } +} + +// MARK: - Tests + +- (void)testSequence1 { + [self decode:{ + 0x2d, 0x77, 0xea, 0x72, 0xfc, 0x4b, 0xb5, 0x28, 0xc3, 0xca, 0x26, 0x48, 0x65, 0x6d, 0x7b, 0x9f, + 0xc2, 0x65, 0x42, 0x4e, 0xef, 0x70, 0x20, 0x94, 0xc4, 0xd4, 0x93, 0x43, 0x3c, 0x8e, 0x6a, 0x65, + 0x1a, 0x78, 0x45, 0x10, 0x7f, 0x3c, 0x19, 0x5a, 0x16, 0x31, 0x64, 0x2c, 0xe7, 0xc6, 0x7d, 0xb0, + 0xb5, 0x49, 0x67, 0x61, 0xba, 0xc0, 0xcb, 0x14, 0x7e, 0x71, 0xd0, 0x50, 0x78, 0x3d, 0x03, 0x1d, + 0xe5, 0xc9, 0x97, 0xc3, 0x9b, 0xe6, 0xd3, 0x6c, 0x58, 0x4d, 0x76, 0x80, 0x44, 0xd6, 0x9f, 0xa5, + 0xbd, 0xa1, 0x12, 0xc5, 0x29, 0xc9, 0x9e, 0xd8, 0xf3, 0xcf, 0x92, 0x39, 0x5d, 0x90, 0x15, 0xc3, + 0xb8, 0xad, 0xe8, 0xc8, 0x16, 0x4a, 0xb0, 0x9e, 0xf9, 0xbf, 0x56, 0xea, 0x4e, 0xfd, 0xe4, 0x5a, + 0x23, 0xaa, 0x2c, 0x5b, 0x2a, 0xd2, 0xf7, 0x5f, 0x18, 0x86, 0x90, 0x25, 0x64, 0xb7, 0xc3 + }]; +} + +@end diff --git a/Processors/Decoders/x86/x86.cpp b/Processors/Decoders/x86/x86.cpp index 119b7c6d0..8e9833235 100644 --- a/Processors/Decoders/x86/x86.cpp +++ b/Processors/Decoders/x86/x86.cpp @@ -12,6 +12,9 @@ using namespace CPU::Decoder::x86; +// Only 8086 is suppoted for now. +Decoder::Decoder(Model) {} + Instruction Decoder::decode(uint8_t *source, size_t length) { uint8_t *const limit = source + length;