Added necessary support to get as far as an empty window when attempting to load a piece of ZX80 software.

2025-01-11 08:30:55 +00:00 · 2017-06-04 17:55:19 -04:00 · 2017-06-04 17:55:19 -04:00 · d2637123c4
commit d2637123c4
parent 02b7c3d1b0
9 changed files with 273 additions and 4 deletions
--- a/Machines/ZX8081/ZX8081.cpp
+++ b/Machines/ZX8081/ZX8081.cpp
@ -0,0 +1,46 @@
+//
+//  ZX8081.cpp
+//  Clock Signal
+//
+//  Created by Thomas Harte on 04/06/2017.
+//  Copyright © 2017 Thomas Harte. All rights reserved.
+//
+
+#include "ZX8081.hpp"
+
+using namespace ZX8081;
+
+Machine::Machine() {
+	// run at 3.25 Mhz
+	set_clock_rate(3250000);
+}
+
+int Machine::perform_machine_cycle(const CPU::Z80::MachineCycle &cycle) {
+	return 0;
+}
+
+void Machine::setup_output(float aspect_ratio) {
+	crt_.reset(new Outputs::CRT::CRT(207 * 8, 8, Outputs::CRT::DisplayType::PAL50, 1));
+	crt_->set_rgb_sampling_function(
+		"vec3 rgb_sample(usampler2D sampler, vec2 coordinate, vec2 icoordinate)"
+		"{"
+			"return vec3(1.0);"
+		"}");
+}
+
+void Machine::close_output() {
+}
+
+std::shared_ptr<Outputs::CRT::CRT> Machine::get_crt() {
+	return crt_;
+}
+
+std::shared_ptr<Outputs::Speaker> Machine::get_speaker() {
+	return nullptr;
+}
+
+void Machine::run_for_cycles(int number_of_cycles) {
+}
+
+void Machine::configure_as_target(const StaticAnalyser::Target &target) {
+}
--- a/Machines/ZX8081/ZX8081.hpp
+++ b/Machines/ZX8081/ZX8081.hpp
@ -0,0 +1,44 @@
+//
+//  ZX8081.hpp
+//  Clock Signal
+//
+//  Created by Thomas Harte on 04/06/2017.
+//  Copyright © 2017 Thomas Harte. All rights reserved.
+//
+
+#ifndef ZX8081_hpp
+#define ZX8081_hpp
+
+#include "../ConfigurationTarget.hpp"
+#include "../CRTMachine.hpp"
+
+#include "../../Processors/Z80/Z80.hpp"
+
+namespace ZX8081 {
+
+class Machine:
+	public CPU::Z80::Processor<Machine>,
+	public CRTMachine::Machine,
+	public ConfigurationTarget::Machine {
+	public:
+		Machine();
+
+		int perform_machine_cycle(const CPU::Z80::MachineCycle &cycle);
+
+		void setup_output(float aspect_ratio);
+		void close_output();
+
+		std::shared_ptr<Outputs::CRT::CRT> get_crt();
+		std::shared_ptr<Outputs::Speaker> get_speaker();
+
+		void run_for_cycles(int number_of_cycles);
+
+		void configure_as_target(const StaticAnalyser::Target &target);
+
+	private:
+		std::shared_ptr<Outputs::CRT::CRT> crt_;
+};
+
+}
+
+#endif /* ZX8081_hpp */
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@ -21,6 +21,9 @@
 		4B1414621B58888700E04248 /* KlausDormannTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1414611B58888700E04248 /* KlausDormannTests.swift */; };
 		4B1497881EE4A1DA00CE2596 /* ZX80O.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1497861EE4A1DA00CE2596 /* ZX80O.cpp */; };
 		4B14978B1EE4AC5E00CE2596 /* StaticAnalyser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1497891EE4AC5E00CE2596 /* StaticAnalyser.cpp */; };
