Vm-dev November 2015

vm-dev@lists.squeakfoundation.org

32 participants
118 discussions

[commit][3487] Indent ifdefs in platforms/iOS/vm/Common/Classes/ sqSqueakMainApp.m so one can
by commits＠squeakvm.org 10 Nov '15

10 Nov '15

Revision: 3487 Author: eliot Date: 2015-11-10 11:15:04 -0800 (Tue, 10 Nov 2015) Log Message: ----------- Indent ifdefs in platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m so one can make sense of the ifdefs. Add an XCode template for Cocoa apps. Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m Added Paths: ----------- branches/Cog/build.macos32x86/xcode/CarbonTemplate/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/AppDelegate.h branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/AppDelegate.m branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Base.lproj/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Base.lproj/MainMenu.xib branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Images.xcassets/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Images.xcassets/AppIcon.appiconset/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Images.xcassets/AppIcon.appiconset/Contents.json branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Info.plist branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/main.m branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate.xcodeproj/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate.xcodeproj/project.xcworkspace/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate.xcodeproj/project.xcworkspace/contents.xcworkspacedata branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate.xcodeproj/project.xcworkspace/xcuserdata/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate.xcodeproj/project.xcworkspace/xcuserdata/eliot.xcuserdatad/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate.xcodeproj/project.xcworkspace/xcuserdata/eliot.xcuserdatad/UserInterfaceState.xcuserstate branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate.xcodeproj/xcuserdata/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplateTests/ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplateTests/CocoaTemplateTests.m branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplateTests/Info.plist branches/Cog/build.macos32x86/xcode/CocoaTemplate/DOIT branches/Cog/build.macos32x86/xcode/CocoaTemplate/README Removed Paths: ------------- branches/Cog/build.macos32x86/xcode/Template/ Modified: branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2015-11-07 20:04:18 UTC (rev 3486) +++ branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2015-11-10 19:15:04 UTC (rev 3487) @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -128,10 +128,8 @@ /* Begin PBXProject section */ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; - attributes = { - }; buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "BochsIA32Plugin" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -220,6 +218,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = i386; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)"; COPY_PHASE_STRIP = NO; @@ -234,6 +233,7 @@ STRIP_INSTALLED_PRODUCT = NO; USER_HEADER_SEARCH_PATHS = ""; USE_HEADERMAP = NO; + VALID_ARCHS = i386; }; name = Debug; }; @@ -241,6 +241,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = i386; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)"; COPY_PHASE_STRIP = NO; @@ -253,6 +254,7 @@ SDKROOT = macosx; USER_HEADER_SEARCH_PATHS = ""; USE_HEADERMAP = NO; + VALID_ARCHS = i386; }; name = Release; }; Modified: branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj 2015-11-07 20:04:18 UTC (rev 3486) +++ branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj 2015-11-10 19:15:04 UTC (rev 3487) @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -128,10 +128,8 @@ /* Begin PBXProject section */ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; - attributes = { - }; buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "BochsX64Plugin" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -220,6 +218,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = i386; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)"; COPY_PHASE_STRIP = NO; @@ -234,6 +233,7 @@ STRIP_INSTALLED_PRODUCT = NO; USER_HEADER_SEARCH_PATHS = ""; USE_HEADERMAP = NO; + VALID_ARCHS = i386; }; name = Debug; }; @@ -241,6 +241,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = i386; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)"; COPY_PHASE_STRIP = NO; @@ -253,6 +254,7 @@ SDKROOT = macosx; USER_HEADER_SEARCH_PATHS = ""; USE_HEADERMAP = NO; + VALID_ARCHS = i386; }; name = Release; }; Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-07 20:04:18 UTC (rev 3486) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-10 19:15:04 UTC (rev 3487) @@ -399,9 +399,9 @@ 94B9533310E6BD7100DC476A /* MacMenuOS9ToOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacMenuOS9ToOSX.h; sourceTree = "<group>"; }; 94B9533410E6BD7100DC476A /* MacMenuOS9ToOSX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MacMenuOS9ToOSX.m; sourceTree = "<group>"; }; 94BB096B1BB47DDB0016BFDF /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - 94BB09711BB47F9B0016BFDF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 94BB09731BB47FB20016BFDF /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; }; - 94BB09751BB47FCD0016BFDF /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; + 94BB09711BB47F9B0016BFDF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = file; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 94BB09731BB47FB20016BFDF /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = file; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; }; + 94BB09751BB47FCD0016BFDF /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = file; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 94BCABBF10AB72A600F87527 /* sqSqueakOSXFileDirectoryInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqSqueakOSXFileDirectoryInterface.h; path = vm/OSX/sqSqueakOSXFileDirectoryInterface.h; sourceTree = "<group>"; }; 94BCABC010AB72A600F87527 /* sqSqueakOSXFileDirectoryInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = sqSqueakOSXFileDirectoryInterface.m; path = vm/OSX/sqSqueakOSXFileDirectoryInterface.m; sourceTree = "<group>"; }; 94BCAD1B10AB942300F87527 /* sqSqueakOSXApplication+attributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sqSqueakOSXApplication+attributes.h"; path = "vm/OSX/sqSqueakOSXApplication+attributes.h"; sourceTree = "<group>"; }; @@ -580,7 +580,7 @@ 94F8798F0E6C0C7E00662DEA /* sqSqueakIPhoneInfoPlistInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSqueakIPhoneInfoPlistInterface.h; sourceTree = "<group>"; }; 94F879900E6C0C7E00662DEA /* sqSqueakIPhoneInfoPlistInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sqSqueakIPhoneInfoPlistInterface.m; sourceTree = "<group>"; }; 94FA4CDD1BB4D8A800C1BE8F /* sqMacOpenGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMacOpenGL.h; sourceTree = "<group>"; }; - 94FA4CE41BB4DE1400C1BE8F /* Images-2.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = "Images-2.xcassets"; path = "SqueakCogSpur32x86/Images-2.xcassets"; sourceTree = SOURCE_ROOT; }; + 94FA4CE41BB4DE1400C1BE8F /* Images-2.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Images-2.xcassets"; path = "SqueakCogSpur32x86/Images-2.xcassets"; sourceTree = SOURCE_ROOT; }; 94FE5EC11B7A6232000D6014 /* sqSqueakOSXCGView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqSqueakOSXCGView.h; path = vm/OSX/sqSqueakOSXCGView.h; sourceTree = "<group>"; }; 94FE5EC21B7A6232000D6014 /* sqSqueakOSXCGView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = sqSqueakOSXCGView.m; path = vm/OSX/sqSqueakOSXCGView.m; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -1818,6 +1818,73 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 73AB729D1BEBDF590080A392 /* Assert */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; + CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = "compiler-default"; + GCC_DEBUGGING_SYMBOLS = full; + GCC_ENABLE_SSE3_EXTENSIONS = YES; + GCC_ENABLE_SSE41_EXTENSIONS = YES; + GCC_ENABLE_SSE42_EXTENSIONS = YES; + GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; + GCC_MODEL_TUNING = ""; + GCC_OPTIMIZATION_LEVEL = 1; + GCC_PREPROCESSOR_DEFINITIONS = ( + "COGMTVM=0", + "DEBUGVM=0", + "USE_GLOBAL_STRUCT=0", + SQUEAK_BUILTIN_PLUGIN, + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /usr/include/uuid; + MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = ""; + SEPARATE_STRIP = YES; + STRIP_INSTALLED_PRODUCT = NO; + }; + name = Assert; + }; + 73AB729E1BEBDF590080A392 /* Assert */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_OBJC_ARC = NO; + CLANG_USE_OPTIMIZATION_PROFILE = NO; + COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); + GCC_C_LANGUAGE_STANDARD = "compiler-default"; + GCC_OPTIMIZATION_LEVEL = 1; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ../../platforms/iOS/vm/SqueakPureObjc_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + BUILD_FOR_OSX, + USE_INLINE_MEMORY_ACCESSORS, + HAVE_NANOSLEEP, + SQUEAK_BUILTIN_PLUGIN, + "DEBUGVM=0", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + INFOPLIST_FILE = SqueakCogSpur32x86.plist; + LD_GENERATE_MAP_FILE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; + OTHER_CFLAGS = ""; + PRODUCT_BUNDLE_IDENTIFIER = org.squeak.osx3286.cog; + PRODUCT_NAME = Squeak; + }; + name = Assert; + }; 947E5F3610A9FD0400D3B69E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1825,35 +1892,62 @@ CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_PREPROCESSOR_DEFINITIONS = "-DSQUEAK_BUILTIN_PLUGIN"; + GCC_DEBUGGING_SYMBOLS = full; + GCC_ENABLE_SSE3_EXTENSIONS = YES; + GCC_ENABLE_SSE41_EXTENSIONS = YES; + GCC_ENABLE_SSE42_EXTENSIONS = YES; + GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; + GCC_MODEL_TUNING = ""; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "COGMTVM=0", + "DEBUGVM=1", + "USE_GLOBAL_STRUCT=0", + SQUEAK_BUILTIN_PLUGIN, + ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /usr/include/uuid; MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = NO; + SDKROOT = ""; SEPARATE_STRIP = YES; + STRIP_INSTALLED_PRODUCT = NO; }; name = Debug; }; - 9480CD150E5C7D9300C32178 /* Distribution */ = { + 9480CD150E5C7D9300C32178 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_PREPROCESSOR_DEFINITIONS = SQUEAK_BUILTIN_PLUGIN; + GCC_ENABLE_SSE3_EXTENSIONS = YES; + GCC_ENABLE_SSE41_EXTENSIONS = YES; + GCC_ENABLE_SSE42_EXTENSIONS = YES; + GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES; + GCC_MODEL_TUNING = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUGVM=0", + "NDEBUG=1", + "USE_GLOBAL_STRUCT=0", + SQUEAK_BUILTIN_PLUGIN, + ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /usr/include/uuid; MACOSX_DEPLOYMENT_TARGET = 10.6; + SDKROOT = ""; SEPARATE_STRIP = YES; + STRIP_INSTALLED_PRODUCT = NO; }; - name = Distribution; + name = Release; }; 948774A610C64DD800E4AEC5 /* Debug */ = { isa = XCBuildConfiguration; @@ -1877,6 +1971,7 @@ HAVE_NANOSLEEP, SQUEAK_BUILTIN_PLUGIN, "DEBUGVM=1", + "USE_GLOBAL_STRUCT=0", ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; INFOPLIST_FILE = SqueakCogSpur32x86.plist; @@ -1885,11 +1980,10 @@ OTHER_CFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = org.squeak.osx3286.cog; PRODUCT_NAME = Squeak; - PROVISIONING_PROFILE = ""; }; name = Debug; }; - 948774A710C64DD800E4AEC5 /* Distribution */ = { + 948774A710C64DD800E4AEC5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -1902,7 +1996,7 @@ "$(PROJECT_DIR)", ); GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_OPTIMIZATION_LEVEL = fast; + GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../../platforms/iOS/vm/SqueakPureObjc_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1918,9 +2012,8 @@ OTHER_CFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = org.squeak.osx3286.cog; PRODUCT_NAME = Squeak; - PROVISIONING_PROFILE = "a9c24a26-f48b-45e4-ab61-12d8c233f0fa"; }; - name = Distribution; + name = Release; }; /* End XCBuildConfiguration section */ @@ -1929,7 +2022,8 @@ isa = XCConfigurationList; buildConfigurations = ( 948774A610C64DD800E4AEC5 /* Debug */, - 948774A710C64DD800E4AEC5 /* Distribution */, + 73AB729E1BEBDF590080A392 /* Assert */, + 948774A710C64DD800E4AEC5 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; @@ -1938,7 +2032,8 @@ isa = XCConfigurationList; buildConfigurations = ( 947E5F3610A9FD0400D3B69E /* Debug */, - 9480CD150E5C7D9300C32178 /* Distribution */, + 73AB729D1BEBDF590080A392 /* Assert */, + 9480CD150E5C7D9300C32178 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-11-07 20:04:18 UTC (rev 3486) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-11-10 19:15:04 UTC (rev 3487) @@ -1,13 +1,12 @@ #!/bin/bash # Build a "complete" Mac VM consisting of CoreVM/CoreMTVM + Plugins. -# By default build the Deployment configuration into $DEST$VMAPP (CocoaSqueak.app) +# By default build the Release configuration into $DEST$VMAPP (CocoaSqueak.app) IFS=' ' -BUILD_CONFIGURATION=Deployment +BUILD_CONFIGURATION=Release NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release APP=Squeak.app -# build/SqueakCogSpur32x86.build/Debug/SqueakCogSpur32x86.build/Objects-normal #OBJDIR=Squeak.build/Objects-normal/i386 OBJDIR=SqueakCogSpur32x86.build/Objects-normal/i386 VMAPP=".app" @@ -31,7 +30,7 @@ m) VMAPP="MT.app"; VMXCP=SqueakCogSpur32x86MT; SFP=SqueakMTFFIPrims;; - s) BUILD_CONFIGURATION=DeploymentSymbols + s) BUILD_CONFIGURATION=Release DEST=CocoaFast;; k) KEEP=1;; h|\?|*) echo $USAGE @@ -39,7 +38,7 @@ echo ' -a: compile Assert configuration in Assert.app for assert checks' echo ' -d: compile Development configuration in Debug.app for debugging' echo ' -m: compile the multi-threaded version of the target, e.g. FastMT.app instead of Fast.app' - echo ' -s: compile DeploymentSymbols configuration in Fast.app for partial debugging' + echo ' -s: compile Release configuration in Fast.app for partial debugging' echo " -k: keep (do not delete) the existing $APP prior to the build" echo ' -h: display this help' exit 0;; @@ -74,6 +73,7 @@ echo FloatMathPlugin xcodebuild -project FloatMathPlugin/FloatMathPlugin.xcodeproj -configuration Release xcodebuild -project FloatMathPlugin/FloatMathPlugin.xcodeproj -configuration Release rm -rf "$DEST/Contents/Resources/FloatMathPlugin.bundle" +echo cp -R FloatMathPlugin/build/Release/FloatMathPlugin.bundle "$DEST/Contents/Resources" cp -R FloatMathPlugin/build/Release/FloatMathPlugin.bundle "$DEST/Contents/Resources" # Build the FloatArray plugin Added: branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/AppDelegate.h =================================================================== --- branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/AppDelegate.h (rev 0) +++ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/AppDelegate.h 2015-11-10 19:15:04 UTC (rev 3487) @@ -0,0 +1,15 @@ +// +// AppDelegate.h +// CocoaTemplate +// +// Created by Eliot Miranda on 09/11/2015. +// Copyright (c) 2015 Cog VM. All rights reserved. +// + +#import <Cocoa/Cocoa.h> + +@interface AppDelegate : NSObject <NSApplicationDelegate> + + +@end + Added: branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/AppDelegate.m =================================================================== --- branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/AppDelegate.m (rev 0) +++ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/AppDelegate.m 2015-11-10 19:15:04 UTC (rev 3487) @@ -0,0 +1,26 @@ +// +// AppDelegate.m +// CocoaTemplate +// +// Created by Eliot Miranda on 09/11/2015. +// Copyright (c) 2015 Cog VM. All rights reserved. +// + +#import "AppDelegate.h" + +@interface AppDelegate () + +@property (weak) IBOutlet NSWindow *window; +@end + +@implementation AppDelegate + +- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { + // Insert code here to initialize your application +} + +- (void)applicationWillTerminate:(NSNotification *)aNotification { + // Insert code here to tear down your application +} + +@end Added: branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Base.lproj/MainMenu.xib =================================================================== --- branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Base.lproj/MainMenu.xib (rev 0) +++ branches/Cog/build.macos32x86/xcode/CocoaTemplate/CocoaTemplate/Base.lproj/MainMenu.xib 2015-11-10 19:15:04 UTC (rev 3487) @@ -0,0 +1,680 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6233" systemVersion="14A329f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> + <dependencies> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6233"/> + </dependencies> + <objects> + <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"> + <connections> + <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/> + </connections> + </customObject> + <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> + <customObject id="-3" userLabel="Application" customClass="NSObject"/> + <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider=""> + <connections> + <outlet property="window" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/> + </connections> + </customObject> + <customObject id="YLy-65-1bz" customClass="NSFontManager"/> + <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6"> + <items> + <menuItem title="CocoaTemplate" id="1Xt-HY-uBw"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="CocoaTemplate" systemMenu="apple" id="uQy-DD-JDr"> + <items> + <menuItem title="About CocoaTemplate" id="5kV-Vb-QxS"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/> + <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/> + <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/> + <menuItem title="Services" id="NMo-om-nkz"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/> + </menuItem> + <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/> + <menuItem title="Hide CocoaTemplate" keyEquivalent="h" id="Olw-nP-bQN"> + <connections> + <action selector="hide:" target="-1" id="PnN-Uc-m68"/> + </connections> + </menuItem> + <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO"> + <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/> + <connections> + <action selector="hideOtherApplications:" target="-1" id="VT4-aY-XCT"/> + </connections> + </menuItem> + <menuItem title="Show All" id="Kd2-mp-pUS"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="unhideAllApplications:" target="-1" id="Dhg-Le-xox"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/> + <menuItem title="Quit CocoaTemplate" keyEquivalent="q" id="4sb-4s-VLi"> + <connections> + <action selector="terminate:" target="-1" id="Te7-pn-YzF"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem title="File" id="dMs-cI-mzQ"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="File" id="bib-Uj-vzu"> + <items> + <menuItem title="New" keyEquivalent="n" id="Was-JA-tGl"> + <connections> + <action selector="newDocument:" target="-1" id="4Si-XN-c54"/> + </connections> + </menuItem> + <menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9"> + <connections> + <action selector="openDocument:" target="-1" id="bVn-NM-KNZ"/> + </connections> + </menuItem> + <menuItem title="Open Recent" id="tXI-mr-wws"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ"> + <items> + <menuItem title="Clear Menu" id="vNY-rz-j42"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="clearRecentDocuments:" target="-1" id="Daa-9d-B3U"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/> + <menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG"> + <connections> + <action selector="performClose:" target="-1" id="HmO-Ls-i7Q"/> + </connections> + </menuItem> + <menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV"> + <connections> + <action selector="saveDocument:" target="-1" id="teZ-XB-qJY"/> + </connections> + </menuItem> + <menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A"> + <connections> + <action selector="saveDocumentAs:" target="-1" id="mDf-zr-I0C"/> + </connections> + </menuItem> + <menuItem title="Revert to Saved" id="KaW-ft-85H"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="revertDocumentToSaved:" target="-1" id="iJ3-Pv-kwq"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="aJh-i4-bef"/> + <menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK"> + <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/> + <connections> + <action selector="runPageLayout:" target="-1" id="Din-rz-gC5"/> + </connections> + </menuItem> + <menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS"> + <connections> + <action selector="print:" target="-1" id="qaZ-4w-aoO"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem title="Edit" id="5QF-Oa-p0T"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Edit" id="W48-6f-4Dl"> + <items> + <menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg"> + <connections> + <action selector="undo:" target="-1" id="M6e-cu-g7V"/> + </connections> + </menuItem> + <menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam"> + <connections> + <action selector="redo:" target="-1" id="oIA-Rs-6OD"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/> + <menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG"> + <connections> + <action selector="cut:" target="-1" id="YJe-68-I9s"/> + </connections> + </menuItem> + <menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU"> + <connections> + <action selector="copy:" target="-1" id="G1f-GL-Joy"/> + </connections> + </menuItem> + <menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL"> + <connections> + <action selector="paste:" target="-1" id="UvS-8e-Qdg"/> + </connections> + </menuItem> + <menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk"> + <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/> + <connections> + <action selector="pasteAsPlainText:" target="-1" id="cEh-KX-wJQ"/> + </connections> + </menuItem> + <menuItem title="Delete" id="pa3-QI-u2k"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="delete:" target="-1" id="0Mk-Ml-PaM"/> + </connections> + </menuItem> + <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m"> + <connections> + <action selector="selectAll:" target="-1" id="VNm-Mi-diN"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/> + <menuItem title="Find" id="4EN-yA-p0u"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Find" id="1b7-l0-nxx"> + <items> + <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W"> + <connections> + <action selector="performFindPanelAction:" target="-1" id="cD7-Qs-BN4"/> + </connections> + </menuItem> + <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz"> + <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/> + <connections> + <action selector="performFindPanelAction:" target="-1" id="WD3-Gg-5AJ"/> + </connections> + </menuItem> + <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye"> + <connections> + <action selector="performFindPanelAction:" target="-1" id="NDo-RZ-v9R"/> + </connections> + </menuItem> + <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV"> + <connections> + <action selector="performFindPanelAction:" target="-1" id="HOh-sY-3ay"/> + </connections> + </menuItem> + <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt"> + <connections> + <action selector="performFindPanelAction:" target="-1" id="U76-nv-p5D"/> + </connections> + </menuItem> + <menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd"> + <connections> + <action selector="centerSelectionInVisibleArea:" target="-1" id="IOG-6D-g5B"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem title="Spelling and Grammar" id="Dv1-io-Yv7"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Spelling" id="3IN-sU-3Bg"> + <items> + <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI"> + <connections> + <action selector="showGuessPanel:" target="-1" id="vFj-Ks-hy3"/> + </connections> + </menuItem> + <menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7"> + <connections> + <action selector="checkSpelling:" target="-1" id="fz7-VC-reM"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="bNw-od-mp5"/> + <menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleContinuousSpellChecking:" target="-1" id="7w6-Qz-0kB"/> + </connections> + </menuItem> + <menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleGrammarChecking:" target="-1" id="muD-Qn-j4w"/> + </connections> + </menuItem> + <menuItem title="Correct Spelling Automatically" id="78Y-hA-62v"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="2lM-Qi-WAP"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem title="Substitutions" id="9ic-FL-obx"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Substitutions" id="FeM-D8-WVr"> + <items> + <menuItem title="Show Substitutions" id="z6F-FW-3nz"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="orderFrontSubstitutionsPanel:" target="-1" id="oku-mr-iSq"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/> + <menuItem title="Smart Copy/Paste" id="9yt-4B-nSM"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleSmartInsertDelete:" target="-1" id="3IJ-Se-DZD"/> + </connections> + </menuItem> + <menuItem title="Smart Quotes" id="hQb-2v-fYv"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="ptq-xd-QOA"/> + </connections> + </menuItem> + <menuItem title="Smart Dashes" id="rgM-f4-ycn"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleAutomaticDashSubstitution:" target="-1" id="oCt-pO-9gS"/> + </connections> + </menuItem> + <menuItem title="Smart Links" id="cwL-P1-jid"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleAutomaticLinkDetection:" target="-1" id="Gip-E3-Fov"/> + </connections> + </menuItem> + <menuItem title="Data Detectors" id="tRr-pd-1PS"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleAutomaticDataDetection:" target="-1" id="R1I-Nq-Kbl"/> + </connections> + </menuItem> + <menuItem title="Text Replacement" id="HFQ-gK-NFA"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="toggleAutomaticTextReplacement:" target="-1" id="DvP-Fe-Py6"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem title="Transformations" id="2oI-Rn-ZJC"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Transformations" id="c8a-y6-VQd"> + <items> + <menuItem title="Make Upper Case" id="vmV-6d-7jI"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="uppercaseWord:" target="-1" id="sPh-Tk-edu"/> + </connections> + </menuItem> + <menuItem title="Make Lower Case" id="d9M-CD-aMd"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="lowercaseWord:" target="-1" id="iUZ-b5-hil"/> + </connections> + </menuItem> + <menuItem title="Capitalize" id="UEZ-Bs-lqG"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="capitalizeWord:" target="-1" id="26H-TL-nsh"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem title="Speech" id="xrE-MZ-jX0"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Speech" id="3rS-ZA-NoH"> + <items> + <menuItem title="Start Speaking" id="Ynk-f8-cLZ"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="startSpeaking:" target="-1" id="654-Ng-kyl"/> + </connections> + </menuItem> + <menuItem title="Stop Speaking" id="Oyz-dy-DGm"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="stopSpeaking:" target="-1" id="dX8-6p-jy9"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem title="Format" id="jxT-CU-nIS"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Format" id="GEO-Iw-cKr"> + <items> + <menuItem title="Font" id="Gi5-1S-RQB"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq"> + <items> + <menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq"> + <connections> + <action selector="orderFrontFontPanel:" target="YLy-65-1bz" id="WHr-nq-2xA"/> + </connections> + </menuItem> + <menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27"> + <connections> + <action selector="addFontTrait:" target="YLy-65-1bz" id="hqk-hr-sYV"/> + </connections> + </menuItem> + <menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq"> + <connections> + <action selector="addFontTrait:" target="YLy-65-1bz" id="IHV-OB-c03"/> + </connections> + </menuItem> + <menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S"> + <connections> + <action selector="underline:" target="-1" id="FYS-2b-JAY"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/> + <menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL"> + <connections> + <action selector="modifyFont:" target="YLy-65-1bz" id="Uc7-di-UnL"/> + </connections> + </menuItem> + <menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST"> + <connections> + <action selector="modifyFont:" target="YLy-65-1bz" id="HcX-Lf-eNd"/> + </connections> + </menuItem> + <menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/> + <menuItem title="Kern" id="jBQ-r6-VK2"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Kern" id="tlD-Oa-oAM"> + <items> + <menuItem title="Use Default" id="GUa-eO-cwY"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="useStandardKerning:" target="-1" id="6dk-9l-Ckg"/> + </connections> + </menuItem> + <menuItem title="Use None" id="cDB-IK-hbR"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="turnOffKerning:" target="-1" id="U8a-gz-Maa"/> + </connections> + </menuItem> + <menuItem title="Tighten" id="46P-cB-AYj"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="tightenKerning:" target="-1" id="hr7-Nz-8ro"/> + </connections> + </menuItem> + <menuItem title="Loosen" id="ogc-rX-tC1"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="loosenKerning:" target="-1" id="8i4-f9-FKE"/> + </connections> + </menuItem> + </items> + </menu> + </menuItem> + <menuItem title="Ligatures" id="o6e-r0-MWq"> + <modifierMask key="keyEquivalentModifierMask"/> + <menu key="submenu" title="Ligatures" id="w0m-vy-SC9"> + <items> + <menuItem title="Use Default" id="agt-UL-0e3"> + <modifierMask key="keyEquivalentModifierMask"/> + <connections> + <action selector="useStandardLigatures:" target="-1" id="7uR-wd-Dx6"/> + </connections> + </menuItem> + <menuItem title="Use None" id="J7y-lM-qPV"> + <modifierMask key="keyEquivalentModifierMask"/> @@ Diff output truncated at 50000 characters. @@

1 0

Unix MIDI instrument selection
by tim Rowledge 10 Nov '15

10 Nov '15

(posted to both lists because although it is strictly speaking a vm (possible) bug) there may be midi-aware readers not on that list) I’m hooking up ALSA MIDI on the Pi for Scratch. The basic work was actually done a year ago by Sugiura-san but I missed reading about it due to travel back last summer. It mostly works but the instrument selection is off-by-one and it appears to be due to vm bug that looks to have been around a very long time. In the image we use 1-128 for the MIDI general instrument list - so Tubular Bells is 15 - and subtract one before passing to the plugin in the time-honoured fashion. Unfortunately the tubular bells sound more like a xylophone. And ‘seashore’ sounds like a telephone. It turns out that in sqUnixMIDIALSA.inc the code which - so far as I can tell - deals with the instrument index being set actually *adds* 1 to the byte value we pass in! I can’t think of any reason that would sensible but since all I know of ALSA MIDI stuff for unix has been read recently from a bunch of truly awful webpages masquerading as documentation, whaddaino? This code snippet - case 192: /* program change */ { int instrument= arg1 + 1; snd_seq_ev_set_pgmchange(ev, ch, instrument); } break; in Cog/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc seems to have been there as long as the file has existed. Certainly in my ancient dusty archives back in 3.8 days there was no code at all for unix MIDI, so the history on the svn server seems to be correct. I’ll compile a new vm with the +1 whacked out and see what happens but any solid info would be welcomed. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim A paperless office has about as likely as a paperless bathroom.

