Vm-dev January 2014

vm-dev@lists.squeakfoundation.org

28 participants
97 discussions

[commit][2856] Add build directory for mac Newspeak Spur Cog VM.
by commits＠squeakvm.org 29 Jan '14

29 Jan '14

Revision: 2856 Author: eliot Date: 2014-01-28 16:03:21 -0800 (Tue, 28 Jan 2014) Log Message: ----------- Add build directory for mac Newspeak Spur Cog VM. Added Paths: ----------- branches/Cog/nsspurcogbuild/ branches/Cog/nsspurcogbuild/macbuild/ branches/Cog/nsspurcogbuild/macbuild/CoreVM.plist branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/ branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/eliot.mode1v3 branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/eliot.pbxuser branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/nsspurcogbuild/macbuild/HowToBuild branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/ branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/Info.plist branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/ branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.pbxuser branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/nsspurcogbuild/macbuild/SqueakSSL/SqueakSSL_Prefix.pch branches/Cog/nsspurcogbuild/macbuild/build/ branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/ branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/ branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/categories.pbxbtree branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/cdecls.pbxbtree branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/decls.pbxbtree branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/files.pbxbtree branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/imports.pbxbtree branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/pbxindex.header branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/protocols.pbxbtree branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/refs.pbxbtree branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/strings.pbxstrings/ branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/strings.pbxstrings/control branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/strings.pbxstrings/strings branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/subclasses.pbxbtree branches/Cog/nsspurcogbuild/macbuild/build/CoreVM.build/CoreVM.pbxindex/symbols0.pbxsymbols branches/Cog/nsspurcogbuild/macbuild/installer/ branches/Cog/nsspurcogbuild/macbuild/installer/InstallerBackground.png branches/Cog/nsspurcogbuild/macbuild/installer/LayoutDiskImage.applescript.in branches/Cog/nsspurcogbuild/macbuild/installer/Makefile branches/Cog/nsspurcogbuild/macbuild/installer/VolumeIcon.icns branches/Cog/nsspurcogbuild/macbuild/installer/branding-sed-rules.gmk branches/Cog/nsspurcogbuild/macbuild/installer/branding.gmk branches/Cog/nsspurcogbuild/macbuild/installer/installer-Darwin.gmk branches/Cog/nsspurcogbuild/macbuild/makeclean branches/Cog/nsspurcogbuild/macbuild/makevm branches/Cog/nsspurcogbuild/macbuild/mkNamedPrims.sh branches/Cog/nsspurcogbuild/macbuild/mvm branches/Cog/nsspurcogbuild/macbuild/plugins.ext branches/Cog/nsspurcogbuild/macbuild/plugins.int branches/Cog/nsspurcogbuild/macbuild/resources/ branches/Cog/nsspurcogbuild/macbuild/resources/ProjectBuilder/ branches/Cog/nsspurcogbuild/macbuild/resources/ProjectBuilder/Newspeak Virtual Machine.icns branches/Cog/nsspurcogbuild/macbuild/resources/ProjectBuilder/NewspeakDocuments.icns branches/Cog/nsspurcogbuild/macbuild/resources/ProjectBuilder/Squeak VM.r branches/Cog/nsspurcogbuild/macbuild/resources/ProjectBuilder/SqueakPlugin.icns branches/Cog/nsspurcogbuild/macbuild/sqNamedPrims.h Added: branches/Cog/nsspurcogbuild/macbuild/CoreVM.plist =================================================================== --- branches/Cog/nsspurcogbuild/macbuild/CoreVM.plist (rev 0) +++ branches/Cog/nsspurcogbuild/macbuild/CoreVM.plist 2014-01-29 00:03:21 UTC (rev 2856) @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleDocumentTypes</key> + <array> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>image</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>Newspeak Virtual Machine.icns</string> + <key>CFBundleTypeName</key> + <string>Newspeak Image File</string> + <key>CFBundleTypeOSTypes</key> + <array> + <string>STim</string> + </array> + <key>CFBundleTypeRole</key> + <string>Editor</string> + </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>sources</string> + <string>ns0</string> + <string>ns1</string> + <string>ns2</string> + <string>ns3</string> + <string>ns4</string> + <string>ns5</string> + <string>ns6</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>Newspeak Virtual Machine.icns</string> + <key>CFBundleTypeName</key> + <string>Newspeak Sources File</string> + <key>CFBundleTypeOSTypes</key> + <array> + <string>STso</string> + </array> + <key>CFBundleTypeRole</key> + <string>Editor</string> + </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>changes</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>Newspeak Virtual Machine.icns</string> + <key>CFBundleTypeName</key> + <string>Newspeak Changes File</string> + <key>CFBundleTypeOSTypes</key> + <array> + <string>STch</string> + </array> + <key>CFBundleTypeRole</key> + <string>Editor</string> + </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>bundle</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>SqueakPlugin.icns</string> + <key>CFBundleTypeName</key> + <string>Squeak Plugin</string> + <key>CFBundleTypeOSTypes</key> + <array> + <string>BNDL</string> + </array> + <key>CFBundleTypeRole</key> + <string>Editor</string> + </dict> + </array> + <key>UTExportedTypeDeclarations</key> + <array> + <dict> + <key>UTTypeConformsTo</key> + <array> + <string>public.data</string> + </array> + <key>UTTypeDescription</key> + <string>Newspeak Virtual Machine Image</string> + <key>UTTypeIconFile</key> + <string>NewspeakDocuments.icns</string> + <key>UTTypeIdentifier</key> + <string>org.newspeakplatform.image-data</string> + <key>UTTypeTagSpecification</key> + <dict> + <key>public.filename-extension</key> + <array> + <string>image</string> + </array> + </dict> + </dict> + <dict> + <key>UTTypeConformsTo</key> + <array> + <string>public.text</string> + </array> + <key>UTTypeDescription</key> + <string>Newspeak Virtual Machine Changes</string> + <key>UTTypeIconFile</key> + <string>NewspeakDocuments.icns</string> + <key>UTTypeIdentifier</key> + <string>org.newspeakplatform.changes-data</string> + <key>UTTypeTagSpecification</key> + <dict> + <key>public.filename-extension</key> + <array> + <string>changes</string> + </array> + </dict> + </dict> + </array> + <key>CFBundleExecutable</key> + <string>Newspeak Virtual Machine</string> + <key>CFBundleGetInfoString</key> + <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> + <key>CFBundleShortVersionString</key> + <string>Newspeak Virtual Machine 4.0.0</string> + <key>CFBundleVersion</key> + <string>4.0.0</string> + <key>CFBundleIconFile</key> + <string>Newspeak Virtual Machine.icns</string> + <key>CFBundleIdentifier</key> + <string>org.bracha.Newspeak</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>Newspeak Virtual Machine</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleSignature</key> + <string>NSVM</string> + <key>CGDisableCoalescedUpdates</key> + <true/> + <key>LSBackgroundOnly</key> + <false/> + <key>LSMinimumSystemVersion</key> + <string>10.5.0</string> + <key>SqueakBrowserMouseCmdButton1</key> + <integer>3</integer> + <key>SqueakBrowserMouseCmdButton2</key> + <integer>3</integer> + <key>SqueakBrowserMouseCmdButton3</key> + <integer>2</integer> + <key>SqueakBrowserMouseControlButton1</key> + <integer>1</integer> + <key>SqueakBrowserMouseControlButton2</key> + <integer>3</integer> + <key>SqueakBrowserMouseControlButton3</key> + <integer>2</integer> + <key>SqueakBrowserMouseNoneButton1</key> + <integer>1</integer> + <key>SqueakBrowserMouseNoneButton2</key> + <integer>3</integer> + <key>SqueakBrowserMouseNoneButton3</key> + <integer>2</integer> + <key>SqueakBrowserMouseOptionButton1</key> + <integer>2</integer> + <key>SqueakBrowserMouseOptionButton2</key> + <integer>3</integer> + <key>SqueakBrowserMouseOptionButton3</key> + <integer>2</integer> + <key>SqueakDebug</key> + <integer>0</integer> + <key>SqueakEncodingType</key> + <string>UTF-8</string> + <key>SqueakExplicitWindowOpenNeeded</key> + <false/> + <key>SqueakFloatingWindowGetsFocus</key> + <true/> + <key>SqueakHasQuitWithoutSaving</key> + <false/> + <key>SqueakImageName</key> + <string>Newspeak.image</string> + <key>SqueakMaxHeapSize</key> + <integer>1073741824</integer> + <key>SqueakMouseCmdButton1</key> + <integer>3</integer> + <key>SqueakMouseCmdButton2</key> + <integer>3</integer> + <key>SqueakMouseCmdButton3</key> + <integer>2</integer> + <key>SqueakMouseControlButton1</key> + <integer>1</integer> + <key>SqueakMouseControlButton2</key> + <integer>3</integer> + <key>SqueakMouseControlButton3</key> + <integer>2</integer> + <key>SqueakMouseNoneButton1</key> + <integer>1</integer> + <key>SqueakMouseNoneButton2</key> + <integer>3</integer> + <key>SqueakMouseNoneButton3</key> + <integer>2</integer> + <key>SqueakMouseOptionButton1</key> + <integer>2</integer> + <key>SqueakMouseOptionButton2</key> + <integer>3</integer> + <key>SqueakMouseOptionButton3</key> + <integer>2</integer> + <key>SqueakPluginsBuiltInOrLocalOnly</key> + <false/> + <key>SqueakUIFlushPrimaryDeferNMilliseconds</key> + <integer>20</integer> + <key>SqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds</key> + <integer>20</integer> + <key>SqueakUIFlushSecondaryCleanupDelayMilliseconds</key> + <integer>25</integer> + <key>SqueakUIFlushUseHighPercisionClock</key> + <true/> + <key>SqueakUnTrustedDirectory</key> + <string>~/Library/Preferences/Newspeak/Internet/Untrusted/</string> + <key>SqueakWindowAttribute</key> + <data> + ggAAHw== + </data> + <key>SqueakWindowHasTitle</key> + <true/> + <key>SqueakWindowType</key> + <integer>6</integer> + <key>SqueakVMPathAnswersResources</key> + <true/> +</dict> +</plist> Added: branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/eliot.mode1v3 =================================================================== --- branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/eliot.mode1v3 (rev 0) +++ branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/eliot.mode1v3 2014-01-29 00:03:21 UTC (rev 2856) @@ -0,0 +1,1384 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>ActivePerspectiveName</key> + <string>Project</string> + <key>AllowedModules</key> + <array> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Name</key> + <string>Groups and Files Outline View</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Name</key> + <string>Editor</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCTaskListModule</string> + <key>Name</key> + <string>Task List</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCDetailModule</string> + <key>Name</key> + <string>File and Smart Group Detail Viewer</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXBuildResultsModule</string> + <key>Name</key> + <string>Detailed Build Results Viewer</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXProjectFindModule</string> + <key>Name</key> + <string>Project Batch Find Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCProjectFormatConflictsModule</string> + <key>Name</key> + <string>Project Format Conflicts List</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXBookmarksModule</string> + <key>Name</key> + <string>Bookmarks Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXClassBrowserModule</string> + <key>Name</key> + <string>Class Browser</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXCVSModule</string> + <key>Name</key> + <string>Source Code Control Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXDebugBreakpointsModule</string> + <key>Name</key> + <string>Debug Breakpoints Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCDockableInspector</string> + <key>Name</key> + <string>Inspector</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXOpenQuicklyModule</string> + <key>Name</key> + <string>Open Quickly Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXDebugSessionModule</string> + <key>Name</key> + <string>Debugger</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXDebugCLIModule</string> + <key>Name</key> + <string>Debug Console</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCSnapshotModule</string> + <key>Name</key> + <string>Snapshots Tool</string> + </dict> + </array> + <key>BundlePath</key> + <string>/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources</string> + <key>Description</key> + <string>DefaultDescriptionKey</string> + <key>DockingSystemVisible</key> + <false/> + <key>Extension</key> + <string>mode1v3</string> + <key>FavBarConfig</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>738CF2D218987C220039020A</string> + <key>XCBarModuleItemNames</key> + <dict/> + <key>XCBarModuleItems</key> + <array/> + </dict> + <key>FirstTimeWindowDisplayed</key> + <false/> + <key>Identifier</key> + <string>com.apple.perspectives.project.mode1v3</string> + <key>MajorVersion</key> + <integer>33</integer> + <key>MinorVersion</key> + <integer>0</integer> + <key>Name</key> + <string>Default</string> + <key>Notifications</key> + <array/> + <key>OpenEditors</key> + <array/> + <key>PerspectiveWidths</key> + <array> + <integer>-1</integer> + <integer>-1</integer> + </array> + <key>Perspectives</key> + <array> + <dict> + <key>ChosenToolbarItems</key> + <array> + <string>active-combo-popup</string> + <string>action</string> + <string>NSToolbarFlexibleSpaceItem</string> + <string>debugger-enable-breakpoints</string> + <string>build-and-go</string> + <string>com.apple.ide.PBXToolbarStopButton</string> + <string>get-info</string> + <string>NSToolbarFlexibleSpaceItem</string> + <string>com.apple.pbx.toolbar.searchfield</string> + </array> + <key>ControllerClassBaseName</key> + <string></string> + <key>IconName</key> + <string>WindowOfProjectWithEditor</string> + <key>Identifier</key> + <string>perspective.project</string> + <key>IsVertical</key> + <false/> + <key>Layout</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXBottomSmartGroupGIDs</key> + <array> + <string>1C37FBAC04509CD000000102</string> + <string>1C37FAAC04509CD000000102</string> + <string>1C37FABC05509CD000000102</string> + <string>1C37FABC05539CD112110102</string> + <string>E2644B35053B69B200211256</string> + <string>1C37FABC04509CD000100104</string> + <string>1CC0EA4004350EF90044410B</string> + <string>1CC0EA4004350EF90041110B</string> + </array> + <key>PBXProjectModuleGUID</key> + <string>1CE0B1FE06471DED0097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>Files</string> + <key>PBXProjectStructureProvided</key> + <string>yes</string> + <key>PBXSmartGroupTreeModuleColumnData</key> + <dict> + <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> + <array> + <real>186</real> + </array> + <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> + <array> + <string>MainColumn</string> + </array> + </dict> + <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key> + <dict> + <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> + <array> + <string>08773EB500C6A1C4C0A80109</string> + <string>F5F8ADC002EB4E090100013C</string> + <string>F5F8ADC102EB4E090100013C</string> + <string>F5F8ADC502EB4E090100013C</string> + <string>1C37FABC05509CD000000102</string> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> + <array> + <array> + <integer>3</integer> + <integer>2</integer> + <integer>1</integer> + <integer>0</integer> + </array> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> + <string>{{0, 0}, {186, 445}}</string> + </dict> + <key>PBXTopSmartGroupGIDs</key> + <array/> + <key>XCIncludePerspectivesSwitch</key> + <true/> + <key>XCSharingToken</key> + <string>com.apple.Xcode.GFSharingToken</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {203, 463}}</string> + <key>GroupTreeTableConfiguration</key> + <array> + <string>MainColumn</string> + <real>186</real> + </array> + <key>RubberWindowFrame</key> + <string>204 552 788 504 0 0 1920 1178 </string> + </dict> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Proportion</key> + <string>203pt</string> + </dict> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CE0B20306471E060097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>AsynchFilePlugin.c</string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CE0B20406471E060097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>AsynchFilePlugin.c</string> + <key>_historyCapacity</key> + <integer>0</integer> + <key>bookmark</key> + <string>738CF2D518987C230039020A</string> + <key>history</key> + <array> + <string>738CF2BA18987C220039020A</string> + <string>738CF2BC18987C220039020A</string> + <string>738CF2BE18987C220039020A</string> + <string>738CF2C018987C220039020A</string> + <string>738CF2C218987C220039020A</string> + <string>738CF2C418987C220039020A</string> + <string>738CF2C618987C220039020A</string> + <string>738CF2C818987C220039020A</string> + <string>738CF2C918987C220039020A</string> + <string>738CF2CA18987C220039020A</string> + <string>738CF2CB18987C220039020A</string> + <string>738CF2CC18987C220039020A</string> + <string>738CF2CD18987C220039020A</string> + <string>738CF2CE18987C220039020A</string> + </array> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <true/> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {580, 277}}</string> + <key>RubberWindowFrame</key> + <string>204 552 788 504 0 0 1920 1178 </string> + </dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>277pt</string> + </dict> + <dict> + <key>BecomeActive</key> + <true/> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CE0B20506471E060097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>Detail</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 282}, {580, 181}}</string> + <key>RubberWindowFrame</key> + <string>204 552 788 504 0 0 1920 1178 </string> + </dict> + <key>Module</key> + <string>XCDetailModule</string> + <key>Proportion</key> + <string>181pt</string> + </dict> + </array> + <key>Proportion</key> + <string>580pt</string> + </dict> + </array> + <key>Name</key> + <string>Project</string> + <key>ServiceClasses</key> + <array> + <string>XCModuleDock</string> + <string>PBXSmartGroupTreeModule</string> + <string>XCModuleDock</string> + <string>PBXNavigatorGroup</string> + <string>XCDetailModule</string> + </array> + <key>TableOfContents</key> + <array> + <string>738CF2D018987C220039020A</string> + <string>1CE0B1FE06471DED0097A5F4</string> + <string>738CF2D118987C220039020A</string> + <string>1CE0B20306471E060097A5F4</string> + <string>1CE0B20506471E060097A5F4</string> + </array> + <key>ToolbarConfigUserDefaultsMinorVersion</key> + <string>2</string> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.defaultV3</string> + </dict> + <dict> + <key>ControllerClassBaseName</key> + <string></string> + <key>IconName</key> + <string>WindowOfProject</string> + <key>Identifier</key> + <string>perspective.morph</string> + <key>IsVertical</key> + <integer>0</integer> + <key>Layout</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXBottomSmartGroupGIDs</key> + <array> + <string>1C37FBAC04509CD000000102</string> + <string>1C37FAAC04509CD000000102</string> + <string>1C08E77C0454961000C914BD</string> + <string>1C37FABC05509CD000000102</string> + <string>1C37FABC05539CD112110102</string> + <string>E2644B35053B69B200211256</string> + <string>1C37FABC04509CD000100104</string> + <string>1CC0EA4004350EF90044410B</string> + <string>1CC0EA4004350EF90041110B</string> + </array> + <key>PBXProjectModuleGUID</key> + <string>11E0B1FE06471DED0097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>Files</string> + <key>PBXProjectStructureProvided</key> + <string>yes</string> + <key>PBXSmartGroupTreeModuleColumnData</key> + <dict> + <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> + <array> + <real>186</real> + </array> + <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> + <array> + <string>MainColumn</string> + </array> + </dict> + <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key> + <dict> + <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> + <array> + <string>29B97314FDCFA39411CA2CEA</string> + <string>1C37FABC05509CD000000102</string> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> + <array> + <array> + <integer>0</integer> + </array> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> + <string>{{0, 0}, {186, 337}}</string> + </dict> + <key>PBXTopSmartGroupGIDs</key> + <array/> + <key>XCIncludePerspectivesSwitch</key> + <integer>1</integer> + <key>XCSharingToken</key> + <string>com.apple.Xcode.GFSharingToken</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {203, 355}}</string> + <key>GroupTreeTableConfiguration</key> + <array> + <string>MainColumn</string> + <real>186</real> + </array> + <key>RubberWindowFrame</key> + <string>373 269 690 397 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Morph</string> + <key>PreferredWidth</key> + <integer>300</integer> + <key>ServiceClasses</key> + <array> + <string>XCModuleDock</string> + <string>PBXSmartGroupTreeModule</string> + </array> + <key>TableOfContents</key> + <array> + <string>11E0B1FE06471DED0097A5F4</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.default.shortV3</string> + </dict> + </array> + <key>PerspectivesBarVisible</key> + <false/> + <key>ShelfIsVisible</key> + <false/> + <key>SourceDescription</key> + <string>file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string> + <key>StatusbarIsVisible</key> + <true/> + <key>TimeStamp</key> + <real>0.0</real> + <key>ToolbarConfigUserDefaultsMinorVersion</key> + <string>2</string> + <key>ToolbarDisplayMode</key> + <integer>1</integer> + <key>ToolbarIsVisible</key> + <true/> + <key>ToolbarSizeMode</key> + <integer>1</integer> + <key>Type</key> + <string>Perspectives</string> + <key>UpdateMessage</key> + <string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'?</string> + <key>WindowJustification</key> + <integer>5</integer> + <key>WindowOrderList</key> + <array> + <string>738CF2D318987C220039020A</string> + <string>/Users/eliot/Cog/oscogvm/nsspurcogbuild/macbuild/CoreVM.xcodeproj</string> + </array> + <key>WindowString</key> + <string>204 552 788 504 0 0 1920 1178 </string> + <key>WindowToolsV3</key> + <array> + <dict> + <key>FirstTimeWindowDisplayed</key> + <false/> + <key>Identifier</key> + <string>windowTool.build</string> + <key>IsVertical</key> + <true/> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CD0528F0623707200166675</string> + <key>PBXProjectModuleLabel</key> + <string></string> + <key>StatusBarVisibility</key> + <true/> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {500, 218}}</string> + <key>RubberWindowFrame</key> + <string>613 500 500 500 0 0 1920 1178 </string> + </dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>218pt</string> + </dict> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>XCMainBuildResultsModuleGUID</string> + <key>PBXProjectModuleLabel</key> + <string>Build Results</string> + <key>XCBuildResultsTrigger_Collapse</key> + <integer>1021</integer> + <key>XCBuildResultsTrigger_Open</key> + <integer>1011</integer> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 223}, {500, 236}}</string> + <key>RubberWindowFrame</key> + <string>613 500 500 500 0 0 1920 1178 </string> + </dict> + <key>Module</key> + <string>PBXBuildResultsModule</string> + <key>Proportion</key> + <string>236pt</string> + </dict> + </array> + <key>Proportion</key> + <string>459pt</string> + </dict> + </array> + <key>Name</key> + <string>Build Results</string> + <key>ServiceClasses</key> + <array> + <string>PBXBuildResultsModule</string> + </array> + <key>StatusbarIsVisible</key> + <true/> + <key>TableOfContents</key> + <array> + <string>738CF2D318987C220039020A</string> + <string>738CF2D418987C220039020A</string> + <string>1CD0528F0623707200166675</string> + <string>XCMainBuildResultsModuleGUID</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.buildV3</string> + <key>WindowContentMinSize</key> + <string>486 300</string> + <key>WindowString</key> + <string>613 500 500 500 0 0 1920 1178 </string> + <key>WindowToolGUID</key> + <string>738CF2D318987C220039020A</string> + <key>WindowToolIsVisible</key> + <false/> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.debugger</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>Debugger</key> + <dict> + <key>HorizontalSplitView</key> + <dict> + <key>_collapsingFrameDimension</key> + <real>0.0</real> + <key>_indexOfCollapsedView</key> + <integer>0</integer> + <key>_percentageOfCollapsedView</key> + <real>0.0</real> + <key>isCollapsed</key> + <string>yes</string> + <key>sizes</key> + <array> + <string>{{0, 0}, {317, 164}}</string> + <string>{{317, 0}, {377, 164}}</string> + </array> + </dict> + <key>VerticalSplitView</key> + <dict> + <key>_collapsingFrameDimension</key> + <real>0.0</real> + <key>_indexOfCollapsedView</key> + <integer>0</integer> + <key>_percentageOfCollapsedView</key> + <real>0.0</real> + <key>isCollapsed</key> + <string>yes</string> + <key>sizes</key> + <array> + <string>{{0, 0}, {694, 164}}</string> + <string>{{0, 164}, {694, 216}}</string> + </array> + </dict> + </dict> + <key>LauncherConfigVersion</key> + <string>8</string> + <key>PBXProjectModuleGUID</key> + <string>1C162984064C10D400B95A72</string> + <key>PBXProjectModuleLabel</key> + <string>Debug - GLUTExamples (Underwater)</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>DebugConsoleDrawerSize</key> + <string>{100, 120}</string> + <key>DebugConsoleVisible</key> + <string>None</string> + <key>DebugConsoleWindowFrame</key> + <string>{{200, 200}, {500, 300}}</string> + <key>DebugSTDIOWindowFrame</key> + <string>{{200, 200}, {500, 300}}</string> + <key>Frame</key> + <string>{{0, 0}, {694, 380}}</string> + <key>RubberWindowFrame</key> + <string>321 238 694 422 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXDebugSessionModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Debugger</string> + <key>ServiceClasses</key> + <array> + <string>PBXDebugSessionModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1CD10A99069EF8BA00B06720</string> + <string>1C0AD2AB069F1E9B00FABCE6</string> + <string>1C162984064C10D400B95A72</string> + <string>1C0AD2AC069F1E9B00FABCE6</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.debugV3</string> + <key>WindowString</key> + <string>321 238 694 422 0 0 1440 878 </string> + <key>WindowToolGUID</key> + <string>1CD10A99069EF8BA00B06720</string> + <key>WindowToolIsVisible</key> + <integer>0</integer> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.find</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CDD528C0622207200134675</string> + <key>PBXProjectModuleLabel</key> + <string><No Editor></string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CD0528D0623707200166675</string> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <integer>1</integer> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {781, 167}}</string> + <key>RubberWindowFrame</key> + <string>62 385 781 470 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>781pt</string> + </dict> + </array> + <key>Proportion</key> + <string>50%</string> + </dict> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CD0528E0623707200166675</string> + <key>PBXProjectModuleLabel</key> + <string>Project Find</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{8, 0}, {773, 254}}</string> + <key>RubberWindowFrame</key> + <string>62 385 781 470 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXProjectFindModule</string> + <key>Proportion</key> + <string>50%</string> + </dict> + </array> + <key>Proportion</key> + <string>428pt</string> + </dict> + </array> + <key>Name</key> + <string>Project Find</string> + <key>ServiceClasses</key> + <array> + <string>PBXProjectFindModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1C530D57069F1CE1000CFCEE</string> + <string>1C530D58069F1CE1000CFCEE</string> + <string>1C530D59069F1CE1000CFCEE</string> + <string>1CDD528C0622207200134675</string> + <string>1C530D5A069F1CE1000CFCEE</string> + <string>1CE0B1FE06471DED0097A5F4</string> + <string>1CD0528E0623707200166675</string> + </array> + <key>WindowString</key> + <string>62 385 781 470 0 0 1440 878 </string> + <key>WindowToolGUID</key> + <string>1C530D57069F1CE1000CFCEE</string> + <key>WindowToolIsVisible</key> + <integer>0</integer> + </dict> + <dict> + <key>Identifier</key> + <string>MENUSEPARATOR</string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.debuggerConsole</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1C78EAAC065D492600B07095</string> + <key>PBXProjectModuleLabel</key> + <string>Debugger Console</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {650, 250}}</string> + <key>RubberWindowFrame</key> + <string>516 632 650 250 0 0 1680 1027 </string> + </dict> + <key>Module</key> + <string>PBXDebugCLIModule</string> + <key>Proportion</key> + <string>209pt</string> + </dict> + </array> + <key>Proportion</key> + <string>209pt</string> + </dict> + </array> + <key>Name</key> + <string>Debugger Console</string> + <key>ServiceClasses</key> + <array> + <string>PBXDebugCLIModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1C78EAAD065D492600B07095</string> + <string>1C78EAAE065D492600B07095</string> + <string>1C78EAAC065D492600B07095</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.consoleV3</string> + <key>WindowString</key> + <string>650 41 650 250 0 0 1280 1002 </string> + <key>WindowToolGUID</key> + <string>1C78EAAD065D492600B07095</string> + <key>WindowToolIsVisible</key> + <integer>0</integer> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.snapshots</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>Module</key> + <string>XCSnapshotModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Snapshots</string> + <key>ServiceClasses</key> + <array> + <string>XCSnapshotModule</string> + </array> + <key>StatusbarIsVisible</key> + <string>Yes</string> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.snapshots</string> + <key>WindowString</key> + <string>315 824 300 550 0 0 1440 878 </string> + <key>WindowToolIsVisible</key> + <string>Yes</string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.scm</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1C78EAB2065D492600B07095</string> + <key>PBXProjectModuleLabel</key> + <string><No Editor></string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1C78EAB3065D492600B07095</string> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <integer>1</integer> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {452, 0}}</string> + <key>RubberWindowFrame</key> + <string>743 379 452 308 0 0 1280 1002 </string> + </dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>0pt</string> + </dict> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CD052920623707200166675</string> + <key>PBXProjectModuleLabel</key> + <string>SCM</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>ConsoleFrame</key> + <string>{{0, 259}, {452, 0}}</string> + <key>Frame</key> + <string>{{0, 7}, {452, 259}}</string> + <key>RubberWindowFrame</key> + <string>743 379 452 308 0 0 1280 1002 </string> + <key>TableConfiguration</key> + <array> + <string>Status</string> + <real>30</real> + <string>FileName</string> + <real>199</real> + <string>Path</string> + <real>197.0950012207031</real> + </array> + <key>TableFrame</key> + <string>{{0, 0}, {452, 250}}</string> + </dict> + <key>Module</key> + <string>PBXCVSModule</string> + <key>Proportion</key> + <string>262pt</string> + </dict> + </array> + <key>Proportion</key> + <string>266pt</string> + </dict> + </array> + <key>Name</key> + <string>SCM</string> + <key>ServiceClasses</key> + <array> + <string>PBXCVSModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1C78EAB4065D492600B07095</string> + <string>1C78EAB5065D492600B07095</string> + <string>1C78EAB2065D492600B07095</string> + <string>1CD052920623707200166675</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.scm</string> + <key>WindowString</key> + <string>743 379 452 308 0 0 1280 1002 </string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.breakpoints</string> + <key>IsVertical</key> + <integer>0</integer> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXBottomSmartGroupGIDs</key> + <array> + <string>1C77FABC04509CD000000102</string> + </array> + <key>PBXProjectModuleGUID</key> + <string>1CE0B1FE06471DED0097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>Files</string> + <key>PBXProjectStructureProvided</key> + <string>no</string> + <key>PBXSmartGroupTreeModuleColumnData</key> + <dict> + <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> + <array> + <real>168</real> + </array> + <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> + <array> + <string>MainColumn</string> + </array> + </dict> + <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key> + <dict> + <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> + <array> + <string>1C77FABC04509CD000000102</string> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> + <array> + <array> + <integer>0</integer> + </array> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> + <string>{{0, 0}, {168, 350}}</string> + </dict> + <key>PBXTopSmartGroupGIDs</key> + <array/> + <key>XCIncludePerspectivesSwitch</key> + <integer>0</integer> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {185, 368}}</string> + <key>GroupTreeTableConfiguration</key> + <array> + <string>MainColumn</string> + <real>168</real> + </array> + <key>RubberWindowFrame</key> + <string>315 424 744 409 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Proportion</key> + <string>185pt</string> + </dict> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CA1AED706398EBD00589147</string> + <key>PBXProjectModuleLabel</key> + <string>Detail</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{190, 0}, {554, 368}}</string> + <key>RubberWindowFrame</key> + <string>315 424 744 409 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>XCDetailModule</string> + <key>Proportion</key> + <string>554pt</string> + </dict> + </array> + <key>Proportion</key> + <string>368pt</string> + </dict> + </array> + <key>MajorVersion</key> + <integer>3</integer> + <key>MinorVersion</key> + <integer>0</integer> + <key>Name</key> + <string>Breakpoints</string> + <key>ServiceClasses</key> + <array> + <string>PBXSmartGroupTreeModule</string> + <string>XCDetailModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1CDDB66807F98D9800BB5817</string> + <string>1CDDB66907F98D9800BB5817</string> + <string>1CE0B1FE06471DED0097A5F4</string> + <string>1CA1AED706398EBD00589147</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.breakpointsV3</string> + <key>WindowString</key> + <string>315 424 744 409 0 0 1440 878 </string> + <key>WindowToolGUID</key> + <string>1CDDB66807F98D9800BB5817</string> + <key>WindowToolIsVisible</key> + <integer>1</integer> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.debugAnimator</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Debug Visualizer</string> + <key>ServiceClasses</key> + <array> + <string>PBXNavigatorGroup</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.debugAnimatorV3</string> + <key>WindowString</key> + <string>100 100 700 500 0 0 1280 1002 </string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.bookmarks</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>Module</key> + <string>PBXBookmarksModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Bookmarks</string> + <key>ServiceClasses</key> + <array> + <string>PBXBookmarksModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>0</integer> + <key>WindowString</key> + <string>538 42 401 187 0 0 1280 1002 </string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.projectFormatConflicts</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>Module</key> + <string>XCProjectFormatConflictsModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Project Format Conflicts</string> + <key>ServiceClasses</key> + <array> + <string>XCProjectFormatConflictsModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>0</integer> + <key>WindowContentMinSize</key> + <string>450 300</string> + <key>WindowString</key> + <string>50 850 472 307 0 0 1440 877</string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.classBrowser</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>OptionsSetName</key> + <string>Hierarchy, all classes</string> + <key>PBXProjectModuleGUID</key> + <string>1CA6456E063B45B4001379D8</string> + <key>PBXProjectModuleLabel</key> + <string>Class Browser - NSObject</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>ClassesFrame</key> + <string>{{0, 0}, {374, 96}}</string> + <key>ClassesTreeTableConfiguration</key> + <array> + <string>PBXClassNameColumnIdentifier</string> + <real>208</real> + <string>PBXClassBookColumnIdentifier</string> + <real>22</real> + </array> + <key>Frame</key> + <string>{{0, 0}, {630, 331}}</string> + <key>MembersFrame</key> + <string>{{0, 105}, {374, 395}}</string> + <key>MembersTreeTableConfiguration</key> + <array> + <string>PBXMemberTypeIconColumnIdentifier</string> + <real>22</real> + <string>PBXMemberNameColumnIdentifier</string> + <real>216</real> + <string>PBXMemberTypeColumnIdentifier</string> + <real>97</real> + <string>PBXMemberBookColumnIdentifier</string> + <real>22</real> + </array> + <key>PBXModuleWindowStatusBarHidden2</key> + <integer>1</integer> + <key>RubberWindowFrame</key> + <string>385 179 630 352 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXClassBrowserModule</string> + <key>Proportion</key> + <string>332pt</string> + </dict> + </array> + <key>Proportion</key> + <string>332pt</string> + </dict> + </array> + <key>Name</key> + <string>Class Browser</string> + <key>ServiceClasses</key> + <array> + <string>PBXClassBrowserModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>0</integer> + <key>TableOfContents</key> + <array> + <string>1C0AD2AF069F1E9B00FABCE6</string> + <string>1C0AD2B0069F1E9B00FABCE6</string> + <string>1CA6456E063B45B4001379D8</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.classbrowser</string> + <key>WindowString</key> + <string>385 179 630 352 0 0 1440 878 </string> + <key>WindowToolGUID</key> + <string>1C0AD2AF069F1E9B00FABCE6</string> + <key>WindowToolIsVisible</key> + <integer>0</integer> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.refactoring</string> + <key>IncludeInToolsMenu</key> + <integer>0</integer> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{0, 0}, {500, 335}</string> + <key>RubberWindowFrame</key> + <string>{0, 0}, {500, 335}</string> + </dict> + <key>Module</key> + <string>XCRefactoringModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Refactoring</string> + <key>ServiceClasses</key> + <array> + <string>XCRefactoringModule</string> + </array> + <key>WindowString</key> + <string>200 200 500 356 0 0 1920 1200 </string> + </dict> + </array> +</dict> +</plist> Added: branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/eliot.pbxuser =================================================================== --- branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/eliot.pbxuser (rev 0) +++ branches/Cog/nsspurcogbuild/macbuild/CoreVM.xcodeproj/eliot.pbxuser 2014-01-29 00:03:21 UTC (rev 2856) @@ -0,0 +1,346 @@ +// !$*UTF8*$! +{ + 08773EB400C6A1C4C0A80109 /* Project object */ = { + activeBuildConfigurationName = Development; + activeExecutable = 738CF29A18987A140039020A /* Newspeak Virtual Machine */; + activeTarget = 941A3B2B09AA144000C9D25A /* Newspeak Virtual Machine */; + codeSenseManager = 738CF2B718987A350039020A /* Code sense */; + executables = ( + 738CF29A18987A140039020A /* Newspeak Virtual Machine */, + ); + perUserDictionary = { + PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 341, + 20, + 48.16259765625, + 43, + 43, + 20, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + PBXFileDataSource_Target_ColumnID, + ); + }; + PBXPerProjectTemplateStateSaveDate = 412645909; + PBXWorkspaceStateSaveDate = 412645909; + }; + perUserProjectItems = { + 738CF2BA18987C220039020A /* PBXTextBookmark */ = 738CF2BA18987C220039020A /* PBXTextBookmark */; + 738CF2BC18987C220039020A /* PBXTextBookmark */ = 738CF2BC18987C220039020A /* PBXTextBookmark */; + 738CF2BE18987C220039020A /* PBXTextBookmark */ = 738CF2BE18987C220039020A /* PBXTextBookmark */; + 738CF2C018987C220039020A /* PBXTextBookmark */ = 738CF2C018987C220039020A /* PBXTextBookmark */; + 738CF2C218987C220039020A /* PBXTextBookmark */ = 738CF2C218987C220039020A /* PBXTextBookmark */; + 738CF2C418987C220039020A /* PBXTextBookmark */ = 738CF2C418987C220039020A /* PBXTextBookmark */; + 738CF2C618987C220039020A /* PBXTextBookmark */ = 738CF2C618987C220039020A /* PBXTextBookmark */; + 738CF2C818987C220039020A /* PBXTextBookmark */ = 738CF2C818987C220039020A /* PBXTextBookmark */; + 738CF2C918987C220039020A /* PBXTextBookmark */ = 738CF2C918987C220039020A /* PBXTextBookmark */; + 738CF2CA18987C220039020A /* PBXTextBookmark */ = 738CF2CA18987C220039020A /* PBXTextBookmark */; @@ Diff output truncated at 50000 characters. @@

