diff --git a/A2Mac.xcodeproj/project.pbxproj b/A2Mac.xcodeproj/project.pbxproj index fe785e8..0ceef1f 100644 --- a/A2Mac.xcodeproj/project.pbxproj +++ b/A2Mac.xcodeproj/project.pbxproj @@ -12,6 +12,14 @@ 325EB62F23F8856F00C6B4A4 /* woz.c in Sources */ = {isa = PBXBuildFile; fileRef = 325EB62E23F8856F00C6B4A4 /* woz.c */; }; 325EB63623F8F78300C6B4A4 /* disk.c in Sources */ = {isa = PBXBuildFile; fileRef = 325EB63523F8F78300C6B4A4 /* disk.c */; }; 325EB63923F9E48100C6B4A4 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 325EB63823F9E48100C6B4A4 /* common.c */; }; + 325EB64323FBBACF00C6B4A4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 325EB64223FBBACF00C6B4A4 /* AppDelegate.swift */; }; + 325EB64523FBBACF00C6B4A4 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 325EB64423FBBACF00C6B4A4 /* SceneDelegate.swift */; }; + 325EB64723FBBACF00C6B4A4 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 325EB64623FBBACF00C6B4A4 /* ViewController.swift */; }; + 325EB64A23FBBACF00C6B4A4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 325EB64823FBBACF00C6B4A4 /* Main.storyboard */; }; + 325EB64C23FBBAD100C6B4A4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 325EB64B23FBBAD100C6B4A4 /* Assets.xcassets */; }; + 325EB64F23FBBAD100C6B4A4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 325EB64D23FBBAD100C6B4A4 /* LaunchScreen.storyboard */; }; + 325EB65A23FBBAD100C6B4A4 /* A2iOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 325EB65923FBBAD100C6B4A4 /* A2iOSTests.swift */; }; + 325EB66523FBBAD100C6B4A4 /* A2iOSUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 325EB66423FBBAD100C6B4A4 /* A2iOSUITests.swift */; }; 3262F37623E169F8008BDB95 /* spk_dn.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3262F37423E169F8008BDB95 /* spk_dn.wav */; }; 3262F37723E169F8008BDB95 /* spk_up.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3262F37523E169F8008BDB95 /* spk_up.wav */; }; 326ED2EF232D7A0000A41337 /* 6502_functional_test.bin in Resources */ = {isa = PBXBuildFile; fileRef = 326ED2EE232D7A0000A41337 /* 6502_functional_test.bin */; }; @@ -50,6 +58,20 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 325EB65623FBBAD100C6B4A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 32BFFB4F22EACC630003B53F /* Project object */; + proxyType = 1; + remoteGlobalIDString = 325EB63F23FBBACF00C6B4A4; + remoteInfo = A2iOS; + }; + 325EB66123FBBAD100C6B4A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 32BFFB4F22EACC630003B53F /* Project object */; + proxyType = 1; + remoteGlobalIDString = 325EB63F23FBBACF00C6B4A4; + remoteInfo = A2iOS; + }; 32BFFB6A22EACC660003B53F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 32BFFB4F22EACC630003B53F /* Project object */; @@ -92,6 +114,20 @@ 325EB63423F8F78300C6B4A4 /* disk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = disk.h; sourceTree = ""; }; 325EB63523F8F78300C6B4A4 /* disk.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = disk.c; sourceTree = ""; }; 325EB63823F9E48100C6B4A4 /* common.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = common.c; sourceTree = ""; }; + 325EB64023FBBACF00C6B4A4 /* A2iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = A2iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 325EB64223FBBACF00C6B4A4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 325EB64423FBBACF00C6B4A4 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 325EB64623FBBACF00C6B4A4 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 325EB64923FBBACF00C6B4A4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 325EB64B23FBBAD100C6B4A4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 325EB64E23FBBAD100C6B4A4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 325EB65023FBBAD100C6B4A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 325EB65523FBBAD100C6B4A4 /* A2iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = A2iOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 325EB65923FBBAD100C6B4A4 /* A2iOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = A2iOSTests.swift; sourceTree = ""; }; + 325EB65B23FBBAD100C6B4A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 325EB66023FBBAD100C6B4A4 /* A2iOSUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = A2iOSUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 325EB66423FBBAD100C6B4A4 /* A2iOSUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = A2iOSUITests.swift; sourceTree = ""; }; + 325EB66623FBBAD100C6B4A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3262F37423E169F8008BDB95 /* spk_dn.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = spk_dn.wav; sourceTree = ""; }; 3262F37523E169F8008BDB95 /* spk_up.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = spk_up.wav; sourceTree = ""; }; 3264261023284F6F008B615F /* Apple2_mmio_8bit_ioaddr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Apple2_mmio_8bit_ioaddr.h; sourceTree = ""; }; @@ -125,6 +161,27 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 325EB63D23FBBACF00C6B4A4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 325EB65223FBBAD100C6B4A4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 325EB65D23FBBAD100C6B4A4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 32BFFB5422EACC630003B53F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -243,6 +300,38 @@ path = mem; sourceTree = ""; }; + 325EB64123FBBACF00C6B4A4 /* A2iOS */ = { + isa = PBXGroup; + children = ( + 325EB64223FBBACF00C6B4A4 /* AppDelegate.swift */, + 325EB64423FBBACF00C6B4A4 /* SceneDelegate.swift */, + 325EB64623FBBACF00C6B4A4 /* ViewController.swift */, + 325EB64823FBBACF00C6B4A4 /* Main.storyboard */, + 325EB64B23FBBAD100C6B4A4 /* Assets.xcassets */, + 325EB64D23FBBAD100C6B4A4 /* LaunchScreen.storyboard */, + 325EB65023FBBAD100C6B4A4 /* Info.plist */, + ); + path = A2iOS; + sourceTree = ""; + }; + 325EB65823FBBAD100C6B4A4 /* A2iOSTests */ = { + isa = PBXGroup; + children = ( + 325EB65923FBBAD100C6B4A4 /* A2iOSTests.swift */, + 325EB65B23FBBAD100C6B4A4 /* Info.plist */, + ); + path = A2iOSTests; + sourceTree = ""; + }; + 325EB66323FBBAD100C6B4A4 /* A2iOSUITests */ = { + isa = PBXGroup; + children = ( + 325EB66423FBBAD100C6B4A4 /* A2iOSUITests.swift */, + 325EB66623FBBAD100C6B4A4 /* Info.plist */, + ); + path = A2iOSUITests; + sourceTree = ""; + }; 3262F37823E17013008BDB95 /* Resources */ = { isa = PBXGroup; children = ( @@ -256,9 +345,14 @@ isa = PBXGroup; children = ( 326426112328ADF4008B615F /* Apple_II_ROM.s */, + 325EB63123F8861A00C6B4A4 /* src */, + 3262F37823E17013008BDB95 /* Resources */, 32BFFB5922EACC630003B53F /* A2Mac */, 32BFFB6C22EACC660003B53F /* A2MacTests */, 32BFFB7722EACC660003B53F /* A2MacUITests */, + 325EB64123FBBACF00C6B4A4 /* A2iOS */, + 325EB65823FBBAD100C6B4A4 /* A2iOSTests */, + 325EB66323FBBAD100C6B4A4 /* A2iOSUITests */, 32BFFB5822EACC630003B53F /* Products */, 32C4531A2331F7220000EBA1 /* A2Mac copy-Info.plist */, 32C4532C2331FEDA0000EBA1 /* A2Mac copy2-Info.plist */, @@ -273,6 +367,9 @@ 32BFFB7422EACC660003B53F /* A2MacUITests.xctest */, 32C453192331F7220000EBA1 /* Speedtest.app */, 32C4532B2331FED90000EBA1 /* Functiontest.app */, + 325EB64023FBBACF00C6B4A4 /* A2iOS.app */, + 325EB65523FBBAD100C6B4A4 /* A2iOSTests.xctest */, + 325EB66023FBBAD100C6B4A4 /* A2iOSUITests.xctest */, ); name = Products; sourceTree = ""; @@ -280,8 +377,6 @@ 32BFFB5922EACC630003B53F /* A2Mac */ = { isa = PBXGroup; children = ( - 325EB63123F8861A00C6B4A4 /* src */, - 3262F37823E17013008BDB95 /* Resources */, 32439F8422ECD8AD0077AAE0 /* apple.rom */, 326ED2EE232D7A0000A41337 /* 6502_functional_test.bin */, 32B18438233FAB3900DBB4AB /* verticies.swift */, @@ -323,6 +418,59 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 325EB63F23FBBACF00C6B4A4 /* A2iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 325EB66723FBBAD100C6B4A4 /* Build configuration list for PBXNativeTarget "A2iOS" */; + buildPhases = ( + 325EB63C23FBBACF00C6B4A4 /* Sources */, + 325EB63D23FBBACF00C6B4A4 /* Frameworks */, + 325EB63E23FBBACF00C6B4A4 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = A2iOS; + productName = A2iOS; + productReference = 325EB64023FBBACF00C6B4A4 /* A2iOS.app */; + productType = "com.apple.product-type.application"; + }; + 325EB65423FBBAD100C6B4A4 /* A2iOSTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 325EB66A23FBBAD100C6B4A4 /* Build configuration list for PBXNativeTarget "A2iOSTests" */; + buildPhases = ( + 325EB65123FBBAD100C6B4A4 /* Sources */, + 325EB65223FBBAD100C6B4A4 /* Frameworks */, + 325EB65323FBBAD100C6B4A4 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 325EB65723FBBAD100C6B4A4 /* PBXTargetDependency */, + ); + name = A2iOSTests; + productName = A2iOSTests; + productReference = 325EB65523FBBAD100C6B4A4 /* A2iOSTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 325EB65F23FBBAD100C6B4A4 /* A2iOSUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 325EB66D23FBBAD100C6B4A4 /* Build configuration list for PBXNativeTarget "A2iOSUITests" */; + buildPhases = ( + 325EB65C23FBBAD100C6B4A4 /* Sources */, + 325EB65D23FBBAD100C6B4A4 /* Frameworks */, + 325EB65E23FBBAD100C6B4A4 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 325EB66223FBBAD100C6B4A4 /* PBXTargetDependency */, + ); + name = A2iOSUITests; + productName = A2iOSUITests; + productReference = 325EB66023FBBAD100C6B4A4 /* A2iOSUITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; 32BFFB5622EACC630003B53F /* A2Mac */ = { isa = PBXNativeTarget; buildConfigurationList = 32BFFB7D22EACC660003B53F /* Build configuration list for PBXNativeTarget "A2Mac" */; @@ -416,10 +564,21 @@ 32BFFB4F22EACC630003B53F /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1020; + LastSwiftUpdateCheck = 1130; LastUpgradeCheck = 1100; ORGANIZATIONNAME = GameAlloy; TargetAttributes = { + 325EB63F23FBBACF00C6B4A4 = { + CreatedOnToolsVersion = 11.3.1; + }; + 325EB65423FBBAD100C6B4A4 = { + CreatedOnToolsVersion = 11.3.1; + TestTargetID = 325EB63F23FBBACF00C6B4A4; + }; + 325EB65F23FBBAD100C6B4A4 = { + CreatedOnToolsVersion = 11.3.1; + TestTargetID = 325EB63F23FBBACF00C6B4A4; + }; 32BFFB5622EACC630003B53F = { CreatedOnToolsVersion = 10.2.1; LastSwiftMigration = 1020; @@ -452,11 +611,38 @@ 32BFFB7322EACC660003B53F /* A2MacUITests */, 32C453092331F7220000EBA1 /* Speedtest */, 32C4531B2331FED90000EBA1 /* Functiontest */, + 325EB63F23FBBACF00C6B4A4 /* A2iOS */, + 325EB65423FBBAD100C6B4A4 /* A2iOSTests */, + 325EB65F23FBBAD100C6B4A4 /* A2iOSUITests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 325EB63E23FBBACF00C6B4A4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 325EB64F23FBBAD100C6B4A4 /* LaunchScreen.storyboard in Resources */, + 325EB64C23FBBAD100C6B4A4 /* Assets.xcassets in Resources */, + 325EB64A23FBBACF00C6B4A4 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 325EB65323FBBAD100C6B4A4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 325EB65E23FBBAD100C6B4A4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 32BFFB5522EACC630003B53F /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -512,6 +698,32 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 325EB63C23FBBACF00C6B4A4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 325EB64723FBBACF00C6B4A4 /* ViewController.swift in Sources */, + 325EB64323FBBACF00C6B4A4 /* AppDelegate.swift in Sources */, + 325EB64523FBBACF00C6B4A4 /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 325EB65123FBBAD100C6B4A4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 325EB65A23FBBAD100C6B4A4 /* A2iOSTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 325EB65C23FBBAD100C6B4A4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 325EB66523FBBAD100C6B4A4 /* A2iOSUITests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 32BFFB5322EACC630003B53F /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -573,6 +785,16 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 325EB65723FBBAD100C6B4A4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 325EB63F23FBBACF00C6B4A4 /* A2iOS */; + targetProxy = 325EB65623FBBAD100C6B4A4 /* PBXContainerItemProxy */; + }; + 325EB66223FBBAD100C6B4A4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 325EB63F23FBBACF00C6B4A4 /* A2iOS */; + targetProxy = 325EB66123FBBAD100C6B4A4 /* PBXContainerItemProxy */; + }; 32BFFB6B22EACC660003B53F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 32BFFB5622EACC630003B53F /* A2Mac */; @@ -586,6 +808,22 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ + 325EB64823FBBACF00C6B4A4 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 325EB64923FBBACF00C6B4A4 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 325EB64D23FBBAD100C6B4A4 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 325EB64E23FBBAD100C6B4A4 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; 32BFFB6022EACC660003B53F /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -597,6 +835,139 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 325EB66823FBBAD100C6B4A4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = W6TFQTZ4DA; + INFOPLIST_FILE = A2iOS/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.gamealloy.A2iOS; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 325EB66923FBBAD100C6B4A4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = W6TFQTZ4DA; + INFOPLIST_FILE = A2iOS/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.gamealloy.A2iOS; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 325EB66B23FBBAD100C6B4A4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = W6TFQTZ4DA; + INFOPLIST_FILE = A2iOSTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.gamealloy.A2iOSTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/A2iOS.app/A2iOS"; + }; + name = Debug; + }; + 325EB66C23FBBAD100C6B4A4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = W6TFQTZ4DA; + INFOPLIST_FILE = A2iOSTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.gamealloy.A2iOSTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/A2iOS.app/A2iOS"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 325EB66E23FBBAD100C6B4A4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = W6TFQTZ4DA; + INFOPLIST_FILE = A2iOSUITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.gamealloy.A2iOSUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = A2iOS; + }; + name = Debug; + }; + 325EB66F23FBBAD100C6B4A4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = W6TFQTZ4DA; + INFOPLIST_FILE = A2iOSUITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.gamealloy.A2iOSUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = A2iOS; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; 32BFFB7B22EACC660003B53F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -969,6 +1340,33 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 325EB66723FBBAD100C6B4A4 /* Build configuration list for PBXNativeTarget "A2iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 325EB66823FBBAD100C6B4A4 /* Debug */, + 325EB66923FBBAD100C6B4A4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 325EB66A23FBBAD100C6B4A4 /* Build configuration list for PBXNativeTarget "A2iOSTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 325EB66B23FBBAD100C6B4A4 /* Debug */, + 325EB66C23FBBAD100C6B4A4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 325EB66D23FBBAD100C6B4A4 /* Build configuration list for PBXNativeTarget "A2iOSUITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 325EB66E23FBBAD100C6B4A4 /* Debug */, + 325EB66F23FBBAD100C6B4A4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 32BFFB5222EACC630003B53F /* Build configuration list for PBXProject "A2Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/A2Mac.xcodeproj/xcuserdata/trudnai.xcuserdatad/xcschemes/xcschememanagement.plist b/A2Mac.xcodeproj/xcuserdata/trudnai.xcuserdatad/xcschemes/xcschememanagement.plist index 1d88928..e43a239 100644 --- a/A2Mac.xcodeproj/xcuserdata/trudnai.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/A2Mac.xcodeproj/xcuserdata/trudnai.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ orderHint 0 + A2iOS.xcscheme_^#shared#^_ + + orderHint + 4 + Debug.xcscheme orderHint diff --git a/A2iOS/AppDelegate.swift b/A2iOS/AppDelegate.swift new file mode 100644 index 0000000..e07f741 --- /dev/null +++ b/A2iOS/AppDelegate.swift @@ -0,0 +1,37 @@ +// +// AppDelegate.swift +// A2iOS +// +// Created by Tamas Rudnai on 2/17/20. +// Copyright © 2020 GameAlloy. All rights reserved. +// + +import UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + // MARK: UISceneSession Lifecycle + + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + // Called when a new scene session is being created. + // Use this method to select a configuration to create the new scene with. + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + // Called when the user discards a scene session. + // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. + // Use this method to release any resources that were specific to the discarded scenes, as they will not return. + } + + +} + diff --git a/A2iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/A2iOS/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d8db8d6 --- /dev/null +++ b/A2iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/A2iOS/Assets.xcassets/Contents.json b/A2iOS/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/A2iOS/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/A2iOS/Base.lproj/LaunchScreen.storyboard b/A2iOS/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..865e932 --- /dev/null +++ b/A2iOS/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/A2iOS/Base.lproj/Main.storyboard b/A2iOS/Base.lproj/Main.storyboard new file mode 100644 index 0000000..25a7638 --- /dev/null +++ b/A2iOS/Base.lproj/Main.storyboard @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/A2iOS/Info.plist b/A2iOS/Info.plist new file mode 100644 index 0000000..2a3483c --- /dev/null +++ b/A2iOS/Info.plist @@ -0,0 +1,64 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/A2iOS/SceneDelegate.swift b/A2iOS/SceneDelegate.swift new file mode 100644 index 0000000..f52d2f8 --- /dev/null +++ b/A2iOS/SceneDelegate.swift @@ -0,0 +1,53 @@ +// +// SceneDelegate.swift +// A2iOS +// +// Created by Tamas Rudnai on 2/17/20. +// Copyright © 2020 GameAlloy. All rights reserved. +// + +import UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + // Called as the scene is being released by the system. + // This occurs shortly after the scene enters the background, or when its session is discarded. + // Release any resources associated with this scene that can be re-created the next time the scene connects. + // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). + } + + func sceneDidBecomeActive(_ scene: UIScene) { + // Called when the scene has moved from an inactive state to an active state. + // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. + } + + func sceneWillResignActive(_ scene: UIScene) { + // Called when the scene will move from an active state to an inactive state. + // This may occur due to temporary interruptions (ex. an incoming phone call). + } + + func sceneWillEnterForeground(_ scene: UIScene) { + // Called as the scene transitions from the background to the foreground. + // Use this method to undo the changes made on entering the background. + } + + func sceneDidEnterBackground(_ scene: UIScene) { + // Called as the scene transitions from the foreground to the background. + // Use this method to save data, release shared resources, and store enough scene-specific state information + // to restore the scene back to its current state. + } + + +} + diff --git a/A2iOS/ViewController.swift b/A2iOS/ViewController.swift new file mode 100644 index 0000000..75d0ca0 --- /dev/null +++ b/A2iOS/ViewController.swift @@ -0,0 +1,20 @@ +// +// ViewController.swift +// A2iOS +// +// Created by Tamas Rudnai on 2/17/20. +// Copyright © 2020 GameAlloy. All rights reserved. +// + +import UIKit + +class ViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + + +} + diff --git a/A2iOSTests/A2iOSTests.swift b/A2iOSTests/A2iOSTests.swift new file mode 100644 index 0000000..1a8e0b4 --- /dev/null +++ b/A2iOSTests/A2iOSTests.swift @@ -0,0 +1,34 @@ +// +// A2iOSTests.swift +// A2iOSTests +// +// Created by Tamas Rudnai on 2/17/20. +// Copyright © 2020 GameAlloy. All rights reserved. +// + +import XCTest +@testable import A2iOS + +class A2iOSTests: XCTestCase { + + override func setUp() { + // Put setup code here. This method is called before the invocation of each test method in the class. + } + + override func tearDown() { + // Put teardown code here. This method is called after the invocation of each test method in the class. + } + + func testExample() { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct results. + } + + func testPerformanceExample() { + // This is an example of a performance test case. + self.measure { + // Put the code you want to measure the time of here. + } + } + +} diff --git a/A2iOSTests/Info.plist b/A2iOSTests/Info.plist new file mode 100644 index 0000000..64d65ca --- /dev/null +++ b/A2iOSTests/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/A2iOSUITests/A2iOSUITests.swift b/A2iOSUITests/A2iOSUITests.swift new file mode 100644 index 0000000..eef8838 --- /dev/null +++ b/A2iOSUITests/A2iOSUITests.swift @@ -0,0 +1,43 @@ +// +// A2iOSUITests.swift +// A2iOSUITests +// +// Created by Tamas Rudnai on 2/17/20. +// Copyright © 2020 GameAlloy. All rights reserved. +// + +import XCTest + +class A2iOSUITests: XCTestCase { + + override func setUp() { + // Put setup code here. This method is called before the invocation of each test method in the class. + + // In UI tests it is usually best to stop immediately when a failure occurs. + continueAfterFailure = false + + // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. + } + + override func tearDown() { + // Put teardown code here. This method is called after the invocation of each test method in the class. + } + + func testExample() { + // UI tests must launch the application that they test. + let app = XCUIApplication() + app.launch() + + // Use recording to get started writing UI tests. + // Use XCTAssert and related functions to verify your tests produce the correct results. + } + + func testLaunchPerformance() { + if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) { + // This measures how long it takes to launch your application. + measure(metrics: [XCTOSSignpostMetric.applicationLaunch]) { + XCUIApplication().launch() + } + } + } +} diff --git a/A2iOSUITests/Info.plist b/A2iOSUITests/Info.plist new file mode 100644 index 0000000..64d65ca --- /dev/null +++ b/A2iOSUITests/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/A2Mac/Resources/spk_dn.wav b/Resources/spk_dn.wav similarity index 100% rename from A2Mac/Resources/spk_dn.wav rename to Resources/spk_dn.wav diff --git a/A2Mac/Resources/spk_up.wav b/Resources/spk_up.wav similarity index 100% rename from A2Mac/Resources/spk_up.wav rename to Resources/spk_up.wav diff --git a/A2Mac/src/cpu/6502.c b/src/cpu/6502.c similarity index 100% rename from A2Mac/src/cpu/6502.c rename to src/cpu/6502.c diff --git a/A2Mac/src/cpu/6502.h b/src/cpu/6502.h similarity index 100% rename from A2Mac/src/cpu/6502.h rename to src/cpu/6502.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_BACKUP.h b/src/cpu/instructions/6502_instr_BACKUP.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_BACKUP.h rename to src/cpu/instructions/6502_instr_BACKUP.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_arithmetic.h b/src/cpu/instructions/6502_instr_arithmetic.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_arithmetic.h rename to src/cpu/instructions/6502_instr_arithmetic.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_branch.h b/src/cpu/instructions/6502_instr_branch.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_branch.h rename to src/cpu/instructions/6502_instr_branch.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_call_ret_jump.h b/src/cpu/instructions/6502_instr_call_ret_jump.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_call_ret_jump.h rename to src/cpu/instructions/6502_instr_call_ret_jump.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_compare_test.h b/src/cpu/instructions/6502_instr_compare_test.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_compare_test.h rename to src/cpu/instructions/6502_instr_compare_test.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_inc_dec.h b/src/cpu/instructions/6502_instr_inc_dec.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_inc_dec.h rename to src/cpu/instructions/6502_instr_inc_dec.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_load_store.h b/src/cpu/instructions/6502_instr_load_store.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_load_store.h rename to src/cpu/instructions/6502_instr_load_store.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_logic.h b/src/cpu/instructions/6502_instr_logic.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_logic.h rename to src/cpu/instructions/6502_instr_logic.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_misc.h b/src/cpu/instructions/6502_instr_misc.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_misc.h rename to src/cpu/instructions/6502_instr_misc.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_set_clr.h b/src/cpu/instructions/6502_instr_set_clr.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_set_clr.h rename to src/cpu/instructions/6502_instr_set_clr.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_shift_rotate.h b/src/cpu/instructions/6502_instr_shift_rotate.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_shift_rotate.h rename to src/cpu/instructions/6502_instr_shift_rotate.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_stack.h b/src/cpu/instructions/6502_instr_stack.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_stack.h rename to src/cpu/instructions/6502_instr_stack.h diff --git a/A2Mac/src/cpu/instructions/6502_instr_transfer.h b/src/cpu/instructions/6502_instr_transfer.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instr_transfer.h rename to src/cpu/instructions/6502_instr_transfer.h diff --git a/A2Mac/src/cpu/instructions/6502_instructions.h b/src/cpu/instructions/6502_instructions.h similarity index 100% rename from A2Mac/src/cpu/instructions/6502_instructions.h rename to src/cpu/instructions/6502_instructions.h diff --git a/A2Mac/src/dev/disk/disk.c b/src/dev/disk/disk.c similarity index 100% rename from A2Mac/src/dev/disk/disk.c rename to src/dev/disk/disk.c diff --git a/A2Mac/src/dev/disk/disk.h b/src/dev/disk/disk.h similarity index 100% rename from A2Mac/src/dev/disk/disk.h rename to src/dev/disk/disk.h diff --git a/A2Mac/src/dev/disk/woz.c b/src/dev/disk/woz.c similarity index 100% rename from A2Mac/src/dev/disk/woz.c rename to src/dev/disk/woz.c diff --git a/A2Mac/src/dev/disk/woz.h b/src/dev/disk/woz.h similarity index 100% rename from A2Mac/src/dev/disk/woz.h rename to src/dev/disk/woz.h diff --git a/A2Mac/src/dev/mem/Apple2_mmio_8bit_ioaddr.h b/src/dev/mem/Apple2_mmio_8bit_ioaddr.h similarity index 100% rename from A2Mac/src/dev/mem/Apple2_mmio_8bit_ioaddr.h rename to src/dev/mem/Apple2_mmio_8bit_ioaddr.h diff --git a/A2Mac/src/dev/mem/mmio.h b/src/dev/mem/mmio.h similarity index 100% rename from A2Mac/src/dev/mem/mmio.h rename to src/dev/mem/mmio.h diff --git a/A2Mac/src/util/common.c b/src/util/common.c similarity index 100% rename from A2Mac/src/util/common.c rename to src/util/common.c diff --git a/A2Mac/src/util/common.h b/src/util/common.h similarity index 100% rename from A2Mac/src/util/common.h rename to src/util/common.h diff --git a/A2Mac/src/util/disassembler.h b/src/util/disassembler.h similarity index 100% rename from A2Mac/src/util/disassembler.h rename to src/util/disassembler.h