1 2

clang analyzer warning - double release
by Nicolas Cellier 08 Nov '15

08 Nov '15

Hi, I get the attached warning from clang analyzer... vendorKeyCFStringRef might be released twice I'll senf the other image in follow-up, not sure about mail limit... Nicolas

1 2

VM Maker: VMMaker.oscog-rmacnak.1512.mcz
by commits＠source.squeak.org 08 Nov '15

08 Nov '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1512.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1512 Author: rmacnak Time: 7 November 2015, 4:58:32.667 pm UUID: 14d52427-4db4-49b4-a3c7-94f99e78f83e Ancestors: VMMaker.oscog-tpr.1511 Fix ARM debug VMs. Release ARM VMs still broken unless compiled with -O0. =============== Diff against VMMaker.oscog-tpr.1511 =============== Item was added: + ----- Method: CogARMCompiler>>byteReadsZeroExtend (in category 'testing') ----- + byteReadsZeroExtend + ^true! Item was changed: ----- Method: CogOutOfLineLiteralsARMCompiler>>usesOutOfLineLiteral (in category 'testing') ----- usesOutOfLineLiteral "Answer if the receiver uses an out-of-line literal. Needs only to work for the opcodes created with gen:literal:operand: et al." opcode caseOf: { [CallFull] -> [^true]. [JumpFull] -> [^true]. "Arithmetic" [AddCqR] -> [^self rotateable8bitSignedImmediate: (operands at: 0) ifTrue: [:r :i :n| false] ifFalse: [true]]. [AndCqR] -> [^self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| false] ifFalse: [1 << (operands at: 0) highBit ~= ((operands at: 0) + 1)]]. [AndCqRR] -> [^self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| false] ifFalse: [1 << (operands at: 0) highBit ~= ((operands at: 0) + 1)]]. [CmpCqR] -> [^self rotateable8bitSignedImmediate: (operands at: 0) ifTrue: [:r :i :n| false] ifFalse: [true]]. [OrCqR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| false] ifFalse: [true]]. [SubCqR] -> [^self rotateable8bitSignedImmediate: (operands at: 0) ifTrue: [:r :i :n| false] ifFalse: [true]]. [TstCqR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| false] ifFalse: [true]]. [XorCqR] -> [^self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| false] ifFalse: [true]]. [AddCwR] -> [^true]. [AndCwR] -> [^true]. [CmpCwR] -> [^true]. [OrCwR] -> [^true]. [SubCwR] -> [^true]. [XorCwR] -> [^true]. [LoadEffectiveAddressMwrR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| false] ifFalse: [true]]. "Data Movement" [MoveCqR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| false] ifFalse: [true]]. [MoveCwR] -> [^((self isAnInstruction: (cogit cCoerceSimple: (operands at: 0) to: #'AbstractInstruction *')) "i.e. a label, which by definition will be in the current compilation." or: [cogit addressIsInCurrentCompilation: (operands at: 0)]) not]. [MoveAwR] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [false] ifFalse: [true]]. [MoveRAw] -> [^(self isAddressRelativeToVarBase: (operands at: 1)) ifTrue: [false] ifFalse: [true]]. + [MoveAbR] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [false] ifFalse: [true]]. + [MoveRAb] -> [^(self isAddressRelativeToVarBase: (operands at: 1)) ifTrue: [false] ifFalse: [true]]. [MoveRMwr] -> [^self is12BitValue: (operands at: 1) ifTrue: [:u :i| false] ifFalse: [true]]. [MoveRdM64r] -> [^self is12BitValue: (operands at: 1) ifTrue: [:u :i| false] ifFalse: [true]]. [MoveMbrR] -> [^self is12BitValue: (operands at: 0) ifTrue: [:u :i| false] ifFalse: [true]]. [MoveRMbr] -> [^self is12BitValue: (operands at: 1) ifTrue: [:u :i| false] ifFalse: [true]]. [MoveM16rR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| false] ifFalse: [true]]. [MoveM64rRd] -> [^self is12BitValue: (operands at: 0) ifTrue: [:u :i| false] ifFalse: [true]]. [MoveMwrR] -> [^self is12BitValue: (operands at: 0) ifTrue: [:u :i| false] ifFalse: [true]]. [PushCw] -> [^((self isAnInstruction: (cogit cCoerceSimple: (operands at: 0) to: #'AbstractInstruction *')) "i.e. a label, which by definiion will be in the current compilation." or: [cogit addressIsInCurrentCompilation: (operands at: 0)]) not]. [PushCq] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| false] ifFalse: [true]]. [PrefetchAw] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [false] ifFalse: [true]]. } otherwise: [self assert: false]. ^false "to keep C compiler quiet" !

1 0

[commit][3486] JMM - iOS VM problems with dragging a morph and PasteUpMorph >>flashRects:color:, Javier Diaz-Reinoso
by commits＠squeakvm.org 07 Nov '15

07 Nov '15

Revision: 3486 Author: johnmci Date: 2015-11-07 12:04:18 -0800 (Sat, 07 Nov 2015) Log Message: ----------- JMM - iOS VM problems with dragging a morph and PasteUpMorph>>flashRects:color:, Javier Diaz-Reinoso Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate =================================================================== (Binary files differ) Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m 2015-11-05 20:53:44 UTC (rev 3485) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m 2015-11-07 20:04:18 UTC (rev 3486) @@ -120,10 +120,15 @@ [[self getMainView] preDrawThelayers]; - - dispatch_async(dispatch_get_main_queue(), ^{ - [[self getMainView] drawThelayers]; - }); + //SQK-24 + //javier_diaz_r(a)mac.com iOS VM problems with dragging a morph and PasteUpMorph>>flashRects:color: + if ([NSThread isMainThread]) { + [[self getMainView] drawThelayers]; + } else { + dispatch_async(dispatch_get_main_queue(), ^{ //note try sync not async, I wonder if that would be an issue? + [[self getMainView] drawThelayers]; + }); + } } - (void) ioForceDisplayUpdate {

1 0

implementing atomic operator
by Sebastián Krynski 07 Nov '15

07 Nov '15

Hello, as I mentioned before I'm starting to implement an atomic operator (a swap between two variables). I have compiled the StackVM (at least to get started) in Ubuntu 32bits. A few questions: - Should I be working on generation.image while doing the implementation? If so, should I be running the simulated VM running another image while doing my tests? - Do you think it is possible to implement the operations in Slang or using #cCode:inSmalltalk:? Otherwise I will need to do it in assembler and inline it Thanks Sebastián

6 7

Re: [Vm-dev] VM Maker: VMMaker.oscog-tpr.1511.mcz
by tim Rowledge 06 Nov '15

06 Nov '15

This suite of changes works for me in simulation of both ARM & x86, and generates vm code that compiles to a working Pi vm. So obviously it will explode anyone else’s machine; that’s just the way the world works. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim There are two ways to write error-free programs; only the third one works.

1 0

VM Maker: VMMaker.oscog-tpr.1511.mcz
by commits＠source.squeak.org 06 Nov '15