1 0

[commit][2855] CogVM source as per VMMaker.oscog-eem.594.
by commits＠squeakvm.org 29 Jan '14

29 Jan '14

Revision: 2855 Author: eliot Date: 2014-01-28 15:05:51 -0800 (Tue, 28 Jan 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.594. Stabilize generation so that implicitly default options cause the same dead code elimination as explicit defaults. Regenerate the CameraPlugin, ScratchPlugin, UnicodePlugin & WeDoPlugin with the Spur metadata. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/examplePlugins.ext branches/Cog/src/plugins/CameraPlugin/CameraPlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/plugins/UnicodePlugin/UnicodePlugin.c branches/Cog/src/plugins/WeDoPlugin/WeDoPlugin.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-01-27 20:38:08 UTC (rev 2854) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-01-28 23:05:51 UTC (rev 2855) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b from - CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + CoInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2029,7 +2029,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.592"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.594"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -16222,13 +16222,6 @@ return PrimErrInappropriate; } -# if IMMUTABILITY - if ((rcvrHdr & ImmutabilityBit) != 0) { - return PrimErrNoModification; - } - -# endif /* IMMUTABILITY */ - longAtput(rcvr, (((rcvrHdr | CompactClassMask) - CompactClassMask)) | ccIndex); } else { @@ -16236,13 +16229,6 @@ /* Exchange the class pointer, which could make rcvr a root for argClass */ -# if IMMUTABILITY - if ((rcvrHdr & ImmutabilityBit) != 0) { - return PrimErrNoModification; - } - -# endif /* IMMUTABILITY */ - if (((((usqInt) rcvrHdr) >> 12) & 0x1F) != 0) { longAtput(rcvr, ((rcvrHdr | CompactClassMask) - CompactClassMask)); } @@ -25057,26 +25043,14 @@ isOopImmutable(sqInt anOop) { return ((anOop & 1)) - || ( -# if IMMUTABILITY - ((longAt(anOop)) & (hex(ImmutabilityBit))) != 0 -# else /* IMMUTABILITY */ - 0 -# endif /* IMMUTABILITY */ - ); + || (0); } sqInt isOopMutable(sqInt anOop) { return (!((anOop & 1))) - && (!( -#if IMMUTABILITY - ((longAt(anOop)) & (hex(ImmutabilityBit))) != 0 -#else /* IMMUTABILITY */ - 0 -#endif /* IMMUTABILITY */ - )); + && (!(0)); } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-01-27 20:38:08 UTC (rev 2854) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-01-28 23:05:51 UTC (rev 2855) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-01-27 20:38:08 UTC (rev 2854) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-01-28 23:05:51 UTC (rev 2855) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b from - CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + CoInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2032,7 +2032,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.592"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.594"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -16231,13 +16231,6 @@ return PrimErrInappropriate; } -# if IMMUTABILITY - if ((rcvrHdr & ImmutabilityBit) != 0) { - return PrimErrNoModification; - } - -# endif /* IMMUTABILITY */ - longAtput(rcvr, (((rcvrHdr | CompactClassMask) - CompactClassMask)) | ccIndex); } else { @@ -16245,13 +16238,6 @@ /* Exchange the class pointer, which could make rcvr a root for argClass */ -# if IMMUTABILITY - if ((rcvrHdr & ImmutabilityBit) != 0) { - return PrimErrNoModification; - } - -# endif /* IMMUTABILITY */ - if (((((usqInt) rcvrHdr) >> 12) & 0x1F) != 0) { longAtput(rcvr, ((rcvrHdr | CompactClassMask) - CompactClassMask)); } @@ -25066,26 +25052,14 @@ isOopImmutable(sqInt anOop) { return ((anOop & 1)) - || ( -# if IMMUTABILITY - ((longAt(anOop)) & (hex(ImmutabilityBit))) != 0 -# else /* IMMUTABILITY */ - 0 -# endif /* IMMUTABILITY */ - ); + || (0); } sqInt isOopMutable(sqInt anOop) { return (!((anOop & 1))) - && (!( -#if IMMUTABILITY - ((longAt(anOop)) & (hex(ImmutabilityBit))) != 0 -#else /* IMMUTABILITY */ - 0 -#endif /* IMMUTABILITY */ - )); + && (!(0)); } Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-01-27 20:38:08 UTC (rev 2854) +++ branches/Cog/nscogsrc/vm/interp.h 2014-01-28 23:05:51 UTC (rev 2855) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-01-27 20:38:08 UTC (rev 2854) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-01-28 23:05:51 UTC (rev 2855) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Jan 25 12:25:08 PST 2014 + Tue Jan 28 15:03:50 PST 2014 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-27 20:38:08 UTC (rev 2854) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-28 23:05:51 UTC (rev 2855) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b from - StackInterpreter VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a + StackInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1961,7 +1961,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.593]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.594]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -2038,22 +2038,10 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin initExtensions */ -# if MULTIPLEBYTECODESETS - extA = (extB = 0); - -# endif /* MULTIPLEBYTECODESETS */ - while (1) { bytecodeDispatchDebugHook(); @@ -2064,15 +2052,8 @@ { VM_LABEL(0pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 0 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2083,15 +2064,8 @@ { VM_LABEL(1pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 4 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2102,15 +2076,8 @@ { VM_LABEL(2pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 8 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2121,15 +2088,8 @@ { VM_LABEL(3pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 12 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2140,15 +2100,8 @@ { VM_LABEL(4pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 16 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2159,15 +2112,8 @@ { VM_LABEL(5pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 20 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2178,15 +2124,8 @@ { VM_LABEL(6pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 24 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2197,15 +2136,8 @@ { VM_LABEL(7pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 28 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2216,15 +2148,8 @@ { VM_LABEL(8pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 32 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2235,15 +2160,8 @@ { VM_LABEL(9pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 36 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2254,15 +2172,8 @@ { VM_LABEL(10pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 40 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2273,15 +2184,8 @@ { VM_LABEL(11pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 44 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2292,15 +2196,8 @@ { VM_LABEL(12pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 48 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2311,15 +2208,8 @@ { VM_LABEL(13pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 52 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2330,15 +2220,8 @@ { VM_LABEL(14pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 56 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2349,15 +2232,8 @@ { VM_LABEL(15pushReceiverVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 60 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2371,15 +2247,8 @@ VM_LABEL(0pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(0pushTemporaryVariable); /* begin internalPush: */ @@ -2397,15 +2266,8 @@ VM_LABEL(1pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(1pushTemporaryVariable); /* begin internalPush: */ @@ -2423,15 +2285,8 @@ VM_LABEL(2pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(2pushTemporaryVariable); /* begin internalPush: */ @@ -2449,15 +2304,8 @@ VM_LABEL(3pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(3pushTemporaryVariable); /* begin internalPush: */ @@ -2475,15 +2323,8 @@ VM_LABEL(4pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(4pushTemporaryVariable); /* begin internalPush: */ @@ -2501,15 +2342,8 @@ VM_LABEL(5pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(5pushTemporaryVariable); /* begin internalPush: */ @@ -2527,15 +2361,8 @@ VM_LABEL(6pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(6pushTemporaryVariable); /* begin internalPush: */ @@ -2553,15 +2380,8 @@ VM_LABEL(7pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(7pushTemporaryVariable); /* begin internalPush: */ @@ -2579,15 +2399,8 @@ VM_LABEL(8pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(8pushTemporaryVariable); /* begin internalPush: */ @@ -2605,15 +2418,8 @@ VM_LABEL(9pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(9pushTemporaryVariable); /* begin internalPush: */ @@ -2631,15 +2437,8 @@ VM_LABEL(10pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(10pushTemporaryVariable); /* begin internalPush: */ @@ -2657,15 +2456,8 @@ VM_LABEL(11pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(11pushTemporaryVariable); /* begin internalPush: */ @@ -2683,15 +2475,8 @@ VM_LABEL(12pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(12pushTemporaryVariable); /* begin internalPush: */ @@ -2709,15 +2494,8 @@ VM_LABEL(13pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(13pushTemporaryVariable); /* begin internalPush: */ @@ -2735,15 +2513,8 @@ VM_LABEL(14pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(14pushTemporaryVariable); /* begin internalPush: */ @@ -2761,15 +2532,8 @@ VM_LABEL(15pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushTemporaryVariable: */ VM_LABEL(15pushTemporaryVariable); /* begin internalPush: */ @@ -2786,15 +2550,8 @@ VM_LABEL(0pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2810,15 +2567,8 @@ VM_LABEL(1pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2834,15 +2584,8 @@ VM_LABEL(2pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2858,15 +2601,8 @@ VM_LABEL(3pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2882,15 +2618,8 @@ VM_LABEL(4pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2906,15 +2635,8 @@ VM_LABEL(5pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2930,15 +2652,8 @@ VM_LABEL(6pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2954,15 +2669,8 @@ VM_LABEL(7pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2978,15 +2686,8 @@ VM_LABEL(8pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3002,15 +2703,8 @@ VM_LABEL(9pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3026,15 +2720,8 @@ VM_LABEL(10pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3050,15 +2737,8 @@ VM_LABEL(11pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3074,15 +2754,8 @@ VM_LABEL(12pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3098,15 +2771,8 @@ VM_LABEL(13pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3122,15 +2788,8 @@ VM_LABEL(14pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3146,15 +2805,8 @@ VM_LABEL(15pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3170,15 +2822,8 @@ VM_LABEL(16pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3194,15 +2839,8 @@ VM_LABEL(17pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3218,15 +2856,8 @@ VM_LABEL(18pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3242,15 +2873,8 @@ VM_LABEL(19pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3266,15 +2890,8 @@ VM_LABEL(20pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3290,15 +2907,8 @@ VM_LABEL(21pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3314,15 +2924,8 @@ VM_LABEL(22pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3338,15 +2941,8 @@ VM_LABEL(23pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3362,15 +2958,8 @@ VM_LABEL(24pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3386,15 +2975,8 @@ VM_LABEL(25pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3410,15 +2992,8 @@ VM_LABEL(26pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3434,15 +3009,8 @@ VM_LABEL(27pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3458,15 +3026,8 @@ VM_LABEL(28pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3482,15 +3043,8 @@ VM_LABEL(29pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3506,15 +3060,8 @@ VM_LABEL(30pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3530,15 +3077,8 @@ VM_LABEL(31pushLiteralConstantBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3557,15 +3097,8 @@ VM_LABEL(0pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(0pushLiteralVariable); @@ -3602,15 +3135,8 @@ VM_LABEL(1pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(1pushLiteralVariable); @@ -3647,15 +3173,8 @@ VM_LABEL(2pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(2pushLiteralVariable); @@ -3692,15 +3211,8 @@ VM_LABEL(3pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(3pushLiteralVariable); @@ -3737,15 +3249,8 @@ VM_LABEL(4pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(4pushLiteralVariable); @@ -3782,15 +3287,8 @@ VM_LABEL(5pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(5pushLiteralVariable); @@ -3827,15 +3325,8 @@ VM_LABEL(6pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(6pushLiteralVariable); @@ -3872,15 +3363,8 @@ VM_LABEL(7pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(7pushLiteralVariable); @@ -3917,15 +3401,8 @@ VM_LABEL(8pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(8pushLiteralVariable); @@ -3962,15 +3439,8 @@ VM_LABEL(9pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(9pushLiteralVariable); @@ -4007,15 +3477,8 @@ VM_LABEL(10pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(10pushLiteralVariable); @@ -4052,15 +3515,8 @@ VM_LABEL(11pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(11pushLiteralVariable); @@ -4097,15 +3553,8 @@ VM_LABEL(12pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(12pushLiteralVariable); @@ -4142,15 +3591,8 @@ VM_LABEL(13pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(13pushLiteralVariable); @@ -4187,15 +3629,8 @@ VM_LABEL(14pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(14pushLiteralVariable); @@ -4232,15 +3667,8 @@ VM_LABEL(15pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(15pushLiteralVariable); @@ -4277,15 +3705,8 @@ VM_LABEL(16pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(16pushLiteralVariable); @@ -4322,15 +3743,8 @@ VM_LABEL(17pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(17pushLiteralVariable); @@ -4367,15 +3781,8 @@ VM_LABEL(18pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(18pushLiteralVariable); @@ -4412,15 +3819,8 @@ VM_LABEL(19pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(19pushLiteralVariable); @@ -4457,15 +3857,8 @@ VM_LABEL(20pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(20pushLiteralVariable); @@ -4502,15 +3895,8 @@ VM_LABEL(21pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(21pushLiteralVariable); @@ -4547,15 +3933,8 @@ VM_LABEL(22pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(22pushLiteralVariable); @@ -4592,15 +3971,8 @@ VM_LABEL(23pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(23pushLiteralVariable); @@ -4637,15 +4009,8 @@ VM_LABEL(24pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(24pushLiteralVariable); @@ -4682,15 +4047,8 @@ VM_LABEL(25pushLiteralVariableBytecode); /* begin fetchNextBytecode */ - -# if MULTIPLEBYTECODESETS - currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; - -# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); -# endif /* MULTIPLEBYTECODESETS */ - /* begin pushLiteralVariable: */ VM_LABEL(25pushLiteralVariable); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.594.mcz
by commits＠source.squeak.org 28 Jan '14

