From 2f99930b710493c6d30b984d669c5a3ba5df3404 Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Mon, 11 Nov 2019 17:08:05 -0800 Subject: [PATCH 01/10] Fix link to libpal folder --- libpal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpal b/libpal index dea2627..58f9501 120000 --- a/libpal +++ b/libpal @@ -1 +1 @@ -/projects/SQ/projects/pocoproj/libpal \ No newline at end of file +../libpal \ No newline at end of file From 98f8a8a85958056ad8f6c37aa3fdbd056f81c02e Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Mon, 11 Nov 2019 19:28:21 -0800 Subject: [PATCH 02/10] Add project(ProjectName) directive to CMakeLists.txt to silence warning. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36dffb9..c86c95a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.0) +project(QAsm) + set(CMAKE_BUILD_TYPE Debug) set(APPVERSION "1.0.0") set(LIBRARY_NAME pal) From 9a7050f8aa2b50b1648a0d3ba1d45dfd3ea890fe Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Tue, 12 Nov 2019 19:39:09 -0800 Subject: [PATCH 03/10] Changes to CMakeLists.txt to get os x version compiling (but not linking) via make/cmake --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f268d8..19aec4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,12 @@ cmake_minimum_required(VERSION 3.0) set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") +project(QAsm) + set(CMAKE_BUILD_TYPE Debug) set(APPVERSION "1.0.1") set(LIBRARY_NAME pal) +set(FIND_LIBRARY_USE_LIB64_PATHS TRUE) include(./lib${LIBRARY_NAME}/cmake/CMakeHeader.txt) @@ -21,6 +24,7 @@ find_package(Poco REQUIRED Foundation Util XML JSON NetSSL) include_directories(BEFORE ${PROJECT_ROOT} ${PROJECT_ROOT}/lib${LIBRARY_NAME}/include/${LIBRARY_NAME} + ${OPENSSL_INCLUDE_DIR} ${Poco_INCLUDE_DIRS} ) From fed72777c84a83e860e7f2e54deed2b046a8ff63 Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Tue, 12 Nov 2019 19:44:47 -0800 Subject: [PATCH 04/10] Add XCode project --- .gitignore | 1 + qasm.xcodeproj/project.pbxproj | 484 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcschemes/xcschememanagement.plist | 14 + 5 files changed, 514 insertions(+) create mode 100644 qasm.xcodeproj/project.pbxproj create mode 100644 qasm.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 qasm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 qasm.xcodeproj/xcuserdata/lroathe.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/.gitignore b/.gitignore index 4469528..e089905 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ **/build +*.xcuserstate diff --git a/qasm.xcodeproj/project.pbxproj b/qasm.xcodeproj/project.pbxproj new file mode 100644 index 0000000..37b51ed --- /dev/null +++ b/qasm.xcodeproj/project.pbxproj @@ -0,0 +1,484 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 2F5E54C2237BAE370091163D /* libPocoJSON.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54B5237BAE370091163D /* libPocoJSON.64.dylib */; }; + 2F5E54C3237BAE370091163D /* libPocoEncodings.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54B6237BAE370091163D /* libPocoEncodings.64.dylib */; }; + 2F5E54C4237BAE370091163D /* libPocoMongoDB.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54B7237BAE370091163D /* libPocoMongoDB.64.dylib */; }; + 2F5E54C5237BAE370091163D /* libPocoDataSQLite.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54B8237BAE370091163D /* libPocoDataSQLite.64.dylib */; }; + 2F5E54C6237BAE370091163D /* libPocoNetSSL.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54B9237BAE370091163D /* libPocoNetSSL.64.dylib */; }; + 2F5E54C7237BAE370091163D /* libPocoData.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54BA237BAE370091163D /* libPocoData.64.dylib */; }; + 2F5E54C8237BAE370091163D /* libPocoCrypto.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54BB237BAE370091163D /* libPocoCrypto.64.dylib */; }; + 2F5E54C9237BAE370091163D /* libPocoRedis.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54BC237BAE370091163D /* libPocoRedis.64.dylib */; }; + 2F5E54CA237BAE370091163D /* libPocoUtil.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54BD237BAE370091163D /* libPocoUtil.64.dylib */; }; + 2F5E54CB237BAE370091163D /* libPocoFoundation.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54BE237BAE370091163D /* libPocoFoundation.64.dylib */; }; + 2F5E54CC237BAE370091163D /* libPocoZip.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54BF237BAE370091163D /* libPocoZip.64.dylib */; }; + 2F5E54CD237BAE370091163D /* libPocoNet.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54C0237BAE370091163D /* libPocoNet.64.dylib */; }; + 2F5E54CE237BAE370091163D /* libPocoXML.64.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54C1237BAE370091163D /* libPocoXML.64.dylib */; }; + 2F5E54D0237BAE3F0091163D /* libboringssl.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5E54CF237BAE3F0091163D /* libboringssl.tbd */; }; + 2F5E550B237BB3090091163D /* eval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E54FE237BB3090091163D /* eval.cpp */; }; + 2F5E550C237BB3090091163D /* asm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5500237BB3090091163D /* asm.cpp */; }; + 2F5E550D237BB3090091163D /* qasm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5501237BB3090091163D /* qasm.cpp */; }; + 2F5E550E237BB3090091163D /* opcodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5504237BB3090091163D /* opcodes.cpp */; }; + 2F5E550F237BB3090091163D /* psuedo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5505237BB3090091163D /* psuedo.cpp */; }; + 2F5E5536237BB3190091163D /* palutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E552D237BB3190091163D /* palutils.cpp */; }; + 2F5E5537237BB3190091163D /* httpserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E552E237BB3190091163D /* httpserver.cpp */; }; + 2F5E5538237BB3190091163D /* eventtask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E552F237BB3190091163D /* eventtask.cpp */; }; + 2F5E5539237BB3190091163D /* baseapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5530237BB3190091163D /* baseapp.cpp */; }; + 2F5E553A237BB3190091163D /* httpclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5531237BB3190091163D /* httpclient.cpp */; }; + 2F5E553B237BB3190091163D /* pallogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5532237BB3190091163D /* pallogger.cpp */; }; + 2F5E553C237BB3190091163D /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5533237BB3190091163D /* main.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 2F5E5495237BAC9A0091163D /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 2F5E5497237BAC9A0091163D /* qasm */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = qasm; sourceTree = BUILT_PRODUCTS_DIR; }; + 2F5E54B5237BAE370091163D /* libPocoJSON.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoJSON.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoJSON.64.dylib; sourceTree = ""; }; + 2F5E54B6237BAE370091163D /* libPocoEncodings.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoEncodings.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoEncodings.64.dylib; sourceTree = ""; }; + 2F5E54B7237BAE370091163D /* libPocoMongoDB.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoMongoDB.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoMongoDB.64.dylib; sourceTree = ""; }; + 2F5E54B8237BAE370091163D /* libPocoDataSQLite.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoDataSQLite.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoDataSQLite.64.dylib; sourceTree = ""; }; + 2F5E54B9237BAE370091163D /* libPocoNetSSL.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoNetSSL.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoNetSSL.64.dylib; sourceTree = ""; }; + 2F5E54BA237BAE370091163D /* libPocoData.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoData.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoData.64.dylib; sourceTree = ""; }; + 2F5E54BB237BAE370091163D /* libPocoCrypto.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoCrypto.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoCrypto.64.dylib; sourceTree = ""; }; + 2F5E54BC237BAE370091163D /* libPocoRedis.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoRedis.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoRedis.64.dylib; sourceTree = ""; }; + 2F5E54BD237BAE370091163D /* libPocoUtil.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoUtil.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoUtil.64.dylib; sourceTree = ""; }; + 2F5E54BE237BAE370091163D /* libPocoFoundation.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoFoundation.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoFoundation.64.dylib; sourceTree = ""; }; + 2F5E54BF237BAE370091163D /* libPocoZip.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoZip.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoZip.64.dylib; sourceTree = ""; }; + 2F5E54C0237BAE370091163D /* libPocoNet.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoNet.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoNet.64.dylib; sourceTree = ""; }; + 2F5E54C1237BAE370091163D /* libPocoXML.64.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPocoXML.64.dylib; path = ../../../../../../usr/local/Cellar/poco/1.9.4/lib/libPocoXML.64.dylib; sourceTree = ""; }; + 2F5E54CF237BAE3F0091163D /* libboringssl.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libboringssl.tbd; path = usr/lib/libboringssl.tbd; sourceTree = SDKROOT; }; + 2F5E54FE237BB3090091163D /* eval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eval.cpp; sourceTree = SOURCE_ROOT; }; + 2F5E54FF237BB3090091163D /* eval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eval.h; sourceTree = SOURCE_ROOT; }; + 2F5E5500237BB3090091163D /* asm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = asm.cpp; sourceTree = SOURCE_ROOT; }; + 2F5E5501237BB3090091163D /* qasm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = qasm.cpp; sourceTree = SOURCE_ROOT; }; + 2F5E5502237BB3090091163D /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = SOURCE_ROOT; }; + 2F5E5503237BB3090091163D /* opcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opcodes.h; sourceTree = SOURCE_ROOT; }; + 2F5E5504237BB3090091163D /* opcodes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opcodes.cpp; sourceTree = SOURCE_ROOT; }; + 2F5E5505237BB3090091163D /* psuedo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = psuedo.cpp; sourceTree = SOURCE_ROOT; }; + 2F5E5506237BB3090091163D /* qasm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qasm.h; sourceTree = SOURCE_ROOT; }; + 2F5E5507237BB3090091163D /* asm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asm.h; sourceTree = SOURCE_ROOT; }; + 2F5E5508237BB3090091163D /* psuedo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psuedo.h; sourceTree = SOURCE_ROOT; }; + 2F5E5509237BB3090091163D /* qasm.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = qasm.ini; sourceTree = SOURCE_ROOT; }; + 2F5E550A237BB3090091163D /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; }; + 2F5E551A237BB3190091163D /* palPoco.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palPoco.h; sourceTree = ""; }; + 2F5E551B237BB3190091163D /* pallogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pallogger.h; sourceTree = ""; }; + 2F5E551C237BB3190091163D /* eventtask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eventtask.h; sourceTree = ""; }; + 2F5E551D237BB3190091163D /* baseapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = baseapp.h; sourceTree = ""; }; + 2F5E551E237BB3190091163D /* pal_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pal_config.h; sourceTree = ""; }; + 2F5E551F237BB3190091163D /* httpserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = httpserver.h; sourceTree = ""; }; + 2F5E5520237BB3190091163D /* httpclient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = httpclient.h; sourceTree = ""; }; + 2F5E5521237BB3190091163D /* palutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palutils.h; sourceTree = ""; }; + 2F5E5522237BB3190091163D /* pal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pal.h; sourceTree = ""; }; + 2F5E552D237BB3190091163D /* palutils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palutils.cpp; sourceTree = ""; }; + 2F5E552E237BB3190091163D /* httpserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = httpserver.cpp; sourceTree = ""; }; + 2F5E552F237BB3190091163D /* eventtask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eventtask.cpp; sourceTree = ""; }; + 2F5E5530237BB3190091163D /* baseapp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = baseapp.cpp; sourceTree = ""; }; + 2F5E5531237BB3190091163D /* httpclient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = httpclient.cpp; sourceTree = ""; }; + 2F5E5532237BB3190091163D /* pallogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pallogger.cpp; sourceTree = ""; }; + 2F5E5533237BB3190091163D /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + 2F5E553E237BB3730091163D /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 2F5E5494237BAC9A0091163D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 2F5E54D0237BAE3F0091163D /* libboringssl.tbd in Frameworks */, + 2F5E54C2237BAE370091163D /* libPocoJSON.64.dylib in Frameworks */, + 2F5E54C3237BAE370091163D /* libPocoEncodings.64.dylib in Frameworks */, + 2F5E54C4237BAE370091163D /* libPocoMongoDB.64.dylib in Frameworks */, + 2F5E54C5237BAE370091163D /* libPocoDataSQLite.64.dylib in Frameworks */, + 2F5E54C6237BAE370091163D /* libPocoNetSSL.64.dylib in Frameworks */, + 2F5E54C7237BAE370091163D /* libPocoData.64.dylib in Frameworks */, + 2F5E54C8237BAE370091163D /* libPocoCrypto.64.dylib in Frameworks */, + 2F5E54C9237BAE370091163D /* libPocoRedis.64.dylib in Frameworks */, + 2F5E54CA237BAE370091163D /* libPocoUtil.64.dylib in Frameworks */, + 2F5E54CB237BAE370091163D /* libPocoFoundation.64.dylib in Frameworks */, + 2F5E54CC237BAE370091163D /* libPocoZip.64.dylib in Frameworks */, + 2F5E54CD237BAE370091163D /* libPocoNet.64.dylib in Frameworks */, + 2F5E54CE237BAE370091163D /* libPocoXML.64.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 2F5E548E237BAC9A0091163D = { + isa = PBXGroup; + children = ( + 2F5E5510237BB3190091163D /* libpal */, + 2F5E5499237BAC9A0091163D /* qasm */, + 2F5E553D237BB3490091163D /* Test */, + 2F5E5498237BAC9A0091163D /* Products */, + 2F5E54B4237BAE370091163D /* Frameworks */, + ); + sourceTree = ""; + }; + 2F5E5498237BAC9A0091163D /* Products */ = { + isa = PBXGroup; + children = ( + 2F5E5497237BAC9A0091163D /* qasm */, + ); + name = Products; + sourceTree = ""; + }; + 2F5E5499237BAC9A0091163D /* qasm */ = { + isa = PBXGroup; + children = ( + 2F5E5500237BB3090091163D /* asm.cpp */, + 2F5E5507237BB3090091163D /* asm.h */, + 2F5E550A237BB3090091163D /* config.h */, + 2F5E54FE237BB3090091163D /* eval.cpp */, + 2F5E54FF237BB3090091163D /* eval.h */, + 2F5E5504237BB3090091163D /* opcodes.cpp */, + 2F5E5503237BB3090091163D /* opcodes.h */, + 2F5E5505237BB3090091163D /* psuedo.cpp */, + 2F5E5508237BB3090091163D /* psuedo.h */, + 2F5E5501237BB3090091163D /* qasm.cpp */, + 2F5E5506237BB3090091163D /* qasm.h */, + 2F5E5509237BB3090091163D /* qasm.ini */, + 2F5E5502237BB3090091163D /* README */, + ); + path = qasm; + sourceTree = ""; + }; + 2F5E54B4237BAE370091163D /* Frameworks */ = { + isa = PBXGroup; + children = ( + 2F5E54CF237BAE3F0091163D /* libboringssl.tbd */, + 2F5E54BB237BAE370091163D /* libPocoCrypto.64.dylib */, + 2F5E54BA237BAE370091163D /* libPocoData.64.dylib */, + 2F5E54B8237BAE370091163D /* libPocoDataSQLite.64.dylib */, + 2F5E54B6237BAE370091163D /* libPocoEncodings.64.dylib */, + 2F5E54BE237BAE370091163D /* libPocoFoundation.64.dylib */, + 2F5E54B5237BAE370091163D /* libPocoJSON.64.dylib */, + 2F5E54B7237BAE370091163D /* libPocoMongoDB.64.dylib */, + 2F5E54C0237BAE370091163D /* libPocoNet.64.dylib */, + 2F5E54B9237BAE370091163D /* libPocoNetSSL.64.dylib */, + 2F5E54BC237BAE370091163D /* libPocoRedis.64.dylib */, + 2F5E54BD237BAE370091163D /* libPocoUtil.64.dylib */, + 2F5E54C1237BAE370091163D /* libPocoXML.64.dylib */, + 2F5E54BF237BAE370091163D /* libPocoZip.64.dylib */, + ); + name = Frameworks; + sourceTree = ""; + }; + 2F5E5510237BB3190091163D /* libpal */ = { + isa = PBXGroup; + children = ( + 2F5E5518237BB3190091163D /* include */, + 2F5E552C237BB3190091163D /* src */, + ); + name = libpal; + path = ../../libpal; + sourceTree = ""; + }; + 2F5E5518237BB3190091163D /* include */ = { + isa = PBXGroup; + children = ( + 2F5E5519237BB3190091163D /* pal */, + ); + path = include; + sourceTree = ""; + }; + 2F5E5519237BB3190091163D /* pal */ = { + isa = PBXGroup; + children = ( + 2F5E551A237BB3190091163D /* palPoco.h */, + 2F5E551B237BB3190091163D /* pallogger.h */, + 2F5E551C237BB3190091163D /* eventtask.h */, + 2F5E551D237BB3190091163D /* baseapp.h */, + 2F5E551E237BB3190091163D /* pal_config.h */, + 2F5E551F237BB3190091163D /* httpserver.h */, + 2F5E5520237BB3190091163D /* httpclient.h */, + 2F5E5521237BB3190091163D /* palutils.h */, + 2F5E5522237BB3190091163D /* pal.h */, + ); + path = pal; + sourceTree = ""; + }; + 2F5E552C237BB3190091163D /* src */ = { + isa = PBXGroup; + children = ( + 2F5E552D237BB3190091163D /* palutils.cpp */, + 2F5E552E237BB3190091163D /* httpserver.cpp */, + 2F5E552F237BB3190091163D /* eventtask.cpp */, + 2F5E5530237BB3190091163D /* baseapp.cpp */, + 2F5E5531237BB3190091163D /* httpclient.cpp */, + 2F5E5532237BB3190091163D /* pallogger.cpp */, + 2F5E5533237BB3190091163D /* main.cpp */, + ); + path = src; + sourceTree = ""; + }; + 2F5E553D237BB3490091163D /* Test */ = { + isa = PBXGroup; + children = ( + 2F5E553E237BB3730091163D /* src */, + ); + path = Test; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 2F5E5496237BAC9A0091163D /* qasm */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2F5E549E237BAC9A0091163D /* Build configuration list for PBXNativeTarget "qasm" */; + buildPhases = ( + 2F5E5493237BAC9A0091163D /* Sources */, + 2F5E5494237BAC9A0091163D /* Frameworks */, + 2F5E5495237BAC9A0091163D /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = qasm; + productName = qasm; + productReference = 2F5E5497237BAC9A0091163D /* qasm */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 2F5E548F237BAC9A0091163D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = "Lane Roathe"; + TargetAttributes = { + 2F5E5496237BAC9A0091163D = { + CreatedOnToolsVersion = 10.2.1; + }; + }; + }; + buildConfigurationList = 2F5E5492237BAC9A0091163D /* Build configuration list for PBXProject "qasm" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 2F5E548E237BAC9A0091163D; + productRefGroup = 2F5E5498237BAC9A0091163D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 2F5E5496237BAC9A0091163D /* qasm */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 2F5E5493237BAC9A0091163D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2F5E550F237BB3090091163D /* psuedo.cpp in Sources */, + 2F5E550B237BB3090091163D /* eval.cpp in Sources */, + 2F5E550E237BB3090091163D /* opcodes.cpp in Sources */, + 2F5E5538237BB3190091163D /* eventtask.cpp in Sources */, + 2F5E553C237BB3190091163D /* main.cpp in Sources */, + 2F5E5537237BB3190091163D /* httpserver.cpp in Sources */, + 2F5E5536237BB3190091163D /* palutils.cpp in Sources */, + 2F5E553A237BB3190091163D /* httpclient.cpp in Sources */, + 2F5E550C237BB3090091163D /* asm.cpp in Sources */, + 2F5E550D237BB3090091163D /* qasm.cpp in Sources */, + 2F5E553B237BB3190091163D /* pallogger.cpp in Sources */, + 2F5E5539237BB3190091163D /* baseapp.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 2F5E549C237BAC9A0091163D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "Mac Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SYSTEM_HEADER_SEARCH_PATHS = ( + /usr/local/include, + "/usr/local/opt/openssl\\@1.0/include/", + ); + VALID_ARCHS = x86_64; + }; + name = Debug; + }; + 2F5E549D237BAC9A0091163D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "Mac Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = macosx; + SYSTEM_HEADER_SEARCH_PATHS = ( + /usr/local/include, + "/usr/local/opt/openssl\\@1.0/include/", + ); + VALID_ARCHS = x86_64; + }; + name = Release; + }; + 2F5E549F237BAC9A0091163D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = 32JVURPAZ7; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /usr/local/Cellar/poco/1.9.4/lib, + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 2F5E54A0237BAC9A0091163D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = 32JVURPAZ7; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /usr/local/Cellar/poco/1.9.4/lib, + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 2F5E5492237BAC9A0091163D /* Build configuration list for PBXProject "qasm" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2F5E549C237BAC9A0091163D /* Debug */, + 2F5E549D237BAC9A0091163D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 2F5E549E237BAC9A0091163D /* Build configuration list for PBXNativeTarget "qasm" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2F5E549F237BAC9A0091163D /* Debug */, + 2F5E54A0237BAC9A0091163D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 2F5E548F237BAC9A0091163D /* Project object */; +} diff --git a/qasm.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/qasm.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..3b5ff94 --- /dev/null +++ b/qasm.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/qasm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/qasm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/qasm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/qasm.xcodeproj/xcuserdata/lroathe.xcuserdatad/xcschemes/xcschememanagement.plist b/qasm.xcodeproj/xcuserdata/lroathe.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..4032c53 --- /dev/null +++ b/qasm.xcodeproj/xcuserdata/lroathe.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + qasm.xcscheme_^#shared#^_ + + orderHint + 0 + + + + From a2c08f716909cd4e75e2da2720f45c196725c794 Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Tue, 12 Nov 2019 19:45:01 -0800 Subject: [PATCH 05/10] Fix git:: in readme --- README | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README b/README index 3c35c4f..5e4a78c 100644 --- a/README +++ b/README @@ -29,7 +29,7 @@ For example: mkdir workdir cd workdir git clone git://github.com/marketideas/libpal libpal -git clone git:://github.com/marketideas/qasm qasm +git clone git://github.com/marketideas/qasm qasm cd qasm make clean @@ -37,5 +37,3 @@ make To test: ./qasm src/testfile.s - - From 4e0afb3e853a6622bdf9d81596ff08a562e88f4b Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Tue, 12 Nov 2019 19:45:29 -0800 Subject: [PATCH 06/10] Fix includes that use system instead of project syntax --- qasm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qasm.h b/qasm.h index e76710d..a751739 100644 --- a/qasm.h +++ b/qasm.h @@ -1,9 +1,9 @@ #pragma once -#include +#include "palPoco.h" #include "pallogger.h" -#include -#include -#include +#include "eventtask.h" +#include "baseapp.h" +#include "httpserver.h" #define CLASS PAL_APPCLASS using namespace PAL_NAMESPACE; From 48042d2c7e36fb3f562f142df60b8bb36224d096 Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Tue, 12 Nov 2019 20:33:32 -0800 Subject: [PATCH 07/10] Get run to assemble test file --- .../xcshareddata/xcschemes/qasm.xcscheme | 97 +++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 8 ++ src/main.s | 33 +------ 3 files changed, 109 insertions(+), 29 deletions(-) create mode 100644 qasm.xcodeproj/xcshareddata/xcschemes/qasm.xcscheme diff --git a/qasm.xcodeproj/xcshareddata/xcschemes/qasm.xcscheme b/qasm.xcodeproj/xcshareddata/xcschemes/qasm.xcscheme new file mode 100644 index 0000000..362ed8f --- /dev/null +++ b/qasm.xcodeproj/xcshareddata/xcschemes/qasm.xcscheme @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qasm.xcodeproj/xcuserdata/lroathe.xcuserdatad/xcschemes/xcschememanagement.plist b/qasm.xcodeproj/xcuserdata/lroathe.xcuserdatad/xcschemes/xcschememanagement.plist index 4032c53..e1f28ee 100644 --- a/qasm.xcodeproj/xcuserdata/lroathe.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/qasm.xcodeproj/xcuserdata/lroathe.xcuserdatad/xcschemes/xcschememanagement.plist @@ -10,5 +10,13 @@ 0 + SuppressBuildableAutocreation + + 2F5E5496237BAC9A0091163D + + primary + + + diff --git a/src/main.s b/src/main.s index d0b850c..ce3a75e 100644 --- a/src/main.s +++ b/src/main.s @@ -6,37 +6,12 @@ * Created by Lane Roathe on 8/26/19. * Copyright © 2019 Ideas From the Deep. All rights reserved. * - xc off - xc - xc - mx %00 -exprdp = $A5 -expr = $6789 -exprL = $123456 //]XCODESTART ; Keep this at the start and put your code after this - lda expr,S - lda (expr,S),Y - lda #expr - lda (expr,X) - lda (expr),y - lda (expr) - lda [exprL],x - lda [exprL] - lda expr,x - lda expr,y - mvp expr,expr1 - lda expr - lda expr - ldal expr - jmp expr - jmp (expr) - lda #exprL - lda #^exprL - lda #|exprL - - end + xc off + xc + xc + mx %00 *========================================================== * monitor addresses From 2785b20ded276c09877ba7311f61d1ac0d482267 Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Tue, 12 Nov 2019 21:46:20 -0800 Subject: [PATCH 08/10] Columns in symbol table output, attempted work on dum/dend --- .gitignore | 1 + asm.cpp | 21 +++++++++++++++++---- asm.h | 9 ++++++++- opcodes.cpp | 3 +-- psuedo.cpp | 43 +++++++++++++++++++++++++++++++++++++++++-- psuedo.h | 2 +- 6 files changed, 69 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e089905..17ca9e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ **/build *.xcuserstate +*.xcbkptlist diff --git a/asm.cpp b/asm.cpp index 22118e9..79345fa 100644 --- a/asm.cpp +++ b/asm.cpp @@ -585,6 +585,7 @@ void CLASS::complete(void) CLASS::CLASS() : TFileProcessor() { lines.clear(); + inDUMSection = false; psuedoops = new TPsuedoOp(); } @@ -734,6 +735,8 @@ void CLASS::showSymbolTable(bool alpha) std::map alphamap; std::map nummap; + int columns = 4; + int column = columns; for (auto itr = symbols.begin(); itr != symbols.end(); itr++) { @@ -746,19 +749,29 @@ void CLASS::showSymbolTable(bool alpha) if (alpha) { - printf("\nSymbol table sorted alphabetically:\n"); + printf("\n\nSymbol table sorted alphabetically:\n\n"); for (auto itr = alphamap.begin(); itr != alphamap.end(); ++itr) { - printf("%-16s 0x%08X\n", itr->first.c_str(), itr->second); + printf("%16s 0x%08X", itr->first.c_str(), itr->second); + if( !--column ) + { + printf("\n"); + column = columns; + } } } else { - printf("\nSymbol table sorted numerically:\n"); + printf("\n\nSymbol table sorted numerically:\n\n"); for (auto itr = nummap.begin(); itr != nummap.end(); ++itr) { - printf("0x%08X %-16s\n", itr->first, itr->second.c_str()); + printf("0x%08X %-16s", itr->first, itr->second.c_str()); + if( !--column ) + { + printf("\n"); + column = columns; + } } } } diff --git a/asm.h b/asm.h index 7d00f35..1f68cb5 100644 --- a/asm.h +++ b/asm.h @@ -42,6 +42,9 @@ enum asmErrors errNoRedefinition, errBadOperand, errDupSymbol, + errRecursiveOp, + errOpcodeNotStarted, + errMAX }; @@ -62,6 +65,8 @@ const std::string errStrings[errMAX + 1] = "Unable to redefine symbol", "Unable to evaluate", "Duplicate Symbol", + "Recursive Operand", + "Opcode without start", "" }; @@ -242,6 +247,8 @@ public: uint16_t pass; + bool inDUMSection; // yes if we are in a DUM/DEND section + T65816Asm(); virtual ~T65816Asm(); @@ -299,4 +306,4 @@ public: virtual void process(void); virtual void complete(void); -}; \ No newline at end of file +}; diff --git a/opcodes.cpp b/opcodes.cpp index 725b26d..0008f67 100644 --- a/opcodes.cpp +++ b/opcodes.cpp @@ -687,7 +687,6 @@ void CLASS::insertOpcodes(void) pushopcode("ORG", P_ORG, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("DSK", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("SAV", P_SAV, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); - pushopcode("DS", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("REL", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("OBJ", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("PUT", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); @@ -697,7 +696,7 @@ void CLASS::insertOpcodes(void) pushopcode("TYP", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("END", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doEND)); pushopcode("DUM", P_DUM, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); - pushopcode("DEND",P_DEND, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); + pushopcode("DEND", P_DEND, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("AST", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("CYC", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); pushopcode("DAT", 0x00, OP_PSUEDO, OPHANDLER(&CLASS::doPSEUDO)); diff --git a/psuedo.cpp b/psuedo.cpp index e000d59..b6c3fed 100644 --- a/psuedo.cpp +++ b/psuedo.cpp @@ -17,6 +17,40 @@ int CLASS::doDUM(T65816Asm &a, MerlinLine &line, TSymbol &opinfo) int res=-1; //bool isdend=((opinfo.opcode==P_DEND)?true:false); return(res); + +// int res = 0; +// switch (opinfo.opcode ) +// { +// case P_DUM: +// if( a.inDUMSection ) +// { +// line.setError(errRecursiveOp); +// res = -1; +// } +// else +// { +// a.inDUMSection = true; +// a.PCstack.push(a.PC); +// a.PC.origin = a.PC.currentpc = line.expr_value; +// a.PC.totalbytes = 0; +// } +// break; +// +// case P_DEND: +// if( ! a.inDUMSection ) +// { +// line.setError(errOpcodeNotStarted); +// res = -1; +// } +// else +// { +// a.PC = a.PCstack.top(); +// a.PCstack.pop(); +// a.inDUMSection = false; +// } +// break; +// } +// return res; } int CLASS::doLST(T65816Asm &a, MerlinLine &line, TSymbol &opinfo) @@ -51,18 +85,23 @@ int CLASS::ProcessOpcode(T65816Asm &a, MerlinLine &line, TSymbol &opinfo) res = -1; // undefined p-op line.setError(errUnimplemented); break; + case P_DUM: case P_DEND: - res=doDUM(a,line,opinfo); - case P_ORG: + res = doDUM(a,line,opinfo); + + case P_ORG: a.PC.currentpc = line.expr_value; break; + case P_SAV: a.savepath = line.operand; break; + case P_LST: res = doLST(a, line, opinfo); break; + } return (res); } diff --git a/psuedo.h b/psuedo.h index 7599eba..661081e 100644 --- a/psuedo.h +++ b/psuedo.h @@ -27,4 +27,4 @@ public: }; -#undef CLASS \ No newline at end of file +#undef CLASS From b4c41031a854a1bc185405c52029341ccff01471 Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Wed, 13 Nov 2019 15:05:03 -0800 Subject: [PATCH 09/10] Udpate Xcode project --- qasm.xcodeproj/project.pbxproj | 400 ++++++++++++++++++++++++++++----- 1 file changed, 340 insertions(+), 60 deletions(-) diff --git a/qasm.xcodeproj/project.pbxproj b/qasm.xcodeproj/project.pbxproj index 37b51ed..432d9fe 100644 --- a/qasm.xcodeproj/project.pbxproj +++ b/qasm.xcodeproj/project.pbxproj @@ -26,13 +26,13 @@ 2F5E550D237BB3090091163D /* qasm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5501237BB3090091163D /* qasm.cpp */; }; 2F5E550E237BB3090091163D /* opcodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5504237BB3090091163D /* opcodes.cpp */; }; 2F5E550F237BB3090091163D /* psuedo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5505237BB3090091163D /* psuedo.cpp */; }; - 2F5E5536237BB3190091163D /* palutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E552D237BB3190091163D /* palutils.cpp */; }; - 2F5E5537237BB3190091163D /* httpserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E552E237BB3190091163D /* httpserver.cpp */; }; - 2F5E5538237BB3190091163D /* eventtask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E552F237BB3190091163D /* eventtask.cpp */; }; - 2F5E5539237BB3190091163D /* baseapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5530237BB3190091163D /* baseapp.cpp */; }; - 2F5E553A237BB3190091163D /* httpclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5531237BB3190091163D /* httpclient.cpp */; }; - 2F5E553B237BB3190091163D /* pallogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5532237BB3190091163D /* pallogger.cpp */; }; - 2F5E553C237BB3190091163D /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E5533237BB3190091163D /* main.cpp */; }; + 2F5E55F8237CBECB0091163D /* palutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E55EF237CBECB0091163D /* palutils.cpp */; }; + 2F5E55F9237CBECB0091163D /* httpserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E55F0237CBECB0091163D /* httpserver.cpp */; }; + 2F5E55FA237CBECB0091163D /* eventtask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E55F1237CBECB0091163D /* eventtask.cpp */; }; + 2F5E55FB237CBECB0091163D /* baseapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E55F2237CBECB0091163D /* baseapp.cpp */; }; + 2F5E55FC237CBECB0091163D /* httpclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E55F3237CBECB0091163D /* httpclient.cpp */; }; + 2F5E55FD237CBECB0091163D /* pallogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E55F4237CBECB0091163D /* pallogger.cpp */; }; + 2F5E55FE237CBECB0091163D /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E55F5237CBECB0091163D /* main.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -76,23 +76,107 @@ 2F5E5508237BB3090091163D /* psuedo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psuedo.h; sourceTree = SOURCE_ROOT; }; 2F5E5509237BB3090091163D /* qasm.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = qasm.ini; sourceTree = SOURCE_ROOT; }; 2F5E550A237BB3090091163D /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; }; - 2F5E551A237BB3190091163D /* palPoco.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palPoco.h; sourceTree = ""; }; - 2F5E551B237BB3190091163D /* pallogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pallogger.h; sourceTree = ""; }; - 2F5E551C237BB3190091163D /* eventtask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eventtask.h; sourceTree = ""; }; - 2F5E551D237BB3190091163D /* baseapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = baseapp.h; sourceTree = ""; }; - 2F5E551E237BB3190091163D /* pal_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pal_config.h; sourceTree = ""; }; - 2F5E551F237BB3190091163D /* httpserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = httpserver.h; sourceTree = ""; }; - 2F5E5520237BB3190091163D /* httpclient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = httpclient.h; sourceTree = ""; }; - 2F5E5521237BB3190091163D /* palutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palutils.h; sourceTree = ""; }; - 2F5E5522237BB3190091163D /* pal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pal.h; sourceTree = ""; }; - 2F5E552D237BB3190091163D /* palutils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palutils.cpp; sourceTree = ""; }; - 2F5E552E237BB3190091163D /* httpserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = httpserver.cpp; sourceTree = ""; }; - 2F5E552F237BB3190091163D /* eventtask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eventtask.cpp; sourceTree = ""; }; - 2F5E5530237BB3190091163D /* baseapp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = baseapp.cpp; sourceTree = ""; }; - 2F5E5531237BB3190091163D /* httpclient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = httpclient.cpp; sourceTree = ""; }; - 2F5E5532237BB3190091163D /* pallogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pallogger.cpp; sourceTree = ""; }; - 2F5E5533237BB3190091163D /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; - 2F5E553E237BB3730091163D /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = SOURCE_ROOT; }; + 2F5E55DC237CBECB0091163D /* palPoco.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palPoco.h; sourceTree = ""; }; + 2F5E55DD237CBECB0091163D /* pallogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pallogger.h; sourceTree = ""; }; + 2F5E55DE237CBECB0091163D /* eventtask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eventtask.h; sourceTree = ""; }; + 2F5E55DF237CBECB0091163D /* baseapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = baseapp.h; sourceTree = ""; }; + 2F5E55E0237CBECB0091163D /* pal_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pal_config.h; sourceTree = ""; }; + 2F5E55E1237CBECB0091163D /* httpserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = httpserver.h; sourceTree = ""; }; + 2F5E55E2237CBECB0091163D /* httpclient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = httpclient.h; sourceTree = ""; }; + 2F5E55E3237CBECB0091163D /* palutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palutils.h; sourceTree = ""; }; + 2F5E55E4237CBECB0091163D /* pal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pal.h; sourceTree = ""; }; + 2F5E55EF237CBECB0091163D /* palutils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palutils.cpp; sourceTree = ""; }; + 2F5E55F0237CBECB0091163D /* httpserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = httpserver.cpp; sourceTree = ""; }; + 2F5E55F1237CBECB0091163D /* eventtask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eventtask.cpp; sourceTree = ""; }; + 2F5E55F2237CBECB0091163D /* baseapp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = baseapp.cpp; sourceTree = ""; }; + 2F5E55F3237CBECB0091163D /* httpclient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = httpclient.cpp; sourceTree = ""; }; + 2F5E55F4237CBECB0091163D /* pallogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pallogger.cpp; sourceTree = ""; }; + 2F5E55F5237CBECB0091163D /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + 2F5E5665237CC26F0091163D /* main.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = main.s; sourceTree = ""; }; + 2F5E5667237CC26F0091163D /* qatools */ = {isa = PBXFileReference; lastKnownFileType = file; path = qatools; sourceTree = ""; }; + 2F5E5668237CC26F0091163D /* testfile.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = testfile.s; sourceTree = ""; }; + 2F5E566A237CC26F0091163D /* tool.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = tool.macs.s; sourceTree = ""; }; + 2F5E566B237CC26F0091163D /* qatools.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qatools.s; sourceTree = ""; }; + 2F5E566C237CC26F0091163D /* qatools.1.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qatools.1.s; sourceTree = ""; }; + 2F5E566D237CC26F0091163D /* link.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = link.s; sourceTree = ""; }; + 2F5E566E237CC26F0091163D /* qatools.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qatools.macs.s; sourceTree = ""; }; + 2F5E5670237CC26F0091163D /* asm.cmd.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.cmd.s; sourceTree = ""; }; + 2F5E5671237CC26F0091163D /* asm.dsk.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.dsk.s; sourceTree = ""; }; + 2F5E5672237CC26F0091163D /* asm.opcodes.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.opcodes.s; sourceTree = ""; }; + 2F5E5673237CC26F0091163D /* asm.1.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.1.s; sourceTree = ""; }; + 2F5E5674237CC26F0091163D /* asm.header.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.header.s; sourceTree = ""; }; + 2F5E5675237CC26F0091163D /* asm.eval.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.eval.s; sourceTree = ""; }; + 2F5E5676237CC26F0091163D /* asm.cond.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.cond.s; sourceTree = ""; }; + 2F5E5677237CC26F0091163D /* asm.vars.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.vars.s; sourceTree = ""; }; + 2F5E5678237CC26F0091163D /* asm.errors.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = asm.errors.s; sourceTree = ""; }; + 2F5E5679237CC26F0091163D /* merlin_convert.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = merlin_convert.s; sourceTree = ""; }; + 2F5E567B237CC26F0091163D /* ifd.equs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = ifd.equs.s; sourceTree = ""; }; + 2F5E567C237CC26F0091163D /* qasm.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qasm.s; sourceTree = ""; }; + 2F5E567D237CC26F0091163D /* equs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = equs.s; sourceTree = ""; }; + 2F5E567E237CC26F0091163D /* ifd.lib.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = ifd.lib.s; sourceTree = ""; }; + 2F5E567F237CC26F0091163D /* qasm2.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qasm2.s; sourceTree = ""; }; + 2F5E5680237CC26F0091163D /* macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = macs.s; sourceTree = ""; }; + 2F5E5681237CC26F0091163D /* link.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = link.s; sourceTree = ""; }; + 2F5E5682237CC26F0091163D /* qasm1.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qasm1.s; sourceTree = ""; }; + 2F5E5683237CC26F0091163D /* merlin_orig.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = merlin_orig.s; sourceTree = ""; }; + 2F5E5685237CC2700091163D /* qasm.docs */ = {isa = PBXFileReference; lastKnownFileType = text; path = qasm.docs; sourceTree = ""; }; + 2F5E5686237CC2700091163D /* shell.docs */ = {isa = PBXFileReference; lastKnownFileType = text; path = shell.docs; sourceTree = ""; }; + 2F5E5687237CC2700091163D /* zak.idea */ = {isa = PBXFileReference; lastKnownFileType = text; path = zak.idea; sourceTree = ""; }; + 2F5E5689237CC2700091163D /* edit.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = edit.macs.s; sourceTree = ""; }; + 2F5E568A237CC2700091163D /* edit.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = edit.s; sourceTree = ""; }; + 2F5E568B237CC2700091163D /* edit.types.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = edit.types.s; sourceTree = ""; }; + 2F5E568C237CC2700091163D /* edit.apw.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = edit.apw.s; sourceTree = ""; }; + 2F5E568D237CC2700091163D /* edit.1.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = edit.1.s; sourceTree = ""; }; + 2F5E568E237CC2700091163D /* edit.cmd.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = edit.cmd.s; sourceTree = ""; }; + 2F5E568F237CC2700091163D /* edit.equs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = edit.equs.s; sourceTree = ""; }; + 2F5E5691237CC2700091163D /* qaintcmd.cmd.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qaintcmd.cmd.s; sourceTree = ""; }; + 2F5E5692237CC2700091163D /* qaintcmd.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qaintcmd.s; sourceTree = ""; }; + 2F5E5693237CC2700091163D /* intcmd.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = intcmd.macs.s; sourceTree = ""; }; + 2F5E5695237CC2700091163D /* qatext */ = {isa = PBXFileReference; lastKnownFileType = file; path = qatext; sourceTree = ""; }; + 2F5E5696237CC2700091163D /* quicklink.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = quicklink.s; sourceTree = ""; }; + 2F5E5697237CC2700091163D /* qagraf */ = {isa = PBXFileReference; lastKnownFileType = file; path = qagraf; sourceTree = ""; }; + 2F5E5698237CC2700091163D /* qaprefs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qaprefs.s; sourceTree = ""; }; + 2F5E5699237CC2700091163D /* qacmd */ = {isa = PBXFileReference; lastKnownFileType = text; path = qacmd; sourceTree = ""; }; + 2F5E569A237CC2700091163D /* qaintcmd */ = {isa = PBXFileReference; lastKnownFileType = file; path = qaintcmd; sourceTree = ""; }; + 2F5E569B237CC2700091163D /* qaprefs */ = {isa = PBXFileReference; lastKnownFileType = text; path = qaprefs; sourceTree = ""; }; + 2F5E569C237CC2700091163D /* qatools */ = {isa = PBXFileReference; lastKnownFileType = text; path = qatools; sourceTree = ""; }; + 2F5E569D237CC2700091163D /* qe.prefs */ = {isa = PBXFileReference; lastKnownFileType = file; path = qe.prefs; sourceTree = ""; }; + 2F5E569E237CC2700091163D /* login */ = {isa = PBXFileReference; lastKnownFileType = text; path = login; sourceTree = ""; }; + 2F5E56A0237CC2700091163D /* link.cmd.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = link.cmd.s; sourceTree = ""; }; + 2F5E56A1237CC2700091163D /* link.eval.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = link.eval.s; sourceTree = ""; }; + 2F5E56A2237CC2700091163D /* link.errors.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = link.errors.s; sourceTree = ""; }; + 2F5E56A3237CC2700091163D /* linker.2.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = linker.2.s; sourceTree = ""; }; + 2F5E56A4237CC2700091163D /* link.header.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = link.header.s; sourceTree = ""; }; + 2F5E56A5237CC2700091163D /* link.express.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = link.express.s; sourceTree = ""; }; + 2F5E56A6237CC2700091163D /* linker.1.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = linker.1.s; sourceTree = ""; }; + 2F5E56A7237CC2700091163D /* link.vars.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = link.vars.s; sourceTree = ""; }; + 2F5E56A9237CC2700091163D /* tool.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = tool.macs.s; sourceTree = ""; }; + 2F5E56AA237CC2700091163D /* toolmacs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = toolmacs.s; sourceTree = ""; }; + 2F5E56AB237CC2700091163D /* intcmd.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = intcmd.macs.s; sourceTree = ""; }; + 2F5E56AC237CC2700091163D /* qatools.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qatools.macs.s; sourceTree = ""; }; + 2F5E56AE237CC2700091163D /* dump.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = dump.s; sourceTree = ""; }; + 2F5E56AF237CC2700091163D /* time.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = time.s; sourceTree = ""; }; + 2F5E56B0237CC2700091163D /* cat.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = cat.macs.s; sourceTree = ""; }; + 2F5E56B1237CC2700091163D /* cat.cmd.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = cat.cmd.s; sourceTree = ""; }; + 2F5E56B2237CC2700091163D /* catalog.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = catalog.s; sourceTree = ""; }; + 2F5E56B3237CC2700091163D /* del.cmd.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = del.cmd.s; sourceTree = ""; }; + 2F5E56B4237CC2700091163D /* ascii.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = ascii.s; sourceTree = ""; }; + 2F5E56B6237CC2700091163D /* external.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = external.s; sourceTree = ""; }; + 2F5E56B7237CC2700091163D /* opcodetest.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = opcodetest.s; sourceTree = ""; }; + 2F5E56B8237CC2700091163D /* globals.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = globals.s; sourceTree = ""; }; + 2F5E56B9237CC2700091163D /* toolmacs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = toolmacs.s; sourceTree = ""; }; + 2F5E56BA237CC2700091163D /* opdata.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = opdata.s; sourceTree = ""; }; + 2F5E56BB237CC2700091163D /* qa.equates.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qa.equates.s; sourceTree = ""; }; + 2F5E56BD237CC2700091163D /* rez */ = {isa = PBXFileReference; lastKnownFileType = text; path = rez; sourceTree = ""; }; + 2F5E56BE237CC2700091163D /* dump */ = {isa = PBXFileReference; lastKnownFileType = file; path = dump; sourceTree = ""; }; + 2F5E56BF237CC2700091163D /* delete */ = {isa = PBXFileReference; lastKnownFileType = file; path = delete; sourceTree = ""; }; + 2F5E56C0237CC2700091163D /* qasmgs */ = {isa = PBXFileReference; lastKnownFileType = text; path = qasmgs; sourceTree = ""; }; + 2F5E56C1237CC2700091163D /* lc */ = {isa = PBXFileReference; lastKnownFileType = file; path = lc; sourceTree = ""; }; + 2F5E56C2237CC2700091163D /* catalog */ = {isa = PBXFileReference; lastKnownFileType = file; path = catalog; sourceTree = ""; }; + 2F5E56C3237CC2700091163D /* deletelink */ = {isa = PBXFileReference; lastKnownFileType = file; path = deletelink; sourceTree = ""; }; + 2F5E56C4237CC2700091163D /* time */ = {isa = PBXFileReference; lastKnownFileType = file; path = time; sourceTree = ""; }; + 2F5E56C5237CC2700091163D /* edit */ = {isa = PBXFileReference; lastKnownFileType = text; path = edit; sourceTree = ""; }; + 2F5E56C6237CC2700091163D /* qlinkgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = qlinkgs; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -123,9 +207,9 @@ 2F5E548E237BAC9A0091163D = { isa = PBXGroup; children = ( - 2F5E5510237BB3190091163D /* libpal */, + 2F5E55D1237CBECB0091163D /* libpal */, 2F5E5499237BAC9A0091163D /* qasm */, - 2F5E553D237BB3490091163D /* Test */, + 2F5E5663237CC25D0091163D /* Test */, 2F5E5498237BAC9A0091163D /* Products */, 2F5E54B4237BAE370091163D /* Frameworks */, ); @@ -180,60 +264,256 @@ name = Frameworks; sourceTree = ""; }; - 2F5E5510237BB3190091163D /* libpal */ = { + 2F5E55D1237CBECB0091163D /* libpal */ = { isa = PBXGroup; children = ( - 2F5E5518237BB3190091163D /* include */, - 2F5E552C237BB3190091163D /* src */, + 2F5E55DA237CBECB0091163D /* include */, + 2F5E55EE237CBECB0091163D /* src */, ); name = libpal; - path = ../../libpal; + path = ../libpal; sourceTree = ""; }; - 2F5E5518237BB3190091163D /* include */ = { + 2F5E55DA237CBECB0091163D /* include */ = { isa = PBXGroup; children = ( - 2F5E5519237BB3190091163D /* pal */, + 2F5E55DB237CBECB0091163D /* pal */, ); path = include; sourceTree = ""; }; - 2F5E5519237BB3190091163D /* pal */ = { + 2F5E55DB237CBECB0091163D /* pal */ = { isa = PBXGroup; children = ( - 2F5E551A237BB3190091163D /* palPoco.h */, - 2F5E551B237BB3190091163D /* pallogger.h */, - 2F5E551C237BB3190091163D /* eventtask.h */, - 2F5E551D237BB3190091163D /* baseapp.h */, - 2F5E551E237BB3190091163D /* pal_config.h */, - 2F5E551F237BB3190091163D /* httpserver.h */, - 2F5E5520237BB3190091163D /* httpclient.h */, - 2F5E5521237BB3190091163D /* palutils.h */, - 2F5E5522237BB3190091163D /* pal.h */, + 2F5E55DC237CBECB0091163D /* palPoco.h */, + 2F5E55DD237CBECB0091163D /* pallogger.h */, + 2F5E55DE237CBECB0091163D /* eventtask.h */, + 2F5E55DF237CBECB0091163D /* baseapp.h */, + 2F5E55E0237CBECB0091163D /* pal_config.h */, + 2F5E55E1237CBECB0091163D /* httpserver.h */, + 2F5E55E2237CBECB0091163D /* httpclient.h */, + 2F5E55E3237CBECB0091163D /* palutils.h */, + 2F5E55E4237CBECB0091163D /* pal.h */, ); path = pal; sourceTree = ""; }; - 2F5E552C237BB3190091163D /* src */ = { + 2F5E55EE237CBECB0091163D /* src */ = { isa = PBXGroup; children = ( - 2F5E552D237BB3190091163D /* palutils.cpp */, - 2F5E552E237BB3190091163D /* httpserver.cpp */, - 2F5E552F237BB3190091163D /* eventtask.cpp */, - 2F5E5530237BB3190091163D /* baseapp.cpp */, - 2F5E5531237BB3190091163D /* httpclient.cpp */, - 2F5E5532237BB3190091163D /* pallogger.cpp */, - 2F5E5533237BB3190091163D /* main.cpp */, + 2F5E55EF237CBECB0091163D /* palutils.cpp */, + 2F5E55F0237CBECB0091163D /* httpserver.cpp */, + 2F5E55F1237CBECB0091163D /* eventtask.cpp */, + 2F5E55F2237CBECB0091163D /* baseapp.cpp */, + 2F5E55F3237CBECB0091163D /* httpclient.cpp */, + 2F5E55F4237CBECB0091163D /* pallogger.cpp */, + 2F5E55F5237CBECB0091163D /* main.cpp */, ); path = src; sourceTree = ""; }; - 2F5E553D237BB3490091163D /* Test */ = { + 2F5E5663237CC25D0091163D /* Test */ = { isa = PBXGroup; children = ( - 2F5E553E237BB3730091163D /* src */, + 2F5E5664237CC26F0091163D /* src */, ); - path = Test; + name = Test; + sourceTree = ""; + }; + 2F5E5664237CC26F0091163D /* src */ = { + isa = PBXGroup; + children = ( + 2F5E5665237CC26F0091163D /* main.s */, + 2F5E5666237CC26F0091163D /* obj */, + 2F5E5668237CC26F0091163D /* testfile.s */, + 2F5E5669237CC26F0091163D /* tools */, + 2F5E566F237CC26F0091163D /* asm */, + 2F5E5679237CC26F0091163D /* merlin_convert.s */, + 2F5E567A237CC26F0091163D /* shell */, + 2F5E5683237CC26F0091163D /* merlin_orig.s */, + 2F5E5684237CC2700091163D /* docs */, + 2F5E5688237CC2700091163D /* edit */, + 2F5E5690237CC2700091163D /* intcmd */, + 2F5E5694237CC2700091163D /* qasystem */, + 2F5E569F237CC2700091163D /* link */, + 2F5E56A8237CC2700091163D /* macs */, + 2F5E56AD237CC2700091163D /* exe */, + 2F5E56B5237CC2700091163D /* data */, + 2F5E56BC237CC2700091163D /* utility */, + ); + path = src; + sourceTree = ""; + }; + 2F5E5666237CC26F0091163D /* obj */ = { + isa = PBXGroup; + children = ( + 2F5E5667237CC26F0091163D /* qatools */, + ); + path = obj; + sourceTree = ""; + }; + 2F5E5669237CC26F0091163D /* tools */ = { + isa = PBXGroup; + children = ( + 2F5E566A237CC26F0091163D /* tool.macs.s */, + 2F5E566B237CC26F0091163D /* qatools.s */, + 2F5E566C237CC26F0091163D /* qatools.1.s */, + 2F5E566D237CC26F0091163D /* link.s */, + 2F5E566E237CC26F0091163D /* qatools.macs.s */, + ); + path = tools; + sourceTree = ""; + }; + 2F5E566F237CC26F0091163D /* asm */ = { + isa = PBXGroup; + children = ( + 2F5E5670237CC26F0091163D /* asm.cmd.s */, + 2F5E5671237CC26F0091163D /* asm.dsk.s */, + 2F5E5672237CC26F0091163D /* asm.opcodes.s */, + 2F5E5673237CC26F0091163D /* asm.1.s */, + 2F5E5674237CC26F0091163D /* asm.header.s */, + 2F5E5675237CC26F0091163D /* asm.eval.s */, + 2F5E5676237CC26F0091163D /* asm.cond.s */, + 2F5E5677237CC26F0091163D /* asm.vars.s */, + 2F5E5678237CC26F0091163D /* asm.errors.s */, + ); + path = asm; + sourceTree = ""; + }; + 2F5E567A237CC26F0091163D /* shell */ = { + isa = PBXGroup; + children = ( + 2F5E567B237CC26F0091163D /* ifd.equs.s */, + 2F5E567C237CC26F0091163D /* qasm.s */, + 2F5E567D237CC26F0091163D /* equs.s */, + 2F5E567E237CC26F0091163D /* ifd.lib.s */, + 2F5E567F237CC26F0091163D /* qasm2.s */, + 2F5E5680237CC26F0091163D /* macs.s */, + 2F5E5681237CC26F0091163D /* link.s */, + 2F5E5682237CC26F0091163D /* qasm1.s */, + ); + path = shell; + sourceTree = ""; + }; + 2F5E5684237CC2700091163D /* docs */ = { + isa = PBXGroup; + children = ( + 2F5E5685237CC2700091163D /* qasm.docs */, + 2F5E5686237CC2700091163D /* shell.docs */, + 2F5E5687237CC2700091163D /* zak.idea */, + ); + path = docs; + sourceTree = ""; + }; + 2F5E5688237CC2700091163D /* edit */ = { + isa = PBXGroup; + children = ( + 2F5E5689237CC2700091163D /* edit.macs.s */, + 2F5E568A237CC2700091163D /* edit.s */, + 2F5E568B237CC2700091163D /* edit.types.s */, + 2F5E568C237CC2700091163D /* edit.apw.s */, + 2F5E568D237CC2700091163D /* edit.1.s */, + 2F5E568E237CC2700091163D /* edit.cmd.s */, + 2F5E568F237CC2700091163D /* edit.equs.s */, + ); + path = edit; + sourceTree = ""; + }; + 2F5E5690237CC2700091163D /* intcmd */ = { + isa = PBXGroup; + children = ( + 2F5E5691237CC2700091163D /* qaintcmd.cmd.s */, + 2F5E5692237CC2700091163D /* qaintcmd.s */, + 2F5E5693237CC2700091163D /* intcmd.macs.s */, + ); + path = intcmd; + sourceTree = ""; + }; + 2F5E5694237CC2700091163D /* qasystem */ = { + isa = PBXGroup; + children = ( + 2F5E5695237CC2700091163D /* qatext */, + 2F5E5696237CC2700091163D /* quicklink.s */, + 2F5E5697237CC2700091163D /* qagraf */, + 2F5E5698237CC2700091163D /* qaprefs.s */, + 2F5E5699237CC2700091163D /* qacmd */, + 2F5E569A237CC2700091163D /* qaintcmd */, + 2F5E569B237CC2700091163D /* qaprefs */, + 2F5E569C237CC2700091163D /* qatools */, + 2F5E569D237CC2700091163D /* qe.prefs */, + 2F5E569E237CC2700091163D /* login */, + ); + path = qasystem; + sourceTree = ""; + }; + 2F5E569F237CC2700091163D /* link */ = { + isa = PBXGroup; + children = ( + 2F5E56A0237CC2700091163D /* link.cmd.s */, + 2F5E56A1237CC2700091163D /* link.eval.s */, + 2F5E56A2237CC2700091163D /* link.errors.s */, + 2F5E56A3237CC2700091163D /* linker.2.s */, + 2F5E56A4237CC2700091163D /* link.header.s */, + 2F5E56A5237CC2700091163D /* link.express.s */, + 2F5E56A6237CC2700091163D /* linker.1.s */, + 2F5E56A7237CC2700091163D /* link.vars.s */, + ); + path = link; + sourceTree = ""; + }; + 2F5E56A8237CC2700091163D /* macs */ = { + isa = PBXGroup; + children = ( + 2F5E56A9237CC2700091163D /* tool.macs.s */, + 2F5E56AA237CC2700091163D /* toolmacs.s */, + 2F5E56AB237CC2700091163D /* intcmd.macs.s */, + 2F5E56AC237CC2700091163D /* qatools.macs.s */, + ); + path = macs; + sourceTree = ""; + }; + 2F5E56AD237CC2700091163D /* exe */ = { + isa = PBXGroup; + children = ( + 2F5E56AE237CC2700091163D /* dump.s */, + 2F5E56AF237CC2700091163D /* time.s */, + 2F5E56B0237CC2700091163D /* cat.macs.s */, + 2F5E56B1237CC2700091163D /* cat.cmd.s */, + 2F5E56B2237CC2700091163D /* catalog.s */, + 2F5E56B3237CC2700091163D /* del.cmd.s */, + 2F5E56B4237CC2700091163D /* ascii.s */, + ); + path = exe; + sourceTree = ""; + }; + 2F5E56B5237CC2700091163D /* data */ = { + isa = PBXGroup; + children = ( + 2F5E56B6237CC2700091163D /* external.s */, + 2F5E56B7237CC2700091163D /* opcodetest.s */, + 2F5E56B8237CC2700091163D /* globals.s */, + 2F5E56B9237CC2700091163D /* toolmacs.s */, + 2F5E56BA237CC2700091163D /* opdata.s */, + 2F5E56BB237CC2700091163D /* qa.equates.s */, + ); + path = data; + sourceTree = ""; + }; + 2F5E56BC237CC2700091163D /* utility */ = { + isa = PBXGroup; + children = ( + 2F5E56BD237CC2700091163D /* rez */, + 2F5E56BE237CC2700091163D /* dump */, + 2F5E56BF237CC2700091163D /* delete */, + 2F5E56C0237CC2700091163D /* qasmgs */, + 2F5E56C1237CC2700091163D /* lc */, + 2F5E56C2237CC2700091163D /* catalog */, + 2F5E56C3237CC2700091163D /* deletelink */, + 2F5E56C4237CC2700091163D /* time */, + 2F5E56C5237CC2700091163D /* edit */, + 2F5E56C6237CC2700091163D /* qlinkgs */, + ); + path = utility; sourceTree = ""; }; /* End PBXGroup section */ @@ -295,15 +575,15 @@ 2F5E550F237BB3090091163D /* psuedo.cpp in Sources */, 2F5E550B237BB3090091163D /* eval.cpp in Sources */, 2F5E550E237BB3090091163D /* opcodes.cpp in Sources */, - 2F5E5538237BB3190091163D /* eventtask.cpp in Sources */, - 2F5E553C237BB3190091163D /* main.cpp in Sources */, - 2F5E5537237BB3190091163D /* httpserver.cpp in Sources */, - 2F5E5536237BB3190091163D /* palutils.cpp in Sources */, - 2F5E553A237BB3190091163D /* httpclient.cpp in Sources */, + 2F5E55FA237CBECB0091163D /* eventtask.cpp in Sources */, + 2F5E55FE237CBECB0091163D /* main.cpp in Sources */, + 2F5E55F9237CBECB0091163D /* httpserver.cpp in Sources */, + 2F5E55F8237CBECB0091163D /* palutils.cpp in Sources */, + 2F5E55FC237CBECB0091163D /* httpclient.cpp in Sources */, 2F5E550C237BB3090091163D /* asm.cpp in Sources */, 2F5E550D237BB3090091163D /* qasm.cpp in Sources */, - 2F5E553B237BB3190091163D /* pallogger.cpp in Sources */, - 2F5E5539237BB3190091163D /* baseapp.cpp in Sources */, + 2F5E55FD237CBECB0091163D /* pallogger.cpp in Sources */, + 2F5E55FB237CBECB0091163D /* baseapp.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 380eb7843e358d6d0cacf40d232328259e86eff4 Mon Sep 17 00:00:00 2001 From: Lane Roathe Date: Wed, 13 Nov 2019 15:05:12 -0800 Subject: [PATCH 10/10] Fix warnings --- asm.cpp | 20 ++++++++++---------- eval.cpp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/asm.cpp b/asm.cpp index 595d5fb..766889a 100644 --- a/asm.cpp +++ b/asm.cpp @@ -171,10 +171,10 @@ void CLASS::clear() void CLASS::set(std::string line) { int state = 0; - int l = line.length(); + int l = (int)line.length(); int i = 0; int x; - char c, delim; + char c, delim = 0; clear(); @@ -299,7 +299,7 @@ void CLASS::set(std::string line) } } printlable = lable; - x = lable.length(); + x = (int)lable.length(); if (x > 1) { while ((x > 1) && (lable[x - 1] == ':')) @@ -343,7 +343,7 @@ void CLASS::complete(void) uint64_t n = GetTickCount(); if (isDebug()) { - printf("Processing Time: %lu ms\n", n - starttime); + printf("Processing Time: %llu ms\n", n - starttime); } } @@ -509,7 +509,7 @@ void CLASS::process(void) { uint32_t len, t, pos; - uint32_t ct = lines.size(); + uint32_t ct = (uint32_t)lines.size(); for (uint32_t lineno = 0; lineno < ct; lineno++) { @@ -967,7 +967,7 @@ void CLASS::complete(void) std::ofstream f(savepath); uint32_t lineno = 0; - uint32_t l = lines.size(); + uint32_t l = (uint32_t)lines.size(); while (lineno < l) { MerlinLine &line=lines.at(lineno++); @@ -1011,7 +1011,7 @@ int CLASS::evaluate(std::string expr, int64_t &value) if (isDebug() > 2) { int c = SetColor(CL_RED); - printf("eval Error=%d %08lX |%s|\n", res, result, eval.badsymbol.c_str()); + printf("eval Error=%d %08llX |%s|\n", res, result, eval.badsymbol.c_str()); SetColor(c); } } @@ -1027,7 +1027,7 @@ int CLASS::evaluate(std::string expr, int64_t &value) } if (isDebug()>=3) { - printf("Eval Result: %08lX (status=%d)\n",value,res); + printf("Eval Result: %08llX (status=%d)\n",value,res); } return (res); } @@ -1162,7 +1162,7 @@ void CLASS::process(void) { initpass(); - l = lines.size(); + l = (uint32_t)lines.size(); while ((lineno < l) && (!passcomplete)) { MerlinLine &line=lines[lineno]; @@ -1215,7 +1215,7 @@ void CLASS::process(void) if (x == 0) { value &= 0xFFFFFFFF; - line.expr_value = value; + line.expr_value = (int32_t)value; } else { diff --git a/eval.cpp b/eval.cpp index 44352e5..a8b9dda 100644 --- a/eval.cpp +++ b/eval.cpp @@ -26,7 +26,7 @@ std::deque CLASS::exprToTokens(const std::string& expr) std::deque tokens; int state = 0; char c; - char delim; + char delim = 0; std::string ident, asc; std::string ops = "+-*//^!.&()"; @@ -378,7 +378,7 @@ int CLASS::parseNumber(std::string n, int64_t &val) i = 0; - l = n.length(); + l = (int)n.length(); s = ""; for (i = 0; i < l; i++) {