06 Nov '15

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1511.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.1511 Author: tpr Time: 6 November 2015, 1:08:47.44 pm UUID: c040c1b1-b67f-45ec-973e-4ffd34322ea5 Ancestors: VMMaker.oscog-eem.1510 Merge in a fairly large change to closed PICs; they are no longer compiled each time we make on or extend one, but rather copied from a prototype and updated as needed. Take a look at http://wiki.squeak.org/squeak/6205 for some explanations. Oh, and fix the div/mod simulation so it actually works. This makes simulating the stdio reading test images actually work on ARM. Clement - there is a single Sista related change in here that may or may not break things for you ;-) =============== Diff against VMMaker.oscog-eem.1510 =============== Item was changed: ----- Method: CogARMCompiler>>aeabiDiv:Mod: (in category 'simulation') ----- aeabiDiv: dividend Mod: divisor "simulate the __aeabi_idivmod call" <doNotGenerate> + |result top bottom| - |result| + top:= dividend signedIntFromLong. + bottom := divisor signedIntFromLong. + + cogit processor r0: (result :=(top quo: bottom) signedIntToLong). + cogit processor r1: (top rem: bottom) signedIntToLong. - cogit processor r0: (result :=dividend quo: divisor). - cogit processor r1: (dividend rem: divisor). ^result! Item was changed: ----- Method: CogARMCompiler>>callTargetFromReturnAddress: (in category 'inline cacheing') ----- callTargetFromReturnAddress: callSiteReturnAddress "Answer the address that the call immediately preceding callSiteReturnAddress will jump to." "this is also used by #jumpLongTargetBeforeFollowingAddress:." | callDistance call | call := self instructionBeforeAddress: callSiteReturnAddress. self assert: ((self instructionIsB: call) or: [self instructionIsBL: call]). callDistance := self extractOffsetFromBL: call. + ^callSiteReturnAddress + 4 "this is the pc's +8 offset, - the 4 byte correction for the previous instruction address" + callDistance signedIntFromLong! - ^callSiteReturnAddress + 4 + callDistance signedIntFromLong! Item was changed: ----- Method: CogARMCompiler>>computeMaximumSize (in category 'generate machine code') ----- computeMaximumSize "Because we don't use Thumb, each ARM instruction has 4 bytes. Many abstract opcodes need more than one instruction. Instructions that refer to constants and/or literals depend on literals being stored in-line or out-of-line. N.B. The ^N forms are to get around the bytecode compiler's long branch limits which are exceeded when each case jumps around the otherwise." opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^0]. [Literal] -> [^4]. [AlignmentNops] -> [^(operands at: 0) - 4]. [Fill16] -> [^4]. [Fill32] -> [^4]. [FillFromWord] -> [^4]. [Nop] -> [^4]. "Control" [Call] -> [^4]. [CallFull] -> [^self literalLoadInstructionBytes + 4]. [JumpR] -> [^4]. [Jump] -> [^4]. [JumpFull] -> [^self literalLoadInstructionBytes + 4]. [JumpLong] -> [^4]. [JumpZero] -> [^4]. [JumpNonZero] -> [^4]. [JumpNegative] -> [^4]. [JumpNonNegative] -> [^4]. [JumpOverflow] -> [^4]. [JumpNoOverflow] -> [^4]. [JumpCarry] -> [^4]. [JumpNoCarry] -> [^4]. [JumpLess] -> [^4]. [JumpGreaterOrEqual] -> [^4]. [JumpGreater] -> [^4]. [JumpLessOrEqual] -> [^4]. [JumpBelow] -> [^4]. [JumpAboveOrEqual] -> [^4]. [JumpAbove] -> [^4]. [JumpBelowOrEqual] -> [^4]. [JumpLongZero] -> [^4]. [JumpLongNonZero] -> [^4]. [JumpFPEqual] -> [^8]. [JumpFPNotEqual] -> [^8]. [JumpFPLess] -> [^8]. [JumpFPGreaterOrEqual]-> [^8]. [JumpFPGreater] -> [^8]. [JumpFPLessOrEqual] -> [^8]. [JumpFPOrdered] -> [^8]. [JumpFPUnordered] -> [^8]. [RetN] -> [^(operands at: 0) = 0 ifTrue: [4] ifFalse: [8]]. [Stop] -> [^4]. "Arithmetic" [AddCqR] -> [^self rotateable8bitSignedImmediate: (operands at: 0) ifTrue: [:r :i :n| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [AndCqR] -> [^self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| 4] ifFalse: [self literalLoadInstructionBytes = 4 ifTrue: [8] ifFalse: [1 << (operands at: 0) highBit = ((operands at: 0) + 1) ifTrue: [8] ifFalse: [self literalLoadInstructionBytes + 4]]]]. [AndCqRR] -> [^self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| 4] ifFalse: [self literalLoadInstructionBytes = 4 ifTrue: [8] ifFalse: [1 << (operands at: 0) highBit = ((operands at: 0) + 1) ifTrue: [8] ifFalse: [self literalLoadInstructionBytes + 4]]]]. [CmpCqR] -> [^self rotateable8bitSignedImmediate: (operands at: 0) ifTrue: [:r :i :n| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [OrCqR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [SubCqR] -> [^self rotateable8bitSignedImmediate: (operands at: 0) ifTrue: [:r :i :n| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [TstCqR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [XorCqR] -> [^self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| 4] ifFalse: [self literalLoadInstructionBytes = 4 ifTrue: [8] ifFalse: [1 << (operands at: 0) highBit = ((operands at: 0) + 1) ifTrue: [8] ifFalse: [self literalLoadInstructionBytes + 4]]]]. [AddCwR] -> [^self literalLoadInstructionBytes + 4]. [AndCwR] -> [^self literalLoadInstructionBytes + 4]. [CmpCwR] -> [^self literalLoadInstructionBytes + 4]. [OrCwR] -> [^self literalLoadInstructionBytes + 4]. [SubCwR] -> [^self literalLoadInstructionBytes + 4]. [XorCwR] -> [^self literalLoadInstructionBytes + 4]. [AddRR] -> [^4]. [AndRR] -> [^4]. [CmpRR] -> [^4]. [OrRR] -> [^4]. [XorRR] -> [^4]. [SubRR] -> [^4]. [NegateR] -> [^4]. [LoadEffectiveAddressMwrR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [LogicalShiftLeftCqR] -> [^4]. [LogicalShiftRightCqR] -> [^4]. [ArithmeticShiftRightCqR] -> [^4]. [LogicalShiftLeftRR] -> [^4]. [LogicalShiftRightRR] -> [^4]. [ArithmeticShiftRightRR] -> [^4]. [AddRdRd] -> [^4]. [CmpRdRd] -> [^4]. [SubRdRd] -> [^4]. [MulRdRd] -> [^4]. [DivRdRd] -> [^4]. [SqrtRd] -> [^4]. "ARM Specific Arithmetic" [SMULL] -> [^4]. [MSR] -> [^4]. [CMPSMULL] -> [^4]. "special compare for genMulR:R: usage" "Data Movement" [MoveCqR] -> [^self literalLoadInstructionBytes = 4 ifTrue: [self literalLoadInstructionBytes] ifFalse: [self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| 4] ifFalse: [self literalLoadInstructionBytes]]]. [MoveCwR] -> [^self literalLoadInstructionBytes = 4 ifTrue: [self literalLoadInstructionBytes] ifFalse: [(self inCurrentCompilation: (operands at: 0)) ifTrue: [4] ifFalse: [self literalLoadInstructionBytes]]]. [MoveRR] -> [^4]. [MoveRdRd] -> [^4]. [MoveAwR] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveRAw] -> [^(self isAddressRelativeToVarBase: (operands at: 1)) ifTrue: [4] ifFalse: [self literalLoadInstructionBytes + 4]]. + [MoveAbR] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) + ifTrue: [4] + ifFalse: [self literalLoadInstructionBytes + 4]]. + [MoveRAb] -> [^(self isAddressRelativeToVarBase: (operands at: 1)) + ifTrue: [4] + ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveRMwr] -> [^self is12BitValue: (operands at: 1) ifTrue: [:u :i| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveRdM64r] -> [^self literalLoadInstructionBytes + 4]. [MoveMbrR] -> [^self is12BitValue: (operands at: 0) ifTrue: [:u :i| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveRMbr] -> [^self is12BitValue: (operands at: 1) ifTrue: [:u :i| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveM16rR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveM64rRd] -> [^self literalLoadInstructionBytes + 4]. [MoveMwrR] -> [^self is12BitValue: (operands at: 0) ifTrue: [:u :i| 4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveXbrRR] -> [^4]. [MoveRXbrR] -> [^4]. [MoveXwrRR] -> [^4]. [MoveRXwrR] -> [^4]. [PopR] -> [^4]. [PushR] -> [^4]. [PushCw] -> [^self literalLoadInstructionBytes = 4 ifTrue: [self literalLoadInstructionBytes + 4] ifFalse: [(self inCurrentCompilation: (operands at: 0)) ifTrue: [8] ifFalse: [self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| 8] ifFalse: [self literalLoadInstructionBytes + 4]]]]. [PushCq] -> [^self literalLoadInstructionBytes = 4 ifTrue: [self literalLoadInstructionBytes + 4] ifFalse: [self rotateable8bitBitwiseImmediate: (operands at: 0) ifTrue: [:r :i :n| 8] ifFalse: [self literalLoadInstructionBytes + 4]]]. [PrefetchAw] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [4] ifFalse: [self literalLoadInstructionBytes + 4]]. "Conversion" [ConvertRRd] -> [^8]. }. ^0 "to keep C compiler quiet" ! Item was added: + ----- Method: CogARMCompiler>>concretizeMoveAbR (in category 'generate machine code - concretize') ----- + concretizeMoveAbR + "Will get inlined into concretizeAt: switch." + <inline: true> + | srcAddr destReg instrOffset| + srcAddr := operands at: 0. + destReg := self concreteRegister: (operands at: 1). + (self isAddressRelativeToVarBase: srcAddr) ifTrue: + [self machineCodeAt: 0 put: (self ldrb: destReg rn: ConcreteVarBaseReg plus: 1 imm: srcAddr - cogit varBaseAddress). + ^machineCodeSize := 4]. + "load the address into ConcreteIPReg" + instrOffset := self moveCw: srcAddr intoR: ConcreteIPReg. + "We *could* overwrite the last instruction above with a LDR a, b, last-byte-of-srcAddr BUT that would break if we change to loading literals instead of forming long constants" + self machineCodeAt: instrOffset put: (self ldrb: destReg rn: ConcreteIPReg plus: 1 imm: 0). + ^machineCodeSize := instrOffset + 4! Item was added: + ----- Method: CogARMCompiler>>concretizeMoveRAb (in category 'generate machine code - concretize') ----- + concretizeMoveRAb + "Will get inlined into concretizeAt: switch." + "LEA ConcreteIPReg + strb srcReg, [ConcreteIPReg]" + <inline: true> + | srcReg destAddr instrOffset| + srcReg := self concreteRegister: (operands at: 0). + destAddr := operands at: 1. + (self isAddressRelativeToVarBase: destAddr) ifTrue: + [self machineCodeAt: 0 put: (self strb: srcReg rn: ConcreteVarBaseReg plus: 1 imm: destAddr - cogit varBaseAddress). + ^machineCodeSize := 4]. + "load the address into ConcreteIPReg" + instrOffset := self moveCw: destAddr intoR: ConcreteIPReg. + "We *could* overwrite the last instruction above with a LDR a, b, last-byte-of-srcAddr BUT that would break if we change to loading literals instead of forming long constants" + self machineCodeAt: instrOffset put: (self strb: srcReg rn: ConcreteIPReg plus: 1 imm: 0). + ^machineCodeSize := instrOffset + 4! Item was changed: ----- Method: CogARMCompiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." <returnTypeC: #void> conditionOrNil ifNotNil: [self concretizeConditionalInstruction. ^self]. opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [Literal] -> [^self concretizeLiteral]. [AlignmentNops] -> [^self concretizeAlignmentNops]. [Fill16] -> [^self concretizeFill16]. [Fill32] -> [^self concretizeFill32]. [FillFromWord] -> [^self concretizeFillFromWord]. [Nop] -> [^self concretizeNop]. "Control" [Call] -> [^self concretizeCall]. "call code within code space" [CallFull] -> [^self concretizeCallFull]. "call code anywhere in address space" [JumpR] -> [^self concretizeJumpR]. [JumpFull] -> [^self concretizeJumpFull]."jump within address space" [JumpLong] -> [^self concretizeConditionalJump: AL]."jumps witihn code space" [JumpLongZero] -> [^self concretizeConditionalJump: EQ]. [JumpLongNonZero] -> [^self concretizeConditionalJump: NE]. [Jump] -> [^self concretizeConditionalJump: AL]. [JumpZero] -> [^self concretizeConditionalJump: EQ]. [JumpNonZero] -> [^self concretizeConditionalJump: NE]. [JumpNegative] -> [^self concretizeConditionalJump: MI]. [JumpNonNegative] -> [^self concretizeConditionalJump: PL]. [JumpOverflow] -> [^self concretizeConditionalJump: VS]. [JumpNoOverflow] -> [^self concretizeConditionalJump: VC]. [JumpCarry] -> [^self concretizeConditionalJump: CS]. [JumpNoCarry] -> [^self concretizeConditionalJump: CC]. [JumpLess] -> [^self concretizeConditionalJump: LT]. [JumpGreaterOrEqual] -> [^self concretizeConditionalJump: GE]. [JumpGreater] -> [^self concretizeConditionalJump: GT]. [JumpLessOrEqual] -> [^self concretizeConditionalJump: LE]. [JumpBelow] -> [^self concretizeConditionalJump: CC]. "unsigned lower" [JumpAboveOrEqual] -> [^self concretizeConditionalJump: CS]. "unsigned greater or equal" [JumpAbove] -> [^self concretizeConditionalJump: HI]. [JumpBelowOrEqual] -> [^self concretizeConditionalJump: LS]. [JumpFPEqual] -> [^self concretizeFPConditionalJump: EQ]. [JumpFPNotEqual] -> [^self concretizeFPConditionalJump: NE]. [JumpFPLess] -> [^self concretizeFPConditionalJump: LT]. [JumpFPGreaterOrEqual] -> [^self concretizeFPConditionalJump: GE]. [JumpFPGreater] -> [^self concretizeFPConditionalJump: GT]. [JumpFPLessOrEqual] -> [^self concretizeFPConditionalJump: LE]. [JumpFPOrdered] -> [^self concretizeFPConditionalJump: VC]. [JumpFPUnordered] -> [^self concretizeFPConditionalJump: VS]. [RetN] -> [^self concretizeRetN]. [Stop] -> [^self concretizeStop]. "Arithmetic" [AddCqR] -> [^self concretizeNegateableDataOperationCqR: AddOpcode]. [AndCqR] -> [^self concretizeInvertibleDataOperationCqR: AndOpcode]. [AndCqRR] -> [^self concretizeAndCqRR]. [CmpCqR] -> [^self concretizeNegateableDataOperationCqR: CmpOpcode]. [OrCqR] -> [^self concretizeDataOperationCqR: OrOpcode]. [SubCqR] -> [^self concretizeSubCqR]. [TstCqR] -> [^self concretizeTstCqR]. [XorCqR] -> [^self concretizeInvertibleDataOperationCqR: XorOpcode]. [AddCwR] -> [^self concretizeDataOperationCwR: AddOpcode]. [AndCwR] -> [^self concretizeDataOperationCwR: AndOpcode]. [CmpCwR] -> [^self concretizeDataOperationCwR: CmpOpcode]. [OrCwR] -> [^self concretizeDataOperationCwR: OrOpcode]. [SubCwR] -> [^self concretizeDataOperationCwR: SubOpcode]. [XorCwR] -> [^self concretizeDataOperationCwR: XorOpcode]. [AddRR] -> [^self concretizeDataOperationRR: AddOpcode]. [AndRR] -> [^self concretizeDataOperationRR: AndOpcode]. [CmpRR] -> [^self concretizeDataOperationRR: CmpOpcode]. [OrRR] -> [^self concretizeDataOperationRR: OrOpcode]. [SubRR] -> [^self concretizeDataOperationRR: SubOpcode]. [XorRR] -> [^self concretizeDataOperationRR: XorOpcode]. [AddRdRd] -> [^self concretizeAddRdRd]. [CmpRdRd] -> [^self concretizeCmpRdRd]. [DivRdRd] -> [^self concretizeDivRdRd]. [MulRdRd] -> [^self concretizeMulRdRd]. [SubRdRd] -> [^self concretizeSubRdRd]. [SqrtRd] -> [^self concretizeSqrtRd]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [ArithmeticShiftRightCqR] -> [^self concretizeArithmeticShiftRightCqR]. [LogicalShiftRightCqR] -> [^self concretizeLogicalShiftRightCqR]. [LogicalShiftLeftCqR] -> [^self concretizeLogicalShiftLeftCqR]. [ArithmeticShiftRightRR] -> [^self concretizeArithmeticShiftRightRR]. [LogicalShiftLeftRR] -> [^self concretizeLogicalShiftLeftRR]. [LogicalShiftRightRR] -> [^self concretizeLogicalShiftRightRR]. "ARM Specific Arithmetic" [SMULL] -> [^self concretizeSMULL] . [CMPSMULL] -> [^self concretizeCMPSMULL]. [MSR] -> [^self concretizeMSR]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. [MoveRR] -> [^self concretizeMoveRR]. [MoveAwR] -> [^self concretizeMoveAwR]. [MoveRAw] -> [^self concretizeMoveRAw]. + [MoveAbR] -> [^self concretizeMoveAbR]. + [MoveRAb] -> [^self concretizeMoveRAb]. [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeMoveRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveM64rRd] -> [^self concretizeMoveM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveRXbrR] -> [^self concretizeMoveRXbrR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeMoveRdM64r]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCq] -> [^self concretizePushCq]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. "Conversion" [ConvertRRd] -> [^self concretizeConvertRRd]}! Item was added: + ----- Method: CogARMCompiler>>instructionAddressBefore: (in category 'inline cacheing') ----- + instructionAddressBefore: followingAddress + "Answer the instruction address immediately preceding followingAddress." + <inline: true> + ^followingAddress -4! Item was changed: ----- Method: CogARMCompiler>>instructionBeforeAddress: (in category 'inline cacheing') ----- instructionBeforeAddress: followingAddress "Answer the instruction immediately preceding followingAddress." <inline: true> + ^objectMemory longAt: (self instructionAddressBefore: followingAddress)! - ^objectMemory longAt: followingAddress -4! Item was changed: ----- Method: CogARMCompiler>>loadLiteralByteSize (in category 'accessing') ----- loadLiteralByteSize + "Answer the byte size of a MoveCwR opcode's corresponding machine code. On ARM this is a single instruction pc-relative register load - unless we have made a mistake and not turned on the out of line literals manager" + ^4! - "Answer the byte size of a MoveCwR opcode's corresponding machine code" - ^16! Item was changed: ----- Method: CogARMCompiler>>relocateCallBeforeReturnPC:by: (in category 'inline cacheing') ----- relocateCallBeforeReturnPC: retpc by: delta | instr distanceDiv4 | self assert: delta \\ 4 = 0. delta ~= 0 ifTrue: [instr := self instructionBeforeAddress: retpc. self assert: ((self instructionIsB: instr) or: [self instructionIsBL: instr]). distanceDiv4 := instr bitAnd: 16rFFFFFF. distanceDiv4 := distanceDiv4 + (delta // 4). + objectMemory longAt: (self instructionAddressBefore: retpc ) put: ((instr bitAnd: 16rFF000000) bitOr: (distanceDiv4 bitAnd: 16rFFFFFF))]! - objectMemory longAt: retpc - 4 put: ((instr bitAnd: 16rFF000000) bitOr: (distanceDiv4 bitAnd: 16rFFFFFF))]! Item was added: + ----- Method: CogARMCompiler>>rewriteCPICJumpAt:target: (in category 'inline cacheing') ----- + rewriteCPICJumpAt: callSiteReturnAddress target: callTargetAddress + "Rewrite a jump instruction to call a different target. This variant is used to reset the + jumps in the prototype CPIC to suit each use,. + Answer the extent of the code change which is used to compute the range of the icache to flush." + <var: #callSiteReturnAddress type: #usqInt> + <var: #callTargetAddress type: #usqInt> + ^self rewriteTransferAt: callSiteReturnAddress target: callTargetAddress! Item was changed: ----- Method: CogARMCompiler>>rewriteCallAt:target: (in category 'inline cacheing') ----- rewriteCallAt: callSiteReturnAddress target: callTargetAddress "Rewrite a call instruction to call a different target. This variant is used to link PICs + in ceSendMiss et al,. + Answer the extent of the code change which is used to compute the range of the icache to flush." - in ceSendMiss et al, and to rewrite cached primitive calls. Answer the extent of - the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> + ^self rewriteTransferAt: callSiteReturnAddress target: callTargetAddress! - | callDistance call | - "self cCode: '' - inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." - false - ifTrue: [self assert: callTargetAddress >= cogit minCallAddress] - ifFalse: [callTargetAddress >= cogit minCallAddress ifFalse: - [self error: 'linking callsite to invalid address']]. - callDistance := (callTargetAddress - (callSiteReturnAddress + 8 "pc offset"- 4 "return offset")) signedIntToLong. - self assert: (self isInImmediateJumpRange: callDistance). "we don't support long call updates, yet" - call := self bl: callDistance. - objectMemory longAt: callSiteReturnAddress - 4 put: call. - - self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) signedIntToLong = callTargetAddress. - "self cCode: '' - inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." - ^4! Item was changed: ----- Method: CogARMCompiler>>rewriteCallFullAt:target: (in category 'inline cacheing') ----- rewriteCallFullAt: callSiteReturnAddress target: callTargetAddress "Rewrite a callFull instruction to jump to a different target. This variant + is used to rewrite cached primitive calls where we load the target address into ip + and use the 'blx ip' instruction for the actual call. + Answer the extent of the - is used to rewrite cached primitive calls. Answer the extent of the code change which is used to compute the range of the icache to flush." <inline: true> ^self rewriteFullTransferAt: callSiteReturnAddress target: callTargetAddress expectedInstruction: 16rE12FFF3C! Item was changed: ----- Method: CogARMCompiler>>rewriteJumpFullAt:target: (in category 'inline cacheing') ----- rewriteJumpFullAt: callSiteReturnAddress target: callTargetAddress "Rewrite a full jump instruction to jump to a different target. This variant + is used to rewrite cached primitive calls where we load the target address into ip + and use the 'bx ip' instruction for the actual jump. + Answer the extent of the - is used to rewrite cached primitive calls. Answer the extent of the code change which is used to compute the range of the icache to flush." <inline: true> ^self rewriteFullTransferAt: callSiteReturnAddress target: callTargetAddress expectedInstruction: 16rE12FFF1C! Item was added: + ----- Method: CogARMCompiler>>rewriteJumpLongAt:target: (in category 'inline cacheing') ----- + rewriteJumpLongAt: callSiteReturnAddress target: callTargetAddress + "Rewrite a jump instruction to call a different target. This variant is used to reset the + jumps in the prototype CPIC to suit each use,. + Answer the extent of the code change which is used to compute the range of the icache to flush." + <var: #callSiteReturnAddress type: #usqInt> + <var: #callTargetAddress type: #usqInt> + ^self rewriteTransferAt: callSiteReturnAddress target: callTargetAddress! Item was added: + ----- Method: CogARMCompiler>>rewriteTransferAt:target: (in category 'inline cacheing') ----- + rewriteTransferAt: callSiteReturnAddress target: callTargetAddress + "Rewrite a call/jump instruction to call a different target. This variant is used to link PICs + in ceSendMiss et al, and to rewrite call/jumps in CPICs. + Answer the extent of + the code change which is used to compute the range of the icache to flush." + <var: #callSiteReturnAddress type: #usqInt> + <var: #callTargetAddress type: #usqInt> + | callDistance instr | + "for debug - [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." + false + ifTrue: [self assert: callTargetAddress >= cogit minCallAddress] + ifFalse: [callTargetAddress >= cogit minCallAddress ifFalse: + [self error: 'linking callsite to invalid address']]. + + callDistance := (callTargetAddress - (callSiteReturnAddress + 8 "pc offset"- 4 "return offset")) signedIntToLong. + self assert: (self isInImmediateJumpRange: callDistance). "we don't support long call updates, yet" + + instr := self instructionBeforeAddress: callSiteReturnAddress. + self assert: ((self instructionIsB: instr) or: [self instructionIsBL: instr]). + + objectMemory longAt: (self instructionAddressBefore: callSiteReturnAddress) put: ((instr bitAnd: 16rFF000000) bitOr: (callDistance // 4 bitAnd: 16rFFFFFF)). + + self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) signedIntToLong = callTargetAddress. + + ^4! Item was added: + ----- Method: CogAbstractInstruction>>rewriteCPICCaseAt:tag:objRef:target: (in category 'inline cacheing') ----- + rewriteCPICCaseAt: followingAddress tag: newTag objRef: newObjRef target: newTarget + "rewrite the three values involved in a CPIC case. Used by the create & extend cpcic methods" + self subclassResponsibility + ! Item was added: + ----- Method: CogIA32Compiler>>rewriteCPICCaseAt:tag:objRef:target: (in category 'inline cacheing') ----- + rewriteCPICCaseAt: followingAddress tag: newTag objRef: newObjRef target: newTarget + "rewrite the three values involved in a CPIC case. Used by the create & extend cpcic methods" + + "IA32 CPIC cases are + cmpl $0x newTag, %eax + movl $0x newObjRef, %ebx + jz .+0x newTarget (0x00010924) + " + "rewite the tag via the first ldr" + self storeLiteral: newTag beforeFollowingAddress: (followingAddress -11). + + "write the obj ref/operand via the second ldr" + self storeLiteral: newObjRef beforeFollowingAddress: (followingAddress - 6). + + "write the jump address for the new target address" + self rewriteJumpLongAt: followingAddress target: newTarget! Item was added: + ----- Method: CogIA32Compiler>>rewriteCPICJumpAt:target: (in category 'inline cacheing') ----- + rewriteCPICJumpAt: callSiteReturnAddress target: callTargetAddress + "Rewrite the short jump instruction to jump to a new cpic case target. " + <var: #callSiteReturnAddress type: #usqInt> + <var: #callTargetAddress type: #usqInt> + | callDistance | + callDistance := (callTargetAddress - callSiteReturnAddress) signedIntToLong. + self assert: (callDistance < 256). + objectMemory + byteAt: callSiteReturnAddress - 1 put: (callDistance bitAnd: 16rFF). + "self cCode: '' + inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." + ^2! Item was changed: ----- Method: CogInLineLiteralsARMCompiler>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress "Rewrite an inline cache to call a different target for a new tag. This variant is used to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | call callDistance | false ifTrue: [self assert: callTargetAddress >= cogit minCallAddress] ifFalse: [callTargetAddress >= cogit minCallAddress ifFalse: [self error: 'linking callsite to invalid address']]. callDistance := (callTargetAddress - (callSiteReturnAddress + 8 "pc offset"- 4 "return offset")) signedIntToLong. self assert: (self isInImmediateJumpRange: callDistance). "we don't support long call updates here" call := self bl: callDistance. + objectMemory longAt: (self instructionAddressBefore: callSiteReturnAddress ) put: call. + self insert32BitOperand: cacheTag into4InstructionsPreceding: (self instructionAddressBefore: callSiteReturnAddress ). - objectMemory longAt: callSiteReturnAddress - 4 put: call. - self insert32BitOperand: cacheTag into4InstructionsPreceding: callSiteReturnAddress - 4. self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) signedIntToLong = callTargetAddress. + self assert: (self extract32BitOperandFrom4InstructionsPreceding: (self instructionAddressBefore: callSiteReturnAddress )) = cacheTag. - self assert: (self extract32BitOperandFrom4InstructionsPreceding: callSiteReturnAddress - 4) = cacheTag. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 20 to: callSiteReturnAddress - 1]." ^20! Item was changed: ----- Method: CogMethod>>containsAddress: (in category 'testing') ----- containsAddress: anAddress + "is anAddress within my bounds; not a test of addresses referred to within instructions in the method" <inline: true> ^self asUnsignedInteger <= anAddress asUnsignedInteger and: [self asUnsignedInteger + self blockSize >= anAddress asUnsignedInteger]! Item was changed: ----- Method: CogMethodZone>>printOpenPICList (in category 'accessing') ----- printOpenPICList <api> | openPIC | <var: #openPIC type: #'CogMethod *'> openPIC := openPICList. [openPIC == nil] whileFalse: + [coInterpreter printCogMethod: openPIC. - [self printCogMethod: openPIC. openPIC := self cCoerceSimple: openPIC nextOpenPIC to: #'CogMethod *']! Item was added: + ----- Method: CogOutOfLineLiteralsARMCompiler>>literalBeforeFollowingAddress: (in category 'inline cacheing') ----- + literalBeforeFollowingAddress: followingAddress + "Return the literal referenced by the instruction immediately preceding followingAddress." + ^objectMemory longAt: (self pcRelativeAddressAt: (self instructionAddressBefore: followingAddress))! Item was added: + ----- Method: CogOutOfLineLiteralsARMCompiler>>rewriteCPICCaseAt:tag:objRef:target: (in category 'inline cacheing') ----- + rewriteCPICCaseAt: followingAddress tag: newTag objRef: newObjRef target: newTarget + "rewrite the three values involved in a CPIC case. Used by the create & extend cpcic methods" + + "ARM CPIC cases are + ldr TempReg, [pc relative -> tag] + cmp TempReg0, TempReg + ldr SendNumArgs, [pc relative -> obj ref] + beq target" + "rewite the tag via the first ldr" + objectMemory longAt: (self pcRelativeAddressAt: followingAddress - 16) put: newTag. + + "write the obj ref/operand via the second ldr" + objectMemory longAt: (self pcRelativeAddressAt: followingAddress - 8) put: newObjRef. + + "write the jump address for the new target address" + self rewriteJumpLongAt: followingAddress target: newTarget! Item was changed: ----- Method: CogOutOfLineLiteralsARMCompiler>>rewriteFullTransferAt:target:expectedInstruction: (in category 'inline cacheing') ----- rewriteFullTransferAt: callSiteReturnAddress target: callTargetAddress expectedInstruction: expectedInstruction "Rewrite a CallFull or JumpFull instruction to transfer to a different target. + This variant is used to rewrite cached primitive calls where we load the target address into ip + and use the 'bx ip' or 'blx ip' instruction for the actual jump or call. + Answer the extent - This variant is used to rewrite cached primitive calls. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> self assert: (self instructionBeforeAddress: callSiteReturnAddress) = expectedInstruction. objectMemory longAt: (self pcRelativeAddressAt: callSiteReturnAddress - 8) put: callTargetAddress. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 8 to: (self pcRelativeAddressAt: callSiteReturnAddress - 8)]." ^0! Item was changed: ----- Method: CogOutOfLineLiteralsARMCompiler>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress "Rewrite an inline cache to call a different target for a new tag. This variant is used to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | call callDistance | callTargetAddress >= cogit minCallAddress ifFalse: [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - (callSiteReturnAddress + 8 "pc offset"- 4 "return offset")) signedIntToLong. self assert: (self isInImmediateJumpRange: callDistance). "we don't support long call updates here" call := self bl: callDistance. objectMemory + longAt: (self instructionAddressBefore: callSiteReturnAddress ) put: call; - longAt: callSiteReturnAddress - 4 put: call; longAt: (self pcRelativeAddressAt: callSiteReturnAddress - 8) put: cacheTag. self assert: (self inlineCacheTagAt: callSiteReturnAddress) = cacheTag. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 8 to: (self pcRelativeAddressAt: callSiteReturnAddress - 8)]." ^4! Item was changed: ----- Method: CogOutOfLineLiteralsARMCompiler>>storeLiteral:beforeFollowingAddress: (in category 'inline cacheing') ----- storeLiteral: literal beforeFollowingAddress: followingAddress "Rewrite the literal in the instruction immediately preceding followingAddress." + objectMemory longAt: (self pcRelativeAddressAt: (self instructionAddressBefore: followingAddress )) put: literal! - objectMemory longAt: (self pcRelativeAddressAt: followingAddress - 4) put: literal! Item was changed: CogClass subclass: #Cogit + instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager callerSavedRegMask postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer cPICPrototype cPICEndOfCodeOffset cPICEndOfCodeLabel maxCPICCases' - instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager callerSavedRegMask postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer' classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AltNumSpecialSelectors AnnotationConstantNames AnnotationShift AnnotationsWithBytecodePCs BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation FirstSpecialSelector HasBytecodePC IsAbsPCReference IsAnnotationExtension IsDirectedSuperSend IsDisplacementX2N IsNSDynamicSuperSend IsNSImplicitReceiverSend IsNSSelfSend IsNSSendCall IsObjectReference IsRelativeCall IsSendCall IsSuperSend MapEnd MaxCompiledPrimitiveIndex MaxStackAllocSize MaxX2NDisplacement NSCClassTagIndex NSCEnclosingObjectIndex NSCNumArgsIndex NSCSelectorIndex NSCTargetIndex NSSendIsPCAnnotated NumObjRefsInRuntime NumOopsPerNSC NumSpecialSelectors NumTrampolines ProcessorClass' poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMBytecodeConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 4/6/2015 15:56' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventually the total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'nsSendCacheSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'selfSendTrampolines' 'dynamicSuperSendTrampolines' 'implicitReceiverSendTrampolines' 'outerSendTrampolines' 'ceEnclosingObjectTrampoline' 'numIRCs' 'indexOfIRC' 'theIRCs') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"dispdbg.h"'; "must precede cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up" addHeaderFile:'"cogmethod.h"'. NewspeakVM ifTrue: [aCCodeGenerator addHeaderFile:'"nssendcache.h"']. aCCodeGenerator addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverReg declareC: 'void (*ceCallCogCodePopReceiverReg)(void)'; var: #realCECallCogCodePopReceiverReg declareC: 'void (*realCECallCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverAndClassRegs declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)'; var: #realCECallCogCodePopReceiverAndClassRegs declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMiss entry noCheckEntry selfSendEntry dynSuperEntry + picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 cPICEndOfCodeLabel) - picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #ordinarySendTrampolines declareC: 'sqInt ordinarySendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #directedSuperSendTrampolines declareC: 'sqInt directedSuperSendTrampolines[NumSendTrampolines]'; var: #selfSendTrampolines declareC: 'sqInt selfSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #implicitReceiverSendTrampolines declareC: 'sqInt implicitReceiverSendTrampolines[NumSendTrampolines]'; var: #outerSendTrampolines declareC: 'sqInt outerSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static usqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #labelCounter type: #int; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator vmClass generatorTable ifNotNil: [:bytecodeGenTable| aCCodeGenerator var: #generatorTable declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']', (self tableInitializerFor: bytecodeGenTable in: aCCodeGenerator); var: #primitiveGeneratorTable declareC: 'static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]', (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable in: aCCodeGenerator)]. "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was changed: ----- Method: Cogit>>addressOfEndOfCase:inCPIC: (in category 'in-line cacheing') ----- + addressOfEndOfCase: n inCPIC: cPIC + "calculate the end of the n'th case statement - which is complicated because we have case 1 right at the top of our CPIC and then build up from the last one. Yes I know this sounds strange, but trust me - I'm an Engineer, we do things backwards all the emit" + - addressOfEndOfCase: n inCPIC: cPIC - "N.B. zero-relative" <var: #cPIC type: #'CogMethod *'> + self assert: (n >= 1and: [n <= maxCPICCases]). + n = 1 + ifTrue: [^ cPIC asInteger + firstCPICCaseOffset] + ifFalse: [^ cPIC asInteger + firstCPICCaseOffset + (maxCPICCases + 1 - n * cPICCaseSize)]! - ^cPIC asInteger + firstCPICCaseOffset + (n * cPICCaseSize)! Item was changed: ----- Method: Cogit>>cPIC:HasTarget: (in category 'in-line cacheing') ----- cPIC: cPIC HasTarget: targetMethod + "Are any of the jumps from this CPIC to targetMethod?" <var: #cPIC type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> | pc target | target := targetMethod asUnsignedInteger + cmNoCheckEntryOffset. pc := cPIC asInteger + firstCPICCaseOffset. + "Since this is a fast test doing simple compares we don't need to care that some + cases have nonsense addresses in there. Just zip on through" 1 to: cPIC cPICNumCases do: [:i| + target = (backEnd jumpLongTargetBeforeFollowingAddress: pc) ifTrue: - target = (literalsManager cPICCase: i jumpTargetBefore: pc) ifTrue: [^true]. pc := pc + cPICCaseSize]. ^false! Item was changed: ----- Method: Cogit>>cPICHasForwardedClass: (in category 'in-line cacheing') ----- + cPICHasForwardedClass: cPIC + "The first case in a CPIC doesn't have a class reference so we need only step over actually usd subsequent cases." - cPICHasForwardedClass: cPIC - <var: #cPIC type: #'CogMethod *'> | pc | + <var: #cPIC type: #'CogMethod *'> + "start by finding the address of the topmost case, the cPICNumCases'th one" + pc := (self addressOfEndOfCase: cPIC cPICNumCases inCPIC: cPIC) + - backEnd jumpLongConditionalByteSize. + 2 to: cPIC cPICNumCases do: + [:i | | classIndex | + classIndex := literalsManager classRefInClosedPICAt: pc. + (objectMemory isForwardedClassIndex: classIndex) + ifTrue: [^ true]. + "since we started at the top, we can just add the case size each time to move on to the next case" + pc := pc + cPICCaseSize]. + ^ false! - pc := cPIC asUnsignedInteger - + firstCPICCaseOffset - + cPICCaseSize - - backEnd jumpLongConditionalByteSize. - 2 to: cPIC cPICNumCases do: - [:i| | classIndex | - classIndex := literalsManager classRefInClosedPICAt: pc. - (objectMemory isForwardedClassIndex: classIndex) ifTrue: - [^true]. - pc := pc + cPICCaseSize]. - ^false! Item was changed: ----- Method: Cogit>>cPICHasFreedTargets: (in category 'in-line cacheing') ----- cPICHasFreedTargets: cPIC + "scan the CPIC for target methods that have been freed. " <var: #cPIC type: #'CogMethod *'> | pc entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> + - pc := cPIC asInteger + firstCPICCaseOffset. 1 to: cPIC cPICNumCases do: [:i| + pc := self addressOfEndOfCase: i inCPIC: cPIC. + entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. - entryPoint := literalsManager cPICCase: i jumpTargetBefore: pc. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" (cPIC containsAddress: entryPoint) ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMFree]). targetMethod cmType = CMFree ifTrue: + [^true]]]. - [^true]]. - pc := pc + cPICCaseSize]. ^false! Item was changed: ----- Method: Cogit>>ceCPICMiss:receiver: (in category 'in-line cacheing') ----- ceCPICMiss: cPIC receiver: receiver "Code entry closed PIC miss. A send has fallen through a closed (finite) polymorphic inline cache. Either extend it or patch the send site to an open PIC. The stack looks like: receiver args sp=> sender return address" <var: #cPIC type: #'CogMethod *'> <api> | outerReturn newTargetMethodOrNil errorSelectorOrNil cacheTag result | self cCode: '' inSmalltalk: [cPIC isInteger ifTrue: [^self ceCPICMiss: (self cogMethodSurrogateAt: cPIC) receiver: receiver]]. (objectMemory isOopForwarded: receiver) ifTrue: [^coInterpreter ceSendFromInLineCacheMiss: cPIC]. outerReturn := coInterpreter stackTop. self deny: (backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue. + cPIC cPICNumCases < maxCPICCases - cPIC cPICNumCases < numPICCases ifTrue: [self lookup: cPIC selector for: receiver methodAndErrorSelectorInto: [:method :errsel| newTargetMethodOrNil := method. errorSelectorOrNil := errsel]] ifFalse: [newTargetMethodOrNil := errorSelectorOrNil := nil]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. + (cPIC cPICNumCases >= maxCPICCases - (cPIC cPICNumCases >= numPICCases or: [(errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue: [result := self patchToOpenPICFor: cPIC selector numArgs: cPIC cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: cPIC]. "Now extend the PIC with the new case." self cogExtendPIC: cPIC CaseNMethod: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. "Jump back into the pic at its entry in case this is an MNU." coInterpreter executeCogPIC: cPIC fromLinkedSendWithReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil! Item was changed: ----- Method: Cogit>>checkValidObjectReferencesInClosedPIC: (in category 'garbage collection') ----- checkValidObjectReferencesInClosedPIC: cPIC <var: #cPIC type: #'CogMethod *'> | ok pc | ok := true. pc := cPIC asInteger + firstCPICCaseOffset. + + "first we check the obj ref at the beginning of the CPIC" (self checkMaybeObjRefInClosedPIC: (literalsManager objRefInClosedPICAt: pc - backEnd jumpLongByteSize)) ifFalse: [self print: 'object leak in CPIC '; printHex: cPIC asInteger; print: ' @ '; printHex: pc - backEnd jumpLongByteSize; cr. ok := false]. + + "Next we step over each case that is in use. We find the end address of the cPICNumCases'th case and can then just step forward by the case size thereafter" + pc := self addressOfEndOfCase: cPIC cPICNumCases inCPIC: cPIC. + + "For each case we check any object reference at the end address - sizeof(conditional instruction) and then increment the end address by case size" - pc := pc + cPICCaseSize. 2 to: cPIC cPICNumCases do: [:i| objectRepresentation inlineCacheTagsMayBeObjects ifTrue: [(self checkMaybeObjRefInClosedPIC: (literalsManager classRefInClosedPICAt: pc - backEnd jumpLongConditionalByteSize)) ifFalse: [self print: 'object leak in CPIC '; printHex: cPIC asInteger; print: ' @ '; printHex: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize; cr. ok := false]]. (self checkMaybeObjRefInClosedPIC: (literalsManager objRefInClosedPICAt: pc - backEnd jumpLongConditionalByteSize)) ifFalse: [self print: 'object leak in CPIC '; printHex: cPIC asInteger; print: ' @ '; printHex: pc - backEnd jumpLongConditionalByteSize; cr. ok := false]. pc := pc + cPICCaseSize]. ^ok! Item was changed: ----- Method: Cogit>>closedPICRefersToUnmarkedObject: (in category 'garbage collection') ----- closedPICRefersToUnmarkedObject: cPIC "Answer if the ClosedPIC refers to any unmarked objects or freed/freeable target methods, applying markAndTraceOrFreeCogMethod:firstVisit: to those targets to determine if freed/freeable." <var: #cPIC type: #'CogMethod *'> | pc offsetToLiteral object entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> (objectMemory isImmediate: cPIC selector) ifFalse: [(objectMemory isMarked: cPIC selector) ifFalse: [^true]]. - pc := cPIC asInteger + firstCPICCaseOffset. "First jump is unconditional; subsequent ones are conditional" offsetToLiteral := backEnd jumpLongByteSize. 1 to: cPIC cPICNumCases do: + [:i| + pc := self addressOfEndOfCase: i inCPIC: cPIC. + (objectRepresentation inlineCacheTagsMayBeObjects and: [i>1] ) "inline cache tags for the 0th case are at the send site" ifTrue: - [:i| - objectRepresentation inlineCacheTagsMayBeObjects ifTrue: [object := literalsManager classRefInClosedPICAt: pc - offsetToLiteral. ((objectRepresentation couldBeObject: object) and: [(objectMemory isMarked: object) not]) ifTrue: [^true]]. object := literalsManager objRefInClosedPICAt: pc - offsetToLiteral. ((objectRepresentation couldBeObject: object) and: [(objectMemory isMarked: object) not]) ifTrue: [^true]. offsetToLiteral := backEnd jumpLongConditionalByteSize. + entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. - entryPoint := literalsManager cPICCase: i jumpTargetBefore: pc. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" self assert: (entryPoint > methodZoneBase and: [entryPoint < methodZone freeStart]). (cPIC containsAddress: entryPoint) ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMFree]). (self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > pc asUnsignedInteger) ifTrue: [^true]]. + ]. - pc := pc + cPICCaseSize]. ^false! Item was changed: ----- Method: Cogit>>codeRangesFor: (in category 'disassembly') ----- codeRangesFor: cogMethod "Answer a sequence of ranges of code for the main method and all of the blocks in a CogMethod. N.B. These are in order of block dispatch, _not_ necessarily address order in the method." <doNotGenerate> | pc end blockEntry starts | cogMethod cmType = CMClosedPIC ifTrue: + [end := cogMethod asInteger + cPICEndOfCodeOffset - backEnd jumpLongByteSize. - [end := (self addressOfEndOfCase: cogMethod cPICNumCases - 1 inCPIC: cogMethod) + cPICEndSize. ^{ CogCodeRange from: cogMethod asInteger + (self sizeof: CogMethod) to: end cogMethod: cogMethod startpc: nil }]. end := (self mapEndFor: cogMethod) - 1. cogMethod blockEntryOffset = 0 ifTrue: [^{ CogCodeRange from: cogMethod asInteger + (self sizeof: CogMethod) to: end cogMethod: cogMethod startpc: (cogMethod cmType ~= CMOpenPIC ifTrue: [coInterpreter startPCOfMethodHeader: cogMethod methodHeader]) }]. pc := blockEntry := cogMethod blockEntryOffset + cogMethod asInteger. starts := OrderedCollection with: cogMethod. [pc < end] whileTrue: [| targetpc | targetpc := blockEntry. (backEnd isJumpAt: pc) ifTrue: [targetpc := backEnd jumpTargetPCAt: pc. targetpc < blockEntry ifTrue: [starts add: (self cCoerceSimple: targetpc - (self sizeof: CogBlockMethod) to: #'CogBlockMethod *')]]. pc := pc + (backEnd instructionSizeAt: pc)]. starts := starts asSortedCollection. ^(1 to: starts size + 1) collect: [:i| | cogSubMethod nextpc | i <= starts size ifTrue: [cogSubMethod := starts at: i. nextpc := i < starts size ifTrue: [(starts at: i + 1) address] ifFalse: [blockEntry]. CogCodeRange from: cogSubMethod address + (self sizeof: cogSubMethod) to: nextpc - 1 cogMethod: cogSubMethod startpc: (i = 1 ifTrue: [coInterpreter startPCOfMethodHeader: cogMethod methodHeader] ifFalse: [cogSubMethod startpc])] ifFalse: [CogCodeRange from: blockEntry to: end]]! Item was changed: ----- Method: Cogit>>cogExtendPIC:CaseNMethod:tag:isMNUCase: (in category 'in-line cacheing') ----- cogExtendPIC: cPIC CaseNMethod: caseNMethod tag: caseNTag isMNUCase: isMNUCase "Extend the cPIC with the supplied case. If caseNMethod is cogged dispatch direct to its unchecked entry-point. If caseNMethod is not cogged, jump to the fast interpreter dispatch, and if isMNUCase then dispatch to fast MNU invocation and mark the cPIC as having the MNU case for cache flushing." <var: #cPIC type: #'CogMethod *'> + | operand target address | + - | operand target address size end | - "stack allocate the various collections so that they - are effectively garbage collected on return." coInterpreter compilationBreak: cPIC selector point: (objectMemory numBytesOf: cPIC selector) isMNUCase: isMNUCase. + - self allocateOpcodes: 8 bytecodes: 0. - methodLabel address: cPIC asUnsignedInteger; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self assert: (objectRepresentation inlineCacheTagIsYoung: caseNTag) not. "Caller patches to open pic if caseNMethod is young." self assert: (caseNMethod notNil and: [(objectMemory isYoung: caseNMethod) not]). + (isMNUCase not and: [coInterpreter methodHasCogMethod: caseNMethod]) + ifTrue: "this isn't an mNU and we have an already cogged method to jump to" - (isMNUCase not - and: [coInterpreter methodHasCogMethod: caseNMethod]) - ifTrue: [operand := 0. target := (coInterpreter cogMethodOf: caseNMethod) asInteger + cmNoCheckEntryOffset] + ifFalse: - ifFalse: [operand := caseNMethod. isMNUCase + ifTrue: "this is an mNU so tag the CPIC header and setup a jump to the mNUAbort" - ifTrue: [cPIC cpicHasMNUCase: true. target := cPIC asInteger + (self sizeof: CogMethod)] + ifFalse: "setup a jump to the interpretAborth so we can cog the target method" - ifFalse: [target := cPIC asInteger + self picInterpretAbortOffset]]. + + "find the end address of the new case" + address := self addressOfEndOfCase: cPIC cPICNumCases +1 inCPIC: cPIC. + + backEnd rewriteCPICCaseAt: address tag: caseNTag objRef: operand target: target. + + "finally, rewrite the jump 3 instr before firstCPICCaseOffset to jump to the beginning of this new case" + self rewriteCPIC: cPIC caseJumpTo: address - cPICCaseSize. + - self CmpCw: caseNTag R: TempReg. - self MoveUniqueCw: operand R: SendNumArgsReg. - self DumpJumpLongZero: target. - self MoveCw: cPIC asUnsignedInteger R: ClassReg. - self JumpLong: (self cPICMissTrampolineFor: cPIC cmNumArgs). - self computeMaximumSizes. - address := self addressOfEndOfCase: cPIC cPICNumCases - 1 inCPIC: cPIC. - size := self generateInstructionsAt: address. - end := self outputInstructionsAt: address. processor flushICacheFrom: cPIC asUnsignedInteger to: cPIC asUnsignedInteger + closedPICSize. + "update the header flag for the number of cases" cPIC cPICNumCases: cPIC cPICNumCases + 1. ^0! Item was changed: ----- Method: Cogit>>cogMNUPICSelector:receiver:methodOperand:numArgs: (in category 'in-line cacheing') ----- cogMNUPICSelector: selector receiver: rcvr methodOperand: methodOperand numArgs: numArgs <api> "Attempt to create a one-case PIC for an MNU. The tag for the case is at the send site and so doesn't need to be generated." <returnTypeC: #'CogMethod *'> + | startAddress | - | startAddress size end | ((objectMemory isYoung: selector) or: [(objectRepresentation inlineCacheTagForInstance: rcvr) = self picAbortDiscriminatorValue]) ifTrue: [^0]. coInterpreter compilationBreak: selector point: (objectMemory numBytesOf: selector) isMNUCase: true. self assert: endCPICCase0 notNil. + "get memory in the code zone for the CPIC; if that fails we return an error code for the sender to use to work out how to blow up" startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [coInterpreter callForCogCompiledCodeCompaction. ^0]. + + "memcpy the prototype across to our allocated space; because anything else would be silly" + objectMemory mem: startAddress cp: cPICPrototype y: closedPICSize. + + self configureMNUCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') - "stack allocate the various collections so that they - are effectively garbage collected on return." - self allocateOpcodes: numPICCases * 9 bytecodes: 0. - methodLabel address: startAddress; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" - self compileMNUCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') methodOperand: methodOperand + numArgs: numArgs + delta: startAddress - cPICPrototype. + - numArgs: numArgs. - self computeMaximumSizes. - size := self generateInstructionsAt: startAddress + (self sizeof: CogMethod). - end := self outputInstructionsAt: startAddress + (self sizeof: CogMethod). - "The missOffset is the same as the interpretOffset. On RISCs it includes an additional instruction." - self assert: missOffset = ((backEnd hasLinkRegister ifTrue: [backEnd callInstructionByteSize] ifFalse: [0]) - + picInterpretAbort address + picInterpretAbort machineCodeSize - startAddress). - self assert: startAddress + cmEntryOffset = entry address. ^self fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') numArgs: numArgs numCases: 1 hasMNUCase: true selector: selector ! Item was changed: ----- Method: Cogit>>cogMethodDoesntLookKosher: (in category 'debugging') ----- cogMethodDoesntLookKosher: cogMethod "Check that the header fields onf a non-free method are consistent with the type. Answer 0 if it is ok, otherwise answer a code for the error." <api> <inline: false> <var: #cogMethod type: #'CogMethod *'> ((cogMethod blockSize bitAnd: objectMemory wordSize - 1) ~= 0 or: [cogMethod blockSize < (self sizeof: CogMethod) or: [cogMethod blockSize >= 32768]]) ifTrue: [^1]. cogMethod cmType = CMFree ifTrue: [^2]. cogMethod cmType = CMMethod ifTrue: [(objectMemory isIntegerObject: cogMethod methodHeader) ifFalse: [^11]. (objectRepresentation couldBeObject: cogMethod methodObject) ifFalse: [^12]. (cogMethod stackCheckOffset > 0 and: [cogMethod stackCheckOffset < cmNoCheckEntryOffset]) ifTrue: [^13]. ^0]. cogMethod cmType = CMOpenPIC ifTrue: [cogMethod blockSize ~= openPICSize ifTrue: [^21]. cogMethod methodHeader ~= 0 ifTrue: [^22]. "Check the nextOpenPIC link unless we're compacting" cogMethod objectHeader >= 0 ifTrue: [(cogMethod methodObject ~= 0 and: [cogMethod methodObject < methodZoneBase or: [cogMethod methodObject > (methodZone freeStart - openPICSize) or: [(cogMethod methodObject bitAnd: objectMemory wordSize - 1) ~= 0 or: [(self cCoerceSimple: cogMethod methodObject to: #'CogMethod *') cmType ~= CMOpenPIC]]]]) ifTrue: [^23]]. cogMethod stackCheckOffset ~= 0 ifTrue: [^24]. ^0]. cogMethod cmType = CMClosedPIC ifTrue: [cogMethod blockSize ~= closedPICSize ifTrue: [^31]. + (cogMethod cPICNumCases between: 1 and: maxCPICCases) ifFalse: - (cogMethod cPICNumCases between: 1 and: numPICCases) ifFalse: [^32]. cogMethod methodHeader ~= 0 ifTrue: [^33]. cogMethod methodObject ~= 0 ifTrue: [^34]. ^0]. ^9! Item was changed: ----- Method: Cogit>>cogPICSelector:numArgs:Case0Method:Case1Method:tag:isMNUCase: (in category 'in-line cacheing') ----- cogPICSelector: selector numArgs: numArgs Case0Method: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase "Attempt to create a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; link to its unchecked entry-point - a CompiledMethod; link to ceInterpretMethodFromPIC: - a CompiledMethod; link to ceMNUFromPICMNUMethod:receiver:" <var: #case0CogMethod type: #'CogMethod *'> <returnTypeC: #'CogMethod *'> + | startAddress | - | startAddress size end | (objectMemory isYoung: selector) ifTrue: [^self cCoerceSimple: YoungSelectorInPIC to: #'CogMethod *']. coInterpreter compilationBreak: selector point: (objectMemory numBytesOf: selector) isMNUCase: isMNUCase. + + "get memory in the code zone for the CPIC; if that fails we return an error code for the sender to use to work out how to blow up" startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. + + "memcpy the prototype across to our allocated space; because anything else would be silly" + objectMemory mem: startAddress cp: cPICPrototype y: closedPICSize. + + self configureCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') - "stack allocate the various collections so that they - are effectively garbage collected on return." - self allocateOpcodes: numPICCases * 9 bytecodes: 0. - methodLabel address: startAddress; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" - self compileCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') Case0: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase + numArgs: numArgs + delta: startAddress - cPICPrototype . + - numArgs: numArgs. - self computeMaximumSizes. - size := self generateInstructionsAt: startAddress + (self sizeof: CogMethod). - end := self outputInstructionsAt: startAddress + (self sizeof: CogMethod). - "The missOffset is the same as the interpretOffset. On RISCs it includes an additional instruction." - self assert: missOffset = ((backEnd hasLinkRegister ifTrue: [backEnd callInstructionByteSize] ifFalse: [0]) - + picInterpretAbort address + picInterpretAbort machineCodeSize - startAddress). - self assert: startAddress + cmEntryOffset = entry address. - self assert: endCPICCase0 address = (startAddress + firstCPICCaseOffset). - self assert: endCPICCase1 address = (startAddress + firstCPICCaseOffset + cPICCaseSize). ^self fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') numArgs: numArgs numCases: 2 hasMNUCase: isMNUCase selector: selector ! Item was removed: - ----- Method: Cogit>>compileCPIC:Case0:Case1Method:tag:isMNUCase:numArgs: (in category 'in-line cacheing') ----- - compileCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs - "Compile the code for a two-case PIC for case0CogMethod and case1Method,case1Tag. - The tag for case0CogMethod is at the send site and so doesn't need to be generated. - case1Method may be any of - - a Cog method; jump to its unchecked entry-point - - a CompiledMethod; jump to the ceInterpretFromPIC trampoline - - nil; call ceMNUFromPIC" - <var: #cPIC type: #'CogMethod *'> - | operand targetEntry jumpNext | - <var: #case0CogMethod type: #'CogMethod *'> - <var: #targetEntry type: #'void *'> - <var: #jumpNext type: #'AbstractInstruction *'> - self assert: case1Method notNil. - self compilePICAbort: numArgs. - self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not. - (isMNUCase not - and: [coInterpreter methodHasCogMethod: case1Method]) - ifTrue: - [operand := 0. - targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer] - ifFalse: "We do not scavenge PICs, hence we cannot cache the MNU method if it is in new space." - [operand := (case1Method isNil or: [objectMemory isYoungObject: case1Method]) - ifTrue: [0] - ifFalse: [case1Method]. - targetEntry := case1Method isNil ifTrue: [picMNUAbort] ifFalse: [picInterpretAbort]]. - - jumpNext := self compileCPICEntry. - self MoveUniqueCw: 0 R: SendNumArgsReg. - self DumpJumpLong: case0CogMethod asInteger + cmNoCheckEntryOffset. - endCPICCase0 := self CmpCw: case1Tag R: TempReg. - jumpNext jmpTarget: endCPICCase0. - self MoveUniqueCw: operand R: SendNumArgsReg. - self DumpJumpLongZero: (isMNUCase ifTrue: [picMNUAbort] ifFalse: [targetEntry]) asInteger. - endCPICCase1 := self MoveCw: cPIC asUnsignedInteger R: ClassReg. - self JumpLong: (self cPICMissTrampolineFor: numArgs). - ^0 - ! Item was changed: ----- Method: Cogit>>compileClosedPICPrototype (in category 'in-line cacheing') ----- compileClosedPICPrototype "Compile the abstract instructions for a full closed PIC used to initialize closedPICSize. The loads into SendNumArgsReg are those for optional method objects which may be used in MNU cases." <inline: true> | numArgs jumpNext | <var: #jumpNext type: #'AbstractInstruction *'> numArgs := 0. self compilePICAbort: numArgs. + jumpNext := self compileCPICEntry. "at the end of the entry code we need to jump to the first case code, which is actually the last chunk - for each entension we must update this jump to move back one case" - jumpNext := self compileCPICEntry. self MoveUniqueCw: 16r5EAF00D R: SendNumArgsReg. + self JumpLong: self cPICPrototypeCaseOffset + 16rCA5E10. + endCPICCase0 := self Label. + 1 to: maxCPICCases - 1 do: - self DumpJumpLong: self cPICPrototypeCaseOffset + 16rCA5E10. - jumpNext jmpTarget: (endCPICCase0 := self Label). - 1 to: numPICCases - 1 do: [:h| + h = (maxCPICCases - 1) + ifTrue: [jumpNext jmpTarget: self Label]. "this is where we jump to for the first case" self CmpCw: 16rBABE1F15+h R: TempReg. self MoveUniqueCw: 16rBADA550 + h R: SendNumArgsReg. + self JumpLongZero: self cPICPrototypeCaseOffset + 16rCA5E10 + (h * 16). + h = 1 ifTrue: - self DumpJumpLongZero: self cPICPrototypeCaseOffset + 16rCA5E10 + (h * 16). - h = 1 ifTrue: [endCPICCase1 := self Label]]. self MoveCw: methodLabel address R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: numArgs). + cPICEndOfCodeLabel := self Label. + literalsManager dumpLiterals: false. ^0! Item was removed: - ----- Method: Cogit>>compileMNUCPIC:methodOperand:numArgs: (in category 'in-line cacheing') ----- - compileMNUCPIC: cPIC methodOperand: methodOperand numArgs: numArgs - "Compile the code for a one-case MNU PIC that calls ceMNUFromPIC for case0Tag - The tag for case0 is at the send site and so doesn't need to be generated." - <var: #cPIC type: #'CogMethod *'> - | jumpNext operand | - <var: #jumpNext type: #'AbstractInstruction *'> - self compilePICAbort: numArgs. - jumpNext := self compileCPICEntry. - "We do not scavenge PICs, hence we cannot cache the MNU method if it is in new space." - operand := (methodOperand isNil or: [objectMemory isYoungObject: methodOperand]) - ifTrue: [0] - ifFalse: [methodOperand]. - self MoveUniqueCw: operand R: SendNumArgsReg. - self DumpJumpLong: picMNUAbort asInteger. - jumpNext jmpTarget: (self MoveCw: cPIC asUnsignedInteger R: ClassReg). - self JumpLong: (self cPICMissTrampolineFor: numArgs). - ^0 - ! Item was added: + ----- Method: Cogit>>configureCPIC:Case0:Case1Method:tag:isMNUCase:numArgs:delta: (in category 'in-line cacheing') ----- + configureCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs delta: addrDelta + "Configure a copy of the prototype CPIC for a two-case PIC for + case0CogMethod and + case1Method + case1Tag. + The tag for case0CogMethod is at the send site and so doesn't need to be generated. + case1Method may be any of + - a Cog method; jump to its unchecked entry-point + - a CompiledMethod; jump to the ceInterpretFromPIC trampoline + - nil; call ceMNUFromPIC + addDelta is the address change from the prototype to the new CPCI location, needed + because the loading of the CPIC lable at the end may use a literal instead of a pc relative" + <var: #cPIC type: #'CogMethod *'> + | operand targetEntry caseEndAddress| + <var: #case0CogMethod type: #'CogMethod *'> + <var: #targetEntry type: #'void *'> + <var: #jumpNext type: #'AbstractInstruction *'> + self assert: case1Method notNil. + + "adjust the jump at missOffset, the ceAbortXArgs" + backEnd rewriteJumpLongAt: cPIC asInteger + missOffset target: (self picAbortTrampolineFor: numArgs). + + self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not. + (isMNUCase not + and: [coInterpreter methodHasCogMethod: case1Method]) + ifTrue: + [operand := 0. + targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer] + ifFalse: "We do not scavenge PICs, hence we cannot cache the MNU method if it is in new space." + [operand := (case1Method isNil or: [objectMemory isYoungObject: case1Method]) + ifTrue: [0] + ifFalse: [case1Method]. + targetEntry := case1Method isNil ifTrue: [cPIC asInteger + (self sizeof: CogMethod)] ifFalse: [cPIC asInteger + self picInterpretAbortOffset]]. + + "set the jump to the case0 method" + backEnd rewriteJumpLongAt: cPIC asInteger + firstCPICCaseOffset target: case0CogMethod asInteger + cmNoCheckEntryOffset. + + caseEndAddress := self addressOfEndOfCase: 2 inCPIC: cPIC. + + "update the cpic case - deferred to backend because messy" + backEnd rewriteCPICCaseAt: caseEndAddress tag: case1Tag objRef: operand target: (isMNUCase ifTrue: [cPIC asInteger + (self sizeof: CogMethod)] ifFalse: [targetEntry]) asInteger. + + "update the loading of the PCIC label address" + backEnd relocateMethodReferenceBeforeAddress: cPIC asInteger + cPICEndOfCodeOffset - backEnd jumpLongByteSize by: addrDelta. + + "write the final desperate jump to cePICMissXArgs" + backEnd rewriteJumpLongAt: cPIC asInteger + cPICEndOfCodeOffset target: (self cPICMissTrampolineFor: numArgs). + ^0 + "self disassembleFrom: cPIC + (self sizeof: CogMethod) to: cPIC + closedPICSize - 1."! Item was added: + ----- Method: Cogit>>configureMNUCPIC:methodOperand:numArgs:delta: (in category 'in-line cacheing') ----- + configureMNUCPIC: cPIC methodOperand: methodOperand numArgs: numArgs delta: addrDelta + "Configure a copy of the prototype CPIC for a one-case MNU PIC that calls ceMNUFromPIC for case0Tag + The tag for case0 is at the send site and so doesn't need to be generated. + addDelta is the address change from the prototype to the new CPCI location, needed + because the loading of the CPIC label at the end may use a literal instead of a pc relative" + <var: #cPIC type: #'CogMethod *'> + | operand | + <var: #jumpNext type: #'AbstractInstruction *'> + + "adjust the jump at missOffset, the ceAbortXArgs" + backEnd rewriteJumpLongAt: cPIC asInteger + missOffset target: (self picAbortTrampolineFor: numArgs). + + "We do not scavenge PICs, hence we cannot cache the MNU method if it is in new space." + operand := (methodOperand isNil or: [objectMemory isYoungObject: methodOperand]) + ifTrue: [0] + ifFalse: [methodOperand]. + "set the jump to the case0 method" + backEnd rewriteJumpLongAt: cPIC asInteger + firstCPICCaseOffset target: cPIC asInteger + (self sizeof: CogMethod) . + + backEnd storeLiteral: operand beforeFollowingAddress: cPIC asInteger + firstCPICCaseOffset - backEnd jumpLongByteSize. + + "rewrite the final desperate jump to cePICMissXArgs" + backEnd rewriteJumpLongAt: cPIC asInteger + cPICEndOfCodeOffset target: (self cPICMissTrampolineFor: numArgs). + + "update the loading of the PCIC label address" + backEnd relocateMethodReferenceBeforeAddress: cPIC asInteger + cPICEndOfCodeOffset - backEnd jumpLongByteSize by: addrDelta. + + "finally, rewrite the jump 3 instr before firstCPICCaseOffset to jump to the end of case 2, missing the actual case" + self rewriteCPIC: cPIC caseJumpTo: (self addressOfEndOfCase: 2 inCPIC: cPIC). + + + ^0 + ! Item was changed: ----- Method: Cogit>>disassembleMethod:on: (in category 'disassembly') ----- disassembleMethod: surrogateOrAddress on: aStream <doNotGenerate> | cogMethod mapEntries codeRanges | cogMethod := surrogateOrAddress isInteger ifTrue: [self cogMethodSurrogateAt: surrogateOrAddress] ifFalse: [surrogateOrAddress]. cogMethod cmType = CMBlock ifTrue: [^self disassembleMethod: cogMethod cmHomeMethod on: aStream]. self printMethodHeader: cogMethod on: aStream. (mapEntries := Dictionary new) at: cogMethod asInteger + cmEntryOffset put: 'entry'. cogMethod cmType = CMMethod ifTrue: [mapEntries at: cogMethod asInteger + cmNoCheckEntryOffset put: 'noCheckEntry']. cogMethod cmType = CMClosedPIC ifTrue: [mapEntries at: cogMethod asInteger + firstCPICCaseOffset put: 'ClosedPICCase0'. + 1 to: maxCPICCases - 1 do: - 1 to: numPICCases - 1 do: [:i| mapEntries at: cogMethod asInteger + firstCPICCaseOffset + (i * cPICCaseSize) put: 'ClosedPICCase', i printString]]. self mapFor: cogMethod performUntil: #collectMapEntry:address:into: arg: mapEntries. NewspeakVM ifTrue: [objectRepresentation canPinObjects ifFalse: [mapEntries keys do: [:a| (mapEntries at: a) = #IsNSSendCall ifTrue: [mapEntries at: a + backEnd jumpShortByteSize put: {'Class'. #disassembleCachedOop:. (objectMemory wordSize)}; at: a + backEnd jumpShortByteSize + objectMemory bytesPerOop put: {'ImplicitReceiver'. #disassembleCachedOop:. (objectMemory wordSize)}]]]]. "This would all be far more elegant and simple if we used blocks. But there are no blocks in C and the basic enumerators here need to be used in the real VM. Apologies." (codeRanges := self codeRangesFor: cogMethod) do: [:range| (cogMethod cmType = CMMethod) ifTrue: [mapEntries keysAndValuesDo: [:mcpc :label| | bcpc | ((range includes: mcpc) and: [(AnnotationsWithBytecodePCs includes: label) and: [range cogMethod stackCheckOffset > 0]]) ifTrue: [bcpc := self bytecodePCFor: mcpc startBcpc: range startpc in: range cogMethod. bcpc ~= 0 ifTrue: [mapEntries at: mcpc put: label, ' bc ', bcpc printString, '/', (bcpc + 1) printString]]]]. (cogMethod blockEntryOffset ~= 0 and: [range first = (cogMethod blockEntryOffset + cogMethod asInteger)]) ifTrue: [aStream nextPutAll: 'blockEntry:'; cr. self blockDispatchFor: cogMethod perform: #disassemble:from:to:arg: arg: aStream] ifFalse: [range first > (cogMethod address + cmNoCheckEntryOffset) ifTrue: [self printMethodHeader: range cogMethod on: aStream]. self disassembleFrom: range first to: range last labels: mapEntries on: aStream]]. aStream nextPutAll: 'startpc: '; print: codeRanges first startpc; cr. (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]) ifTrue: [[self mapFor: cogMethod performUntil: #printMapEntry:mcpc:args: arg: { aStream. codeRanges. cogMethod }] on: AssertionFailure do: [:ex| ex primitiveChangeClassTo: ResumableVMError basicNew. ":) :) :)" ex resume: nil]]. ^cogMethod! Item was changed: ----- Method: Cogit>>expectedClosedPICPrototype: (in category 'garbage collection') ----- expectedClosedPICPrototype: cPIC "Answer 0 if the ClosedPIC is as expected from compileClosedPICPrototype, otherwise answer an error code identifying the first discrepancy found." "self disassembleFrom: methodZoneBase + (self sizeof: CogMethod) to: methodZoneBase + closedPICSize" <var: #cPIC type: #'CogMethod *'> | pc offsetToLiteral object entryPoint | pc := cPIC asInteger + firstCPICCaseOffset. "First jump is unconditional; subsequent ones are conditional" offsetToLiteral := backEnd jumpLongByteSize. + 1 to: maxCPICCases do: - 1 to: numPICCases do: [:i| i > 1 ifTrue: [object := literalsManager classRefInClosedPICAt: pc - offsetToLiteral. object = (16rBABE1F15 + i - 1) ifFalse: [^1]]. object := literalsManager objRefInClosedPICAt: pc - offsetToLiteral. object = (i = 1 ifTrue: [16r5EAF00D] ifFalse: [16rBADA550 + i - 1]) ifFalse: [^2]. offsetToLiteral := backEnd jumpLongConditionalByteSize. + entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. - entryPoint := literalsManager cPICCase: i jumpTargetBefore: pc. entryPoint = (self cPICPrototypeCaseOffset + 16rCA5E10 + (i - 1 * 16)) ifFalse: [^3]. pc := pc + cPICCaseSize]. pc := pc - cPICCaseSize. + entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc + cPICEndSize - literalsManager endSizeOffset. - entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc + cPICEndSize. entryPoint = (self cPICMissTrampolineFor: 0) ifFalse: [^4]. ^0! Item was changed: ----- Method: Cogit>>followMaybeObjRefInClosedPICAt: (in category 'garbage collection') ----- followMaybeObjRefInClosedPICAt: mcpc "Follow a potential object reference from a closed PIC. This may be a method reference or null. + Answer if the followed literal is young. + 'mcpc' refers to the jump/branch instruction at the end of + each cpic case" - Answer if the followed literal is young." | object subject | object := literalsManager objRefInClosedPICAt: mcpc. (objectRepresentation couldBeObject: object) ifFalse: [^false]. (objectMemory isForwarded: object) ifFalse: [^objectMemory isYoungObject: object]. subject := objectMemory followForwarded: object. literalsManager storeObjRef: subject inClosedPICAt: mcpc. codeModified := true. ^objectMemory isYoungObject: subject! Item was changed: ----- Method: Cogit>>followMethodReferencesInClosedPIC: (in category 'garbage collection') ----- followMethodReferencesInClosedPIC: cPIC "Remap all object references in the closed PIC. Answer if any references are young. Set codeModified if any modifications are made." <var: #cPIC type: #'CogMethod *'> | pc refersToYoung | + pc := self addressOfEndOfCase: 1 inCPIC: cPIC. + + "first we check the method obj ref at the beginning of the CPIC" - pc := cPIC asInteger + firstCPICCaseOffset. refersToYoung := self followMaybeObjRefInClosedPICAt: pc - backEnd jumpLongByteSize. + + "We find the end address of the cPICNumCases'th case and can then just step forward by the case size thereafter" + pc := self addressOfEndOfCase: cPIC cPICNumCases inCPIC: cPIC. + + "For each case we check any object reference at the end address - sizeof(conditional instruction) and then increment the end address by case size" - pc := pc + cPICCaseSize. 2 to: cPIC cPICNumCases do: [:i| (self followMaybeObjRefInClosedPICAt: pc - backEnd jumpLongConditionalByteSize) ifTrue: [refersToYoung := true]. pc := pc + cPICCaseSize]. ^refersToYoung! Item was changed: ----- Method: Cogit>>generateClosedPICPrototype (in category 'initialization') ----- generateClosedPICPrototype "Generate the prototype ClosedPIC to determine how much space as full PIC takes. When we first allocate a closed PIC it only has one or two cases and we want to grow it. So we have to determine how big a full one is before hand." + | cPIC endAddress | - | cPIC | <var: 'cPIC' type: #'CogMethod *'> + maxCPICCases := 6. - numPICCases := 6. "stack allocate the various collections so that they are effectively garbage collected on return." + self allocateOpcodes: maxCPICCases * 9 bytecodes: 0. - self allocateOpcodes: numPICCases * 9 bytecodes: 0. methodLabel address: methodZoneBase; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self compileClosedPICPrototype. self computeMaximumSizes. cPIC := (self cCoerceSimple: methodZoneBase to: #'CogMethod *'). closedPICSize := (self sizeof: CogMethod) + (self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod)). + endAddress := self outputInstructionsAt: methodZoneBase + (self sizeof: CogMethod). + self assert: methodZoneBase + closedPICSize = endAddress. - self outputInstructionsAt: methodZoneBase + (self sizeof: CogMethod). firstCPICCaseOffset := endCPICCase0 address - methodZoneBase. + cPICEndOfCodeOffset := cPICEndOfCodeLabel address - methodZoneBase. cPICCaseSize := endCPICCase1 address - endCPICCase0 address. + cPICEndSize := closedPICSize - (maxCPICCases - 1 * cPICCaseSize + firstCPICCaseOffset). - cPICEndSize := closedPICSize - (numPICCases - 1 * cPICCaseSize + firstCPICCaseOffset). closedPICSize := methodZone roundUpLength: closedPICSize. self assert: picInterpretAbort address = (methodLabel address + self picInterpretAbortOffset). + self assert: (self expectedClosedPICPrototype: cPIC) = 0. + + "tpr this is a little tiresome but after any assert checking we need to 0 out the case0 objRef rather than leaving 16r5EAF00D lying around" + + backEnd storeLiteral: 0 beforeFollowingAddress: endCPICCase0 address - backEnd jumpLongByteSize. + + "update the methodZoneBase so we keep the prototype aruond for later use" + methodZoneBase := self alignUptoRoutineBoundary: endAddress. + cPICPrototype := cPIC. - self assert: (self expectedClosedPICPrototype: cPIC) = 0 "self cCode: '' inSmalltalk: + [self disassembleFrom: cPIC + (self sizeof: CogMethod) to: cPIC + closedPICSize - 1. - [self disassembleFrom: methodZoneBase + (self sizeof: CogMethod) to: methodZoneBase + closedPICSize - 1. self halt]"! Item was changed: ----- Method: Cogit>>initializeCodeZoneFrom:upTo: (in category 'initialization') ----- initializeCodeZoneFrom: startAddress upTo: endAddress <api> self cCode: [self sqMakeMemoryExecutableFrom: startAddress To: endAddress] inSmalltalk: [self initializeProcessor]. codeBase := methodZoneBase := startAddress. minValidCallAddress := (codeBase min: coInterpreter interpretAddress) min: coInterpreter primitiveFailAddress. self initializeBackend. methodZone manageFrom: methodZoneBase to: endAddress. self maybeGenerateCheckFeatures. self maybeGenerateICacheFlush. self generateVMOwnerLockFunctions. ceGetSP := self cCoerceSimple: self genGetLeafCallStackPointer to: #'unsigned long (*)(void)'. self generateStackPointerCapture. self generateTrampolines. - methodZone manageFrom: methodZoneBase to: endAddress. self computeEntryOffsets. self generateClosedPICPrototype. + methodZone manageFrom: methodZoneBase to: endAddress. "N.B. this is assumed to be the last thing done in initialization; see Cogit>>initialized" self generateOpenPICPrototype! Item was changed: ----- Method: Cogit>>mapObjectReferencesInClosedPIC: (in category 'garbage collection') ----- mapObjectReferencesInClosedPIC: cPIC "Remap all object references in the closed PIC. Answer if any references are young. Set codeModified if any modifications are made." <var: #cPIC type: #'CogMethod *'> | pc refersToYoung | + pc := self addressOfEndOfCase:1 inCPIC:cPIC. + + "first we check the obj ref at the beginning of the CPIC" - pc := cPIC asInteger + firstCPICCaseOffset. refersToYoung := self updateMaybeObjRefInClosedPICAt: pc - backEnd jumpLongByteSize. + + "We find the end address of the cPICNumCases'th case and can then just step forward by the case size thereafter" + pc := self addressOfEndOfCase: cPIC cPICNumCases inCPIC: cPIC. + + "For each case we check any object reference at the end address - sizeof(conditional instruction) and then increment the end address by case size" - pc := pc + cPICCaseSize. 2 to: cPIC cPICNumCases do: [:i| objectRepresentation inlineCacheTagsMayBeObjects ifTrue: [(self updateMaybeClassRefInClosedPICAt: pc - backEnd jumpLongConditionalByteSize) ifTrue: [refersToYoung := true]]. (self updateMaybeObjRefInClosedPICAt: pc - backEnd jumpLongConditionalByteSize) ifTrue: [refersToYoung := true]. pc := pc + cPICCaseSize]. ^refersToYoung! Item was changed: ----- Method: Cogit>>noTargetsFreeInClosedPIC: (in category 'compaction') ----- noTargetsFreeInClosedPIC: cPIC + "Answer if all targets in the PIC are in-use methods." - "Answerr if all targets in the PIC are in-use methods." <var: #cPIC type: #'CogMethod *'> | pc entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> + - pc := cPIC asInteger + firstCPICCaseOffset. 1 to: cPIC cPICNumCases do: [:i| + pc := self addressOfEndOfCase: i inCPIC: cPIC. + entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. - entryPoint := literalsManager cPICCase: i jumpTargetBefore: pc. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" (cPIC containsAddress: entryPoint) ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. targetMethod cmType ~= CMMethod ifTrue: + [^false]]]. - [^false]]. - i < cPIC cPICNumCases ifTrue: - [pc := pc + cPICCaseSize]]. ^true! Item was changed: ----- Method: Cogit>>relocateCallsInClosedPIC: (in category 'compaction') ----- relocateCallsInClosedPIC: cPIC <var: #cPIC type: #'CogMethod *'> | delta pc entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> delta := cPIC objectHeader. self assert: (backEnd callTargetFromReturnAddress: cPIC asInteger + missOffset) = (self picAbortTrampolineFor: cPIC cmNumArgs). backEnd relocateCallBeforeReturnPC: cPIC asInteger + missOffset by: delta negated. pc := cPIC asInteger + firstCPICCaseOffset. 1 to: cPIC cPICNumCases do: [:i| + pc := self addressOfEndOfCase: i inCPIC: cPIC. + entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. - entryPoint := literalsManager cPICCase: i jumpTargetBefore: pc. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" (cPIC containsAddress: entryPoint) ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: targetMethod cmType = CMMethod. + backEnd + relocateJumpLongBeforeFollowingAddress: pc + by: (delta - targetMethod objectHeader) negated]]. - literalsManager - cPICCase: i - relocateJumpLongBefore: pc - by: (delta - targetMethod objectHeader) negated]. - pc := pc + cPICCaseSize]. self assert: cPIC cPICNumCases > 0. + - pc := pc - cPICCaseSize. "Finally relocate the load of the PIC and the jump to the overflow routine ceCPICMiss:receiver:" + backEnd relocateMethodReferenceBeforeAddress: (self addressOfEndOfCase: 2 inCPIC: cPIC)+ backEnd loadPICLiteralByteSize by: delta. + backEnd relocateJumpLongBeforeFollowingAddress: cPIC asInteger + cPICEndOfCodeOffset by: delta negated! - backEnd relocateMethodReferenceBeforeAddress: pc + backEnd loadPICLiteralByteSize by: delta. - backEnd relocateJumpLongBeforeFollowingAddress: pc + cPICEndSize by: delta negated! Item was added: + ----- Method: Cogit>>rewriteCPIC:caseJumpTo: (in category 'in-line cacheing') ----- + rewriteCPIC: cPIC caseJumpTo: target + "adding a new CPIC case, or making an MNU CPIC, requires altering the jump that takes us to the first case to be used" + <inline: true> + backEnd rewriteCPICJumpAt: cPIC asInteger + firstCPICCaseOffset - backEnd jumpLongByteSize - backEnd loadPICLiteralByteSize target: target! Item was changed: ----- Method: Cogit>>updateMaybeObjRefInClosedPICAt: (in category 'garbage collection') ----- updateMaybeObjRefInClosedPICAt: mcpc "Update a potential object reference from a closed PIC. This may be an object reference, an inline cache tag or null. + Answer if the updated literal is young. + 'mcpc' refers to the jump/branch instruction at the end of + each cpic case" - Answer if the updated literal is young." | object subject | object := literalsManager objRefInClosedPICAt: mcpc. (objectRepresentation couldBeObject: object) ifFalse: [^false]. subject := objectRepresentation remapOop: object. object ~= subject ifTrue: [literalsManager storeObjRef: subject inClosedPICAt: mcpc. codeModified := true]. ^objectMemory isYoungObject: subject! Item was removed: - ----- Method: InLineLiteralsManager>>cPICCase:jumpTargetBefore: (in category 'closed PIC parsing') ----- - cPICCase: caseIndex jumpTargetBefore: pc - <inline: true> - ^cogit backEnd jumpLongTargetBeforeFollowingAddress: pc! Item was added: + ----- Method: InLineLiteralsManager>>endSizeOffset (in category 'closed PIC parsing') ----- + endSizeOffset + "return the offset need from the cPICEndSize in order to point to just after the last instruction - here that means 0" + ^0! Item was changed: ----- Method: InLineLiteralsManager>>objRefInClosedPICAt: (in category 'garbage collection') ----- objRefInClosedPICAt: mcpc + "'mcpc' refers to the jump/branch instruction at the end of + each cpic case. The method objRef is the method object referenced by the + movI $0x0bada553, %ebx + or + ldr r6, [pc, #64] ; 0x000017d4 16rBADA553 + type instruction preceeding this" <inline: true> ^cogit backEnd literalBeforeFollowingAddress: mcpc! Item was changed: ----- Method: InLineLiteralsManager>>storeObjRef:inClosedPICAt: (in category 'garbage collection') ----- storeObjRef: literal inClosedPICAt: address + "'mcpc' refers to the jump/branch instruction at the end of + each cpic case. The objRef is the literal referenced by the + movI $0x0bada553, %ebx or + ldr r6, [pc, #64] ; 0x000017d4 16rBADA553 + type instruction preceeding this" <var: #address type: #usqInt> <inline: true> cogit backEnd storeLiteral: literal beforeFollowingAddress: address! Item was removed: - ----- Method: OutOfLineLiteralsManager>>cPICCase:jumpTargetBefore: (in category 'closed PIC parsing') ----- - cPICCase: caseIndex jumpTargetBefore: pc - <inline: true> - "With Spur the class tag is always 32-bits and the literal is bytesPerOop. - With V3 the class and literal are both bytesPerOop." - ^cogit backEnd jumpLongTargetBeforeFollowingAddress: pc - (caseIndex <= 1 - ifTrue: [objectMemory bytesPerOop] - ifFalse: [objectRepresentation inlineCacheTagsMayBeObjects - ifTrue: [objectMemory bytesPerOop * 2] - ifFalse: [objectMemory bytesPerOop + 4]])! Item was changed: ----- Method: OutOfLineLiteralsManager>>cPICCase:relocateJumpLongBefore:by: (in category 'closed PIC parsing') ----- cPICCase: caseIndex relocateJumpLongBefore: pc by: delta <inline: true> + cogit backEnd relocateJumpLongBeforeFollowingAddress: pc by: delta! - "With Spur the class tag is always 32-bits and the literal is bytesPerOop. - With V3 the class and literal are both bytesPerOop." - cogit backEnd - relocateJumpLongBeforeFollowingAddress: pc - (caseIndex <= 1 - ifTrue: [objectMemory bytesPerOop] - ifFalse: [objectRepresentation inlineCacheTagsMayBeObjects - ifTrue: [objectMemory bytesPerOop * 2] - ifFalse: [objectMemory bytesPerOop + 4]]) - by: delta! Item was changed: ----- Method: OutOfLineLiteralsManager>>classRefInClosedPICAt: (in category 'garbage collection') ----- classRefInClosedPICAt: address <inline: true> "If inline cache tags are not objects they will be 32-bit values." + "Current ARM out-of-line literal CPICs use + ldr ip, [pc relative address1] + cmp r0, ip + ldr r6, [pc relative address2 + beq code + hence the large backwards stepping here - address is pointing at the beq" ^objectRepresentation inlineCacheTagsMayBeObjects + ifFalse: [cogit backEnd literalBeforeFollowingAddress: address - 8 "better to use 2 * instructionSize if we could, step back to the cmp so the literal is found properly" ] + ifTrue: [self break. "not sure about this ? "objectMemory longAt: address - objectMemory bytesPerOop]! - ifFalse: [objectMemory long32At: address - 4] - ifTrue: [objectMemory longAt: address - objectMemory bytesPerOop]! Item was added: + ----- Method: OutOfLineLiteralsManager>>endSizeOffset (in category 'closed PIC parsing') ----- + endSizeOffset + "return the offset need from the cPICEndSize in order to point to just after the last instruction - here that means bytesPerOop * list size" + ^nextLiteralIndex * objectMemory bytesPerOop! Item was changed: ----- Method: OutOfLineLiteralsManager>>objRefInClosedPICAt: (in category 'garbage collection') ----- objRefInClosedPICAt: address + "'mcpc' refers to the jump/branch instruction at the end of + each cpic case. The objRef is the literal referenced by the + ldr r6, [pc, #88] ; 16r5EAF00D type instruction preceeding this" <inline: true> + ^cogit backEnd literalBeforeFollowingAddress: address ! - ^objectMemory longAt: address! Item was changed: ----- Method: OutOfLineLiteralsManager>>storeClassRef:inClosedPICAt: (in category 'garbage collection') ----- storeClassRef: classObj inClosedPICAt: address <var: #address type: #usqInt> <inline: true> "If inline cache tags are not objects they will be 32-bit values." + "Current ARM out-of-line literal CPICs use + ldr ip, [pc relative address1] + cmp r0, ip + ldr r6, [pc relative address2 + beq code + hence the large backwards stepping here" objectRepresentation inlineCacheTagsMayBeObjects + ifTrue: [self break. objectMemory long32At: address - 4 put: classObj] + ifFalse: [cogit backEnd storeLiteral: classObj beforeFollowingAddress: address - 8 "better to use 2 * instructionSize if we could, step back to the cmp so the literal is found properly"]! - ifTrue: [objectMemory long32At: address - 4 put: classObj] - ifFalse: [objectMemory longAt: address - objectMemory bytesPerOop]! Item was changed: ----- Method: OutOfLineLiteralsManager>>storeObjRef:inClosedPICAt: (in category 'garbage collection') ----- storeObjRef: literal inClosedPICAt: address + "'mcpc' refers to the jump/branch instruction at the end of + each cpic case. The objRef is the literal referenced by the + ldr r6, [pc, #88] ; 16r5EAF00D type instruction preceeding this" <var: #address type: #usqInt> <inline: true> + cogit backEnd storeLiteral: literal beforeFollowingAddress: address! - objectMemory longAt: address put: literal! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>populate:withPICInfoFor:firstCacheTag: (in category 'method introspection') ----- populate: tuple withPICInfoFor: cPIC firstCacheTag: firstCacheTag "Populate tuple (which must be large enough) with the ClosedPIC's target method class pairs. The first entry in tuple contains the bytecode pc for the send, so skip the tuple's first field." <var: #cPIC type: #'CogMethod *'> | pc cacheTag classOop entryPoint targetMethod value | <var: #targetMethod type: #'CogMethod *'> + - pc := cPIC asInteger + firstCPICCaseOffset. 1 to: cPIC cPICNumCases do: [:i| + pc := self addressOfEndOfCase: i inCPIC: cPIC. cacheTag := i = 1 ifTrue: [firstCacheTag] ifFalse: [backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize]. classOop := objectRepresentation classForInlineCacheTag: cacheTag. objectMemory storePointer: i * 2 - 1 ofObject: tuple withValue: classOop. + entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. - entryPoint := literalsManager cPICCase: i jumpTargetBefore: pc. "Find target from jump. A jump to the MNU entry-point should collect #doesNotUnderstand:" (cPIC containsAddress: entryPoint) ifTrue: [value := objectMemory splObj: SelectorDoesNotUnderstand] ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: targetMethod cmType = CMMethod. value := targetMethod methodObject]. + objectMemory storePointer: i * 2 ofObject: tuple withValue: value ]! - objectMemory storePointer: i * 2 ofObject: tuple withValue: value. - pc := pc + cPICCaseSize]!