+		4B14978F1EE4B4D200CE2596 /* CSZX8081.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B14978E1EE4B4D200CE2596 /* CSZX8081.mm */; };
+		4B1497921EE4B5A800CE2596 /* ZX8081.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1497901EE4B5A800CE2596 /* ZX8081.cpp */; };
+		4B1497951EE4B7D300CE2596 /* ZX8081Options.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B1497941EE4B7D300CE2596 /* ZX8081Options.xib */; };
 		4B1D08061E0F7A1100763741 /* TimeTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B1D08051E0F7A1100763741 /* TimeTests.mm */; };
 		4B1E85751D170228001EF87D /* Typer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E85731D170228001EF87D /* Typer.cpp */; };
 		4B1E85811D176468001EF87D /* 6532Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E85801D176468001EF87D /* 6532Tests.swift */; };
@ -470,6 +473,11 @@
 		4B1497871EE4A1DA00CE2596 /* ZX80O.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ZX80O.hpp; sourceTree = "<group>"; };
 		4B1497891EE4AC5E00CE2596 /* StaticAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticAnalyser.cpp; path = ../../StaticAnalyser/ZX8081/StaticAnalyser.cpp; sourceTree = "<group>"; };
 		4B14978A1EE4AC5E00CE2596 /* StaticAnalyser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = StaticAnalyser.hpp; path = ../../StaticAnalyser/ZX8081/StaticAnalyser.hpp; sourceTree = "<group>"; };
+		4B14978D1EE4B4D200CE2596 /* CSZX8081.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSZX8081.h; sourceTree = "<group>"; };
+		4B14978E1EE4B4D200CE2596 /* CSZX8081.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CSZX8081.mm; sourceTree = "<group>"; };
+		4B1497901EE4B5A800CE2596 /* ZX8081.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZX8081.cpp; path = ZX8081/ZX8081.cpp; sourceTree = "<group>"; };
+		4B1497911EE4B5A800CE2596 /* ZX8081.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ZX8081.hpp; path = ZX8081/ZX8081.hpp; sourceTree = "<group>"; };
+		4B1497941EE4B7D300CE2596 /* ZX8081Options.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ZX8081Options.xib; sourceTree = "<group>"; };
 		4B1D08051E0F7A1100763741 /* TimeTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TimeTests.mm; sourceTree = "<group>"; };
 		4B1E85731D170228001EF87D /* Typer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Typer.cpp; sourceTree = "<group>"; };
 		4B1E85741D170228001EF87D /* Typer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Typer.hpp; sourceTree = "<group>"; };
@ -1079,6 +1087,15 @@
 			name = ZX80/81;
 			sourceTree = "<group>";
 		};
+		4B1497931EE4B5AC00CE2596 /* ZX8081 */ = {
+			isa = PBXGroup;
+			children = (
+				4B1497901EE4B5A800CE2596 /* ZX8081.cpp */,
+				4B1497911EE4B5A800CE2596 /* ZX8081.hpp */,
+			);
+			name = ZX8081;
+			sourceTree = "<group>";
+		};
 		4B1E85791D174DEC001EF87D /* 6532 */ = {
 			isa = PBXGroup;
 			children = (
@ -1144,13 +1161,15 @@
 			isa = PBXGroup;
 			children = (
 				4B2A53991D117D36003C6002 /* CSAtari2600.h */,
-				4B2A539A1D117D36003C6002 /* CSAtari2600.mm */,
 				4B2A539B1D117D36003C6002 /* CSElectron.h */,
-				4B2A539C1D117D36003C6002 /* CSElectron.mm */,
 				4BCF1FA61DADC5250039D2E7 /* CSOric.h */,
-				4BCF1FA71DADC5250039D2E7 /* CSOric.mm */,
 				4B2A539D1D117D36003C6002 /* CSVic20.h */,
+				4B14978D1EE4B4D200CE2596 /* CSZX8081.h */,
+				4B2A539A1D117D36003C6002 /* CSAtari2600.mm */,
+				4B2A539C1D117D36003C6002 /* CSElectron.mm */,
+				4BCF1FA71DADC5250039D2E7 /* CSOric.mm */,
 				4B2A539E1D117D36003C6002 /* CSVic20.mm */,
+				4B14978E1EE4B4D200CE2596 /* CSZX8081.mm */,
 			);
 			path = Wrappers;
 			sourceTree = "<group>";
@ -1280,6 +1299,7 @@
 				4B8FE2211DA19FB20090D3CE /* MachinePanel.swift */,
 				4B2A332E1DB86869002876E3 /* OricOptionsPanel.swift */,
 				4B9CCDA01DA279CA0098B625 /* Vic20OptionsPanel.swift */,
+				4B1497941EE4B7D300CE2596 /* ZX8081Options.xib */,
 				4B8FE2131DA19D5F0090D3CE /* Atari2600Options.xib */,
 				4B8FE2171DA19D5F0090D3CE /* ElectronOptions.xib */,
 				4B8FE2151DA19D5F0090D3CE /* MachineDocument.xib */,
@ -1851,6 +1871,7 @@
 				4B4DC81D1D2C2425003C5BF8 /* Commodore */,
 				4B2E2D9E1C3A070900138695 /* Electron */,
 				4BCF1FA51DADC3E10039D2E7 /* Oric */,
+				4B1497931EE4B5AC00CE2596 /* ZX8081 */,
 			);
 			name = Machines;
 			path = ../../Machines;
@ -2221,6 +2242,7 @@
 				4B8FE21D1DA19D5F0090D3CE /* ElectronOptions.xib in Resources */,
 				4B79E4461E3AF38600141F11 /* floppy525.png in Resources */,
 				4BC9DF451D044FCA00F44158 /* ROMImages in Resources */,
+				4B1497951EE4B7D300CE2596 /* ZX8081Options.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -2530,6 +2552,7 @@
 				4BCF1FA41DADC3DD0039D2E7 /* Oric.cpp in Sources */,
 				4BEA525E1DF33323007E74F2 /* Tape.cpp in Sources */,
 				4BC8A62D1DCE60E000DAC693 /* Typer.cpp in Sources */,
+				4B1497921EE4B5A800CE2596 /* ZX8081.cpp in Sources */,
 				4B643F3F1D77B88000D431D6 /* DocumentController.swift in Sources */,
 				4BA799951D8B656E0045123D /* StaticAnalyser.cpp in Sources */,
 				4B2BFDB21DAEF5FF001A68B8 /* Video.cpp in Sources */,
@ -2608,6 +2631,7 @@
 				4BEE0A701D72496600532C7B /* PRG.cpp in Sources */,
 				4B8FE2271DA1DE2D0090D3CE /* NSBundle+DataResource.m in Sources */,
 				4B2A53A01D117D36003C6002 /* CSMachine.mm in Sources */,
+				4B14978F1EE4B4D200CE2596 /* CSZX8081.mm in Sources */,
 				4BC91B831D1F160E00884B76 /* CommodoreTAP.cpp in Sources */,
 				4BCF1FAB1DADD41B0039D2E7 /* StaticAnalyser.cpp in Sources */,
 				4B2A539F1D117D36003C6002 /* CSAudioQueue.m in Sources */,
--- a/Signal/Base.lproj/ZX8081Options.xib
+++ b/Signal/Base.lproj/ZX8081Options.xib
@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="MachineDocument" customModule="Clock_Signal" customModuleProvider="target">
+            <connections>
+                <outlet property="optionsPanel" destination="ota-g7-hOL" id="zeO-di-9i3"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Options" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="ota-g7-hOL" customClass="Vic20OptionsPanel" customModule="Clock_Signal" customModuleProvider="target">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" nonactivatingPanel="YES" HUD="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="83" y="102" width="200" height="112"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1366" height="768"/>
+            <view key="contentView" id="7Pv-WL-2Rq">
+                <rect key="frame" x="0.0" y="0.0" width="200" height="112"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <subviews>
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="sBT-cU-h7s">
+                        <rect key="frame" x="18" y="76" width="164" height="18"/>
+                        <buttonCell key="cell" type="check" title="Load Tapes Quickly" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="w0l-ha-esm">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="setFastLoading:" target="ota-g7-hOL" id="me0-h2-Ga5"/>
+                        </connections>
+                    </button>
+                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MlB-rE-TXV" userLabel="Country Selector">
+                        <rect key="frame" x="18" y="46" width="165" height="26"/>
+                        <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="UIu-uz-pTu">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="menu"/>
+                            <menu key="menu" id="ajo-u0-WGk">
+                                <items>
+                                    <menuItem title="Danish Machine" id="38Y-Wm-1uo"/>
+                                    <menuItem title="European Machine" id="5ju-Z0-BDa"/>
+                                    <menuItem title="Japanese Machine" id="YlT-9e-azY"/>
+                                    <menuItem title="Swedish Machine" id="joU-Bt-XFb"/>
+                                    <menuItem title="US Machine" id="FXe-ca-cTY"/>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                        <connections>
+                            <action selector="setCountry:" target="ota-g7-hOL" id="YIc-QB-R1S"/>
+                        </connections>
+                    </popUpButton>
+                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0NP-x1-qH2">
+                        <rect key="frame" x="18" y="17" width="165" height="26"/>
+                        <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="K81-0X-C4f">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="menu"/>
+                            <menu key="menu" id="diI-80-lCf">
+                                <items>
+                                    <menuItem title="5 kb" id="ze7-6B-ois"/>
+                                    <menuItem title="8 kb" id="6C7-Iv-Wvl"/>
+                                    <menuItem title="32 kb" id="DOo-f6-OeZ"/>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                        <connections>
+                            <action selector="setMemorySize:" target="ota-g7-hOL" id="lep-Qi-00V"/>
+                        </connections>
+                    </popUpButton>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="MlB-rE-TXV" firstAttribute="top" secondItem="sBT-cU-h7s" secondAttribute="bottom" constant="8" id="0kc-u0-05p"/>
+                    <constraint firstAttribute="trailing" secondItem="sBT-cU-h7s" secondAttribute="trailing" constant="20" id="79b-2A-2c7"/>
+                    <constraint firstItem="0NP-x1-qH2" firstAttribute="leading" secondItem="7Pv-WL-2Rq" secondAttribute="leading" constant="20" id="7EF-L9-lIu"/>
+                    <constraint firstAttribute="bottom" secondItem="0NP-x1-qH2" secondAttribute="bottom" constant="20" id="Dtd-kf-4oU"/>
+                    <constraint firstItem="sBT-cU-h7s" firstAttribute="top" secondItem="7Pv-WL-2Rq" secondAttribute="top" constant="20" id="E5m-wo-X92"/>
+                    <constraint firstItem="0NP-x1-qH2" firstAttribute="top" secondItem="MlB-rE-TXV" secondAttribute="bottom" constant="8" id="NbW-5e-wGB"/>
+                    <constraint firstAttribute="trailing" secondItem="0NP-x1-qH2" secondAttribute="trailing" constant="20" id="ero-D6-tJj"/>
+                    <constraint firstItem="sBT-cU-h7s" firstAttribute="leading" secondItem="7Pv-WL-2Rq" secondAttribute="leading" constant="20" id="nDy-Xc-Ug9"/>
+                    <constraint firstItem="MlB-rE-TXV" firstAttribute="leading" secondItem="7Pv-WL-2Rq" secondAttribute="leading" constant="20" id="qb4-Lp-ZMc"/>
+                    <constraint firstAttribute="trailing" secondItem="MlB-rE-TXV" secondAttribute="trailing" constant="20" id="v18-62-uee"/>
+                </constraints>
+            </view>
+            <connections>
+                <outlet property="countryButton" destination="MlB-rE-TXV" id="Duc-AC-ZRO"/>
+                <outlet property="fastLoadingButton" destination="sBT-cU-h7s" id="uWa-EB-mbd"/>
+                <outlet property="memorySizeButton" destination="0NP-x1-qH2" id="qYy-3f-o94"/>
+            </connections>
+            <point key="canvasLocation" x="-2" y="21"/>
+        </window>
+    </objects>
+</document>
--- a/Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
+++ b/Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
@ -18,6 +18,7 @@
 #import "CSElectron.h"
 #import "CSOric.h"
 #import "CSVic20.h"
+#import "CSZX8081.h"

 #import "Clock_Signal-Swift.h"

@ -49,6 +50,7 @@
 		case StaticAnalyser::Target::Electron:	return @"ElectronOptions";
 		case StaticAnalyser::Target::Oric:		return @"OricOptions";
 		case StaticAnalyser::Target::Vic20:		return @"Vic20Options";
+		case StaticAnalyser::Target::ZX80:		return @"ZX8081Options";
 		default: return nil;
 	}
 }