28 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.594.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.594 Author: eem Time: 28 January 2014, 2:42:02.47 pm UUID: dc0cca0d-8f63-4da1-a647-94be0840104b Ancestors: VMMaker.oscog-eem.593 Stabilize generation so that implicitly default options cause the same dead code elimination as explicit defaults. Generate CameraPlugin, ScratchPlugin, UnicodePlugin & WeDoPlugin. =============== Diff against VMMaker.oscog-eem.593 =============== Item was changed: ----- Method: CCodeGenerator>>vmClass: (in category 'accessing') ----- vmClass: aClass "Set the main translation class if any. This is nil other than for the core VM. It may be an interpreter or a cogit" vmClass := aClass. vmClass ifNotNil: + [generateDeadCode := vmClass shouldGenerateDeadCode. + vmClass copyOptionsBackTo: optionsDictionary]! - [generateDeadCode := vmClass shouldGenerateDeadCode]! Item was added: + ----- Method: VMClass class>>copyOptionsBackTo: (in category 'initialization') ----- + copyOptionsBackTo: optionsDictionary + "Ugh. Copy back those options that the CCodeGenerator will do + dead-code elimination for that are not yet set in optionsDictionary. + This lets the CCodeGenerator see defaults for the options below." + + optionsDictionary ifNil: [^self]. + initializationOptions ifNil: [^self]. + #(MULTIPLEBYTECODESETS IMMUTABILITY) do: + [:option| + ((initializationOptions includesKey: option) + and: [(optionsDictionary includesKey: option) not]) ifTrue: + [optionsDictionary at: option put: (initializationOptions at: option)]]! Item was changed: ----- Method: VMClass class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants "Falsify the `what type of VM is this?' flags that are defined in the various interp.h files, or in the case of VMBIGENDIAN the various sqConfig.h files. + Subclass implementations need to include a super initializeMiscConstants" - Subclass implementations need to include a super initializeMiscConstantsWith:." | omc | VMBIGENDIAN class. "Mention this for the benefit of CCodeGenerator>>emitCConstantsOn:" self isInterpreterClass ifTrue: [STACKVM := COGVM := COGMTVM := false]. omc := initializationOptions at: #ObjectMemory ifAbsent: nil. initializationOptions at: #SqueakV3ObjectMemory "the good ole default" put: (omc ifNil: [true] ifNotNil: [(Smalltalk at: omc) inheritsFrom: ObjectMemory]); at: #SpurObjectMemory "the new condender" put: (omc ifNil: [false] ifNotNil: [(Smalltalk at: omc) inheritsFrom: SpurMemoryManager]). + "Use ifAbsentPut: so that they will get copied back to the + VMMaker's options and dead code will likely be eliminated." + NewspeakVM := initializationOptions at: #NewspeakVM ifAbsentPut: [false]. + MULTIPLEBYTECODESETS := initializationOptions at: #MULTIPLEBYTECODESETS ifAbsentPut: [false]. - NewspeakVM := initializationOptions at: #NewspeakVM ifAbsent: [false]. - MULTIPLEBYTECODESETS := initializationOptions at: #MULTIPLEBYTECODESETS ifAbsent: [false]. "N.B. Not yet implemented." + IMMUTABILITY := initializationOptions at: #IMMUTABILITY ifAbsentPut: [false]. - IMMUTABILITY := initializationOptions at: #IMMUTABILITY ifAbsent: [false]. "These for scripts etc... Usually they should get set by an Interpreter class's initializeMiscConstantsWith:" (initializationOptions includesKey: #STACKVM) ifTrue: [STACKVM := initializationOptions at: #STACKVM]. (initializationOptions includesKey: #COGVM) ifTrue: [COGVM := initializationOptions at: #COGVM]. (initializationOptions includesKey: #COGMTVM) ifTrue: [COGMTVM := initializationOptions at: #COGMTVM]! Item was changed: ----- Method: VMClass class>>initializeWithOptions: (in category 'initialization') ----- initializeWithOptions: optionsDictionaryOrArray "Initialize the receiver, typically initializing class variables. Initialize any class variables whose names occur in optionsDictionary with the corresponding values there-in." | optionsDictionary | optionsDictionary := optionsDictionaryOrArray isArray ifTrue: [Dictionary newFromPairs: optionsDictionaryOrArray] ifFalse: [optionsDictionaryOrArray]. + "This is necessary. e.g. if the receiver is CoInterpreterPrimitives, + it is still necessary to set the options in CoInterpreter. Otherwise, + some class in the chain may have stale options, and when building + the code generator, a stale ancilliary class may be computed." (self withAllSuperclasses copyUpThrough: VMClass) do: [:class| class initializationOptions: optionsDictionary]! Item was removed: - ----- Method: VMMaker class>>generateNewSqueakCogVM (in category 'configurations') ----- - generateNewSqueakCogVM - "self generateNewSqueakCogVM" - ^VMMaker - generate: (Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^self]] - value: #(CoInterpreter CoInterpreterMT))) - and: StackToRegisterMappingCogit - with: #( MULTIPLEBYTECODESETS false - NewspeakVM false - bytecodeTableInitializer newInitializeBytecodeTableForSqueakV3PlusClosures) - to: (FileDirectory default pathFromURI: 'oscogvm/src') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') - including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin - BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CroquetPlugin DSAPlugin - DeflatePlugin DropPlugin FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin - FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin - JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin - LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin - MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin SecurityPlugin SerialPlugin - SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin - ThreadedIA32FFIPlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin - Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin)! Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurStackVM (in category 'configurations') ----- generateNewspeakSpurStackVM "No primitives since we can use those for the Cog Newspeak VM" ^VMMaker generate: StackInterpreter with: #( ObjectMemory Spur32BitMemoryManager MULTIPLEBYTECODESETS true NewspeakVM true) to: (FileDirectory default directoryNamed: 'oscogvm/nsspurstacksrc') fullName platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName + including: #()! - excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! Item was changed: ----- Method: VMMaker class>>generateNewspeakStackVM (in category 'configurations') ----- generateNewspeakStackVM "No primitives since we can use those for the Cog Newspeak VM" ^VMMaker generate: StackInterpreter with: #(NewspeakVM true MULTIPLEBYTECODESETS true) to: (FileDirectory default pathFromURI: 'oscogvm/nsstacksrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') + including: #()! - excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! Item was changed: ----- Method: VMMaker class>>generateSqueakCogSistaVM (in category 'configurations') ----- generateSqueakCogSistaVM + "No primitives since we can use those for the Cog VM" ^VMMaker generate: CoInterpreter and: SistaStackToRegisterMappingCogit to: (FileDirectory default pathFromURI: 'oscogvm/sistasrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') + including: #()! - excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! Item was changed: ----- Method: VMMaker class>>generateSqueakCogVMWithInterpreterClass: (in category 'confs-support') ----- generateSqueakCogVMWithInterpreterClass: interpreterClass ^VMMaker generate: interpreterClass and: StackToRegisterMappingCogit - with: #( MULTIPLEBYTECODESETS false - NewspeakVM false) to: (FileDirectory default pathFromURI: 'oscogvm/src') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') + including:#( ADPCMCodecPlugin AsynchFilePlugin + BalloonEnginePlugin B3DAcceleratorPlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin + CameraPlugin CroquetPlugin DSAPlugin DeflatePlugin DropPlugin + FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin + GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin - including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin - BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CroquetPlugin DSAPlugin - DeflatePlugin DropPlugin FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin - FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin + MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin + ScratchPlugin SecurityPlugin SerialPlugin SocketPlugin + SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin + ThreadedIA32FFIPlugin UnicodePlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin + Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin WeDoPlugin) + + ! - MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin SecurityPlugin SerialPlugin - SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin - ThreadedIA32FFIPlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin - Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin)! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurCogVM (in category 'configurations') ----- generateSqueakSpurCogVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit + with: #( ObjectMemory Spur32BitCoMemoryManager) - with: #( ObjectMemory Spur32BitCoMemoryManager - MULTIPLEBYTECODESETS false - NewspeakVM false) to: (FileDirectory default pathFromURI: 'oscogvm/spursrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#()! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurStackVM (in category 'configurations') ----- generateSqueakSpurStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter with: #(ObjectMemory Spur32BitMemoryManager) to: (FileDirectory default directoryNamed: 'oscogvm/spurstacksrc') fullName platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName + including: #()! - excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! Item was changed: ----- Method: VMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter to: (FileDirectory default directoryNamed: 'oscogvm/stacksrc') fullName platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName + including: #()! - excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])!

