Vm-dev October 2011

vm-dev@lists.squeakfoundation.org

25 participants
55 discussions

New COg VMs available at...
by Eliot Miranda 20 Oct '11

20 Oct '11

http://www.mirandabanda.org/files/Cog/VM/VM.r2502/ CogVM binaries as per VMMaker.oscog-eem.134/r2502 Ensure the unix run scripts set SQUEAK_PLUGINS if unset. Fix remaining bug in context access fixes of VMMaker.oscog-eem.119. stObject:at: and stObject:at:put: need to use stackPointerForMaybeMarriedContext: not fetchStackPointerOf:, since the context's stack pointer may be stale. Fix send trace printing. Interpreter sends need also to be printed. (A better fix is probably to redo sendBreakpoint: but this will serve for now). N.B. this reassigns the sendtrace flag values. Add primitiveNotEquivalent with prim # 169. -- best, Eliot

1 0

Auto Reply: Re: [squeak-dev] [Vm-dev] Re: [Pharo-project] About ~= and ~~
by michael.haupt＠oracle.com 19 Oct '11

19 Oct '11

I am on vacation until (including) Oct 31, 2011, with occasional low-bandwidth internet connection.

1 0

Re: [Pharo-project] About ~= and ~~
by Eliot Miranda 19 Oct '11

19 Oct '11

On Wed, Oct 12, 2011 at 8:38 AM, Levente Uzonyi <leves(a)elte.hu> wrote: > On Wed, 12 Oct 2011, Clara Allende wrote: > > Hi guys, >> >> I'm wondering, why? >> >> ProtoObject>> ~~ anObject >> "Answer whether the receiver and the argument are not the same object >> (do not have the same object pointer)." >> >> self == anObject >> ifTrue: [^ false] >> ifFalse: [^ true] >> >> Instead of: >> ProtoObject>> ~~ anObject >> "Answer whether the receiver and the argument are not the same object >> (do not have the same object pointer)." >> >> ^(self == anObject) not >> >> And why? >> Object >> ~= anObject >> "Answer whether the receiver and the argument do not represent the >> same object." >> >> ^self = anObject == false >> >> Instead of >> Object>> ~= anObject >> "Answer whether the receiver and the argument do not represent the >> same object." >> >> ^(self = anObject) not. >> >> Is there any particular reason for this that I'm missing? >> > > Performance. > But better still is to add a ~~ primitive. I did this for VisualWorks. e.g. primitive 150 is free. why don't we use that for 1.4/4.3? > > > Levente > > Thanks in advance! >> -- >> >> "*Most good programmers do programming not because they expect to get paid >> or get adulation by the public, but because it is fun to program.*" >> >> Linus Torvalds >> >> > -- best, Eliot

10 21

[commit] r2502 - Ensure the unix run scripts set SQUEAK_PLUGINS if unset.
by commits＠squeakvm.org 19 Oct '11

19 Oct '11

Author: eliot Date: 2011-10-19 11:52:10 -0700 (Wed, 19 Oct 2011) New Revision: 2502 Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/unix/config/bin.squeak.sh.in branches/Cog/platforms/unix/config/squeak.sh.in Log: Ensure the unix run scripts set SQUEAK_PLUGINS if unset. Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Oct 19 11:05:54 PDT 2011 + Wed Oct 19 11:51:32 PDT 2011 Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in =================================================================== --- branches/Cog/platforms/unix/config/bin.squeak.sh.in 2011-10-19 18:07:48 UTC (rev 2501) +++ branches/Cog/platforms/unix/config/bin.squeak.sh.in 2011-10-19 18:52:10 UTC (rev 2502) @@ -1,5 +1,10 @@ #!/bin/sh +# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory +# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory. BIN=`/usr/bin/dirname $0`/../@expanded_relative_imgdir@ +if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then + export SQUEAK_PLUGINS="$BIN" +fi # At least on linux LD_LIBRARY_PATH's components must be absolute path names case "$BIN" in /*) PLUGINS="$BIN";; Modified: branches/Cog/platforms/unix/config/squeak.sh.in =================================================================== --- branches/Cog/platforms/unix/config/squeak.sh.in 2011-10-19 18:07:48 UTC (rev 2501) +++ branches/Cog/platforms/unix/config/squeak.sh.in 2011-10-19 18:52:10 UTC (rev 2502) @@ -1,5 +1,10 @@ #!/bin/sh +# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory +# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory. BIN=`/usr/bin/dirname $0`/@expanded_relative_imgdir@ +if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then + export SQUEAK_PLUGINS="$BIN" +fi # At least on linux LD_LIBRARY_PATH's components must be absolute path names case "$BIN" in /*) PLUGINS="$BIN";;

1 0

Auto Reply: [Vm-dev] [commit] r2501 - CogVM source as per VMMaker.oscog-eem.134.
by michael.haupt＠oracle.com 19 Oct '11

19 Oct '11

I am on vacation until (including) Oct 31, 2011, with occasional low-bandwidth internet connection.

1 0

[commit] r2501 - CogVM source as per VMMaker.oscog-eem.134.
by commits＠squeakvm.org 19 Oct '11

19 Oct '11

