Vm-dev November 2015

vm-dev@lists.squeakfoundation.org

32 participants
118 discussions

VM Maker: VMMaker.oscog-eem.1535.mcz
by commits＠source.squeak.org 01 Dec '15

01 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1535.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1535 Author: eem Time: 30 November 2015, 3:57:15.946 pm UUID: eceebca6-4bc3-4640-b1eb-18e0ea917247 Ancestors: VMMaker.oscog-rmacnak.1534 Fix maybeInlinePositive32BitIntegerFor: and hence positive64BitIntegerFor: for values that look like 32-bit negative SmallIntegers. Nuke broken and obsoleted by Tim's new CPIC the DumpJump*: Cogit assembler ops. =============== Diff against VMMaker.oscog-rmacnak.1534 =============== Item was removed: - ----- Method: Cogit>>DumpJumpLong: (in category 'abstract instructions') ----- - DumpJumpLong: jumpTarget - "Convenience conflation of JumpLong: & dumpLiterals for PIC generation. - Literals must be dumped early and often to keep each PIC case the same size." - <inline: true> - <returnTypeC: #'AbstractInstruction *'> - | inst | - <var: 'inst' type: #'AbstractInstruction *'> - inst := self gen: JumpLong operand: jumpTarget asInteger. - literalsManager dumpLiterals: false. - ^inst! Item was removed: - ----- Method: Cogit>>DumpJumpLongZero: (in category 'abstract instructions') ----- - DumpJumpLongZero: jumpTarget - "Convenience conflation of JumpLongZero: & dumpLiterals for PIC generation. - Literals must be dumped early and often to keep each PIC case the same size." - <inline: true> - <returnTypeC: #'AbstractInstruction *'> - | inst | - <var: 'inst' type: #'AbstractInstruction *'> - inst := self gen: JumpLongZero operand: jumpTarget asInteger. - literalsManager dumpLiterals: false. - ^inst! Item was changed: ----- Method: StackInterpreter>>maybeInlinePositive32BitIntegerFor: (in category 'primitive support') ----- maybeInlinePositive32BitIntegerFor: integerValue "N.B. will *not* cause a GC. integerValue is interpreted as POSITIVE, e.g. as the result of Bitmap>at:." <notOption: #Spur64BitMemoryManager> | newLargeInteger | self deny: objectMemory hasSixtyFourBitImmediates. + (integerValue asInteger >= 0 - (integerValue >= 0 and: [objectMemory isIntegerValue: integerValue]) ifTrue: [^objectMemory integerObjectOf: integerValue]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex format: (objectMemory byteFormatForNumBytes: 4) numSlots: 1. self cppIf: VMBIGENDIAN ifTrue: [objectMemory storeByte: 3 ofObject: newLargeInteger withValue: (integerValue >> 24 bitAnd: 16rFF); storeByte: 2 ofObject: newLargeInteger withValue: (integerValue >> 16 bitAnd: 16rFF); storeByte: 1 ofObject: newLargeInteger withValue: (integerValue >> 8 bitAnd: 16rFF); storeByte: 0 ofObject: newLargeInteger withValue: (integerValue ">> 0" bitAnd: 16rFF)] ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: integerValue]. ^newLargeInteger!

1 0

[commit][3509] Get the icons & in-plist-ersion right for the Spur Cocoa build
by commits＠squeakvm.org 30 Nov '15

30 Nov '15

Revision: 3509 Author: eliot Date: 2015-11-30 12:53:12 -0800 (Mon, 30 Nov 2015) Log Message: ----------- Get the icons & in-plist-ersion right for the Spur Cocoa build Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm Added Paths: ----------- branches/Cog/platforms/iOS/vm/OSX/GreenCogSqueak.icns Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist 2015-11-30 20:14:11 UTC (rev 3508) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist 2015-11-30 20:53:12 UTC (rev 3509) @@ -366,7 +366,9 @@ <key>CFBundleExecutable</key> <string>Squeak</string> <key>CFBundleGetInfoString</key> - <string>Squeak Cog Spur http://www.mirandabanda.org</string> + <string>Squeak Cog 5.0.0 http://www.mirandabanda.org</string> + <key>CFBundleIconFile</key> + <string>GreenCogSqueak.icns</string> <key>CFBundleIdentifier</key> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> @@ -376,7 +378,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>5.0.0</string> + <string>5.0.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-30 20:14:11 UTC (rev 3508) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-30 20:53:12 UTC (rev 3509) @@ -8,6 +8,14 @@ /* Begin PBXBuildFile section */ 731F205E1C0CDE2300A27A22 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = 731F205D1C0CDE2300A27A22 /* version.c */; }; + 735F2EC71C0CE9FE0080B9A5 /* SqueakChanges.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414421F10BC89440088F8AC /* SqueakChanges.icns */; }; + 735F2EC81C0CEA010080B9A5 /* SqueakGeneric.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422010BC89440088F8AC /* SqueakGeneric.icns */; }; + 735F2EC91C0CEA020080B9A5 /* SqueakImage.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422110BC89440088F8AC /* SqueakImage.icns */; }; + 735F2ECA1C0CEA030080B9A5 /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422210BC89440088F8AC /* SqueakPlugin.icns */; }; + 735F2ECB1C0CEA040080B9A5 /* SqueakProject.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422310BC89440088F8AC /* SqueakProject.icns */; }; + 735F2ECC1C0CEA050080B9A5 /* SqueakScript.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422410BC89440088F8AC /* SqueakScript.icns */; }; + 735F2ECD1C0CEA050080B9A5 /* SqueakSources.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422510BC89440088F8AC /* SqueakSources.icns */; }; + 735F2ED01C0CEAAC0080B9A5 /* GreenCogSqueak.icns in Resources */ = {isa = PBXBuildFile; fileRef = 735F2ECF1C0CEAAC0080B9A5 /* GreenCogSqueak.icns */; }; 9402DD6010CE0C16005C2102 /* SqViewBitmapConversion.m in Sources */ = {isa = PBXBuildFile; fileRef = 9402DD5F10CE0C16005C2102 /* SqViewBitmapConversion.m */; }; 9402DD7010CE0E91005C2102 /* SqViewClut.m in Sources */ = {isa = PBXBuildFile; fileRef = 9402DD6F10CE0E91005C2102 /* SqViewClut.m */; }; 9422C3B51AFFFAC500448DC0 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9422C3B31AFFFAC500448DC0 /* Localizable.strings */; }; @@ -212,6 +220,7 @@ 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = vm/Common/main.m; sourceTree = "<group>"; }; 731F205D1C0CDE2300A27A22 /* version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = version.c; path = vm/Common/version.c; sourceTree = "<group>"; }; + 735F2ECF1C0CEAAC0080B9A5 /* GreenCogSqueak.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = GreenCogSqueak.icns; path = OSX/GreenCogSqueak.icns; sourceTree = "<group>"; }; 9400325B0DEF3936002FA1C4 /* sqDummyaio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqDummyaio.h; sourceTree = "<group>"; }; 9400325C0DEF3936002FA1C4 /* sqDummyaio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqDummyaio.c; sourceTree = "<group>"; }; 9402DD5E10CE0C16005C2102 /* SqViewBitmapConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqViewBitmapConversion.h; path = vm/OSX/SqViewBitmapConversion.h; sourceTree = "<group>"; }; @@ -665,6 +674,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 735F2ECF1C0CEAAC0080B9A5 /* GreenCogSqueak.icns */, 94FA4CE41BB4DE1400C1BE8F /* Images-2.xcassets */, 9422C3B31AFFFAC500448DC0 /* Localizable.strings */, 947E64DC10AA18FE00D3B69E /* MainMenu.xib */, @@ -1553,6 +1563,14 @@ 9422C3B51AFFFAC500448DC0 /* Localizable.strings in Resources */, 94FA4CE51BB4DE1400C1BE8F /* Images-2.xcassets in Resources */, 9487740610C64DD800E4AEC5 /* Credits.rtf in Resources */, + 735F2EC71C0CE9FE0080B9A5 /* SqueakChanges.icns in Resources */, + 735F2EC81C0CEA010080B9A5 /* SqueakGeneric.icns in Resources */, + 735F2EC91C0CEA020080B9A5 /* SqueakImage.icns in Resources */, + 735F2ECA1C0CEA030080B9A5 /* SqueakPlugin.icns in Resources */, + 735F2ECB1C0CEA040080B9A5 /* SqueakProject.icns in Resources */, + 735F2ECC1C0CEA050080B9A5 /* SqueakScript.icns in Resources */, + 735F2ECD1C0CEA050080B9A5 /* SqueakSources.icns in Resources */, + 735F2ED01C0CEAAC0080B9A5 /* GreenCogSqueak.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-11-30 20:14:11 UTC (rev 3508) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-11-30 20:53:12 UTC (rev 3509) @@ -66,7 +66,7 @@ else cp -Rp build/$BUILD_CONFIGURATION/$APP "$DEST" fi -../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist" +../../scripts/versionInfoPlist ../../platforms SqueakCogSpur32x86.plist "$DEST/Contents/Info.plist" # Build the Float plugin echo Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Nov 30 12:12:08 PST 2015 + Mon Nov 30 12:50:35 PST 2015 Copied: branches/Cog/platforms/iOS/vm/OSX/GreenCogSqueak.icns (from rev 3503, branches/Cog/platforms/Mac OS/Resources/GreenCogSqueak.icns) =================================================================== (Binary files differ)

1 0

[commit][3508] Implement full help and version information for the Cocoa VM .
by commits＠squeakvm.org 30 Nov '15

30 Nov '15