1 0

VM Maker: VMMaker-dtl.339.mcz
by commits＠source.squeak.org 27 Jan '14

27 Jan '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.339.mcz ==================== Summary ==================== Name: VMMaker-dtl.339 Author: dtl Time: 27 January 2014, 3:23:29.887 pm UUID: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 Ancestors: VMMaker-dtl.338 VMMaker 4.13.1 Add primitiveAllObjects, answering an array of all objects in the object memory at the time of calling the primitive, possibly excluding those that were garbage collected as a side effect of allocating the result array for the primitive. Fix comment for ObjectMemory>>lengthOf:baseHeader:format: to indicate that length includes the fixed fields as well as indexable fields (the length of an OrderedCollection instance is 3, not 0). Add shorten:toIndexableSize: with error checks and correct size logic for long arrays. Change the return value to be the number of bytes released to free memory, allowing sender to test for success. The implementation for ClassicObjectMemory is tested for both 32-bit and 64-bit object memories. The implementation for NewObjectMemory is based on this, but has not been tested. Add primitiveTestShortenIndexableSize to allow shorten:toIndexableSize: to be exercised from the image. This primitive is for testing purposes only and will probably be removed in the future. FT2Plugin to external plugins in VMMakerTool class>>defaultUnixSpec because some platforms (e.g. OS X) may not have the runtime library conveniently available. =============== Diff against VMMaker-dtl.338 =============== Item was changed: ----- Method: ClassicObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- shorten: obj toIndexableSize: nSlots + "Reduce the number if indexable fields in obj, a pointer object, to nSlots. Convert the + unused residual to a free chunk. Word and byte indexable objects are not changed. + Answer the number of bytes returned to free memory, which may be zero if no change + was possible." + | deltaBytes desiredLength fixedFields fmt hdr totalLength + indexableFields | + (self isPointersNonInt: obj) ifFalse: [^0]. + nSlots > 0 + ifFalse: [^0]. "no change if nSlots is zero, error if nSlots is negative" - "Currently this works for pointer objects only, and is almost certainly wrong for 64 bits." - | deltaBytes desiredLength fixedFields fmt hdr totalLength | - (self isPointersNonInt: obj) ifFalse: - [^obj]. hdr := self baseHeader: obj. fmt := self formatOfHeader: hdr. totalLength := self lengthOf: obj baseHeader: hdr format: fmt. fixedFields := self fixedFieldsOf: obj format: fmt length: totalLength. + indexableFields := totalLength - fixedFields. + nSlots >= indexableFields + ifTrue: [^0]. "no change, or error if attempting to increase size into next chunk" + desiredLength := fixedFields + nSlots. - - self cCode: ' printf("fixedFields is %d\n", fixedFields); fflush(stdout) '. - self cCode: ' printf("nSlots is %d\n", nSlots); fflush(stdout) '. - - desiredLength := fixedFields + nSlots. deltaBytes := (totalLength - desiredLength) * self bytesPerWord. - - self cCode: ' printf("desiredLength is %d\n", desiredLength); fflush(stdout) '. - self cCode: ' printf("deltaBytes is %d\n", deltaBytes); fflush(stdout) '. - self setSizeOfFree: obj + self baseHeaderSize + (desiredLength * self bytesPerWord) to: deltaBytes. (self headerType: obj) caseOf: { [HeaderTypeSizeAndClass] -> + [self longAt: (obj - (self baseHeaderSize * 2)) put: (self sizeHeader: obj) - deltaBytes]. - [ - self cCode: ' printf("HeaderTypeSizeAndClass\n"); fflush(stdout) '. - - self longAt: obj put: hdr - deltaBytes]. [HeaderTypeClass] -> + [self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)]. - [ - self cCode: ' printf("HeaderTypeClass\n"); fflush(stdout) '. - - self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)]. [HeaderTypeShort] -> + [self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)] }. + ^deltaBytes! - [ - self cCode: ' printf("HeaderTypeShort\n"); fflush(stdout) '. - - self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)] }. - ^obj! Item was added: + ----- Method: InterpreterPrimitives>>primitiveAllObjects (in category 'object access primitives') ----- + primitiveAllObjects + "Answer an array of all objects that exist when the primitive is called, excluding those + that may be garbage collected as a side effect of allocating the result array. The array + will contain at least one trailing integer zero that serves as a marker for end of valid + object references. Additional trailing zeros represent objects that were garbage + collected during execution of this primitive. Sender is responsible for ignoring all + trailing zero marker objects in the result array." + + <export: true> + | count obj resultArray newCount | + self pop: argumentCount+1. + "Count the currently accessible objects" + count := 0. + obj := objectMemory firstAccessibleObject. + [obj = nil] whileFalse: + [count := count + 1. + obj := objectMemory accessibleObjectAfter: obj]. + "Allocate result array, may cause GC" + resultArray := objectMemory instantiateClass: objectMemory classArray indexableSize: count. + resultArray = nil ifTrue: + [^self primitiveFailFor: PrimErrNoMemory]. + "Store all objects in result array, excluding any reference to the result array + itself, as may happen if garbage collection occurred during allocation of the array." + newCount := 0. + obj := objectMemory firstAccessibleObject. + [obj = nil or: [newCount >= count]] whileFalse: + [obj == resultArray + ifFalse: [newCount := newCount + 1. + self stObject: resultArray at: newCount put: obj ]. + obj := objectMemory accessibleObjectAfter: obj]. + "If GC occurred during result array allocation, truncate unused portion of result array" + newCount < count + ifTrue: [self shorten: resultArray toIndexableSize: newCount]. + self push: resultArray! Item was added: + ----- Method: InterpreterPrimitives>>primitiveTestShortenIndexableSize (in category 'object access primitives') ----- + primitiveTestShortenIndexableSize + "Given an object with indexable pointer fields, reduce the size of the indexable fields + to the requested size. Answer the number of bytes freed, or zero if the object cannot + be shortened." + + <export: true> + | array newSize bytesFreed | + newSize := self stackIntegerValue: 0. + array := self stackValue: 1. + self pop: argumentCount + 1. + bytesFreed := self shorten: array toIndexableSize: newSize. + self pushInteger: bytesFreed! Item was added: + ----- Method: NewObjectMemory>>maybeFillWithAllocationCheckFillerFrom:to: (in category 'allocation') ----- + maybeFillWithAllocationCheckFillerFrom: start to: end + "Fill free memory with a bit pattern for checking if the last object has been overwritten." + <inline: true> + <var: 'start' type: #usqInt> + <var: 'end' type: #usqInt> + <var: 'i' type: #usqInt> + AllocationCheckFiller ~= 0 ifTrue: + [start to: end by: self bytesPerWord do: + [:i| + self longAt: i put: (AllocationCheckFiller = 16rADD4E55 + ifTrue: [i] + ifFalse: [AllocationCheckFiller])]]! Item was changed: ----- Method: NewObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- shorten: obj toIndexableSize: nSlots + "Reduce the number if indexable fields in obj, a pointer object, to nSlots. Convert the + unused residual to a free chunk. Word and byte indexable objects are not changed. + Answer the number of bytes returned to free memory, which may be zero if no change + was possible." + | deltaBytes desiredLength fixedFields fmt hdr totalLength + indexableFields | + (self isPointersNonInt: obj) ifFalse: [^0]. + nSlots > 0 + ifFalse: [^0]. "no change if nSlots is zero, error if nSlots is negative" - "Currently this works for pointer objects only, and is almost certainly wrong for 64 bits." - | deltaBytes desiredLength fixedFields fmt hdr totalLength | - (self isPointersNonImm: obj) ifFalse: - [^obj]. hdr := self baseHeader: obj. fmt := self formatOfHeader: hdr. totalLength := self lengthOf: obj baseHeader: hdr format: fmt. fixedFields := self fixedFieldsOf: obj format: fmt length: totalLength. + indexableFields := totalLength - fixedFields. + nSlots >= indexableFields + ifTrue: [^0]. "no change, or error if attempting to increase size into next chunk" + desiredLength := fixedFields + nSlots. - desiredLength := fixedFields + nSlots. deltaBytes := (totalLength - desiredLength) * self bytesPerWord. obj + self baseHeaderSize + (totalLength * self bytesPerWord) = freeStart ifTrue: "Shortening the last object. Need to reduce freeStart." [self maybeFillWithAllocationCheckFillerFrom: obj + self baseHeaderSize + (desiredLength * self bytesPerWord) to: freeStart. freeStart := obj + self baseHeaderSize + (desiredLength * self bytesPerWord)] ifFalse: "Shortening some interior object. Need to create a free block." [self setSizeOfFree: obj + self baseHeaderSize + (desiredLength * self bytesPerWord) to: deltaBytes]. (self headerType: obj) caseOf: { [HeaderTypeSizeAndClass] -> + [self longAt: (obj - (self baseHeaderSize * 2)) put: (self sizeHeader: obj) - deltaBytes]. - [self longAt: obj put: hdr - deltaBytes]. [HeaderTypeClass] -> [self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)]. [HeaderTypeShort] -> [self longAt: obj put: ((hdr bitClear: self sizeMask) bitOr: (hdr bitAnd: self sizeMask) - deltaBytes)] }. + ^deltaBytes! - ^obj! Item was changed: ----- Method: ObjectMemory>>lengthOf:baseHeader:format: (in category 'indexing primitive support') ----- lengthOf: oop baseHeader: hdr format: fmt + "Return the number of fixed and indexable bytes, words, or object pointers in the + given object. Assume the given oop is not an integer. For a CompiledMethod, the size + of the method header (in bytes) should be subtracted from the result of this method." - "Return the number of indexable bytes or words in the given object. Assume the given oop is not an integer. For a CompiledMethod, the size of the method header (in bytes) should be subtracted from the result of this method." | sz | <inline: true> <asmLabel: false> (hdr bitAnd: TypeMask) = HeaderTypeSizeAndClass ifTrue: [ sz := (self sizeHeader: oop) bitAnd: self longSizeMask ] ifFalse: [ sz := (hdr bitAnd: self sizeMask)]. sz := sz - (hdr bitAnd: self size4Bit). fmt <= 4 ifTrue: [ ^ (sz - self baseHeaderSize) >> self shiftForWord "words"]. fmt < 8 ifTrue: [ ^ (sz - self baseHeaderSize) >> 2 "32-bit longs"] ifFalse: [ ^ (sz - self baseHeaderSize) - (fmt bitAnd: 3) "bytes"]! Item was changed: ----- Method: ObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- shorten: obj toIndexableSize: nSlots + "Reduce the number if indexable fields in obj, a pointer object, to nSlots. Convert the + unused residual to a free chunk. Word and byte indexable objects are not changed. + Answer the number of bytes returned to free memory, which may be zero if no change + was possible." - "Shorten the length of a pointer object to nSlots, marking free memory and adjusting - end of memory as required." self subclassResponsibility! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.13.1'! - ^'4.12.14'! Item was changed: ----- Method: VMMakerTool class>>defaultUnixSpec (in category 'configurations') ----- defaultUnixSpec "Typical VMMaker spec for a unix/linux target platform" "VMMakerTool defaultUnixSpec" ^#( #( "internal plugins" #ADPCMCodecPlugin #AsynchFilePlugin #BMPReadWriterPlugin #BalloonEnginePlugin #BitBltSimulation #CroquetPlugin #DSAPlugin #DeflatePlugin #DropPlugin #FFTPlugin - #FT2Plugin #FilePlugin #FloatArrayPlugin #FloatMathPlugin #GeniePlugin #JPEGReadWriter2Plugin #JPEGReaderPlugin #JoystickTabletPlugin #KlattSynthesizerPlugin #LargeIntegersPlugin #LocalePlugin #MD5Plugin #Matrix2x3Plugin #MiscPrimitivePlugin #RandPlugin #RePlugin #SHA256Plugin #SecurityPlugin #SerialPlugin #SlangTestPlugin #SlangTestSupportPlugin #SocketPlugin #SoundCodecPlugin #SoundGenerationPlugin #SoundPlugin #StarSqueakPlugin #SurfacePlugin ) #( "external plugins" #B3DAcceleratorPlugin #B3DEnginePlugin #ClipboardExtendedPlugin #DBusPlugin #FFIPlugin #FileCopyPlugin + #FT2Plugin #GStreamerPlugin #HostWindowPlugin #KedamaPlugin #KedamaPlugin2 #MIDIPlugin #Mpeg3Plugin #RomePlugin #UUIDPlugin #UnixAioPlugin #UnixOSProcessPlugin #XDisplayControlPlugin #CameraPlugin #ScratchPlugin #UnicodePlugin #WeDoPlugin #SqueakSSLPlugin ) true "inline flag" false "forBrowser flag" 'unix' "platform" 'src' "source directory for generated sources" 'platforms' "path to platform sources" 4 "unused, was bytesPerWord which is now a compile time definition" true "unused, was flag for source directtory pathname is relative" true "unused, was flag for platforms directory path is relative" 'Interpreter' "interpreter class name" )!