Author: eliot Date: 2011-10-19 11:07:48 -0700 (Wed, 19 Oct 2011) New Revision: 2501 Added: branches/Cog/macbuild/SqueakMTFFIPrims/ branches/Cog/macbuild/SqueakMTFFIPrims/Info.plist branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/ branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFIPrims_Prefix.pch Modified: branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h 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/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.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 Log: CogVM source as per VMMaker.oscog-eem.134. Fix remaining bug in context access fixes of VMMaker.oscog-eem.119. stObject:at: and stObject:at:put: need to use stackPointerForMaybeMarriedContext: not fetchStackPointerOf:, since the context's stack pointer may be stale. Fix send trace printing. Interpreter sends need also to be printed. (A better fix is probably to redo sendBreakpoint: but this will serve for now). N.B. this reassigns the sendtrace flag values. Add primitiveNotEquivalent with prim # 169. Added: branches/Cog/macbuild/SqueakMTFFIPrims/Info.plist =================================================================== --- branches/Cog/macbuild/SqueakMTFFIPrims/Info.plist (rev 0) +++ branches/Cog/macbuild/SqueakMTFFIPrims/Info.plist 2011-10-19 18:07:48 UTC (rev 2501) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//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>CFBundleExecutable</key> + <string>SqueakFFIPrims</string> + <key>CFBundleIdentifier</key> + <string>org.squeak.SqueakFFIPrims</string> + <key>CFBundleGetInfoString</key> + <string>SqueakFFIPrims for Squeak</string> + <key>CFBundleName</key> + <string>SqueakFFIPrims for Squeak</string> + <key>CFBundleIconFile</key> + <string>SqueakPlugin.icns</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleSignature</key> + <string>FAST</string> + <key>CFBundleVersion</key> + <string>1.1</string> + <key>CFBundleShortVersionString</key> + <string>1.1</string> + <key>CSResourcesFileMapped</key> + <true/> +</dict> +</plist> Added: branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj (rev 0) +++ branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj 2011-10-19 18:07:48 UTC (rev 2501) @@ -0,0 +1,270 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 44; + objects = { + +/* Begin PBXBuildFile section */ + 458E6DD111C6D5850024C822 /* sqManualSurface.c in Sources */ = {isa = PBXBuildFile; fileRef = 458E6DD011C6D5850024C822 /* sqManualSurface.c */; }; + 730BD72610AA25350023C110 /* SqueakFFIPrims.c in Sources */ = {isa = PBXBuildFile; fileRef = 730BD72510AA25350023C110 /* SqueakFFIPrims.c */; }; + 730BD72810AA26D00023C110 /* sqFFIPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 730BD72710AA26D00023C110 /* sqFFIPlugin.c */; }; + 730BD73110AA277B0023C110 /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 730BD73010AA277B0023C110 /* SqueakPlugin.icns */; }; + 7386749111ED15E500E5B738 /* sqFFITestFuncs.c in Sources */ = {isa = PBXBuildFile; fileRef = 7386749011ED15E500E5B738 /* sqFFITestFuncs.c */; }; + 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; + 458E6DD011C6D5850024C822 /* sqManualSurface.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = sqManualSurface.c; path = ../../platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c; sourceTree = SOURCE_ROOT; }; + 730BD72510AA25350023C110 /* SqueakFFIPrims.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = SqueakFFIPrims.c; path = ../../src/plugins/SqueakFFIPrims/SqueakFFIPrims.c; sourceTree = SOURCE_ROOT; }; + 730BD72710AA26D00023C110 /* sqFFIPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = sqFFIPlugin.c; path = ../../platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c; sourceTree = SOURCE_ROOT; }; + 730BD72910AA26EF0023C110 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; + 730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../src/vm/interp.h; sourceTree = SOURCE_ROOT; }; + 730BD72D10AA27410023C110 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; + 730BD72F10AA27590023C110 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; + 730BD73010AA277B0023C110 /* SqueakPlugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = SqueakPlugin.icns; path = ../resources/ProjectBuilder/SqueakPlugin.icns; sourceTree = SOURCE_ROOT; }; + 733EFEAC10B4D31C00A2FDA5 /* sqFFI.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = sqFFI.h; path = ../../platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h; sourceTree = SOURCE_ROOT; }; + 7386749011ED15E500E5B738 /* sqFFITestFuncs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqFFITestFuncs.c; path = ../../platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c; sourceTree = SOURCE_ROOT; }; + 739A636B10AA442600F87ADB /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; }; + 739A636C10AA444800F87ADB /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; }; + 739BEEE011C96C240093BD8A /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73E2C0B310AA5C4700E80856 /* sqAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqAssert.h; path = ../../platforms/Cross/vm/sqAssert.h; sourceTree = SOURCE_ROOT; }; + 8D576316048677EA00EA77CD /* SqueakFFIPrims.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakFFIPrims.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8D576313048677EA00EA77CD /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 089C166AFE841209C02AAC07 /* SqueakFFI */ = { + isa = PBXGroup; + children = ( + 08FB77AFFE84173DC02AAC07 /* Source */, + 089C167CFE841241C02AAC07 /* Resources */, + 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */, + 19C28FB6FE9D52B211CA2CBB /* Products */, + ); + name = SqueakFFI; + sourceTree = "<group>"; + }; + 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = { + isa = PBXGroup; + children = ( + 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */, + ); + name = "External Frameworks and Libraries"; + sourceTree = "<group>"; + }; + 089C167CFE841241C02AAC07 /* Resources */ = { + isa = PBXGroup; + children = ( + 730BD73010AA277B0023C110 /* SqueakPlugin.icns */, + 8D576317048677EA00EA77CD /* Info.plist */, + ); + name = Resources; + sourceTree = "<group>"; + }; + 08FB77AFFE84173DC02AAC07 /* Source */ = { + isa = PBXGroup; + children = ( + 7386749011ED15E500E5B738 /* sqFFITestFuncs.c */, + 739BEEE011C96C240093BD8A /* sq.h */, + 733EFEAC10B4D31C00A2FDA5 /* sqFFI.h */, + 73E2C0B310AA5C4700E80856 /* sqAssert.h */, + 739A636C10AA444800F87ADB /* sqPlatformSpecific.h */, + 739A636B10AA442600F87ADB /* sqConfig.h */, + 730BD72910AA26EF0023C110 /* config.h */, + 730BD72A10AA26FB0023C110 /* interp.h */, + 730BD72D10AA27410023C110 /* sqMemoryAccess.h */, + 730BD72F10AA27590023C110 /* sqVirtualMachine.h */, + 730BD72710AA26D00023C110 /* sqFFIPlugin.c */, + 730BD72510AA25350023C110 /* SqueakFFIPrims.c */, + 458E6DD011C6D5850024C822 /* sqManualSurface.c */, + ); + name = Source; + sourceTree = "<group>"; + }; + 19C28FB6FE9D52B211CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D576316048677EA00EA77CD /* SqueakFFIPrims.bundle */, + ); + name = Products; + sourceTree = "<group>"; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8D57630D048677EA00EA77CD /* SqueakFFIPrims */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SqueakFFIPrims" */; + buildPhases = ( + 8D57630F048677EA00EA77CD /* Resources */, + 8D576311048677EA00EA77CD /* Sources */, + 8D576313048677EA00EA77CD /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SqueakFFIPrims; + productInstallPath = "$(HOME)/Library/Bundles"; + productName = SqueakFFI; + productReference = 8D576316048677EA00EA77CD /* SqueakFFIPrims.bundle */; + productType = "com.apple.product-type.bundle"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 089C1669FE841209C02AAC07 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "SqueakFFI" */; + compatibilityVersion = "Xcode 3.0"; + hasScannedForEncodings = 1; + mainGroup = 089C166AFE841209C02AAC07 /* SqueakFFI */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8D57630D048677EA00EA77CD /* SqueakFFIPrims */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8D57630F048677EA00EA77CD /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 730BD73110AA277B0023C110 /* SqueakPlugin.icns in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8D576311048677EA00EA77CD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 730BD72610AA25350023C110 /* SqueakFFIPrims.c in Sources */, + 730BD72810AA26D00023C110 /* sqFFIPlugin.c in Sources */, + 458E6DD111C6D5850024C822 /* sqManualSurface.c in Sources */, + 7386749111ED15E500E5B738 /* sqFFITestFuncs.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 1DEB911B08733D790010E9CD /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "COGMTVM=1", + ); + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + PRODUCT_NAME = SqueakFFIPrims; + WRAPPER_EXTENSION = bundle; + ZERO_LINK = YES; + }; + name = Development; + }; + 1DEB911C08733D790010E9CD /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = i386; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_OPTIMIZATION_LEVEL = 2; + GCC_PREPROCESSOR_DEFINITIONS = ( + "COGMTVM=1", + ); + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + PRODUCT_NAME = SqueakFFIPrims; + WRAPPER_EXTENSION = bundle; + }; + name = Deployment; + }; + 1DEB911F08733D790010E9CD /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DEBUGGING_SYMBOLS = full; + GCC_ENABLE_OBJC_EXCEPTIONS = NO; + GCC_MODEL_TUNING = ""; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "COGMTVM=1", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + OTHER_CFLAGS = "-fno-omit-frame-pointer"; + PREBINDING = NO; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + STRIP_INSTALLED_PRODUCT = NO; + }; + name = Development; + }; + 1DEB912008733D790010E9CD /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + GCC_ENABLE_OBJC_EXCEPTIONS = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = ""; + GCC_OPTIMIZATION_LEVEL = 2; + GCC_PREPROCESSOR_DEFINITIONS = ( + "COGMTVM=1", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + OTHER_CFLAGS = "-fno-omit-frame-pointer"; + PREBINDING = NO; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + STRIP_INSTALLED_PRODUCT = NO; + }; + name = Deployment; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SqueakFFIPrims" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1DEB911B08733D790010E9CD /* Development */, + 1DEB911C08733D790010E9CD /* Deployment */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Deployment; + }; + 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "SqueakFFI" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1DEB911F08733D790010E9CD /* Development */, + 1DEB912008733D790010E9CD /* Deployment */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Deployment; + }; +/* End XCConfigurationList section */ + }; + rootObject = 089C1669FE841209C02AAC07 /* Project object */; +} Added: branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFIPrims_Prefix.pch =================================================================== --- branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFIPrims_Prefix.pch (rev 0) +++ branches/Cog/macbuild/SqueakMTFFIPrims/SqueakFFIPrims_Prefix.pch 2011-10-19 18:07:48 UTC (rev 2501) @@ -0,0 +1,5 @@ +// +// Prefix header for all source files of the 'Template' target in the 'Template' project. +// + +#include <Carbon/Carbon.h> Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/nscogsrc/vm/cogit.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa + CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 from - StackToRegisterMappingCogit VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa + StackToRegisterMappingCogit VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -675,6 +675,7 @@ static sqInt genPrimitiveMod(void); static sqInt genPrimitiveMultiply(void); static sqInt genPrimitiveNotEqual(void); +static sqInt genPrimitiveNotEquivalent(void); static sqInt genPrimitiveQuo(void); static sqInt genPrimitiveSize(void); static sqInt genPrimitiveStringAt(void); @@ -1550,6 +1551,7 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, + { genPrimitiveNotEquivalent, 1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -1578,7 +1580,6 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { 0, -1, 0 }, { genFastPrimFail, -1, 0 }, { genFastPrimFail, -1, 0 }, { 0, -1, 0 }, @@ -1621,7 +1622,7 @@ static AbstractInstruction * stackCheckLabel; static AbstractInstruction * stackOverflowCall; static sqInt superSendTrampolines[NumSendTrampolines]; -int traceLinkedSends = 2 /* prim trace log on by default */; +int traceLinkedSends = 8 /* prim trace log on by default */; sqInt traceStores; static char *trampolineAddresses[NumTrampolines*2]; static sqInt trampolineTableIndex; @@ -1644,7 +1645,7 @@ opcodeIndex = labelCounter = annotationIndex = 0; \ } while (0) #define blockStartAt(index) (&blockStarts[index]) -#define breakOnImplicitReceiver() (traceLinkedSends & 16) +#define breakOnImplicitReceiver() (traceLinkedSends & 32) #define ceBaseFrameReturnPC() ceBaseFrameReturnTrampoline #define ceCannotResumePC() ((usqInt)ceCannotResumeTrampoline) #define ceCheckFeatures() ceCheckFeaturesFunction() @@ -1676,11 +1677,12 @@ #define notYetImplemented() warning("not yet implemented") #define numRegArgs() 1 #define printNum(n) printf("%ld", (long) n) -#define printOnTrace() (traceLinkedSends & 8) +#define printOnTrace() (traceLinkedSends & 1) #define print(aString) printf(aString) -#define recordEventTrace() (traceLinkedSends & 4) -#define recordPrimTrace() (traceLinkedSends & 2) -#define recordSendTrace() (traceLinkedSends & 1) +#define recordBlockTrace() (traceLinkedSends & 4) +#define recordEventTrace() (traceLinkedSends & 16) +#define recordPrimTrace() (traceLinkedSends & 8) +#define recordSendTrace() (traceLinkedSends & 2) #define reportError(n) warning("compilation error") #define setCFramePointer(theFP) (CFramePointer = (void *)(theFP)) #define setCStackPointer(theSP) (CStackPointer = (void *)(theSP)) @@ -3581,7 +3583,7 @@ (blockStart->entryLabel = gLabel()); if (needsFrame) { compileBlockFrameBuild(blockStart); - if (recordSendTrace()) { + if (recordBlockTrace()) { CallRT(ceTraceBlockActivationTrampoline); } } @@ -10644,7 +10646,30 @@ return genSmallIntegerComparison(JumpNonZero); } + +/* Receiver and arg in registers. + Stack looks like + return address */ + static sqInt +genPrimitiveNotEquivalent(void) +{ + AbstractInstruction *jumpFalse; + + /* begin CmpR:R: */ + genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg); + /* begin JumpZero: */ + jumpFalse = genoperand(JumpZero, ((sqInt)0)); + annotateobjRef(gMoveCwR(trueObject(), ReceiverResultReg), trueObject()); + /* begin RetN: */ + genoperand(RetN, 0); + jmpTarget(jumpFalse, annotateobjRef(gMoveCwR(falseObject(), ReceiverResultReg), falseObject())); + /* begin RetN: */ + genoperand(RetN, 0); + return 0; +} + +static sqInt genPrimitiveQuo(void) { AbstractInstruction *jumpNotSI; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/nscogsrc/vm/cogit.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa + CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ @@ -109,7 +109,7 @@ /*** Macros ***/ -#define breakOnImplicitReceiver() (traceLinkedSends & 16) +#define breakOnImplicitReceiver() (traceLinkedSends & 32) #define ceBaseFrameReturnPC() ceBaseFrameReturnTrampoline #define ceCannotResumePC() ((usqInt)ceCannotResumeTrampoline) #define ceReturnToInterpreterPC() ((usqInt)ceReturnToInterpreterTrampoline) @@ -120,10 +120,11 @@ #define noCheckEntryOffset() cmNoCheckEntryOffset #define noContextSwitchBlockEntryOffset() blockNoContextSwitchOffset #define numRegArgs() 1 -#define printOnTrace() (traceLinkedSends & 8) -#define recordEventTrace() (traceLinkedSends & 4) -#define recordPrimTrace() (traceLinkedSends & 2) -#define recordSendTrace() (traceLinkedSends & 1) +#define printOnTrace() (traceLinkedSends & 1) +#define recordBlockTrace() (traceLinkedSends & 4) +#define recordEventTrace() (traceLinkedSends & 16) +#define recordPrimTrace() (traceLinkedSends & 8) +#define recordSendTrace() (traceLinkedSends & 2) #define setCFramePointer(theFP) (CFramePointer = (void *)(theFP)) #define setCStackPointer(theSP) (CStackPointer = (void *)(theSP)) #define tryLockVMOwner() (ceTryLockVMOwner() != 0) Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa + CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/nscogsrc/vm/cointerp.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 from - CoInterpreter VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CoInterpreter VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -893,6 +893,7 @@ static void primitiveNoop(void); static void primitiveNotEqual(void); EXPORT(void) primitiveNotEqualLargeIntegers(void); +static void primitiveNotIdentical(void); static void primitiveObjectAt(void); static void primitiveObjectAtPut(void); static void primitiveObjectPointsTo(void); @@ -967,6 +968,7 @@ static void primitiveYield(void); void * primTraceLogAddress(void); usqInt primTraceLogIndexAddress(void); +static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass); static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage); void printAllStacks(void); void printCallStack(void); @@ -1486,7 +1488,7 @@ /* 166 */ primitiveIntegerAtPut, /* 167 */ primitiveYield, /* 168 */ primitiveCopyObject, - /* 169 */ (void (*)(void))0, + /* 169 */ primitiveNotIdentical, /* 170 */ (void (*)(void))0, /* 171 */ (void (*)(void))0, /* 172 */ (void (*)(void))0, @@ -1895,7 +1897,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.133"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.134"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4997,6 +4999,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), GIV(lkupClass)); + /* begin cr */ + printf("\n"); + } } /* begin internalFindNewMethod */ VM_LABEL(0internalFindNewMethod); @@ -11287,21 +11294,21 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt selector; - if (recordSendTrace()) { + if (recordBlockTrace()) { /* begin recordTrace:thing:source: */ selector = (mframeHomeMethod(GIV(framePointer))->methodObject); GIV(traceLog)[GIV(traceLogIndex)] = TraceBlockActivation; GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase + ? longAt(GIV(framePointer) + FoxMFReceiver) + : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); + /* begin cr */ + printf("\n"); + } } - if (printOnTrace()) { - printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase - ? longAt(GIV(framePointer) + FoxMFReceiver) - : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); - /* begin cr */ - printf("\n"); - } } void @@ -11312,29 +11319,30 @@ CogMethod *cogMethod; sqInt selector; + + /* cogit recordSendTrace ifTrue: is implicit; wouldn't compile the call otherwise. */ + cogMethod = ((CogMethod *) ((longAt(GIV(stackPointer))) - (traceLinkedSendOffset()))); - if (recordSendTrace()) { - /* begin recordTrace:thing:source: */ - /* begin fetchClassOf: */ - if ((theReceiver & 1)) { - classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); - goto l1; - } - if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { - classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; - goto l1; - } - else { - classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l1; - } - l1: /* end fetchClassOf: */; - selector = (cogMethod->selector); - GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; - GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; - GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + /* begin recordTrace:thing:source: */ + /* begin fetchClassOf: */ + if ((theReceiver & 1)) { + classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); + goto l1; } + if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { + classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; + goto l1; + } + else { + classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); + goto l1; + } +l1: /* end fetchClassOf: */; + selector = (cogMethod->selector); + GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; + GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; + GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; if (printOnTrace()) { printActivationNameForreceiverisBlockfirstTemporary((cogMethod->methodObject), theReceiver, 0, null); /* begin cr */ @@ -12430,9 +12438,6 @@ /* Return a shallow copy of the given object. May cause GC */ /* Assume: Oop is a real object, not a small integer. Override to assert it's not a married context */ -/* Return a shallow copy of the given object. May cause GC */ -/* Assume: Oop is a real object, not a small integer. - Override to assert it's not a cogged method */ sqInt clone(sqInt obj) @@ -12452,8 +12457,6 @@ sqInt remappedOop; sqInt toIndex; - assert((!(isOopCompiledMethod(obj))) - || (!(methodHasCogMethod(obj)))); assert((!(isContext(obj))) || (!(isMarriedOrWidowedContext(obj)))); assert(isNonIntegerObject(obj)); @@ -26337,10 +26340,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -26417,54 +26419,45 @@ /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l5; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l5; } - l4: /* end fetchClassOfNonInt: */; + l5: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(0stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l5; - } /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l5; + goto l3; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l5: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l3: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ if (fmt <= 4) { value = longAt((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << ShiftForWord)); - goto l3; + goto l4; } if (fmt < 8) { value = positive32BitIntegerFor(long32At((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << 2))); - goto l3; + goto l4; } else { value = (((byteAt((aContext + BaseHeaderSize) + ((index + fixedFields) - 1))) << 1) | 1); - goto l3; + goto l4; } - l3: /* end subscript:with:format: */; + l4: /* end subscript:with:format: */; /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return; } /* begin frameOfMarriedContext: */ @@ -26483,8 +26476,8 @@ ? longAt((spouseFP + FoxCallerSavedIP) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)) : longAt(((spouseFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)))); /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; } @@ -26505,10 +26498,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -26572,43 +26564,34 @@ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l2; + goto l3; } if (fmt < 2) { fixedFields = totalLength; - goto l2; + goto l3; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l3; + goto l4; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l3; + goto l4; } - l3: /* end fetchClassOfNonInt: */; + l4: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; - l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(1stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l4; - } + l3: /* end fixedFieldsOf:format:length: */; /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l4; + goto l2; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l4: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { return (GIV(primFailCode) = PrimErrBadIndex); } @@ -26662,8 +26645,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return null; } /* begin frameOfMarriedContext: */ @@ -26692,8 +26675,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; return null; } @@ -26779,7 +26762,7 @@ (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(2stackPointerForMaybeMarriedContext); + VM_LABEL(0stackPointerForMaybeMarriedContext); if ((((longAt((rcvr + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && (!(isWidowedContext(rcvr)))) { sp2 = stackPointerIndexForFrame(frameOfMarriedContext(rcvr)); @@ -32956,6 +32939,28 @@ } +/* is the receiver/first argument not the same object as the (last) + argument?. pop argumentCount because this can be used as a mirror + primitive. + */ + +static void +primitiveNotIdentical(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt otherObject; + char *sp; + sqInt thisObject; + + otherObject = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + thisObject = longAt(GIV(stackPointer)); + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (thisObject != otherObject + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; +} + + /* Defined for CompiledMethods only */ static void @@ -33244,6 +33249,11 @@ GIV(argumentCount) = arraySize; GIV(messageSelector) = selector; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), actualReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if ((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -33328,6 +33338,11 @@ } l1: /* end fetchClassOf: */; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), newReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if (!((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -37779,6 +37794,90 @@ } static void +printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt class; + sqInt classDict; + sqInt classDictSize; + sqInt currClass; + sqInt header; + sqInt i; + sqInt methClass; + sqInt sz; + + if (((startClass & 3) == 0) + && (((((usqInt)startClass)) >= heapBase) + && (((((usqInt)startClass)) < GIV(freeStart)) + && (((longAt(startClass)) & TypeMask) != HeaderTypeGC)))) { + /* begin findClassForSelector:lookupClass:do: */ + VM_LABEL(0findClassForSelectorlookupClassdo); + currClass = startClass; + do { + classDict = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << ShiftForWord)); + /* begin fetchWordLengthOf: */ + /* begin sizeBitsOf: */ + header = longAt(classDict); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(classDict - (BytesPerWord * 2))) & LongSizeMask + : header & SizeMask); + classDictSize = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; + i = SelectorStart; + while (i < classDictSize) { + if (aSelector == (longAt((classDict + BaseHeaderSize) + (i << ShiftForWord)))) { + methClass = currClass; + + goto l1; + } + i += 1; + } + currClass = longAt((currClass + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); + } while(!(currClass == GIV(nilObj))); + methClass = null; + + l1: /* end findClassForSelector:lookupClass:do: */; + if ((methClass == null) + || (startClass == methClass)) { + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar('>'); + if (!(methClass)) { + printStringOf(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << ShiftForWord))); + print(" "); + } + } + else { + printNameOfClasscount(startClass, 5); + /* begin printChar: */ + putchar('('); + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar(')'); + /* begin printChar: */ + putchar('>'); + } + } + else { + print("INVALID CLASS"); + } + if (((aSelector & 1)) + || (((aSelector & 3) == 0) + && (((((usqInt)aSelector)) >= heapBase) + && (((((usqInt)aSelector)) < GIV(freeStart)) + && (((longAt(aSelector)) & TypeMask) != HeaderTypeGC))))) { + if (((aSelector & 1) == 0) + && (((((usqInt) (longAt(aSelector))) >> 8) & 15) >= 8)) { + printStringOf(aSelector); + } + else { + printOopShort(aSelector); + } + } + else { + print("INVALID SELECTOR"); + } +} + +static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; @@ -43180,6 +43279,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -43196,17 +43296,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -43232,15 +43332,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(1stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -43283,6 +43392,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -43300,17 +43410,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -43336,15 +43446,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(2stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/nscogsrc/vm/cointerp.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 from - CoInterpreter VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CoInterpreter VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -896,6 +896,7 @@ static void primitiveNoop(void); static void primitiveNotEqual(void); EXPORT(void) primitiveNotEqualLargeIntegers(void); +static void primitiveNotIdentical(void); static void primitiveObjectAt(void); static void primitiveObjectAtPut(void); static void primitiveObjectPointsTo(void); @@ -970,6 +971,7 @@ static void primitiveYield(void); void * primTraceLogAddress(void); usqInt primTraceLogIndexAddress(void); +static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass); static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage); void printAllStacks(void); void printCallStack(void); @@ -1489,7 +1491,7 @@ /* 166 */ primitiveIntegerAtPut, /* 167 */ primitiveYield, /* 168 */ primitiveCopyObject, - /* 169 */ (void (*)(void))0, + /* 169 */ primitiveNotIdentical, /* 170 */ (void (*)(void))0, /* 171 */ (void (*)(void))0, /* 172 */ (void (*)(void))0, @@ -1898,7 +1900,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.133"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.134"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5001,6 +5003,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), GIV(lkupClass)); + /* begin cr */ + printf("\n"); + } } /* begin internalFindNewMethod */ VM_LABEL(0internalFindNewMethod); @@ -11291,21 +11298,21 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt selector; - if (recordSendTrace()) { + if (recordBlockTrace()) { /* begin recordTrace:thing:source: */ selector = (mframeHomeMethod(GIV(framePointer))->methodObject); GIV(traceLog)[GIV(traceLogIndex)] = TraceBlockActivation; GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase + ? longAt(GIV(framePointer) + FoxMFReceiver) + : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); + /* begin cr */ + printf("\n"); + } } - if (printOnTrace()) { - printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase - ? longAt(GIV(framePointer) + FoxMFReceiver) - : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); - /* begin cr */ - printf("\n"); - } } void @@ -11316,29 +11323,30 @@ CogMethod *cogMethod; sqInt selector; + + /* cogit recordSendTrace ifTrue: is implicit; wouldn't compile the call otherwise. */ + cogMethod = ((CogMethod *) ((longAt(GIV(stackPointer))) - (traceLinkedSendOffset()))); - if (recordSendTrace()) { - /* begin recordTrace:thing:source: */ - /* begin fetchClassOf: */ - if ((theReceiver & 1)) { - classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); - goto l1; - } - if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { - classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; - goto l1; - } - else { - classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l1; - } - l1: /* end fetchClassOf: */; - selector = (cogMethod->selector); - GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; - GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; - GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + /* begin recordTrace:thing:source: */ + /* begin fetchClassOf: */ + if ((theReceiver & 1)) { + classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); + goto l1; } + if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { + classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; + goto l1; + } + else { + classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); + goto l1; + } +l1: /* end fetchClassOf: */; + selector = (cogMethod->selector); + GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; + GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; + GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; if (printOnTrace()) { printActivationNameForreceiverisBlockfirstTemporary((cogMethod->methodObject), theReceiver, 0, null); /* begin cr */ @@ -12434,9 +12442,6 @@ /* Return a shallow copy of the given object. May cause GC */ /* Assume: Oop is a real object, not a small integer. Override to assert it's not a married context */ -/* Return a shallow copy of the given object. May cause GC */ -/* Assume: Oop is a real object, not a small integer. - Override to assert it's not a cogged method */ sqInt clone(sqInt obj) @@ -12456,8 +12461,6 @@ sqInt remappedOop; sqInt toIndex; - assert((!(isOopCompiledMethod(obj))) - || (!(methodHasCogMethod(obj)))); assert((!(isContext(obj))) || (!(isMarriedOrWidowedContext(obj)))); assert(isNonIntegerObject(obj)); @@ -26341,10 +26344,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -26421,54 +26423,45 @@ /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l5; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l5; } - l4: /* end fetchClassOfNonInt: */; + l5: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(0stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l5; - } /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l5; + goto l3; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l5: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l3: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ if (fmt <= 4) { value = longAt((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << ShiftForWord)); - goto l3; + goto l4; } if (fmt < 8) { value = positive32BitIntegerFor(long32At((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << 2))); - goto l3; + goto l4; } else { value = (((byteAt((aContext + BaseHeaderSize) + ((index + fixedFields) - 1))) << 1) | 1); - goto l3; + goto l4; } - l3: /* end subscript:with:format: */; + l4: /* end subscript:with:format: */; /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return; } /* begin frameOfMarriedContext: */ @@ -26487,8 +26480,8 @@ ? longAt((spouseFP + FoxCallerSavedIP) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)) : longAt(((spouseFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)))); /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; } @@ -26509,10 +26502,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -26576,43 +26568,34 @@ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l2; + goto l3; } if (fmt < 2) { fixedFields = totalLength; - goto l2; + goto l3; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l3; + goto l4; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l3; + goto l4; } - l3: /* end fetchClassOfNonInt: */; + l4: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; - l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(1stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l4; - } + l3: /* end fixedFieldsOf:format:length: */; /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l4; + goto l2; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l4: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { return (GIV(primFailCode) = PrimErrBadIndex); } @@ -26666,8 +26649,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return null; } /* begin frameOfMarriedContext: */ @@ -26696,8 +26679,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; return null; } @@ -26783,7 +26766,7 @@ (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(2stackPointerForMaybeMarriedContext); + VM_LABEL(0stackPointerForMaybeMarriedContext); if ((((longAt((rcvr + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && (!(isWidowedContext(rcvr)))) { sp2 = stackPointerIndexForFrame(frameOfMarriedContext(rcvr)); @@ -32960,6 +32943,28 @@ } +/* is the receiver/first argument not the same object as the (last) + argument?. pop argumentCount because this can be used as a mirror + primitive. + */ + +static void +primitiveNotIdentical(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt otherObject; + char *sp; + sqInt thisObject; + + otherObject = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + thisObject = longAt(GIV(stackPointer)); + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (thisObject != otherObject + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; +} + + /* Defined for CompiledMethods only */ static void @@ -33248,6 +33253,11 @@ GIV(argumentCount) = arraySize; GIV(messageSelector) = selector; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), actualReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if ((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -33332,6 +33342,11 @@ } l1: /* end fetchClassOf: */; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), newReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if (!((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -37783,6 +37798,90 @@ } static void +printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt class; + sqInt classDict; + sqInt classDictSize; + sqInt currClass; + sqInt header; + sqInt i; + sqInt methClass; + sqInt sz; + + if (((startClass & 3) == 0) + && (((((usqInt)startClass)) >= heapBase) + && (((((usqInt)startClass)) < GIV(freeStart)) + && (((longAt(startClass)) & TypeMask) != HeaderTypeGC)))) { + /* begin findClassForSelector:lookupClass:do: */ + VM_LABEL(0findClassForSelectorlookupClassdo); + currClass = startClass; + do { + classDict = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << ShiftForWord)); + /* begin fetchWordLengthOf: */ + /* begin sizeBitsOf: */ + header = longAt(classDict); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(classDict - (BytesPerWord * 2))) & LongSizeMask + : header & SizeMask); + classDictSize = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; + i = SelectorStart; + while (i < classDictSize) { + if (aSelector == (longAt((classDict + BaseHeaderSize) + (i << ShiftForWord)))) { + methClass = currClass; + + goto l1; + } + i += 1; + } + currClass = longAt((currClass + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); + } while(!(currClass == GIV(nilObj))); + methClass = null; + + l1: /* end findClassForSelector:lookupClass:do: */; + if ((methClass == null) + || (startClass == methClass)) { + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar('>'); + if (!(methClass)) { + printStringOf(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << ShiftForWord))); + print(" "); + } + } + else { + printNameOfClasscount(startClass, 5); + /* begin printChar: */ + putchar('('); + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar(')'); + /* begin printChar: */ + putchar('>'); + } + } + else { + print("INVALID CLASS"); + } + if (((aSelector & 1)) + || (((aSelector & 3) == 0) + && (((((usqInt)aSelector)) >= heapBase) + && (((((usqInt)aSelector)) < GIV(freeStart)) + && (((longAt(aSelector)) & TypeMask) != HeaderTypeGC))))) { + if (((aSelector & 1) == 0) + && (((((usqInt) (longAt(aSelector))) >> 8) & 15) >= 8)) { + printStringOf(aSelector); + } + else { + printOopShort(aSelector); + } + } + else { + print("INVALID SELECTOR"); + } +} + +static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; @@ -43184,6 +43283,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -43200,17 +43300,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -43236,15 +43336,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(1stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -43287,6 +43396,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -43304,17 +43414,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -43340,15 +43450,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(2stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/nscogsrc/vm/interp.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Oct 9 10:12:20 PDT 2011 + Wed Oct 19 11:05:54 PDT 2011 Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -1212,7 +1212,7 @@ #endif /* STACKVM */ #if COGVM { ARG_UINT, &desiredCogCodeSize, "-codesize:"}, /* machine code memory to use */ - { ARG_FLAG, &traceLinkedSends, "-sendtrace" }, /* trace sends in log */ + { ARG_UINT, &traceLinkedSends, "-sendtrace:" }, /* trace sends in log */ { ARG_INT, &traceLinkedSends, "-trace:" }, /* trace sends in log */ { ARG_FLAG, &traceStores, "-tracestores" }, /* assert-check stores */ { ARG_UINT, &debugPrimCallStackOffset, "-dpcso:"}, /* debug prim call stack offset */ Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/cogit.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa + CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 from - StackToRegisterMappingCogit VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa + StackToRegisterMappingCogit VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -670,6 +670,7 @@ static sqInt genPrimitiveMod(void); static sqInt genPrimitiveMultiply(void); static sqInt genPrimitiveNotEqual(void); +static sqInt genPrimitiveNotEquivalent(void); static sqInt genPrimitiveQuo(void); static sqInt genPrimitiveSize(void); static sqInt genPrimitiveStringAt(void); @@ -1533,6 +1534,7 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, + { genPrimitiveNotEquivalent, 1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -1561,7 +1563,6 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { 0, -1, 0 }, { genFastPrimFail, -1, 0 }, { genFastPrimFail, -1, 0 }, { 0, -1, 0 }, @@ -1604,7 +1605,7 @@ static AbstractInstruction * stackCheckLabel; static AbstractInstruction * stackOverflowCall; static sqInt superSendTrampolines[NumSendTrampolines]; -int traceLinkedSends = 2 /* prim trace log on by default */; +int traceLinkedSends = 8 /* prim trace log on by default */; sqInt traceStores; static char *trampolineAddresses[NumTrampolines*2]; static sqInt trampolineTableIndex; @@ -1627,7 +1628,7 @@ opcodeIndex = labelCounter = annotationIndex = 0; \ } while (0) #define blockStartAt(index) (&blockStarts[index]) -#define breakOnImplicitReceiver() (traceLinkedSends & 16) +#define breakOnImplicitReceiver() (traceLinkedSends & 32) #define ceBaseFrameReturnPC() ceBaseFrameReturnTrampoline #define ceCannotResumePC() ((usqInt)ceCannotResumeTrampoline) #define ceCheckFeatures() ceCheckFeaturesFunction() @@ -1659,11 +1660,12 @@ #define notYetImplemented() warning("not yet implemented") #define numRegArgs() 1 #define printNum(n) printf("%ld", (long) n) -#define printOnTrace() (traceLinkedSends & 8) +#define printOnTrace() (traceLinkedSends & 1) #define print(aString) printf(aString) -#define recordEventTrace() (traceLinkedSends & 4) -#define recordPrimTrace() (traceLinkedSends & 2) -#define recordSendTrace() (traceLinkedSends & 1) +#define recordBlockTrace() (traceLinkedSends & 4) +#define recordEventTrace() (traceLinkedSends & 16) +#define recordPrimTrace() (traceLinkedSends & 8) +#define recordSendTrace() (traceLinkedSends & 2) #define reportError(n) warning("compilation error") #define setCFramePointer(theFP) (CFramePointer = (void *)(theFP)) #define setCStackPointer(theSP) (CStackPointer = (void *)(theSP)) @@ -3504,7 +3506,7 @@ (blockStart->entryLabel = gLabel()); if (needsFrame) { compileBlockFrameBuild(blockStart); - if (recordSendTrace()) { + if (recordBlockTrace()) { CallRT(ceTraceBlockActivationTrampoline); } } @@ -10487,7 +10489,30 @@ return genSmallIntegerComparison(JumpNonZero); } + +/* Receiver and arg in registers. + Stack looks like + return address */ + static sqInt +genPrimitiveNotEquivalent(void) +{ + AbstractInstruction *jumpFalse; + + /* begin CmpR:R: */ + genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg); + /* begin JumpZero: */ + jumpFalse = genoperand(JumpZero, ((sqInt)0)); + annotateobjRef(gMoveCwR(trueObject(), ReceiverResultReg), trueObject()); + /* begin RetN: */ + genoperand(RetN, 0); + jmpTarget(jumpFalse, annotateobjRef(gMoveCwR(falseObject(), ReceiverResultReg), falseObject())); + /* begin RetN: */ + genoperand(RetN, 0); + return 0; +} + +static sqInt genPrimitiveQuo(void) { AbstractInstruction *jumpNotSI; Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/cogit.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa + CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ @@ -108,7 +108,7 @@ /*** Macros ***/ -#define breakOnImplicitReceiver() (traceLinkedSends & 16) +#define breakOnImplicitReceiver() (traceLinkedSends & 32) #define ceBaseFrameReturnPC() ceBaseFrameReturnTrampoline #define ceCannotResumePC() ((usqInt)ceCannotResumeTrampoline) #define ceReturnToInterpreterPC() ((usqInt)ceReturnToInterpreterTrampoline) @@ -119,10 +119,11 @@ #define noCheckEntryOffset() cmNoCheckEntryOffset #define noContextSwitchBlockEntryOffset() blockNoContextSwitchOffset #define numRegArgs() 1 -#define printOnTrace() (traceLinkedSends & 8) -#define recordEventTrace() (traceLinkedSends & 4) -#define recordPrimTrace() (traceLinkedSends & 2) -#define recordSendTrace() (traceLinkedSends & 1) +#define printOnTrace() (traceLinkedSends & 1) +#define recordBlockTrace() (traceLinkedSends & 4) +#define recordEventTrace() (traceLinkedSends & 16) +#define recordPrimTrace() (traceLinkedSends & 8) +#define recordSendTrace() (traceLinkedSends & 2) #define setCFramePointer(theFP) (CFramePointer = (void *)(theFP)) #define setCStackPointer(theSP) (CStackPointer = (void *)(theSP)) #define tryLockVMOwner() (ceTryLockVMOwner() != 0) Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/cogmethod.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.132 uuid: bd35186a-b5f6-490a-ad8b-2a9c487674fa + CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/cointerp.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 from - CoInterpreter VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CoInterpreter VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -884,6 +884,7 @@ static void primitiveNoop(void); static void primitiveNotEqual(void); EXPORT(void) primitiveNotEqualLargeIntegers(void); +static void primitiveNotIdentical(void); static void primitiveObjectAt(void); static void primitiveObjectAtPut(void); static void primitiveObjectPointsTo(void); @@ -958,6 +959,7 @@ static void primitiveYield(void); void * primTraceLogAddress(void); usqInt primTraceLogIndexAddress(void); +static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass); static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage); void printAllStacks(void); void printCallStack(void); @@ -1143,8 +1145,8 @@ _iss sqInt nilObj; _iss usqInt instructionPointer; _iss sqInt argumentCount; +_iss usqInt freeStart; _iss usqInt method; -_iss usqInt freeStart; _iss usqInt newMethod; _iss sqInt messageSelector; _iss StackPage * pages; @@ -1477,7 +1479,7 @@ /* 166 */ primitiveIntegerAtPut, /* 167 */ primitiveYield, /* 168 */ primitiveCopyObject, - /* 169 */ (void (*)(void))0, + /* 169 */ primitiveNotIdentical, /* 170 */ (void (*)(void))0, /* 171 */ (void (*)(void))0, /* 172 */ (void (*)(void))0, @@ -1886,7 +1888,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.133]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.134]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4772,6 +4774,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), GIV(lkupClass)); + /* begin cr */ + printf("\n"); + } } /* begin internalFindNewMethod */ VM_LABEL(0internalFindNewMethod); @@ -10908,21 +10915,21 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt selector; - if (recordSendTrace()) { + if (recordBlockTrace()) { /* begin recordTrace:thing:source: */ selector = (mframeHomeMethod(GIV(framePointer))->methodObject); GIV(traceLog)[GIV(traceLogIndex)] = TraceBlockActivation; GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase + ? longAt(GIV(framePointer) + FoxMFReceiver) + : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); + /* begin cr */ + printf("\n"); + } } - if (printOnTrace()) { - printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase - ? longAt(GIV(framePointer) + FoxMFReceiver) - : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); - /* begin cr */ - printf("\n"); - } } void @@ -10933,29 +10940,30 @@ CogMethod *cogMethod; sqInt selector; + + /* cogit recordSendTrace ifTrue: is implicit; wouldn't compile the call otherwise. */ + cogMethod = ((CogMethod *) ((longAt(GIV(stackPointer))) - (traceLinkedSendOffset()))); - if (recordSendTrace()) { - /* begin recordTrace:thing:source: */ - /* begin fetchClassOf: */ - if ((theReceiver & 1)) { - classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); - goto l1; - } - if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { - classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; - goto l1; - } - else { - classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l1; - } - l1: /* end fetchClassOf: */; - selector = (cogMethod->selector); - GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; - GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; - GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + /* begin recordTrace:thing:source: */ + /* begin fetchClassOf: */ + if ((theReceiver & 1)) { + classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); + goto l1; } + if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { + classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; + goto l1; + } + else { + classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); + goto l1; + } +l1: /* end fetchClassOf: */; + selector = (cogMethod->selector); + GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; + GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; + GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; if (printOnTrace()) { printActivationNameForreceiverisBlockfirstTemporary((cogMethod->methodObject), theReceiver, 0, null); /* begin cr */ @@ -12051,9 +12059,6 @@ /* Return a shallow copy of the given object. May cause GC */ /* Assume: Oop is a real object, not a small integer. Override to assert it's not a married context */ -/* Return a shallow copy of the given object. May cause GC */ -/* Assume: Oop is a real object, not a small integer. - Override to assert it's not a cogged method */ sqInt clone(sqInt obj) @@ -12073,8 +12078,6 @@ sqInt remappedOop; sqInt toIndex; - assert((!(isOopCompiledMethod(obj))) - || (!(methodHasCogMethod(obj)))); assert((!(isContext(obj))) || (!(isMarriedOrWidowedContext(obj)))); assert(isNonIntegerObject(obj)); @@ -25655,10 +25658,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -25735,54 +25737,45 @@ /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l5; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l5; } - l4: /* end fetchClassOfNonInt: */; + l5: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(0stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l5; - } /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l5; + goto l3; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l5: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l3: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ if (fmt <= 4) { value = longAt((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << ShiftForWord)); - goto l3; + goto l4; } if (fmt < 8) { value = positive32BitIntegerFor(long32At((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << 2))); - goto l3; + goto l4; } else { value = (((byteAt((aContext + BaseHeaderSize) + ((index + fixedFields) - 1))) << 1) | 1); - goto l3; + goto l4; } - l3: /* end subscript:with:format: */; + l4: /* end subscript:with:format: */; /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return; } /* begin frameOfMarriedContext: */ @@ -25801,8 +25794,8 @@ ? longAt((spouseFP + FoxCallerSavedIP) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)) : longAt(((spouseFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)))); /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; } @@ -25823,10 +25816,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -25890,43 +25882,34 @@ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l2; + goto l3; } if (fmt < 2) { fixedFields = totalLength; - goto l2; + goto l3; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l3; + goto l4; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l3; + goto l4; } - l3: /* end fetchClassOfNonInt: */; + l4: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; - l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(1stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l4; - } + l3: /* end fixedFieldsOf:format:length: */; /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l4; + goto l2; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l4: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { return (GIV(primFailCode) = PrimErrBadIndex); } @@ -25980,8 +25963,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return null; } /* begin frameOfMarriedContext: */ @@ -26010,8 +25993,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; return null; } @@ -26097,7 +26080,7 @@ (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(2stackPointerForMaybeMarriedContext); + VM_LABEL(0stackPointerForMaybeMarriedContext); if ((((longAt((rcvr + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && (!(isWidowedContext(rcvr)))) { sp2 = stackPointerIndexForFrame(frameOfMarriedContext(rcvr)); @@ -32274,6 +32257,28 @@ } +/* is the receiver/first argument not the same object as the (last) + argument?. pop argumentCount because this can be used as a mirror + primitive. + */ + +static void +primitiveNotIdentical(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt otherObject; + char *sp; + sqInt thisObject; + + otherObject = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + thisObject = longAt(GIV(stackPointer)); + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (thisObject != otherObject + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; +} + + /* Defined for CompiledMethods only */ static void @@ -32562,6 +32567,11 @@ GIV(argumentCount) = arraySize; GIV(messageSelector) = selector; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), actualReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if ((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -32646,6 +32656,11 @@ } l1: /* end fetchClassOf: */; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), newReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if (!((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -37097,6 +37112,90 @@ } static void +printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt class; + sqInt classDict; + sqInt classDictSize; + sqInt currClass; + sqInt header; + sqInt i; + sqInt methClass; + sqInt sz; + + if (((startClass & 3) == 0) + && (((((usqInt)startClass)) >= heapBase) + && (((((usqInt)startClass)) < GIV(freeStart)) + && (((longAt(startClass)) & TypeMask) != HeaderTypeGC)))) { + /* begin findClassForSelector:lookupClass:do: */ + VM_LABEL(0findClassForSelectorlookupClassdo); + currClass = startClass; + do { + classDict = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << ShiftForWord)); + /* begin fetchWordLengthOf: */ + /* begin sizeBitsOf: */ + header = longAt(classDict); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(classDict - (BytesPerWord * 2))) & LongSizeMask + : header & SizeMask); + classDictSize = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; + i = SelectorStart; + while (i < classDictSize) { + if (aSelector == (longAt((classDict + BaseHeaderSize) + (i << ShiftForWord)))) { + methClass = currClass; + + goto l1; + } + i += 1; + } + currClass = longAt((currClass + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); + } while(!(currClass == GIV(nilObj))); + methClass = null; + + l1: /* end findClassForSelector:lookupClass:do: */; + if ((methClass == null) + || (startClass == methClass)) { + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar('>'); + if (!(methClass)) { + printStringOf(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << ShiftForWord))); + print(" "); + } + } + else { + printNameOfClasscount(startClass, 5); + /* begin printChar: */ + putchar('('); + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar(')'); + /* begin printChar: */ + putchar('>'); + } + } + else { + print("INVALID CLASS"); + } + if (((aSelector & 1)) + || (((aSelector & 3) == 0) + && (((((usqInt)aSelector)) >= heapBase) + && (((((usqInt)aSelector)) < GIV(freeStart)) + && (((longAt(aSelector)) & TypeMask) != HeaderTypeGC))))) { + if (((aSelector & 1) == 0) + && (((((usqInt) (longAt(aSelector))) >> 8) & 15) >= 8)) { + printStringOf(aSelector); + } + else { + printOopShort(aSelector); + } + } + else { + print("INVALID SELECTOR"); + } +} + +static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; @@ -42498,6 +42597,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -42514,17 +42614,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -42550,15 +42650,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(1stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -42601,6 +42710,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -42618,17 +42728,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -42654,15 +42764,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(2stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/cointerp.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/cointerpmt.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 from - CoInterpreterMT VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CoInterpreterMT VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -947,6 +947,7 @@ static void primitiveNoop(void); static void primitiveNotEqual(void); EXPORT(void) primitiveNotEqualLargeIntegers(void); +static void primitiveNotIdentical(void); static void primitiveObjectAt(void); static void primitiveObjectAtPut(void); static void primitiveObjectPointsTo(void); @@ -1024,6 +1025,7 @@ static void primitiveYield(void); void * primTraceLogAddress(void); usqInt primTraceLogIndexAddress(void); +static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass); static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage); void printAllStacks(void); void printCallStack(void); @@ -1226,8 +1228,8 @@ _iss sqInt nilObj; _iss usqInt instructionPointer; _iss sqInt argumentCount; +_iss usqInt freeStart; _iss usqInt method; -_iss usqInt freeStart; _iss usqInt newMethod; _iss usqInt youngStart; _iss sqInt messageSelector; @@ -1577,7 +1579,7 @@ /* 166 */ primitiveIntegerAtPut, /* 167 */ primitiveYield, /* 168 */ primitiveCopyObject, - /* 169 */ (void (*)(void))0, + /* 169 */ primitiveNotIdentical, /* 170 */ (void (*)(void))0, /* 171 */ (void (*)(void))0, /* 172 */ (void (*)(void))0, @@ -1986,7 +1988,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.133]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.134]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -4874,6 +4876,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = (TraceIsFromInterpreter + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), GIV(lkupClass)); + /* begin cr */ + printf("\n"); + } } /* begin internalFindNewMethod */ VM_LABEL(0internalFindNewMethod); @@ -11255,21 +11262,21 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt selector; - if (recordSendTrace()) { + if (recordBlockTrace()) { /* begin recordTrace:thing:source: */ selector = (mframeHomeMethod(GIV(framePointer))->methodObject); GIV(traceLog)[GIV(traceLogIndex)] = TraceBlockActivation; GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; GIV(traceLog)[GIV(traceLogIndex) + 2] = (TraceIsFromMachineCode + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase + ? longAt(GIV(framePointer) + FoxMFReceiver) + : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); + /* begin cr */ + printf("\n"); + } } - if (printOnTrace()) { - printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase - ? longAt(GIV(framePointer) + FoxMFReceiver) - : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); - /* begin cr */ - printf("\n"); - } } void @@ -11280,29 +11287,30 @@ CogMethod *cogMethod; sqInt selector; + + /* cogit recordSendTrace ifTrue: is implicit; wouldn't compile the call otherwise. */ + cogMethod = ((CogMethod *) ((longAt(GIV(stackPointer))) - (traceLinkedSendOffset()))); - if (recordSendTrace()) { - /* begin recordTrace:thing:source: */ - /* begin fetchClassOf: */ - if ((theReceiver & 1)) { - classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); - goto l1; - } - if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { - classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; - goto l1; - } - else { - classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l1; - } - l1: /* end fetchClassOf: */; - selector = (cogMethod->selector); - GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; - GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; - GIV(traceLog)[GIV(traceLogIndex) + 2] = (TraceIsFromMachineCode + (((usqInt) (getVMOwner()) << 16))); - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + /* begin recordTrace:thing:source: */ + /* begin fetchClassOf: */ + if ((theReceiver & 1)) { + classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); + goto l1; } + if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { + classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; + goto l1; + } + else { + classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); + goto l1; + } +l1: /* end fetchClassOf: */; + selector = (cogMethod->selector); + GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; + GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; + GIV(traceLog)[GIV(traceLogIndex) + 2] = (TraceIsFromMachineCode + (((usqInt) (getVMOwner()) << 16))); + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; if (printOnTrace()) { printActivationNameForreceiverisBlockfirstTemporary((cogMethod->methodObject), theReceiver, 0, null); /* begin cr */ @@ -12467,9 +12475,6 @@ /* Return a shallow copy of the given object. May cause GC */ /* Assume: Oop is a real object, not a small integer. Override to assert it's not a married context */ -/* Return a shallow copy of the given object. May cause GC */ -/* Assume: Oop is a real object, not a small integer. - Override to assert it's not a cogged method */ sqInt clone(sqInt obj) @@ -12489,8 +12494,6 @@ sqInt remappedOop; sqInt toIndex; - assert((!(isOopCompiledMethod(obj))) - || (!(methodHasCogMethod(obj)))); assert((!(isContext(obj))) || (!(isMarriedOrWidowedContext(obj)))); assert(isNonIntegerObject(obj)); @@ -26864,10 +26867,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -26944,54 +26946,45 @@ /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l5; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l5; } - l4: /* end fetchClassOfNonInt: */; + l5: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(0stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l5; - } /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l5; + goto l3; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l5: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l3: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ if (fmt <= 4) { value = longAt((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << ShiftForWord)); - goto l3; + goto l4; } if (fmt < 8) { value = positive32BitIntegerFor(long32At((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << 2))); - goto l3; + goto l4; } else { value = (((byteAt((aContext + BaseHeaderSize) + ((index + fixedFields) - 1))) << 1) | 1); - goto l3; + goto l4; } - l3: /* end subscript:with:format: */; + l4: /* end subscript:with:format: */; /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return; } /* begin frameOfMarriedContext: */ @@ -27010,8 +27003,8 @@ ? longAt((spouseFP + FoxCallerSavedIP) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)) : longAt(((spouseFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)))); /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; } @@ -27032,10 +27025,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -27099,43 +27091,34 @@ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l2; + goto l3; } if (fmt < 2) { fixedFields = totalLength; - goto l2; + goto l3; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l3; + goto l4; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l3; + goto l4; } - l3: /* end fetchClassOfNonInt: */; + l4: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; - l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(1stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l4; - } + l3: /* end fixedFieldsOf:format:length: */; /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l4; + goto l2; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l4: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { return (GIV(primFailCode) = PrimErrBadIndex); } @@ -27189,8 +27172,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return null; } /* begin frameOfMarriedContext: */ @@ -27219,8 +27202,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; return null; } @@ -27306,7 +27289,7 @@ (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(2stackPointerForMaybeMarriedContext); + VM_LABEL(0stackPointerForMaybeMarriedContext); if ((((longAt((rcvr + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && (!(isWidowedContext(rcvr)))) { sp2 = stackPointerIndexForFrame(frameOfMarriedContext(rcvr)); @@ -33483,6 +33466,28 @@ } +/* is the receiver/first argument not the same object as the (last) + argument?. pop argumentCount because this can be used as a mirror + primitive. + */ + +static void +primitiveNotIdentical(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt otherObject; + char *sp; + sqInt thisObject; + + otherObject = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + thisObject = longAt(GIV(stackPointer)); + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (thisObject != otherObject + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; +} + + /* Defined for CompiledMethods only */ static void @@ -33771,6 +33776,11 @@ GIV(argumentCount) = arraySize; GIV(messageSelector) = selector; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), actualReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if ((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -33855,6 +33865,11 @@ } l1: /* end fetchClassOf: */; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), newReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if (!((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -38424,6 +38439,90 @@ } static void +printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt class; + sqInt classDict; + sqInt classDictSize; + sqInt currClass; + sqInt header; + sqInt i; + sqInt methClass; + sqInt sz; + + if (((startClass & 3) == 0) + && (((((usqInt)startClass)) >= heapBase) + && (((((usqInt)startClass)) < GIV(freeStart)) + && (((longAt(startClass)) & TypeMask) != HeaderTypeGC)))) { + /* begin findClassForSelector:lookupClass:do: */ + VM_LABEL(0findClassForSelectorlookupClassdo); + currClass = startClass; + do { + classDict = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << ShiftForWord)); + /* begin fetchWordLengthOf: */ + /* begin sizeBitsOf: */ + header = longAt(classDict); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(classDict - (BytesPerWord * 2))) & LongSizeMask + : header & SizeMask); + classDictSize = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; + i = SelectorStart; + while (i < classDictSize) { + if (aSelector == (longAt((classDict + BaseHeaderSize) + (i << ShiftForWord)))) { + methClass = currClass; + + goto l1; + } + i += 1; + } + currClass = longAt((currClass + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); + } while(!(currClass == GIV(nilObj))); + methClass = null; + + l1: /* end findClassForSelector:lookupClass:do: */; + if ((methClass == null) + || (startClass == methClass)) { + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar('>'); + if (!(methClass)) { + printStringOf(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << ShiftForWord))); + print(" "); + } + } + else { + printNameOfClasscount(startClass, 5); + /* begin printChar: */ + putchar('('); + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar(')'); + /* begin printChar: */ + putchar('>'); + } + } + else { + print("INVALID CLASS"); + } + if (((aSelector & 1)) + || (((aSelector & 3) == 0) + && (((((usqInt)aSelector)) >= heapBase) + && (((((usqInt)aSelector)) < GIV(freeStart)) + && (((longAt(aSelector)) & TypeMask) != HeaderTypeGC))))) { + if (((aSelector & 1) == 0) + && (((((usqInt) (longAt(aSelector))) >> 8) & 15) >= 8)) { + printStringOf(aSelector); + } + else { + printOopShort(aSelector); + } + } + else { + print("INVALID SELECTOR"); + } +} + +static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; @@ -43996,6 +44095,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -44012,17 +44112,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -44048,15 +44148,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(1stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -44099,6 +44208,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -44116,17 +44226,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -44152,15 +44262,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(2stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/cointerpmt.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 from - CoInterpreter VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CoInterpreter VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -887,6 +887,7 @@ static void primitiveNoop(void); static void primitiveNotEqual(void); EXPORT(void) primitiveNotEqualLargeIntegers(void); +static void primitiveNotIdentical(void); static void primitiveObjectAt(void); static void primitiveObjectAtPut(void); static void primitiveObjectPointsTo(void); @@ -961,6 +962,7 @@ static void primitiveYield(void); void * primTraceLogAddress(void); usqInt primTraceLogIndexAddress(void); +static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass); static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage); void printAllStacks(void); void printCallStack(void); @@ -1146,8 +1148,8 @@ _iss sqInt nilObj; _iss usqInt instructionPointer; _iss sqInt argumentCount; +_iss usqInt freeStart; _iss usqInt method; -_iss usqInt freeStart; _iss usqInt newMethod; _iss sqInt messageSelector; _iss StackPage * pages; @@ -1480,7 +1482,7 @@ /* 166 */ primitiveIntegerAtPut, /* 167 */ primitiveYield, /* 168 */ primitiveCopyObject, - /* 169 */ (void (*)(void))0, + /* 169 */ primitiveNotIdentical, /* 170 */ (void (*)(void))0, /* 171 */ (void (*)(void))0, /* 172 */ (void (*)(void))0, @@ -1889,7 +1891,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.133]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.134]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4776,6 +4778,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), GIV(lkupClass)); + /* begin cr */ + printf("\n"); + } } /* begin internalFindNewMethod */ VM_LABEL(0internalFindNewMethod); @@ -10912,21 +10919,21 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt selector; - if (recordSendTrace()) { + if (recordBlockTrace()) { /* begin recordTrace:thing:source: */ selector = (mframeHomeMethod(GIV(framePointer))->methodObject); GIV(traceLog)[GIV(traceLogIndex)] = TraceBlockActivation; GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase + ? longAt(GIV(framePointer) + FoxMFReceiver) + : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); + /* begin cr */ + printf("\n"); + } } - if (printOnTrace()) { - printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase - ? longAt(GIV(framePointer) + FoxMFReceiver) - : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); - /* begin cr */ - printf("\n"); - } } void @@ -10937,29 +10944,30 @@ CogMethod *cogMethod; sqInt selector; + + /* cogit recordSendTrace ifTrue: is implicit; wouldn't compile the call otherwise. */ + cogMethod = ((CogMethod *) ((longAt(GIV(stackPointer))) - (traceLinkedSendOffset()))); - if (recordSendTrace()) { - /* begin recordTrace:thing:source: */ - /* begin fetchClassOf: */ - if ((theReceiver & 1)) { - classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); - goto l1; - } - if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { - classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; - goto l1; - } - else { - classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l1; - } - l1: /* end fetchClassOf: */; - selector = (cogMethod->selector); - GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; - GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; - GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + /* begin recordTrace:thing:source: */ + /* begin fetchClassOf: */ + if ((theReceiver & 1)) { + classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); + goto l1; } + if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { + classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; + goto l1; + } + else { + classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); + goto l1; + } +l1: /* end fetchClassOf: */; + selector = (cogMethod->selector); + GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; + GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; + GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromMachineCode; + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; if (printOnTrace()) { printActivationNameForreceiverisBlockfirstTemporary((cogMethod->methodObject), theReceiver, 0, null); /* begin cr */ @@ -12055,9 +12063,6 @@ /* Return a shallow copy of the given object. May cause GC */ /* Assume: Oop is a real object, not a small integer. Override to assert it's not a married context */ -/* Return a shallow copy of the given object. May cause GC */ -/* Assume: Oop is a real object, not a small integer. - Override to assert it's not a cogged method */ sqInt clone(sqInt obj) @@ -12077,8 +12082,6 @@ sqInt remappedOop; sqInt toIndex; - assert((!(isOopCompiledMethod(obj))) - || (!(methodHasCogMethod(obj)))); assert((!(isContext(obj))) || (!(isMarriedOrWidowedContext(obj)))); assert(isNonIntegerObject(obj)); @@ -25659,10 +25662,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -25739,54 +25741,45 @@ /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l5; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l5; } - l4: /* end fetchClassOfNonInt: */; + l5: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(0stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l5; - } /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l5; + goto l3; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l5: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l3: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ if (fmt <= 4) { value = longAt((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << ShiftForWord)); - goto l3; + goto l4; } if (fmt < 8) { value = positive32BitIntegerFor(long32At((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << 2))); - goto l3; + goto l4; } else { value = (((byteAt((aContext + BaseHeaderSize) + ((index + fixedFields) - 1))) << 1) | 1); - goto l3; + goto l4; } - l3: /* end subscript:with:format: */; + l4: /* end subscript:with:format: */; /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return; } /* begin frameOfMarriedContext: */ @@ -25805,8 +25798,8 @@ ? longAt((spouseFP + FoxCallerSavedIP) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)) : longAt(((spouseFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)))); /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; } @@ -25827,10 +25820,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -25894,43 +25886,34 @@ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l2; + goto l3; } if (fmt < 2) { fixedFields = totalLength; - goto l2; + goto l3; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l3; + goto l4; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l3; + goto l4; } - l3: /* end fetchClassOfNonInt: */; + l4: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; - l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(1stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l4; - } + l3: /* end fixedFieldsOf:format:length: */; /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l4; + goto l2; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l4: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { return (GIV(primFailCode) = PrimErrBadIndex); } @@ -25984,8 +25967,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return null; } /* begin frameOfMarriedContext: */ @@ -26014,8 +25997,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; return null; } @@ -26101,7 +26084,7 @@ (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(2stackPointerForMaybeMarriedContext); + VM_LABEL(0stackPointerForMaybeMarriedContext); if ((((longAt((rcvr + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && (!(isWidowedContext(rcvr)))) { sp2 = stackPointerIndexForFrame(frameOfMarriedContext(rcvr)); @@ -32278,6 +32261,28 @@ } +/* is the receiver/first argument not the same object as the (last) + argument?. pop argumentCount because this can be used as a mirror + primitive. + */ + +static void +primitiveNotIdentical(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt otherObject; + char *sp; + sqInt thisObject; + + otherObject = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + thisObject = longAt(GIV(stackPointer)); + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (thisObject != otherObject + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; +} + + /* Defined for CompiledMethods only */ static void @@ -32566,6 +32571,11 @@ GIV(argumentCount) = arraySize; GIV(messageSelector) = selector; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), actualReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if ((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -32650,6 +32660,11 @@ } l1: /* end fetchClassOf: */; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), newReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if (!((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -37101,6 +37116,90 @@ } static void +printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt class; + sqInt classDict; + sqInt classDictSize; + sqInt currClass; + sqInt header; + sqInt i; + sqInt methClass; + sqInt sz; + + if (((startClass & 3) == 0) + && (((((usqInt)startClass)) >= heapBase) + && (((((usqInt)startClass)) < GIV(freeStart)) + && (((longAt(startClass)) & TypeMask) != HeaderTypeGC)))) { + /* begin findClassForSelector:lookupClass:do: */ + VM_LABEL(0findClassForSelectorlookupClassdo); + currClass = startClass; + do { + classDict = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << ShiftForWord)); + /* begin fetchWordLengthOf: */ + /* begin sizeBitsOf: */ + header = longAt(classDict); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(classDict - (BytesPerWord * 2))) & LongSizeMask + : header & SizeMask); + classDictSize = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; + i = SelectorStart; + while (i < classDictSize) { + if (aSelector == (longAt((classDict + BaseHeaderSize) + (i << ShiftForWord)))) { + methClass = currClass; + + goto l1; + } + i += 1; + } + currClass = longAt((currClass + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); + } while(!(currClass == GIV(nilObj))); + methClass = null; + + l1: /* end findClassForSelector:lookupClass:do: */; + if ((methClass == null) + || (startClass == methClass)) { + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar('>'); + if (!(methClass)) { + printStringOf(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << ShiftForWord))); + print(" "); + } + } + else { + printNameOfClasscount(startClass, 5); + /* begin printChar: */ + putchar('('); + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar(')'); + /* begin printChar: */ + putchar('>'); + } + } + else { + print("INVALID CLASS"); + } + if (((aSelector & 1)) + || (((aSelector & 3) == 0) + && (((((usqInt)aSelector)) >= heapBase) + && (((((usqInt)aSelector)) < GIV(freeStart)) + && (((longAt(aSelector)) & TypeMask) != HeaderTypeGC))))) { + if (((aSelector & 1) == 0) + && (((((usqInt) (longAt(aSelector))) >> 8) & 15) >= 8)) { + printStringOf(aSelector); + } + else { + printOopShort(aSelector); + } + } + else { + print("INVALID SELECTOR"); + } +} + +static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; @@ -42502,6 +42601,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -42518,17 +42618,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -42554,15 +42654,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(1stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -42605,6 +42714,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -42622,17 +42732,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -42658,15 +42768,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(2stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-10-19 18:07:48 UTC (rev 2501) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 from - CoInterpreterMT VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CoInterpreterMT VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -950,6 +950,7 @@ static void primitiveNoop(void); static void primitiveNotEqual(void); EXPORT(void) primitiveNotEqualLargeIntegers(void); +static void primitiveNotIdentical(void); static void primitiveObjectAt(void); static void primitiveObjectAtPut(void); static void primitiveObjectPointsTo(void); @@ -1027,6 +1028,7 @@ static void primitiveYield(void); void * primTraceLogAddress(void); usqInt primTraceLogIndexAddress(void); +static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass); static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage); void printAllStacks(void); void printCallStack(void); @@ -1229,8 +1231,8 @@ _iss sqInt nilObj; _iss usqInt instructionPointer; _iss sqInt argumentCount; +_iss usqInt freeStart; _iss usqInt method; -_iss usqInt freeStart; _iss usqInt newMethod; _iss usqInt youngStart; _iss sqInt messageSelector; @@ -1580,7 +1582,7 @@ /* 166 */ primitiveIntegerAtPut, /* 167 */ primitiveYield, /* 168 */ primitiveCopyObject, - /* 169 */ (void (*)(void))0, + /* 169 */ primitiveNotIdentical, /* 170 */ (void (*)(void))0, /* 171 */ (void (*)(void))0, /* 172 */ (void (*)(void))0, @@ -1989,7 +1991,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.133]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.134]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -4878,6 +4880,11 @@ GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = (TraceIsFromInterpreter + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), GIV(lkupClass)); + /* begin cr */ + printf("\n"); + } } /* begin internalFindNewMethod */ VM_LABEL(0internalFindNewMethod); @@ -11259,21 +11266,21 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt selector; - if (recordSendTrace()) { + if (recordBlockTrace()) { /* begin recordTrace:thing:source: */ selector = (mframeHomeMethod(GIV(framePointer))->methodObject); GIV(traceLog)[GIV(traceLogIndex)] = TraceBlockActivation; GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; GIV(traceLog)[GIV(traceLogIndex) + 2] = (TraceIsFromMachineCode + (((usqInt) (getVMOwner()) << 16))); GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase + ? longAt(GIV(framePointer) + FoxMFReceiver) + : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); + /* begin cr */ + printf("\n"); + } } - if (printOnTrace()) { - printActivationNameForreceiverisBlockfirstTemporary((mframeHomeMethod(GIV(framePointer))->methodObject), ((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < heapBase - ? longAt(GIV(framePointer) + FoxMFReceiver) - : longAt(GIV(framePointer) + FoxIFReceiver)), 1, null); - /* begin cr */ - printf("\n"); - } } void @@ -11284,29 +11291,30 @@ CogMethod *cogMethod; sqInt selector; + + /* cogit recordSendTrace ifTrue: is implicit; wouldn't compile the call otherwise. */ + cogMethod = ((CogMethod *) ((longAt(GIV(stackPointer))) - (traceLinkedSendOffset()))); - if (recordSendTrace()) { - /* begin recordTrace:thing:source: */ - /* begin fetchClassOf: */ - if ((theReceiver & 1)) { - classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); - goto l1; - } - if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { - classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; - goto l1; - } - else { - classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l1; - } - l1: /* end fetchClassOf: */; - selector = (cogMethod->selector); - GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; - GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; - GIV(traceLog)[GIV(traceLogIndex) + 2] = (TraceIsFromMachineCode + (((usqInt) (getVMOwner()) << 16))); - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + /* begin recordTrace:thing:source: */ + /* begin fetchClassOf: */ + if ((theReceiver & 1)) { + classOrInteger = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)); + goto l1; } + if (((ccIndex = (((usqInt) (longAt(theReceiver))) >> 12) & 31)) == 0) { + classOrInteger = (longAt(theReceiver - BaseHeaderSize)) & AllButTypeMask; + goto l1; + } + else { + classOrInteger = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); + goto l1; + } +l1: /* end fetchClassOf: */; + selector = (cogMethod->selector); + GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; + GIV(traceLog)[GIV(traceLogIndex) + 1] = selector; + GIV(traceLog)[GIV(traceLogIndex) + 2] = (TraceIsFromMachineCode + (((usqInt) (getVMOwner()) << 16))); + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; if (printOnTrace()) { printActivationNameForreceiverisBlockfirstTemporary((cogMethod->methodObject), theReceiver, 0, null); /* begin cr */ @@ -12471,9 +12479,6 @@ /* Return a shallow copy of the given object. May cause GC */ /* Assume: Oop is a real object, not a small integer. Override to assert it's not a married context */ -/* Return a shallow copy of the given object. May cause GC */ -/* Assume: Oop is a real object, not a small integer. - Override to assert it's not a cogged method */ sqInt clone(sqInt obj) @@ -12493,8 +12498,6 @@ sqInt remappedOop; sqInt toIndex; - assert((!(isOopCompiledMethod(obj))) - || (!(methodHasCogMethod(obj)))); assert((!(isContext(obj))) || (!(isMarriedOrWidowedContext(obj)))); assert(isNonIntegerObject(obj)); @@ -26868,10 +26871,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -26948,54 +26950,45 @@ /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l5; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l5; } - l4: /* end fetchClassOfNonInt: */; + l5: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(0stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l5; - } /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l5; + goto l3; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l5: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l3: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ if (fmt <= 4) { value = longAt((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << ShiftForWord)); - goto l3; + goto l4; } if (fmt < 8) { value = positive32BitIntegerFor(long32At((aContext + BaseHeaderSize) + (((index + fixedFields) - 1) << 2))); - goto l3; + goto l4; } else { value = (((byteAt((aContext + BaseHeaderSize) + ((index + fixedFields) - 1))) << 1) | 1); - goto l3; + goto l4; } - l3: /* end subscript:with:format: */; + l4: /* end subscript:with:format: */; /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return; } /* begin frameOfMarriedContext: */ @@ -27014,8 +27007,8 @@ ? longAt((spouseFP + FoxCallerSavedIP) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)) : longAt(((spouseFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)))); /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; } @@ -27036,10 +27029,9 @@ sqInt hdr; sqInt index; char *sp; - char *sp1; - sqInt sp11; + sqInt sp1; char *sp2; - sqInt sp3; + char *sp3; char *spouseFP; sqInt stSize; sqInt sz; @@ -27103,43 +27095,34 @@ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l2; + goto l3; } if (fmt < 2) { fixedFields = totalLength; - goto l2; + goto l3; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(aContext))) >> 12) & 31)) == 0) { class = (longAt(aContext - BaseHeaderSize)) & AllButTypeMask; - goto l3; + goto l4; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l3; + goto l4; } - l3: /* end fetchClassOfNonInt: */; + l4: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; - l2: /* end fixedFieldsOf:format:length: */; - /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(1stackPointerForMaybeMarriedContext); - if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) - && (!(isWidowedContext(aContext)))) { - sp3 = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); - assert((ReceiverIndex + ((sp3 >> 1))) < (lengthOf(aContext))); - stSize = sp3; - goto l4; - } + l3: /* end fixedFieldsOf:format:length: */; /* begin fetchStackPointerOf: */ - sp11 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp11 & 1))) { + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l4; + goto l2; } - assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(aContext))); - stSize = (sp11 >> 1); - l4: /* end stackPointerForMaybeMarriedContext: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + stSize = (sp1 >> 1); + l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { return (GIV(primFailCode) = PrimErrBadIndex); } @@ -27193,8 +27176,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp1; + longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp2; return null; } /* begin frameOfMarriedContext: */ @@ -27223,8 +27206,8 @@ } } /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); - GIV(stackPointer) = sp2; + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp3; return null; } @@ -27310,7 +27293,7 @@ (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); /* begin stackPointerForMaybeMarriedContext: */ - VM_LABEL(2stackPointerForMaybeMarriedContext); + VM_LABEL(0stackPointerForMaybeMarriedContext); if ((((longAt((rcvr + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && (!(isWidowedContext(rcvr)))) { sp2 = stackPointerIndexForFrame(frameOfMarriedContext(rcvr)); @@ -33487,6 +33470,28 @@ } +/* is the receiver/first argument not the same object as the (last) + argument?. pop argumentCount because this can be used as a mirror + primitive. + */ + +static void +primitiveNotIdentical(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt otherObject; + char *sp; + sqInt thisObject; + + otherObject = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + thisObject = longAt(GIV(stackPointer)); + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (thisObject != otherObject + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; +} + + /* Defined for CompiledMethods only */ static void @@ -33775,6 +33780,11 @@ GIV(argumentCount) = arraySize; GIV(messageSelector) = selector; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), actualReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if ((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -33859,6 +33869,11 @@ } l1: /* end fetchClassOf: */; sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOf(GIV(messageSelector)), newReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); + /* begin cr */ + printf("\n"); + } findNewMethodInClass(lookupClass); if (!((((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 8) & 15) >= 12)) @@ -38428,6 +38443,90 @@ } static void +printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt class; + sqInt classDict; + sqInt classDictSize; + sqInt currClass; + sqInt header; + sqInt i; + sqInt methClass; + sqInt sz; + + if (((startClass & 3) == 0) + && (((((usqInt)startClass)) >= heapBase) + && (((((usqInt)startClass)) < GIV(freeStart)) + && (((longAt(startClass)) & TypeMask) != HeaderTypeGC)))) { + /* begin findClassForSelector:lookupClass:do: */ + VM_LABEL(0findClassForSelectorlookupClassdo); + currClass = startClass; + do { + classDict = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << ShiftForWord)); + /* begin fetchWordLengthOf: */ + /* begin sizeBitsOf: */ + header = longAt(classDict); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(classDict - (BytesPerWord * 2))) & LongSizeMask + : header & SizeMask); + classDictSize = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; + i = SelectorStart; + while (i < classDictSize) { + if (aSelector == (longAt((classDict + BaseHeaderSize) + (i << ShiftForWord)))) { + methClass = currClass; + + goto l1; + } + i += 1; + } + currClass = longAt((currClass + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); + } while(!(currClass == GIV(nilObj))); + methClass = null; + + l1: /* end findClassForSelector:lookupClass:do: */; + if ((methClass == null) + || (startClass == methClass)) { + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar('>'); + if (!(methClass)) { + printStringOf(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << ShiftForWord))); + print(" "); + } + } + else { + printNameOfClasscount(startClass, 5); + /* begin printChar: */ + putchar('('); + printNameOfClasscount(methClass, 5); + /* begin printChar: */ + putchar(')'); + /* begin printChar: */ + putchar('>'); + } + } + else { + print("INVALID CLASS"); + } + if (((aSelector & 1)) + || (((aSelector & 3) == 0) + && (((((usqInt)aSelector)) >= heapBase) + && (((((usqInt)aSelector)) < GIV(freeStart)) + && (((longAt(aSelector)) & TypeMask) != HeaderTypeGC))))) { + if (((aSelector & 1) == 0) + && (((((usqInt) (longAt(aSelector))) >> 8) & 15) >= 8)) { + printStringOf(aSelector); + } + else { + printOopShort(aSelector); + } + } + else { + print("INVALID SELECTOR"); + } +} + +static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; @@ -44000,6 +44099,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -44016,17 +44116,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -44052,15 +44152,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(1stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -44103,6 +44212,7 @@ sqInt fmt; sqInt hdr; sqInt sp; + sqInt sp1; sqInt stSize; sqInt sz; sqInt totalLength; @@ -44120,17 +44230,17 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l2; + goto l1; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l2; + goto l1; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l2; + goto l1; } -l2: /* end lengthOf:baseHeader:format: */; +l1: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { @@ -44156,15 +44266,24 @@ l3: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { + /* begin stackPointerForMaybeMarriedContext: */ + VM_LABEL(2stackPointerForMaybeMarriedContext); + if ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(array)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); + stSize = sp; + goto l2; + } /* begin fetchStackPointerOf: */ - sp = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); - if (!((sp & 1))) { + sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); + if (!((sp1 & 1))) { stSize = 0; - goto l1; + goto l2; } - assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); - stSize = (sp >> 1); - l1: /* end fetchStackPointerOf: */; + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); + stSize = (sp1 >> 1); + l2: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/interp.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2011-10-10 18:03:19 UTC (rev 2500) +++ branches/Cog/src/vm/vmCallback.h 2011-10-19 18:07:48 UTC (rev 2501) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.133 uuid: 1ca6557f-8901-4791-8473-e2c09d25bbf3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 */ #define VM_CALLBACK_INC 1

1 0

Auto Reply: [Vm-dev] VM Maker: VMMaker.oscog-eem.134.mcz
by michael.haupt＠oracle.com 19 Oct '11

19 Oct '11

I am on vacation until (including) Oct 31, 2011, with occasional low-bandwidth internet connection.

1 0

VM Maker: VMMaker.oscog-eem.134.mcz
by commits＠source.squeak.org 19 Oct '11

19 Oct '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.134.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.134 Author: eem Time: 19 October 2011, 10:36:08.493 am UUID: a0d46c48-3d9a-43f9-a769-51f31ce120e9 Ancestors: VMMaker.oscog-eem.133 Fix remaining bug in context access fixes of VMMaker.oscog-eem.119. stObject:at: and stObject:at:put: need to use stackPointerForMaybeMarriedContext: not fetchStackPointerOf:, since the context's stack pointer may be stale. Fix send trace printing. Interpreter sends need also to be printed. (A better fix is probably to redo sendBreakpoint: but this will serve for now). N.B. this reassigns the sendtrace flag values. Add primitiveNotEquivalent with prim # 169. Merge with VMMaker-oscog-dtl.125/VMMaker-oscog-EstebanLorenzano.124 for the BytesPerWord generation fixes. =============== Diff against VMMaker.oscog-eem.133 =============== Item was changed: ----- Method: CCodeGenerator>>emitCConstantsOn: (in category 'C code generator') ----- emitCConstantsOn: aStream "Store the global variable declarations on the given stream." | unused constList | unused := constants keys asSet. methods do: [:meth| meth parseTree nodesDo: [:n| n isConstant ifTrue: [unused remove: n name ifAbsent: []]]]. unused copy do: [:const| (variableDeclarations anySatisfy: [:value| value includesSubString: const]) ifTrue: [unused remove: const ifAbsent: []]]. "Don't generate any defines for the externally defined constants, STACKVM, COGVM, COGMTVM et al." (VMClass class>>#initializeMiscConstantsWith:) literalsDo: [:lit| lit isVariableBinding ifTrue: [unused add: lit key]]. + unused remove: #BytesPerWord ifAbsent: []. "force inclusion of BytesPerWord declaration" constList := constants keys reject:[:any| unused includes: any]. aStream cr; nextPutAll: '/*** Constants ***/'; cr. (self sortStrings: constList) do: [:varName| | node default value | node := constants at: varName. node name isEmpty ifFalse: ["Allow the class to provide an alternative definition, either of just the value or the whole shebang" default := self cLiteralFor: node value name: varName. value := vmClass ifNotNil: [(vmClass specialValueForConstant: node name default: default) ifNotNil: [:specialDef| specialDef] ifNil: [default]] ifNil: [default]. value first ~= $# ifTrue: [aStream nextPutAll: '#define '; nextPutAll: node name; space]. aStream nextPutAll: value; cr]]. aStream cr! Item was added: + ----- Method: CCodeGenerator>>generateBaseHeaderSize:on:indent: (in category 'C translation') ----- + generateBaseHeaderSize: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: 'BaseHeaderSize' + ! Item was added: + ----- Method: CCodeGenerator>>generateBytesPerWord:on:indent: (in category 'C translation') ----- + generateBytesPerWord: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: 'BytesPerWord'! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | + translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asSymbol #generateAsSymbol:on:indent: #anyMask: #generateBitAnd:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: + #bytesPerWord #generateBytesPerWord:on:indent: + #baseHeaderSize #generateBaseHeaderSize:on:indent: + #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: CoInterpreter>>ceTraceBlockActivation (in category 'debug support') ----- ceTraceBlockActivation <api> <var: #cogMethod type: #'CogMethod *'> + cogit recordBlockTrace ifTrue: - cogit recordSendTrace ifTrue: [self recordTrace: TraceBlockActivation thing: (self mframeHomeMethod: framePointer) methodObject + source: TraceIsFromMachineCode. + cogit printOnTrace ifTrue: + [self printActivationNameFor: (self mframeHomeMethod: framePointer) methodObject + receiver: (self frameReceiver: framePointer) + isBlock: true + firstTemporary: nil. + self cr]]! - source: TraceIsFromMachineCode]. - cogit printOnTrace ifTrue: - [self printActivationNameFor: (self mframeHomeMethod: framePointer) methodObject - receiver: (self frameReceiver: framePointer) - isBlock: true - firstTemporary: nil. - self cr]! Item was changed: ----- Method: CoInterpreter>>ceTraceLinkedSend: (in category 'debug support') ----- ceTraceLinkedSend: theReceiver | cogMethod | <api> <var: #cogMethod type: #'CogMethod *'> cogMethod := self cCoerceSimple: (self stackTop - cogit traceLinkedSendOffset) to: #'CogMethod *'. + "cogit recordSendTrace ifTrue: is implicit; wouldn't compile the call otherwise." + self recordTrace: (objectMemory fetchClassOf: theReceiver) + thing: cogMethod selector + source: TraceIsFromMachineCode. - cogit recordSendTrace ifTrue: - [self recordTrace: (objectMemory fetchClassOf: theReceiver) thing: cogMethod selector source: TraceIsFromMachineCode]. cogit printOnTrace ifTrue: [self printActivationNameFor: cogMethod methodObject receiver: theReceiver isBlock: false firstTemporary: nil; cr]. self sendBreak: cogMethod selector + BaseHeaderSize point: (objectMemory lengthOf: cogMethod selector) receiver: theReceiver! Item was changed: ----- Method: CoInterpreter>>commonSend (in category 'message sending') ----- commonSend "Send a message, starting lookup with the receiver's class." "Assume: messageSelector and argumentCount have been set, and that the receiver and arguments have been pushed onto the stack," "Note: This method is inlined into the interpreter dispatch loop." <sharedCodeNamed: 'commonSend' inCase: 131> self sendBreak: messageSelector + BaseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: (self internalStackValue: argumentCount). cogit recordSendTrace ifTrue: + [self recordTrace: lkupClass thing: messageSelector source: TraceIsFromInterpreter. + cogit printOnTrace ifTrue: + [self printActivationNameForSelector: messageSelector startClass: lkupClass; cr]]. - [self recordTrace: lkupClass thing: messageSelector source: TraceIsFromInterpreter]. self internalFindNewMethod. self internalExecuteNewMethod. self fetchNextBytecode! Item was added: + ----- Method: CoInterpreter>>printSends (in category 'debug printing') ----- + printSends + <inline: true> + ^cogit printOnTrace! Item was changed: ----- Method: CogVMSimulator>>sendBreak:point:receiver: (in category 'debugging traps') ----- sendBreak: selectorString point: selectorLength receiver: receiverOrNil "self shortPrintFrameAndCallers: localFP" | i | - cogit printOnTrace ifTrue: - [0 to: selectorLength - 1 do: - [:si| transcript nextPut: (objectMemory byteAt: selectorString + si) asCharacter]. - transcript cr; flush]. breakSelectorLength = selectorLength ifTrue: [i := breakSelectorLength. [i > 0] whileTrue: [(objectMemory byteAt: selectorString + i - 1) = (breakSelector at: i) asInteger ifTrue: [(i := i - 1) = 0 ifTrue: [self changed: #byteCountText. self halt: 'Send of ' , breakSelector, (receiverOrNil ifNotNil: [' to ', (self shortPrint: receiverOrNil)] ifNil: [''])]] ifFalse: [i := 0]]]! Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines' 'ceImplicitReceiverTrampoline' 'ceExplicitReceiverTrampoline' 'cmDynSuperEntryOffset') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'; addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'; addHeaderFile:'"dispdbg.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceEnterCogCodePopReceiverAndClassRegs declareC: 'void (*ceEnterCogCodePopReceiverAndClassRegs)(void)'; var: #realCEEnterCogCodePopReceiverAndClassRegs declareC: 'void (*realCEEnterCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *, void *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction *backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction *methodLabel = &aMethodLabel'; var: #primInvokeLabel type: #'AbstractInstruction *'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMissCall entry noCheckEntry dynSuperEntry mnuCall interpretCall endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #annotations type: #'InstructionAnnotation *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #sendTrampolines declareC: 'sqInt sendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #cePositive32BitIntegerTrampoline declareC: 'static sqInt cePositive32BitIntegerTrampoline'; var: #labelCounter declareC: 'static int labelCounter'; var: #traceLinkedSends + declareC: 'int traceLinkedSends = 8 /* prim trace log on by default */'; - declareC: 'int traceLinkedSends = 2 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator var: #generatorTable declareC: 'BytecodeDescriptor generatorTable[256]' , (self tableInitializerFor: aCCodeGenerator vmClass generatorTable in: aCCodeGenerator); var: #primitiveGeneratorTable declareC: 'PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]' , (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable in: aCCodeGenerator). "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was changed: ----- Method: Cogit>>breakOnImplicitReceiver (in category 'debugging') ----- breakOnImplicitReceiver <api> + <cmacro: '() (traceLinkedSends & 32)'> + ^(traceLinkedSends bitAnd: 32) ~= 0! - <cmacro: '() (traceLinkedSends & 16)'> - ^(traceLinkedSends bitAnd: 16) ~= 0! Item was changed: ----- Method: Cogit>>compileBlockEntry: (in category 'compile abstract instructions') ----- compileBlockEntry: blockStart "Compile a block's entry. This looks like a dummy CogBlockMethod header (for frame parsing) followed by either a frame build, if a frame is required, or nothing. The CogMethodHeader's objectHeader field is a back pointer to the method, but this can't be filled in until code generation." <var: #blockStart type: #'BlockStart *'> self AlignmentNops: (self sizeof: CogBlockMethod). self assert: (self sizeof: CogBlockMethod) = (2 * BytesPerWord). blockStart fakeHeader: self Label. self Fill32: 0. "gets filled in later with the homeOffset and startpc" self Fill32: 0. "gets filled in later with numArgs et al" blockStart entryLabel: self Label. needsFrame ifTrue: [self compileBlockFrameBuild: blockStart. + self recordBlockTrace ifTrue: - self recordSendTrace ifTrue: [self CallRT: ceTraceBlockActivationTrampoline]] ifFalse: [self compileBlockFramelessEntry: blockStart]! Item was changed: ----- Method: Cogit>>printOnTrace (in category 'debugging') ----- printOnTrace <api> + <cmacro: '() (traceLinkedSends & 1)'> + ^(traceLinkedSends bitAnd: 1) ~= 0! - <cmacro: '() (traceLinkedSends & 8)'> - ^(traceLinkedSends bitAnd: 8) ~= 0! Item was added: + ----- Method: Cogit>>recordBlockTrace (in category 'debugging') ----- + recordBlockTrace + <api> + <cmacro: '() (traceLinkedSends & 4)'> + ^(traceLinkedSends bitAnd: 4) ~= 0! Item was changed: ----- Method: Cogit>>recordEventTrace (in category 'debugging') ----- recordEventTrace <api> + <cmacro: '() (traceLinkedSends & 16)'> + ^(traceLinkedSends bitAnd: 16) ~= 0! - <cmacro: '() (traceLinkedSends & 4)'> - ^(traceLinkedSends bitAnd: 4) ~= 0! Item was changed: ----- Method: Cogit>>recordPrimTrace (in category 'debugging') ----- recordPrimTrace <api> + <cmacro: '() (traceLinkedSends & 8)'> + ^(traceLinkedSends bitAnd: 8) ~= 0! - <cmacro: '() (traceLinkedSends & 2)'> - ^(traceLinkedSends bitAnd: 2) ~= 0! Item was changed: ----- Method: Cogit>>recordSendTrace (in category 'debugging') ----- recordSendTrace <api> + <cmacro: '() (traceLinkedSends & 2)'> + ^(traceLinkedSends bitAnd: 2) ~= 0! - <cmacro: '() (traceLinkedSends & 1)'> - ^(traceLinkedSends bitAnd: 1) ~= 0! Item was changed: ----- Method: Cogit>>sendTrace: (in category 'debugging') ----- sendTrace: aBooleanOrInteger <doNotGenerate> "traceLinkedSends is a set of flags. + 1 => print trace (if somethign below is selected) + 2 => trace sends + 4 => trace block activations + 8 => trace interpreter primitives + 16 => trace events (context switches, GCs, etc) + 32 => send breakpoint on implicit receiver (Newspeak VM only)" - 1 => trace sends & block activations - 2 => trace interpreter primitives - 4 => trace events (context switches, GCs, etc) - 8 => print trace" traceLinkedSends := aBooleanOrInteger isInteger ifTrue: [aBooleanOrInteger] ifFalse: [aBooleanOrInteger ifTrue: [1] ifFalse: [0]]! Item was changed: ----- Method: Cogit>>setInterpreter: (in category 'initialization') ----- setInterpreter: aCoInterpreter "Initialization of the code generator in the simulator. These objects already exist in the generated C VM or are used only in the simulation." <doNotGenerate> coInterpreter := aCoInterpreter. objectMemory := aCoInterpreter objectMemory. threadManager := aCoInterpreter threadManager. "N.B. may be nil" objectRepresentation := objectMemory objectRepresentationClass for: self. methodZone := CogMethodZone new. methodZone setInterpreter: aCoInterpreter objectRepresentation: objectRepresentation cogit: self. generatorTable := self class generatorTable. primitiveGeneratorTable := self class primitiveTable. processor := ProcessorClass new. simulatedAddresses := Dictionary new. simulatedTrampolines := Dictionary new. simulatedVariableGetters := Dictionary new. simulatedVariableSetters := Dictionary new. traceStores := 0. + traceLinkedSends := 8. "record prim trace on by default (see Cogit class>>decareCVarsIn:)" - traceLinkedSends := 2. "record prim trace on by default (see Cogit class>>decareCVarsIn:)" debugPrimCallStackOffset := 0. singleStep := printRegisters := printInstructions := clickConfirm := false. breakBlock ifNil: [self breakPC: breakPC]. (backEnd := processor abstractInstructionCompilerClass new) cogit: self. (methodLabel := processor abstractInstructionCompilerClass new) cogit: self. sendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). superSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). NewspeakVM ifTrue: [dynamicSuperSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines)]. "debug metadata" objectReferencesInRuntime := CArrayAccessor on: (Array new: NumObjRefsInRuntime). runtimeObjectRefIndex := 0. "debug metadata" trampolineAddresses := CArrayAccessor on: (Array new: NumTrampolines * 2). trampolineTableIndex := 0. compilationTrace ifNil: [compilationTrace := 0]! Item was changed: ----- Method: Interpreter class>>initializePrimitiveTable (in category 'initialization') ----- initializePrimitiveTable "This table generates a C function address table use in primitiveResponse along with dispatchFunctionPointerOn:in:" "NOTE: The real limit here is 2047 because of the method header layout but there is no point in going over the needed size" MaxPrimitiveIndex := 575. PrimitiveTable := Array new: MaxPrimitiveIndex + 1. self table: PrimitiveTable from: #( "Integer Primitives (0-19)" (0 primitiveFail) (1 primitiveAdd) (2 primitiveSubtract) (3 primitiveLessThan) (4 primitiveGreaterThan) (5 primitiveLessOrEqual) (6 primitiveGreaterOrEqual) (7 primitiveEqual) (8 primitiveNotEqual) (9 primitiveMultiply) (10 primitiveDivide) (11 primitiveMod) (12 primitiveDiv) (13 primitiveQuo) (14 primitiveBitAnd) (15 primitiveBitOr) (16 primitiveBitXor) (17 primitiveBitShift) (18 primitiveMakePoint) (19 primitiveFail) "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" (20 primitiveFail) (21 primitiveAddLargeIntegers) (22 primitiveSubtractLargeIntegers) (23 primitiveLessThanLargeIntegers) (24 primitiveGreaterThanLargeIntegers) (25 primitiveLessOrEqualLargeIntegers) (26 primitiveGreaterOrEqualLargeIntegers) (27 primitiveEqualLargeIntegers) (28 primitiveNotEqualLargeIntegers) (29 primitiveMultiplyLargeIntegers) (30 primitiveDivideLargeIntegers) (31 primitiveModLargeIntegers) (32 primitiveDivLargeIntegers) (33 primitiveQuoLargeIntegers) (34 primitiveBitAndLargeIntegers) (35 primitiveBitOrLargeIntegers) (36 primitiveBitXorLargeIntegers) (37 primitiveBitShiftLargeIntegers) (38 primitiveFail) (39 primitiveFail) "Float Primitives (40-59)" (40 primitiveAsFloat) (41 primitiveFloatAdd) (42 primitiveFloatSubtract) (43 primitiveFloatLessThan) (44 primitiveFloatGreaterThan) (45 primitiveFloatLessOrEqual) (46 primitiveFloatGreaterOrEqual) (47 primitiveFloatEqual) (48 primitiveFloatNotEqual) (49 primitiveFloatMultiply) (50 primitiveFloatDivide) (51 primitiveTruncated) (52 primitiveFractionalPart) (53 primitiveExponent) (54 primitiveTimesTwoPower) (55 primitiveSquareRoot) (56 primitiveSine) (57 primitiveArctan) (58 primitiveLogN) (59 primitiveExp) "Subscript and Stream Primitives (60-67)" (60 primitiveAt) (61 primitiveAtPut) (62 primitiveSize) (63 primitiveStringAt) (64 primitiveStringAtPut) (65 primitiveFail) "was primitiveNext which no longer pays its way (normal Smalltalk code is faster)" (66 primitiveFail) "was primitiveNextPut which no longer pays its way (normal Smalltalk code is faster)" (67 primitiveFail) "was primitiveAtEnd which no longer pays its way (normal Smalltalk code is faster)" "StorageManagement Primitives (68-79)" (68 primitiveObjectAt) (69 primitiveObjectAtPut) (70 primitiveNew) (71 primitiveNewWithArg) (72 primitiveArrayBecomeOneWay) "Blue Book: primitiveBecome" (73 primitiveInstVarAt) (74 primitiveInstVarAtPut) (75 primitiveAsOop) (76 primitiveStoreStackp) "Blue Book: primitiveAsObject" (77 primitiveSomeInstance) (78 primitiveNextInstance) (79 primitiveNewMethod) "Control Primitives (80-89)" (80 primitiveBlockCopy) (81 primitiveValue) (82 primitiveValueWithArgs) (83 primitivePerform) (84 primitivePerformWithArgs) (85 primitiveSignal) (86 primitiveWait) (87 primitiveResume) (88 primitiveSuspend) (89 primitiveFlushCache) "Input/Output Primitives (90-109)" (90 primitiveMousePoint) (91 primitiveTestDisplayDepth) "Blue Book: primitiveCursorLocPut" (92 primitiveSetDisplayMode) "Blue Book: primitiveCursorLink" (93 primitiveInputSemaphore) (94 primitiveGetNextEvent) "Blue Book: primitiveSampleInterval" (95 primitiveInputWord) (96 primitiveFail) "primitiveCopyBits" (97 primitiveSnapshot) (98 primitiveStoreImageSegment) (99 primitiveLoadImageSegment) (100 primitivePerformInSuperclass) "Blue Book: primitiveSignalAtTick" (101 primitiveBeCursor) (102 primitiveBeDisplay) (103 primitiveScanCharacters) (104 primitiveFail) "primitiveDrawLoop" (105 primitiveStringReplace) (106 primitiveScreenSize) (107 primitiveMouseButtons) (108 primitiveKbdNext) (109 primitiveKbdPeek) "System Primitives (110-119)" (110 primitiveEquivalent) (111 primitiveClass) (112 primitiveBytesLeft) (113 primitiveQuit) (114 primitiveExitToDebugger) (115 primitiveChangeClass) "Blue Book: primitiveOopsLeft" (116 primitiveFlushCacheByMethod) (117 primitiveExternalCall) (118 primitiveDoPrimitiveWithArgs) (119 primitiveFlushCacheSelective) "Squeak 2.2 and earlier use 119. Squeak 2.3 and later use 116. Both are supported for backward compatibility." "Miscellaneous Primitives (120-127)" (120 primitiveCalloutToFFI) (121 primitiveImageName) (122 primitiveNoop) "Blue Book: primitiveImageVolume" (123 primitiveValueUninterruptably) "@@@: Remove this when all VMs have support" (124 primitiveLowSpaceSemaphore) (125 primitiveSignalAtBytesLeft) "Squeak Primitives Start Here" "Squeak Miscellaneous Primitives (128-149)" (126 primitiveDeferDisplayUpdates) (127 primitiveShowDisplayRect) (128 primitiveArrayBecome) (129 primitiveSpecialObjectsOop) (130 primitiveFullGC) (131 primitiveIncrementalGC) (132 primitiveObjectPointsTo) (133 primitiveSetInterruptKey) (134 primitiveInterruptSemaphore) (135 primitiveMillisecondClock) (136 primitiveSignalAtMilliseconds) (137 primitiveSecondsClock) (138 primitiveSomeObject) (139 primitiveNextObject) (140 primitiveBeep) (141 primitiveClipboardText) (142 primitiveVMPath) (143 primitiveShortAt) (144 primitiveShortAtPut) (145 primitiveConstantFill) "NOTE: When removing the obsolete indexed primitives, the following two should go become #primitiveIntegerAt / atPut" (146 primitiveFail) "primitiveReadJoystick" (147 primitiveFail) "primitiveWarpBits" (148 primitiveClone) (149 primitiveGetAttribute) "File Primitives (150-169) - NO LONGER INDEXED" (150 159 primitiveFail) (160 primitiveAdoptInstance) (161 164 primitiveFail) (165 primitiveIntegerAt) "hacked in here for now" (166 primitiveIntegerAtPut) (167 primitiveYield) (168 primitiveCopyObject) + (169 primitiveNotIdentical) - (169 primitiveFail) "Sound Primitives (170-199) - NO LONGER INDEXED" (170 185 primitiveFail) "Old closure primitives" (186 primitiveFail) "was primitiveClosureValue" (187 primitiveFail) "was primitiveClosureValueWithArgs" "Perform method directly" (188 primitiveExecuteMethodArgsArray) (189 primitiveExecuteMethod) "Sound Primitives (continued) - NO LONGER INDEXED" (190 194 primitiveFail) "Unwind primitives" (195 primitiveFindNextUnwindContext) (196 primitiveTerminateTo) (197 primitiveFindHandlerContext) (198 primitiveMarkUnwindMethod) (199 primitiveMarkHandlerMethod) "new closure primitives (were Networking primitives)" (200 primitiveClosureCopyWithCopiedValues) (201 primitiveClosureValue) "value" (202 primitiveClosureValue) "value:" (203 primitiveClosureValue) "value:value:" (204 primitiveClosureValue) "value:value:value:" (205 primitiveClosureValue) "value:value:value:value:" (206 primitiveClosureValueWithArgs) "valueWithArguments:" (207 209 primitiveFail) "reserved for Cog primitives" (210 primitiveAt) "Compatibility with Cog StackInterpreter Context primitives" (211 primitiveAtPut) "Compatibility with Cog StackInterpreter Context primitives" (212 primitiveSize) "Compatibility with Cog StackInterpreter Context primitives" (213 219 primitiveFail) "reserved for Cog primitives" (220 primitiveFail) "reserved for Cog primitives" (221 primitiveClosureValueNoContextSwitch) "valueNoContextSwitch" (222 primitiveClosureValueNoContextSwitch) "valueNoContextSwitch:" (223 229 primitiveFail) "reserved for Cog primitives" (230 primitiveRelinquishProcessor) (231 primitiveForceDisplayUpdate) (232 primitiveFormPrint) (233 primitiveSetFullScreen) (234 primitiveFail) "primBitmapdecompressfromByteArrayat" (235 primitiveFail) "primStringcomparewithcollated" (236 primitiveFail) "primSampledSoundconvert8bitSignedFromto16Bit" (237 primitiveFail) "primBitmapcompresstoByteArray" (238 241 primitiveFail) "serial port primitives" (242 primitiveFail) (243 primitiveFail) "primStringtranslatefromtotable" (244 primitiveFail) "primStringfindFirstInStringinSetstartingAt" (245 primitiveFail) "primStringindexOfAsciiinStringstartingAt" (246 primitiveFail) "primStringfindSubstringinstartingAtmatchTable" (247 primitiveSnapshotEmbedded) (248 primitiveInvokeObjectAsMethod) (249 primitiveArrayBecomeOneWayCopyHash) "VM Implementor Primitives (250-255)" (250 primitiveClearVMProfile) (251 primitiveControlVMProfiling "primitiveStartVMProfiling") (252 primitiveVMProfileSamplesInto "primitiveStopVMProfiling") (253 primitiveFail "primitiveVMProfileInfoInto") (254 primitiveVMParameter) (255 primitiveInstVarsPutFromStack) "Never used except in Disney tests. Remove after 2.3 release." "Quick Push Const Methods" (256 primitivePushSelf) (257 primitivePushTrue) (258 primitivePushFalse) (259 primitivePushNil) (260 primitivePushMinusOne) (261 primitivePushZero) (262 primitivePushOne) (263 primitivePushTwo) "Quick Push Const Methods" (264 519 primitiveLoadInstVar) "These ranges used to be used by obsiolete indexed primitives." (520 529 primitiveFail) (530 539 primitiveFail) (540 549 primitiveFail) (550 559 primitiveFail) (560 569 primitiveFail) "External primitive support primitives" (570 primitiveFlushExternalPrimitives) (571 primitiveUnloadModule) (572 primitiveListBuiltinModule) (573 primitiveListExternalModule) (574 primitiveFail) "reserved for addl. external support prims" "Unassigned Primitives" (575 primitiveFail)). ! Item was added: + ----- Method: Interpreter>>primitiveNotIdentical (in category 'object access primitives') ----- + primitiveNotIdentical + "is the receiver/first argument not the same object as the (last) argument?. + pop argumentCount because this can be used as a mirror primitive." + | thisObject otherObject | + otherObject := self stackValue: 1. + thisObject := self stackTop. + self pop: argumentCount + 1 thenPushBool: thisObject ~= otherObject! Item was added: + ----- Method: InterpreterPrimitives>>primitiveNotIdentical (in category 'object access primitives') ----- + primitiveNotIdentical + "is the receiver/first argument not the same object as the (last) argument?. + pop argumentCount because this can be used as a mirror primitive." + | thisObject otherObject | + otherObject := self stackValue: 1. + thisObject := self stackTop. + self pop: argumentCount + 1 thenPushBool: thisObject ~= otherObject! Item was changed: + ----- Method: InterpreterSimulatorLSB64>>bytesPerWord (in category 'memory access') ----- - ----- Method: InterpreterSimulatorLSB64>>bytesPerWord (in category 'as yet unclassified') ----- bytesPerWord "overridden for 64-bit images..." ^ 8! Item was changed: + ----- Method: InterpreterSimulatorLSB64>>long32At: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorLSB64>>long32At: (in category 'as yet unclassified') ----- long32At: byteAddress "Return the 32-bit word at byteAddress which must be 0 mod 4." | lowBits long | lowBits := byteAddress bitAnd: 4. long := self longAt: byteAddress - lowBits. ^ lowBits = 4 ifTrue: [ long bitShift: -32 ] ifFalse: [ long bitAnd: 16rFFFFFFFF ]. ! Item was changed: + ----- Method: InterpreterSimulatorLSB64>>long32At:put: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorLSB64>>long32At:put: (in category 'as yet unclassified') ----- long32At: byteAddress put: a32BitValue "Store the 32-bit value at byteAddress which must be 0 mod 4." | lowBits long64 longAddress | lowBits := byteAddress bitAnd: 4. lowBits = 0 ifTrue: [ "storing into LS word" long64 := self longAt: byteAddress. self longAt: byteAddress put: ((long64 bitAnd: 16rFFFFFFFF00000000) bitOr: a32BitValue) ] ifFalse: [longAddress := byteAddress - 4. long64 := self longAt: longAddress. self longAt: longAddress put: ((long64 bitAnd: 16rFFFFFFFF) bitOr: (a32BitValue bitShift: 32)) ]! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>byteSwapped: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>byteSwapped: (in category 'as yet unclassified') ----- byteSwapped: w "Return the given integer with its bytes in the reverse order." ^ (super byteSwapped: ((w bitShift: -32) bitAnd: 16rFFFFFFFF)) + ((super byteSwapped: (w bitAnd: 16rFFFFFFFF)) bitShift: 32)! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>bytesPerWord (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>bytesPerWord (in category 'as yet unclassified') ----- bytesPerWord "overridden for 64-bit images..." ^ 8! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>long32At: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>long32At: (in category 'as yet unclassified') ----- long32At: byteAddress "Return the 32-bit word at byteAddress which must be 0 mod 4." ^ super longAt: byteAddress! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>long32At:put: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>long32At:put: (in category 'as yet unclassified') ----- long32At: byteAddress put: a32BitValue "Store the 32-bit value at byteAddress which must be 0 mod 4." super longAt: byteAddress put: a32BitValue! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>longAt: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>longAt: (in category 'as yet unclassified') ----- longAt: byteAddress "Note: Adjusted for Smalltalk's 1-based array indexing." ^ ((super longAt: byteAddress) bitShift: 32) bitOr: (super longAt: byteAddress + 4)! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>longAt:put: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>longAt:put: (in category 'as yet unclassified') ----- longAt: byteAddress put: a64BitValue "Note: Adjusted for Smalltalk's 1-based array indexing." super longAt: byteAddress put: (a64BitValue bitShift: -32). super longAt: byteAddress + 4 put: (a64BitValue bitAnd: 16rFFFFFFFF). ^ a64BitValue! Item was removed: - ----- Method: NewCoObjectMemory>>clone: (in category 'allocation') ----- - clone: obj - "Return a shallow copy of the given object. May cause GC" - "Assume: Oop is a real object, not a small integer. - Override to assert it's not a cogged method" - self assert: ((self isOopCompiledMethod: obj) not - or: [(coInterpreter methodHasCogMethod: obj) not]). - ^super clone: obj! Item was changed: ----- Method: NewspeakInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- initializePrimitiveTable "This table generates a C function address table use in primitiveResponse along with dispatchFunctionPointerOn:in:" "NOTE: The real limit here is 2047 because of the method header layout but there is no point in going over the needed size" MaxPrimitiveIndex := 575. MaxQuickPrimitiveIndex := 519. PrimitiveTable := Array new: MaxPrimitiveIndex + 1. self table: PrimitiveTable from: #( "Integer Primitives (0-19)" (0 primitiveFail) (1 primitiveAdd) (2 primitiveSubtract) (3 primitiveLessThan) (4 primitiveGreaterThan) (5 primitiveLessOrEqual) (6 primitiveGreaterOrEqual) (7 primitiveEqual) (8 primitiveNotEqual) (9 primitiveMultiply) (10 primitiveDivide) (11 primitiveMod) (12 primitiveDiv) (13 primitiveQuo) (14 primitiveBitAnd) (15 primitiveBitOr) (16 primitiveBitXor) (17 primitiveBitShift) (18 primitiveMakePoint) (19 primitiveFail) "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "32-bit logic is aliased to Integer prims above" (20 37 primitiveFail) "Float Primitives (38-59)" (38 primitiveAt) "for compatibility with Cog's primitiveFloatAt" (39 primitiveAtPut) "for compatibility with Cog's primitiveFloatAtPut" (40 primitiveAsFloat) (41 primitiveFloatAdd) (42 primitiveFloatSubtract) (43 primitiveFloatLessThan) (44 primitiveFloatGreaterThan) (45 primitiveFloatLessOrEqual) (46 primitiveFloatGreaterOrEqual) (47 primitiveFloatEqual) (48 primitiveFloatNotEqual) (49 primitiveFloatMultiply) (50 primitiveFloatDivide) (51 primitiveTruncated) (52 primitiveFractionalPart) (53 primitiveExponent) (54 primitiveTimesTwoPower) (55 primitiveSquareRoot) (56 primitiveSine) (57 primitiveArctan) (58 primitiveLogN) (59 primitiveExp) "Subscript and Stream Primitives (60-67)" (60 primitiveAt) (61 primitiveAtPut) (62 primitiveSize) (63 primitiveStringAt) (64 primitiveStringAtPut) (65 primitiveNext) (66 primitiveNextPut) (67 primitiveAtEnd) "StorageManagement Primitives (68-79)" (68 primitiveObjectAt) (69 primitiveObjectAtPut) (70 primitiveNew) (71 primitiveNewWithArg) (72 primitiveArrayBecomeOneWay) "Blue Book: primitiveBecome" (73 primitiveInstVarAt) (74 primitiveInstVarAtPut) (75 primitiveAsOop) (76 primitiveStoreStackp) "Blue Book: primitiveAsObject" (77 primitiveSomeInstance) (78 primitiveNextInstance) (79 primitiveNewMethod) "Control Primitives (80-89)" (80 primitiveBlockCopy) (81 primitiveValue) (82 primitiveValueWithArgs) (83 primitivePerform) (84 primitivePerformWithArgs) (85 primitiveSignal) (86 primitiveWait) (87 primitiveResume) (88 primitiveSuspend) (89 primitiveFlushCache) "Input/Output Primitives (90-109)" (90 primitiveMousePoint) (91 primitiveTestDisplayDepth) "Blue Book: primitiveCursorLocPut" (92 primitiveSetDisplayMode) "Blue Book: primitiveCursorLink" (93 primitiveInputSemaphore) (94 primitiveGetNextEvent) "Blue Book: primitiveSampleInterval" (95 primitiveInputWord) (96 primitiveFail) "was primitiveObsoleteIndexedPrimitive; was primitiveCopyBits" (97 primitiveSnapshot) (98 primitiveStoreImageSegment) (99 primitiveLoadImageSegment) (100 primitivePerformInSuperclass) "Blue Book: primitiveSignalAtTick" (101 primitiveBeCursor) (102 primitiveBeDisplay) (103 primitiveScanCharacters) (104 primitiveFail) "was primitiveObsoleteIndexedPrimitive; was primitiveDrawLoop" (105 primitiveStringReplace) (106 primitiveScreenSize) (107 primitiveMouseButtons) (108 primitiveKbdNext) (109 primitiveKbdPeek) "System Primitives (110-119)" (110 primitiveEquivalent) (111 primitiveClass) (112 primitiveBytesLeft) (113 primitiveQuit) (114 primitiveExitToDebugger) (115 primitiveChangeClass) "Blue Book: primitiveOopsLeft" (116 primitiveFlushCacheByMethod) (117 primitiveExternalCall) (118 primitiveDoPrimitiveWithArgs) (119 primitiveFlushCacheBySelector) "Squeak 2.2 and earlier use 119. Squeak 2.3 and later use 116. Both are supported for backward compatibility." "Miscellaneous Primitives (120-127)" (120 primitiveCalloutToFFI) (121 primitiveImageName) (122 primitiveNoop) "Blue Book: primitiveImageVolume" (123 primitiveFail) "was primitiveValueUninterruptably" (124 primitiveLowSpaceSemaphore) (125 primitiveSignalAtBytesLeft) "Squeak Primitives Start Here" "Squeak Miscellaneous Primitives (128-149)" (126 primitiveDeferDisplayUpdates) (127 primitiveShowDisplayRect) (128 primitiveArrayBecome) (129 primitiveSpecialObjectsOop) (130 primitiveFullGC) (131 primitiveIncrementalGC) (132 primitiveObjectPointsTo) (133 primitiveSetInterruptKey) (134 primitiveInterruptSemaphore) (135 primitiveMillisecondClock) (136 primitiveSignalAtMilliseconds) (137 primitiveSecondsClock) (138 primitiveSomeObject) (139 primitiveNextObject) (140 primitiveBeep) (141 primitiveClipboardText) (142 primitiveVMPath) (143 primitiveShortAt) (144 primitiveShortAtPut) (145 primitiveConstantFill) "NOTE: When removing the obsolete indexed primitives, the following two should go become #primitiveIntegerAt / atPut" (146 primitiveFail) "primitiveReadJoystick" (147 primitiveFail) "primitiveWarpBits" (148 primitiveClone) (149 primitiveGetAttribute) "File Primitives (150-169) - NO LONGER INDEXED" (150 159 primitiveFail) (160 primitiveAdoptInstance) (161 primitiveArrayBecomeOneWayForceImmutables) (162 primitiveArrayBecomeForceImmutables) (163 primitiveGetImmutability) (164 primitiveSetImmutability) (165 primitiveIntegerAt) "hacked in here for now" (166 primitiveIntegerAtPut) (167 primitiveYield) (168 primitiveCopyObject) + (169 primitiveNotIdentical) - (169 primitiveFail) "Sound Primitives (170-199) - NO LONGER INDEXED" (170 185 primitiveFail) "Old closure primitives" (186 primitiveFail) "was primitiveClosureValue" (187 primitiveFail) "was primitiveClosureValueWithArgs" "Perform method directly" (188 primitiveExecuteMethodArgsArray) (189 primitiveExecuteMethod) "Sound Primitives (continued) - NO LONGER INDEXED" (190 194 primitiveFail) "Unwind primitives" (195 primitiveFindNextUnwindContext) (196 primitiveTerminateTo) (197 primitiveFindHandlerContext) (198 primitiveMarkUnwindMethod) (199 primitiveMarkHandlerMethod) "new closure primitives (were Networking primitives)" (200 primitiveClosureCopyWithCopiedValues) (201 primitiveClosureValue) "value" (202 primitiveClosureValue) "value:" (203 primitiveClosureValue) "value:value:" (204 primitiveClosureValue) "value:value:value:" (205 primitiveClosureValue) "value:value:value:value:" (206 primitiveClosureValueWithArgs) "valueWithArguments:" (207 209 primitiveFail) "reserved for Cog primitives" (210 primitiveAt) "Compatibility with Cog StackInterpreter Context primitives" (211 primitiveAtPut) "Compatibility with Cog StackInterpreter Context primitives" (212 primitiveSize) "Compatibility with Cog StackInterpreter Context primitives" (213 219 primitiveFail) "reserved for Cog primitives" (220 primitiveFail) "reserved for Cog primitives" (221 primitiveClosureValueNoContextSwitch) "valueNoContextSwitch" (222 primitiveClosureValueNoContextSwitch) "valueNoContextSwitch:" (223 225 primitiveFail) "reserved for Cog primitives" "Newsqueak debug primitives" (226 primitiveHeaderWords) "Used to encode protected access" (227 primitiveFail) "Other Primitives (228-249)" (228 primitiveFail) (229 primitiveFail) (230 primitiveRelinquishProcessor) (231 primitiveForceDisplayUpdate) (232 primitiveFormPrint) (233 primitiveSetFullScreen) (234 primitiveFail) "primBitmapdecompressfromByteArrayat" (235 primitiveFail) "primStringcomparewithcollated" (236 primitiveFail) "primSampledSoundconvert8bitSignedFromto16Bit" (237 primitiveFail) "primBitmapcompresstoByteArray" (238 241 primitiveFail) "serial port primitives" (242 primitiveFail) (243 primitiveFail) "primStringtranslatefromtotable" (244 primitiveFail) "primStringfindFirstInStringinSetstartingAt" (245 primitiveFail) "primStringindexOfAsciiinStringstartingAt" (246 primitiveFail) "primStringfindSubstringinstartingAtmatchTable" (247 primitiveSnapshotEmbedded) (248 primitiveInvokeObjectAsMethod) (249 primitiveArrayBecomeOneWayCopyHash) "VM Implementor Primitives (250-255)" (250 primitiveClearVMProfile) (251 primitiveControlVMProfiling "primitiveStartVMProfiling") (252 primitiveVMProfileSamplesInto "primitiveStopVMProfiling") (253 primitiveFail "N.B. primitiveCollectCogCodeConstituents in CoInterpreter below") (254 primitiveVMParameter) (255 primitiveFail) "Quick Push Const Methods" (256 nil) "primitivePushSelf" (257 nil) "primitivePushTrue" (258 nil) "primitivePushFalse" (259 nil) "primitivePushNil" (260 nil) "primitivePushMinusOne" (261 nil) "primitivePushZero" (262 nil) "primitivePushOne" (263 nil) "primitivePushTwo" "Quick Push Const Methods" (264 519 nil) "primitiveLoadInstVar" (520 primitiveFail) "MIDI Primitives (521-539) - NO LONGER INDEXED" (521 529 primitiveFail) (530 539 primitiveFail) "reserved for extended MIDI primitives" "Experimental Asynchrous File Primitives - NO LONGER INDEXED" (540 545 primitiveFail) "Used to encode private access" (546 primitiveFail) (547 primitiveFail) "Pen Tablet Primitives - NO LONGER INDEXED" (548 549 primitiveFail) "Sound Codec Primitives - NO LONGER INDEXED" (550 569 primitiveFail) "External primitive support primitives" (570 primitiveFlushExternalPrimitives) (571 primitiveUnloadModule) (572 primitiveListBuiltinModule) (573 primitiveListExternalModule) (574 primitiveFail) "reserved for addl. external support prims" "Unassigned Primitives" (575 primitiveFail)). ! Item was added: + ----- Method: NewspeakInterpreter>>primitiveNotIdentical (in category 'object access primitives') ----- + primitiveNotIdentical + "is the receiver/first argument not the same object as the (last) argument?. + pop argumentCount because this can be used as a mirror primitive." + | thisObject otherObject | + otherObject := self stackValue: 1. + thisObject := self stackTop. + self pop: argumentCount + 1 thenPushBool: thisObject ~= otherObject! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForSqueakV3 (in category 'class initialization') ----- initializePrimitiveTableForSqueakV3 "Initialize the table of primitive generators. This does not include normal primitives implemened in the coInterpreter." "SimpleStackBasedCogit initializePrimitiveTableForSqueakV3" MaxCompiledPrimitiveIndex := 222. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" (1 genPrimitiveAdd 1) (2 genPrimitiveSubtract 1) (3 genPrimitiveLessThan 1) (4 genPrimitiveGreaterThan 1) (5 genPrimitiveLessOrEqual 1) (6 genPrimitiveGreaterOrEqual 1) (7 genPrimitiveEqual 1) (8 genPrimitiveNotEqual 1) (9 genPrimitiveMultiply 1 processorHasMultiply:) (10 genPrimitiveDivide 1 processorHasDivQuoRem:) (11 genPrimitiveMod 1 processorHasDivQuoRem:) (12 genPrimitiveDiv 1 processorHasDivQuoRem:) (13 genPrimitiveQuo 1 processorHasDivQuoRem:) (14 genPrimitiveBitAnd 1) (15 genPrimitiveBitOr 1) (16 genPrimitiveBitXor 1) (17 genPrimitiveBitShift 1) "(18 primitiveMakePoint)" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 primitiveFloatAt)" "(39 primitiveFloatAtPut)" (40 genPrimitiveAsFloat 0 processorHasDoublePrecisionFloatingPointSupport:) (41 genPrimitiveFloatAdd 1 processorHasDoublePrecisionFloatingPointSupport:) (42 genPrimitiveFloatSubtract 1 processorHasDoublePrecisionFloatingPointSupport:) (43 genPrimitiveFloatLessThan 1 processorHasDoublePrecisionFloatingPointSupport:) (44 genPrimitiveFloatGreaterThan 1 processorHasDoublePrecisionFloatingPointSupport:) (45 genPrimitiveFloatLessOrEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (46 genPrimitiveFloatGreaterOrEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (47 genPrimitiveFloatEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (48 genPrimitiveFloatNotEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (49 genPrimitiveFloatMultiply 1 processorHasDoublePrecisionFloatingPointSupport:) (50 genPrimitiveFloatDivide 1 processorHasDoublePrecisionFloatingPointSupport:) "(51 primitiveTruncated)" "(52 primitiveFractionalPart)" "(53 primitiveExponent)" "(54 primitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0 processorHasDoublePrecisionFloatingPointSupport:) "(56 primitiveSine)" "(57 primitiveArctan)" "(58 primitiveLogN)" "(59 primitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) "(61 primitiveAtPut)" (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) "(64 primitiveStringAtPut)" "The stream primitives no longer pay their way; normal Smalltalk code is faster." "(65 primitiveFail)""was primitiveNext" "(66 primitiveFail)" "was primitiveNextPut" "(67 primitiveFail)" "was primitiveAtEnd" "StorageManagement Primitives (68-79)" "(68 primitiveObjectAt)" "(69 primitiveObjectAtPut)" "(70 primitiveNew)" "(71 primitiveNewWithArg)" "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" "(79 primitiveNewMethod)" "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" "(83 primitivePerform)" "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "Input/Output Primitives (90-109); We won't compile any of these" "System Primitives (110-119)" (110 genPrimitiveEquivalent 1) "(111 genPrimitiveClass)" "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" "Squeak 2.2 and earlier use 119. Squeak 2.3 and later use 116. Both are supported for backward compatibility." "Miscellaneous Primitives (120-127); We won't compile any of these" "Squeak Primitives Start Here" "Squeak Miscellaneous Primitives (128-149); We won't compile any of these" "File Primitives (150-169) - NO LONGER INDEXED; We won't compile any of these" + (169 genPrimitiveNotEquivalent 1) "Sound Primitives (170-199) - NO LONGER INDEXED; We won't compile any of these" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Sound Primitives (continued) - NO LONGER INDEXED; We won't compile any of these" "(190 194 primitiveFail)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives (were Networking primitives)" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue) "value" (202 genPrimitiveClosureValue) "value:" (203 genPrimitiveClosureValue) "value:value:" (204 genPrimitiveClosureValue) "value:value:value:" (205 genPrimitiveClosureValue) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" "(207 209 primitiveFail)" "reserved for Cog primitives" "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(213 217 primitiveFail)" "reserved for Cog primitives" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue) "valueNoContextSwitch" (222 genPrimitiveClosureValue) "valueNoContextSwitch:" "(223 229 primitiveFail)" "reserved for Cog primitives" )! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveEquivalent (in category 'primitive generators') ----- genPrimitiveEquivalent "Stack looks like receiver (also in ResultReceiverReg) arg return address" | jumpFalse | <var: #jumpFalse type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. self CmpR: TempReg R: ReceiverResultReg. jumpFalse := self JumpNonZero: 0. self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. + jumpFalse jmpTarget: (self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) + objRef: objectMemory falseObject). - jumpFalse jmpTarget: (self - annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) - objRef: objectMemory falseObject). self RetN: BytesPerWord * 2. ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPrimitiveNotEquivalent (in category 'primitive generators') ----- + genPrimitiveNotEquivalent + "Stack looks like + receiver (also in ResultReceiverReg) + arg + return address" + | jumpFalse | + <var: #jumpFalse type: #'AbstractInstruction *'> + self MoveMw: BytesPerWord r: SPReg R: TempReg. + self CmpR: TempReg R: ReceiverResultReg. + jumpFalse := self JumpZero: 0. + self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) + objRef: objectMemory trueObject. + self flag: 'currently caller pushes result'. + self RetN: BytesPerWord * 2. + jumpFalse jmpTarget: (self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) + objRef: objectMemory falseObject). + self RetN: BytesPerWord * 2. + ^0! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter>>commonSend (in category 'message sending') ----- commonSend "Send a message, starting lookup with the receiver's class." "Assume: messageSelector and argumentCount have been set, and that the receiver and arguments have been pushed onto the stack," "Note: This method is inlined into the interpreter dispatch loop." <sharedCodeNamed: 'commonSend' inCase: 131> self sendBreak: messageSelector + BaseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: (self internalStackValue: argumentCount). + self printSends ifTrue: + [self printActivationNameForSelector: messageSelector startClass: lkupClass; cr]. self internalFindNewMethod. self internalExecuteNewMethod. self fetchNextBytecode! Item was added: + ----- Method: StackInterpreter>>findClassForSelector:lookupClass:do: (in category 'debug support') ----- + findClassForSelector: aSelector lookupClass: startClass do: unaryBlock + "Search startClass' class hierarchy looking for aSelector and if found, evaluate unaryBlock + with the class where the selector is found. Otherwise evaluate unaryBlock with nil." + | currClass classDict classDictSize i | + currClass := startClass. + [classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: currClass. + classDictSize := objectMemory fetchWordLengthOf: classDict. + i := SelectorStart. + [i < classDictSize] whileTrue: + [aSelector = (objectMemory fetchPointer: i ofObject: classDict) ifTrue: + [^unaryBlock value: currClass]. + i := i + 1]. + currClass := self superclassOf: currClass. + currClass = objectMemory nilObject] whileFalse. + ^unaryBlock value: nil "selector not found in superclass chain" + ! Item was added: + ----- Method: StackInterpreter>>findSelectorAndClassForMethod:lookupClass:do: (in category 'debug support') ----- + findSelectorAndClassForMethod: meth lookupClass: startClass do: binaryBlock + "Search startClass' class hierarchy searching for method and if found, evaluate aBinaryBlock + with the selector and class where the method is found. Otherwise evaluate aBinaryBlock + with doesNotUnderstand: and nil." + | currClass classDict classDictSize methodArray i | + currClass := startClass. + [classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: currClass. + classDictSize := objectMemory fetchWordLengthOf: classDict. + methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. + i := 0. + [i <= (classDictSize - SelectorStart)] whileTrue: + [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: + [^binaryBlock + value: (objectMemory fetchPointer: i + SelectorStart ofObject: classDict) + value: currClass]. + i := i + 1]. + currClass := self superclassOf: currClass. + currClass = objectMemory nilObject] whileFalse. + ^binaryBlock "method not found in superclass chain" + value: (objectMemory splObj: SelectorDoesNotUnderstand) + value: nil! Item was changed: ----- Method: StackInterpreter>>primitiveObject:perform:withArguments:lookedUpIn: (in category 'control primitives') ----- primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClass "Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:, object:perform:withArgs:inClass: et al. Answer nil on success. NOTE: The case of doesNotUnderstand: is not a failure to perform. The only failures are arg types and consistency of argumentCount. Since we're in the stack VM we can assume there is space to push the arguments provided they are within limits (max argument count is 15). We can therefore deal with the arbitrary amount of state to remove from the stack (lookup class, selector, mirror receiver) and arbitrary argument orders by deferring popping anything until we know whether the send has succeeded. So on failure we merely have to remove the actual receiver and arguments pushed, and on success we have to slide the actual receiver and arguments down to replace the original ones." | arraySize performArgCount delta | (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. "Check if number of arguments is reasonable; MaxNumArgs isn't available so just use LargeContextSize" arraySize := objectMemory fetchWordLengthOf: argumentArray. arraySize > (LargeContextSize / BytesPerWord) ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. performArgCount := argumentCount. "Push newMethod to save it in case of failure, then push the actual receiver and args out of the array." self push: newMethod. self push: actualReceiver. "Copy the arguments to the stack, and execute" 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. argumentCount := arraySize. messageSelector := selector. self sendBreak: messageSelector + BaseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: actualReceiver. + self printSends ifTrue: + [self printActivationNameForSelector: messageSelector startClass: lookupClass; cr]. self findNewMethodInClass: lookupClass. "Only test CompiledMethods for argument count - any other objects playacting as CMs will have to take their chances" ((objectMemory isOopCompiledMethod: newMethod) and: [(self argumentCountOf: newMethod) ~= argumentCount]) ifTrue: ["Restore the state by popping all those array entries and pushing back the selector and array, and fail" self pop: arraySize + 1. newMethod := self popStack. ^self primitiveFailFor: PrimErrBadNumArgs]. "Cannot fail this primitive from here-on. Slide the actual receiver and arguments down to replace the perform arguments and saved newMethod and then execute the new method. Use argumentCount not arraySize because an MNU may have changed it." delta := BytesPerWord * (performArgCount + 2). "+2 = receiver + saved newMethod" argumentCount * BytesPerWord to: 0 by: BytesPerWord negated do: [:offset| stackPages longAt: stackPointer + offset + delta put: (stackPages longAt: stackPointer + offset)]. self pop: performArgCount + 2. self executeNewMethod. self initPrimCall. "Recursive xeq affects primErrorCode" ^nil! Item was added: + ----- Method: StackInterpreter>>printActivationNameForMethod:startClass:isBlock:firstTemporary: (in category 'debug printing') ----- + printActivationNameForMethod: aMethod startClass: startClass isBlock: isBlock firstTemporary: maybeMessage + | methClass methodSel | + <inline: false> + isBlock ifTrue: + [self print: '[] in ']. + self findSelectorAndClassForMethod: aMethod + lookupClass: startClass + do: [:sel :class| + methodSel := sel. + methClass := class]. + ((self addressCouldBeOop: startClass) and: [methClass notNil]) + ifTrue: + [startClass = methClass + ifTrue: [self printNameOfClass: methClass count: 5] + ifFalse: + [self printNameOfClass: startClass count: 5. + self printChar: $(. + self printNameOfClass: methClass count: 5. + self printChar: $)]] + ifFalse: [self print: 'INVALID CLASS']. + self printChar: $>. + (objectMemory addressCouldBeOop: methodSel) + ifTrue: + [(objectMemory isBytes: methodSel) + ifTrue: [self printStringOf: methodSel] + ifFalse: [self printOopShort: methodSel]] + ifFalse: [self print: 'INVALID SELECTOR']. + (methodSel = (objectMemory splObj: SelectorDoesNotUnderstand) + and: [(objectMemory addressCouldBeObj: maybeMessage) + and: [(objectMemory fetchClassOfNonInt: maybeMessage) = (objectMemory splObj: ClassMessage)]]) ifTrue: + ["print arg message selector" + methodSel := objectMemory fetchPointer: MessageSelectorIndex ofObject: maybeMessage. + self print: ' '. + self printStringOf: methodSel]! Item was added: + ----- Method: StackInterpreter>>printActivationNameForSelector:startClass: (in category 'debug printing') ----- + printActivationNameForSelector: aSelector startClass: startClass + | methClass | + <inline: false> + (objectMemory addressCouldBeObj: startClass) + ifTrue: + [self findClassForSelector: aSelector + lookupClass: startClass + do: [:class| methClass := class]. + (methClass isNil or: [startClass = methClass]) + ifTrue: + [self printNameOfClass: methClass count: 5.. + self printChar: $>. + methClass ifNil: + [self printStringOf: (objectMemory splObj: SelectorDoesNotUnderstand). + self print: ' ']] + ifFalse: + [self printNameOfClass: startClass count: 5. + self printChar: $(. + self printNameOfClass: methClass count: 5. + self printChar: $). + self printChar: $>]] + ifFalse: [self print: 'INVALID CLASS']. + (objectMemory addressCouldBeOop: aSelector) + ifTrue: + [(objectMemory isBytes: aSelector) + ifTrue: [self printStringOf: aSelector] + ifFalse: [self printOopShort: aSelector]] + ifFalse: [self print: 'INVALID SELECTOR']! Item was added: + ----- Method: StackInterpreter>>printSends (in category 'debug printing') ----- + printSends + ^false! Item was changed: ----- Method: StackInterpreter>>stObject:at: (in category 'indexing primitive support') ----- stObject: array at: index "Return what ST would return for <obj> at: index." | hdr fmt totalLength fixedFields stSize | <inline: false> hdr := objectMemory baseHeader: array. fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: array baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength. (fmt = 3 and: [objectMemory isContextHeader: hdr]) ifTrue: + [stSize := self stackPointerForMaybeMarriedContext: array. - [stSize := self fetchStackPointerOf: array. ((self oop: index isGreaterThanOrEqualTo: 1) and: [(self oop: index isLessThanOrEqualTo: stSize) and: [self isStillMarriedContext: array]]) ifTrue: [^self noInlineTemporary: index - 1 in: (self frameOfMarriedContext: array)]] ifFalse: [stSize := totalLength - fixedFields]. ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [^self subscript: array with: (index + fixedFields) format: fmt] ifFalse: [self primitiveFailFor: PrimErrBadIndex. ^ 0]! Item was changed: ----- Method: StackInterpreter>>stObject:at:put: (in category 'indexing primitive support') ----- stObject: array at: index put: value "Do what ST would return for <obj> at: index put: value." | hdr fmt totalLength fixedFields stSize | <inline: false> hdr := objectMemory baseHeader: array. fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: array baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength. (fmt = 3 and: [objectMemory isContextHeader: hdr]) ifTrue: + [stSize := self stackPointerForMaybeMarriedContext: array. - [stSize := self fetchStackPointerOf: array. ((self oop: index isGreaterThanOrEqualTo: 1) and: [(self oop: index isLessThanOrEqualTo: stSize) and: [self isStillMarriedContext: array]]) ifTrue: [self noInlineTemporary: index - 1 in: (self frameOfMarriedContext: array) put: value. ^self]] ifFalse: [stSize := totalLength - fixedFields]. ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [self subscript: array with: (index + fixedFields) storing: value format: fmt] ifFalse: [self primitiveFailFor: PrimErrBadIndex]! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveContextAt (in category 'indexing primitives') ----- primitiveContextAt "Special version of primitiveAt for accessing contexts. Written to be varargs for use from mirror primitives." | index value aContext spouseFP hdr fmt totalLength fixedFields stSize | <inline: false> <var: #spouseFP type: #'char *'> index := self stackTop. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. index := objectMemory integerValueOf: index. aContext := self stackValue: 1. "Duplicating much of stObject:at:put: here allows stObject:at:put: to omit tests for contexts." hdr := objectMemory baseHeader: aContext. (objectMemory isContextHeader: hdr) ifFalse: "might be an instance of a subclass" [value := self stObject: aContext at: index. ^self pop: argumentCount thenPush: value]. self externalWriteBackHeadFramePointers. (self isStillMarriedContext: aContext) ifFalse: [fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: aContext baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: aContext format: fmt length: totalLength. + stSize := self fetchStackPointerOf: aContext. - stSize := self stackPointerForMaybeMarriedContext: aContext. (index between: 1 and: stSize) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. value := self subscript: aContext with: (index + fixedFields) format: fmt. ^self pop: argumentCount + 1 thenPush: value]. spouseFP := self frameOfMarriedContext: aContext. (index between: 1 and: (self stackPointerIndexForFrame: spouseFP)) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. value := self temporary: index - 1 in: spouseFP. self pop: argumentCount + 1 thenPush: value! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveContextAtPut (in category 'indexing primitives') ----- primitiveContextAtPut "Special version of primitiveAtPut for accessing contexts. Written to be varargs for use from mirror primitives." | index value aContext spouseFP hdr fmt totalLength fixedFields stSize | <inline: false> <var: #spouseFP type: #'char *'> value := self stackTop. index := self stackValue: 1. aContext := self stackValue: 2. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. "Duplicating much of stObject:at:put: here allows stObject:at:put: to omit tests for contexts." hdr := objectMemory baseHeader: aContext. index := objectMemory integerValueOf: index. (objectMemory isContextHeader: hdr) ifFalse: "might be an instance of a subclass" [self stObject: aContext at: index put: value. ^self pop: argumentCount + 1 thenPush: value]. self externalWriteBackHeadFramePointers. (self isStillMarriedContext: aContext) ifFalse: [fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: aContext baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: aContext format: fmt length: totalLength. + stSize := self fetchStackPointerOf: aContext. - stSize := self stackPointerForMaybeMarriedContext: aContext. (index between: 1 and: stSize) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. self subscript: aContext with: (index + fixedFields) storing: value format: fmt. ^self pop: argumentCount + 1 thenPush: value]. spouseFP := self frameOfMarriedContext: aContext. (index between: 1 and: (self stackPointerIndexForFrame: spouseFP)) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. self temporary: index - 1 in: spouseFP put: value. ^self pop: argumentCount + 1 thenPush: value! Item was changed: ----- Method: StackInterpreterPrimitives>>primitivePerform (in category 'control primitives') ----- primitivePerform <returnTypeC: #void> | performSelector newReceiver lookupClass performMethod | performSelector := messageSelector. performMethod := newMethod. messageSelector := self stackValue: argumentCount - 1. newReceiver := self stackValue: argumentCount. "NOTE: the following lookup may fail and be converted to #doesNotUnderstand:, so we must adjust argumentCount and slide args now, so that will work." "Slide arguments down over selector" argumentCount := argumentCount - 1. argumentCount to: 1 by: -1 do: [:i| stackPages longAt: stackPointer + (i * BytesPerWord) put: (stackPages longAt: stackPointer + ((i - 1) * BytesPerWord))]. self pop: 1. lookupClass := objectMemory fetchClassOf: newReceiver. self sendBreak: messageSelector + BaseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: newReceiver. + self printSends ifTrue: + [self printActivationNameForSelector: messageSelector startClass: lookupClass; cr]. self findNewMethodInClass: lookupClass. "Only test CompiledMethods for argument count - other objects will have to take their chances" ((objectMemory isOopCompiledMethod: newMethod) and: [(self argumentCountOf: newMethod) = argumentCount]) ifFalse: ["Slide the args back up (sigh) and re-insert the selector." self unPop: 1. 1 to: argumentCount by: 1 do: [:i | stackPages longAt: stackPointer + ((i - 1) * BytesPerWord) put: (stackPages longAt: stackPointer + (i * BytesPerWord))]. stackPages longAt: stackPointer + (argumentCount * BytesPerWord) put: messageSelector. argumentCount := argumentCount + 1. newMethod := performMethod. messageSelector := performSelector. ^self primitiveFail]. self executeNewMethod. "Recursive xeq affects primErrorCode" self initPrimCall! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPrimitiveNotEquivalent (in category 'primitive generators') ----- + genPrimitiveNotEquivalent + "Receiver and arg in registers. + Stack looks like + return address" + | jumpFalse | + <var: #jumpFalse type: #'AbstractInstruction *'> + self CmpR: Arg0Reg R: ReceiverResultReg. + jumpFalse := self JumpZero: 0. + self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) + objRef: objectMemory trueObject. + self RetN: 0. + jumpFalse jmpTarget: (self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) + objRef: objectMemory falseObject). + self RetN: 0. + ^0!

1 0

Auto Reply: Auto Reply: Re: [squeak-dev] [Vm-dev] Re: [Pharo-project] About ~= and ~~
by michael.haupt＠oracle.com 19 Oct '11

19 Oct '11

I am on vacation until (including) Oct 31, 2011, with occasional low-bandwidth internet connection.

1 0

Auto Reply: Re: [squeak-dev] [Vm-dev] Re: [Pharo-project] About ~= and ~~
by michael.haupt＠oracle.com 19 Oct '11

19 Oct '11

I am on vacation until (including) Oct 31, 2011, with occasional low-bandwidth internet connection.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2011