Revision: 3508 Author: eliot Date: 2015-11-30 12:14:11 -0800 (Mon, 30 Nov 2015) Log Message: ----------- Implement full help and version information for the Cocoa VM. Copy rather than move the build .app when composing the VM .app (as yet 32-bit Spur build only). Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m branches/Cog/platforms/iOS/vm/Common/main.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m branches/Cog/platforms/unix/vm/sqUnixMain.c Added Paths: ----------- branches/Cog/platforms/iOS/vm/Common/version.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-30 20:14:11 UTC (rev 3508) @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 731F205E1C0CDE2300A27A22 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = 731F205D1C0CDE2300A27A22 /* version.c */; }; 9402DD6010CE0C16005C2102 /* SqViewBitmapConversion.m in Sources */ = {isa = PBXBuildFile; fileRef = 9402DD5F10CE0C16005C2102 /* SqViewBitmapConversion.m */; }; 9402DD7010CE0E91005C2102 /* SqViewClut.m in Sources */ = {isa = PBXBuildFile; fileRef = 9402DD6F10CE0E91005C2102 /* SqViewClut.m */; }; 9422C3B51AFFFAC500448DC0 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9422C3B31AFFFAC500448DC0 /* Localizable.strings */; }; @@ -210,6 +211,7 @@ 1D3623250D0F684500981E51 /* SqueakNoOGLIPhoneAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SqueakNoOGLIPhoneAppDelegate.m; sourceTree = "<group>"; }; 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = vm/Common/main.m; sourceTree = "<group>"; }; + 731F205D1C0CDE2300A27A22 /* version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = version.c; path = vm/Common/version.c; sourceTree = "<group>"; }; 9400325B0DEF3936002FA1C4 /* sqDummyaio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqDummyaio.h; sourceTree = "<group>"; }; 9400325C0DEF3936002FA1C4 /* sqDummyaio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqDummyaio.c; sourceTree = "<group>"; }; 9402DD5E10CE0C16005C2102 /* SqViewBitmapConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqViewBitmapConversion.h; path = vm/OSX/SqViewBitmapConversion.h; sourceTree = "<group>"; }; @@ -773,6 +775,7 @@ 9452D5EF0E044AC2000AD792 /* Common */ = { isa = PBXGroup; children = ( + 731F205D1C0CDE2300A27A22 /* version.c */, 29B97316FDCFA39411CA2CEA /* main.m */, 9478E0220EC8D957007096A7 /* plugins */, 9452D5F00E044AD1000AD792 /* Classes */, @@ -1759,6 +1762,7 @@ 9463C1D71AEE1693009C5CE5 /* study.c in Sources */, 94584FDB10F02378001401E7 /* sqMacExtendedClipboard.m in Sources */, 943B9CA11235C5120056205E /* sqMacHostWindow.m in Sources */, + 731F205E1C0CDE2300A27A22 /* version.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-11-30 20:14:11 UTC (rev 3508) @@ -62,9 +62,9 @@ export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then - mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" + cp -Rp build/$BUILD_CONFIGURATION/$APP/* "$DEST" else - mv build/$BUILD_CONFIGURATION/$APP "$DEST" + cp -Rp build/$BUILD_CONFIGURATION/$APP "$DEST" fi ../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist" Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Nov 24 15:09:27 PST 2015 + Mon Nov 30 12:12:08 PST 2015 Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2015-11-30 20:14:11 UTC (rev 3508) @@ -355,7 +355,11 @@ static void printUsageNotes(void) { - printf(" If `-memory' is not specified then the heap will grow dynamically.\n"); +#if SPURVM + printf(" If `-memory' or '-maxoldspace' are not specified then the heap will grow dynamically.\n"); +#else + printf(" If `-memory' is not specified then the heap will grow dynamically.\n"); +#endif printf(" <argument>s are ignored, but are processed by the " IMAGE_DIALECT_NAME " image.\n"); printf(" The first <argument> normally names a " IMAGE_DIALECT_NAME " `script' to execute.\n"); printf(" Precede <arguments> by `--' to use default image.\n"); Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m 2015-11-30 20:14:11 UTC (rev 3508) @@ -21,10 +21,10 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -48,7 +48,7 @@ #import <limits.h> #import "sqPlatformSpecific.h" -#if COGVM +#if STACKVM || COGVM #import "sqSCCSVersion.h" #else #import "sqMacV2Memory.h" @@ -60,25 +60,34 @@ #endif -#warning what about these guyes? +#ifdef BUILD_FOR_OSX /*** Variables -- globals for access from pluggable primitives ***/ EXPORT(int) argCnt= 0; EXPORT(char**) argVec= 0; EXPORT(char**) envVec= 0; +#endif extern sqSqueakAppDelegate *gDelegateApp; BOOL gQuitNowRightNow=NO; BOOL gSqueakHeadless=NO; +BOOL gNoSignalHandlers=NO; int gSqueakUseFileMappedMMAP=0; char gSqueakUntrustedDirectoryName[PATH_MAX]; char gSqueakTrustedDirectoryName[PATH_MAX]; +int blockOnError=0; extern sqInt printAllStacks(void); extern sqInt printCallStack(void); extern void dumpPrimTraceLog(void); extern BOOL NSApplicationLoad(void); +extern void pushOutputFile(char *); +extern void popOutputFile(void); +static void reportStackState(char *, char *, int, ucontext_t *); +static void block(); +static void *printRegisterState(ucontext_t *); + /* Print an error message, possibly a stack trace, and exit. */ /* Disable Intel compiler inlining of error which is used for breakpoints */ #pragma auto_inline off @@ -86,33 +95,26 @@ void error(char *msg) { - /* flag prevents recursive error when trying to print a broken stack */ - static sqInt printingStack = false; - - printf("\n%s\n\n", msg); - - if (ioOSThreadsEqual(ioCurrentOSThread(),getVMOSThread())) { - if (!printingStack) { - printingStack = true; - printf("\n\nSmalltalk stack dump:\n"); - printCallStack(); - } - } - else - printf("\nCan't dump Smalltalk stack. Not in VM thread\n"); - printf("\nMost recent primitives\n"); -# if COGVM - dumpPrimTraceLog(); -# endif + reportStackState(msg,0,0,0); + if (blockOnError) block(); abort(); } #pragma auto_inline on -/* - * Signal handlers - * - */ +static void +block() +{ struct timespec while_away_the_hours; + char pwd[PATH_MAX+1]; + printf("blocking e.g. to allow attaching debugger\n"); + printf("pid: %d pwd: %s vm:%s\n", + (int)getpid(), getcwd(pwd,PATH_MAX+1), argVec[0]); + while (1) { + while_away_the_hours.tv_sec = 3600; + nanosleep(&while_away_the_hours, 0); + } +} + /* Print an error message, possibly a stack trace, do /not/ exit. * Allows e.g. writing to a log file and stderr. */ @@ -125,28 +127,43 @@ # endif /* flag prevents recursive error when trying to print a broken stack */ static sqInt printingStack = false; - + printf("\n%s%s%s\n\n", msg, date ? " " : "", date ? date : ""); # if COGVM printf("%s\n\n", sourceVersionString('\n')); # endif - + # if !defined(NOEXECINFO) - printf("C stack backtrace:\n"); + printf("C stack backtrace & registers:\n"); + if (uap) { + addrs[0] = printRegisterState(uap); + depth = 1 + backtrace(addrs + 1, BACKTRACE_DEPTH); + } + else + depth = backtrace(addrs, BACKTRACE_DEPTH); +# if 1 /* Mac OS's backtrace_symbols_fd prints NULL byte droppings each line */ fflush(stdout); /* backtrace_symbols_fd uses unbuffered i/o */ - depth = backtrace(addrs, BACKTRACE_DEPTH); backtrace_symbols_fd(addrs, depth, fileno(stdout)); +# else + { int i; char **strings; + strings = backtrace_symbols(addrs, depth); + printf("(%s)\n", strings[0]); + for (i = 1; i < depth; i++) + printf("%s\n", strings[i]); + } +# endif # endif - + if (ioOSThreadsEqual(ioCurrentOSThread(),getVMOSThread())) { if (!printingStack) { # if COGVM - /* If we're in generated machine code then the only way the stack - * dump machinery has of giving us an accurate report is if we set - * stackPointer & framePointer to the native stack & frame pointers. - */ + /* If we're in generated machine code then the only way the stack + * dump machinery has of giving us an accurate report is if we set + * stackPointer & framePointer to the native stack & frame pointers. + */ + extern void ifValidWriteBackStackPointersSaveTo(void*,void*,char**,char**); # if __APPLE__ && __MACH__ && __i386__ - /* see sys/ucontext.h; two different namings */ + /* see sys/ucontext.h; two different namings */ # if __GNUC__ && !__INTEL_COMPILER /* icc pretends to be gcc */ void *fp = (void *)(uap ? uap->uc_mcontext->__ss.__ebp: 0); void *sp = (void *)(uap ? uap->uc_mcontext->__ss.__esp: 0); @@ -161,10 +178,10 @@ # error need to implement extracting pc from a ucontext_t on this system # endif char *savedSP, *savedFP; - + ifValidWriteBackStackPointersSaveTo(fp,sp,&savedFP,&savedSP); # endif - + printingStack = true; if (printAll) { printf("\n\nAll Smalltalk process stacks (active first):\n"); @@ -186,21 +203,57 @@ # if STACKVM printf("\nMost recent primitives\n"); dumpPrimTraceLog(); +# if COGVM + printf("\n"); + reportMinimumUnusedHeadroom(); +# endif # endif printf("\n\t(%s)\n", msg); fflush(stdout); } +/* Attempt to dump the registers to stdout. Only do so if we know how. */ +static void * +printRegisterState(ucontext_t *uap) +{ +#if __DARWIN_UNIX03 && __APPLE__ && __MACH__ && __i386__ + _STRUCT_X86_THREAD_STATE32 *regs = &uap->uc_mcontext->__ss; + printf( "\teax 0x%08x ebx 0x%08x ecx 0x%08x edx 0x%08x\n" + "\tedi 0x%08x esi 0x%08x ebp 0x%08x esp 0x%08x\n" + "\teip 0x%08x\n", + regs->__eax, regs->__ebx, regs->__ecx, regs->__edx, + regs->__edi, regs->__edi, regs->__ebp, regs->__esp, + regs->__eip); + return (void *)(regs->__eip); +#elif __APPLE__ && __MACH__ && __i386__ + _STRUCT_X86_THREAD_STATE32 *regs = &uap->uc_mcontext->ss; + printf( "\teax 0x%08x ebx 0x%08x ecx 0x%08x edx 0x%08x\n" + "\tedi 0x%08x esi 0x%08x ebp 0x%08x esp 0x%08x\n" + "\teip 0x%08x\n", + regs->eax, regs->ebx, regs->ecx, regs->edx, + regs->edi, regs->edi, regs->ebp, regs->esp, + regs->eip); + return (void *)(regs->eip); +#else + printf("don't know how to derive register state from a ucontext_t on this platform\n"); + return 0; +#endif +} static void getCrashDumpFilenameInto(char *buf) { char *slash; - + strcpy(buf,imageName); slash = strrchr(buf,'/'); strcpy(slash ? slash + 1 : buf, "crash.dmp"); } +/* + * Signal handlers + * + */ + void sigusr1(int sig, siginfo_t *info, void *uap) { @@ -208,21 +261,20 @@ time_t now = time(NULL); char ctimebuf[32]; char crashdump[imageNameSize()+1]; - unsigned long pc; - + if (!ioOSThreadsEqual(ioCurrentOSThread(),getVMOSThread())) { pthread_kill(getVMOSThread(),sig); errno = saved_errno; return; } - + getCrashDumpFilenameInto(crashdump); ctime_r(&now,ctimebuf); pushOutputFile(crashdump); reportStackState("SIGUSR1", ctimebuf, 1, uap); popOutputFile(); reportStackState("SIGUSR1", ctimebuf, 1, uap); - + errno = saved_errno; } @@ -232,7 +284,7 @@ time_t now = time(NULL); char ctimebuf[32]; char crashdump[imageNameSize()+1]; - + getCrashDumpFilenameInto(crashdump); ctime_r(&now,ctimebuf); pushOutputFile(crashdump); @@ -245,10 +297,10 @@ void sigsegv(int sig, siginfo_t *info, void *uap) { - + /* error("Segmentation fault"); */ static int printingStack= 0; - + printf("\nSegmentation fault\n\ns"); if (!printingStack) { printingStack= 1; @@ -267,12 +319,14 @@ attachToSignals() { #if COGVM struct sigaction sigusr1_handler_action, sigsegv_handler_action; - + + if (gNoSignalHandlers) return; + sigsegv_handler_action.sa_sigaction = sigsegv; sigsegv_handler_action.sa_flags = SA_NODEFER | SA_SIGINFO; sigemptyset(&sigsegv_handler_action.sa_mask); (void)sigaction(SIGSEGV, &sigsegv_handler_action, 0); - + sigusr1_handler_action.sa_sigaction = sigusr1; sigusr1_handler_action.sa_flags = SA_NODEFER | SA_SIGINFO; sigemptyset(&sigusr1_handler_action.sa_mask); @@ -306,7 +360,7 @@ * a) Answer whether the C frame pointer is in use, for capture of the C stack * pointers. */ -# if defined(i386) || defined(__i386) || defined(__i386__) + /* * Cog has already captured CStackPointer before calling this routine. Record * the original value, capture the pointers again and determine if CFramePointer @@ -320,13 +374,12 @@ extern unsigned long CStackPointer, CFramePointer; extern void (*ceCaptureCStackPointers)(void); unsigned long currentCSP = CStackPointer; - + currentCSP = CStackPointer; ceCaptureCStackPointers(); assert(CStackPointer < currentCSP); return CFramePointer >= CStackPointer && CFramePointer <= currentCSP; } -# endif /* defined(i386) || defined(__i386) || defined(__i386__) */ /* Answer an approximation of the size of the redzone (if any). Do so by @@ -341,7 +394,7 @@ static char *p = 0; static void -sighandler(int sig) { p = (char *)&sig; } +sighandler(int sig, siginfo_t *info, void *uap) { p = (char *)&sig; } static int getRedzoneSize() Modified: branches/Cog/platforms/iOS/vm/Common/main.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/main.m 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/platforms/iOS/vm/Common/main.m 2015-11-30 20:14:11 UTC (rev 3508) @@ -46,7 +46,7 @@ extern char **envVec; argCnt = argc; - argVec= argv; + argVec = argv; envVec = envp; return NSApplicationMain(argc, (const char **) argv); Copied: branches/Cog/platforms/iOS/vm/Common/version.c (from rev 3503, branches/Cog/platforms/Mac OS/vm/version.c) =================================================================== --- branches/Cog/platforms/iOS/vm/Common/version.c (rev 0) +++ branches/Cog/platforms/iOS/vm/Common/version.c 2015-11-30 20:14:11 UTC (rev 3508) @@ -0,0 +1,15 @@ +#if !defined __VERSION__ +# define __VERSION__ "Unknown" +#endif + +#if !defined(TZ) +# define TZ "" +# define SPACER "" +#else +# define SPACER " " +#endif + +char vmBuildString[] = \ + "Mac OS X built on " \ + __DATE__" "__TIME__ SPACER TZ \ + " Compiler: " __VERSION__; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 2015-11-30 20:14:11 UTC (rev 3508) @@ -15,10 +15,10 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -27,7 +27,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by Corporate Smalltalk Consulting Ltd (http://www.smalltalkconsulting.com) and its contributors", in the same place and form as other third-party acknowledgments. @@ -48,107 +48,73 @@ //indexNumber is a postive/negative number #warning to test switch (indexNumber) { - case 1001: /* OS type: "unix", "win32", "mac", ... */ - return "Mac OS"; - - case 1002: { /* OS name: "solaris2.5" on unix, "win95" on win32, ... */ - SInt32 myattr; - static char data[32]; - - Gestalt(gestaltSystemVersion, &myattr); - sprintf(data,"%X",(unsigned int) myattr); - return data; + case 1001: /* OS type: "unix", "win32", "mac", ... */ + return "Mac OS"; + + case 1002: { /* OS name: "solaris2.5" on unix, "win95" on win32, ... */ + SInt32 myattr; + static char data[32]; + + Gestalt(gestaltSystemVersion, &myattr); + sprintf(data,"%X",(unsigned int) myattr); + return data; + } + case 1003: { /* processor architecture: "68k", "x86", "PowerPC", ... */ + SInt32 myattr; + + Gestalt(gestaltSysArchitecture, &myattr); + if (myattr == gestalt68k) + return "68K"; + if (myattr == gestaltPowerPC) + return "powerpc"; + if (myattr == gestaltIntel) + return "intel"; + + return "unknown"; + } + +#if 0 /* see iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m */ + if (id == 1004) { + CFBundleRef mainBundle; + CFStringRef versionString; + static char data[255]; + mainBundle = CFBundleGetMainBundle (); + versionString = CFBundleGetValueForInfoDictionaryKey(mainBundle, CFSTR("CFBundleShortVersionString")); + bzero(data,255); + strcat(data,interpreterVersion); + if (versionString) { + strcat(data," "); + CFStringGetCString (versionString, data+strlen(data), 255-strlen(data), gCurrentVMEncoding); } - case 1003: { /* processor architecture: "68k", "x86", "PowerPC", ... */ - SInt32 myattr; - - Gestalt(gestaltSysArchitecture, &myattr); - if (myattr == gestalt68k) - return "68K"; - if (myattr == gestaltPowerPC) - return "powerpc"; - if (myattr == gestaltIntel) - return "intel"; - - return "unknown"; - } - - case 1005: { - return "Aqua"; - } - - - case 1006: {/* vm build string also info.plist */ -#if (SQ_VI_BYTES_PER_WORD == 4) - -#if STACKVM - - return "Mac Cocoa Cog 5.8b12 21-Sep-10 >1B0534FA-246C-47C5-AB29-7A76C81CCDCB<"; -// return "Mac Cocoa Cog 5.8b11 12-Sep-10 >9BFC792A-F173-4C65-AD2A-FFFB1D52DAC2<"; -// return "Mac Cocoa Cog 5.8b10 07-Sep-10 >8AD3A516-DBAC-4CD4-BC89-8F21317DF7E1<"; -// return "Mac Cocoa Cog 5.8b9 06-Sep-10 >01641B99-1842-4422-A99D-43153BEDEFFA<"; -// return "Mac Cocoa Cog 5.8b8 04-Sep-10 >8A66B7E0-B578-4E5F-97B4-6195547A35F5<"; -// return "Mac Cocoa Cog 5.8b7 02-Sep-10 >4EBF00E3-453E-4010-9AC8-6B64C292984B<"; -// return "Mac Cocoa Cog 5.8b6 31-Aug-10 >DFB49E57-40FB-44B9-97D3-B7CA51608429<"; -// return "Mac Cocoa Cog 5.8b5 30-Aug-10 >0A92B82A-9AC1-4B0E-9DEE-440C3FFAE568<"; -// return "Mac Cocoa Cog 5.8b4 27-Aug-10 >5954D562-FB39-4195-9D19-EBB49FAECCF7<"; -// return "Mac Cocoa Cog 5.8b3 21-Aug-10 >5954D562-FB39-4195-9D19-EBB49FAECCF7<"; -// return "Mac Cocoa Cog 5.8b2 08-Jul-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; -// return "Mac Cocoa Cog 5.8b1 07-Jul-10 >529F6B5A-DC81-4C1F-81B6-3D99741B954A<"; -#else - return "Mac Cocoa 5.7b3 27-Aug-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; -// return "Mac Cocoa 5.7b2 08-Jul-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; -// return "Mac Cocoa 5.7b1 15-Jun-10 >34286DE5-3BD3-40D8-9700-4C41C772B16B<"; + return data; + } #endif -// return "Mac Cocoa 5.7b1 15-Jun-10 >34286DE5-3BD3-40D8-9700-4C41C772B16B<"; -// return "Mac Cocoa 5.6b1 02-Mar-10 >9E99B1C2-0B6B-4944-8B6F-74030D14F3C6<"; -// return "Mac Cocoa 5.5b1 16-Feb-10 >2EE2964B-462A-4F66-92AF-C810216EF798<"; -// return "Mac Cocoa 5.4b2 24-Jan-10 >2EE2964B-462A-4F66-92AF-C810216EF798<"; -// return "Mac Cocoa 5.4b1 20-Jan-10 >F0EB07E3-7805-4C09-8419-D8316F7ADC21<"; -// return "Mac Cocoa 5.3b1 06-Jan-10 >0DADC752-8E86-48FC-8D6B-CC97482C6851<"; -// return "Mac Cocoa 5.2b3 05-Jan-10 >1618879A-3D07-427F-A8CB-5B3DF73ED840<"; -// return "Mac Cocoa 5.2b2 04-Jan-10 >94E27C49-8575-4604-A2C4-0A5C659CC734<"; -// return "Mac Cocoa 5.2b1 02-Jan-10 >D94A0034-7415-4AA1-AA7C-B35BBCDBA0D4<"; -// return "Mac Cocoa 5.1b1 25-Dec-09 >C0908D0B-4D97-47CA-9FAB-479AFC6BA978<"; -// return "Mac Cocoa 5.0b9 02-Dec-09 >C8598ABA-DA73-4A71-836C-62C4369D5A0F<"; -#else - return "Mac Cocoa 5.7b2 64/64 bits 08-Jul-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; -// return "Mac Cocoa 5.7b1 64/64 bits 15-Jun-10 >34286DE5-3BD3-40D8-9700-4C41C772B16B<"; -// return "Mac Cocoa 5.6b1 64/64 bits 02-Mar-10 >9E99B1C2-0B6B-4944-8B6F-74030D14F3C6<"; -// return "Mac Cocoa 5.5b1 64/64 bits 16-Feb-10 >70984CDA-9482-4E7F-BCF0-08C635E0A7BF<"; -// return "Mac Cocoa 5.4b2 64/64 bits 24-Jan-10 >70984CDA-9482-4E7F-BCF0-08C635E0A7BF<"; -// return "Mac Cocoa 5.4b1 64/64 bits 20-Jan-10 >E27846BC-15A7-4BE8-B467-B645E9D37163<"; -// return "Mac Cocoa 5.3b1 64/64 bits 06-Jan-10 >0DADC752-8E86-48FC-8D6B-CC97482C6851<"; -// return "Mac Cocoa 5.2b3 64/64 bits 05-Jan-10 >1618879A-3D07-427F-A8CB-5B3DF73ED840<"; -// return "Mac Cocoa 5.2b2 64/64 bits 04-Jan-10 >94E27C49-8575-4604-A2C4-0A5C659CC734<"; -// return "Mac Cocoa 5.2b1 64/64 bits 02-Jan-10 >D94A0034-7415-4AA1-AA7C-B35BBCDBA0D4<"; -// return "Mac Cocoa 5.1b1 64/64 bits 25-Dec-09 >C0908D0B-4D97-47CA-9FAB-479AFC6BA978<"; -// return "Mac Cocoa 5.0b9 64/64 bits 02-Dec-09 >C8598ABA-DA73-4A71-836C-62C4369D5A0F<"; -// return "Mac Cocoa 5.0b8 01-Dec-09 >2329A610-327B-403D-960E-EEF3C369D032<"; -// return "Mac Cocoa 5.0b7 29-Nov-09 >1215B15B-9463-4D53-BA13-AA989DAB5C01<"; -// return "Mac Cocoa 5.0b6 27-Nov-09 >CF087523-A432-4427-9AD3-4ACF26336A08<"; -// return "Mac Cocoa 5.0b5 26-Nov-09 >9C6EF973-CECF-4E38-B5E0-BB9986A03D5D<"; -// return "Mac Cocoa 5.0b4 26-Nov-09 >DA33132E-D7E6-48C4-8363-EB7408E3124B<"; -// return "Mac Cocoa 5.0.0b1 11-Nov-09 >40BF8061-CC65-4E5E-9841-6BB5E809A688<"; -#endif - } - case 1007: { /* vm build string also info.plist */ + + case 1005: { + return "Aqua"; + } + + case 1006: {/* vm build string also info.plist */ + extern char vmBuildString[]; + return vmBuildString; + } + case 1007: { /* vm build string also info.plist */ #if STACKVM - extern char *__interpBuildInfo; - return __interpBuildInfo; + extern char *__interpBuildInfo; + return __interpBuildInfo; #endif - break; - } - case 1008: { /* vm build string also info.plist */ + break; + } + case 1008: { /* vm build string also info.plist */ # if COGVM - extern char *__cogitBuildInfo; - return __cogitBuildInfo; + extern char *__cogitBuildInfo; + return __cogitBuildInfo; #endif - break; - } - default: - break; + break; } + default: + break; + } return (char *) [super getAttribute: indexNumber]; } @end Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h 2015-11-30 20:14:11 UTC (rev 3508) @@ -47,7 +47,7 @@ @property (nonatomic,strong) NSCursor *squeakCursor; @property (nonatomic,assign) BOOL squeakHasCursor; -- (NSInteger) parseArgument: (NSString *) argData peek: (NSString *) peek; +- (NSInteger) parseArgument: (NSString *) argData peek: (char *) peek; - (void) parseArgs: (NSArray *) args; - (void) parseEnv: (NSDictionary *) env; - (long long) strtobkm: (const char *) chr; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m 2015-11-30 20:14:11 UTC (rev 3508) @@ -36,6 +36,7 @@ */ // +#include "sqSCCSVersion.h" #import "sqSqueakOSXApplication.h" #import "sqSqueakOSXFileDirectoryInterface.h" @@ -43,6 +44,7 @@ #import "sqSqueakOSXSoundCoreAudio.h" #import "sqSqueakSoundCoreAudioAPI.h" #import "sqSqueakOSXApplication+imageReadWrite.h" +#import "sqSqueakOSXApplication+attributes.h" #if !defined(IMAGE_DIALECT_NAME) # if NewspeakVM @@ -56,7 +58,7 @@ # endif #endif -usqInt gMaxHeapSize=(512*1024*1024)+(4*1024*1024); //Last part are "eden bytes" needed in the new startup +usqInt gMaxHeapSize = 512*1024*1024; #if defined(__GNUC__) && ( defined(i386) || defined(__i386) || defined(__i386__) \ || defined(i486) || defined(__i486) || defined (__i486__) \ @@ -83,6 +85,7 @@ # define mtfsfi(fpscr) #endif +static char *getVersionInfo(int verbose); @implementation sqSqueakOSXApplication @synthesize squeakHasCursor,squeakCursor; @@ -130,9 +133,9 @@ [(sqSqueakOSXSoundCoreAudio *) self.soundInterfaceLogic soundInitOverride]; snd_Start(2644, 22050, 1, 0); - char slience[10576]; - bzero(&slience, sizeof(slience)); - snd_PlaySamplesFromAtLength(2644,(usqInt * ) &slience,0); + char silence[10576]; + bzero(&silence, sizeof(silence)); + snd_PlaySamplesFromAtLength(2644,(usqInt * ) &silence,0); [self.soundInterfaceLogic snd_Stop_Force]; } @@ -142,67 +145,217 @@ [self parseEnv: [p environment]]; } -- (void) attachToSignals { - if (![self noHandlers]) { - attachToSignals(); - } -} +- (int) parseArgument: (NSString *) argData peek: (char *) peek +{ -- (NSInteger) parseArgument: (NSString *) argData peek: (NSString *) peek { - if ([argData isEqualToString: @"--"]) { return 1; } + /* Options with no arguments */ + NS_DURING; if ([argData compare: @"-psn_" options: NSLiteralSearch range: NSMakeRange(0,5)] == NSOrderedSame) { return 1; } NS_HANDLER; NS_ENDHANDLER; - + if ([argData isEqualToString: @"-help"]) { [self usage]; exit(0); return 1; } + if ([argData isEqualToString: @"-version"]) { + printf("%s\n", getVersionInfo(0)); + exit(0); + return 1; + } + if ([argData isEqualToString: @"-blockonerror"]) { + extern int blockOnError; + blockOnError = true; + return 1; + } + if ([argData isEqualToString: @"-blockonwarn"]) { + extern int blockOnError; + extern sqInt erroronwarn; + erroronwarn = blockOnError = true; + return 1; + } + if ([argData isEqualToString: @"-exitonwarn"]) { + extern sqInt erroronwarn; + erroronwarn = true; + return 1; + } if ([argData isEqualToString: @"-headless"]) { extern BOOL gSqueakHeadless; gSqueakHeadless = YES; return 1; } - - if ([argData compare: @"--nohandlers"] == NSOrderedSame){ - [self setNoHandlers: YES]; + if ([argData isEqualToString: @"-headfull"]) { + extern BOOL gSqueakHeadless; + gSqueakHeadless = NO; + return 1; + } + if ([argData isEqualToString: @"-nohandlers"]) { + extern BOOL gNoSignalHandlers; + gNoSignalHandlers = YES; return 1; } + if ([argData isEqualToString: @"-timephases"]) { + extern void printPhaseTime(int); + printPhaseTime(1); + return 1; + } +#if COGVM + if ([argData compare: @"-trace" options: NSLiteralSearch range: NSMakeRange(0,6)] == NSOrderedSame) { + extern int traceFlags; + if ([argData length] == 6) { + traceFlags = 1; + return 1; + } + if ([argData length] <= 7 + || [argData characterAtIndex: 6] != '=' + || !isdigit([argData characterAtIndex: 7])) + return 0; + + traceFlags = atoi([argData UTF8String] + 7); + return 1; + } + if ([argData isEqualToString: @"-tracestores"]) { + extern sqInt traceStores; + traceStores = 1; + return 1; + } +#endif +#if STACKVM + if ([argData isEqualToString: @"-checkpluginwrites"]) { + extern sqInt checkAllocFiller; + checkAllocFiller = 1; + return 1; + } + if ([argData isEqualToString: @"-noheartbeat"]) { + extern sqInt suppressHeartbeatFlag; + suppressHeartbeatFlag = 1; + return 1; + } + if ([argData isEqualToString: @"-warnpid"]) { + extern sqInt warnpid; + warnpid = getpid(); + return 1; + } + if ([argData isEqualToString: @"-reportheadroom"] + || [argData isEqualToString: @"-rh"]) { + extern sqInt reportStackHeadroom; + reportStackHeadroom = 1; + return 1; + } +#endif + + /* Options with arguments */ + if (!peek) + return 0; + if ([argData isEqualToString: @"-memory"]) { - gMaxHeapSize = (usqInt) [self strtobkm: [peek UTF8String]]; + gMaxHeapSize = (usqInt) [self strtobkm: peek]; return 2; } if ([argData isEqualToString: @"-NSDocumentRevisionsDebugMode"]) { return 2; } - + +#if STACKVM || NewspeakVM + if ([argData isEqualToString: @"-breaksel"]) { + extern void setBreakSelector(char *); + setBreakSelector(peek); + return 2; + } +#endif +#if STACKVM + if ([argData isEqualToString: @"-breakmnu"]) { + extern void setBreakMNUSelector(char *); + setBreakMNUSelector(peek); + return 2; + } + if ([argData isEqualToString: @"-eden"]) { + extern sqInt desiredEdenBytes; + desiredEdenBytes = [self strtobkm: peek]; + return 2; + } + if ([argData isEqualToString: @"-leakcheck"]) { + extern sqInt checkForLeaks; + checkForLeaks = atoi(peek); + return 2; + } + if ([argData isEqualToString: @"-stackpages"]) { + extern sqInt desiredNumStackPages; + desiredNumStackPages = atoi(peek); + return 2; + } + if ([argData isEqualToString: @"-numextsems"]) { + ioSetMaxExtSemTableSize(atoi(peek)); + return 2; + } + if ([argData isEqualToString: @"-pollpip"]) { + extern sqInt pollpip; + pollpip = atoi(peek); + return 2; + } +#endif /* STACKVM */ +#if COGVM + if ([argData isEqualToString: @"-codesize"]) { + extern sqInt desiredCogCodeSize; + desiredCogCodeSize = [self strtobkm: peek]; + return 2; + } + if ([argData isEqualToString: @"-dpcso"]) { + extern unsigned long debugPrimCallStackOffset; + debugPrimCallStackOffset = (unsigned long)[self strtobkm: peek]; + return 2; + } + if ([argData isEqualToString: @"-cogmaxlits"]) { + extern sqInt maxLiteralCountForCompile; + maxLiteralCountForCompile = [self strtobkm: peek]; + return 2; + } + if ([argData isEqualToString: @"-cogminjumps"]) { + extern sqInt minBackwardJumpCountForCompile; + minBackwardJumpCountForCompile = [self strtobkm: peek]; + return 2; + } +#endif /* COGVM */ +#if SPURVM + if ([argData isEqualToString: @"-maxoldspace"]) { + extern unsigned long maxOldSpaceSize; + maxOldSpaceSize = (unsigned long)[self strtobkm: peek]; + return 2; + } +#endif +#if 0 /* Not sure if encoding is an issue with the Cocoa VM. eem 2015-11-30 */ + if ([argData isEqualToString: @"-pathenc"]) { + setEncodingType(peek); + return 2; + } +#endif return 0; } + - (void) parseArgs: (NSArray *) args { commandLineArguments = [args copyWithZone:null]; argsArguments = [[NSMutableArray alloc] initWithCapacity: [args count]]; - + if ([args count] < 2) return; NSMutableArray *revisedArgs = AUTORELEASEOBJ([args mutableCopyWithZone: NULL]); [revisedArgs removeObjectAtIndex:0]; - - NSUInteger i,result; + + int i; BOOL optionsCompleted = NO; - for (i=0; i<[revisedArgs count]; i++) { + for (i = 0; i < [revisedArgs count]; i++) { NSString *argData = revisedArgs[i]; - NSString *peek = (i == ([revisedArgs count] - 1)) ? @"" : revisedArgs[i+1]; if ([argData isEqualToString: @"--"]) { optionsCompleted = YES; continue; @@ -210,26 +363,27 @@ if (!optionsCompleted && ![[argData substringToIndex: 1] isEqualToString: @"-"]) { optionsCompleted = YES; //guessing first parameter as image name - if ([argData compare: @"--"] != NSOrderedSame) { + if ([argData compare: @"--"] != NSOrderedSame) [self setImageNamePathIfItWasReadable:argData]; - } else { + else continue; - } continue; } - if (optionsCompleted) { + if (optionsCompleted) [self.argsArguments addObject: argData]; - } else { - result = [self parseArgument: argData peek: peek]; - if (result == 0) /* option not recognised */ { + else { + int result = [self parseArgument: argData + peek: (char *)(i >= ([revisedArgs count] - 1) + ? 0 + : [revisedArgs[i+1] UTF8String])]; + if (result == 0) { /* option not recognised */ fprintf(stderr, "unknown option: %s\n", [argData UTF8String]); [self usage]; exit(1); } - if (result == 2) - i++; + if (result > 1) + i += result - 1; } - } } @@ -259,27 +413,76 @@ gMaxHeapSize = (usqInt) [self strtobkm: [memoryString UTF8String]]; } } - + - (void) usage { - printf("Usage: [<option>...] [<imageName> [<argument>...]]\n"); - printf(" [<option>...] -- [<argument>...]\n"); + extern char **argVec; + printf("Usage: %s [<option>...] [<imageName> [<argument>...]]\n", argVec[0]); + printf(" %s [<option>...] -- [<argument>...]\n", argVec[0]); [self printUsage]; printf("\nNotes:\n"); - printf(" <imageName> defaults to `%s'.\n", DEFAULT_IMAGE_NAME); + //printf(" <imageName> defaults to `%s'.\n", DEFAULT_IMAGE_NAME); + printf(" <imageName> defaults to `" DEFAULT_IMAGE_NAME "'.\n"); [self printUsageNotes]; + // exit(1); } - (void) printUsage { printf("\nCommon <option>s:\n"); - printf(" --help print this help message, then exit\n"); - printf(" --memory <size>[mk] use fixed heap size (added to image size)\n"); - printf(" --headless run in headless (no window) mode (default: false)\n"); - printf(" --nohandlers disable sigsegv & sigusr1 handlers\n"); + printf(" -help print this help message, then exit\n"); + printf(" -memory <size>[mk] use fixed heap size (added to image size)\n"); + printf(" -nohandlers disable sigsegv & sigusr1 handlers\n"); + printf(" -timephases print start load and run times\n"); +#if STACKVM || NewspeakVM + printf(" -breaksel selector set breakpoint on send of selector\n"); +#endif +#if STACKVM + printf(" -breakmnu selector set breakpoint on MNU of selector\n"); + printf(" -eden <size>[mk] set eden memory to bytes\n"); + printf(" -leakcheck num check for leaks in the heap\n"); + printf(" -stackpages num use n stack pages\n"); + printf(" -numextsems num make the external semaphore table num in size\n"); + printf(" -noheartbeat disable the heartbeat for VM debugging. disables input\n"); + printf(" -pollpip output . on each poll for input\n"); + printf(" -checkpluginwrites check for writes past end of object in plugins\n"); +#endif +#if STACKVM || NewspeakVM +# if COGVM + printf(" -trace[=num] enable tracing (optionally to a specific value)\n"); +# else + printf(" -sendtrace enable send tracing\n"); +# endif + printf(" -warnpid print pid in warnings\n"); +#endif +#if COGVM + printf(" -codesize <size>[mk] set machine code memory to bytes\n"); + printf(" -tracestores enable store tracing (assert check stores)\n"); + printf(" -cogmaxlits <n> set max number of literals for methods to be compiled to machine code\n"); + printf(" -cogminjumps <n> set min number of backward jumps for interpreted methods to be considered for compilation to machine code\n"); + printf(" -reportheadroom report unused stack headroom on exit\n"); +#endif +#if SPURVM + printf(" -maxoldspace <size>[mk] set max size of old space memory to bytes\n"); +#endif +#if 0 /* Not sure if encoding is an issue with the Cocoa VM. eem 2015-11-30 */ + printf(" -pathenc <enc> set encoding for pathnames (default: %s)\n", + getEncodingType([self currentVMEncoding])); +#endif + printf(" -headless run in headless (no window) mode (default: false)\n"); + printf(" -headfull run in headful (window) mode (default: true)\n"); + printf(" -version print version information, then exit\n"); + + printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n"); + printf(" -blockonwarn on warning block, don't warn. useful for attaching gdb\n"); + printf(" -exitonwarn treat warnings as errors, exiting on warn\n"); } - (void) printUsageNotes { +#if SPURVM + printf(" If `-memory' or '-maxoldspace' are not specified then the heap will grow dynamically.\n"); +#else printf(" If `-memory' is not specified then the heap will grow dynamically.\n"); +#endif printf(" <argument>s are ignored, but are processed by the Squeak image.\n"); printf(" The first <argument> normally names a Squeak `script' to execute.\n"); printf(" Precede <arguments> by `--' to use default image.\n"); @@ -289,21 +492,81 @@ { NSFileManager *dfm = [NSFileManager defaultManager]; BOOL isDirectory; - + [dfm fileExistsAtPath: filePath isDirectory: &isDirectory]; if (isDirectory) return NO; BOOL fileIsReadable = [[NSFileManager defaultManager] isReadableFileAtPath: filePath]; - + if (fileIsReadable == NO) return NO; if ([[[filePath lastPathComponent] pathExtension] compare: @"image" options: NSCaseInsensitiveSearch] == NSOrderedSame) return YES; - + return NO; } @end + +static char * +getVersionInfo(int verbose) +{ +#if STACKVM + extern char *__interpBuildInfo; +# define INTERP_BUILD __interpBuildInfo +# if COGVM + extern char *__cogitBuildInfo; +# endif +#else +# define INTERP_BUILD interpreterVersion +#endif + extern char vmBuildString[]; + CFStringRef versionString; + char *info= (char *)malloc(4096); + info[0]= '\0'; + +#if SPURVM +# if BytesPerOop == 8 +# define ObjectMemory " Spur 64-bit" +# else +# define ObjectMemory " Spur" +# endif +#else +# define ObjectMemory +#endif +#if defined(NDEBUG) +# define BuildVariant "Production" ObjectMemory +#elif DEBUGVM +# define BuildVariant "Debug" ObjectMemory +# else +# define BuildVariant "Assert" ObjectMemory +#endif + + if (verbose) + sprintf(info+strlen(info), IMAGE_DIALECT_NAME " VM version: "); + sprintf(info+strlen(info), "%s ", VM_VERSION); + if ((versionString = CFBundleGetValueForInfoDictionaryKey( + CFBundleGetMainBundle(), + CFSTR("CFBundleVersion")))) +#if 0 /* Not sure if encoding is an issue with the Cocoa VM. eem 2015-11-30 */ + CFStringGetCString(versionString, info+strlen(info), 4095-strlen(info), gCurrentVMEncoding); +#else + CFStringGetCString(versionString, info+strlen(info), 4095-strlen(info), kCFStringEncodingUTF8); +#endif + sprintf(info+strlen(info), " %s [" BuildVariant " VM]\n", vmBuildString); + if (verbose) + sprintf(info+strlen(info), "Built from: "); + sprintf(info+strlen(info), "%s\n", INTERP_BUILD); +#if COGVM + if (verbose) + sprintf(info+strlen(info), "With: "); + sprintf(info+strlen(info), "%s\n", __cogitBuildInfo); /* __cogitBuildInfo */ +#endif + if (verbose) + sprintf(info+strlen(info), "Revision: "); + sprintf(info+strlen(info), "%s\n", sourceVersionString('\n')); + return info; +} Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2015-11-26 21:16:03 UTC (rev 3507) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2015-11-30 20:14:11 UTC (rev 3508) @@ -1585,7 +1585,11 @@ static void vm_printUsageNotes(void) { - printf(" If `-memory' is not specified then the heap will grow dynamically.\n"); +#if SPURVM + printf(" If `-memory' or '-maxoldspace' are not specified then the heap will grow dynamically.\n"); +#else + printf(" If `-memory' is not specified then the heap will grow dynamically.\n"); +#endif printf(" <argument>s are ignored, but are processed by the " IMAGE_DIALECT_NAME " image.\n"); printf(" The first <argument> normally names a " IMAGE_DIALECT_NAME " `script' to execute.\n"); printf(" Precede <arguments> by `--' to use default image.\n"); @@ -2111,7 +2115,7 @@ * b) answer the amount of stack room to ensure in a Cog stack page, including * the size of the redzone, if any. */ -# if defined(i386) || defined(__i386) || defined(__i386__) + /* * Cog has already captured CStackPointer before calling this routine. Record * the original value, capture the pointers again and determine if CFramePointer @@ -2131,22 +2135,7 @@ assert(CStackPointer < currentCSP); return CFramePointer >= CStackPointer && CFramePointer <= currentCSP; } -# endif /* defined(i386) || defined(__i386) || defined(__i386__) */ -# if defined(__arm__) || defined(__arm32__) || defined(ARM32) -/* Currently pretty sure fp is used but prepared to be shown wrong */ - int -isCFramePointerInUse() -{ - extern unsigned long CStackPointer, CFramePointer; - extern void (*ceCaptureCStackPointers)(void); - unsigned long currentCSP = CStackPointer; - currentCSP = CStackPointer; - ceCaptureCStackPointers(); - assert(CStackPointer < currentCSP); - return CFramePointer >= CStackPointer && CFramePointer <= currentCSP; -} -#endif /* defined(__arm__) || defined(__arm32__) || defined(ARM32) */ /* Answer an approximation of the size of the redzone (if any). Do so by * sending a signal to the process and computing the difference between the * stack pointer in the signal handler and that in the caller. Assumes stacks @@ -2159,7 +2148,7 @@ static char * volatile p = 0; static void -sighandler(int sig) { p = (char *)&sig; } +sighandler(int sig, siginfo_t *info, void *uap) { p = (char *)&sig; } static int getRedzoneSize()

1 0

Crash when saving a project
by David T. Lewis 28 Nov '15

28 Nov '15

Forwarding message from Colin Putney (colin at wiresong.com>) that was blocked due to message size. I saved a copy of the original message attachment (zip of the crashing image) for downloading here: http://squeakvm.org/~lewis/tmp/crash-image.zip Dave ----- original message below ----- Date: Fri, 27 Nov 2015 19:30:09 -0800 Subject: Crash when saving a project From: Colin Putney <colin(a)wiresong.com> To: Squeak Virtual Machine Development <vm-dev(a)lists.squeakfoundation.org> Hi all, I was trying to track down the Environment issues related to saving a project, but instead ran into this crash on CogSpur. It doesn't happen in a Squeak 4.6 image on Cog. Colin

1 0

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

28 Nov '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1534.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1534 Author: rmacnak Time: 27 November 2015, 6:12:43.777 pm UUID: dbeb984f-191e-4919-94b7-ffb681765d32 Ancestors: VMMaker.oscog-rmacnak.1533 The receiver of initializeSpecificOpcodes:in: is not necessarily the defining class of its method argument. =============== Diff against VMMaker.oscog-rmacnak.1533 =============== Item was changed: ----- Method: CogAbstractInstruction class>>initializeSpecificOpcodes:in: (in category 'class initialization') ----- initializeSpecificOpcodes: opcodeSymbolSequence in: initializeMethod "Declare as class variables, the opcodes in opcodeSymbolSequence. Assign values to them from LastRTLOpcode on. Undeclare any obsolete class vars. The assumption is that initializeMethod defines all class vars + in the class. This method should be used by subclasses wishing to declare - in the class. This method should be used by subclasses wiching to declare their own specific opcodes." + | pool classVariablesDefinedInMethod | - | classVariablesDefinedInMethod | self assert: self ~~ CogAbstractInstruction. + pool := initializeMethod methodClass classPool. LastRTLCode ifNil: [CogRTLOpcodes initialize]. + classVariablesDefinedInMethod := (initializeMethod literals select: [:l| l isVariableBinding and: [pool includesKey: l key]]) collect: - classVariablesDefinedInMethod := (initializeMethod literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect: [:ea| ea key]. "Undeclare any class var not defined in opcodeSymbolSequence or by the method." + (pool keys reject: [:k| (opcodeSymbolSequence includes: k) or: [classVariablesDefinedInMethod includes: k]]) do: - (classPool keys reject: [:k| (opcodeSymbolSequence includes: k) or: [classVariablesDefinedInMethod includes: k]]) do: [:k| + Undeclared declare: k from: pool]. - Undeclared declare: k from: classPool]. "Declare opcodeSymbolSequence's elements from LastRTLCode on up." opcodeSymbolSequence withIndexDo: [:classVarName :value| + pool - self classPool declare: classVarName from: Undeclared; at: classVarName put: value + LastRTLCode - 1]!

1 0

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

27 Nov '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1533.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1533 Author: rmacnak Time: 27 November 2015, 2:07:17.218 pm UUID: 6f75f364-358a-4762-b934-fefc76c19285 Ancestors: VMMaker.oscog-rmacnak.1532 Move MIPSConstants to VMMaker. Add CogMIPSELCompilerTests. Move noteFollowingConditionalBranch: to catch branches created outside of Jump<Cond>: Fix Br instructions that use slt[u] right, left. Fix backwards SubRR. Two address instructions are bizarre. CPIC patching (architecture independent): fix call mistaken for a jump and conditional branch mistaken for a jump. =============== Diff against VMMaker.oscog-rmacnak.1532 =============== Item was added: + ----- Method: AbstractInstructionTests>>genConditionalBranch:operand: (in category 'generating machine code') ----- + genConditionalBranch: opcode operand: operandOne + ^self previousInstruction noteFollowingConditionalBranch: (self gen: opcode operand: operandOne)! Item was added: + ----- Method: AbstractInstructionTests>>previousInstruction (in category 'as yet unclassified') ----- + previousInstruction + <returnTypeC: #'AbstractInstruction *'> + ^opcodes last! Item was changed: ----- Method: AbstractInstructionTests>>runBinaryConditionalJumps: (in category 'running') ----- runBinaryConditionalJumps: assertPrintBar "self defaultTester runBinaryConditionalJumps: false" + | mask count reg1 reg2 reg3 reg1Getter reg2Setter reg3Setter | - | mask reg1 reg2 reg3 | mask := (1 << self processor bitsInWord) - 1. + count := 0. self concreteCompilerClass dataRegistersWithAccessorsDo: [:n :get :set| + count = 0 ifTrue: [reg1 := n. reg1Getter := get]. + count = 1 ifTrue: [reg2 := n. reg2Setter := set]. + count = 2 ifTrue: [reg3 := n. reg3Setter := set]. + count := count + 1]. + self assert: reg1 ~= nil. + self assert: reg2 ~= nil. + self assert: reg3 ~= nil. - n = 0 ifTrue: [reg1 := get]. - n = 1 ifTrue: [reg2 := set]. - n = 2 ifTrue: [reg3 := set]]. #( (JumpAbove > unsigned) (JumpBelowOrEqual <= unsigned) (JumpBelow < unsigned) (JumpAboveOrEqual >= unsigned) (JumpGreater > signed) (JumpLessOrEqual <= signed) (JumpLess < signed) (JumpGreaterOrEqual >= signed) (JumpZero = signed) (JumpNonZero ~= signed)) do: [:triple| [:opName :relation :signednessOrResult| | opcode jumpNotTaken jumpTaken nop memory bogus | self resetGen. opcode := CogRTLOpcodes classPool at: opName. + self gen: CmpRR operand: reg3 operand: reg2. + jumpTaken := self genConditionalBranch: opcode operand: 0. + self gen: MoveCqR operand: 0 operand: reg1. - self gen: CmpRR operand: 2 operand: 1. - jumpTaken := self gen: opcode. - self gen: MoveCqR operand: 0 operand: 0. jumpNotTaken := self gen: Jump. + jumpTaken jmpTarget: (self gen: MoveCqR operand: 1 operand: reg1). - jumpTaken jmpTarget: (self gen: MoveCqR operand: 1 operand: 0). jumpNotTaken jmpTarget: (nop := self gen: Nop). memory := self generateInstructions. + "self processor disassembleFrom: 0 to: memory size in: memory on: Transcript." - "self processor disassembleFrom: 0 to: memory size in: memory on: Transcript" bogus := false. self pairs: (-2 to: 2) do: [:a :b| | taken | self processor reset; + perform: reg2Setter with: (processor convertIntegerToInternal: a); + perform: reg3Setter with: (processor convertIntegerToInternal: b). - perform: reg2 with: (processor convertIntegerToInternal: a); - perform: reg3 with: (processor convertIntegerToInternal: b). [self processor singleStepIn: memory. self processor pc ~= nop address] whileTrue. + taken := (self processor perform: reg1Getter) = 1. - taken := (self processor perform: reg1) = 1. assertPrintBar ifTrue: [self assert: taken equals: (signednessOrResult == #unsigned ifTrue: [(a bitAnd: mask) perform: relation with: (b bitAnd: mask)] ifFalse: [a perform: relation with: b])] ifFalse: [Transcript nextPutAll: reg2; nextPut: $(; print: a; nextPutAll: ') '; nextPutAll: relation; space; nextPutAll: reg3; nextPut: $(; print: b; nextPutAll: ') = '; print: taken; cr; flush. taken = (signednessOrResult == #unsigned ifTrue: [(a bitAnd: mask) perform: relation with: (b bitAnd: mask)] ifFalse: [a perform: relation with: b]) ifFalse: [bogus := true]]]. bogus ifTrue: [self processor printRegistersOn: Transcript. Transcript show: (self processor disassembleInstructionAt: jumpTaken address In: memory); cr]] valueWithArguments: triple]! Item was changed: ----- Method: AbstractInstructionTests>>runBinaryConditionalJumpsViaCmpCqR: (in category 'running') ----- runBinaryConditionalJumpsViaCmpCqR: assertPrintBar "self defaultTester runBinaryConditionalJumpsViaCmpCqR: false" + | mask count reg1 reg2 resultRegNum operandRegNum | - | mask reg1 reg2 resultRegNum operandRegNum | mask := (1 << self processor bitsInWord) - 1. + count := 0. - resultRegNum := 0. - operandRegNum := 1. self concreteCompilerClass dataRegistersWithAccessorsDo: [:n :get :set| + count = 0 ifTrue: [resultRegNum := n. reg1 := get]. + count = 1 ifTrue: [operandRegNum := n. reg2 := set]. + count := count + 1]. + self assert: resultRegNum ~= nil. + self assert: operandRegNum ~= nil. - n = resultRegNum ifTrue: [reg1 := get]. - n = operandRegNum ifTrue: [reg2 := set]]. #( (JumpAbove > unsigned) (JumpBelowOrEqual <= unsigned) (JumpBelow < unsigned) (JumpAboveOrEqual >= unsigned) (JumpGreater > signed) (JumpLessOrEqual <= signed) (JumpLess < signed) (JumpGreaterOrEqual >= signed) (JumpZero = signed) (JumpNonZero ~= signed)) do: [:triple| [:opName :relation :signednessOrResult| | opcode | opcode := CogRTLOpcodes classPool at: opName. (-2 to: 2) do: [:b| | jumpNotTaken jumpTaken nop memory bogus | self resetGen. self gen: CmpCqR operand: b operand: operandRegNum. + jumpTaken := self genConditionalBranch: opcode operand: 0. - jumpTaken := self gen: opcode. self gen: MoveCqR operand: 0 operand: resultRegNum. jumpNotTaken := self gen: Jump. jumpTaken jmpTarget: (self gen: MoveCqR operand: 1 operand: resultRegNum). jumpNotTaken jmpTarget: (nop := self gen: Nop). memory := self generateInstructions. assertPrintBar ifFalse: [Transcript print: triple; cr. self disassembleOpcodesIn: memory to: Transcript]. bogus := false. (-2 to: 2) do: [:a| | taken expected | self processor reset; perform: reg2 with: (processor convertIntegerToInternal: a). [self processor singleStepIn: memory. self processor pc ~= nop address] whileTrue. taken := (self processor perform: reg1) = 1. expected := signednessOrResult == #unsigned ifTrue: [(a bitAnd: mask) perform: relation with: (b bitAnd: mask)] ifFalse: [a perform: relation with: b]. assertPrintBar ifTrue: [self assert: taken equals: expected] ifFalse: [Transcript nextPutAll: 'CmpCqR '; print: b; space; nextPutAll: reg2; tab; tab; nextPutAll: reg2; nextPut: $(; print: a; nextPut: $); space; nextPutAll: relation; space; print: b; nextPutAll: ' = '; print: taken; nextPutAll: ' ('; print: expected; nextPut: $). taken ~= expected ifTrue: [Transcript nextPutAll: ' !!!!'. bogus := true]. Transcript cr; flush]]. bogus ifTrue: [self processor printRegistersOn: Transcript. Transcript nextPutAll: jumpTaken symbolic; tab; show: (self processor disassembleInstructionAt: jumpTaken address In: memory); cr]]] valueWithArguments: triple]! Item was changed: ----- Method: AbstractInstructionTests>>runBinaryConditionalJumpsViaSubCqR: (in category 'running') ----- runBinaryConditionalJumpsViaSubCqR: assertPrintBar "self defaultTester runBinaryConditionalJumpsViaSubCqR: false" + | mask count reg1 reg2 setreg2 resultRegNum operandRegNum | - | mask reg1 reg2 setreg2 resultRegNum operandRegNum | mask := (1 << self processor bitsInWord) - 1. + count := 0. - resultRegNum := 0. - operandRegNum := 1. self concreteCompilerClass dataRegistersWithAccessorsDo: [:n :get :set| + count = 0 ifTrue: [resultRegNum := n. reg1 := get]. + count = 1 ifTrue: [operandRegNum := n. reg2 := get. setreg2 := set]. + count := count + 1]. + self assert: resultRegNum ~= nil. + self assert: operandRegNum ~= nil. + - n = resultRegNum ifTrue: [reg1 := get]. - n = operandRegNum ifTrue: [reg2 := get. setreg2 := set]]. #( (JumpAbove > unsigned) (JumpBelowOrEqual <= unsigned) (JumpBelow < unsigned) (JumpAboveOrEqual >= unsigned) (JumpGreater > signed) (JumpLessOrEqual <= signed) (JumpLess < signed) (JumpGreaterOrEqual >= signed) (JumpZero = signed) (JumpNonZero ~= signed)) do: [:triple| [:opName :relation :signednessOrResult| | opcode | opcode := CogRTLOpcodes classPool at: opName. (-2 to: 2) do: [:b| | jumpNotTaken jumpTaken nop memory bogus | self resetGen. self gen: SubCqR operand: b operand: operandRegNum. + jumpTaken := self genConditionalBranch: opcode operand: 0. - jumpTaken := self gen: opcode. self gen: MoveCqR operand: 0 operand: resultRegNum. jumpNotTaken := self gen: Jump. jumpTaken jmpTarget: (self gen: MoveCqR operand: 1 operand: resultRegNum). jumpNotTaken jmpTarget: (nop := self gen: Nop). memory := self generateInstructions. assertPrintBar ifFalse: [Transcript print: triple; cr. self disassembleOpcodesIn: memory to: Transcript]. bogus := false. (-2 to: 2) do: [:a| | taken result expected | self processor reset; perform: setreg2 with: (self processor convertIntegerToInternal: a). [self processor singleStepIn: memory. self processor pc ~= nop address] whileTrue. taken := (self processor perform: reg1) = 1. result := signednessOrResult == #unsigned ifTrue: [(a bitAnd: mask) - (b bitAnd: mask)] ifFalse: [a - b]. expected := result perform: relation with: 0. assertPrintBar ifTrue: [self assert: (taken = expected and: [(result bitAnd: mask) = (processor perform: reg2)])] ifFalse: [Transcript nextPutAll: 'SubCqR '; print: b; space; nextPutAll: reg2; tab; tab; print: b; space; nextPutAll: relation; space; nextPutAll: reg2; nextPut: $(; print: a; nextPutAll: ') = '; print: taken; nextPutAll: ' ('; print: expected; nextPut: $). taken ~= expected ifTrue: [Transcript nextPutAll: ' !!!!'. bogus := true]. Transcript cr; flush]]. bogus ifTrue: [self processor printRegistersOn: Transcript. Transcript nextPutAll: jumpTaken symbolic; tab; show: (self processor disassembleInstructionAt: jumpTaken address In: memory); cr]]] valueWithArguments: triple]! Item was added: + ----- Method: CogARMCompiler>>rewriteConditionalJumpLongAt:target: (in category 'inline cacheing') ----- + rewriteConditionalJumpLongAt: callSiteReturnAddress target: callTargetAddress + ^self rewriteJumpLongAt: callSiteReturnAddress target: callTargetAddress! Item was added: + ----- Method: CogIA32Compiler>>rewriteConditionalJumpLongAt:target: (in category 'inline cacheing') ----- + rewriteConditionalJumpLongAt: callSiteReturnAddress target: callTargetAddress + ^self rewriteJumpLongAt: callSiteReturnAddress target: callTargetAddress! Item was added: + ----- Method: CogMIPSELCompiler>>canMulRR (in category 'testing') ----- + canMulRR + <inline: true> + ^true! Item was changed: ----- Method: CogMIPSELCompiler>>computeMaximumSize (in category 'generate machine code') ----- computeMaximumSize "Each MIPS instruction has 4 bytes. Many abstract opcodes need more than one instruction. Instructions that refer to constants and/or literals depend on literals being stored in-line or out-of-line. N.B. The ^N forms are to get around the bytecode compiler's long branch limits which are exceeded when each case jumps around the otherwise." opcode caseOf: { [BrEqualRR] -> [^8]. [BrNotEqualRR] -> [^8]. [BrUnsignedLessRR] -> [^12]. [BrUnsignedLessEqualRR] -> [^12]. [BrUnsignedGreaterRR] -> [^12]. [BrUnsignedGreaterEqualRR] -> [^12]. [BrSignedLessRR] -> [^12]. [BrSignedLessEqualRR] -> [^12]. [BrSignedGreaterRR] -> [^12]. [BrSignedGreaterEqualRR] -> [^12]. [BrLongEqualRR] -> [^16]. [BrLongNotEqualRR] -> [^16]. [MulRR] -> [^4]. [DivRR] -> [^4]. [MoveLowR] -> [^4]. [MoveHighR] -> [^4]. "Noops & Pseudo Ops" [Label] -> [^0]. [Literal] -> [^4]. [AlignmentNops] -> [^(operands at: 0) - 4]. [Fill16] -> [^4]. [Fill32] -> [^4]. [FillFromWord] -> [^4]. [Nop] -> [^4]. "Control" [Call] -> [^self literalLoadInstructionBytes + 8]. [CallFull] -> [^self literalLoadInstructionBytes + 8]. [JumpR] -> [^8]. [Jump] -> [^8]. [JumpFull] -> [^self literalLoadInstructionBytes + 8]. [JumpLong] -> [^self literalLoadInstructionBytes + 8]. [JumpZero] -> [^8]. [JumpNonZero] -> [^8]. [JumpNegative] -> [^8]. [JumpNonNegative] -> [^8]. [JumpOverflow] -> [^8]. [JumpNoOverflow] -> [^8]. [JumpCarry] -> [^8]. [JumpNoCarry] -> [^8]. [JumpLess] -> [^8]. [JumpGreaterOrEqual] -> [^8]. [JumpGreater] -> [^8]. [JumpLessOrEqual] -> [^8]. [JumpBelow] -> [^8]. [JumpAboveOrEqual] -> [^8]. [JumpAbove] -> [^8]. [JumpBelowOrEqual] -> [^8]. [JumpLongZero] -> [^self literalLoadInstructionBytes + 8]. [JumpLongNonZero] -> [^self literalLoadInstructionBytes + 8]. [JumpFPEqual] -> [^8]. [JumpFPNotEqual] -> [^8]. [JumpFPLess] -> [^8]. [JumpFPGreaterOrEqual]-> [^8]. [JumpFPGreater] -> [^8]. [JumpFPLessOrEqual] -> [^8]. [JumpFPOrdered] -> [^8]. [JumpFPUnordered] -> [^8]. [RetN] -> [^8]. [Stop] -> [^4]. "Arithmetic" [AddCqR] -> [^12]. [AndCqR] -> [^16]. [AndCqRR] -> [^12]. [CmpCqR] -> [^28]. [OrCqR] -> [^12]. [SubCqR] -> [^12]. [TstCqR] -> [^12]. [XorCqR] -> [^12]. [AddCwR] -> [^12]. [AndCwR] -> [^12]. [CmpCwR] -> [^28]. [OrCwR] -> [^12]. [SubCwR] -> [^12]. [XorCwR] -> [^12]. [AddRR] -> [^4]. [AndRR] -> [^4]. [CmpRR] -> [^20]. [OrRR] -> [^4]. [XorRR] -> [^4]. [SubRR] -> [^4]. [NegateR] -> [^4]. [LoadEffectiveAddressMwrR] -> [^12]. [LogicalShiftLeftCqR] -> [^4]. [LogicalShiftRightCqR] -> [^4]. [ArithmeticShiftRightCqR] -> [^4]. [LogicalShiftLeftRR] -> [^4]. [LogicalShiftRightRR] -> [^4]. [ArithmeticShiftRightRR] -> [^4]. [AddRdRd] -> [^4]. [CmpRdRd] -> [^4]. [SubRdRd] -> [^4]. [MulRdRd] -> [^4]. [DivRdRd] -> [^4]. [SqrtRd] -> [^4]. [AddCheckOverflowCqR] -> [^28]. [AddCheckOverflowRR] -> [^20]. [SubCheckOverflowCqR] -> [^28]. [SubCheckOverflowRR] -> [^20]. + [MulCheckOverflowRR] -> [^20]. "Data Movement" [MoveCqR] -> [^8 "or 4"]. [MoveCwR] -> [^8]. [MoveRR] -> [^4]. [MoveRdRd] -> [^4]. [MoveAwR] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveRAw] -> [^(self isAddressRelativeToVarBase: (operands at: 1)) ifTrue: [4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveAbR] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveRAb] -> [^(self isAddressRelativeToVarBase: (operands at: 1)) ifTrue: [4] ifFalse: [self literalLoadInstructionBytes + 4]]. [MoveRMwr] -> [^16]. [MoveRdM64r] -> [^self literalLoadInstructionBytes + 4]. [MoveMbrR] -> [^16]. [MoveRMbr] -> [^16]. [MoveM16rR] -> [^4]. [MoveM64rRd] -> [^self literalLoadInstructionBytes + 4]. [MoveMwrR] -> [^16]. [MoveXbrRR] -> [^8]. [MoveRXbrR] -> [^8]. [MoveXwrRR] -> [^12]. [MoveRXwrR] -> [^12]. [PopR] -> [^8]. [PushR] -> [^8]. [PushCw] -> [^16]. [PushCq] -> [^16]. [PrefetchAw] -> [^12]. "Conversion" [ConvertRRd] -> [^8]. }. ^0 "to keep C compiler quiet" ! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeBrSignedGreaterRR (in category 'generate machine code - concretize') ----- concretizeBrSignedGreaterRR | offset leftReg rightReg | offset := self computeJumpTargetOffsetPlus: 8. "Relative to delay slot" leftReg := self concreteRegister: (operands at: 1). rightReg := self concreteRegister: (operands at: 2). self machineCodeAt: 0 put: (self sltR: BranchTemp R: rightReg R: leftReg). + self machineCodeAt: 4 put: (self bneR: BranchTemp R: ZR offset: offset). - self machineCodeAt: 4 put: (self beqR: BranchTemp R: ZR offset: offset). self machineCodeAt: 8 put: (self nop). "Delay slot" ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeBrSignedLessEqualRR (in category 'generate machine code - concretize') ----- concretizeBrSignedLessEqualRR | offset leftReg rightReg | offset := self computeJumpTargetOffsetPlus: 8. "Relative to delay slot" leftReg := self concreteRegister: (operands at: 1). rightReg := self concreteRegister: (operands at: 2). self machineCodeAt: 0 put: (self sltR: BranchTemp R: rightReg R: leftReg). + self machineCodeAt: 4 put: (self beqR: BranchTemp R: ZR offset: offset). - self machineCodeAt: 4 put: (self bneR: BranchTemp R: ZR offset: offset). self machineCodeAt: 8 put: (self nop). "Delay slot" ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeBrUnsignedGreaterRR (in category 'generate machine code - concretize') ----- concretizeBrUnsignedGreaterRR | offset leftReg rightReg | offset := self computeJumpTargetOffsetPlus: 8. "Relative to delay slot" leftReg := self concreteRegister: (operands at: 1). rightReg := self concreteRegister: (operands at: 2). self machineCodeAt: 0 put: (self sltuR: BranchTemp R: rightReg R: leftReg). + self machineCodeAt: 4 put: (self bneR: BranchTemp R: ZR offset: offset). - self machineCodeAt: 4 put: (self beqR: BranchTemp R: ZR offset: offset). self machineCodeAt: 8 put: (self nop). "Delay slot" ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeBrUnsignedLessEqualRR (in category 'generate machine code - concretize') ----- concretizeBrUnsignedLessEqualRR | offset leftReg rightReg | offset := self computeJumpTargetOffsetPlus: 8. "Relative to delay slot" leftReg := self concreteRegister: (operands at: 1). rightReg := self concreteRegister: (operands at: 2). self machineCodeAt: 0 put: (self sltuR: BranchTemp R: rightReg R: leftReg). + self machineCodeAt: 4 put: (self beqR: BranchTemp R: ZR offset: offset). - self machineCodeAt: 4 put: (self bneR: BranchTemp R: ZR offset: offset). self machineCodeAt: 8 put: (self nop). "Delay slot" ^machineCodeSize := 12! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeFill32 (in category 'generate machine code - concretize') ----- concretizeFill32 "fill with operand 0 according to the processor's endianness" | word | <var: #word type: #'unsigned long'> self flag: #bogus. "Gaps in the instruction stream should be filled with the stop instruction." word := operands at: 0. self machineCodeAt: 0 put: word. ^machineCodeSize := 4! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeMoveM16rR (in category 'generate machine code - concretize') ----- concretizeMoveM16rR <var: #offset type: #sqInt> | srcReg offset destReg | offset := operands at: 0. srcReg := self concreteRegister: (operands at: 1). destReg := self concreteRegister: (operands at: 2). + self machineCodeAt: 0 put: (self lhuR: destReg base: srcReg offset: offset). - self machineCodeAt: 0 put: (self lhR: destReg base: srcReg offset: offset). ^machineCodeSize := 4! Item was added: + ----- Method: CogMIPSELCompiler>>concretizeMulCheckOverflowRR (in category 'generate machine code - concretize') ----- + concretizeMulCheckOverflowRR + | leftReg rightReg | + leftReg := self concreteRegister: (operands at: 0). + rightReg := self concreteRegister: (operands at: 1). "Also destReg." + + "Overflow occured if the sign bit of the low part is different from the high part." + self machineCodeAt: 0 put: (self multR: leftReg R: rightReg). + self machineCodeAt: 4 put: (self mfloR: rightReg). + self machineCodeAt: 8 put: (self sraR: OverflowTemp1 R: rightReg C: 31). + self machineCodeAt: 12 put: (self mfhiR: OverflowTemp2). + "Overflow contains 0 on overflow, non-zero otherwise." + self machineCodeAt: 16 put: (self subuR: Overflow R: OverflowTemp1 R: OverflowTemp2). + ^machineCodeSize := 20! Item was added: + ----- Method: CogMIPSELCompiler>>concretizeNegateR (in category 'generate machine code - concretize') ----- + concretizeNegateR + | reg | + reg := self concreteRegister: (operands at: 0). + self machineCodeAt: 0 put: (self subuR: reg R: ZR R: reg). + ^machineCodeSize := 4! Item was changed: ----- Method: CogMIPSELCompiler>>concretizeSubRR (in category 'generate machine code - concretize') ----- concretizeSubRR | leftReg rightReg | + rightReg := self concreteRegister: (operands at: 0). + leftReg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self subuR: leftReg R: leftReg R: rightReg). - leftReg := self concreteRegister: (operands at: 0). - rightReg := self concreteRegister: (operands at: 1). - self machineCodeAt: 0 put: (self subuR: rightReg R: leftReg R: rightReg). ^machineCodeSize := 4! Item was changed: ----- Method: CogMIPSELCompiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." <returnTypeC: #void> opcode caseOf: { [BrEqualRR] -> [^self concretizeBrEqualRR]. [BrNotEqualRR] -> [^self concretizeBrNotEqualRR]. [BrUnsignedLessRR] -> [^self concretizeBrUnsignedLessRR]. [BrUnsignedLessEqualRR] -> [^self concretizeBrUnsignedLessEqualRR]. [BrUnsignedGreaterRR] -> [^self concretizeBrUnsignedGreaterRR]. [BrUnsignedGreaterEqualRR] -> [^self concretizeBrUnsignedGreaterEqualRR]. [BrSignedLessRR] -> [^self concretizeBrSignedLessRR]. [BrSignedLessEqualRR] -> [^self concretizeBrSignedLessEqualRR]. [BrSignedGreaterRR] -> [^self concretizeBrSignedGreaterRR]. [BrSignedGreaterEqualRR] -> [^self concretizeBrSignedGreaterEqualRR]. [BrLongEqualRR] -> [^self concretizeBrLongEqualRR]. [BrLongNotEqualRR] -> [^self concretizeBrLongNotEqualRR]. [MulRR] -> [^self concretizeMulRR]. [DivRR] -> [^self concretizeDivRR]. [MoveLowR] -> [^self concretizeMoveLowR]. [MoveHighR] -> [^self concretizeMoveHighR]. "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [AlignmentNops] -> [^self concretizeAlignmentNops]. [Fill16] -> [^self concretizeFill16]. [Fill32] -> [^self concretizeFill32]. [FillFromWord] -> [^self concretizeFillFromWord]. [Nop] -> [^self concretizeNop]. "Control" [Call] -> [^self concretizeCall]. "call code within code space" [CallFull] -> [^self concretizeCallFull]. "call code anywhere in address space" [JumpR] -> [^self concretizeJumpR]. [JumpFull] -> [^self concretizeJumpFull]."jump within address space" [JumpLong] -> [^self concretizeJumpLong]."jumps witihn code space" [JumpLongZero] -> [^self concretizeJumpLongZero]. [JumpLongNonZero] -> [^self concretizeJumpLongNonZero]. [Jump] -> [^self concretizeJump]. [JumpZero] -> [^self concretizeJumpZero]. [JumpNonZero] -> [^self concretizeJumpNonZero]. [JumpNegative] -> [^self concretizeUnimplemented]. [JumpNonNegative] -> [^self concretizeUnimplemented]. [JumpOverflow] -> [^self concretizeJumpOverflow]. [JumpNoOverflow] -> [^self concretizeJumpNoOverflow]. [JumpCarry] -> [^self concretizeUnimplemented]. [JumpNoCarry] -> [^self concretizeUnimplemented]. [JumpLess] -> [^self concretizeJumpSignedLessThan]. [JumpGreaterOrEqual] -> [^self concretizeJumpSignedGreaterEqual]. [JumpGreater] -> [^self concretizeJumpSignedGreaterThan]. [JumpLessOrEqual] -> [^self concretizeJumpSignedLessEqual]. [JumpBelow] -> [^self concretizeJumpUnsignedLessThan]. [JumpAboveOrEqual] -> [^self concretizeJumpUnsignedGreaterEqual]. [JumpAbove] -> [^self concretizeJumpUnsignedGreaterThan]. [JumpBelowOrEqual] -> [^self concretizeJumpUnsignedLessEqual]. [JumpFPEqual] -> [^self concretizeUnimplemented]. [JumpFPNotEqual] -> [^self concretizeUnimplemented]. [JumpFPLess] -> [^self concretizeUnimplemented]. [JumpFPGreaterOrEqual] -> [^self concretizeUnimplemented]. [JumpFPGreater] -> [^self concretizeUnimplemented]. [JumpFPLessOrEqual] -> [^self concretizeUnimplemented]. [JumpFPOrdered] -> [^self concretizeUnimplemented]. [JumpFPUnordered] -> [^self concretizeUnimplemented]. [RetN] -> [^self concretizeRetN]. [Stop] -> [^self concretizeStop]. "Arithmetic" [AddCqR] -> [^self concretizeAddCqR]. [AndCqR] -> [^self concretizeAndCqR]. [AndCqRR] -> [^self concretizeAndCqRR]. [CmpCqR] -> [^self concretizeCmpCqR]. [OrCqR] -> [^self concretizeOrCqR]. [SubCqR] -> [^self concretizeSubCqR]. [TstCqR] -> [^self concretizeTstCqR]. [XorCqR] -> [^self concretizeXorCqR]. [AddCwR] -> [^self concretizeAddCwR]. [AndCwR] -> [^self concretizeAndCwR]. [CmpCwR] -> [^self concretizeCmpCwR]. [OrCwR] -> [^self concretizeOrCwR]. [SubCwR] -> [^self concretizeSubCwR]. [XorCwR] -> [^self concretizeXorCwR]. [AddRR] -> [^self concretizeAddRR]. [AndRR] -> [^self concretizeAndRR]. [CmpRR] -> [^self concretizeCmpRR]. [OrRR] -> [^self concretizeOrRR]. [SubRR] -> [^self concretizeSubRR]. [XorRR] -> [^self concretizeXorRR]. [AddRdRd] -> [^self concretizeUnimplemented]. [CmpRdRd] -> [^self concretizeUnimplemented]. [DivRdRd] -> [^self concretizeUnimplemented]. [MulRdRd] -> [^self concretizeUnimplemented]. [SubRdRd] -> [^self concretizeUnimplemented]. [SqrtRd] -> [^self concretizeUnimplemented]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [ArithmeticShiftRightCqR] -> [^self concretizeArithmeticShiftRightCqR]. [LogicalShiftRightCqR] -> [^self concretizeLogicalShiftRightCqR]. [LogicalShiftLeftCqR] -> [^self concretizeLogicalShiftLeftCqR]. [ArithmeticShiftRightRR] -> [^self concretizeArithmeticShiftRightRR]. [LogicalShiftLeftRR] -> [^self concretizeLogicalShiftLeftRR]. [LogicalShiftRightRR] -> [^self concretizeLogicalShiftRightRR]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. [MoveRR] -> [^self concretizeMoveRR]. [MoveAwR] -> [^self concretizeMoveAwR]. [MoveRAw] -> [^self concretizeMoveRAw]. [MoveAbR] -> [^self concretizeMoveAbR]. [MoveRAb] -> [^self concretizeMoveRAb]. [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveM64rRd] -> [^self concretizeM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveRXbrR] -> [^self concretizeMoveRXbrR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeRdM64r]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCq] -> [^self concretizePushCq]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. [AddCheckOverflowCqR] -> [^self concretizeAddCheckOverflowCqR]. [AddCheckOverflowRR] -> [^self concretizeAddCheckOverflowRR]. [SubCheckOverflowCqR] -> [^self concretizeSubCheckOverflowCqR]. [SubCheckOverflowRR] -> [^self concretizeSubCheckOverflowRR]. + [MulCheckOverflowRR] -> [^self concretizeMulCheckOverflowRR]. "Conversion" [ConvertRRd] -> [^self concretizeUnimplemented]}! Item was added: + ----- Method: CogMIPSELCompiler>>genAlignCStackSavingRegisters:numArgs:wordAlignment: (in category 'abi') ----- + genAlignCStackSavingRegisters: saveRegs numArgs: numArgs wordAlignment: alignment + | wordsPushedModAlignment delta | + self numIntRegArgs >= (saveRegs + ifTrue: [self numberOfSaveableRegisters + numArgs] + ifFalse: [numArgs]) ifTrue: + [^0]. + wordsPushedModAlignment := ((saveRegs ifTrue: [self numberOfSaveableRegisters] ifFalse: [0]) + + numArgs) + \\ alignment. + wordsPushedModAlignment ~= 0 ifTrue: + [delta := alignment - wordsPushedModAlignment. + cogit SubCq: delta * 4 R: SPReg]. + ^0! Item was added: + ----- Method: CogMIPSELCompiler>>genMulR:R: (in category 'abstract instructions') ----- + genMulR: regSource R: regDest + cogit gen: MulRR operand: regSource operand: regDest. + ^0! Item was added: + ----- Method: CogMIPSELCompiler>>genSubstituteReturnAddress: (in category 'abstract instructions') ----- + genSubstituteReturnAddress: retpc + <inline: true> + <returnTypeC: #'AbstractInstruction *'> + ^cogit MoveCw: retpc R: RA! Item was added: + ----- Method: CogMIPSELCompiler>>hasDoublePrecisionFloatingPointSupport (in category 'testing') ----- + hasDoublePrecisionFloatingPointSupport + <inline: true> + self flag: #todo. + ^false! Item was added: + ----- Method: CogMIPSELCompiler>>isCallPrecedingReturnPC: (in category 'testing') ----- + isCallPrecedingReturnPC: mcpc + cogit disassembleFrom: mcpc - 8 to: mcpc. + + (self opcodeAtAddress: mcpc - 8) = JAL ifTrue: [^true]. + + ((self opcodeAtAddress: mcpc - 8) = SPECIAL + and: [(self opcodeAtAddress: mcpc - 8) = JALR]) ifTrue: [^true]. + + ^false! Item was changed: + ----- Method: CogMIPSELCompiler>>isJump (in category 'testing') ----- - ----- Method: CogMIPSELCompiler>>isJump (in category 'as yet unclassified') ----- isJump ^super isJump or: [opcode between: BrEqualRR and: BrLongNotEqualRR]! Item was changed: ----- Method: CogMIPSELCompiler>>noteFollowingConditionalBranch: (in category 'abstract instructions') ----- noteFollowingConditionalBranch: branch "Support for processors without condition codes, such as the MIPS. Answer the branch opcode. Modify the receiver and the branch to implement a suitable conditional branch that doesn't depend on condition codes being set by the receiver." <var: #branch type: #'AbstractInstruction *'> | newBranchLeft newBranchOpcode newBranchRight | ((branch opcode = JumpOverflow) or: [branch opcode = JumpNoOverflow]) ifTrue: [opcode := opcode caseOf: { [AddCqR] -> [AddCheckOverflowCqR]. [AddRR] -> [AddCheckOverflowRR]. [MulRR] -> [MulCheckOverflowRR]. [SubCqR] -> [SubCheckOverflowCqR]. [SubRR] -> [SubCheckOverflowRR]. } otherwise: [self unreachable]. ^branch]. newBranchOpcode := branch opcode caseOf: { [JumpZero] -> [BrEqualRR]. [JumpNonZero] -> [BrNotEqualRR]. [JumpBelow] -> [BrUnsignedLessRR]. [JumpBelowOrEqual] -> [BrUnsignedLessEqualRR]. [JumpAbove] -> [BrUnsignedGreaterRR]. [JumpAboveOrEqual] -> [BrUnsignedGreaterEqualRR]. [JumpLess] -> [BrSignedLessRR]. [JumpLessOrEqual] -> [BrSignedLessEqualRR]. [JumpGreater] -> [BrSignedGreaterRR]. [JumpGreaterOrEqual] -> [BrSignedGreaterEqualRR]. [JumpLongZero] -> [BrLongEqualRR]. [JumpLongNonZero] -> [BrLongNotEqualRR]. + + [JumpNegative] -> [BrSignedLessRR]. } otherwise: [self unreachable]. opcode caseOf: { [BrEqualRR] -> ["I.e., two jumps after a compare." newBranchLeft := operands at: 1. + newBranchRight := operands at: 2]. + [BrUnsignedLessRR] -> ["I.e., two jumps after a compare." + newBranchLeft := operands at: 1. + newBranchRight := operands at: 2]. + + [CmpRR] -> [newBranchLeft := operands at: 1. + newBranchRight := operands at: 0. - newBranchRight := operands at: 2]. - [CmpRR] -> [newBranchLeft := operands at: 0. - newBranchRight := operands at: 1. opcode := Label]. + [CmpCqR] -> [newBranchLeft := operands at: 1. + newBranchRight := AT. - [CmpCqR] -> [newBranchLeft := AT. - newBranchRight := operands at: 1. opcode := MoveCqR. operands at: 1 put: AT]. + [CmpCwR] -> [newBranchLeft := operands at: 1. + newBranchRight := AT. - [CmpCwR] -> [newBranchLeft := AT. - newBranchRight := operands at: 1. opcode := MoveCwR. operands at: 1 put: AT]. [TstCqR] -> [newBranchLeft := Cmp. newBranchRight := ZR]. [AndCqR] -> [newBranchLeft := operands at: 1. newBranchRight := ZR]. [AndCqRR] -> [newBranchLeft := operands at: 2. newBranchRight := ZR]. [OrRR] -> [newBranchLeft := operands at: 1. newBranchRight := ZR]. [XorRR] -> [newBranchLeft := operands at: 1. newBranchRight := ZR]. [SubCwR] -> [newBranchLeft := operands at: 1. newBranchRight := ZR]. [SubCqR] -> [newBranchLeft := operands at: 1. newBranchRight := ZR]. + [ArithmeticShiftRightCqR] -> [newBranchLeft := operands at: 1. + newBranchRight := ZR]. } otherwise: [self unreachable]. branch rewriteOpcode: newBranchOpcode with: newBranchLeft with: newBranchRight. ^branch! Item was changed: ----- Method: CogMIPSELCompiler>>rewriteCPICJumpAt:target: (in category 'inline cacheing') ----- rewriteCPICJumpAt: addressFollowingJump target: jumpTargetAddress "Rewrite a jump instruction to call a different target. This variant is used to reset the jumps in the prototype CPIC to suit each use,. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #addressFollowingJump type: #usqInt> <var: #jumpTargetAddress type: #usqInt> + "self CmpR: ClassReg R: TempReg. + ^self JumpNonZero: 0" + + "bne s5, s3, +156 ; =BE7C + nop (delay slot) + .... <-- addressFollowingJump" + + self assert: (self opcodeAtAddress: addressFollowingJump - 8) = BNE. + self assert: (objectMemory longAt: addressFollowingJump - 4) = self nop. + cogit disassembleFrom: addressFollowingJump - 8 to: addressFollowingJump. + + self rewriteITypeBranchAtAddress: addressFollowingJump - 8 target: jumpTargetAddress. + + self assert: (self opcodeAtAddress: addressFollowingJump - 8) = BNE. + self assert: (objectMemory longAt: addressFollowingJump - 4) = self nop. + cogit disassembleFrom: addressFollowingJump - 8 to: addressFollowingJump.! - cogit disassembleFrom: addressFollowingJump - 16 to: addressFollowingJump + 16. - self halt.! Item was added: + ----- Method: CogMIPSELCompiler>>rewriteConditionalJumpLongAt:target: (in category 'inline cacheing') ----- + rewriteConditionalJumpLongAt: callSiteReturnAddress target: callTargetAddress + "Rewrite a jump instruction to call a different target. This variant is used to reset the + jumps in the prototype CPIC to suit each use,. + Answer the extent of the code change which is used to compute the range of the icache to flush." + <var: #callSiteReturnAddress type: #usqInt> + <var: #callTargetAddress type: #usqInt> + + self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = J. + self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. + cogit disassembleFrom: callSiteReturnAddress - 8 to: callSiteReturnAddress. + + self rewriteJTypeAtAddress: callSiteReturnAddress - 8 target: callTargetAddress. + + self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = J. + self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. + cogit disassembleFrom: callSiteReturnAddress - 8 to: callSiteReturnAddress. + ! Item was changed: ----- Method: CogMIPSELCompiler>>rewriteJumpLongAt:target: (in category 'inline cacheing') ----- rewriteJumpLongAt: callSiteReturnAddress target: callTargetAddress "Rewrite a jump instruction to call a different target. This variant is used to reset the jumps in the prototype CPIC to suit each use,. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> - self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = J. - self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. - cogit disassembleFrom: callSiteReturnAddress - 8 to: callSiteReturnAddress. - - self rewriteJTypeAtAddress: callSiteReturnAddress - 8 target: callTargetAddress. - - self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = J. - self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. - cogit disassembleFrom: callSiteReturnAddress - 8 to: callSiteReturnAddress. - - ^8 - "lui t9, stub/targetHigh ori t9, t9, stub/targetLow jr t9 nop (delay slot) ... <-- callSiteReturnAddress" + self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. - "self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) = ORI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = SPECIAL. self assert: (self functionAtAddress: callSiteReturnAddress - 8) = JR. self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. cogit disassembleFrom: callSiteReturnAddress - 16 to: callSiteReturnAddress. self literalAtAddress: callSiteReturnAddress - 12 put: callTargetAddress. self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) = ORI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = SPECIAL. self assert: (self functionAtAddress: callSiteReturnAddress - 8) = JR. self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. cogit disassembleFrom: callSiteReturnAddress - 16 to: callSiteReturnAddress. + ^20! - ^20"! Item was changed: ----- Method: CogMIPSELCompiler>>setsConditionCodesFor: (in category 'testing') ----- setsConditionCodesFor: aConditionalJumpOpcode <inline: false> + "Not really, but we can merge this in noteFollowingConditionalBranch:." + opcode = XorRR ifTrue: [^true]. + opcode = ArithmeticShiftRightCqR ifTrue: [^true]. - opcode = XorRR ifTrue: [^true]. "Not really, but we can merge this in noteFollowingConditionalBranch:." self unreachable. ^false! Item was added: + CogMIPSELCompiler subclass: #CogMIPSELCompilerForTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Tests'! Item was added: + ----- Method: CogMIPSELCompilerForTests class>>dataRegistersWithAccessorsDo: (in category 'as yet unclassified') ----- + dataRegistersWithAccessorsDo: aTrinaryBlock + #((16 s0 s0:) + (17 s1 s1:) + (18 s2 s2:) + (19 s3 s3:) + (20 s4 s4:) + (21 s5 s5:) + (22 s6 s6:) + (29 sp sp:) + (30 fp fp:) + (31 ra ra:)) do: [:triple | aTrinaryBlock valueWithArguments: triple].! Item was added: + ----- Method: CogMIPSELCompilerForTests class>>isConcreteRISCTempRegister: (in category 'as yet unclassified') ----- + isConcreteRISCTempRegister: concreteRegister + "For tests to filter-out bogus values left in the ConcreteRISCTempRegister, if any." + ^concreteRegister = AT + or: [concreteRegister = Cmp + or: [concreteRegister = Overflow + or: [concreteRegister = BranchTemp]]]! Item was added: + AbstractInstructionTests subclass: #CogMIPSELCompilerTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Tests'! Item was added: + ----- Method: CogMIPSELCompilerTests>>assertCheckLongArithOpCodeSize: (in category 'accessing') ----- + assertCheckLongArithOpCodeSize: bytes + self assert: bytes = 12.! Item was added: + ----- Method: CogMIPSELCompilerTests>>assertCheckQuickArithOpCodeSize: (in category 'as yet unclassified') ----- + assertCheckQuickArithOpCodeSize: bytes + self flag: #todo. "We always generate the full 3 instructions for now." + self assert: bytes = 12! Item was added: + ----- Method: CogMIPSELCompilerTests>>concreteCompilerClass (in category 'accessing') ----- + concreteCompilerClass + ^CogMIPSELCompilerForTests! Item was added: + ----- Method: CogMIPSELCompilerTests>>memoryAsBytes: (in category 'as yet unclassified') ----- + memoryAsBytes: instructionMachineCode + "Manage the fact that in the simulator inst machineCode object is an Array and the disassembler requires a ByteArray or some such." + | bytes | + instructionMachineCode isCObjectAccessor ifTrue: + [^self memoryAsBytes: instructionMachineCode object]. + instructionMachineCode isArray ifFalse: + [self assert: instructionMachineCode class isBits. + ^instructionMachineCode]. + bytes := ByteArray new: instructionMachineCode size * 4. + 1 to: instructionMachineCode size do: + [:i| + (instructionMachineCode at: i) ifNotNil: + [:word| + bytes unsignedLongAt: i - 1* 4 + 1 put: word]]. + ^bytes! Item was added: + ----- Method: CogMIPSELCompilerTests>>processor (in category 'accessing') ----- + processor + processor ifNil: + [processor := MIPSELSimulator new]. + ^processor! Item was changed: ----- Method: Cogit>>JumpAbove: (in category 'abstract instructions') ----- JumpAbove: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpAbove operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpAbove operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpAboveOrEqual: (in category 'abstract instructions') ----- JumpAboveOrEqual: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpAboveOrEqual operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpAboveOrEqual operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpBelow: (in category 'abstract instructions') ----- JumpBelow: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpBelow operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpBelow operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpBelowOrEqual: (in category 'abstract instructions') ----- JumpBelowOrEqual: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpBelowOrEqual operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpBelowOrEqual operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpCarry: (in category 'abstract instructions') ----- JumpCarry: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpCarry operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpCarry operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpGreater: (in category 'abstract instructions') ----- JumpGreater: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpGreater operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpGreater operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpGreaterOrEqual: (in category 'abstract instructions') ----- JumpGreaterOrEqual: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpGreaterOrEqual operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpGreaterOrEqual operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpLess: (in category 'abstract instructions') ----- JumpLess: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpLess operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpLess operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpLessOrEqual: (in category 'abstract instructions') ----- JumpLessOrEqual: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpLessOrEqual operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpLessOrEqual operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpLongNonZero: (in category 'abstract instructions') ----- JumpLongNonZero: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> + ^self genConditionalBranch: JumpLongNonZero operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpLongNonZero operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpLongZero: (in category 'abstract instructions') ----- JumpLongZero: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> + ^self genConditionalBranch: JumpLongZero operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpLongZero operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpNegative: (in category 'abstract instructions') ----- JumpNegative: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpNegative operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpNegative operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpNoCarry: (in category 'abstract instructions') ----- JumpNoCarry: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpNoCarry operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpNoCarry operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpNoOverflow: (in category 'abstract instructions') ----- JumpNoOverflow: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpNoOverflow operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpNoOverflow operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpNonNegative: (in category 'abstract instructions') ----- JumpNonNegative: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpNonNegative operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpNonNegative operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpNonZero: (in category 'abstract instructions') ----- JumpNonZero: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpNonZero operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpNonZero operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpOverflow: (in category 'abstract instructions') ----- JumpOverflow: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpOverflow operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpOverflow operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>JumpZero: (in category 'abstract instructions') ----- JumpZero: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> <var: #jumpTarget type: #'void *'> + ^self genConditionalBranch: JumpZero operand: jumpTarget asInteger! - ^self previousInstruction noteFollowingConditionalBranch: - (self gen: JumpZero operand: jumpTarget asInteger)! Item was changed: ----- Method: Cogit>>configureMNUCPIC:methodOperand:numArgs:delta: (in category 'in-line cacheing') ----- configureMNUCPIC: cPIC methodOperand: methodOperand numArgs: numArgs delta: addrDelta "Configure a copy of the prototype CPIC for a one-case MNU CPIC that calls ceMNUFromPIC for case0Tag The tag for case0 is at the send site and so doesn't need to be generated. addDelta is the address change from the prototype to the new CPIC location, needed because the loading of the CPIC label at the end may be a literal instead of a pc-relative load." <var: #cPIC type: #'CogMethod *'> | operand | "adjust the jump at missOffset, the ceAbortXArgs" + backEnd rewriteCallAt: cPIC asInteger + missOffset target: (self picAbortTrampolineFor: numArgs). - backEnd rewriteJumpLongAt: cPIC asInteger + missOffset target: (self picAbortTrampolineFor: numArgs). "We do not scavenge PICs, hence we cannot cache the MNU method if it is in new space." operand := (methodOperand isNil or: [objectMemory isYoungObject: methodOperand]) ifTrue: [0] ifFalse: [methodOperand]. "set the jump to the case0 method" backEnd rewriteJumpLongAt: cPIC asInteger + firstCPICCaseOffset target: cPIC asInteger + (self sizeof: CogMethod) . backEnd storeLiteral: operand beforeFollowingAddress: cPIC asInteger + firstCPICCaseOffset - backEnd jumpLongByteSize. "rewrite the final desperate jump to cePICMissXArgs" backEnd rewriteJumpLongAt: cPIC asInteger + cPICEndOfCodeOffset target: (self cPICMissTrampolineFor: numArgs). "update the loading of the CPIC label address" backEnd relocateMethodReferenceBeforeAddress: cPIC asInteger + cPICEndOfCodeOffset - backEnd jumpLongByteSize by: addrDelta. "finally, rewrite the jump 3 instr before firstCPICCaseOffset to jump to the end of case 2, missing the actual case" self rewriteCPIC: cPIC caseJumpTo: (self addressOfEndOfCase: 2 inCPIC: cPIC). ^0! Item was added: + ----- Method: Cogit>>genConditionalBranch:operand: (in category 'compile abstract instructions') ----- + genConditionalBranch: opcode operand: operandOne + ^self previousInstruction noteFollowingConditionalBranch: (self gen: opcode operand: operandOne)! Item was changed: ----- Method: Cogit>>rewriteCPICCaseAt:tag:objRef:target: (in category 'in-line cacheing') ----- rewriteCPICCaseAt: followingAddress tag: newTag objRef: newObjRef target: newTarget "Rewrite the three values involved in a CPIC case. Used by the initialize & extend CPICs. c.f. expectedClosedPICPrototype:" "write the obj ref/operand via the second ldr" | classTagPC methodObjPC | methodObjPC := followingAddress - backEnd jumpLongConditionalByteSize - backEnd cmpC32RTempByteSize. backEnd storeLiteral: newObjRef beforeFollowingAddress: methodObjPC. classTagPC := followingAddress - backEnd jumpLongConditionalByteSize. "rewite the tag via the first ldr" backEnd storeLiteral32: newTag beforeFollowingAddress: classTagPC. "write the jump address for the new target address" + backEnd rewriteConditionalJumpLongAt: followingAddress target: newTarget! - backEnd rewriteJumpLongAt: followingAddress target: newTarget! Item was added: + SharedPool subclass: #MIPSConstants + instanceVariableNames: '' + classVariableNames: 'A0 A1 A2 A3 ADDIU ADDU AND ANDI AT BEQ BGEZ BGTZ BLEZ BLTZ BNE BREAK DIV FP GP HintLoad HintStore J JAL JALR JR K0 K1 LB LBU LH LHU LUI LW MFHI MFLO MULT OR ORI OneInstruction PREF R0 R1 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R2 R20 R21 R22 R23 R24 R25 R26 R27 R28 R29 R3 R30 R31 R4 R5 R6 R7 R8 R9 RA REGIMM S0 S1 S2 S3 S4 S5 S6 S7 SB SH SLL SLLV SLT SLTI SLTIU SLTU SP SPECIAL SRA SRAV SRL SRLV SUBU SW T0 T1 T2 T3 T4 T5 T6 T7 T8 T9 TwoInstructions V0 V1 XOR XORI ZR' + poolDictionaries: '' + category: 'VMMaker-JIT'! + + !MIPSConstants commentStamp: 'rmacnak 11/11/2015 20:29:59' prior: 0! + MIPS opcodes and register names.! Item was added: + ----- Method: MIPSConstants class>>initialize (in category 'as yet unclassified') ----- + initialize + super initialize. + + OneInstruction := 4. + TwoInstructions := 8. + + HintLoad := 0. + HintStore := 1. + + self initializeRegisters. + self initializeOpcodes. + self initializeSpecialFunctions. + self initializeRegImmRts.! Item was added: + ----- Method: MIPSConstants class>>initializeOpcodes (in category 'as yet unclassified') ----- + initializeOpcodes + SPECIAL := 0. + REGIMM := 1. + J := 2. + JAL := 3. + BEQ := 4. + BNE := 5. + BLEZ := 6. + BGTZ := 7. + ADDIU := 9. + SLTI := 10. + SLTIU := 11. + ANDI := 12. + ORI := 13. + XORI := 14. + LUI := 15. + LB := 32. + LH := 33. + LW := 35. + LBU := 36. + LHU := 37. + SB := 40. + SH := 41. + SW := 43. + PREF := 51.! Item was added: + ----- Method: MIPSConstants class>>initializeRegImmRts (in category 'as yet unclassified') ----- + initializeRegImmRts + BLTZ := 0. + BGEZ := 1.! Item was added: + ----- Method: MIPSConstants class>>initializeRegisters (in category 'as yet unclassified') ----- + initializeRegisters + self flag: #OABI. + R0 := ZR := 0. "Hardwired zero" + R1 := AT := 1. "Assembler temp - used to expand psuedo instructions" + R2 := V0 := 2. "ABI: result register" + R3 := V1 := 3. "ABI: result register" + R4 := A0 := 4. "ABI: argument register" + R5 := A1 := 5. "ABI: argument register" + R6 := A2 := 6. "ABI: argument register" + R7 := A3 := 7. "ABI: argument register" + R8 := T0 := 8. "ABI: volatile" + R9 := T1 := 9. "ABI: volatile" + R10 := T2 := 10. "ABI: volatile" + R11 := T3 := 11. "ABI: volatile" + R12 := T4 := 12. "ABI: volatile" + R13 := T5 := 13. "ABI: volatile" + R14 := T6 := 14. "ABI: volatile" + R15 := T7 := 15. "ABI: volatile" + R16 := S0 := 16. "ABI: preserved" + R17 := S1 := 17. "ABI: preserved" + R18 := S2 := 18. "ABI: preserved" + R19 := S3 := 19. "ABI: preserved" + R20 := S4 := 20. "ABI: preserved" + R21 := S5 := 21. "ABI: preserved" + R22 := S6 := 22. "ABI: preserved" + R23 := S7 := 23. "ABI: preserved" + R24 := T8 := 24. "ABI: volatile" + R25 := T9 := 25. "Special use in some position-independent code" + R26 := K0 := 26. "Reserved for OS" + R27 := K1 := 27. "Reserved for OS" + R28 := GP := 28. "Special use in some position-independent code" + R29 := SP := 29. "Stack pointer" + R30 := FP := 30. "Frame pointer" + R31 := RA := 31. "Link register" + + ! Item was added: + ----- Method: MIPSConstants class>>initializeSpecialFunctions (in category 'as yet unclassified') ----- + initializeSpecialFunctions + SLL := 0. + SRL := 2. + SRA := 3. + SLLV := 4. + SRLV := 6. + SRAV := 7. + JR := 8. + JALR := 9. + BREAK := 13. + MFHI := 16. + MFLO := 18. + MULT := 24. + DIV := 26. + ADDU := 33. + SUBU := 35. + AND := 36. + OR := 37. + XOR := 38. + SLT := 42. + SLTU := 43.! Item was added: + ----- Method: MIPSConstants class>>nameForRegister: (in category 'as yet unclassified') ----- + nameForRegister: registerNumber + ^#(zr at v0 v1 a0 a1 a2 a3 + t0 t1 t2 t3 t4 t5 t6 t7 + s0 s1 s2 s3 s4 s5 s6 s7 + t8 t9 k0 k1 gp sp fp ra) at: registerNumber + 1! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor rcvrIsInt argIsInt argInt jumpNotSmallInts inlineCAB annotateInst counterAddress countTripped counterReg index | <var: #countTripped type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ self genSpecialSelectorComparisonWithoutCounters ]. self ssFlushTo: simStackPtr - 2. primDescriptor := self generatorAt: byte0. argIsInt := self ssTop type = SSConstant and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (self ssValue: 1) type = SSConstant and: [objectMemory isIntegerObject: (self ssValue: 1) constant]. "short-cut the jump if operands are SmallInteger constants." (argIsInt and: [rcvrIsInt]) ifTrue: [^ self genStaticallyResolvedSpecialSelectorComparison]. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. "Only interested in inlining if followed by a conditional branch." inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. The relational operators successfully statically predict SmallIntegers; the equality operators do not." (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: [inlineCAB := argIsInt or: [rcvrIsInt]]. inlineCAB ifFalse: [^self genSpecialSelectorSend]. argIsInt ifTrue: [(self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. self ssPop: 2. self MoveR: ReceiverResultReg R: TempReg] ifFalse: [self marshallSendArguments: 1. self MoveR: Arg0Reg R: TempReg. rcvrIsInt ifFalse: [objectRepresentation isSmallIntegerTagNonZero ifTrue: [self AndR: ReceiverResultReg R: TempReg] ifFalse: [self OrR: ReceiverResultReg R: TempReg]]]. jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. counterReg := self allocateRegNotConflictingWith: (self registerMaskFor: ReceiverResultReg and: Arg0Reg). self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: counterReg. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [self CmpCq: argInt R: ReceiverResultReg]] ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg]. "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." + self genConditionalBranch: (branchDescriptor isBranchTrue - self gen: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). countTripped jmpTarget: (jumpNotSmallInts jmpTarget: self Label). argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. ^self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryInlineComparison:opFalse:destReg: (in category 'inline primitive generators') ----- genBinaryInlineComparison: opTrue opFalse: opFalse destReg: destReg "Inlined comparison. opTrue = jump for true and opFalse = jump for false" <var: #branchDescriptor type: #'BytecodeDescriptor *'> | nextPC branchDescriptor targetBytecodePC postBranchPC | self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifTrue: "This is the path where the inlined comparison is followed immediately by a branch" [ (self fixupAt: nextPC - initialPC) targetInstruction = 0 ifTrue: "The next instruction is dead. we can skip it." [deadCode := true. self ensureFixupAt: targetBytecodePC - initialPC. self ensureFixupAt: postBranchPC - initialPC ] ifFalse: [self ssPushConstant: objectMemory trueObject]. "dummy value" + self genConditionalBranch: (branchDescriptor isBranchTrue ifTrue: [opTrue] ifFalse: [opFalse]) - self gen: (branchDescriptor isBranchTrue ifTrue: [opTrue] ifFalse: [opFalse]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. deadCode ifFalse: [ self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC) ] ] ifFalse: "This is the path where the inlined comparison is *not* followed immediately by a branch" [| condJump jump | + condJump := self genConditionalBranch: opTrue operand: 0. - condJump := self gen: opTrue operand: 0. self genMoveFalseR: destReg. jump := self Jump: 0. condJump jmpTarget: (self genMoveTrueR: destReg). jump jmpTarget: self Label]. ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSmallIntegerComparison: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode | jumpFail jumpTrue | <var: #jumpFail type: #'AbstractInstruction *'> <var: #jumpTrue type: #'AbstractInstruction *'> jumpFail := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg. self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" + jumpTrue := self genConditionalBranch: jumpOpcode operand: 0. - jumpTrue := self gen: jumpOpcode. self genMoveFalseR: ReceiverResultReg. self RetN: 0. jumpTrue jmpTarget: (self genMoveTrueR: ReceiverResultReg). self RetN: 0. jumpFail jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor rcvrIsInt argIsInt argInt jumpNotSmallInts inlineCAB annotateInst index | <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 2. primDescriptor := self generatorAt: byte0. argIsInt := self ssTop type = SSConstant and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (self ssValue: 1) type = SSConstant and: [objectMemory isIntegerObject: (self ssValue: 1) constant]. (argIsInt and: [rcvrIsInt]) ifTrue: [^ self genStaticallyResolvedSpecialSelectorComparison]. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. "Only interested in inlining if followed by a conditional branch." inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. The relational operators successfully statically predict SmallIntegers; the equality operators do not." (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: [inlineCAB := argIsInt or: [rcvrIsInt]]. inlineCAB ifFalse: [^self genSpecialSelectorSend]. argIsInt ifTrue: [(self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. self ssPop: 2. self MoveR: ReceiverResultReg R: TempReg] ifFalse: [self marshallSendArguments: 1. self MoveR: Arg0Reg R: TempReg. rcvrIsInt ifFalse: [objectRepresentation isSmallIntegerTagNonZero ifTrue: [self AndR: ReceiverResultReg R: TempReg] ifFalse: [self OrR: ReceiverResultReg R: TempReg]]]. jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [self CmpCq: argInt R: ReceiverResultReg]] ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg]. "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." + self genConditionalBranch: (branchDescriptor isBranchTrue - self gen: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). jumpNotSmallInts jmpTarget: self Label. argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. ^self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines! Item was changed: ----- Method: StackToRegisterMappingCogit>>genVanillaSpecialSelectorEqualsEquals (in category 'bytecode generators') ----- genVanillaSpecialSelectorEqualsEquals | nextPC postBranchPC targetBytecodePC branchDescriptor rcvrReg argReg argIsConstant rcvrIsConstant | <var: #branchDescriptor type: #'BytecodeDescriptor *'> self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. argIsConstant := self ssTop type = SSConstant. "they can't be both constants because we do not have instructions manipulating two constants, if this is the case, which can happen due to annotable constants that can be moved in memory with become and therefore can't resolve #== at compilation time, still write the rcvr into a register as if it was not a constant. It's uncommon anyway." rcvrIsConstant := argIsConstant not and: [(self ssValue: 1) type = SSConstant]. self allocateEqualsEqualsRegistersArgNeedsReg: argIsConstant not rcvrNeedsReg: rcvrIsConstant not into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. "If not followed by a branch, resolve to true or false." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [ ^ self genEqualsEqualsNoBranchArgIsConstant: argIsConstant rcvrIsConstant: rcvrIsConstant argReg: argReg rcvrReg: rcvrReg]. "If branching the stack must be flushed for the merge" self ssFlushTo: simStackPtr - 2. self genEqualsEqualsComparisonArgIsConstant: argIsConstant rcvrIsConstant: rcvrIsConstant argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "Further since there is a following conditional jump bytecode, define non-merge fixups and leave the cond bytecode to set the mergeness." (self fixupAt: nextPC - initialPC) targetInstruction = 0 ifTrue: "The next instruction is dead. we can skip it." [deadCode := true. self ensureFixupAt: targetBytecodePC - initialPC. self ensureFixupAt: postBranchPC - initialPC] ifFalse: [self ssPushConstant: objectMemory trueObject]. "dummy value" + self genConditionalBranch: (branchDescriptor isBranchTrue ifTrue: [JumpZero] ifFalse: [JumpNonZero]) - self gen: (branchDescriptor isBranchTrue ifTrue: [JumpZero] ifFalse: [JumpNonZero]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. "If the branch is dead, then we can just fall through postBranchPC (only a nop in-between), else we need to jump over the code of the branch" deadCode ifFalse: [self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC)]. ^0!

1 0

VM Maker: Cog-rmacnak.298.mcz
by commits＠source.squeak.org 27 Nov '15

27 Nov '15

Ryan Macnak uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-rmacnak.298.mcz ==================== Summary ==================== Name: Cog-rmacnak.298 Author: rmacnak Time: 27 November 2015, 1:58:17.721 pm UUID: 064ca517-a582-4db4-b874-2737a5a64e11 Ancestors: Cog-rmacnak.297 Move MIPSConstants to VMMaker. Support single stepping the simulator. Add more register accessors. Match hardware behavior for divide by zero and divide with overflow. Initialize registers with zero instead of zap to match existing test expectations. =============== Diff against Cog-rmacnak.297 =============== Item was removed: - SharedPool subclass: #MIPSConstants - instanceVariableNames: '' - classVariableNames: 'A0 A1 A2 A3 ADDIU ADDU AND ANDI AT BEQ BGEZ BGTZ BLEZ BLTZ BNE BREAK DIV FP GP HintLoad HintStore J JAL JALR JR K0 K1 LB LBU LH LHU LUI LW MFHI MFLO MULT OR ORI OneInstruction PREF R0 R1 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R2 R20 R21 R22 R23 R24 R25 R26 R27 R28 R29 R3 R30 R31 R4 R5 R6 R7 R8 R9 RA REGIMM S0 S1 S2 S3 S4 S5 S6 S7 SB SH SLL SLLV SLT SLTI SLTIU SLTU SP SPECIAL SRA SRAV SRL SRLV SUBU SW T0 T1 T2 T3 T4 T5 T6 T7 T8 T9 TwoInstructions V0 V1 XOR XORI ZR' - poolDictionaries: '' - category: 'Cog-Processors'! - - !MIPSConstants commentStamp: 'rmacnak 11/11/2015 20:29:59' prior: 0! - MIPS opcodes and register names.! Item was removed: - ----- Method: MIPSConstants class>>initialize (in category 'as yet unclassified') ----- - initialize - super initialize. - - OneInstruction := 4. - TwoInstructions := 8. - - HintLoad := 0. - HintStore := 1. - - self initializeRegisters. - self initializeOpcodes. - self initializeSpecialFunctions. - self initializeRegImmRts.! Item was removed: - ----- Method: MIPSConstants class>>initializeOpcodes (in category 'as yet unclassified') ----- - initializeOpcodes - SPECIAL := 0. - REGIMM := 1. - J := 2. - JAL := 3. - BEQ := 4. - BNE := 5. - BLEZ := 6. - BGTZ := 7. - ADDIU := 9. - SLTI := 10. - SLTIU := 11. - ANDI := 12. - ORI := 13. - XORI := 14. - LUI := 15. - LB := 32. - LH := 33. - LW := 35. - LBU := 36. - LHU := 37. - SB := 40. - SH := 41. - SW := 43. - PREF := 51.! Item was removed: - ----- Method: MIPSConstants class>>initializeRegImmRts (in category 'as yet unclassified') ----- - initializeRegImmRts - BLTZ := 0. - BGEZ := 1.! Item was removed: - ----- Method: MIPSConstants class>>initializeRegisters (in category 'as yet unclassified') ----- - initializeRegisters - self flag: #OABI. - R0 := ZR := 0. "Hardwired zero" - R1 := AT := 1. "Assembler temp - used to expand psuedo instructions" - R2 := V0 := 2. "ABI: result register" - R3 := V1 := 3. "ABI: result register" - R4 := A0 := 4. "ABI: argument register" - R5 := A1 := 5. "ABI: argument register" - R6 := A2 := 6. "ABI: argument register" - R7 := A3 := 7. "ABI: argument register" - R8 := T0 := 8. "ABI: volatile" - R9 := T1 := 9. "ABI: volatile" - R10 := T2 := 10. "ABI: volatile" - R11 := T3 := 11. "ABI: volatile" - R12 := T4 := 12. "ABI: volatile" - R13 := T5 := 13. "ABI: volatile" - R14 := T6 := 14. "ABI: volatile" - R15 := T7 := 15. "ABI: volatile" - R16 := S0 := 16. "ABI: preserved" - R17 := S1 := 17. "ABI: preserved" - R18 := S2 := 18. "ABI: preserved" - R19 := S3 := 19. "ABI: preserved" - R20 := S4 := 20. "ABI: preserved" - R21 := S5 := 21. "ABI: preserved" - R22 := S6 := 22. "ABI: preserved" - R23 := S7 := 23. "ABI: preserved" - R24 := T8 := 24. "ABI: volatile" - R25 := T9 := 25. "Special use in some position-independent code" - R26 := K0 := 26. "Reserved for OS" - R27 := K1 := 27. "Reserved for OS" - R28 := GP := 28. "Special use in some position-independent code" - R29 := SP := 29. "Stack pointer" - R30 := FP := 30. "Frame pointer" - R31 := RA := 31. "Link register" - - ! Item was removed: - ----- Method: MIPSConstants class>>initializeSpecialFunctions (in category 'as yet unclassified') ----- - initializeSpecialFunctions - SLL := 0. - SRL := 2. - SRA := 3. - SLLV := 4. - SRLV := 6. - SRAV := 7. - JR := 8. - JALR := 9. - BREAK := 13. - MFHI := 16. - MFLO := 18. - MULT := 24. - DIV := 26. - ADDU := 33. - SUBU := 35. - AND := 36. - OR := 37. - XOR := 38. - SLT := 42. - SLTU := 43.! Item was removed: - ----- Method: MIPSConstants class>>nameForRegister: (in category 'as yet unclassified') ----- - nameForRegister: registerNumber - ^#(zr at v0 v1 a0 a1 a2 a3 - t0 t1 t2 t3 t4 t5 t6 t7 - s0 s1 s2 s3 s4 s5 s6 s7 - t8 t9 k0 k1 gp sp fp ra) at: registerNumber + 1! Item was added: + ----- Method: MIPSELSimulator>>endianness (in category 'accessing') ----- + endianness + ^#little! Item was changed: ----- Method: MIPSELSimulator>>signedHalfword: (in category 'memory') ----- signedHalfword: address (address bitAnd: 1) = 0 ifFalse: [self error: 'Unaligned read']. address < readableBase ifTrue: [self readFault: address]. address > readableLimit ifTrue: [self readFault: address]. ^memory signedShortAt: address + 1! Item was changed: ----- Method: MIPSELSimulatorTests>>testDiv (in category 'tests - arithmetic') ----- testDiv "Strangely, objdump is unable to disassemble this sequence." | result | self testGenerateInto: [:stream :compiler | stream nextPut: (compiler divR: A0 R: A1). stream nextPut: (compiler mfloR: V0). stream nextPut: (compiler jR: RA). stream nextPut: (compiler nop). "Delay slot"] disassembly: '00000000 0085001A div a0, a1 00000004 00001012 mflo v0 00000008 03E00008 jr ra 0000000C 00000000 nop ' run: [:simulator | result := simulator call: 0 with: 3 with: 7 with: 0 with: 0. self assert: result equals: 0. result := simulator call: 0 with: -3 with: 7 with: 0 with: 0. self assert: result equals: 0. result := simulator call: 0 with: 3 with: -7 with: 0 with: 0. self assert: result equals: 0. result := simulator call: 0 with: -3 with: -7 with: 0 with: 0. self assert: result equals: 0. result := simulator call: 0 with: 7 with: 3 with: 0 with: 0. self assert: result equals: 2. result := simulator call: 0 with: -7 with: 3 with: 0 with: 0. self assert: result equals: -2. result := simulator call: 0 with: 7 with: -3 with: 0 with: 0. self assert: result equals: -2. result := simulator call: 0 with: -7 with: -3 with: 0 with: 0. + self assert: result equals: 2. + result := simulator call: 0 with: 42 with: 0 with: 0 with: 0. + self assert: result equals: 0. + result := simulator call: 0 with: -16r80000000 with: -1 with: 0 with: 0. + self assert: result equals: -16r80000000]. - self assert: result equals: 2]. self testGenerateInto: [:stream :compiler | stream nextPut: (compiler divR: A0 R: A1). stream nextPut: (compiler mfhiR: V0). stream nextPut: (compiler jR: RA). stream nextPut: (compiler nop). "Delay slot"] disassembly: '00000000 0085001A div a0, a1 00000004 00001010 mfhi v0 00000008 03E00008 jr ra 0000000C 00000000 nop ' run: [:simulator | result := simulator call: 0 with: 3 with: 7 with: 0 with: 0. self assert: result equals: 3. result := simulator call: 0 with: -3 with: 7 with: 0 with: 0. self assert: result equals: -3. result := simulator call: 0 with: 3 with: -7 with: 0 with: 0. self assert: result equals: 3. result := simulator call: 0 with: -3 with: -7 with: 0 with: 0. self assert: result equals: -3. result := simulator call: 0 with: 7 with: 3 with: 0 with: 0. self assert: result equals: 1. result := simulator call: 0 with: -7 with: 3 with: 0 with: 0. self assert: result equals: -1. result := simulator call: 0 with: 7 with: -3 with: 0 with: 0. self assert: result equals: 1. result := simulator call: 0 with: -7 with: -3 with: 0 with: 0. + self assert: result equals: -1. + result := simulator call: 0 with: 42 with: 0 with: 0 with: 0. + self assert: result equals: 42. + result := simulator call: 0 with: -16r80000000 with: -1 with: 0 with: 0. + self assert: result equals: 0].! - self assert: result equals: -1].! Item was added: + ----- Method: MIPSSimulator>>bitsInWord (in category 'processor api') ----- + bitsInWord + ^32! Item was added: + ----- Method: MIPSSimulator>>convertInternalToInteger: (in category 'processor api') ----- + convertInternalToInteger: unsigned + "Default conversion for 32-bit processors. 64-bit processors override." + ^unsigned signedIntFromLong! Item was added: + ----- Method: MIPSSimulator>>disassembleFrom:to:in:on: (in category 'processor api') ----- + disassembleFrom: startAddress to: endAddress in: memory on: aStream + MIPSDisassembler new + disassemble: memory + from: startAddress + to: endAddress + for: nil + labels: nil + on: aStream.! Item was changed: ----- Method: MIPSSimulator>>divideSigned: (in category 'instructions - arithmetic') ----- divideSigned: instruction + "Strangely, the MIPS reference manual does not indicate which division is used, but testing on some hardware shows it is truncated division (rather than floored division or Euclidean division)." - "Strangely, the MIPS reference manual does not indicate which division is used, but testing some hardware show it is truncated division (rather than floored division or Euclidean division)." | rsValue rtValue | rsValue := self signedRegister: instruction rs. rtValue := self signedRegister: instruction rt. + rtValue = 0 ifTrue: + ["No exception is signalled" + lo := rtValue. + hi := rsValue. + ^self]. + (rtValue = -1 and: [rsValue = -16r80000000]) ifTrue: + ["Only overflow case" + lo := rsValue. + hi := 0. + ^self]. lo := rsValue quo: rtValue. hi := rsValue rem: rtValue. ! Item was removed: - ----- Method: MIPSSimulator>>endianness (in category 'as yet unclassified') ----- - endianness - ^#little! Item was changed: ----- Method: MIPSSimulator>>execute (in category 'as yet unclassified') ----- execute + [pc ~= EndSimulationPC] whileTrue: [self step].! - | instruction | - [pc ~= EndSimulationPC] whileTrue: - [Transcript print: instructionCount; nextPutAll: ' X '; nextPutAll: self currentInstruction; flush. - 10 milliSeconds asDelay wait. - instruction := MIPSInstruction new value: (self fetchInstruction: pc). - instruction decodeFor: self. - pc := pc + OneInstruction. - instructionCount := instructionCount + 1].! Item was changed: ----- Method: MIPSSimulator>>executeDelaySlot (in category 'as yet unclassified') ----- executeDelaySlot | instruction | self assert: inDelaySlot not. inDelaySlot := true. instructionCount := instructionCount + 1. + "Transcript print: instructionCount; nextPutAll: ' D '; nextPutAll: self currentInstruction; flush." - Transcript print: instructionCount; nextPutAll: ' D '; nextPutAll: self currentInstruction; flush. instruction := MIPSInstruction new value: (self fetchInstruction: pc). instruction decodeFor: self. inDelaySlot := false.! Item was changed: + ----- Method: MIPSSimulator>>getterForRegister: (in category 'registers') ----- - ----- Method: MIPSSimulator>>getterForRegister: (in category 'as yet unclassified') ----- getterForRegister: registerNumber ^#(zr at v0 v1 a0 a1 a2 a3 t0 t1 t2 t3 t4 t5 t6 t7 s0 s1 s2 s3 s4 s5 s6 s7 t8 t9 k0 k1 gp sp fp ra) at: registerNumber + 1! Item was changed: ----- Method: MIPSSimulator>>initialize (in category 'as yet unclassified') ----- initialize + registers := Array new: 32 withAll: 0. - registers := Array new: 32 withAll: 16rABABAB. pc := 0. hi := 0. lo := 0. inDelaySlot := false. instructionCount := 0.! Item was changed: ----- Method: MIPSSimulator>>jumpAndLinkRegister: (in category 'instructions - control') ----- jumpAndLinkRegister: instruction | nextPC | self assert: inDelaySlot not. self unsignedRegister: instruction rd put: pc + TwoInstructions. "Return past delay slot." nextPC := self unsignedRegister: instruction rs. jumpingPC := pc. pc := pc + OneInstruction. self executeDelaySlot. pc := nextPC. + pc := pc - OneInstruction. "Account for general increment"! - pc := pc - 4. "Account for general increment"! Item was changed: ----- Method: MIPSSimulator>>jumpRegister: (in category 'instructions - control') ----- jumpRegister: instruction | nextPC | self assert: inDelaySlot not. nextPC := self unsignedRegister: instruction rs. jumpingPC := pc. pc := pc + OneInstruction. self executeDelaySlot. pc := nextPC. + pc := pc - OneInstruction. "Account for general increment"! - pc := pc - 4. "Account for general increment"! Item was changed: ----- Method: MIPSSimulator>>printOn: (in category 'as yet unclassified') ----- printOn: stream stream nextPutAll: self class name; nextPut: $:; cr. + self printRegistersOn: stream. - 0 to: 31 do: - [:reg | - stream space. - stream nextPutAll: (MIPSConstants nameForRegister: reg). - stream space. - (self unsignedRegister: reg) printOn: stream base: 16 nDigits: 8. - stream space. - (self signedRegister: reg) printOn: stream. - stream cr]. - - stream nextPutAll: ' pc '. - pc printOn: stream base: 16 nDigits: 8. - stream space. - pc printOn: stream. - stream cr. - stream nextPutAll: self currentInstruction.! Item was added: + ----- Method: MIPSSimulator>>printRegistersOn: (in category 'registers') ----- + printRegistersOn: stream + 0 to: 31 do: + [:reg | + stream space. + stream nextPutAll: (MIPSConstants nameForRegister: reg). + stream space. + (self unsignedRegister: reg) printOn: stream base: 16 nDigits: 8. + stream space. + (self signedRegister: reg) printOn: stream. + stream cr]. + + stream nextPutAll: ' hi '. + hi printOn: stream base: 16 nDigits: 8. + stream space. + hi printOn: stream. + stream cr. + + stream nextPutAll: ' lo '. + lo printOn: stream base: 16 nDigits: 8. + stream space. + lo printOn: stream. + stream cr. + + stream nextPutAll: ' pc '. + pc printOn: stream base: 16 nDigits: 8. + stream space. + pc printOn: stream. + stream cr.! Item was added: + ----- Method: MIPSSimulator>>reset (in category 'processor api') ----- + reset + ^self initialize! Item was added: + ----- Method: MIPSSimulator>>s0 (in category 'registers') ----- + s0 + ^self unsignedRegister: S0! Item was added: + ----- Method: MIPSSimulator>>s0: (in category 'registers') ----- + s0: anInteger + ^self unsignedRegister: S0 put: anInteger! Item was added: + ----- Method: MIPSSimulator>>s1 (in category 'registers') ----- + s1 + ^self unsignedRegister: S1! Item was added: + ----- Method: MIPSSimulator>>s1: (in category 'registers') ----- + s1: anInteger + ^self unsignedRegister: S1 put: anInteger! Item was added: + ----- Method: MIPSSimulator>>s2 (in category 'registers') ----- + s2 + ^self unsignedRegister: S2! Item was added: + ----- Method: MIPSSimulator>>s2: (in category 'registers') ----- + s2: anInteger + ^self unsignedRegister: S2 put: anInteger! Item was added: + ----- Method: MIPSSimulator>>s3: (in category 'registers') ----- + s3: anInteger + ^self unsignedRegister: S3 put: anInteger! Item was added: + ----- Method: MIPSSimulator>>s4 (in category 'registers') ----- + s4 + ^self unsignedRegister: S4! Item was added: + ----- Method: MIPSSimulator>>s6 (in category 'registers') ----- + s6 + ^self unsignedRegister: S6! Item was added: + ----- Method: MIPSSimulator>>s6: (in category 'registers') ----- + s6: anInteger + ^self unsignedRegister: S6 put: anInteger! Item was changed: ----- Method: MIPSSimulator>>setFramePointer:stackPointer: (in category 'processor api') ----- setFramePointer: fp stackPointer: sp + self unsignedRegister: SP put: sp. + self unsignedRegister: FP put: fp.! - self signedRegister: SP put: sp. - self signedRegister: FP put: fp.! Item was changed: + ----- Method: MIPSSimulator>>setterForRegister: (in category 'registers') ----- - ----- Method: MIPSSimulator>>setterForRegister: (in category 'as yet unclassified') ----- setterForRegister: registerNumber ^#(zr: at: v0: v1: a0: a1: a2: a3: t0: t1: t2: t3: t4: t5: t6: t7: s0: s1: s2: s3: s4: s5: s6: s7: t8: t9: k0: k1: gp: sp: fp: ra:) at: registerNumber + 1! Item was added: + ----- Method: MIPSSimulator>>simulateJumpCallOf:memory: (in category 'processor api') ----- + simulateJumpCallOf: address memory: aMemory + "Simulate a frame-building jump of address. Build a frame since + a) this is used for calls into the run-time which are unlikely to be leaf-calls" + "This method builds a stack frame as expected by the simulator, not as defined by ARM aapcs-abi. + In ARM aapcs, every method can define for itself, wether it wants to push lr (nextpc), and wether it + uses a frame pointer. The standard never mentions a fp. It merely defines r4-r11 to be callee-saved." + + self assert: self sp \\ 8 = 0. "This check ensures, that we conform with ARM abi. Before doing anything to the stack, we ensure 2-word alignment." + self pushWord: self ra in: aMemory. + self pushWord: self fp in: aMemory. + self fp: self sp. + "PostBuildStackDelta ~= 0 ifTrue: + [self sp: self sp - PostBuildStackDelta]." "In order to satisfy the CStackAlignment check by cogit, which is only valid on IA32 platforms." + self pc: address! Item was changed: ----- Method: MIPSSimulator>>simulateLeafCallOf:nextpc:memory: (in category 'processor api') ----- simulateLeafCallOf: address nextpc: nextpc memory: aMemory + self unsignedRegister: RA put: nextpc. - self signedRegister: RA put: nextpc. pc := address.! Item was added: + ----- Method: MIPSSimulator>>singleStepIn: (in category 'as yet unclassified') ----- + singleStepIn: aByteArray + self initializeWithMemory: aByteArray. + self step.! Item was added: + ----- Method: MIPSSimulator>>step (in category 'as yet unclassified') ----- + step + "If the next instruction is a branch, its delay slot will also be executed." + | instruction | + "Transcript print: instructionCount; nextPutAll: ' X '; nextPutAll: self currentInstruction; flush" + instruction := MIPSInstruction new value: (self fetchInstruction: pc). + instruction decodeFor: self. + pc := pc + OneInstruction. + instructionCount := instructionCount + 1.!

1 0

where can I find MIPSConstants?
by Esteban Lorenzano 27 Nov '15

27 Nov '15

Hi, that… I don’t know where it is and VMMaker is not loading properly without. cheers, Esteban

3 5

keyUp event modifier bitmap of is shifted by 3 on OSX
by Kruck, Bastian 27 Nov '15

27 Nov '15

Hello Folks, when looking for how Cog passes keystrokes to the image, we found that the modifier bitmap of the keyUp events is left shifted by 3 bits on OS X. This seems to be a bug in Mac OS specific event handling. sqMacUIEvents.c usually unshifts the mouse buttons away before passing it to the image, but it doesn’t do that for keyup events. Something that I oversee here? This could be a fix: Index: platforms/Mac OS/vm/sqMacUIEvents.c =================================================================== --- platforms/Mac OS/vm/sqMacUIEvents.c (revision 3312) +++ platforms/Mac OS/vm/sqMacUIEvents.c (working copy) @@ -1717,7 +1717,7 @@ //fprintf(stdout,"\nrawkey up %i",ioMSecs()); key = findInKeyMap(keyCode); if (key != -1) { - enterKeystroke ( EventTypeKeyboard,keyCode, EventKeyUp, 0, ModifierStateCarbon(event,0)); + enterKeystroke ( EventTypeKeyboard,keyCode, EventKeyUp, 0, ModifierStateCarbon(event,0) >> 3); } removeFromKeyMap(keyCode); result = eventNotHandledErr; Unfortunately, I couldn’t verify the fix as I am running Yosemite which seems to not be supported yet for building from source. I appended the changeset which we used to find that issue. Steps to reproduce: 1) install our changeset into a Squeak4.5 image on OS X 2) run `TempSettings printEvents: true.` 3) open a Transcript 4) Press cmd+a 5) The fifth item of that Array should be 8 on the third time (but is 8<<3 instead) #(2 15512120 0 1 8 0 0 1) #(2 15512120 97 0 8 97 0 1) #(2 15512198 0 2 64 0 0 1) Tobias commented that this bug could be duplicated to some other places (which we didn’t verify yet). I am not sure, how many projects already rely on this behavior and how to go on with that. BR, Bastian Kruck

4 5

Achieving High Resolution Timer Events in Virtualized Environment
by Ben Coman 27 Nov '15

27 Nov '15

Just an article I found interesting, in consideration of maybe one day running Cog as a unikernel... http://www.ncbi.nlm.nih.gov/pmc/articles/PMC4503740/ cheers -ben

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2015