1 0

VM Maker: VMMaker.oscog-eem.593.mcz
by commits＠source.squeak.org 25 Jan '14

25 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.593.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.593 Author: eem Time: 25 January 2014, 12:23:11.325 pm UUID: fca10aeb-7680-4292-9224-890680da8f9a Ancestors: VMMaker.oscog-eem.592 Fix Spur StackVM configuration. =============== Diff against VMMaker.oscog-eem.592 =============== Item was changed: ----- Method: VMMaker class>>generateSqueakSpurStackVM (in category 'configurations') ----- generateSqueakSpurStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter + with: #(ObjectMemory Spur32BitMemoryManager) - with: #( ObjectMemory Spur32BitCoMemoryManager - MULTIPLEBYTECODESETS false - NewspeakVM false) to: (FileDirectory default directoryNamed: 'oscogvm/spurstacksrc') fullName platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])!

1 0

[commit][2853] CogVM source as per VMMaker.oscog-eem.593.
by commits＠squeakvm.org 25 Jan '14

25 Jan '14

Revision: 2853 Author: eliot Date: 2014-01-25 12:25:52 -0800 (Sat, 25 Jan 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.593. Fix the Spur Stack VM source. Modified Paths: -------------- branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jan 24 17:01:09 PST 2014 + Sat Jan 25 12:25:08 PST 2014 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-25 01:04:32 UTC (rev 2852) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-25 20:25:52 UTC (rev 2853) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a from - StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 + StackInterpreter VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -143,7 +143,6 @@ #define ClassArray 7 #define ClassArrayCompactIndex 51 #define ClassBitmap 4 -#define ClassBitmapCompactIndex 53 #define ClassBlockClosure 36 #define ClassBlockClosureCompactIndex 37 #define ClassByteArray 26 @@ -361,8 +360,6 @@ EXPORT(sqInt) callbackEnter(sqInt *callbackID); EXPORT(sqInt) callbackLeave(sqInt cbID); sqInt canContextSwitchIfActivatingheader(sqInt theMethod, sqInt methodHeader); -sqInt ceClassAtIndex(sqInt classIndex); -sqInt ceStoreCheck(sqInt anOop); static sqInt changeClassOfto(sqInt rcvr, sqInt argClass); sqInt characterForAscii(sqInt ascii); sqInt characterObjectOf(sqInt characterCode); @@ -545,7 +542,6 @@ static sqInt freeChunkWithBytesat(sqInt bytes, sqInt address); static sqInt freeListsObj(void); static sqInt freeStackPageNoAssert(StackPage *aPage); -usqInt freeStartAddress(void); static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpace(void); static void freeUntracedStackPages(void); sqInt fullDisplayUpdate(void); @@ -558,7 +554,6 @@ static sqInt getLongFromFileswap(sqImageFile aFile, sqInt swapFlag); usqLong getNextWakeupUsecs(void); sqInt getSavedWindowSize(void); -usqInt getScavengeThreshold(void); static sqInt getShortFromFileswap(sqImageFile aFile, sqInt swapFlag); sqInt * getStackPointer(void); sqInt getThisSessionID(void); @@ -644,7 +639,7 @@ static sqInt isPrimitiveFunctionPointerAnIndex(void); sqInt isQuickPrimitiveIndex(sqInt anInteger); sqInt isReadMediatedContextInstVarIndex(sqInt index); -sqInt isReallyYoungObject(sqInt objOop); +sqInt isReallyYoungObject(sqInt obj); sqInt isReallyYoung(sqInt oop); static sqInt isRemembered(sqInt objOop); static sqInt isScavengeSurvivor(sqInt oop); @@ -738,7 +733,6 @@ sqInt nonIndexablePointerFormat(void); static sqInt noUnfiredEphemeronsAtEndOfRememberedSet(void); static sqInt noUnscannedEphemerons(void); -sqLong nullHeaderForMachineCodeMethod(void); static sqInt numFreeLists(void); sqInt numPointerSlotsOf(sqInt objOop); sqInt numSlotsHalfShift(void); @@ -1195,8 +1189,6 @@ static sqInt voidVMStateForSnapshotFlushingExternalPrimitivesIf(sqInt flushExtPrims); static sqInt wakeHighestPriority(void); sqInt weakArrayFormat(void); -sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); -sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); static sqInt withSmallIntegerTags(char *value); static sqInt wordIndexableFormat(void); static sqInt writeImageFileIO(void); @@ -1245,10 +1237,10 @@ _iss sqInt numSegments; _iss StackPage * mostRecentlyUsedPage; _iss usqInt newSpaceStart; -_iss usqInt oldSpaceStart; _iss sqInt classTableFirstPage; _iss sqInt firstFreeChunk; _iss sqInt futureSurvivorStart; +_iss usqInt oldSpaceStart; _iss sqInt jmpDepth; _iss sqInt numRememberedEphemerons; _iss sqInt classNameIndex; @@ -1291,13 +1283,13 @@ _iss sqInt lkupClass; _iss sqInt metaclassNumSlots; _iss sqInt pendingFinalizationSignals; -_iss usqInt scavengeThreshold; _iss sqInt shrinkThreshold; _iss sqInt statIOProcessEvents; _iss sqInt weakList; _iss sqInt firstSegmentSize; _iss usqLong gcStartUsecs; _iss usqInt memory; +_iss usqInt scavengeThreshold; _iss sqInt statCompactPassCount; _iss sqInt thisClassIndex; _iss sqInt fullScreenFlag; @@ -1969,7 +1961,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.592]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.593]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -1992,7 +1984,7 @@ #define printFloat(f) printf("%g", f) #define rememberedSetSize() GIV(rememberedSetSize) #define stackPageAtpages(index,pages) ((pages) + (index)) -#define startOfMemory() heapBase +#define startOfMemory() GIV(memory) #define wordSize() 4 @@ -2046,10 +2038,22 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin initExtensions */ +# if MULTIPLEBYTECODESETS + extA = (extB = 0); + +# endif /* MULTIPLEBYTECODESETS */ + while (1) { bytecodeDispatchDebugHook(); @@ -2060,8 +2064,15 @@ { VM_LABEL(0pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 0 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2072,8 +2083,15 @@ { VM_LABEL(1pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 4 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2084,8 +2102,15 @@ { VM_LABEL(2pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 8 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2096,8 +2121,15 @@ { VM_LABEL(3pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 12 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2108,8 +2140,15 @@ { VM_LABEL(4pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 16 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2120,8 +2159,15 @@ { VM_LABEL(5pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 20 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2132,8 +2178,15 @@ { VM_LABEL(6pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 24 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2144,8 +2197,15 @@ { VM_LABEL(7pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 28 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2156,8 +2216,15 @@ { VM_LABEL(8pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 32 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2168,8 +2235,15 @@ { VM_LABEL(9pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 36 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2180,8 +2254,15 @@ { VM_LABEL(10pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 40 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2192,8 +2273,15 @@ { VM_LABEL(11pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 44 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2204,8 +2292,15 @@ { VM_LABEL(12pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 48 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2216,8 +2311,15 @@ { VM_LABEL(13pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 52 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2228,8 +2330,15 @@ { VM_LABEL(14pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 56 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2240,8 +2349,15 @@ { VM_LABEL(15pushReceiverVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushReceiverVariable: */ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 60 /* (currentBytecode bitAnd: 15) << 2 */)); @@ -2255,8 +2371,15 @@ VM_LABEL(0pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(0pushTemporaryVariable); /* begin internalPush: */ @@ -2274,8 +2397,15 @@ VM_LABEL(1pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(1pushTemporaryVariable); /* begin internalPush: */ @@ -2293,8 +2423,15 @@ VM_LABEL(2pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(2pushTemporaryVariable); /* begin internalPush: */ @@ -2312,8 +2449,15 @@ VM_LABEL(3pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(3pushTemporaryVariable); /* begin internalPush: */ @@ -2331,8 +2475,15 @@ VM_LABEL(4pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(4pushTemporaryVariable); /* begin internalPush: */ @@ -2350,8 +2501,15 @@ VM_LABEL(5pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(5pushTemporaryVariable); /* begin internalPush: */ @@ -2369,8 +2527,15 @@ VM_LABEL(6pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(6pushTemporaryVariable); /* begin internalPush: */ @@ -2388,8 +2553,15 @@ VM_LABEL(7pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(7pushTemporaryVariable); /* begin internalPush: */ @@ -2407,8 +2579,15 @@ VM_LABEL(8pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(8pushTemporaryVariable); /* begin internalPush: */ @@ -2426,8 +2605,15 @@ VM_LABEL(9pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(9pushTemporaryVariable); /* begin internalPush: */ @@ -2445,8 +2631,15 @@ VM_LABEL(10pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(10pushTemporaryVariable); /* begin internalPush: */ @@ -2464,8 +2657,15 @@ VM_LABEL(11pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(11pushTemporaryVariable); /* begin internalPush: */ @@ -2483,8 +2683,15 @@ VM_LABEL(12pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(12pushTemporaryVariable); /* begin internalPush: */ @@ -2502,8 +2709,15 @@ VM_LABEL(13pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(13pushTemporaryVariable); /* begin internalPush: */ @@ -2521,8 +2735,15 @@ VM_LABEL(14pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(14pushTemporaryVariable); /* begin internalPush: */ @@ -2540,8 +2761,15 @@ VM_LABEL(15pushTemporaryVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushTemporaryVariable: */ VM_LABEL(15pushTemporaryVariable); /* begin internalPush: */ @@ -2558,8 +2786,15 @@ VM_LABEL(0pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2575,8 +2810,15 @@ VM_LABEL(1pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2592,8 +2834,15 @@ VM_LABEL(2pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2609,8 +2858,15 @@ VM_LABEL(3pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2626,8 +2882,15 @@ VM_LABEL(4pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2643,8 +2906,15 @@ VM_LABEL(5pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2660,8 +2930,15 @@ VM_LABEL(6pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2677,8 +2954,15 @@ VM_LABEL(7pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2694,8 +2978,15 @@ VM_LABEL(8pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2711,8 +3002,15 @@ VM_LABEL(9pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2728,8 +3026,15 @@ VM_LABEL(10pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2745,8 +3050,15 @@ VM_LABEL(11pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2762,8 +3074,15 @@ VM_LABEL(12pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2779,8 +3098,15 @@ VM_LABEL(13pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2796,8 +3122,15 @@ VM_LABEL(14pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2813,8 +3146,15 @@ VM_LABEL(15pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2830,8 +3170,15 @@ VM_LABEL(16pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2847,8 +3194,15 @@ VM_LABEL(17pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2864,8 +3218,15 @@ VM_LABEL(18pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2881,8 +3242,15 @@ VM_LABEL(19pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2898,8 +3266,15 @@ VM_LABEL(20pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2915,8 +3290,15 @@ VM_LABEL(21pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2932,8 +3314,15 @@ VM_LABEL(22pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2949,8 +3338,15 @@ VM_LABEL(23pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2966,8 +3362,15 @@ VM_LABEL(24pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -2983,8 +3386,15 @@ VM_LABEL(25pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3000,8 +3410,15 @@ VM_LABEL(26pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3017,8 +3434,15 @@ VM_LABEL(27pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3034,8 +3458,15 @@ VM_LABEL(28pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3051,8 +3482,15 @@ VM_LABEL(29pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3068,8 +3506,15 @@ VM_LABEL(30pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3085,8 +3530,15 @@ VM_LABEL(31pushLiteralConstantBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralConstant: */ /* begin internalPush: */ /* begin literal: */ @@ -3105,8 +3557,15 @@ VM_LABEL(0pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(0pushLiteralVariable); @@ -3143,8 +3602,15 @@ VM_LABEL(1pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(1pushLiteralVariable); @@ -3181,8 +3647,15 @@ VM_LABEL(2pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(2pushLiteralVariable); @@ -3219,8 +3692,15 @@ VM_LABEL(3pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(3pushLiteralVariable); @@ -3257,8 +3737,15 @@ VM_LABEL(4pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(4pushLiteralVariable); @@ -3295,8 +3782,15 @@ VM_LABEL(5pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(5pushLiteralVariable); @@ -3333,8 +3827,15 @@ VM_LABEL(6pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(6pushLiteralVariable); @@ -3371,8 +3872,15 @@ VM_LABEL(7pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(7pushLiteralVariable); @@ -3409,8 +3917,15 @@ VM_LABEL(8pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(8pushLiteralVariable); @@ -3447,8 +3962,15 @@ VM_LABEL(9pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(9pushLiteralVariable); @@ -3485,8 +4007,15 @@ VM_LABEL(10pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(10pushLiteralVariable); @@ -3523,8 +4052,15 @@ VM_LABEL(11pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(11pushLiteralVariable); @@ -3561,8 +4097,15 @@ VM_LABEL(12pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(12pushLiteralVariable); @@ -3599,8 +4142,15 @@ VM_LABEL(13pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(13pushLiteralVariable); @@ -3637,8 +4187,15 @@ VM_LABEL(14pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(14pushLiteralVariable); @@ -3675,8 +4232,15 @@ VM_LABEL(15pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(15pushLiteralVariable); @@ -3713,8 +4277,15 @@ VM_LABEL(16pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(16pushLiteralVariable); @@ -3751,8 +4322,15 @@ VM_LABEL(17pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(17pushLiteralVariable); @@ -3789,8 +4367,15 @@ VM_LABEL(18pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(18pushLiteralVariable); @@ -3827,8 +4412,15 @@ VM_LABEL(19pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(19pushLiteralVariable); @@ -3865,8 +4457,15 @@ VM_LABEL(20pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(20pushLiteralVariable); @@ -3903,8 +4502,15 @@ VM_LABEL(21pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(21pushLiteralVariable); @@ -3941,8 +4547,15 @@ VM_LABEL(22pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(22pushLiteralVariable); @@ -3979,8 +4592,15 @@ VM_LABEL(23pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(23pushLiteralVariable); @@ -4017,8 +4637,15 @@ VM_LABEL(24pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(24pushLiteralVariable); @@ -4055,8 +4682,15 @@ VM_LABEL(25pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(25pushLiteralVariable); @@ -4093,8 +4727,15 @@ VM_LABEL(26pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(26pushLiteralVariable); @@ -4131,8 +4772,15 @@ VM_LABEL(27pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(27pushLiteralVariable); @@ -4169,8 +4817,15 @@ VM_LABEL(28pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(28pushLiteralVariable); @@ -4207,8 +4862,15 @@ VM_LABEL(29pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(29pushLiteralVariable); @@ -4245,8 +4907,15 @@ VM_LABEL(30pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(30pushLiteralVariable); @@ -4283,8 +4952,15 @@ VM_LABEL(31pushLiteralVariableBytecode); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + /* begin pushLiteralVariable: */ VM_LABEL(31pushLiteralVariable); @@ -4347,8 +5023,15 @@ } longAtput((rcvr + (BaseHeaderSize)) + ((currentBytecode & 7) << 2), top); /* begin fetchNextBytecode */ + +# if MULTIPLEBYTECODESETS + currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector; + +# else /* MULTIPLEBYTECODESETS */ currentBytecode = byteAtPointer(++localIP); +# endif /* MULTIPLEBYTECODESETS */ + @@ Diff output truncated at 50000 characters. @@

1 0

[commit][2852] CogVM source as per MMaker.oscog-eem.592
by commits＠squeakvm.org 25 Jan '14

25 Jan '14

Revision: 2852 Author: eliot Date: 2014-01-24 17:04:32 -0800 (Fri, 24 Jan 2014) Log Message: ----------- CogVM source as per MMaker.oscog-eem.592 Author: eem Time: 24 January 2014, 4:52:54.33 pm UUID: 98758c41-4bb5-4d45-87c9-77e5cf416120 Ancestors: VMMaker.oscog-eem.591 Fix regression in mapProfileState committed in VMMaker.oscog-eem.380/r2796. Causes segfaults on GC after running the AndreasSystemProfiler. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1143,7 +1143,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1298,15 +1298,15 @@ _iss usqInt fwdTableNext; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; -_iss sqInt profileProcess; _iss sqInt profileSemaphore; _iss usqInt compStart; _iss sqInt extraRootCount; +_iss sqInt profileProcess; _iss sqInt classNameIndex; _iss sqInt weakRootCount; _iss sqInt longRunningPrimitiveCheckMethod; +_iss sqInt profileMethod; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt profileMethod; _iss sqInt backwardJumpCount; _iss sqInt growHeadroom; _iss sqInt lkupClass; @@ -2029,7 +2029,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.591"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.592"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -23719,15 +23719,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -23738,7 +23740,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23753,7 +23769,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23807,18 +23823,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -27106,7 +27122,7 @@ } if (((GIV(profileMethod) & 1) == 0) && (((longAt(GIV(profileMethod))) & MarkBit) != 0)) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if (((GIV(profileSemaphore) & 1) == 0) && (((longAt(GIV(profileSemaphore))) & MarkBit) != 0)) { @@ -50012,7 +50028,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1146,7 +1146,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1301,15 +1301,15 @@ _iss usqInt fwdTableNext; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; -_iss sqInt profileProcess; _iss sqInt profileSemaphore; _iss usqInt compStart; _iss sqInt extraRootCount; +_iss sqInt profileProcess; _iss sqInt classNameIndex; _iss sqInt weakRootCount; _iss sqInt longRunningPrimitiveCheckMethod; +_iss sqInt profileMethod; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt profileMethod; _iss sqInt backwardJumpCount; _iss sqInt growHeadroom; _iss sqInt lkupClass; @@ -2032,7 +2032,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.591"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.592"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -23728,15 +23728,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -23747,7 +23749,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23762,7 +23778,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23816,18 +23832,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -27115,7 +27131,7 @@ } if (((GIV(profileMethod) & 1) == 0) && (((longAt(GIV(profileMethod))) & MarkBit) != 0)) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if (((GIV(profileSemaphore) & 1) == 0) && (((longAt(GIV(profileSemaphore))) & MarkBit) != 0)) { @@ -50021,7 +50037,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/nscogsrc/vm/interp.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jan 24 13:06:26 PST 2014 + Fri Jan 24 17:01:09 PST 2014 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spursrc/vm/cointerp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1439,20 +1439,20 @@ _iss sqInt tempOop; _iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; -_iss sqInt profileProcess; _iss sqInt profileSemaphore; _iss sqInt tenureThreshold; _iss sqInt ephemeronList; _iss sqInt needGCFlag; +_iss sqInt profileProcess; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; +_iss sqInt profileMethod; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; -_iss sqInt profileMethod; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt classTableIndex; @@ -2168,7 +2168,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.592]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -28752,7 +28752,7 @@ } if ((((longAt(GIV(profileMethod))) & 0x3FFFFF) == 8) || (isReallyYoungObject(GIV(profileMethod)))) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if ((((longAt(GIV(profileSemaphore))) & 0x3FFFFF) == 8) || (isReallyYoungObject(GIV(profileSemaphore)))) { Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spursrc/vm/cointerp.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1442,20 +1442,20 @@ _iss sqInt tempOop; _iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; -_iss sqInt profileProcess; _iss sqInt profileSemaphore; _iss sqInt tenureThreshold; _iss sqInt ephemeronList; _iss sqInt needGCFlag; +_iss sqInt profileProcess; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; +_iss sqInt profileMethod; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; -_iss sqInt profileMethod; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt classTableIndex; @@ -2171,7 +2171,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.592]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -28761,7 +28761,7 @@ } if ((((longAt(GIV(profileMethod))) & 0x3FFFFF) == 8) || (isReallyYoungObject(GIV(profileMethod)))) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if ((((longAt(GIV(profileSemaphore))) & 0x3FFFFF) == 8) || (isReallyYoungObject(GIV(profileSemaphore)))) { Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spursrc/vm/interp.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spursrc/vm/vmCallback.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1259,20 +1259,20 @@ _iss sqLong nextProfileTick; _iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; -_iss sqInt profileProcess; _iss sqInt tenureThreshold; _iss sqInt ephemeronList; _iss sqInt needGCFlag; _iss sqInt numPages; +_iss sqInt profileProcess; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; +_iss sqInt profileMethod; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt profileMethod; _iss sqInt growHeadroom; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; @@ -1969,7 +1969,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.592]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -24495,7 +24495,7 @@ } if ((((longAt(GIV(profileMethod))) & 0x3FFFFF) == 8) || (isReallyYoungObject(GIV(profileMethod)))) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if ((((longAt(GIV(profileSemaphore))) & 0x3FFFFF) == 8) || (isReallyYoungObject(GIV(profileSemaphore)))) { Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1256,20 +1256,20 @@ _iss sqLong nextProfileTick; _iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; -_iss sqInt profileProcess; _iss sqInt tenureThreshold; _iss sqInt ephemeronList; _iss sqInt needGCFlag; _iss sqInt numPages; +_iss sqInt profileProcess; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; +_iss sqInt profileMethod; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt profileMethod; _iss sqInt growHeadroom; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; @@ -1966,7 +1966,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.592]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -24486,7 +24486,7 @@ } if ((((longAt(GIV(profileMethod))) & 0x3FFFFF) == 8) || (isReallyYoungObject(GIV(profileMethod)))) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if ((((longAt(GIV(profileSemaphore))) & 0x3FFFFF) == 8) || (isReallyYoungObject(GIV(profileSemaphore)))) { Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spurstacksrc/vm/interp.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/src/vm/cointerp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1288,15 +1288,15 @@ _iss usqInt fwdTableNext; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; -_iss sqInt profileProcess; _iss sqInt profileSemaphore; _iss usqInt compStart; _iss sqInt extraRootCount; +_iss sqInt profileProcess; _iss sqInt classNameIndex; _iss sqInt weakRootCount; _iss sqInt longRunningPrimitiveCheckMethod; -_iss sqInt lastMethodCacheProbeWrite; _iss sqInt profileMethod; +_iss sqInt lastMethodCacheProbeWrite; _iss sqInt growHeadroom; _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; @@ -2019,7 +2019,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.592]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4711,7 +4711,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l158; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4726,7 +4725,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - null; + /* return self */ l158: /* end baseFrameReturn */; goto l155; } @@ -22541,7 +22540,7 @@ } if (((GIV(profileMethod) & 1) == 0) && (((longAt(GIV(profileMethod))) & MarkBit) != 0)) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if (((GIV(profileSemaphore) & 1) == 0) && (((longAt(GIV(profileSemaphore))) & MarkBit) != 0)) { Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/src/vm/cointerp.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/src/vm/cointerpmt.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - CoInterpreterMT VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CoInterpreterMT VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1201,7 +1201,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1374,19 +1374,19 @@ _iss usqInt fwdTableNext; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; -_iss sqInt profileProcess; _iss sqInt profileSemaphore; _iss usqInt compStart; _iss sqInt extraRootCount; +_iss sqInt profileProcess; _iss sqInt classNameIndex; _iss sqInt maxWaitingPriority; _iss sqInt weakRootCount; _iss sqInt fullGCLock; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt preemptionYields; +_iss sqInt profileMethod; _iss sqInt vmOwner; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt profileMethod; _iss sqInt growHeadroom; _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; @@ -2117,7 +2117,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.592]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -5632,6 +5632,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } + null; goto l4; } if (opType == 3) { @@ -5641,6 +5642,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -5654,6 +5656,7 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); + null; goto l4; } top = longAtPointer(localSP); @@ -19884,17 +19887,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -19905,21 +19906,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -19934,7 +19921,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -19988,18 +19975,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -23332,7 +23319,7 @@ } if (((GIV(profileMethod) & 1) == 0) && (((longAt(GIV(profileMethod))) & MarkBit) != 0)) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if (((GIV(profileSemaphore) & 1) == 0) && (((longAt(GIV(profileSemaphore))) & MarkBit) != 0)) { @@ -46777,7 +46764,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/src/vm/cointerpmt.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1291,15 +1291,15 @@ _iss usqInt fwdTableNext; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; -_iss sqInt profileProcess; _iss sqInt profileSemaphore; _iss usqInt compStart; _iss sqInt extraRootCount; +_iss sqInt profileProcess; _iss sqInt classNameIndex; _iss sqInt weakRootCount; _iss sqInt longRunningPrimitiveCheckMethod; -_iss sqInt lastMethodCacheProbeWrite; _iss sqInt profileMethod; +_iss sqInt lastMethodCacheProbeWrite; _iss sqInt growHeadroom; _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; @@ -2022,7 +2022,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.592]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4720,7 +4720,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l158; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4735,7 +4734,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - null; + /* return self */ l158: /* end baseFrameReturn */; goto l155; } @@ -22550,7 +22549,7 @@ } if (((GIV(profileMethod) & 1) == 0) && (((longAt(GIV(profileMethod))) & MarkBit) != 0)) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if (((GIV(profileSemaphore) & 1) == 0) && (((longAt(GIV(profileSemaphore))) & MarkBit) != 0)) { Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - CoInterpreterMT VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CoInterpreterMT VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1204,7 +1204,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1377,19 +1377,19 @@ _iss usqInt fwdTableNext; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; -_iss sqInt profileProcess; _iss sqInt profileSemaphore; _iss usqInt compStart; _iss sqInt extraRootCount; +_iss sqInt profileProcess; _iss sqInt classNameIndex; _iss sqInt maxWaitingPriority; _iss sqInt weakRootCount; _iss sqInt fullGCLock; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt preemptionYields; +_iss sqInt profileMethod; _iss sqInt vmOwner; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt profileMethod; _iss sqInt growHeadroom; _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; @@ -2120,7 +2120,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.592]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -5641,6 +5641,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } + null; goto l4; } if (opType == 3) { @@ -5650,6 +5651,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -5663,6 +5665,7 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); + null; goto l4; } top = longAtPointer(localSP); @@ -19893,17 +19896,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -19914,21 +19915,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -19943,7 +19930,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -19997,18 +19984,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -23341,7 +23328,7 @@ } if (((GIV(profileMethod) & 1) == 0) && (((longAt(GIV(profileMethod))) & MarkBit) != 0)) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if (((GIV(profileSemaphore) & 1) == 0) && (((longAt(GIV(profileSemaphore))) & MarkBit) != 0)) { @@ -46786,7 +46773,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/src/vm/interp.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/src/vm/vmCallback.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1096,17 +1096,17 @@ _iss sqInt needGCFlag; _iss sqInt tempOop; _iss sqLong nextProfileTick; -_iss sqInt profileProcess; _iss usqInt compStart; _iss sqInt extraRootCount; _iss sqInt numPages; +_iss sqInt profileProcess; _iss sqInt classNameIndex; _iss sqInt weakRootCount; _iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; +_iss sqInt profileMethod; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt profileMethod; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; @@ -1808,7 +1808,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.592]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -19744,7 +19744,7 @@ } if (((GIV(profileMethod) & 1) == 0) && (((longAt(GIV(profileMethod))) & MarkBit) != 0)) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if (((GIV(profileSemaphore) & 1) == 0) && (((longAt(GIV(profileSemaphore))) & MarkBit) != 0)) { Modified: branches/Cog/stacksrc/vm/interp.c =================================================================== --- branches/Cog/stacksrc/vm/interp.c 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/stacksrc/vm/interp.c 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 from - StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1093,17 +1093,17 @@ _iss sqInt needGCFlag; _iss sqInt tempOop; _iss sqLong nextProfileTick; -_iss sqInt profileProcess; _iss usqInt compStart; _iss sqInt extraRootCount; _iss sqInt numPages; +_iss sqInt profileProcess; _iss sqInt classNameIndex; _iss sqInt weakRootCount; _iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; +_iss sqInt profileMethod; _iss sqInt lastMethodCacheProbeWrite; -_iss sqInt profileMethod; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; @@ -1805,7 +1805,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.591]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.592]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -19735,7 +19735,7 @@ } if (((GIV(profileMethod) & 1) == 0) && (((longAt(GIV(profileMethod))) & MarkBit) != 0)) { - GIV(profileMethod) = remapObj(GIV(profileProcess)); + GIV(profileMethod) = remapObj(GIV(profileMethod)); } if (((GIV(profileSemaphore) & 1) == 0) && (((longAt(GIV(profileSemaphore))) & MarkBit) != 0)) { Modified: branches/Cog/stacksrc/vm/interp.h =================================================================== --- branches/Cog/stacksrc/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/stacksrc/vm/interp.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/stacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/stacksrc/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) +++ branches/Cog/stacksrc/vm/vmCallback.h 2014-01-25 01:04:32 UTC (rev 2852) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.592.mcz
by commits＠source.squeak.org 25 Jan '14