@ -61,6 +63,7 @@
 		case StaticAnalyser::Target::Electron:	return [[CSElectron alloc] init];
 		case StaticAnalyser::Target::Oric:		return [[CSOric alloc] init];
 		case StaticAnalyser::Target::Vic20:		return [[CSVic20 alloc] init];
+		case StaticAnalyser::Target::ZX80:		return [[CSZX8081 alloc] init];
 		default: return nil;
 	}
 }
--- a/Signal/Machine/Wrappers/CSZX8081.h
+++ b/Signal/Machine/Wrappers/CSZX8081.h
@ -0,0 +1,17 @@
+//
+//  CSZX8081.h
+//  Clock Signal
+//
+//  Created by Thomas Harte on 04/06/2017.
+//  Copyright © 2017 Thomas Harte. All rights reserved.
+//
+
+#import "CSMachine.h"
+#import "CSKeyboardMachine.h"
+#import "CSFastLoading.h"
+
+@interface CSZX8081 : CSMachine <CSKeyboardMachine, CSFastLoading>
+
+@property (nonatomic, assign) BOOL useFastLoadingHack;
+
+@end
--- a/Signal/Machine/Wrappers/CSZX8081.mm
+++ b/Signal/Machine/Wrappers/CSZX8081.mm
@ -0,0 +1,38 @@
+//
+//  CSZX8081.m
+//  Clock Signal
+//
+//  Created by Thomas Harte on 04/06/2017.
+//  Copyright © 2017 Thomas Harte. All rights reserved.
+//
+
+#import "CSZX8081.h"
+
+#include "ZX8081.hpp"
+
+@implementation CSZX8081 {
+	ZX8081::Machine zx8081;
+}
+
+- (CRTMachine::Machine * const)machine {
+	return &zx8081;
+}
+
+- (instancetype)init {
+	self = [super init];
+	if(self) {
+	}
+	return self;
+}
+
+#pragma mark - Keyboard Mapping
+
+- (void)clearAllKeys {
+}
+
+- (void)setKey:(uint16_t)key isPressed:(BOOL)isPressed {
+}
+
+- (NSString *)userDefaultsPrefix {	return @"zx8081";	}
+
+@end
--- a/Processors/Z80/Z80.hpp
+++ b/Processors/Z80/Z80.hpp
@ -345,7 +345,7 @@ template <class T> class Processor {

 			// Copy in all programs and set pointers.
 			size_t destination = 0;
-			for(int c = 0; c < 256; c++) {
+			for(size_t c = 0; c < 256; c++) {
 				target.instructions[c] = &target.all_operations[destination];
 				for(int t = 0; t < lengths[c];) {
 					// Skip zero-length bus cycles.
--- a/StaticAnalyser/ZX8081/StaticAnalyser.cpp
+++ b/StaticAnalyser/ZX8081/StaticAnalyser.cpp
@ -13,4 +13,9 @@ void StaticAnalyser::ZX8081::AddTargets(
 		const std::list<std::shared_ptr<Storage::Tape::Tape>> &tapes,
 		const std::list<std::shared_ptr<Storage::Cartridge::Cartridge>> &cartridges,
 		std::list<StaticAnalyser::Target> &destination) {
+	// Temporary: be entirely trusting.
+	StaticAnalyser::Target target;
+	target.machine = Target::ZX80;
+	target.tapes = tapes;
+	destination.push_back(target);
 }