1 0

[commit][3484] Fix OpenGL compilation on case-sensitive Mac filesystems.
by commits＠squeakvm.org 05 Nov '15

05 Nov '15

Revision: 3484 Author: eliot Date: 2015-11-05 10:16:38 -0800 (Thu, 05 Nov 2015) Log Message: ----------- Fix OpenGL compilation on case-sensitive Mac filesystems. Ignore the bochs build artifacts Modified Paths: -------------- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Property Changed: ---------------- branches/Cog/build.macos32x86/bochsx64/ branches/Cog/build.macos32x86/bochsx86/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/build.macos32x86/bochsx64 ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.macos32x86/bochsx86 ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Sep 24 12:15:28 PDT 2015 + Thu Nov 5 10:15:54 PST 2015 Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2015-11-02 22:31:32 UTC (rev 3483) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2015-11-05 18:16:38 UTC (rev 3484) @@ -48,8 +48,12 @@ #import "sqVirtualMachine.h" //#import <OpenGL/CGLMacro.h> -#import <OpenGL/gl.h> -#import <OpenGL/Opengl.h> +# import <OpenGL/gl.h> +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 +# import <OpenGL/OpenGL.h> +#else +# import <OpenGL/Opengl.h> +#endif extern SqueakOSXAppDelegate *gDelegateApp; extern struct VirtualMachine* interpreterProxy;

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.1504.mcz
by Ryan Macnak 05 Nov '15