25 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.592.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.592 Author: eem Time: 24 January 2014, 4:52:54.33 pm UUID: 98758c41-4bb5-4d45-87c9-77e5cf416120 Ancestors: VMMaker.oscog-eem.591 Fix regression in mapProfileState committed in VMMaker.oscog-eem.380. =============== Diff against VMMaker.oscog-eem.591 =============== Item was changed: ----- Method: StackInterpreter>>mapProfileState (in category 'object memory support') ----- mapProfileState (objectMemory shouldRemapObj: profileProcess) ifTrue: [profileProcess := objectMemory remapObj: profileProcess]. (objectMemory shouldRemapObj: profileMethod) ifTrue: + [profileMethod := objectMemory remapObj: profileMethod]. - [profileMethod := objectMemory remapObj: profileProcess]. (objectMemory shouldRemapObj: profileSemaphore) ifTrue: [profileSemaphore := objectMemory remapObj: profileSemaphore]. "The longRunningPrimitiveCheckMethod (LRPCM) is sampled in an interrupt. Be very careful with it. If longRunningPrimitiveCheckSequenceNumber (LRPCSN) = statCheckForEvents then LRPCM has been recenty sampled and could be mapped or not, but it must be newMethod and we can simply copy newMethod. If LRPCSN ~= statCheckForEvents then LRPCM must be some extant object and needs to be remapped." self sqLowLevelMFence. longRunningPrimitiveCheckMethod ifNotNil: [longRunningPrimitiveCheckSequenceNumber = statCheckForEvents ifTrue: [longRunningPrimitiveCheckMethod := newMethod] ifFalse: [(objectMemory shouldRemapObj: longRunningPrimitiveCheckMethod) ifTrue: [longRunningPrimitiveCheckMethod := self remapObj: longRunningPrimitiveCheckMethod]]. self sqLowLevelMFence]. longRunningPrimitiveCheckSemaphore ifNotNil: [(objectMemory shouldRemapObj: longRunningPrimitiveCheckSemaphore) ifTrue: [longRunningPrimitiveCheckSemaphore := objectMemory remapObj: longRunningPrimitiveCheckSemaphore]]!