05 Nov '15

Does MoveAbR want zero extension or sign extension? On Mon, Nov 2, 2015 at 6:17 PM, <commits(a)source.squeak.org> wrote: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1504.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.1504 > Author: eem > Time: 2 November 2015, 10:16:22.592 pm > UUID: 3c702143-ff40-4e38-a55e-065a3aec15ec > Ancestors: VMMaker.oscog-EstebanLorenzano.1503 > > Merge with VMMaker.oscog-EstebanLorenzano.1503: > - simplify the addressIsInInstructions: macro. > - express some concerns about ffiAddressOf:startingAt:size: > > x64 Cogit: > Add support for MoveAb:R: & MoveR:Ab: on x64 & x86. Tim, would you mind > adding support for ARM? > The misuse of MoveMb:r:R:/MoveR:Mb:r: as a stand-in for > MoveAb:R:/MoveR:Ab: only works on 32-bit platforms. > > Fix rip-relative addressing for MoveCwR/PushCw. Add some tests. > > Nuke the leaking breaks in genInnerPrimitiveNew[WithArg]: > > Execution now gets to the first jitted method that wants to create a > closure. > > =============== Diff against VMMaker.oscog-EstebanLorenzano.1503 > =============== > > Item was changed: > ----- Method: CogIA32Compiler>>computeMaximumSize (in category 'generate > machine code') ----- > computeMaximumSize > "Compute the maximum size for each opcode. This allows jump > offsets to > be determined, provided that all backward branches are long > branches." > "N.B. The ^N forms are to get around the bytecode compiler's long > branch > limits which are exceeded when each case jumps around the > otherwise." > opcode caseOf: { > "Noops & Pseudo Ops" > [Label] -> [^0]. > [AlignmentNops] -> [^(operands at: 0) - 1]. > [Fill16] -> [^2]. > [Fill32] -> [^4]. > [FillFromWord] -> [^4]. > [Nop] -> [^1]. > "Specific Control/Data Movement" > [CDQ] -> [^1]. > [IDIVR] -> [^2]. > [IMULRR] -> [^3]. > [CPUID] -> [^2]. > [CMPXCHGAwR] -> [^7]. > [CMPXCHGMwrR] -> [^(self concreteRegister: > (operands at: 1)) = ESP > > ifTrue: [(self isQuick: (operands at: 0)) ifTrue: [5] ifFalse: [8]] > > ifFalse: [(self isQuick: (operands at: 0)) ifTrue: [4] ifFalse: [7]]]. > [LFENCE] -> [^3]. > [MFENCE] -> [^3]. > [SFENCE] -> [^3]. > [LOCK] -> [^1]. > [XCHGAwR] -> [^6]. > [XCHGMwrR] -> [^(self > concreteRegister: (operands at: 1)) = ESP > > ifTrue: [(self isQuick: (operands at: 0)) ifTrue: [4] ifFalse: [7]] > > ifFalse: [(self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [6]]]. > [XCHGRR] -> [^((self > concreteRegister: (operands at: 0)) = EAX > > or: [(self concreteRegister: (operands at: 1)) = EAX]) > > ifTrue: [1] > > ifFalse: [2]]. > "Control" > [CallFull] -> [^5]. > [Call] -> [^5]. > [JumpR] -> [^2]. > [JumpFull] -> [self > resolveJumpTarget. ^5]. > [JumpLong] -> [self > resolveJumpTarget. ^5]. > [Jump] -> [self > resolveJumpTarget. ^5]. > [JumpZero] -> [self > resolveJumpTarget. ^6]. > [JumpNonZero] -> [self > resolveJumpTarget. ^6]. > [JumpNegative] -> [self > resolveJumpTarget. ^6]. > [JumpNonNegative] -> [self > resolveJumpTarget. ^6]. > [JumpOverflow] -> [self > resolveJumpTarget. ^6]. > [JumpNoOverflow] -> [self > resolveJumpTarget. ^6]. > [JumpCarry] -> [self > resolveJumpTarget. ^6]. > [JumpNoCarry] -> [self > resolveJumpTarget. ^6]. > [JumpLess] -> [self > resolveJumpTarget. ^6]. > [JumpGreaterOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpGreater] -> [self > resolveJumpTarget. ^6]. > [JumpLessOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpBelow] -> [self > resolveJumpTarget. ^6]. > [JumpAboveOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpAbove] -> [self > resolveJumpTarget. ^6]. > [JumpBelowOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpLongZero] -> [self > resolveJumpTarget. ^6]. > [JumpLongNonZero] -> [self > resolveJumpTarget. ^6]. > [JumpFPEqual] -> [self > resolveJumpTarget. ^6]. > [JumpFPNotEqual] -> [self > resolveJumpTarget. ^6]. > [JumpFPLess] -> [self > resolveJumpTarget. ^6]. > [JumpFPGreaterOrEqual] -> [self resolveJumpTarget. ^6]. > [JumpFPGreater] -> [self > resolveJumpTarget. ^6]. > [JumpFPLessOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpFPOrdered] -> [self > resolveJumpTarget. ^6]. > [JumpFPUnordered] -> [self > resolveJumpTarget. ^6]. > [RetN] -> > [^(operands at: 0) = 0 ifTrue: [1] ifFalse: [3]]. > [Stop] -> [^1]. > > "Arithmetic" > [AddCqR] -> [^(self isQuick: (operands at: > 0)) > > ifTrue: [3] > > ifFalse: [(self concreteRegister: (operands at: 1)) = EAX > > ifTrue: [5] > > ifFalse: [6]]]. > [AndCqR] -> [^(self isQuick: (operands at: > 0)) > > ifTrue: [3] > > ifFalse: [(self concreteRegister: (operands at: 1)) = EAX > > ifTrue: [5] > > ifFalse: [6]]]. > [CmpCqR] -> [^(self isQuick: (operands at: > 0)) > > ifTrue: [3] > > ifFalse: [(self concreteRegister: (operands at: 1)) = EAX > > ifTrue: [5] > > ifFalse: [6]]]. > [OrCqR] -> [^(self isQuick: (operands at: > 0)) > > ifTrue: [3] > > ifFalse: [(self concreteRegister: (operands at: 1)) = EAX > > ifTrue: [5] > > ifFalse: [6]]]. > [SubCqR] -> [^(self isQuick: (operands at: > 0)) > > ifTrue: [3] > > ifFalse: [(self concreteRegister: (operands at: 1)) = EAX > > ifTrue: [5] > > ifFalse: [6]]]. > [TstCqR] -> [^((self isQuick: (operands at: > 0)) and: [(self concreteRegister: (operands at: 1)) < 4]) > > ifTrue: [3] > > ifFalse: [(self concreteRegister: (operands at: 1)) = EAX > > ifTrue: [5] > > ifFalse: [6]]]. > [AddCwR] -> [^(self concreteRegister: > (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. > [AndCwR] -> [^(self concreteRegister: > (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. > [CmpCwR] -> [^(self concreteRegister: > (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. > [OrCwR] -> [^(self concreteRegister: (operands at: > 1)) = EAX ifTrue: [5] ifFalse: [6]]. > [SubCwR] -> [^(self concreteRegister: > (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. > [XorCwR] -> [^(self concreteRegister: > (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. > [AddRR] -> [^2]. > [AndRR] -> [^2]. > [CmpRR] -> [^2]. > [OrRR] -> [^2]. > [XorRR] -> [^2]. > [SubRR] -> [^2]. > [NegateR] -> [^2]. > [LoadEffectiveAddressMwrR] > -> [^((self isQuick: > (operands at: 0)) > > ifTrue: [3] > > ifFalse: [6]) > > + ((self concreteRegister: (operands at: 1)) = ESP > > ifTrue: [1] > > ifFalse: [0])]. > [LogicalShiftLeftCqR] -> [^(operands at: 0) = 1 > ifTrue: [2] ifFalse: [3]]. > [LogicalShiftRightCqR] -> [^(operands at: 0) = 1 > ifTrue: [2] ifFalse: [3]]. > [ArithmeticShiftRightCqR] -> [^(operands at: 0) = 1 > ifTrue: [2] ifFalse: [3]]. > [LogicalShiftLeftRR] -> [^self > computeShiftRRSize]. > [LogicalShiftRightRR] -> [^self > computeShiftRRSize]. > [ArithmeticShiftRightRR] -> [^self > computeShiftRRSize]. > [AddRdRd] -> [^4]. > [CmpRdRd] -> [^4]. > [SubRdRd] -> [^4]. > [MulRdRd] -> [^4]. > [DivRdRd] -> [^4]. > [SqrtRd] -> [^4]. > "Data Movement" > [MoveCqR] -> [^(operands at: 0) = 0 ifTrue: > [2] ifFalse: [5]]. > [MoveCwR] -> [^5]. > [MoveRR] -> [^2]. > [MoveRdRd] -> [^4]. > [MoveAwR] -> [^(self concreteRegister: > (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. > [MoveRAw] -> [^(self concreteRegister: > (operands at: 0)) = EAX ifTrue: [5] ifFalse: [6]]. > + [MoveAbR] -> [^(self concreteRegister: > (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. > + [MoveRAb] -> [^(self concreteRegister: > (operands at: 0)) = EAX ifTrue: [5] ifFalse: [6]]. > [MoveRMwr] -> [^((self isQuick: (operands at: 1)) > > ifTrue: [((operands at: 1) = 0 > > and: [(self concreteRegister: (operands at: 2)) ~= EBP]) > > ifTrue: [2] > > ifFalse: [3]] > > ifFalse: [6]) > + ((self > concreteRegister: (operands at: 2)) = ESP > > ifTrue: [1] > > ifFalse: [0])]. > [MoveRdM64r] -> [^((self isQuick: (operands at: 1)) > > ifTrue: [5] > > ifFalse: [8]) > > + ((self concreteRegister: (operands at: 2)) = ESP > > ifTrue: [1] > > ifFalse: [0])]. > [MoveMbrR] -> [^(self concreteRegister: > (operands at: 1)) = ESP > ifTrue: > [(self isQuick: (operands at: 0)) ifTrue: [5] ifFalse: [8]] > ifFalse: > [(self isQuick: (operands at: 0)) ifTrue: [4] ifFalse: [7]]]. > [MoveRMbr] -> [^(self concreteRegister: > (operands at: 2)) = ESP > ifTrue: [7] > ifFalse: > [(self isQuick: (operands at: 1)) ifTrue: [3] ifFalse: [6]]]. > [MoveM16rR] -> [^(self concreteRegister: (operands at: > 1)) = ESP > ifTrue: > [(self isQuick: (operands at: 0)) ifTrue: [5] ifFalse: [8]] > ifFalse: > [(self isQuick: (operands at: 0)) ifTrue: [4] ifFalse: [7]]]. > [MoveM64rRd] -> [^((self isQuick: (operands at: 0)) > > ifTrue: [5] > > ifFalse: [8]) > > + ((self concreteRegister: (operands at: 1)) = ESP > > ifTrue: [1] > > ifFalse: [0])]. > [MoveMwrR] -> [^((self isQuick: (operands at: > 0)) > > ifTrue: [((operands at: 0) = 0 > > and: [(self concreteRegister: (operands at: 1)) ~= EBP]) > > ifTrue: [2] > > ifFalse: [3]] > > ifFalse: [6]) > + ((self > concreteRegister: (operands at: 1)) = ESP > > ifTrue: [1] > > ifFalse: [0])]. > [MoveXbrRR] -> [self assert: (self concreteRegister: > (operands at: 0)) ~= ESP. > ^(self > concreteRegister: (operands at: 1)) = EBP > > ifTrue: [5] > > ifFalse: [4]]. > [MoveRXbrR] -> [self assert: (self > concreteRegister: (operands at: 1)) ~= ESP. > ^((self > concreteRegister: (operands at: 2)) = EBP > > ifTrue: [4] > > ifFalse: [3]) > > + ((self concreteRegister: (operands at: 0)) >= 4 > > ifTrue: [2] > > ifFalse: [0])]. > [MoveXwrRR] -> [self assert: (self concreteRegister: > (operands at: 0)) ~= ESP. > ^(self > concreteRegister: (operands at: 1)) = EBP > > ifTrue: [4] > > ifFalse: [3]]. > [MoveRXwrR] -> [self assert: (self concreteRegister: > (operands at: 1)) ~= ESP. > ^(self > concreteRegister: (operands at: 2)) = EBP > > ifTrue: [4] > > ifFalse: [3]]. > [PopR] -> [^1]. > [PushR] -> [^1]. > [PushCq] -> [^(self isQuick: (operands at: > 0)) ifTrue: [2] ifFalse: [5]]. > [PushCw] -> [^5]. > [PrefetchAw] -> [^self hasSSEInstructions ifTrue: [7] > ifFalse: [0]]. > "Conversion" > [ConvertRRd] -> [^4] }. > ^0 "to keep C compiler quiet"! > > Item was added: > + ----- Method: CogIA32Compiler>>concretizeMoveAbR (in category 'generate > machine code') ----- > + concretizeMoveAbR > + "Will get inlined into concretizeAt: switch." > + <inline: true> > + | addressOperand reg | > + addressOperand := operands at: 0. > + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: > #'AbstractInstruction *')) ifTrue: > + [addressOperand := (cogit cCoerceSimple: addressOperand > to: #'AbstractInstruction *') address]. > + reg := self concreteRegister: (operands at: 1). > + reg = EAX ifTrue: > + [machineCode > + at: 0 put: 16rA0; > + at: 1 put: (addressOperand bitAnd: 16rFF); > + at: 2 put: (addressOperand >> 8 bitAnd: 16rFF); > + at: 3 put: (addressOperand >> 16 bitAnd: 16rFF); > + at: 4 put: (addressOperand >> 24 bitAnd: 16rFF). > + ^machineCodeSize := 5]. > + machineCode > + at: 0 put: 16r8A; > + at: 1 put: (self mod: ModRegInd RM: 5 RO: reg); > + at: 2 put: (addressOperand bitAnd: 16rFF); > + at: 3 put: (addressOperand >> 8 bitAnd: 16rFF); > + at: 4 put: (addressOperand >> 16 bitAnd: 16rFF); > + at: 5 put: (addressOperand >> 24 bitAnd: 16rFF). > + ^machineCodeSize := 6! > > Item was added: > + ----- Method: CogIA32Compiler>>concretizeMoveRAb (in category 'generate > machine code') ----- > + concretizeMoveRAb > + "Will get inlined into concretizeAt: switch." > + <inline: true> > + | addressOperand reg | > + reg := self concreteRegister: (operands at: 0). > + addressOperand := operands at: 1. > + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: > #'AbstractInstruction *')) ifTrue: > + [addressOperand := (cogit cCoerceSimple: addressOperand > to: #'AbstractInstruction *') address]. > + reg = EAX ifTrue: > + [machineCode > + at: 0 put: 16rA2; > + at: 1 put: (addressOperand bitAnd: 16rFF); > + at: 2 put: (addressOperand >> 8 bitAnd: 16rFF); > + at: 3 put: (addressOperand >> 16 bitAnd: 16rFF); > + at: 4 put: (addressOperand >> 24 bitAnd: 16rFF). > + ^machineCodeSize := 5]. > + machineCode > + at: 0 put: 16r88; > + at: 1 put: (self mod: ModRegInd RM: 5 RO: reg); > + at: 2 put: (addressOperand bitAnd: 16rFF); > + at: 3 put: (addressOperand >> 8 bitAnd: 16rFF); > + at: 4 put: (addressOperand >> 16 bitAnd: 16rFF); > + at: 5 put: (addressOperand >> 24 bitAnd: 16rFF). > + ^machineCodeSize := 6! > > Item was changed: > ----- Method: CogIA32Compiler>>dispatchConcretize (in category 'generate > machine code') ----- > dispatchConcretize > "Attempt to generate concrete machine code for the instruction at > address. > This is the inner dispatch of concretizeAt: actualAddress which > exists only > to get around the branch size limits in the SqueakV3 (blue book > derived) > bytecode set." > <returnTypeC: #void> > opcode caseOf: { > "Noops & Pseudo Ops" > [Label] -> [^self concretizeLabel]. > [AlignmentNops] -> [^self concretizeAlignmentNops]. > [Fill16] -> [^self > concretizeFill16]. > [Fill32] -> [^self > concretizeFill32]. > [FillFromWord] -> [^self concretizeFillFromWord]. > [Nop] -> [^self concretizeNop]. > "Specific Control/Data Movement" > [CDQ] -> [^self > concretizeCDQ]. > [IDIVR] -> [^self > concretizeIDIVR]. > [IMULRR] -> [^self > concretizeMulRR]. > [CPUID] -> [^self > concretizeCPUID]. > [CMPXCHGAwR] -> [^self > concretizeCMPXCHGAwR]. > [CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]. > [LFENCE] -> [^self > concretizeFENCE: 5]. > [MFENCE] -> [^self > concretizeFENCE: 6]. > [SFENCE] -> [^self > concretizeFENCE: 7]. > [LOCK] -> [^self > concretizeLOCK]. > [XCHGAwR] -> [^self > concretizeXCHGAwR]. > [XCHGMwrR] -> [^self > concretizeXCHGMwrR]. > [XCHGRR] -> [^self > concretizeXCHGRR]. > "Control" > [Call] -> [^self > concretizeCall]. > [CallFull] -> [^self > concretizeCall]. > [JumpR] -> [^self > concretizeJumpR]. > [JumpFull] -> [^self > concretizeJumpLong]. > [JumpLong] -> [^self > concretizeJumpLong]. > [JumpLongZero] -> [^self > concretizeConditionalJump: 16r4]. > [JumpLongNonZero] -> [^self > concretizeConditionalJump: 16r5]. > [Jump] -> [^self > concretizeJump]. > "Table B-1 IntelŽ 64 and IA-32 Architectures Software > Developer's Manual Volume 1: Basic Architecture" > [JumpZero] -> [^self > concretizeConditionalJump: 16r4]. > [JumpNonZero] -> [^self > concretizeConditionalJump: 16r5]. > [JumpNegative] -> [^self > concretizeConditionalJump: 16r8]. > [JumpNonNegative] -> [^self > concretizeConditionalJump: 16r9]. > [JumpOverflow] -> [^self > concretizeConditionalJump: 16r0]. > [JumpNoOverflow] -> [^self > concretizeConditionalJump: 16r1]. > [JumpCarry] -> [^self > concretizeConditionalJump: 16r2]. > [JumpNoCarry] -> [^self > concretizeConditionalJump: 16r3]. > [JumpLess] -> [^self > concretizeConditionalJump: 16rC]. > [JumpGreaterOrEqual] -> [^self > concretizeConditionalJump: 16rD]. > [JumpGreater] -> [^self > concretizeConditionalJump: 16rF]. > [JumpLessOrEqual] -> [^self > concretizeConditionalJump: 16rE]. > [JumpBelow] -> [^self > concretizeConditionalJump: 16r2]. > [JumpAboveOrEqual] -> [^self > concretizeConditionalJump: 16r3]. > [JumpAbove] -> [^self > concretizeConditionalJump: 16r7]. > [JumpBelowOrEqual] -> [^self > concretizeConditionalJump: 16r6]. > [JumpFPEqual] -> [^self > concretizeConditionalJump: 16r4]. > [JumpFPNotEqual] -> [^self > concretizeConditionalJump: 16r5]. > [JumpFPLess] -> [^self > concretizeConditionalJump: 16r2]. > [JumpFPGreaterOrEqual] -> [^self > concretizeConditionalJump: 16r3]. > [JumpFPGreater] -> [^self > concretizeConditionalJump: 16r7]. > [JumpFPLessOrEqual] -> [^self > concretizeConditionalJump: 16r6]. > [JumpFPOrdered] -> [^self > concretizeConditionalJump: 16rB]. > [JumpFPUnordered] -> [^self > concretizeConditionalJump: 16rA]. > [RetN] -> [^self > concretizeRetN]. > [Stop] -> [^self > concretizeStop]. > "Arithmetic" > [AddCqR] -> [^self > concretizeAddCqR]. > [AddCwR] -> [^self > concretizeAddCwR]. > [AddRR] -> [^self > concretizeAddRR]. > [AddRdRd] -> [^self > concretizeSEE2OpRdRd: 16r58]. > [AndCqR] -> [^self > concretizeAndCqR]. > [AndCwR] -> [^self > concretizeAndCwR]. > [AndRR] -> [^self > concretizeAndRR]. > [TstCqR] -> [^self > concretizeTstCqR]. > [CmpCqR] -> [^self > concretizeCmpCqR]. > [CmpCwR] -> [^self > concretizeCmpCwR]. > [CmpRR] -> [^self > concretizeCmpRR]. > [CmpRdRd] -> [^self > concretizeCmpRdRd]. > [DivRdRd] -> [^self > concretizeSEE2OpRdRd: 16r5E]. > [MulRdRd] -> [^self > concretizeSEE2OpRdRd: 16r59]. > [OrCqR] -> [^self > concretizeOrCqR]. > [OrCwR] -> [^self > concretizeOrCwR]. > [OrRR] -> [^self > concretizeOrRR]. > [SubCqR] -> [^self > concretizeSubCqR]. > [SubCwR] -> [^self > concretizeSubCwR]. > [SubRR] -> [^self > concretizeSubRR]. > [SubRdRd] -> [^self > concretizeSEE2OpRdRd: 16r5C]. > [SqrtRd] -> > [^self concretizeSqrtRd]. > [XorCwR] -> > [^self concretizeXorCwR]. > [XorRR] -> > [^self concretizeXorRR]. > [NegateR] -> > [^self concretizeNegateR]. > [LoadEffectiveAddressMwrR] -> [^self > concretizeLoadEffectiveAddressMwrR]. > [ArithmeticShiftRightCqR] -> [^self > concretizeArithmeticShiftRightCqR]. > [LogicalShiftRightCqR] -> [^self > concretizeLogicalShiftRightCqR]. > [LogicalShiftLeftCqR] -> [^self > concretizeLogicalShiftLeftCqR]. > [ArithmeticShiftRightRR] -> [^self > concretizeArithmeticShiftRightRR]. > [LogicalShiftLeftRR] -> [^self > concretizeLogicalShiftLeftRR]. > "Data Movement" > [MoveCqR] -> [^self > concretizeMoveCqR]. > [MoveCwR] -> [^self > concretizeMoveCwR]. > [MoveRR] -> [^self > concretizeMoveRR]. > [MoveAwR] -> [^self > concretizeMoveAwR]. > [MoveRAw] -> [^self > concretizeMoveRAw]. > + [MoveAbR] -> [^self > concretizeMoveAbR]. > + [MoveRAb] -> [^self > concretizeMoveRAb]. > [MoveMbrR] -> [^self > concretizeMoveMbrR]. > [MoveRMbr] -> [^self > concretizeMoveRMbr]. > [MoveM16rR] -> [^self concretizeMoveM16rR]. > [MoveM64rRd] -> [^self concretizeMoveM64rRd]. > [MoveMwrR] -> [^self concretizeMoveMwrR]. > [MoveXbrRR] -> [^self concretizeMoveXbrRR]. > [MoveRXbrR] -> [^self concretizeMoveRXbrR]. > [MoveXwrRR] -> [^self concretizeMoveXwrRR]. > [MoveRXwrR] -> [^self concretizeMoveRXwrR]. > [MoveRMwr] -> [^self concretizeMoveRMwr]. > [MoveRdM64r] -> [^self concretizeMoveRdM64r]. > [PopR] -> [^self concretizePopR]. > [PushR] -> [^self concretizePushR]. > [PushCq] -> [^self > concretizePushCq]. > [PushCw] -> [^self > concretizePushCw]. > [PrefetchAw] -> [^self concretizePrefetchAw]. > "Conversion" > [ConvertRRd] -> [^self concretizeConvertRRd] }! > > Item was added: > + ----- Method: CogIA32CompilerTests>>testMoveAbR (in category 'tests') > ----- > + testMoveAbR > + "self new testMoveAbR" > + CogIA32CompilerForTests byteRegistersWithNamesDo: > + [:reg :regname| > + #(16r555555 16rAAAAAA) do: > + [:addr| | inst len | > + inst := self gen: MoveAbR operand: addr operand: > reg. > + len := inst concretizeAt: 0. > + self processor > + disassembleInstructionAt: 0 > + In: inst machineCode object > + into: [:str :sz| | plainJane herIntended | > + "Convert e.g. '00000000: movl > %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" > + plainJane := self strip: str. > + herIntended := 'movb 0x', (addr > hex allButFirst: 3), ', ', regname. > + self assert: (plainJane match: > herIntended). > + self assert: len = sz]]]! > > Item was added: > + ----- Method: CogIA32CompilerTests>>testMoveRAb (in category 'tests') > ----- > + testMoveRAb > + "self new testMoveRAb" > + CogIA32CompilerForTests byteRegistersWithNamesDo: > + [:reg :regname| > + #(16r555555 16rAAAAAA) do: > + [:addr| | inst len | > + inst := self gen: MoveRAb operand: reg operand: > addr. > + len := inst concretizeAt: 0. > + self processor > + disassembleInstructionAt: 0 > + In: inst machineCode object > + into: [:str :sz| | plainJane herIntended | > + plainJane := self strip: str. > + herIntended := 'movb ', regname, > ', 0x', (addr hex allButFirst: 3). > + self assert: (plainJane match: > herIntended). > + self assert: len = sz]]]! > > Item was changed: > ----- Method: CogInLineLiteralsX64Compiler>>concretizeMoveCwR (in > category 'generate machine code') ----- > concretizeMoveCwR > "Will get inlined into concretizeAt: switch." > <inline: true> > | value reg offset | > value := operands at: 0. > reg := self concreteRegister: (operands at: 1). > (self isAnInstruction: (cogit cCoerceSimple: value to: > #'AbstractInstruction *')) ifTrue: > [value := (cogit cCoerceSimple: value to: > #'AbstractInstruction *') address]. > (cogit addressIsInCurrentCompilation: value) ifTrue: > [offset := value - (address + 7). > machineCode > at: 0 put: (self rexR: reg x: 0 b: 0); > + at: 1 put: 16r8D; "LoadEffectiveAddress" > + at: 2 put: (self mod: ModRegInd RM: 5 RO: reg); > - at: 1 put: 16r8B; > - at: 2 put: (self mod: ModReg RM: 5 RO: reg); > at: 3 put: (offset bitAnd: 16rFF); > at: 4 put: (offset >> 8 bitAnd: 16rFF); > at: 5 put: (offset >> 16 bitAnd: 16rFF); > at: 6 put: (offset >> 24 bitAnd: 16rFF). > ^machineCodeSize := 7]. > machineCode > at: 0 put: (self rexR: reg x: 0 b: reg); > at: 1 put: 16rB8 + (reg bitAnd: 7); > at: 2 put: (value bitAnd: 16rFF); > at: 3 put: (value >> 8 bitAnd: 16rFF); > at: 4 put: (value >> 16 bitAnd: 16rFF); > at: 5 put: (value >> 24 bitAnd: 16rFF); > at: 6 put: (value >> 32 bitAnd: 16rFF); > at: 7 put: (value >> 40 bitAnd: 16rFF); > at: 8 put: (value >> 48 bitAnd: 16rFF); > at: 9 put: (value >> 56 bitAnd: 16rFF); > at: 10 put: 16r90. "Add a nop to disambiguate between > MoveCwR/PushCwR and ArithCwR, which ends with a (self mod: ModReg RM: 0 RO: > 0)" > self assert: (self mod: ModReg RM: 0 RO: 0) > 16r90. > ^machineCodeSize := 11! > > Item was changed: > ----- Method: CogInLineLiteralsX64Compiler>>concretizePushCw (in > category 'generate machine code') ----- > concretizePushCw > "Will get inlined into concretizeAt: switch." > <inline: true> > | value offset | > value := operands at: 0. > (self isAnInstruction: (cogit cCoerceSimple: value to: > #'AbstractInstruction *')) ifTrue: > [value := (cogit cCoerceSimple: value to: > #'AbstractInstruction *') address]. > (cogit addressIsInCurrentCompilation: value) ifTrue: > + [offset := value - (address + 7). > - [offset := value - (address + 6). > machineCode > + at: 0 put: (self rexR: ConcreteRISCTempReg x: 0 b: > 0); > + at: 1 put: 16r8D; "LoadEffectiveAddress" > + at: 2 put: (self mod: ModRegInd RM: 5 RO: > ConcreteRISCTempReg); > + at: 3 put: (offset bitAnd: 16rFF); > + at: 4 put: (offset >> 8 bitAnd: 16rFF); > + at: 5 put: (offset >> 16 bitAnd: 16rFF); > + at: 6 put: (offset >> 24 bitAnd: 16rFF); > + at: 7 put: 16r41; > + at: 8 put: 16r48 + ConcreteRISCTempReg. > + ^machineCodeSize := 9]. > - at: 0 put: 16rFF; > - at: 1 put: 16r35; > - at: 2 put: (offset bitAnd: 16rFF); > - at: 3 put: (offset >> 8 bitAnd: 16rFF); > - at: 4 put: (offset >> 16 bitAnd: 16rFF); > - at: 5 put: (offset >> 24 bitAnd: 16rFF). > - ^machineCodeSize := 6]. > machineCode > at: 0 put: (self rexR: ConcreteRISCTempReg x: 0 b: > ConcreteRISCTempReg); > at: 1 put: 16rB8 + (ConcreteRISCTempReg bitAnd: 7); > at: 2 put: (value bitAnd: 16rFF); > at: 3 put: (value >> 8 bitAnd: 16rFF); > at: 4 put: (value >> 16 bitAnd: 16rFF); > at: 5 put: (value >> 24 bitAnd: 16rFF); > at: 6 put: (value >> 32 bitAnd: 16rFF); > at: 7 put: (value >> 40 bitAnd: 16rFF); > at: 8 put: (value >> 48 bitAnd: 16rFF); > at: 9 put: (value >> 56 bitAnd: 16rFF); > at: 10 put: 16r41; > + at: 11 put: 16r48 + ConcreteRISCTempReg. "The 48 will > disambiguate between MoveCwR, PushCwR and ArithCwR, which ends with a (self > mod: ModReg RM: 0 RO: 0)" > - at: 11 put: 16r50 + (ConcreteRISCTempReg - 8). "The 50 > will disambiguate between MoveCwR, PushCwR and ArithCwR, which ends with a > (self mod: ModReg RM: 0 RO: 0)" > self assert: ConcreteRISCTempReg >= 8. > self assert: (self mod: ModReg RM: 0 RO: 0) > 16r57. > ^machineCodeSize := 12! > > Item was changed: > ----- Method: CogObjectRepresentationFor64BitSpur>>genInnerPrimitiveNew: > (in category 'primitive generators') ----- > genInnerPrimitiveNew: retNoffset > "Implement primitiveNew for convenient cases: > - the receiver has a hash > - the receiver is fixed size (excluding ephemerons to save > instructions & miniscule time) > - single word header/num slots < numSlotsMask > - the result fits in eden (actually below scavengeThreshold)" > > | headerReg fillReg instSpecReg byteSizeReg > jumpUnhashed jumpVariableOrEphemeron jumpNoSpace jumpTooBig > jumpHasSlots > fillLoop skip | > <var: 'skip' type: #'AbstractInstruction *'> > <var: 'fillLoop' type: #'AbstractInstruction *'> > <var: 'jumpTooBig' type: #'AbstractInstruction *'> > <var: 'jumpHasSlots' type: #'AbstractInstruction *'> > <var: 'jumpNoSpace' type: #'AbstractInstruction *'> > <var: 'jumpUnhashed' type: #'AbstractInstruction *'> > <var: 'jumpVariableOrEphemeron' type: #'AbstractInstruction *'> > > "header will contain classIndex/class's hash & format & > numSlots/fixed size and finally fill value (nilObject)." > - self break. > headerReg := fillReg := SendNumArgsReg. > "inst spec will hold class's instance specification, then byte > size and finally end of new object." > instSpecReg := byteSizeReg := ClassReg. > > "get freeStart as early as possible so as not to wait later..." > cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg. > "get class's hash & fail if 0" > self genGetHashFieldNonImmOf: ReceiverResultReg into: headerReg. > jumpUnhashed := cogit JumpZero: 0. > "get class's format inst var for both inst spec (format field) and > num fixed fields" > self genLoadSlot: InstanceSpecificationIndex sourceReg: > ReceiverResultReg destReg: TempReg. > self genConvertSmallIntegerToIntegerInReg: TempReg. > cogit MoveR: TempReg R: instSpecReg. > cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth R: > TempReg. > cogit AndCq: objectMemory formatMask R: TempReg. > cogit AndCq: objectMemory fixedFieldsOfClassFormatMask R: > instSpecReg. > "fail if not fixed or if ephemeron (rare beasts so save the > cycles)" > cogit CmpCq: objectMemory nonIndexablePointerFormat R: TempReg. > jumpVariableOrEphemeron := cogit JumpAbove: 0. > cogit CmpCq: objectMemory numSlotsMask R: instSpecReg. > jumpTooBig := cogit JumpAboveOrEqual: 0. > "Add format to classIndex/format in header; the add in numSlots" > cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. > cogit AddR: TempReg R: headerReg. > cogit MoveR: instSpecReg R: TempReg. > cogit LogicalShiftLeftCq: objectMemory numSlotsFullShift R: > TempReg. > cogit AddR: TempReg R: headerReg. > "compute byte size; remember 0-sized objects still need 1 slot." > cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg" > jumpHasSlots := cogit JumpNonZero: 0. > cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg. > skip := cogit Jump: 0. > "round up to allocationUnit" > jumpHasSlots jmpTarget: > (cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize > R: byteSizeReg). > cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg. > skip jmpTarget: > "check if allocation fits (freeSize + byteSize < > scavengeThreshold); scavengeThreshold is constant." > (cogit AddR: Arg1Reg R: byteSizeReg). > cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg. > jumpNoSpace := cogit JumpAboveOrEqual: 0. > "write back new freeStart; get result. byteSizeReg holds new > freeStart, the limit of the object" > cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress. > cogit MoveR: Arg1Reg R: ReceiverResultReg. > "write header" > cogit MoveR: headerReg Mw: 0 r: Arg1Reg. > "now fill" > cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: > ReceiverResultReg R: Arg1Reg. > cogit MoveCq: objectMemory nilObject R: fillReg. > fillLoop := > cogit MoveR: fillReg Mw: 0 r: Arg1Reg. > cogit AddCq: 8 R: Arg1Reg. > cogit CmpR: Arg1Reg R: byteSizeReg. > cogit JumpAbove: fillLoop. > cogit RetN: retNoffset. > > jumpUnhashed jmpTarget: > (jumpVariableOrEphemeron jmpTarget: > (jumpTooBig jmpTarget: > (jumpNoSpace jmpTarget: cogit Label))). > > ^0! > > Item was changed: > ----- Method: > CogObjectRepresentationFor64BitSpur>>genInnerPrimitiveNewWithArg: (in > category 'primitive generators') ----- > genInnerPrimitiveNewWithArg: retNoffset > "Implement primitiveNewWithArg for convenient cases: > - the receiver has a hash > - the receiver is variable and not compiled method > - single word header/num slots < numSlotsMask > - the result fits in eden > See superclass method for dynamic frequencies of formats. > For the moment we implement only arrayFormat, firstByteFormat & > firstLongFormat" > > | headerReg fillReg instSpecReg byteSizeReg maxSlots > jumpArrayTooBig jumpByteTooBig jumpLongTooBig > jumpArrayFormat jumpByteFormat jumpBytePrepDone jumpLongPrepDone > jumpUnhashed jumpNElementsNonInt jumpFailCuzFixed jumpNoSpace > jumpHasSlots fillLoop skip | > <var: 'skip' type: #'AbstractInstruction *'> > <var: 'fillLoop' type: #'AbstractInstruction *'> > <var: 'jumpHasSlots' type: #'AbstractInstruction *'> > <var: 'jumpNoSpace' type: #'AbstractInstruction *'> > <var: 'jumpUnhashed' type: #'AbstractInstruction *'> > <var: 'jumpByteFormat' type: #'AbstractInstruction *'> > <var: 'jumpByteTooBig' type: #'AbstractInstruction *'> > <var: 'jumpLongTooBig' type: #'AbstractInstruction *'> > <var: 'jumpArrayFormat' type: #'AbstractInstruction *'> > <var: 'jumpArrayTooBig' type: #'AbstractInstruction *'> > <var: 'jumpFailCuzFixed' type: #'AbstractInstruction *'> > <var: 'jumpBytePrepDone' type: #'AbstractInstruction *'> > <var: 'jumpLongPrepDone' type: #'AbstractInstruction *'> > <var: 'jumpNElementsNonInt' type: #'AbstractInstruction *'> > > "header will contain classIndex/class's hash & format & > numSlots/fixed size" > - self break. > headerReg := SendNumArgsReg. > "Assume there's an available scratch register on 64-bit machines" > fillReg := Scratch0Reg. > self assert: (cogit backEnd concreteRegister: fillReg) > 0. > "inst spec will hold class's instance specification and then byte > size" > instSpecReg := byteSizeReg := ClassReg. > "The max slots we'll allocate here are those for a single header" > maxSlots := objectMemory numSlotsMask - 1. > > "get freeStart as early as possible so as not to wait later..." > cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg. > "get class's hash & fail if 0" > self genGetHashFieldNonImmOf: ReceiverResultReg into: headerReg. > jumpUnhashed := cogit JumpZero: 0. > "get index and fail if not a +ve integer" > jumpNElementsNonInt := self genJumpNotSmallInteger: Arg0Reg. > jumpNElementsNonInt asInteger = UnimplementedOperation ifTrue: > [cogit MoveR: Arg0Reg R: TempReg. > jumpNElementsNonInt := self > genJumpNotSmallIntegerInScratchReg: TempReg]. > "get class's format inst var for inst spec (format field)" > self genLoadSlot: InstanceSpecificationIndex sourceReg: > ReceiverResultReg destReg: instSpecReg. > cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth + > self numSmallIntegerTagBits R: instSpecReg. > cogit AndCq: objectMemory formatMask R: instSpecReg. > "Add format to classIndex/format header now" > cogit MoveR: instSpecReg R: TempReg. > cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. > cogit AddR: TempReg R: headerReg. > "get integer value of num fields in TempReg now" > cogit MoveR: Arg0Reg R: TempReg. > self genConvertSmallIntegerToIntegerInReg: TempReg. > "dispatch on format, failing if not variable or if compiled method" > cogit CmpCq: objectMemory arrayFormat R: instSpecReg. > jumpArrayFormat := cogit JumpZero: 0. > cogit CmpCq: objectMemory firstByteFormat R: instSpecReg. > jumpByteFormat := cogit JumpZero: 0. > cogit CmpCq: objectMemory firstLongFormat R: instSpecReg. > jumpFailCuzFixed := cogit JumpNonZero: 0. > > cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg. > jumpLongTooBig := cogit JumpAbove: 0. > "save num elements/slot size to instSpecReg" > cogit MoveR: TempReg R: instSpecReg. > cogit MoveCq: 0 R: fillReg. > jumpLongPrepDone := cogit Jump: 0. "go allocate" > > jumpByteFormat jmpTarget: > (cogit CmpCq: (objectMemory integerObjectOf: maxSlots * > objectMemory wordSize) R: Arg0Reg). > jumpByteTooBig := cogit JumpAbove: 0. > "save num elements to instSpecReg" > cogit MoveR: TempReg R: instSpecReg. > "compute odd bits and add into headerReg; oddBits := 4 - nElements > bitAnd: 3" > cogit MoveCq: objectMemory wordSize R: TempReg. > cogit SubR: instSpecReg R: TempReg. > cogit AndCq: objectMemory wordSize - 1 R: TempReg. > cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. > cogit AddR: TempReg R: headerReg. > "round up num elements to numSlots in instSpecReg" > cogit AddCq: objectMemory wordSize - 1 R: instSpecReg. > cogit LogicalShiftRightCq: objectMemory shiftForWord R: > instSpecReg. > "store numSlots to headerReg" > cogit MoveR: instSpecReg R: TempReg. > cogit LogicalShiftLeftCq: objectMemory numSlotsFullShift R: > TempReg. > cogit AddR: TempReg R: headerReg. > cogit MoveCq: 0 R: fillReg. > jumpBytePrepDone := cogit Jump: 0. "go allocate" > > jumpArrayFormat jmpTarget: > (cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: > Arg0Reg). > jumpArrayTooBig := cogit JumpAbove: 0. > "save num elements/slot size to instSpecReg" > cogit MoveR: TempReg R: instSpecReg. > cogit MoveCq: objectMemory nilObject R: fillReg. > "fall through to allocate" > > jumpBytePrepDone jmpTarget: > (jumpLongPrepDone jmpTarget: cogit Label). > > "store numSlots to headerReg" > cogit MoveR: instSpecReg R: TempReg. > cogit LogicalShiftLeftCq: objectMemory numSlotsFullShift R: > TempReg. > cogit AddR: TempReg R: headerReg. > "compute byte size; remember 0-sized objects still need 1 slot." > cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg" > jumpHasSlots := cogit JumpNonZero: 0. > cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg. > skip := cogit Jump: 0. > "round up to allocationUnit" > jumpHasSlots jmpTarget: > (cogit MoveR: byteSizeReg R: TempReg). > cogit AddR: TempReg R: byteSizeReg. > cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize > R: byteSizeReg. > cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg. > skip jmpTarget: > "check if allocation fits" > (cogit AddR: Arg1Reg R: byteSizeReg). > cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg. > jumpNoSpace := cogit JumpAboveOrEqual: 0. > "get result, increment freeStart and write it back. Arg1Reg holds > new freeStart, the limit of the object" > cogit MoveR: Arg1Reg R: ReceiverResultReg. > cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress. > "write other half of header (numSlots/0 identityHash)" > cogit MoveR: headerReg Mw: 0 r: ReceiverResultReg. > "now fill" > cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: > ReceiverResultReg R: Arg1Reg. > fillLoop := > cogit MoveR: fillReg Mw: 0 r: Arg1Reg. > cogit AddCq: 8 R: Arg1Reg. > cogit CmpR: Arg1Reg R: byteSizeReg. > cogit JumpAbove: fillLoop. > cogit RetN: retNoffset. > > jumpNoSpace jmpTarget: > (jumpUnhashed jmpTarget: > (jumpFailCuzFixed jmpTarget: > (jumpArrayTooBig jmpTarget: > (jumpByteTooBig jmpTarget: > (jumpLongTooBig jmpTarget: > (jumpNElementsNonInt jmpTarget: cogit Label)))))). > > ^0! > > Item was changed: > ----- Method: CogX64Compiler>>computeMaximumSize (in category 'generate > machine code') ----- > computeMaximumSize > "Compute the maximum size for each opcode. This allows jump > offsets to > be determined, provided that all backward branches are long > branches." > "N.B. The ^N forms are to get around the bytecode compiler's long > branch > limits which are exceeded when each case jumps around the > otherwise." > opcode caseOf: { > "Noops & Pseudo Ops" > [Label] -> [^0]. > [AlignmentNops] -> [^(operands at: 0) - 1]. > [Fill16] -> [^2]. > [Fill32] -> [^4]. > [FillFromWord] -> [^4]. > [Nop] -> [^1]. > "Specific Control/Data Movement" > [CDQ] -> [^2]. > [IDIVR] -> [^3]. > [IMULRR] -> [^4]. > [CPUID] -> [^2]. > [CMPXCHGAwR] -> [^8]. > [CMPXCHGMwrR] -> [^9]. > [LFENCE] -> [^3]. > [MFENCE] -> [^3]. > [SFENCE] -> [^3]. > [LOCK] -> [^1]. > "[XCHGAwR] -> [^6]. > [XCHGMwrR] -> [^7]." > [XCHGRR] -> [^((self > concreteRegister: (operands at: 0)) = RAX > > or: [(self concreteRegister: (operands at: 1)) = RAX]) > > ifTrue: [2] > > ifFalse: [3]]. > "Control" > [CallFull] -> [^12]. > [Call] -> [^5]. > [JumpR] -> [^2]. > [JumpFull] -> [self > resolveJumpTarget. ^12]. > [JumpLong] -> [self > resolveJumpTarget. ^5]. > [Jump] -> [self > resolveJumpTarget. ^5]. > [JumpZero] -> [self > resolveJumpTarget. ^6]. > [JumpNonZero] -> [self > resolveJumpTarget. ^6]. > [JumpNegative] -> [self > resolveJumpTarget. ^6]. > [JumpNonNegative] -> [self > resolveJumpTarget. ^6]. > [JumpOverflow] -> [self > resolveJumpTarget. ^6]. > [JumpNoOverflow] -> [self > resolveJumpTarget. ^6]. > [JumpCarry] -> [self > resolveJumpTarget. ^6]. > [JumpNoCarry] -> [self > resolveJumpTarget. ^6]. > [JumpLess] -> [self > resolveJumpTarget. ^6]. > [JumpGreaterOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpGreater] -> [self > resolveJumpTarget. ^6]. > [JumpLessOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpBelow] -> [self > resolveJumpTarget. ^6]. > [JumpAboveOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpAbove] -> [self > resolveJumpTarget. ^6]. > [JumpBelowOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpLongZero] -> [self > resolveJumpTarget. ^6]. > [JumpLongNonZero] -> [self > resolveJumpTarget. ^6]. > [JumpFPEqual] -> [self > resolveJumpTarget. ^6]. > [JumpFPNotEqual] -> [self > resolveJumpTarget. ^6]. > [JumpFPLess] -> [self > resolveJumpTarget. ^6]. > [JumpFPGreaterOrEqual] -> [self resolveJumpTarget. ^6]. > [JumpFPGreater] -> [self > resolveJumpTarget. ^6]. > [JumpFPLessOrEqual] -> [self > resolveJumpTarget. ^6]. > [JumpFPOrdered] -> [self > resolveJumpTarget. ^6]. > [JumpFPUnordered] -> [self > resolveJumpTarget. ^6]. > [RetN] -> > [^(operands at: 0) = 0 ifTrue: [1] ifFalse: [3]]. > [Stop] -> [^1]. > > "Arithmetic" > [AddCqR] -> [^self computeSizeOfArithCqR]. > [AndCqR] -> [^self computeSizeOfArithCqR]. > [CmpCqR] -> [^self computeSizeOfArithCqR]. > [OrCqR] -> [^self computeSizeOfArithCqR]. > [SubCqR] -> [^self computeSizeOfArithCqR]. > [TstCqR] -> [^self computeSizeOfArithCqR]. > [AddCwR] -> [^self computeSizeOfArithCwR]. > [AndCwR] -> [^self computeSizeOfArithCwR]. > [CmpCwR] -> [^self computeSizeOfArithCwR]. > [OrCwR] -> [^self computeSizeOfArithCwR]. > [SubCwR] -> [^self computeSizeOfArithCwR]. > [XorCwR] -> [^self computeSizeOfArithCwR]. > [AddRR] -> [^3]. > [AndRR] -> [^3]. > [CmpRR] -> [^3]. > [OrRR] -> [^3]. > [XorRR] -> [^3]. > [SubRR] -> [^3]. > [NegateR] -> [^3]. > [LoadEffectiveAddressMwrR] > -> [^((self isQuick: > (operands at: 0)) > > ifTrue: [4] > > ifFalse: [7]) > + (((self > concreteRegister: (operands at: 1)) bitAnd: 7) = RSP > > ifTrue: [1] > > ifFalse: [0])]. > [LogicalShiftLeftCqR] -> [^(operands at: 0) = 1 > ifTrue: [3] ifFalse: [4]]. > [LogicalShiftRightCqR] -> [^(operands at: 0) = 1 > ifTrue: [3] ifFalse: [4]]. > [ArithmeticShiftRightCqR] -> [^(operands at: 0) = 1 > ifTrue: [3] ifFalse: [4]]. > [LogicalShiftLeftRR] -> [^self > computeShiftRRSize]. > [LogicalShiftRightRR] -> [^self > computeShiftRRSize]. > [ArithmeticShiftRightRR] -> [^self > computeShiftRRSize]. > [AddRdRd] -> [^4]. > [CmpRdRd] -> [^4]. > [SubRdRd] -> [^4]. > [MulRdRd] -> [^4]. > [DivRdRd] -> [^4]. > [SqrtRd] -> [^4]. > "Data Movement" > [MoveCqR] -> [^(operands at: 0) = 0 > ifTrue: [3] > ifFalse: > > [(self is32BitSignedImmediate: (operands at: 0)) > > ifTrue: [7] > > ifFalse: [self moveCwRByteSize]]]. > [MoveCwR] -> [^(self inCurrentCompilation: > (operands at: 0)) > ifTrue: [7] > ifFalse: > [self moveCwRByteSize]]. > [MoveC32R] -> [^7]. "N.B. Always inlined." > [MoveRR] -> [^3]. > [MoveRdRd] -> [^4]. > [MoveAwR] -> [^(self > isAddressRelativeToVarBase: (operands at: 0)) > ifTrue: [7] > ifFalse: > [(self concreteRegister: (operands at: 1)) = RAX ifTrue: [10] ifFalse: > [14]]]. > [MoveRAw] -> [^(self > isAddressRelativeToVarBase: (operands at: 1)) > ifTrue: [7] > ifFalse: > [(self concreteRegister: (operands at: 0)) = RAX ifTrue: [10] ifFalse: > [14]]]. > + [MoveAbR] -> [^(self > isAddressRelativeToVarBase: (operands at: 0)) > + ifTrue: [7] > + ifFalse: > [(self concreteRegister: (operands at: 1)) = RAX ifTrue: [10] ifFalse: > [14]]]. > + [MoveRAb] -> [^(self > isAddressRelativeToVarBase: (operands at: 1)) > + ifTrue: [7] > + ifFalse: > [(self concreteRegister: (operands at: 0)) = RAX ifTrue: [10] ifFalse: > [14]]]. > + [MoveRMwr] -> [self assert: (self > is32BitSignedImmediate: (operands at: 1)). > + ^((self isQuick: > (operands at: 1)) > - [MoveRMwr] -> [^((self isQuick: (operands at: 1)) > > ifTrue: [((operands at: 1) = 0 > > and: [((self concreteRegister: (operands at: 2)) bitAnd: 7) > ~= RBP]) > > ifTrue: [3] > > ifFalse: [4]] > > ifFalse: [7]) > + (((self > concreteRegister: (operands at: 2)) bitAnd: 7) = RSP > > ifTrue: [1] > > ifFalse: [0])]. > "[MoveRdM64r] -> [^((self isQuick: (operands at: 1)) > > ifTrue: [5] > > ifFalse: [8]) > > + ((self concreteRegister: (operands at: 2)) = ESP > > ifTrue: [1] > > ifFalse: [0])]." > + [MoveMbrR] -> [self assert: (self > is32BitSignedImmediate: (operands at: 0)). > + ^((self isQuick: > (operands at: 0)) > - [MoveMbrR] -> [^((self isQuick: (operands at: > 0)) > > ifTrue: [((operands at: 0) = 0 > > and: [((self concreteRegister: (operands at: 1)) bitAnd: 7) > ~= RBP]) > > ifTrue: [4] > > ifFalse: [5]] > > ifFalse: [8]) > + (((self > concreteRegister: (operands at: 1)) bitAnd: 7) = RSP > > ifTrue: [1] > > ifFalse: [0])]. > + [MoveRMbr] -> [self assert: (self > is32BitSignedImmediate: (operands at: 1)). > + ^((self isQuick: > (operands at: 1)) > - [MoveRMbr] -> [^((self isQuick: (operands at: > 1)) > > ifTrue: [((operands at: 1) = 0 > > and: [((self concreteRegister: (operands at: 0)) bitAnd: 7) > ~= RBP]) > > ifTrue: [3] > > ifFalse: [4]] > > ifFalse: [7]) > + (((self > concreteRegister: (operands at: 2)) bitAnd: 7) = RSP > > ifTrue: [1] > > ifFalse: [0])]. > [MoveM16rR] -> [^((self isQuick: (operands at: 0)) > > ifTrue: [((operands at: 0) = 0 > > and: [((self concreteRegister: (operands at: 1)) bitAnd: 7) > ~= RBP]) > > ifTrue: [4] > > ifFalse: [5]] > > ifFalse: [8]) > + (((self > concreteRegister: (operands at: 1)) bitAnd: 7) = RSP > > ifTrue: [1] > > ifFalse: [0])]. > "[MoveM64rRd] -> [^((self isQuick: (operands at: 0)) > > ifTrue: [5] > > ifFalse: [8]) > > + ((self concreteRegister: (operands at: 1)) = ESP > > ifTrue: [1] > > ifFalse: [0])]." > + [MoveMwrR] -> [self assert: (self > is32BitSignedImmediate: (operands at: 0)). > + ^((self > isQuick: (operands at: 0)) > - [MoveMwrR] -> [^((self isQuick: (operands at: > 0)) > > ifTrue: [((operands at: 0) = 0 > > and: [((self concreteRegister: (operands at: 1)) bitAnd: 7) > ~= RBP]) > > ifTrue: [3] > > ifFalse: [4]] > > ifFalse: [7]) > + (((self > concreteRegister: (operands at: 1)) bitAnd: 7) = RSP > > ifTrue: [1] > > ifFalse: [0])]. > [MoveXbrRR] -> [self assert: (self concreteRegister: > (operands at: 0)) ~= RSP. > ^((self > concreteRegister: (operands at: 1)) bitAnd: 7) = RBP > > ifTrue: [6] > > ifFalse: [5]]. > [MoveRXbrR] -> [self assert: (self > concreteRegister: (operands at: 1)) ~= RSP. > ^(((self > concreteRegister: (operands at: 0)) < 8 > and: [(self > concreteRegister: (operands at: 1)) < 8 > and: [(self > concreteRegister: (operands at: 2)) < 8]]) > ifTrue: [3] > ifFalse: > [4]) > + (((self > concreteRegister: (operands at: 2)) bitAnd: 7) = RBP > > ifTrue: [1] > > ifFalse: [0])]. > [MoveXwrRR] -> [self assert: (self concreteRegister: > (operands at: 0)) ~= RSP. > ^((self > concreteRegister: (operands at: 1)) = RBP > or: [(self > concreteRegister: (operands at: 1)) = R13]) > > ifTrue: [5] > > ifFalse: [4]]. > [MoveRXwrR] -> [self assert: (self concreteRegister: > (operands at: 1)) ~= RSP. > ^((self > concreteRegister: (operands at: 2)) = RBP > or: [(self > concreteRegister: (operands at: 2)) = R13]) > > ifTrue: [5] > > ifFalse: [4]]. > [PopR] -> [^(self concreteRegister: > (operands at: 0)) < 8 ifTrue: [1] ifFalse: [2]]. > [PushR] -> [^(self concreteRegister: > (operands at: 0)) < 8 ifTrue: [1] ifFalse: [2]]. > [PushCq] -> [^(self isQuick: (operands at: > 0)) ifTrue: [2] ifFalse: [5]]. > [PushCw] -> [^(self inCurrentCompilation: > (operands at: 0)) > + ifTrue: [9] > - ifTrue: [6] > ifFalse: > [self pushCwByteSize]]. > [PrefetchAw] -> [^(self isAddressRelativeToVarBase: > (operands at: 0)) ifTrue: [7] ifFalse: [0]]. > "Conversion" > "[ConvertRRd] -> [^4]" }. > ^0 "to keep C compiler quiet"! > > Item was added: > + ----- Method: CogX64Compiler>>concretizeMoveAbR (in category 'generate > machine code') ----- > + concretizeMoveAbR > + "Will get inlined into concretizeAt: switch." > + <inline: true> > + | addressOperand reg offset save0 save1 | > + addressOperand := operands at: 0. > + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: > #'AbstractInstruction *')) ifTrue: > + [addressOperand := (cogit cCoerceSimple: addressOperand > to: #'AbstractInstruction *') address]. > + (self isAddressRelativeToVarBase: addressOperand) ifTrue: > + [save0 := operands at: 0. > + save1 := operands at: 1. > + operands > + at: 0 put: addressOperand - cogit varBaseAddress; > + at: 1 put: RBX; > + at: 2 put: save1. > + self concretizeMoveMbrR. > + operands > + at: 0 put: save0; > + at: 1 put: save1; > + at: 2 put: 0. > + ^machineCodeSize]. > + reg := self concreteRegister: (operands at: 1). > + reg = RAX > + ifTrue: [offset := 0] > + ifFalse: > + [machineCode > + at: 0 put: (self rexR: 0 x: 0 b: reg); > + at: 1 put: 16r90 + (reg \\ 8). > + offset := 2]. > + machineCode > + at: 0 + offset put: 16r48; > + at: 1 + offset put: 16rA0; > + at: 2 + offset put: (addressOperand bitAnd: 16rFF); > + at: 3 + offset put: (addressOperand >> 8 bitAnd: 16rFF); > + at: 4 + offset put: (addressOperand >> 16 bitAnd: 16rFF); > + at: 5 + offset put: (addressOperand >> 24 bitAnd: 16rFF); > + at: 6 + offset put: (addressOperand >> 32 bitAnd: 16rFF); > + at: 7 + offset put: (addressOperand >> 40 bitAnd: 16rFF); > + at: 8 + offset put: (addressOperand >> 48 bitAnd: 16rFF); > + at: 9 + offset put: (addressOperand >> 56 bitAnd: 16rFF). > + reg = RAX ifTrue: > + [^machineCodeSize := 10]. > + machineCode > + at: 12 put: (machineCode at: 0); > + at: 13 put: (machineCode at: 1). > + ^machineCodeSize := 14! > > Item was added: > + ----- Method: CogX64Compiler>>concretizeMoveRAb (in category 'generate > machine code') ----- > + concretizeMoveRAb > + "Will get inlined into concretizeAt: switch." > + <inline: true> > + | addressOperand reg offset save1 | > + reg := self concreteRegister: (operands at: 0). > + addressOperand := operands at: 1. > + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: > #'AbstractInstruction *')) ifTrue: > + [addressOperand := (cogit cCoerceSimple: addressOperand > to: #'AbstractInstruction *') address]. > + (self isAddressRelativeToVarBase: addressOperand) ifTrue: > + [save1 := operands at: 1. > + operands > + at: 1 put: addressOperand - cogit varBaseAddress; > + at: 2 put: RBX. > + self concretizeMoveRMbr. > + operands > + at: 1 put: save1; > + at: 2 put: 0. > + ^machineCodeSize]. > + reg = RAX > + ifTrue: [offset := 0] > + ifFalse: > + [machineCode > + at: 0 put: (self rexR: 0 x: 0 b: reg); > + at: 1 put: 16r90 + (reg \\ 8). > + offset := 2]. > + machineCode > + at: 0 + offset put: 16r48; > + at: 1 + offset put: 16rA2; > + at: 2 + offset put: (addressOperand bitAnd: 16rFF); > + at: 3 + offset put: (addressOperand >> 8 bitAnd: 16rFF); > + at: 4 + offset put: (addressOperand >> 16 bitAnd: 16rFF); > + at: 5 + offset put: (addressOperand >> 24 bitAnd: 16rFF); > + at: 6 + offset put: (addressOperand >> 32 bitAnd: 16rFF); > + at: 7 + offset put: (addressOperand >> 40 bitAnd: 16rFF); > + at: 8 + offset put: (addressOperand >> 48 bitAnd: 16rFF); > + at: 9 + offset put: (addressOperand >> 56 bitAnd: 16rFF). > + reg = RAX ifTrue: > + [^machineCodeSize := 10]. > + machineCode > + at: 12 put: (machineCode at: 0); > + at: 13 put: (machineCode at: 1). > + ^machineCodeSize := 14! > > Item was changed: > ----- Method: CogX64Compiler>>dispatchConcretize (in category 'generate > machine code') ----- > dispatchConcretize > "Attempt to generate concrete machine code for the instruction at > address. > This is the inner dispatch of concretizeAt: actualAddress which > exists only > to get around the branch size limits in the SqueakV3 (blue book > derived) > bytecode set." > <returnTypeC: #void> > opcode caseOf: { > "Noops & Pseudo Ops" > [Label] -> [^self concretizeLabel]. > [AlignmentNops] -> [^self concretizeAlignmentNops]. > [Fill16] -> [^self > concretizeFill16]. > [Fill32] -> [^self > concretizeFill32]. > [FillFromWord] -> [^self concretizeFillFromWord]. > [Nop] -> [^self concretizeNop]. > "Specific Control/Data Movement" > [CDQ] -> [^self > concretizeCDQ]. > [IDIVR] -> [^self > concretizeIDIVR]. > [IMULRR] -> [^self > concretizeMulRR]. > [CPUID] -> [^self > concretizeCPUID]. > [CMPXCHGAwR] -> [^self > concretizeCMPXCHGAwR]. > [CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]. > [LFENCE] -> [^self > concretizeFENCE: 5]. > [MFENCE] -> [^self > concretizeFENCE: 6]. > [SFENCE] -> [^self > concretizeFENCE: 7]. > [LOCK] -> [^self > concretizeLOCK]. > [XCHGAwR] -> [^self > concretizeXCHGAwR]. > [XCHGMwrR] -> [^self > concretizeXCHGMwrR]. > [XCHGRR] -> [^self > concretizeXCHGRR]. > "Control" > [Call] -> [^self > concretizeCall]. > [CallFull] -> [^self > concretizeCallFull]. > [JumpR] -> [^self > concretizeJumpR]. > [JumpFull] -> [^self > concretizeJumpFull]. > [JumpLong] -> [^self > concretizeJumpLong]. > [JumpLongZero] -> [^self > concretizeConditionalJump: 16r4]. > [JumpLongNonZero] -> [^self > concretizeConditionalJump: 16r5]. > [Jump] -> [^self > concretizeJump]. > "Table B-1 IntelŹĆ 64 and IA-32 Architectures Software > Developer's Manual Volume 1: Basic Architecture" > [JumpZero] -> [^self > concretizeConditionalJump: 16r4]. > [JumpNonZero] -> [^self > concretizeConditionalJump: 16r5]. > [JumpNegative] -> [^self > concretizeConditionalJump: 16r8]. > [JumpNonNegative] -> [^self > concretizeConditionalJump: 16r9]. > [JumpOverflow] -> [^self > concretizeConditionalJump: 16r0]. > [JumpNoOverflow] -> [^self > concretizeConditionalJump: 16r1]. > [JumpCarry] -> [^self > concretizeConditionalJump: 16r2]. > [JumpNoCarry] -> [^self > concretizeConditionalJump: 16r3]. > [JumpLess] -> [^self > concretizeConditionalJump: 16rC]. > [JumpGreaterOrEqual] -> [^self > concretizeConditionalJump: 16rD]. > [JumpGreater] -> [^self > concretizeConditionalJump: 16rF]. > [JumpLessOrEqual] -> [^self > concretizeConditionalJump: 16rE]. > [JumpBelow] -> [^self > concretizeConditionalJump: 16r2]. > [JumpAboveOrEqual] -> [^self > concretizeConditionalJump: 16r3]. > [JumpAbove] -> [^self > concretizeConditionalJump: 16r7]. > [JumpBelowOrEqual] -> [^self > concretizeConditionalJump: 16r6]. > [JumpFPEqual] -> [^self > concretizeConditionalJump: 16r4]. > [JumpFPNotEqual] -> [^self > concretizeConditionalJump: 16r5]. > [JumpFPLess] -> [^self > concretizeConditionalJump: 16r2]. > [JumpFPGreaterOrEqual] -> [^self > concretizeConditionalJump: 16r3]. > [JumpFPGreater] -> [^self > concretizeConditionalJump: 16r7]. > [JumpFPLessOrEqual] -> [^self > concretizeConditionalJump: 16r6]. > [JumpFPOrdered] -> [^self > concretizeConditionalJump: 16rB]. > [JumpFPUnordered] -> [^self > concretizeConditionalJump: 16rA]. > [RetN] -> [^self > concretizeRetN]. > [Stop] -> [^self > concretizeStop]. > "Arithmetic" > [AddCqR] -> [^self > concretizeArithCqRWithRO: 0 raxOpcode: 15r05]. > [AddCwR] -> [^self > concretizeArithCwR: 16r03]. > [AddRR] -> [^self > concretizeAddRR]. > [AddRdRd] -> [^self > concretizeSEE2OpRdRd: 16r58]. > [AndCqR] -> [^self > concretizeArithCqRWithRO: 4 raxOpcode: 16r25]. > [AndCwR] -> [^self > concretizeArithCwR: 16r23]. > [AndRR] -> [^self > concretizeAndRR]. > [TstCqR] -> [^self > concretizeTstCqR]. > [CmpCqR] -> [^self > concretizeArithCqRWithRO: 7 raxOpcode: 16r3D]. > [CmpCwR] -> [^self > concretizeArithCwR: 16r39]. > [CmpRR] -> [^self > concretizeCmpRR]. > [CmpRdRd] -> [^self > concretizeCmpRdRd]. > [DivRdRd] -> [^self > concretizeSEE2OpRdRd: 16r5E]. > [MulRdRd] -> [^self > concretizeSEE2OpRdRd: 16r59]. > [OrCqR] -> [^self > concretizeArithCqRWithRO: 1 raxOpcode: 16r0D]. > [OrCwR] -> [^self > concretizeArithCwR: 16r0B]. > [OrRR] -> [^self > concretizeOrRR]. > [SubCqR] -> [^self > concretizeArithCqRWithRO: 5 raxOpcode: 16r2D]. > [SubCwR] -> [^self > concretizeArithCwR: 16r2B]. > [SubRR] -> [^self > concretizeSubRR]. > [SubRdRd] -> [^self > concretizeSEE2OpRdRd: 16r5C]. > [SqrtRd] -> [^self > concretizeSqrtRd]. > [XorCwR] -> [^self > concretizeArithCwR: 16r33]. > [XorRR] -> [^self > concretizeXorRR]. > [NegateR] -> [^self > concretizeNegateR]. > [LoadEffectiveAddressMwrR] -> [^self > concretizeLoadEffectiveAddressMwrR]. > [ArithmeticShiftRightCqR] -> [^self > concretizeShiftCqRegOpcode: 7]. > [LogicalShiftRightCqR] -> [^self > concretizeShiftCqRegOpcode: 5]. > [LogicalShiftLeftCqR] -> [^self > concretizeShiftCqRegOpcode: 4]. > [ArithmeticShiftRightRR] -> [^self > concretizeShiftRegRegOpcode: 7]. > [LogicalShiftLeftRR] -> [^self > concretizeShiftRegRegOpcode: 4]. > "Data Movement" > [MoveCqR] -> [^self > concretizeMoveCqR]. > [MoveCwR] -> [^self > concretizeMoveCwR]. > + [MoveC32R] -> [^self concretizeMoveC32R]. > - [MoveC32R] -> [^self > concretizeMoveC32R]. > [MoveRR] -> [^self > concretizeMoveRR]. > [MoveAwR] -> [^self > concretizeMoveAwR]. > [MoveRAw] -> [^self > concretizeMoveRAw]. > + [MoveAbR] -> [^self > concretizeMoveAbR]. > + [MoveRAb] -> [^self > concretizeMoveRAb]. > [MoveMbrR] -> [^self > concretizeMoveMbrR]. > [MoveRMbr] -> [^self > concretizeMoveRMbr]. > [MoveM16rR] -> [^self concretizeMoveM16rR]. > [MoveM64rRd] -> [^self concretizeMoveM64rRd]. > [MoveMwrR] -> [^self concretizeMoveMwrR]. > [MoveXbrRR] -> [^self concretizeMoveXbrRR]. > [MoveRXbrR] -> [^self concretizeMoveRXbrR]. > [MoveXwrRR] -> [^self concretizeMoveXwrRR]. > [MoveRXwrR] -> [^self concretizeMoveRXwrR]. > [MoveRMwr] -> [^self concretizeMoveRMwr]. > [MoveRdM64r] -> [^self concretizeMoveRdM64r]. > [PopR] -> [^self concretizePopR]. > [PushR] -> [^self concretizePushR]. > [PushCq] -> [^self > concretizePushCq]. > [PushCw] -> [^self > concretizePushCw]. > [PrefetchAw] -> [^self concretizePrefetchAw]. > "Conversion" > [ConvertRRd] -> [^self concretizeConvertRRd] }! > > Item was added: > + ----- Method: CogX64CompilerTests>>addressIsInCurrentCompilation: (in > category 'accessing') ----- > + addressIsInCurrentCompilation: address > + ^self currentCompilationBase <= address > + and: [address - self currentCompilationBase < 1024]! > > Item was added: > + ----- Method: CogX64CompilerTests>>currentCompilationBase (in category > 'accessing') ----- > + currentCompilationBase > + ^16r8000! > > Item was added: > + ----- Method: CogX64CompilerTests>>testMoveAbR (in category 'tests') > ----- > + testMoveAbR > + "self neb testMoveAbR" > + self concreteCompilerClass byteRegistersWithNamesDo: > + [:reg :regname| | reg64name | > + reg64name := self processor registerStateGetters at: reg + > 1. > + #(16r555555 16rAAAAAA 16r5A5A5A5A5A5A) do: > + [:addr| | inst len totalsz | > + inst := self gen: MoveAbR operand: addr operand: > reg. > + len := inst concretizeAt: 0. > + totalsz := 0. > + regname ~= '%al' ifTrue: > + [self processor > + disassembleInstructionAt: 0 > + In: inst machineCode object > + into: [:str :sz| | plainJane > herIntended | > + plainJane := self strip: > str. > + herIntended := 'xchgq > %rax, %', reg64name. > + self assert: (plainJane > match: herIntended). > + totalsz := sz]]. > + self processor > + disassembleInstructionAt: totalsz > + In: inst machineCode object > + into: [:str :sz| | plainJane herIntended | > + plainJane := self strip: str. > + herIntended := 'movb 0x', (addr > printStringBase: 16 length: 16 padded: true), ', %al'. > + self assert: (plainJane match: > herIntended). > + totalsz := totalsz + sz]. > + regname ~= '%al' ifTrue: > + [self processor > + disassembleInstructionAt: totalsz > + In: inst machineCode object > + into: [:str :sz| | plainJane > herIntended | > + plainJane := self strip: > str. > + herIntended := 'xchgq > %rax, %', reg64name. > + self assert: (plainJane > match: herIntended). > + totalsz := totalsz + sz]]. > + self assert: len = totalsz]]! > > Item was added: > + ----- Method: CogX64CompilerTests>>testMoveRAb (in category 'tests') > ----- > + testMoveRAb > + "self new testMoveRAb" > + self concreteCompilerClass byteRegistersWithNamesDo: > + [:reg :regname| | reg64name | > + reg64name := self processor registerStateGetters at: reg + > 1. > + #(16r555555 16rAAAAAA 16r5A5A5A5A5A5A) do: > + [:addr| | inst len totalsz | > + inst := self gen: MoveRAb operand: reg operand: > addr. > + len := inst concretizeAt: 0. > + totalsz := 0. > + regname ~= '%al' ifTrue: > + [self processor > + disassembleInstructionAt: 0 > + In: inst machineCode object > + into: [:str :sz| | plainJane > herIntended | > + plainJane := self strip: > str. > + herIntended := 'xchgq > %rax, %', reg64name. > + self assert: (plainJane > match: herIntended). > + totalsz := sz]]. > + self processor > + disassembleInstructionAt: totalsz > + In: inst machineCode object > + into: [:str :sz| | plainJane herIntended | > + plainJane := self strip: str. > + herIntended := 'movb %al, 0x', > (addr printStringBase: 16 length: 16 padded: true). > + self assert: (plainJane match: > herIntended). > + totalsz := totalsz + sz]. > + regname ~= '%al' ifTrue: > + [self processor > + disassembleInstructionAt: totalsz > + In: inst machineCode object > + into: [:str :sz| | plainJane > herIntended | > + plainJane := self strip: > str. > + herIntended := 'xchgq > %rax, %', reg64name. > + self assert: (plainJane > match: herIntended). > + totalsz := totalsz + sz]]. > + self assert: len = totalsz]]! > > Item was added: > + ----- Method: CogX64CompilerTests>>testMoveRIPRelativeCwR (in category > 'as yet unclassified') ----- > + testMoveRIPRelativeCwR > + "test rip-relative constant generation" > + "self new testMoveRIPRelativeCwR" > + > + | memory | > + memory := ByteArray new: 16. > + {self currentCompilationBase. self currentCompilationBase + 512} > do: > + [:n| | inst len | > + self concreteCompilerClass dataRegistersWithAccessorsDo: > + [ :r :rgetter :rset | > + inst := self gen: MoveCwR operand: n operand: r. > + len := inst concretizeAt: 0. > + memory replaceFrom: 1 to: len with: inst > machineCode object startingAt: 1. > + self processor > + reset. > + [[processor pc < len] whileTrue: > + [self processor singleStepIn: memory]] > + on: Error > + do: [:ex| ]. > + self concreteCompilerClass > dataRegistersWithAccessorsDo: > + [:ireg :getter :setter| | expected | > + expected := getter == rgetter ifTrue: [n] > ifFalse: [0]. > + self assert: (self processor perform: > getter) = expected]. > + self assert: self processor pc = inst > machineCodeSize]] > + > + "processor disassembleFrom: 0 to: inst machineCodeSize in: memory > on: Transcript"! > > Item was added: > + ----- Method: Cogit>>MoveAb:R: (in category 'abstract instructions') > ----- > + MoveAb: address R: reg > + <inline: true> > + <returnTypeC: #'AbstractInstruction *'> > + ^self gen: MoveAbR literal: address operand: reg! > > Item was added: > + ----- Method: Cogit>>MoveR:Ab: (in category 'abstract instructions') > ----- > + MoveR: reg Ab: address > + <inline: true> > + <returnTypeC: #'AbstractInstruction *'> > + ^self gen: MoveRAb operand: reg literal: address! > > Item was changed: > ----- Method: Cogit>>addressIsInInstructions: (in category 'testing') > ----- > addressIsInInstructions: address > <var: #address type: #'AbstractInstruction *'> > + ^self cCode: '!!((unsigned)(address) & BytesPerWord-1) \ > - ^self cCode: '!!((((unsigned)address) & BytesPerWord-1)) \ > && (address) >= &abstractOpcodes[0] \ > && (address) < > &abstractOpcodes[opcodeIndex]' > inSmalltalk: [(abstractOpcodes object identityIndexOf: > address) between: 1 and: opcodeIndex]! > > Item was changed: > ----- Method: SimpleStackBasedCogit>>genFastPrimTraceUsing:and: (in > category 'primitive generators') ----- > genFastPrimTraceUsing: r1 and: r2 > "Suport for compileInterpreterPrimitive. Generate inline code so > as to record the primitive > trace as fast as possible." > + self MoveAb: coInterpreter primTraceLogIndexAddress R: r2. > - self MoveCq: 0 R: TempReg. > - "Too lazy to add MoveAbR and MoveRAb, so misuse MoveMbrR and > MoveRMbr" > - self MoveMb: coInterpreter primTraceLogIndexAddress r: TempReg R: > r2. > self MoveR: r2 R: r1. > self AddCq: 1 R: r1. > + self MoveR: r1 Ab: coInterpreter primTraceLogIndexAddress. > - self MoveR: r1 Mb: coInterpreter primTraceLogIndexAddress r: > TempReg. > methodLabel addDependent: > (self annotateAbsolutePCRef: > (self MoveCw: methodLabel asInteger R: r1)). > self MoveMw: (self offset: CogMethod of: #selector) r: r1 R: > TempReg. > self MoveCw: coInterpreter primTraceLogAddress asInteger R: r1. > self MoveR: TempReg Xwr: r2 R: r1! > > Item was changed: > ----- Method: ThreadedFFIPlugin>>ffiAddressOf:startingAt:size: (in > category 'primitive support') ----- > ffiAddressOf: rcvr startingAt: byteOffset size: byteSize > "return an int of the address of the byteSize slot (byte, short, int, > whatever) at byteOffset in rcvr. Nominally intended for use with > ExternalAddress objects, this code will work (for obscure historical > reasons) with plain Byte or Word Arrays as well. " > | rcvrClass rcvrSize addr | > + self flag: 'This needs more thought. It is 32-bit specific. What > about 64-bit platforms?'. > (interpreterProxy isBytes: rcvr) ifFalse:[^interpreterProxy > primitiveFail]. > (byteOffset > 0) ifFalse:[^interpreterProxy primitiveFail]. > rcvrClass := interpreterProxy fetchClassOf: rcvr. > rcvrSize := interpreterProxy byteSizeOf: rcvr. > rcvrClass = interpreterProxy classExternalAddress ifTrue:[ > (rcvrSize = 4) ifFalse:[^interpreterProxy primitiveFail]. > addr := interpreterProxy fetchPointer: 0 ofObject: rcvr. > + self flag: 'This needs more thought. Instead of always > allowing this couldn''t we allow it only if the address is associated with > a pinned object?'. > "don't you dare to read from object memory!!" > + (addr = 0 "or: [interpreterProxy isInMemory: addr]") > - (addr == 0 "or:[interpreterProxy isInMemory: addr]") > ifTrue:[^interpreterProxy primitiveFail]. > ] ifFalse:[ > (byteOffset+byteSize-1 <= rcvrSize) > ifFalse:[^interpreterProxy primitiveFail]. > addr := self cCoerce: (interpreterProxy > firstIndexableField: rcvr) to: 'int'. > ]. > addr := addr + byteOffset - 1. > ^addr! > >

3 4

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2015