1 0

[commit][2851] CogVM source as per VMMaker.oscog-eem.591
by commits＠squeakvm.org 24 Jan '14

24 Jan '14

Revision: 2851 Author: eliot Date: 2014-01-24 13:07:34 -0800 (Fri, 24 Jan 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.591 Fix the regression in CoInterpreter>>validInstructionPointer:inMethod:framePointer: by accepting an instruction pointer pointing just before the first bytecode in StackInterpreter>>validInstructionPointer:inMethod:framePointer: and reverting CoInterpreter's method. This affects only debug and assert VMs. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2029,7 +2029,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.590"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.591"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -54208,7 +54208,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer + 1; + theInstrPointer = instrPointer; if ((((usqInt)(longAt(fp + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ methodField = longAt(fp + FoxMethod); @@ -54229,13 +54229,13 @@ (methodHeader = (isCogMethodReference(methodHeader1) ? ((((CogMethod *) methodHeader1))->methodHeader) : methodHeader1)), - (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && ((theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + BaseHeaderSize) - 1)) && (!(((((sqInt) methodHeader)) < 0) && ((methodHeader & (65536 << SmallIntegerShift)) - && (theInstrPointer < (((((aMethod + BaseHeaderSize) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 + && (theInstrPointer < ((((aMethod + BytesPerOop) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 ? 3 - : 0))) - 1))))))); + : 0))))))))); } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2032,7 +2032,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.590"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.591"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -54217,7 +54217,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer + 1; + theInstrPointer = instrPointer; if ((((usqInt)(longAt(fp + FoxMethod)))) < (startOfMemory())) { /* begin mframeHomeMethod: */ methodField = longAt(fp + FoxMethod); @@ -54238,13 +54238,13 @@ (methodHeader = (isCogMethodReference(methodHeader1) ? ((((CogMethod *) methodHeader1))->methodHeader) : methodHeader1)), - (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && ((theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + BaseHeaderSize) - 1)) && (!(((((sqInt) methodHeader)) < 0) && ((methodHeader & (65536 << SmallIntegerShift)) - && (theInstrPointer < (((((aMethod + BaseHeaderSize) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 + && (theInstrPointer < ((((aMethod + BytesPerOop) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 ? 3 - : 0))) - 1))))))); + : 0))))))))); } Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/nscogsrc/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jan 23 11:23:59 PST 2014 + Fri Jan 24 13:06:26 PST 2014 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spursrc/vm/cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2168,7 +2168,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.591]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5358,6 +5358,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l142; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5372,7 +5373,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l142: /* end baseFrameReturn */; goto l139; } @@ -57926,7 +57927,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer + 1; + theInstrPointer = instrPointer; header = longAt((aMethod + (BaseHeaderSize)) + (HeaderIndex << 2)); if ((isCogMethodReference(header)) && (theInstrPointer < (startOfMemory()))) { @@ -57936,7 +57937,7 @@ } } - return (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)); } Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spursrc/vm/cointerp.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2171,7 +2171,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.591]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5367,6 +5367,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l142; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5381,7 +5382,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l142: /* end baseFrameReturn */; goto l139; } @@ -57935,7 +57936,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer + 1; + theInstrPointer = instrPointer; header = longAt((aMethod + (BaseHeaderSize)) + (HeaderIndex << 2)); if ((isCogMethodReference(header)) && (theInstrPointer < (startOfMemory()))) { @@ -57945,7 +57946,7 @@ } } - return (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)); } Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spursrc/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spursrc/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - StackInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1969,7 +1969,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.591]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -51081,7 +51081,7 @@ { sqInt methodHeader; - return (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)); } Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - StackInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1966,7 +1966,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.591]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -51072,7 +51072,7 @@ { sqInt methodHeader; - return (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)); } Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spurstacksrc/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/src/vm/cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1134,7 +1134,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2019,7 +2019,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.591]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4711,6 +4711,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l158; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4725,7 +4726,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l158: /* end baseFrameReturn */; goto l155; } @@ -19175,17 +19176,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -19196,21 +19195,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -19225,7 +19210,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -19279,18 +19264,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -45323,7 +45308,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -49471,7 +49456,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer + 1; + theInstrPointer = instrPointer; header = longAt((aMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if ((isCogMethodReference(header)) && (theInstrPointer < (startOfMemory()))) { @@ -49481,7 +49466,7 @@ } } - return (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)); } Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/src/vm/cointerp.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/src/vm/cointerpmt.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - CoInterpreterMT VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CoInterpreterMT VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2117,7 +2117,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.591]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -51209,7 +51209,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer + 1; + theInstrPointer = instrPointer; header = longAt((aMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if ((isCogMethodReference(header)) && (theInstrPointer < (startOfMemory()))) { @@ -51219,7 +51219,7 @@ } } - return (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)); } Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/src/vm/cointerpmt.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1137,7 +1137,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2022,7 +2022,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.591]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4720,6 +4720,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l158; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4734,7 +4735,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l158: /* end baseFrameReturn */; goto l155; } @@ -19184,17 +19185,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -19205,21 +19204,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -19234,7 +19219,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -19288,18 +19273,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -45332,7 +45317,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -49480,7 +49465,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer + 1; + theInstrPointer = instrPointer; header = longAt((aMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if ((isCogMethodReference(header)) && (theInstrPointer < (startOfMemory()))) { @@ -49490,7 +49475,7 @@ } } - return (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)); } Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - CoInterpreterMT VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CoInterpreterMT VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2120,7 +2120,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.591]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -51218,7 +51218,7 @@ theInstrPointer = longAt(fp + FoxIFSavedIP); } else { - theInstrPointer = instrPointer + 1; + theInstrPointer = instrPointer; header = longAt((aMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if ((isCogMethodReference(header)) && (theInstrPointer < (startOfMemory()))) { @@ -51228,7 +51228,7 @@ } } - return (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + return (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)); } Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/src/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/src/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - StackInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1808,7 +1808,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.591]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -44801,15 +44801,15 @@ /* -1 for pre-increment in fetchNextBytecode */ (methodHeader = longAt((aMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord))), - (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && ((theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + BaseHeaderSize) - 1)) && (!(((((sqInt) methodHeader)) < 0) && ((methodHeader & (65536 << SmallIntegerShift)) - && (theInstrPointer < (((((aMethod + BaseHeaderSize) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 + && (theInstrPointer < ((((aMethod + BytesPerOop) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 ? 3 - : 0))) - 1))))))) + : 0))))))))) # else /* MULTIPLEBYTECODESETS */ - (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)) # endif /* MULTIPLEBYTECODESETS */ ; Modified: branches/Cog/stacksrc/vm/interp.c =================================================================== --- branches/Cog/stacksrc/vm/interp.c 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/stacksrc/vm/interp.c 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 from - StackInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1805,7 +1805,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.590]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.591]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -44792,15 +44792,15 @@ /* -1 for pre-increment in fetchNextBytecode */ (methodHeader = longAt((aMethod + BaseHeaderSize) + (HeaderIndex << ShiftForWord))), - (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && ((theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + BaseHeaderSize) - 1)) && (!(((((sqInt) methodHeader)) < 0) && ((methodHeader & (65536 << SmallIntegerShift)) - && (theInstrPointer < (((((aMethod + BaseHeaderSize) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 + && (theInstrPointer < ((((aMethod + BytesPerOop) - 1) + (lastPointerOf(aMethod))) + (((((sqInt) methodHeader)) < 0 ? 3 - : 0))) - 1))))))) + : 0))))))))) # else /* MULTIPLEBYTECODESETS */ - (theInstrPointer >= ((aMethod + (lastPointerOf(aMethod))) + BytesPerOop)) + (theInstrPointer >= (((aMethod + (lastPointerOf(aMethod))) + BytesPerOop) - 1)) && (theInstrPointer < (((aMethod + (byteLengthOf(aMethod))) + (BaseHeaderSize)) - 1)) # endif /* MULTIPLEBYTECODESETS */ ; Modified: branches/Cog/stacksrc/vm/interp.h =================================================================== --- branches/Cog/stacksrc/vm/interp.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/stacksrc/vm/interp.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/stacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/stacksrc/vm/vmCallback.h 2014-01-23 19:24:54 UTC (rev 2850) +++ branches/Cog/stacksrc/vm/vmCallback.h 2014-01-24 21:07:34 UTC (rev 2851) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.590 uuid: 8f6d2060-b948-464c-89d9-341f775e8662 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.591 uuid: 2f605da3-babd-4f62-a19e-085c28cca416 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.591.mcz
by commits＠source.squeak.org 24 Jan '14

24 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.591.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.591 Author: eem Time: 24 January 2014, 12:57:20.086 pm UUID: 2f605da3-babd-4f62-a19e-085c28cca416 Ancestors: VMMaker.oscog-eem.590 Fix the regression in CoInterpreter>>validInstructionPointer:inMethod:framePointer: by accepting an instruction pointer pointing just before the first bytecode in StackInterpreter>>validInstructionPointer:inMethod:framePointer: and reverting CoInterpreter's method. Add some missing simulation redirects. Copy the filterPerfrmOf:to: hack to StackInterpreterSimulator. Don't bother emitting plugins for the Newspeak stack VM. =============== Diff against VMMaker.oscog-eem.590 =============== Item was changed: ----- Method: CoInterpreter>>ceDynamicSuperSend:to:numArgs: (in category 'trampolines') ----- ceDynamicSuperSend: selector to: rcvr numArgs: numArgs "Entry-point for an unlinked dynamic super send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> <option: #NewspeakVM> | class classTag canLinkCacheTag errSelIdx cogMethod mClassMixin mixinApplication | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. mClassMixin := self mMethodClass. mixinApplication := self findApplicationOfTargetMixin: mClassMixin startingAtBehavior: (objectMemory fetchClassOf: rcvr). self assert: (objectMemory lengthOf: mixinApplication) > (InstanceSpecificationIndex + 1). + classTag := objectMemory classTagForClass: (self superclassOf: mixinApplication). - classTag := self classTagForClass: (self superclassOf: mixinApplication). class := objectMemory fetchClassOf: rcvr. "what about the read barrier??" canLinkCacheTag := (objectMemory isYoungObject: class) not or: [cogit canLinkToYoungClasses]. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [(objectMemory isOopForwarded: selector) ifTrue: [^self ceDynamicSuperSend: (self handleForwardedSelectorFaultFor: selector) to: rcvr numArgs: numArgs]. (objectMemory isForwardedClassTag: classTag) ifTrue: [^self ceDynamicSuperSend: selector to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc") numArgs: numArgs]. messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. (cogMethod selector = selector and: [canLinkCacheTag]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: cogit dynSuperEntryOffset receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') ----- validInstructionPointer: instrPointer inMethod: aMethod framePointer: fp <var: #instrPointer type: #usqInt> <var: #aMethod type: #usqInt> <var: #fp type: #'char *'> | theInstrPointer cogMethod | <var: #theInstrPointer type: #usqInt> <var: #cogMethod type: #'CogMethod *'> instrPointer = cogit ceCannotResumePC ifTrue: [^self isMachineCodeFrame: fp]. instrPointer = cogit ceReturnToInterpreterPC ifTrue: [(self isMachineCodeFrame: fp) ifTrue: [^false]. theInstrPointer := self iframeSavedIP: fp] ifFalse: + [theInstrPointer := instrPointer. - [theInstrPointer := instrPointer + 1. self cppIf: NewspeakVM ifTrue: [(self isMachineCodeFrame: fp) ifTrue: [cogMethod := self mframeHomeMethod: fp. ^theInstrPointer >= (cogMethod asUnsignedInteger + (cogit sizeof: CogMethod)) and: [theInstrPointer < (cogMethod asUnsignedInteger + cogMethod blockSize)]]] ifFalse: [| header | header := self rawHeaderOf: aMethod. ((self isCogMethodReference: header) and: [theInstrPointer < objectMemory startOfMemory]) ifTrue: [cogMethod := self cCoerceSimple: header to: #'CogMethod *'. ^theInstrPointer >= (header + (cogit sizeof: CogMethod)) and: [theInstrPointer < (header + cogMethod blockSize)]]]]. ^super validInstructionPointer: theInstrPointer inMethod: aMethod framePointer: fp! Item was added: + ----- Method: NewObjectMemorySimulator>>methodReturnValue: (in category 'simulation only') ----- + methodReturnValue: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter methodReturnValue: oop! Item was added: + ----- Method: NewObjectMemorySimulator>>signed32BitIntegerFor: (in category 'simulation only') ----- + signed32BitIntegerFor: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter signed32BitIntegerFor: integerValue! Item was added: + ----- Method: SpurMemoryManager>>methodReturnValue: (in category 'simulation only') ----- + methodReturnValue: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + <doNotGenerate> + ^coInterpreter methodReturnValue: oop! Item was added: + ----- Method: SpurMemoryManager>>signed32BitIntegerFor: (in category 'simulation only') ----- + signed32BitIntegerFor: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + <doNotGenerate> + ^coInterpreter signed32BitIntegerFor: integerValue! Item was changed: ----- Method: StackInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') ----- validInstructionPointer: theInstrPointer inMethod: aMethod framePointer: fp <var: #theInstrPointer type: #usqInt> <var: #aMethod type: #usqInt> <var: #fp type: #'char *'> ^self cppIf: MULTIPLEBYTECODESETS ifTrue: [| methodHeader | methodHeader := self noAssertHeaderOf: aMethod. "-1 for pre-increment in fetchNextBytecode" + theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop - 1) - theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop) and: [theInstrPointer < (aMethod + (objectMemory byteLengthOf: aMethod) + BaseHeaderSize - 1) and: ["If the method starts with a CallPrimitive opcode the instruction pointer should be past it." ((self headerIndicatesAlternateBytecodeSet: methodHeader) + and: [(self alternateHeaderHasPrimitiveFlag: methodHeader) + and: [theInstrPointer < (aMethod + + BytesPerOop - 1 - and: [(self alternateHeaderHasPrimitiveFlag: methodHeader) - and: [theInstrPointer < (aMethod - + BaseHeaderSize - 1 + (objectMemory lastPointerOf: aMethod) + + (self sizeOfCallPrimitiveBytecode: methodHeader))]]) - + (self sizeOfCallPrimitiveBytecode: methodHeader) - 1)]]) not]]] ifFalse: "-1 for pre-increment in fetchNextBytecode" + [theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop - 1) - [theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop) and: [theInstrPointer < (aMethod + (objectMemory byteLengthOf: aMethod) + objectMemory baseHeaderSize - 1)]]! Item was changed: StackInterpreterPrimitives subclass: #StackInterpreterSimulator + instanceVariableNames: 'bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat performFilters' - instanceVariableNames: 'bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-InterpreterSimulation'! !StackInterpreterSimulator commentStamp: 'eem 9/3/2013 11:05' prior: 0! This class defines basic memory access and primitive simulation so that the StackInterpreter can run simulated in the Squeak environment. It also defines a number of handy object viewing methods to facilitate pawing around in the object memory. To see the thing actually run, you could (after backing up this image and changes), execute (StackInterpreterSimulator new openOn: Smalltalk imageName) test ((StackInterpreterSimulator newWithOptions: #(NewspeakVM true MULTIPLEBYTECODESETS true)) openOn: 'ns101.image') test and be patient both to wait for things to happen, and to accept various things that may go wrong depending on how large or unusual your image may be. We usually do this with a small and simple benchmark image. Here's an example of what Eliot uses to launch the simulator in a window. The bottom-right window has a menu packed with useful stuff: | vm | vm := StackInterpreterSimulator newWithOptions: #(). vm openOn: '/Users/eliot/Squeak/Squeak4.4/trunk44.image'. vm setBreakSelector: #&. vm openAsMorph; run! Item was added: + ----- Method: StackInterpreterSimulator>>filterPerformOf:to: (in category 'control primitives') ----- + filterPerformOf: selector to: receiver + "This is to allow simulator to filter start-up items to avoid as-yet unsimulatable plugins." + performFilters ifNil: [^false]. + (performFilters at: (self shortPrint: receiver) ifAbsent: []) ifNotNil: + [:messages| + ^messages includes: (self stringOf: selector)]. + ^false! Item was added: + ----- Method: StackInterpreterSimulator>>forShortPrintString:filterPerformMessages: (in category 'control primitives') ----- + forShortPrintString: shortPrintString filterPerformMessages: aCollection + performFilters ifNil: + [performFilters := Dictionary new]. + performFilters at: shortPrintString put: aCollection! Item was added: + ----- Method: StackInterpreterSimulator>>primitiveObject:perform:withArguments:lookedUpIn: (in category 'control primitives') ----- + primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClass + "Override to allow simulator to filter start-up items to avoid as-yet unsimulatable plugins." + + (self filterPerformOf: selector to: actualReceiver) ifTrue: + [^self pop: argumentCount + 1 thenPush: actualReceiver]. + ^super primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClass! Item was added: + ----- Method: StackInterpreterSimulator>>primitivePerform (in category 'debugging traps') ----- + primitivePerform + | selector | + selector := self stackValue: argumentCount - 1. + self sendBreakpoint: selector receiver: (self stackValue: argumentCount). + (self filterPerformOf: selector to: (self stackValue: argumentCount)) ifTrue: + [^self pop: argumentCount]. + ^super primitivePerform! Item was changed: ----- Method: VMMaker class>>generateNewspeakStackVM (in category 'configurations') ----- generateNewspeakStackVM + "No primitives since we can use those for the Cog Newspeak VM" ^VMMaker generate: StackInterpreter with: #(NewspeakVM true MULTIPLEBYTECODESETS true) to: (FileDirectory default pathFromURI: 'oscogvm/nsstacksrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') + excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! - including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DSAPlugin DropPlugin - FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin InflatePlugin JPEGReadWriter2Plugin - JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin - RePlugin SecurityPlugin SocketPlugin SoundPlugin SurfacePlugin SqueakSSLPlugin ThreadedIA32FFIPlugin - UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)!

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2014