Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.973.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.973
Author: eem
Time: 6 December 2014, 5:31:04.592 pm
UUID: 1c182b73-874c-48f7-a4f4-61255efdc565
Ancestors: VMMaker.oscog-eem.972
Fix regression caused by breakmnu changes due to mis-initialization of breakSelectorLength.
=============== Diff against VMMaker.oscog-eem.972 ===============
Item was changed:
----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCCodeGenerator
| vmClass |
self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses"
vmClass := aCCodeGenerator vmClass. "Generate primitiveTable etc based on vmClass, not just StackInterpreter"
aCCodeGenerator
addHeaderFile:'<stddef.h> /* for e.g. alloca */';
addHeaderFile:'<setjmp.h>';
addHeaderFile:'<wchar.h> /* for wint_t */';
addHeaderFile:'"vmCallback.h"';
addHeaderFile:'"sqMemoryFence.h"';
addHeaderFile:'"dispdbg.h"'.
vmClass declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'.
aCCodeGenerator
var: #interpreterProxy type: #'struct VirtualMachine*'.
aCCodeGenerator
declareVar: #sendTrace type: 'volatile int';
declareVar: #byteCount type: 'unsigned long'.
"These need to be pointers or unsigned."
self declareC: #(instructionPointer method newMethod)
as: #usqInt
in: aCCodeGenerator.
"These are all pointers; char * because Slang has no support for C pointer arithmetic."
+ self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory breakSelector)
- self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory)
as: #'char *'
in: aCCodeGenerator.
self declareC: #(stackPage overflowedPage)
as: #'StackPage *'
in: aCCodeGenerator.
aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code."
"This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS
is not defined, for the benefit of the interpreter on slow machines."
aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS).
MULTIPLEBYTECODESETS == false ifTrue:
[aCCodeGenerator
removeVariable: 'extA';
removeVariable: 'extB';
removeVariable: 'bytecodeSetSelector'].
aCCodeGenerator
var: #methodCache
declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'.
aCCodeGenerator
var: #atCache
declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'.
aCCodeGenerator
var: #primitiveTable
declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', vmClass primitiveTableString.
vmClass primitiveTable do:
[:symbolOrNot|
(symbolOrNot isSymbol
and: [symbolOrNot ~~ #primitiveFail]) ifTrue:
[(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil:
[:tMethod| tMethod returnType: #void]]].
vmClass objectMemoryClass hasSpurMemoryManagerAPI
ifTrue:
[aCCodeGenerator
var: #primitiveAccessorDepthTable
type: 'signed char'
sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */'
array: vmClass primitiveAccessorDepthTable]
ifFalse:
[aCCodeGenerator removeVariable: #primitiveAccessorDepthTable].
aCCodeGenerator
var: #primitiveFunctionPointer
declareC: 'void (*primitiveFunctionPointer)()'.
aCCodeGenerator
var: #externalPrimitiveTable
declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'.
aCCodeGenerator var: #showSurfaceFn type: #'void *'.
aCCodeGenerator
var: #jmpBuf
declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #suspendedCallbacks
declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #suspendedMethods
declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #interruptCheckChain
declareC: 'void (*interruptCheckChain)(void) = 0'.
- aCCodeGenerator
- var: #breakSelector type: #'char *';
- var: #breakSelectorLength
- declareC: 'sqInt breakSelectorLength = -1'.
self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs
longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs
"these are high-frequency enough that they're overflowing quite quickly on modern hardware"
statProcessSwitch statIOProcessEvents statForceInterruptCheck
statCheckForEvents statStackOverflow statStackPageDivorce)
in: aCCodeGenerator.
aCCodeGenerator var: #nextProfileTick type: #sqLong!
Item was changed:
----- Method: StackInterpreter>>initializeInterpreter: (in category 'initialization') -----
initializeInterpreter: bytesToShift
"Initialize Interpreter state before starting execution of a new image."
interpreterProxy := self sqGetInterpreterProxy.
self dummyReferToProxy.
objectMemory initializeObjectMemory: bytesToShift.
self checkAssumedCompactClasses.
self initializeExtraClassInstVarIndices.
method := newMethod := objectMemory nilObject.
+ breakSelectorLength := objectMemory minSmallInteger.
methodDictLinearSearchLimit := 8.
self flushMethodCache.
self flushAtCache.
self initialCleanup.
profileSemaphore := profileProcess := profileMethod := objectMemory nilObject.
interruptKeycode := 2094. "cmd-. as used for Mac but no other OS"
[globalSessionID = 0] whileTrue:
[globalSessionID := self
cCode: [(self time: #NULL) + self ioMSecs]
inSmalltalk: [(Random new next * SmallInteger maxVal) asInteger]]!
1
0
Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.98.mcz
==================== Summary ====================
Name: CMakeVMMakerSqueak-tty.98
Author: tty
Time: 6 December 2014, 3:35:32.954 pm
UUID: 6138923d-433c-43f1-8ba4-6a4ceb18cbe6
Ancestors: CMakeVMMakerSqueak-tty.97
Removed Android build tree as it uses specialized generators I do not feel like porting to the CMake template system. If there is massive interest, I will port once the major platforms are in place.
Refactored Mac stack pushing all configureXZYPlugin and ConfigureByTemplateXYZPlugin up to SqueakMacintoshConfig.
Started process of removing the 'generate' methods in favor of the generateByTemplate methods.
CMake build breaks, but that is expected during this major refactoring.
=============== Diff against CMakeVMMakerSqueak-tty.97 ===============
Item was changed:
SystemOrganization addCategory: #CMakeVMMakerSqueak!
- SystemOrganization addCategory: #'CMakeVMMakerSqueak-Android'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-BSD32x86'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-Builder'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeCompositeTemplates'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeCustomTemplates'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeTemplates'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-Help'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-IA32-Bochs'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-IOS'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-Libs'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux32ARMv6'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux32x86'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-LinuxX86-64'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-MacOSPowerPC'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-MacOSX32x86'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-SunOS32x86'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-Tests'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-VMPlugins'!
SystemOrganization addCategory: #'CMakeVMMakerSqueak-Win32x86'!
Item was changed:
----- Method: CMakeIfAddDefinitionsElseAddDefinitions>>condition:ifdefinitions:elsedefinitions: (in category 'accessing') -----
condition: cString ifdefinitions:iString elsedefinitions:eString
condition:=cString.
ifdefinitions:= iString.
+ elsedefinitions:=eString.
- elsedefinitions:=eString
self content:'
IF(', condition ,')
add_definitions(', ifdefinitions,')
ELSE(', condition ,')
add_definitions(', elsedefinitions,')
ENDIF(', condition ,')'
!
Item was removed:
- CMakeTemplate subclass: #CMakePluginInternalTemplate
- instanceVariableNames: ''
- classVariableNames: ''
- poolDictionaries: ''
- category: 'CMakeVMMakerSqueak'!
-
- !CMakePluginInternalTemplate commentStamp: 'tty 7/11/2014 10:52' prior: 0!
- An Internal Plugin is configured by CMake using the following template:
-
- MESSAGE ("${@plugin@_definitions}")
- MESSAGE ("DUDE")
- ADD_DEFINITIONS (-DSQUEAK_BUILTIN_PLUGIN=1 ${@plugin@_definitions})
- LINK_DIRECTORIES (${@plugin@_link_directories})
- INCLUDE_DIRECTORIES (${@plugin@_include_directories}
- ${bld}
- ${src}/vm
- ${cross}/vm
- ${src}/plugins/@plugin@
- ${unix}/vm
- ${unix}/plugins/@plugin@
- ${unix}/@plugin@
- ${cross}/plugins/@plugin@
- )
-
- ADD_LIBRARY (@plugin@ STATIC @plugin_sources@)
-
- Just fill me in and print me out
- !
Item was removed:
- SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakAndroidBuilder
- instanceVariableNames: ''
- classVariableNames: ''
- poolDictionaries: ''
- category: 'CMakeVMMakerSqueak-Builder'!
-
- !SqueakAndroidBuilder commentStamp: 'tty 6/7/2014 11:23' prior: 0!
- I am a facade.
-
- I query, and invoke CMakeVMMakerSqueak configurations.
-
-
-
- !
Item was removed:
- ----- Method: SqueakAndroidBuilder>>configurationsCategory (in category 'queries') -----
- configurationsCategory
- ^'CMakeVMMakerSqueak-Android'!
Item was removed:
- SqueakUnixConfig subclass: #SqueakAndroidStackEvtConfig
- instanceVariableNames: ''
- classVariableNames: ''
- poolDictionaries: ''
- category: 'CMakeVMMakerSqueak-Android'!
-
- !SqueakAndroidStackEvtConfig commentStamp: 'tty 6/25/2014 16:25' prior: 0!
- A class to configure the Event-driven Stack Cog for Android. This configuration does not lead to building an executable; rather it prepares the source tree to be plugged into the jni subdirectory of an Android project.
-
- Requires AndroidPlugin
-
- Ported from pharo to squeak.
-
- tty: a lot of 'build' methods are included in this class in order to let the testing framework work consistently. They are not used.!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>availableBuildTypes (in category 'cmake') -----
- availableBuildTypes
- ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes
- !
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>buildDirName (in category 'cmake') -----
- buildDirName
- ^'do not build. see class comment'!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>cmakeAddDefinitionsBuild (in category 'cmake buildType redirects') -----
- cmakeAddDefinitionsBuild
- "Compiler flags for Android. Leave empty for now"
- ^ {' -DDEBUG=22 '}!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>cogitClass (in category 'source generation') -----
- cogitClass
- ^ StackToRegisterMappingCogit
- !
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>compilerFlagsBuild (in category 'cmake buildType redirects') -----
- compilerFlagsBuild
- "Compiler flags for Android. Leave empty for now"
- ^ ' -DDEBUG=22 '!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>configureFileCopyPlugin: (in category 'plugin extra rules') -----
- configureFileCopyPlugin: maker
- "extra rules for DropPlugin"
-
- maker addPlatformSources: #( 'sqAndroidFileCopyPlugin.c')
- !
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>configureFilePlugin: (in category 'plugin extra rules') -----
- configureFilePlugin: maker
- "extra rules for FilePlugin"
-
- super configureFilePlugin: maker.
-
- maker addPlatformSources: #( 'sqAndroidFile.c')!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>configureFloatMathPlugin: (in category 'plugin extra rules') -----
- configureFloatMathPlugin: maker
- "extra rules for FloatMathPlugin"
-
- maker addCrossSources: #(
- 'acos.c' 'acosh.c' 'asin.c' 'asinh.c' 'atan.c' 'atan2.c' 'atanh.c'
- 'copysign.c' 'cos.c' 'cosh.c' 'exp.c' 'expm1.c' 'finite.c' 'fmod.c'
- 'hypot.c' 'isnan.c' 'k_cos.c' 'k_rem_pio2.c' 'k_sin.c' 'k_tan.c' 'ldexp.c'
- 'log.c' 'log10.c' 'log1p.c' 'modf.c' 'pow.c' 'rem_pio2.c' 'rint.c'
- 'scalb.c' 'scalbn.c' 'sin.c' 'sinh.c' 'sqrt.c' 'tan.c' 'tanh.c' ).
-
-
- "according to http://www.netlib.org/fdlibm/readme
- it should be compiled with no optimizations"
- maker addDefinitions: '-O0'.
-
- " compile with -D__LITTLE_ENDIAN
- This macro is set automatically in fdlibm.h when compiled ith -m32 but
- not when compiled with -m64 (Nicolas Cellier)
- "
- self isLittleEndian ifTrue: [
- maker addDefinitions: '-D__LITTLE_ENDIAN=1' ].
-
- maker addDefinitions: '-DNO_ISNAN'.
-
-
- !
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>configureJoystickTabletPlugin: (in category 'plugin extra rules') -----
- configureJoystickTabletPlugin: maker
- "extra rules for JoystickTabletPlugin"
-
- super configureJoystickTabletPlugin: maker.
- maker addPlatformSources:
- #( 'sqAndroidJoystickTablet.c' )
- !
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>configureLocalePlugin: (in category 'plugin extra rules') -----
- configureLocalePlugin: maker
- "extra rules for LocalePlugin"
-
- super configureLocalePlugin: maker.
-
- maker addPlatformSources: #( 'sqAndroidLocale.c')!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>configureSecurityPlugin: (in category 'plugin extra rules') -----
- configureSecurityPlugin: maker
- "extra rules for MIDIPlugin"
-
- super configureSecurityPlugin: maker.
-
- maker addPlatformSources: #( 'sqAndroidSecurity.c')!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>configureSocketPlugin: (in category 'plugin extra rules') -----
- configureSocketPlugin: maker
- "extra rules for SocketPlugin"
-
- maker addPlatformSources: #( 'sqAndroidSocket.c')!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>coreSources (in category 'source files') -----
- coreSources
- "files to include from src/vm dir"
-
- ^ #(
- 'gcc3x-interp.c'
- )!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>crossSources (in category 'source files') -----
- crossSources
- ^#(
- 'sqHeapMap.c'
- 'sqNamedPrims.c'
- 'sqVirtualMachine.c'
- )!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>customizeVMPlugins (in category 'plugins') -----
- customizeVMPlugins
- "do nothing"!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>defaultExternalPlugins (in category 'plugins') -----
- defaultExternalPlugins
- ^ #()!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>defaultInternalPlugins (in category 'plugins') -----
- defaultInternalPlugins
- " took from unixbuild/bld/plugins.int"
- ^ #(
- AndroidPlugin
- BitBltSimulation "BitBltPlugin"
- BalloonEnginePlugin "B2DPlugin"
- BMPReadWriterPlugin
- CroquetPlugin
- DSAPlugin "DSAPrims"
- FFTPlugin
- FileCopyPlugin
- FilePlugin
- FloatArrayPlugin
- FloatMathPlugin
- JoystickTabletPlugin
- JPEGReaderPlugin
- LargeIntegersPlugin "LargeIntegers"
- Matrix2x3Plugin
- LocalePlugin
- RePlugin
- SecurityPlugin
- JPEGReadWriter2Plugin
- SocketPlugin
- MiscPrimitivePlugin
- DeflatePlugin "ZipPlugin"
- )!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>dirBuildLanguageVMMM (in category 'cmake') -----
- dirBuildLanguageVMMM
- "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default"
- ^self eventStackV3!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>dirBuildPlatform (in category 'cmake') -----
- dirBuildPlatform
- "the directory for the platform. example: build.linux32x86"
- ^self dirAndroid!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>excludeFromBuild (in category 'cmake') -----
- excludeFromBuild
- "over-ride to exclude yourself from a build or not"
- ^true!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>executableName (in category 'cmake') -----
- executableName
- ^ self vmStackExecutableName!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuild (in category 'cmake buildType redirects') -----
- externalPluginsBuild
- ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') -----
- extraVMSettingsBuild: aMaker
- super extraVMSettingsBuild: aMaker.
- (enabledebugmessages)
- ifTrue:[ templates
- addLast:((CMakeMessage new) message: (self class name) , 'extraVMSettingsBuild: aMaker')
- ] .
- self flag: 'tty'. "copied from pharo class. what is this?"
- "
- versionC := 'version.c'.
-
- aMaker
- puts: '$(buildDir)/',versionC, ':' ;
- puts: ({Character tab}, '$(platformsDir)/android/config/verstamp ', '$(buildDir)/', versionC,' gcc');
- puts: {Character cr};
- puts: ('LOCAL_SRC_FILES += $(buildDir)/', versionC);
- puts: {Character cr}.
- .
- "!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>generate (in category 'source generation') -----
- generate
- ^ CMakeAndroidGenerator generate: self
-
- !
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuild (in category 'cmake buildType redirects') -----
- internalPluginsBuild
- ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>interpreterClass (in category 'source generation') -----
- interpreterClass
- "Does not exist in squeak"
- " ^ StackEvtAndroidInterpreter"!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>mkFileList:baseDir: (in category 'utils') -----
- mkFileList: anArray baseDir: aDir
- "answer the concatenated contents of the array interspersed with backslash-newline sequences"
- ^ (anArray collect: [ :s | aDir, s]) inject: '' into: [ :s :n | s , #($\), {Character cr}, n ].!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>platformName (in category 'source generation') -----
- platformName
- ^ 'android'!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>platformSources (in category 'source files') -----
- platformSources
- "files added from platform/android/vm dir "
- ^ #(
- 'aio.c'
- 'debug.c'
- 'osExports.c'
- 'sqAndroidCharConv.c'
- 'sqAndroidExternalPrims.c'
- 'sqAndroidEvtBeat.c'
- 'sqAndroidEvtMain.c'
- 'sqAndroidMemory.c'
- 'sqAndroidVMProfile.c'
- 'sqAndroidSemaphores.c'
- 'sqAndroidSoundNull.c'
- 'sqAndroidDisplay.c'
- )!
Item was removed:
- ----- Method: SqueakAndroidStackEvtConfig>>prepareForGeneration (in category 'source generation') -----
- prepareForGeneration
-
- "force using LF on Macs"
- CrLfFileStream defaultToLF.
-
- ^ self prepareForStackVMGeneration
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
- configureB3DAcceleratorPlugin: maker
- "extra rules for B3DAcceleratorPlugin"
-
- super configureB3DAcceleratorPlugin: maker.
-
- maker
- includeDirectories: '/usr/X11/include'; "for GL.h"
- addPlatformSources: #( 'sqMacOpenGL.c' 'sqMacOpenGLInfo.c')
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureByTemplateB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
- configureByTemplateB3DAcceleratorPlugin: aMaker
- self flag:'tty'. "consider portablility of /user/X11/include"
- super configureByTemplateB3DAcceleratorPlugin: aMaker.
- aMaker templates
- addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '/usr/X11/include')); "for GL.h <--tty. I don't think this is portable. Revisit on refactor"
- addLast:((CMakeListAppend new)
- list:'sources'
- elements: (OrderedCollection
- with: '${pluginPlatform}/sqMacOpenGL.c'
- with: '${pluginPlatform}/sqMacOpenGLInfo.c')).
-
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureByTemplateCroquetPlugin: (in category 'plugin extra rules') -----
- configureByTemplateCroquetPlugin: aMaker
-
- super configureByTemplateCroquetPlugin: aMaker.
- aMaker templates
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacCroquet.c')).
-
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureCroquetPlugin: (in category 'plugin extra rules') -----
- configureCroquetPlugin: maker
- "extra rules for CroquetPlugin"
-
- super configureCroquetPlugin: maker.
- maker addPlatformSources: #('sqMacCroquet.c').
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureFFIPlugin: (in category 'plugin extra rules') -----
- configureFFIPlugin: maker
- super configureFFIPlugin: maker.
- maker addPlatformSources: #( "'sqMacIntel-Win32.c'"
- 'x86-sysv-MacIntel.c'
- 'x86-sysv-asm-MacIntel.S'
- )!
Item was removed:
- ----- Method: SqueakIOSConfig>>configureFT2Plugin: (in category 'plugin extra rules') -----
- configureFT2Plugin: maker
- "extra rules for Freetype plugin.
- a custom rule to build freetype library"
- | lib |
-
- maker isExternal ifFalse: [
- self error: 'building internal FT2Plugin is not supported yet'
- ].
-
- "add freetype library into loop"
- lib := self addThirdpartyLibrary: 'freetype2'.
-
- "link plugin with freetype lib"
- maker addExternalLibrary: lib targetForLinking.
- maker includeDirectories: lib includeDir.
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureInternetConfigPlugin: (in category 'plugin extra rules') -----
- configureInternetConfigPlugin: maker
- "extra rules for InternetConfigPlugin"
-
- super configureInternetConfigPlugin: maker.
- maker addPlatformSources: #( 'sqMacInternetConfiguration.c')
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureJoystickTabletPlugin: (in category 'plugin extra rules') -----
- configureJoystickTabletPlugin: maker
- "extra rules for JoystickTabletPlugin"
-
- super configureJoystickTabletPlugin: maker.
- maker addPlatformSources:
- #(
- 'HID_Error_Handler.c'
- 'HID_Name_Lookup.c'
- 'HID_Queue_Utilities.c'
- 'HID_Utilities.c'
- 'sqMacJoystickAndTablet.c'
- )
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureLocalePlugin: (in category 'plugin extra rules') -----
- configureLocalePlugin: maker
- "extra rules for LocalePlugin"
-
- super configureLocalePlugin: maker.
- maker addPlatformSources: #( 'sqMacLocaleCarbon.c' )
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureMIDIPlugin: (in category 'plugin extra rules') -----
- configureMIDIPlugin: maker
- "extra rules for MIDIPlugin"
-
- super configureMIDIPlugin: maker.
- maker addPlatformSources: #( 'sqMacMIDI.c')!
Item was removed:
- ----- Method: SqueakIOSConfig>>configureMpeg3Plugin: (in category 'plugin extra rules') -----
- configureMpeg3Plugin: maker
-
- super configureMpeg3Plugin: maker.
-
- maker addPlatformSources: #(
- 'sqMacFileBits.c')
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureObjectiveCPlugin: (in category 'plugin extra rules') -----
- configureObjectiveCPlugin: maker
- maker doNotGenerate: true!
Item was removed:
- ----- Method: SqueakIOSConfig>>configureQuicktimePlugin: (in category 'plugin extra rules') -----
- configureQuicktimePlugin: maker
-
- maker includeDirectories: '${pluginPlatform}'.
- maker includeDirectories: '${crossDir}/plugins/SurfacePlugin'.
-
- " yes, this is not a typo , a file is named 'inteface' instead of 'interface' "
-
- maker addPlatformSources: #( 'sqMacQuicktimeInteface.c' ).
-
- maker addFrameworks: #( 'Carbon' 'QuickTime' ).!
Item was removed:
- ----- Method: SqueakIOSConfig>>configureSecurityPlugin: (in category 'plugin extra rules') -----
- configureSecurityPlugin: maker
- "extra rules for SecurityPlugin"
-
- super configureSecurityPlugin: maker.
- maker includeDirectories: '${crossDir}/plugins/FilePlugin'.
- maker addPlatformSources: #( 'sqMacSecurity.c' )!
Item was removed:
- ----- Method: SqueakIOSConfig>>configureSerialPlugin: (in category 'plugin extra rules') -----
- configureSerialPlugin: maker
- "extra rules for SerialPlugin"
-
- super configureSoundPlugin: maker.
- maker includeDirectories: '${platformsDir}/unix/plugins/SerialPlugin'.
- maker
- addSources: #('sqUnixSerial.c')
- prefixed: '${platformsDir}/unix/plugins/SerialPlugin/'
-
-
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureSocketPlugin: (in category 'plugin extra rules') -----
- configureSocketPlugin: maker
- "extra rules for SoundPlugin"
-
- super configureSoundPlugin: maker.
- maker includeDirectories: '${platformsDir}/unix/plugins/SocketPlugin'.
- maker
- addSources: #('sqUnixSocket.c')
- prefixed: '${platformsDir}/unix/plugins/SocketPlugin/'
-
-
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureSoundGenerationPlugin: (in category 'plugin extra rules') -----
- configureSoundGenerationPlugin: maker
- "extra rules for SoundPlugin"
-
- maker doNotGenerate: true.
- " The sources in platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c
- are out of date and need to be fixed before it can be built
-
-
- maker
- addCrossSources: #('sqOldSoundPrims.c')
-
- "
- !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureTestOSAPlugin: (in category 'plugin extra rules') -----
- configureTestOSAPlugin: maker
-
- maker addFrameworks: #( 'Carbon' 'ApplicationServices' ).!
Item was removed:
- ----- Method: SqueakIOSConfig>>configureUnixOSProcessPlugin: (in category 'plugin extra rules') -----
- configureUnixOSProcessPlugin: maker
- "extra rules for UnixOSProcessPlugin"
-
- maker includeDirectories: '${crossDir}/plugins/FilePlugin'.
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
- configureB3DAcceleratorPlugin: maker
- "extra rules for B3DAcceleratorPlugin"
-
- super configureB3DAcceleratorPlugin: maker.
-
- maker
- includeDirectories: '/usr/X11/include'; "for GL.h"
- addPlatformSources: #( 'sqMacOpenGL.c' 'sqMacOpenGLInfo.c')
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureCroquetPlugin: (in category 'plugin extra rules') -----
- configureCroquetPlugin: maker
- "extra rules for CroquetPlugin"
-
- super configureCroquetPlugin: maker.
- maker addPlatformSources: #('sqMacCroquet.c').
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureFFIPlugin: (in category 'plugin extra rules') -----
- configureFFIPlugin: maker
- super configureFFIPlugin: maker.
- maker addPlatformSources: #( "'sqMacIntel-Win32.c'"
- 'x86-sysv-MacIntel.c'
- 'x86-sysv-asm-MacIntel.S'
- )!
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureFT2Plugin: (in category 'plugin extra rules') -----
- configureFT2Plugin: maker
- "extra rules for Freetype plugin.
- a custom rule to build freetype library"
- | lib |
-
- maker isExternal ifFalse: [
- self error: 'building internal FT2Plugin is not supported yet'
- ].
-
- "add freetype library into loop"
- lib := self addThirdpartyLibrary: 'freetype2'.
-
- "link plugin with freetype lib"
- maker addExternalLibrary: lib targetForLinking.
- maker includeDirectories: lib includeDir.
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureInternetConfigPlugin: (in category 'plugin extra rules') -----
- configureInternetConfigPlugin: maker
- "extra rules for InternetConfigPlugin"
-
- super configureInternetConfigPlugin: maker.
- maker addPlatformSources: #( 'sqMacInternetConfiguration.c')
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureJoystickTabletPlugin: (in category 'plugin extra rules') -----
- configureJoystickTabletPlugin: maker
- "extra rules for JoystickTabletPlugin"
-
- super configureJoystickTabletPlugin: maker.
- maker addPlatformSources:
- #(
- 'HID_Error_Handler.c'
- 'HID_Name_Lookup.c'
- 'HID_Queue_Utilities.c'
- 'HID_Utilities.c'
- 'sqMacJoystickAndTablet.c'
- )
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureLocalePlugin: (in category 'plugin extra rules') -----
- configureLocalePlugin: maker
- "extra rules for LocalePlugin"
-
- super configureLocalePlugin: maker.
- maker addPlatformSources: #( 'sqMacLocaleCarbon.c' )
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureMIDIPlugin: (in category 'plugin extra rules') -----
- configureMIDIPlugin: maker
- "extra rules for MIDIPlugin"
-
- super configureMIDIPlugin: maker.
- maker addPlatformSources: #( 'sqMacMIDI.c')!
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureMpeg3Plugin: (in category 'plugin extra rules') -----
- configureMpeg3Plugin: maker
-
- super configureMpeg3Plugin: maker.
-
- maker addPlatformSources: #(
- 'sqMacFileBits.c')
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureObjectiveCPlugin: (in category 'plugin extra rules') -----
- configureObjectiveCPlugin: maker
- maker doNotGenerate: true!
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configurePlugin:with: (in category 'plugin extra rules') -----
- configurePlugin: aPlugin with: generator
-
- generator isExternal ifTrue: [
- " set output directory for dynamic library to Resources subdir in .app bundle location "
- generator
- set: 'CMAKE_LIBRARY_OUTPUT_DIRECTORY'
- toString: '${externalModulesDir}'
- ].
- ^ super configurePlugin: aPlugin with: generator
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureQuicktimePlugin: (in category 'plugin extra rules') -----
- configureQuicktimePlugin: maker
-
- maker includeDirectories: '${pluginPlatform}'.
- maker includeDirectories: '${crossDir}/plugins/SurfacePlugin'.
-
- " yes, this is not a typo , a file is named 'inteface' instead of 'interface' "
-
- maker addPlatformSources: #( 'sqMacQuicktimeInteface.c' ).
-
- maker addFrameworks: #( 'Carbon' 'QuickTime' ).!
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureSecurityPlugin: (in category 'plugin extra rules') -----
- configureSecurityPlugin: maker
- "extra rules for SecurityPlugin"
-
- super configureSecurityPlugin: maker.
- maker includeDirectories: '${crossDir}/plugins/FilePlugin'.
- maker addPlatformSources: #( 'sqMacSecurity.c' )!
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureSerialPlugin: (in category 'plugin extra rules') -----
- configureSerialPlugin: maker
- "extra rules for SerialPlugin"
-
- super configureSoundPlugin: maker.
- maker includeDirectories: '${platformsDir}/unix/plugins/SerialPlugin'.
- maker
- addSources: #('sqUnixSerial.c')
- prefixed: '${platformsDir}/unix/plugins/SerialPlugin/'
-
-
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureSocketPlugin: (in category 'plugin extra rules') -----
- configureSocketPlugin: maker
- "extra rules for SoundPlugin"
-
- super configureSoundPlugin: maker.
- maker includeDirectories: '${platformsDir}/unix/plugins/SocketPlugin'.
- maker
- addSources: #('sqUnixSocket.c')
- prefixed: '${platformsDir}/unix/plugins/SocketPlugin/'
-
-
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureSoundGenerationPlugin: (in category 'plugin extra rules') -----
- configureSoundGenerationPlugin: maker
- "extra rules for SoundPlugin"
-
- maker doNotGenerate: true.
- " The sources in platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c
- are out of date and need to be fixed before it can be built
-
-
- maker
- addCrossSources: #('sqOldSoundPrims.c')
-
- "
- !
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureTestOSAPlugin: (in category 'plugin extra rules') -----
- configureTestOSAPlugin: maker
-
- maker addFrameworks: #( 'Carbon' 'ApplicationServices' ).!
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureUnixOSProcessPlugin: (in category 'plugin extra rules') -----
- configureUnixOSProcessPlugin: maker
- "extra rules for UnixOSProcessPlugin"
-
- maker includeDirectories: '${crossDir}/plugins/FilePlugin'.
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
- configureB3DAcceleratorPlugin: maker
- "extra rules for B3DAcceleratorPlugin"
-
- super configureB3DAcceleratorPlugin: maker.
-
- maker
- includeDirectories: '/usr/X11/include'; "for GL.h"
- addPlatformSources: #( 'sqMacOpenGL.c' 'sqMacOpenGLInfo.c')
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
- configureByTemplateB3DAcceleratorPlugin: aMaker
- self flag:'tty'. "Consider portability of the include below"
- super configureByTemplateB3DAcceleratorPlugin: aMaker.
- aMaker templates
- addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '/usr/X11/include')); "for GL.h <--tty portability problem?"
- addLast:((CMakeListAppend new)
- list:'sources'
- elements: (OrderedCollection
- with: '${pluginPlatform}/sqMacOpenGL.c'
- with: '${pluginPlatform}/sqMacOpenGLInfo.c')).
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateCroquetPlugin: (in category 'plugin extra rules') -----
- configureByTemplateCroquetPlugin: aMaker
- super configureByTemplateCroquetPlugin: aMaker.
- aMaker templates
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacCroquet.c'))
-
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateFFIPlugin: (in category 'plugin extra rules') -----
- configureByTemplateFFIPlugin: aMaker
- super configureByTemplateFFIPlugin: aMaker.
- aMaker templates
- addLast:((CMakeListAppend new)
- list:'sources'
- elements: (OrderedCollection
- with: '${pluginPlatform}/x86-sysv-MacIntel.c'
- with: '${pluginPlatform}/x86-sysv-asm-MacIntel.S')).
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateFT2Plugin: (in category 'plugin extra rules') -----
- configureByTemplateFT2Plugin: aMaker
- | lib |
- self flag:'tty'. "is internalFT2 still not supported?"
- aMaker isExternal ifFalse: [self error: 'building internal FT2Plugin is not supported yet' ].
- self flag:'tty'. "I haven't been down the addThirdpartyLibrary rabbit hole yet"
- lib := self addThirdpartyLibrary: 'freetype2'.
- aMaker templates "link plugin with freetype lib"
- addLast:((CMakeListAppend new) list:'LINKLIBS' elements: (OrderedCollection with: (lib targetForLinking)));
- addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: lib includeDir)).
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateInternetConfigPlugin: (in category 'plugin extra rules') -----
- configureByTemplateInternetConfigPlugin: aMaker
- self flag:'tty'. "pharo's configureInternetConfigPlugin has a super call to an empty method that I omit here. "
- aMaker templates
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacInternetConfiguration.c')).
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateJoystickTabletPlugin: (in category 'plugin extra rules') -----
- configureByTemplateJoystickTabletPlugin: aMaker
- self flag:'tty'. "pharo's configureJoystickTabletPlugin has a super call to an empty method that I omit here. "
- aMaker templates
- addLast:((CMakeListAppend new)
- list:'sources'
- elements: (OrderedCollection
- with: '${pluginPlatform}/HID_Error_Handler.c'
- with: '${pluginPlatform}/HID_Name_Lookup.c'
- with: '${pluginPlatform}/HID_Queue_Utilities.c'
- with: '${pluginPlatform}/HID_Utilities.c'
- with: '${pluginPlatform}/sqMacJoystickAndTablet.c')).
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateLocalePlugin: (in category 'plugin extra rules') -----
- configureByTemplateLocalePlugin: aMaker
- self flag:'tty'. "pharo's configureLocalePlugin: has a super call to an empty method that I omit here. "
- aMaker templates
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacLocaleCarbon.c'))
-
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateMIDIPlugin: (in category 'plugin extra rules') -----
- configureByTemplateMIDIPlugin: aMaker
- self flag:'tty'. "pharo's configureMIDIPlugin: has a super call to an empty method that I omit here. "
- aMaker templates
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacMIDI.c')).
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateMpeg3Plugin: (in category 'plugin extra rules') -----
- configureByTemplateMpeg3Plugin: aMaker
-
- super configureByTemplateMpeg3Plugin: aMaker.
- aMaker templates
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacFileBits.c'))
-
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateObjectiveCPlugin: (in category 'plugin extra rules') -----
- configureByTemplateObjectiveCPlugin: aMaker
- aMaker doNotGenerate: true!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateQuicktimePlugin: (in category 'plugin extra rules') -----
- configureByTemplateQuicktimePlugin: aMaker
- aMaker templates
- addLast: ((CMakeIncludeDirectories new)
- dirs: (OrderedCollection
- with: '${pluginPlatform}'
- with: '${crossDir}/plugins/SurfacePlugin'));
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacQuicktimeInteface.c')).
- " not a typo , a file is named 'inteface' instead of 'interface' "
- aMaker addFrameworksByTemplate: #( 'Carbon' 'QuickTime' ) maker: aMaker.!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateSecurityPlugin: (in category 'plugin extra rules') -----
- configureByTemplateSecurityPlugin: aMaker
- self flag:'tty'. "pharo's configureSecurityPlugin: has a super call to an empty method that I omit here. "
- aMaker templates
- addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin'));
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacSecurity.c')).
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateSerialPlugin: (in category 'plugin extra rules') -----
- configureByTemplateSerialPlugin: aMaker
- aMaker templates
- addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/plugins/SerialPlugin' ));
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${platformsDir}/unix/plugins/SerialPlugin/sqUnixSerial.c'))
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateSocketPlugin: (in category 'plugin extra rules') -----
- configureByTemplateSocketPlugin: aMaker
- aMaker templates
- addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/plugins/SocketPlugin'));
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${platformsDir}/unix/plugins/SocketPlugin/sqUnixSocket.c')).
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateSoundGenerationPlugin: (in category 'plugin extra rules') -----
- configureByTemplateSoundGenerationPlugin: maker
- maker doNotGenerate: true.
- "pharo code comment: The sources in platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c
- are out of date and need to be fixed before it can be built
-
- aMaker templates
- addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/sqOldSoundPrims.c'));
- "
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateTestOSAPlugin: (in category 'plugin extra rules') -----
- configureByTemplateTestOSAPlugin: aMaker
- aMaker addFrameworksByTemplate: #( 'Carbon' 'ApplicationServices' ).!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateUnixOSProcessPlugin: (in category 'plugin extra rules') -----
- configureByTemplateUnixOSProcessPlugin: aMaker
- aMaker templates
- addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin')).
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureCroquetPlugin: (in category 'plugin extra rules') -----
- configureCroquetPlugin: maker
- "extra rules for CroquetPlugin"
-
- super configureCroquetPlugin: maker.
- maker addPlatformSources: #('sqMacCroquet.c').
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureFFIPlugin: (in category 'plugin extra rules') -----
- configureFFIPlugin: maker
- super configureFFIPlugin: maker.
- maker addPlatformSources: #( "'sqMacIntel-Win32.c'"
- 'x86-sysv-MacIntel.c'
- 'x86-sysv-asm-MacIntel.S'
- )!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureFT2Plugin: (in category 'plugin extra rules') -----
- configureFT2Plugin: maker
- "extra rules for Freetype plugin.
- a custom rule to build freetype library"
- | lib |
-
- maker isExternal ifFalse: [
- self error: 'building internal FT2Plugin is not supported yet'
- ].
-
- "add freetype library into loop"
- lib := self addThirdpartyLibrary: 'freetype2'.
-
- "link plugin with freetype lib"
- maker addExternalLibrary: lib targetForLinking.
- maker includeDirectories: lib includeDir.
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureInternetConfigPlugin: (in category 'plugin extra rules') -----
- configureInternetConfigPlugin: maker
- "extra rules for InternetConfigPlugin"
-
- super configureInternetConfigPlugin: maker.
- maker addPlatformSources: #( 'sqMacInternetConfiguration.c')
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureJoystickTabletPlugin: (in category 'plugin extra rules') -----
- configureJoystickTabletPlugin: maker
- "extra rules for JoystickTabletPlugin"
-
- super configureJoystickTabletPlugin: maker.
- maker addPlatformSources:
- #(
- 'HID_Error_Handler.c'
- 'HID_Name_Lookup.c'
- 'HID_Queue_Utilities.c'
- 'HID_Utilities.c'
- 'sqMacJoystickAndTablet.c'
- )
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureLocalePlugin: (in category 'plugin extra rules') -----
- configureLocalePlugin: maker
- "extra rules for LocalePlugin"
-
- super configureLocalePlugin: maker.
- maker addPlatformSources: #( 'sqMacLocaleCarbon.c' )
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureMIDIPlugin: (in category 'plugin extra rules') -----
- configureMIDIPlugin: maker
- "extra rules for MIDIPlugin"
-
- super configureMIDIPlugin: maker.
- maker addPlatformSources: #( 'sqMacMIDI.c')!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureMpeg3Plugin: (in category 'plugin extra rules') -----
- configureMpeg3Plugin: maker
-
- super configureMpeg3Plugin: maker.
-
- maker addPlatformSources: #(
- 'sqMacFileBits.c')
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureObjectiveCPlugin: (in category 'plugin extra rules') -----
- configureObjectiveCPlugin: maker
- maker doNotGenerate: true!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureQuicktimePlugin: (in category 'plugin extra rules') -----
- configureQuicktimePlugin: maker
-
- maker includeDirectories: '${pluginPlatform}'.
- maker includeDirectories: '${crossDir}/plugins/SurfacePlugin'.
-
- " yes, this is not a typo , a file is named 'inteface' instead of 'interface' "
-
- maker addPlatformSources: #( 'sqMacQuicktimeInteface.c' ).
-
- maker addFrameworks: #( 'Carbon' 'QuickTime' ).!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureSecurityPlugin: (in category 'plugin extra rules') -----
- configureSecurityPlugin: maker
- "extra rules for SecurityPlugin"
-
- super configureSecurityPlugin: maker.
- maker includeDirectories: '${crossDir}/plugins/FilePlugin'.
- maker addPlatformSources: #( 'sqMacSecurity.c' )!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureSerialPlugin: (in category 'plugin extra rules') -----
- configureSerialPlugin: maker
- "extra rules for SerialPlugin"
-
- super configureSoundPlugin: maker.
- maker includeDirectories: '${platformsDir}/unix/plugins/SerialPlugin'.
- maker
- addSources: #('sqUnixSerial.c')
- prefixed: '${platformsDir}/unix/plugins/SerialPlugin/'
-
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureSocketPlugin: (in category 'plugin extra rules') -----
- configureSocketPlugin: maker
- "extra rules for SoundPlugin"
-
- super configureSoundPlugin: maker.
- maker includeDirectories: '${platformsDir}/unix/plugins/SocketPlugin'.
- maker
- addSources: #('sqUnixSocket.c')
- prefixed: '${platformsDir}/unix/plugins/SocketPlugin/'
-
-
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureSoundGenerationPlugin: (in category 'plugin extra rules') -----
- configureSoundGenerationPlugin: maker
- "extra rules for SoundPlugin"
-
- maker doNotGenerate: true.
- " The sources in platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c
- are out of date and need to be fixed before it can be built
-
-
- maker
- addCrossSources: #('sqOldSoundPrims.c')
-
- "
- !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureTestOSAPlugin: (in category 'plugin extra rules') -----
- configureTestOSAPlugin: maker
-
- maker addFrameworks: #( 'Carbon' 'ApplicationServices' ).!
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureUnixOSProcessPlugin: (in category 'plugin extra rules') -----
- configureUnixOSProcessPlugin: maker
- "extra rules for UnixOSProcessPlugin"
-
- maker includeDirectories: '${crossDir}/plugins/FilePlugin'.
- !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
+ configureB3DAcceleratorPlugin: maker
+ "extra rules for B3DAcceleratorPlugin"
+
+ super configureB3DAcceleratorPlugin: maker.
+
+ maker
+ includeDirectories: '/usr/X11/include'; "for GL.h"
+ addPlatformSources: #( 'sqMacOpenGL.c' 'sqMacOpenGLInfo.c')
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateCroquetPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateCroquetPlugin: aMaker
+ super configureByTemplateCroquetPlugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacCroquet.c'))
+
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateFFIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateFFIPlugin: aMaker
+ super configureByTemplateFFIPlugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '${pluginPlatform}/x86-sysv-MacIntel.c'
+ with: '${pluginPlatform}/x86-sysv-asm-MacIntel.S')).
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateFT2Plugin: (in category 'plugin extra rules') -----
+ configureByTemplateFT2Plugin: aMaker
+ | lib |
+ self flag:'tty'. "is internalFT2 still not supported?"
+ aMaker isExternal ifFalse: [self error: 'building internal FT2Plugin is not supported yet' ].
+ self flag:'tty'. "I haven't been down the addThirdpartyLibrary rabbit hole yet"
+ lib := self addThirdpartyLibrary: 'freetype2'.
+ aMaker templates "link plugin with freetype lib"
+ addLast:((CMakeListAppend new) list:'LINKLIBS' elements: (OrderedCollection with: (lib targetForLinking)));
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: lib includeDir)).
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateInternetConfigPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateInternetConfigPlugin: aMaker
+ self flag:'tty'. "pharo's configureInternetConfigPlugin has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacInternetConfiguration.c')).
+
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateJoystickTabletPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateJoystickTabletPlugin: aMaker
+ self flag:'tty'. "pharo's configureJoystickTabletPlugin has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '${pluginPlatform}/HID_Error_Handler.c'
+ with: '${pluginPlatform}/HID_Name_Lookup.c'
+ with: '${pluginPlatform}/HID_Queue_Utilities.c'
+ with: '${pluginPlatform}/HID_Utilities.c'
+ with: '${pluginPlatform}/sqMacJoystickAndTablet.c')).
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateLocalePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateLocalePlugin: aMaker
+ self flag:'tty'. "pharo's configureLocalePlugin: has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacLocaleCarbon.c'))
+
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateMIDIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateMIDIPlugin: aMaker
+ self flag:'tty'. "pharo's configureMIDIPlugin: has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacMIDI.c')).
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateMpeg3Plugin: (in category 'plugin extra rules') -----
+ configureByTemplateMpeg3Plugin: aMaker
+
+ super configureByTemplateMpeg3Plugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacFileBits.c'))
+
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateObjectiveCPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateObjectiveCPlugin: aMaker
+ aMaker doNotGenerate: true
+
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateQuicktimePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateQuicktimePlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new)
+ dirs: (OrderedCollection
+ with: '${pluginPlatform}'
+ with: '${crossDir}/plugins/SurfacePlugin'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacQuicktimeInteface.c')).
+ " not a typo , a file is named 'inteface' instead of 'interface' "
+ aMaker addFrameworksByTemplate: #( 'Carbon' 'QuickTime' ) maker: aMaker.!
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateSecurityPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSecurityPlugin: aMaker
+ self flag:'tty'. "pharo's configureSecurityPlugin: has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacSecurity.c')).
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateSerialPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSerialPlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/plugins/SerialPlugin' ));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${platformsDir}/unix/plugins/SerialPlugin/sqUnixSerial.c'))
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateSocketPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSocketPlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/plugins/SocketPlugin'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${platformsDir}/unix/plugins/SocketPlugin/sqUnixSocket.c')).
+
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateSoundGenerationPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSoundGenerationPlugin: maker
+ maker doNotGenerate: true.
+ "pharo code comment: The sources in platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c
+ are out of date and need to be fixed before it can be built
+
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/sqOldSoundPrims.c'));
+ "
+ !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateTestOSAPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateTestOSAPlugin: aMaker
+ aMaker addFrameworksByTemplate: #( 'Carbon' 'ApplicationServices' ).!
Item was added:
+ ----- Method: SqueakMacintoshConfig>>configureByTemplateUnixOSProcessPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateUnixOSProcessPlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin')).
+ !
1
0
06 Dec '14
Revision: 3163
Author: eliot
Date: 2014-12-06 12:31:43 -0800 (Sat, 06 Dec 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.972
Fix a devilishly tricky bug with 32-bit Spur and PICs in the Cogit. In 32-bit
Spur only zero is a valid cache tag, that for Characters, due to SmallIntegers
having both 2r11 and 2r01 as valid tags. The cache check prolog collapses
these down onto 1 by anding with 1 and hence collapses Character's 2r10 to 0.
The cache tag is also tested in the PIC abort routine to distinguish between
an MNU abort and an interpret abort. A PIC MNU entry jumps to code that first
zeros the cache tag (held in ClassReg) before calling the abort routine, which
tests ClassReg and selects the relevant abort processing.
Hence in 32-bit Spur if a send site is linked for Character and later extended
to a PIC with an interpret case, that interpret case will instead invoke MNU
processing. This is rare; first there needs to be a send to a CHaracter, then
a send to something else which binds to something that must be interpreted.
Ouch.
The fix is simple; if a send site that was linked with a zero cache tag (which
can only happen in 32-bit Spur) link to an open PIC instead of to a closed PIC,
or in the case of an MNU do not link.
Changes:
Rename compilePICProlog:, mnuCall and interpretCall to the more accurate
compilePICAbort:, picMNUAbort and picInterpretAbort. Coment compilePICAbort:
and compileAbort. Name the zero value picAbortDiscriminatorValue to make the
code more comprehensible/browsable.
Assert that the cache tag is not zero in ceCPICMiss:...
Refactor cogMNUPICSelector:methodOperand:numArgs: to add receiver: parameter
for the check for a zero cache tag.
Eliminate some duplication introduced in early versions of the ARM abort code.
Specifically lose sendMissCall mnuCall interpretCall & interpretLabel.
Fix type regression in cogMethodOf: with cCoerceSimple:to:; CogClass's version
should be marked <doNotGenerate>.
Fix type warnings in primitiveCopyObject and printStackCallStackOf:.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/cogit.c
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/cogit.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/cogit.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spurstack64src/vm/gcc3x-interp.c
branches/Cog/spurstack64src/vm/interp.c
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-12-06 04:31:14 UTC (rev 3162)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-12-06 20:31:43 UTC (rev 3163)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
+ CCodeGenerator VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
+ StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -609,12 +609,12 @@
static sqInt cogExtendPICCaseNMethodtagisMNUCase(CogMethod *cPIC, sqInt caseNMethod, sqInt caseNTag, sqInt isMNUCase) NoDbgRegParms;
void cogitPostGCAction(sqInt gcMode);
sqInt cogMethodDoesntLookKosher(CogMethod *cogMethod);
-CogMethod * cogMNUPICSelectormethodOperandnumArgs(sqInt selector, sqInt methodOperand, sqInt numArgs);
+CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
static CogMethod * cogOpenPICSelectornumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
static CogMethod * cogPICSelectornumArgsCase0MethodCase1MethodtagisMNUCase(sqInt selector, sqInt numArgs, CogMethod *case0CogMethod, sqInt case1MethodOrNil, sqInt case1Tag, sqInt isMNUCase) NoDbgRegParms;
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
-static void compileAbort(void);
+static AbstractInstruction * compileAbort(void);
static sqInt compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex) NoDbgRegParms;
static void compileBlockEntry(BlockStart *blockStart) NoDbgRegParms;
static void compileCallFornumArgsargargargargresultRegsaveRegs(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt resultRegOrNil, sqInt saveRegs) NoDbgRegParms;
@@ -624,7 +624,7 @@
static void compileEntry(void);
static sqInt compileMethodBody(void);
static sqInt compileMNUCPICmethodOperandnumArgs(CogMethod *cPIC, sqInt methodOperand, sqInt numArgs) NoDbgRegParms;
-static sqInt compilePICProlog(sqInt numArgs) NoDbgRegParms;
+static sqInt compilePICAbort(sqInt numArgs) NoDbgRegParms;
static sqInt compilePrimitive(void);
static void compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) NoDbgRegParms;
static void computeEntryOffsets(void);
@@ -746,6 +746,7 @@
static AbstractInstruction * gPushCw(sqInt wordConstant) NoDbgRegParms;
sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver);
sqInt pcisWithinMethod(char *address, CogMethod *cogMethod);
+static sqInt picAbortDiscriminatorValue(void);
static PrimitiveDescriptor * primitiveGeneratorOrNil(void);
void printCogMethodFor(void *address);
void printTrampolineTable(void);
@@ -1765,8 +1766,6 @@
static sqInt inBlock;
static sqInt indexOfIRC;
static sqInt initialPC;
-static AbstractInstruction * interpretCall;
-static AbstractInstruction * interpretLabel;
static int labelCounter;
static sqInt lastSend;
static usqInt limitAddress;
@@ -1781,7 +1780,6 @@
static sqInt methodZoneBase;
static unsigned long minValidCallAddress;
sqInt missOffset;
-static AbstractInstruction * mnuCall;
static usqInt mzFreeStart;
static sqInt needsFrame;
static AbstractInstruction * noCheckEntry;
@@ -1794,7 +1792,9 @@
static sqInt openPICSize;
static CogSSOptStatus optStatus;
static sqInt picAbortTrampolines[4];
+static AbstractInstruction * picInterpretAbort;
static sqInt picMissTrampolines[4];
+static AbstractInstruction * picMNUAbort;
static void (*postCompileHook)(CogMethod *, void *);
static BytecodeDescriptor * prevBCDescriptor;
static AbstractInstruction * primInvokeLabel;
@@ -1807,7 +1807,6 @@
static sqInt regArgsHaveBeenPushed;
static sqInt runtimeObjectRefIndex;
static AbstractInstruction * sendMiss;
-static AbstractInstruction * sendMissCall;
static sqInt sendTrampolines[NumSendTrampolines];
static CogSimStackEntry simSelf;
static sqInt simSpillBase;
@@ -8590,6 +8589,7 @@
outerReturn = stackTop();
+ assert(!(((inlineCacheTagAt(backEnd, outerReturn)) == (picAbortDiscriminatorValue()))));
if (((cPIC->cPICNumCases)) < numPICCases) {
/* begin lookup:for:methodAndErrorSelectorInto: */
selector = (cPIC->selector);
@@ -8806,8 +8806,9 @@
if (((errorSelectorOrNil != null)
&& (errorSelectorOrNil != SelectorDoesNotUnderstand))
|| ((inlineCacheTagIsYoung(cacheTag))
+ || (((inlineCacheTagAt(backEnd, outerReturn)) == 0)
|| ((newTargetMethodOrNil == null)
- || (isYoung(newTargetMethodOrNil))))) {
+ || (isYoung(newTargetMethodOrNil)))))) {
result = patchToOpenPICFornumArgsreceiver((targetMethod->selector), (targetMethod->cmNumArgs), receiver);
assert(!result);
return ceSendFromInLineCacheMiss(targetMethod);
@@ -9491,14 +9492,15 @@
*/
CogMethod *
-cogMNUPICSelectormethodOperandnumArgs(sqInt selector, sqInt methodOperand, sqInt numArgs)
+cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs)
{
sqInt end;
sqInt headerSize;
sqInt size;
sqInt startAddress;
- if (isYoung(selector)) {
+ if ((isYoung(selector))
+ || ((inlineCacheTagForInstance(rcvr)) == 0)) {
return 0;
}
compilationBreakpointisMNUCase(selector, numBytesOf(selector), 1);
@@ -9519,7 +9521,7 @@
/* The missOffset is the same as the interpretOffset. */
end = outputInstructionsAt(startAddress + headerSize);
- assert(missOffset == ((((interpretCall->address)) + ((interpretCall->machineCodeSize))) - startAddress));
+ assert(missOffset == ((((picInterpretAbort->address)) + ((picInterpretAbort->machineCodeSize))) - startAddress));
assert((startAddress + cmEntryOffset) == ((entry->address)));
return fillInCPICHeadersizenumArgsnumCaseshasMNUCaseselector(((CogMethod *) startAddress), closedPICSize, numArgs, 1, 1, selector);
}
@@ -9595,7 +9597,7 @@
/* The missOffset is th same as the interpretOffset. */
end = outputInstructionsAt(startAddress + headerSize);
- assert(missOffset == ((((interpretCall->address)) + ((interpretCall->machineCodeSize))) - startAddress));
+ assert(missOffset == ((((picInterpretAbort->address)) + ((picInterpretAbort->machineCodeSize))) - startAddress));
assert((startAddress + cmEntryOffset) == ((entry->address)));
assert(((endCPICCase0->address)) == (startAddress + firstCPICCaseOffset));
assert(((endCPICCase1->address)) == ((startAddress + firstCPICCaseOffset) + cPICCaseSize));
@@ -9675,16 +9677,19 @@
path; if nonzero the in-line cache miss path. Neither of these paths
returns. The abort routine must be called; In the callee the method is
located by
- adding the relevant offset to the return address of the call. */
+ adding the relevant offset to the return address of the call.
+
+ N.B. This code must match that in compilePICAbort: so that the offset of
+ the return address of the call is the same in methods and closed PICs. */
-static void
+static AbstractInstruction *
compileAbort(void)
{
sqInt callTarget;
/* begin MoveCq:R: */
stackOverflowCall = genoperandoperand(MoveCqR, 0, ReceiverResultReg);
- sendMiss = (sendMissCall = gCall(methodAbortTrampolineFor(methodOrBlockNumArgs)));
+ return (sendMiss = gCall(methodAbortTrampolineFor(methodOrBlockNumArgs)));
}
@@ -9871,7 +9876,7 @@
sqInt numArgs;
numArgs = 0;
- compilePICProlog(numArgs);
+ compilePICAbort(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
genoperandoperand(MoveCwR, 99282957, SendNumArgsReg);
@@ -9936,7 +9941,7 @@
void *targetEntry;
assert(case1Method != null);
- compilePICProlog(numArgs);
+ compilePICAbort(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
&& (methodHasCogMethod(case1Method))) {
@@ -9948,8 +9953,8 @@
|| (!(isYoungObject(case1Method))));
operand = case1Method;
targetEntry = (case1Method == null
- ? mnuCall
- : interpretLabel);
+ ? picMNUAbort
+ : picInterpretAbort);
}
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
@@ -9963,7 +9968,7 @@
genoperandoperand(MoveCwR, operand, SendNumArgsReg);
/* begin JumpLongZero: */
jumpTarget = ((sqInt)((isMNUCase
- ? mnuCall
+ ? picMNUAbort
: targetEntry)));
genoperand(JumpLongZero, ((sqInt)jumpTarget));
/* begin MoveCw:R: */
@@ -10029,12 +10034,12 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
- compilePICProlog(numArgs);
+ compilePICAbort(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
genoperandoperand(MoveCwR, methodOperand, SendNumArgsReg);
/* begin JumpLong: */
- genoperand(JumpLong, ((sqInt)mnuCall));
+ genoperand(JumpLong, ((sqInt)picMNUAbort));
jmpTarget(jumpNext, gMoveCwR(((sqInt)cPIC), ClassReg));
/* begin JumpLong: */
jumpTarget = cPICMissTrampolineFor(numArgs);
@@ -10044,20 +10049,32 @@
/* The start of a PIC has a call to a run-time abort routine that either
- handles a dispatch to an interpreted method or a dispatch of an MNU case.
- The routine selects the path depending on ClassReg; if zero it takes the
- MNU path; if nonzero the dispatch to interpreter path. Neither of these
- paths returns. The abort routine must be called; In the callee the PIC is
- located by adding the relevant offset to the return address of the call. */
+ handles a dispatch to an
+ interpreted method or a dispatch of an MNU case. The routine selects the
+ path by testing
+ ClassReg, which holds the inline cache tag; if equal to the
+ picAbortDiscriminatorValue (zero)
+ it takes the MNU path; if nonzero the dispatch to interpreter path.
+ Neither of these paths
+ returns. The abort routine must be called; In the callee the PIC is
+ located by adding the
+ relevant offset to the return address of the call.
+
+ N.B. This code must match that in compileAbort so that the offset of the
+ return address of
+ the call is the same in methods and closed PICs. */
static sqInt
-compilePICProlog(sqInt numArgs)
+compilePICAbort(sqInt numArgs)
{
sqInt callTarget;
+ sqInt callTarget1;
/* begin MoveCq:R: */
- mnuCall = genoperandoperand(MoveCqR, 0, ClassReg);
- interpretLabel = (interpretCall = gCall(picAbortTrampolineFor(numArgs)));
+ picMNUAbort = genoperandoperand(MoveCqR, 0, ClassReg);
+ /* begin Call: */
+ callTarget1 = picAbortTrampolineFor(numArgs);
+ picInterpretAbort = genoperand(Call, callTarget1);
return 0;
}
@@ -10132,9 +10149,11 @@
static void
computeEntryOffsets(void)
{
+ AbstractInstruction *sendMissCall;
+
allocateOpcodesbytecodes(20, 0);
methodOrBlockNumArgs = 0;
- compileAbort();
+ sendMissCall = compileAbort();
compileEntry();
computeMaximumSizes();
generateInstructionsAt(methodZoneBase + (sizeof(CogMethod)));
@@ -11244,10 +11263,17 @@
/* Generate the abort for a PIC. This abort performs either a call of
- ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged
- target or a call of ceMNUFromPICMNUMethod:receiver: to handle an
- MNU dispatch in a closed PIC. It distinguishes the two by testing
- ClassReg. If the register is zero then this is an MNU. */
+ ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged target
+ or a call of ceMNUFromPICMNUMethod:receiver: to handle an MNU dispatch
+ in a closed PIC. It distinguishes the two by testing ClassReg. If the
+ register is zero then this is an MNU.
+
+ This poses a problem in 32-bit Spur, where zero is the cache tag for
+ immediate characters (tag pattern 2r10) because SmallIntegers have tag
+ patterns 2r11
+ and 2r01, so anding with 1 reduces these to 0 & 1. We solve the ambiguity
+ by patching send sites with a 0 cache tag to open PICs instead of closed
+ PICs. */
static sqInt
genInnerPICAbortTrampoline(char *name)
@@ -13270,6 +13296,16 @@
}
+/* This value is used to decide between MNU processing
+ or interpretation in the closed PIC aborts. */
+
+static sqInt
+picAbortDiscriminatorValue(void)
+{
+ return 0;
+}
+
+
/* If there is a generator for the current primitive then answer it;
otherwise answer nil. */
@@ -19036,7 +19072,7 @@
sqInt offset5;
sqInt offset6;
- compilePICProlog(numArgs);
+ compilePICAbort(numArgs);
/* begin Nop */
gen(Nop);
/* begin Nop */
@@ -19076,7 +19112,7 @@
/* begin MoveR:R: */
genoperandoperand(MoveRR, TempReg, ClassReg);
jumpBCMethod = genJumpSmallIntegerInScratchReg(TempReg);
- jmpTarget(jumpBCMethod, interpretLabel);
+ jmpTarget(jumpBCMethod, picInterpretAbort);
/* begin AddCq:R: */
genoperandoperand(AddCqR, cmNoCheckEntryOffset, ClassReg);
/* begin JumpR: */
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-12-06 04:31:14 UTC (rev 3162)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-12-06 20:31:43 UTC (rev 3163)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
+ CCodeGenerator VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef
*/
@@ -39,7 +39,7 @@
sqInt cogCodeConstituents(void);
void cogitPostGCAction(sqInt gcMode);
sqInt cogMethodDoesntLookKosher(CogMethod *cogMethod);
-CogMethod * cogMNUPICSelectormethodOperandnumArgs(sqInt selector, sqInt methodOperand, sqInt numArgs);
+CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
void enterCogCodePopReceiver(void);
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-06 04:31:14 UTC (rev 3162)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
from
- CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2098,7 +2098,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.969";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.971";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -4842,7 +4842,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l300;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4860,7 +4859,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- null;
+ /* return self */
l300: /* end baseFrameReturn */;
goto l299;
}
@@ -15100,7 +15099,7 @@
GIV(messageSelector) = selector;
if (((errSelIdx = lookupMethodNoMNUEtcInClass(classTag))) != 0) {
if ((errSelIdx == SelectorDoesNotUnderstand)
- && ((((usqInt)((cogMethod = cogMNUPICSelectormethodOperandnumArgs(GIV(messageSelector), mnuMethodOrNilFor(rcvr), GIV(argumentCount)))))) > (minCogMethodAddress()))) {
+ && ((((usqInt)((cogMethod = cogMNUPICSelectorreceivermethodOperandnumArgs(GIV(messageSelector), rcvr, mnuMethodOrNilFor(rcvr), GIV(argumentCount)))))) > (minCogMethodAddress()))) {
linkSendAtintooffsetreceiver(longAt(GIV(stackPointer)), mframeHomeMethod(GIV(framePointer)), cogMethod, (superNormalBar == 0
? entryOffset()
: noCheckEntryOffset()), rcvr);
@@ -26102,7 +26101,7 @@
(GIV(primFailCode) = PrimErrBadArgument);
return;
}
- memcpy(rcvr + BaseHeaderSize, arg + BaseHeaderSize, length);
+ memcpy(((void *)(rcvr + BaseHeaderSize)), ((void *)(arg + BaseHeaderSize)), length);
}
else {
if (!(isAppropriateForCopyObject(rcvr))) {
@@ -50484,7 +50483,7 @@
if ((((frameOrContext & 1) == 0)
&& (((((usqInt) (longAt(frameOrContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))
&& (checkIsStillMarriedContextcurrentFP(frameOrContext, null))) {
- return printStackCallStackOf(frameOfMarriedContext(frameOrContext));
+ return printStackCallStackOf(((sqInt)(frameOfMarriedContext(frameOrContext))));
}
return null;
}
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-06 04:31:14 UTC (rev 3162)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-06 20:31:43 UTC (rev 3163)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-06 04:31:14 UTC (rev 3162)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
from
- CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2101,7 +2101,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.969";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.971";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -4851,7 +4851,6 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
- null;
goto l300;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4869,7 +4868,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- null;
+ /* return self */
l300: /* end baseFrameReturn */;
goto l299;
}
@@ -15109,7 +15108,7 @@
GIV(messageSelector) = selector;
if (((errSelIdx = lookupMethodNoMNUEtcInClass(classTag))) != 0) {
if ((errSelIdx == SelectorDoesNotUnderstand)
- && ((((usqInt)((cogMethod = cogMNUPICSelectormethodOperandnumArgs(GIV(messageSelector), mnuMethodOrNilFor(rcvr), GIV(argumentCount)))))) > (minCogMethodAddress()))) {
+ && ((((usqInt)((cogMethod = cogMNUPICSelectorreceivermethodOperandnumArgs(GIV(messageSelector), rcvr, mnuMethodOrNilFor(rcvr), GIV(argumentCount)))))) > (minCogMethodAddress()))) {
linkSendAtintooffsetreceiver(longAt(GIV(stackPointer)), mframeHomeMethod(GIV(framePointer)), cogMethod, (superNormalBar == 0
? entryOffset()
: noCheckEntryOffset()), rcvr);
@@ -26111,7 +26110,7 @@
(GIV(primFailCode) = PrimErrBadArgument);
return;
}
- memcpy(rcvr + BaseHeaderSize, arg + BaseHeaderSize, length);
+ memcpy(((void *)(rcvr + BaseHeaderSize)), ((void *)(arg + BaseHeaderSize)), length);
}
else {
if (!(isAppropriateForCopyObject(rcvr))) {
@@ -50493,7 +50492,7 @@
if ((((frameOrContext & 1) == 0)
&& (((((usqInt) (longAt(frameOrContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))
&& (checkIsStillMarriedContextcurrentFP(frameOrContext, null))) {
- return printStackCallStackOf(frameOfMarriedContext(frameOrContext));
+ return printStackCallStackOf(((sqInt)(frameOfMarriedContext(frameOrContext))));
}
return null;
}
Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c 2014-12-06 04:31:14 UTC (rev 3162)
+++ branches/Cog/nsspursrc/vm/cogit.c 2014-12-06 20:31:43 UTC (rev 3163)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
+ CCodeGenerator VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
+ StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -604,12 +604,12 @@
static sqInt cogExtendPICCaseNMethodtagisMNUCase(CogMethod *cPIC, sqInt caseNMethod, sqInt caseNTag, sqInt isMNUCase) NoDbgRegParms;
void cogitPostGCAction(sqInt gcMode);
sqInt cogMethodDoesntLookKosher(CogMethod *cogMethod);
-CogMethod * cogMNUPICSelectormethodOperandnumArgs(sqInt selector, sqInt methodOperand, sqInt numArgs);
+CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
static CogMethod * cogOpenPICSelectornumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms;
static CogMethod * cogPICSelectornumArgsCase0MethodCase1MethodtagisMNUCase(sqInt selector, sqInt numArgs, CogMethod *case0CogMethod, sqInt case1MethodOrNil, sqInt case1Tag, sqInt isMNUCase) NoDbgRegParms;
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
-static void compileAbort(void);
+static AbstractInstruction * compileAbort(void);
static sqInt compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex) NoDbgRegParms;
static void compileBlockEntry(BlockStart *blockStart) NoDbgRegParms;
static void compileCallFornumArgsargargargargresultRegsaveRegs(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt resultRegOrNil, sqInt saveRegs) NoDbgRegParms;
@@ -619,7 +619,7 @@
static void compileEntry(void);
static sqInt compileMethodBody(void);
static sqInt compileMNUCPICmethodOperandnumArgs(CogMethod *cPIC, sqInt methodOperand, sqInt numArgs) NoDbgRegParms;
-static sqInt compilePICProlog(sqInt numArgs) NoDbgRegParms;
+static sqInt compilePICAbort(sqInt numArgs) NoDbgRegParms;
static sqInt compilePrimitive(void);
static void compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) NoDbgRegParms;
static void computeEntryOffsets(void);
@@ -746,6 +746,7 @@
static AbstractInstruction * gPushCw(sqInt wordConstant) NoDbgRegParms;
sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver);
sqInt pcisWithinMethod(char *address, CogMethod *cogMethod);
+static sqInt picAbortDiscriminatorValue(void);
static PrimitiveDescriptor * primitiveGeneratorOrNil(void);
void printCogMethodFor(void *address);
void printTrampolineTable(void);
@@ -1784,8 +1785,6 @@
static sqInt inBlock;
static sqInt indexOfIRC;
static sqInt initialPC;
-static AbstractInstruction * interpretCall;
-static AbstractInstruction * interpretLabel;
static int labelCounter;
static sqInt lastSend;
static usqInt limitAddress;
@@ -1800,7 +1799,6 @@
static sqInt methodZoneBase;
static unsigned long minValidCallAddress;
sqInt missOffset;
-static AbstractInstruction * mnuCall;
static usqInt mzFreeStart;
static sqInt needsFrame;
static AbstractInstruction * noCheckEntry;
@@ -1813,7 +1811,9 @@
static sqInt openPICSize;
static CogSSOptStatus optStatus;
static sqInt picAbortTrampolines[4];
+static AbstractInstruction * picInterpretAbort;
static sqInt picMissTrampolines[4];
+static AbstractInstruction * picMNUAbort;
static void (*postCompileHook)(CogMethod *, void *);
static BytecodeDescriptor * prevBCDescriptor;
static AbstractInstruction * primInvokeLabel;
@@ -1826,7 +1826,6 @@
static sqInt regArgsHaveBeenPushed;
static sqInt runtimeObjectRefIndex;
static AbstractInstruction * sendMiss;
-static AbstractInstruction * sendMissCall;
static sqInt sendTrampolines[NumSendTrampolines];
static CogSimStackEntry simSelf;
static sqInt simSpillBase;
@@ -8617,6 +8616,7 @@
return ceSendFromInLineCacheMiss(cPIC);
}
outerReturn = stackTop();
+ assert(!(((inlineCacheTagAt(backEnd, outerReturn)) == (picAbortDiscriminatorValue()))));
if (((cPIC->cPICNumCases)) < numPICCases) {
/* begin lookup:for:methodAndErrorSelectorInto: */
selector = (cPIC->selector);
@@ -8827,8 +8827,9 @@
if (((errorSelectorOrNil != null)
&& (errorSelectorOrNil != SelectorDoesNotUnderstand))
|| ((inlineCacheTagIsYoung(cacheTag))
+ || (((inlineCacheTagAt(backEnd, outerReturn)) == 0)
|| ((newTargetMethodOrNil == null)
- || (isYoung(newTargetMethodOrNil))))) {
+ || (isYoung(newTargetMethodOrNil)))))) {
result = patchToOpenPICFornumArgsreceiver((targetMethod->selector), (targetMethod->cmNumArgs), receiver);
assert(!result);
return ceSendFromInLineCacheMiss(targetMethod);
@@ -9449,14 +9450,15 @@
*/
CogMethod *
-cogMNUPICSelectormethodOperandnumArgs(sqInt selector, sqInt methodOperand, sqInt numArgs)
+cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs)
{
sqInt end;
sqInt headerSize;
sqInt size;
sqInt startAddress;
- if (isYoung(selector)) {
+ if ((isYoung(selector))
+ || ((inlineCacheTagForInstance(rcvr)) == 0)) {
return 0;
}
compilationBreakpointisMNUCase(selector, numBytesOf(selector), 1);
@@ -9477,7 +9479,7 @@
/* The missOffset is the same as the interpretOffset. */
end = outputInstructionsAt(startAddress + headerSize);
- assert(missOffset == ((((interpretCall->address)) + ((interpretCall->machineCodeSize))) - startAddress));
+ assert(missOffset == ((((picInterpretAbort->address)) + ((picInterpretAbort->machineCodeSize))) - startAddress));
assert((startAddress + cmEntryOffset) == ((entry->address)));
return fillInCPICHeadersizenumArgsnumCaseshasMNUCaseselector(((CogMethod *) startAddress), closedPICSize, numArgs, 1, 1, selector);
}
@@ -9553,7 +9555,7 @@
/* The missOffset is th same as the interpretOffset. */
end = outputInstructionsAt(startAddress + headerSize);
- assert(missOffset == ((((interpretCall->address)) + ((interpretCall->machineCodeSize))) - startAddress));
+ assert(missOffset == ((((picInterpretAbort->address)) + ((picInterpretAbort->machineCodeSize))) - startAddress));
assert((startAddress + cmEntryOffset) == ((entry->address)));
assert(((endCPICCase0->address)) == (startAddress + firstCPICCaseOffset));
assert(((endCPICCase1->address)) == ((startAddress + firstCPICCaseOffset) + cPICCaseSize));
@@ -9633,16 +9635,19 @@
path; if nonzero the in-line cache miss path. Neither of these paths
returns. The abort routine must be called; In the callee the method is
located by
- adding the relevant offset to the return address of the call. */
+ adding the relevant offset to the return address of the call.
+
+ N.B. This code must match that in compilePICAbort: so that the offset of
+ the return address of the call is the same in methods and closed PICs. */
-static void
+static AbstractInstruction *
compileAbort(void)
{
sqInt callTarget;
/* begin MoveCq:R: */
stackOverflowCall = genoperandoperand(MoveCqR, 0, ReceiverResultReg);
- sendMiss = (sendMissCall = gCall(methodAbortTrampolineFor(methodOrBlockNumArgs)));
+ return (sendMiss = gCall(methodAbortTrampolineFor(methodOrBlockNumArgs)));
}
@@ -9829,7 +9834,7 @@
sqInt numArgs;
numArgs = 0;
- compilePICProlog(numArgs);
+ compilePICAbort(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
genoperandoperand(MoveCwR, 99282957, SendNumArgsReg);
@@ -9894,7 +9899,7 @@
void *targetEntry;
assert(case1Method != null);
- compilePICProlog(numArgs);
+ compilePICAbort(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
&& (methodHasCogMethod(case1Method))) {
@@ -9906,8 +9911,8 @@
|| (!(isYoungObject(case1Method))));
operand = case1Method;
targetEntry = (case1Method == null
- ? mnuCall
- : interpretLabel);
+ ? picMNUAbort
+ : picInterpretAbort);
}
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
@@ -9921,7 +9926,7 @@
genoperandoperand(MoveCwR, operand, SendNumArgsReg);
/* begin JumpLongZero: */
jumpTarget = ((sqInt)((isMNUCase
- ? mnuCall
+ ? picMNUAbort
: targetEntry)));
genoperand(JumpLongZero, ((sqInt)jumpTarget));
/* begin MoveCw:R: */
@@ -9987,12 +9992,12 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
- compilePICProlog(numArgs);
+ compilePICAbort(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
genoperandoperand(MoveCwR, methodOperand, SendNumArgsReg);
/* begin JumpLong: */
- genoperand(JumpLong, ((sqInt)mnuCall));
+ genoperand(JumpLong, ((sqInt)picMNUAbort));
jmpTarget(jumpNext, gMoveCwR(((sqInt)cPIC), ClassReg));
/* begin JumpLong: */
jumpTarget = cPICMissTrampolineFor(numArgs);
@@ -10002,20 +10007,32 @@
/* The start of a PIC has a call to a run-time abort routine that either
- handles a dispatch to an interpreted method or a dispatch of an MNU case.
- The routine selects the path depending on ClassReg; if zero it takes the
- MNU path; if nonzero the dispatch to interpreter path. Neither of these
- paths returns. The abort routine must be called; In the callee the PIC is
- located by adding the relevant offset to the return address of the call. */
+ handles a dispatch to an
+ interpreted method or a dispatch of an MNU case. The routine selects the
+ path by testing
+ ClassReg, which holds the inline cache tag; if equal to the
+ picAbortDiscriminatorValue (zero)
+ it takes the MNU path; if nonzero the dispatch to interpreter path.
+ Neither of these paths
+ returns. The abort routine must be called; In the callee the PIC is
+ located by adding the
+ relevant offset to the return address of the call.
+
+ N.B. This code must match that in compileAbort so that the offset of the
+ return address of
+ the call is the same in methods and closed PICs. */
static sqInt
-compilePICProlog(sqInt numArgs)
+compilePICAbort(sqInt numArgs)
{
sqInt callTarget;
+ sqInt callTarget1;
/* begin MoveCq:R: */
- mnuCall = genoperandoperand(MoveCqR, 0, ClassReg);
- interpretLabel = (interpretCall = gCall(picAbortTrampolineFor(numArgs)));
+ picMNUAbort = genoperandoperand(MoveCqR, 0, ClassReg);
+ /* begin Call: */
+ callTarget1 = picAbortTrampolineFor(numArgs);
+ picInterpretAbort = genoperand(Call, callTarget1);
return 0;
}
@@ -10090,9 +10107,11 @@
static void
computeEntryOffsets(void)
{
+ AbstractInstruction *sendMissCall;
+
allocateOpcodesbytecodes(20, 0);
methodOrBlockNumArgs = 0;
- compileAbort();
+ sendMissCall = compileAbort();
compileEntry();
computeMaximumSizes();
generateInstructionsAt(methodZoneBase + (sizeof(CogMethod)));
@@ -11360,10 +11379,17 @@
/* Generate the abort for a PIC. This abort performs either a call of
- ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged
- target or a call of ceMNUFromPICMNUMethod:receiver: to handle an
- MNU dispatch in a closed PIC. It distinguishes the two by testing
- ClassReg. If the register is zero then this is an MNU. */
+ ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged target
+ or a call of ceMNUFromPICMNUMethod:receiver: to handle an MNU dispatch
+ in a closed PIC. It distinguishes the two by testing ClassReg. If the
+ register is zero then this is an MNU.
+
+ This poses a problem in 32-bit Spur, where zero is the cache tag for
+ immediate characters (tag pattern 2r10) because SmallIntegers have tag
+ patterns 2r11
+ and 2r01, so anding with 1 reduces these to 0 & 1. We solve the ambiguity
+ by patching send sites with a 0 cache tag to open PICs instead of closed
+ PICs. */
static sqInt
genInnerPICAbortTrampoline(char *name)
@@ -13187,6 +13213,16 @@
}
+/* This value is used to decide between MNU processing
+ or interpretation in the closed PIC aborts. */
+
+static sqInt
+picAbortDiscriminatorValue(void)
+{
+ return 0;
+}
+
+
/* If there is a generator for the current primitive then answer it;
otherwise answer nil. */
@@ -20757,7 +20793,7 @@
sqInt offset5;
sqInt offset6;
- compilePICProlog(numArgs);
+ compilePICAbort(numArgs);
/* begin Nop */
gen(Nop);
/* begin Nop */
@@ -20797,7 +20833,7 @@
/* begin MoveR:R: */
genoperandoperand(MoveRR, TempReg, ClassReg);
jumpBCMethod = genJumpSmallIntegerInScratchReg(TempReg);
- jmpTarget(jumpBCMethod, interpretLabel);
+ jmpTarget(jumpBCMethod, picInterpretAbort);
/* begin AddCq:R: */
genoperandoperand(AddCqR, cmNoCheckEntryOffset, ClassReg);
/* begin JumpR: */
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2014-12-06 04:31:14 UTC (rev 3162)
+++ branches/Cog/nsspursrc/vm/cogit.h 2014-12-06 20:31:43 UTC (rev 3163)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
+ CCodeGenerator VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef
*/
@@ -39,7 +39,7 @@
sqInt cogCodeConstituents(void);
void cogitPostGCAction(sqInt gcMode);
sqInt cogMethodDoesntLookKosher(CogMethod *cogMethod);
-CogMethod * cogMNUPICSelectormethodOperandnumArgs(sqInt selector, sqInt methodOperand, sqInt numArgs);
+CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
void enterCogCodePopReceiver(void);
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-12-06 04:31:14 UTC (rev 3162)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-12-06 20:31:43 UTC (rev 3163)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
from
- CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.971 uuid: ed756b25-4d7e-45a8-8a3b-c06199675128 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -390,7 +390,7 @@
#endif
sqInt interpret(void);
-static sqInt cmHomeMethod(CogBlockMethod * self_in_cmHomeMethod) NoDbgRegParms;
+static CogMethod * cmHomeMethod(CogBlockMethod * self_in_cmHomeMethod) NoDbgRegParms;
sqInt accessorDepthForPrimitiveIndex(sqInt primIndex);
static void activateCoggedNewMethod(sqInt inInterpreter) NoDbgRegParms;
static void activateNewMethod(void);
@@ -435,7 +435,7 @@
static sqInt checkOkayFields(sqInt oop) NoDbgRegParms;
static sqInt checkStackIntegrity(void);
void clearTraceLog(void);
-sqInt cogMethodOf(sqInt aMethodOop);
+CogMethod * cogMethodOf(sqInt aMethodOop);
static void commenceCogCompiledCodeCompaction(void);
void compilationBreakpointFor(sqInt selectorOop);
static sqInt contextInstructionPointerframe(sqInt theIP, char *theFP) NoDbgRegParms;
@@ -500,6 +500,7 @@
sqInt methodNeedsLargeContext(sqInt methodObj);
sqInt methodShouldBeCogged(sqInt aMethodObj);
static sqInt methodWithHeaderShouldBeCogged(sqInt methodHeader) NoDbgRegParms;
+static CogBlockMethod * mframeCogMethod(char *theFP) NoDbgRegParms;
CogMethod * mframeHomeMethodExport(void);
CogMethod * mframeHomeMethod(char *theFP);
static sqInt mframeIsBlockActivation(char *theFP) NoDbgRegParms;
@@ -2347,7 +2348,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.969";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.971";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -5101,7 +5102,7 @@
goto l248;
}
closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory())
- ? ((((CogBlockMethod *) ((longAt(localFP + FoxMethod)) & MFMethodMask)))->cmNumArgs)
+ ? ((mframeCogMethod(localFP))->cmNumArgs)
: byteAt((localFP + FoxIFrameFlags) + 1)))));
/* Walk the closure's lexical chain to find the context or frame to return from (home). */
@@ -5203,8 +5204,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages))))));
- index2 = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage));
- thePage1 = stackPageAtpages(index2, GIV(pages));
+ index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage));
+ thePage1 = stackPageAtpages(index, GIV(pages));
callerContextOrNil = longAt((thePage1->baseAddress));
assert(addressCouldBeObj(callerContextOrNil));
assert((callerContextOrNil == (nilObject()))
@@ -5263,8 +5264,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) frameToReturnTo)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) frameToReturnTo)) <= (((char *) GIV(pages))))));
- index1 = pageIndexForstackBasePlus1bytesPerPage(frameToReturnTo, GIV(stackBasePlus1), GIV(bytesPerPage));
- newPage = stackPageAtpages(index1, GIV(pages));
+ index4 = pageIndexForstackBasePlus1bytesPerPage(frameToReturnTo, GIV(stackBasePlus1), GIV(bytesPerPage));
+ newPage = stackPageAtpages(index4, GIV(pages));
if (newPage != GIV(stackPage)) {
/* begin frameCallerContext: */
theFP2 = (GIV(stackPage)->baseFP);
@@ -5273,8 +5274,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) theFP2)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP2)) <= (((char *) GIV(pages))))));
- index4 = pageIndexForstackBasePlus1bytesPerPage(theFP2, GIV(stackBasePlus1), GIV(bytesPerPage));
- thePage3 = stackPageAtpages(index4, GIV(pages));
+ index3 = pageIndexForstackBasePlus1bytesPerPage(theFP2, GIV(stackBasePlus1), GIV(bytesPerPage));
+ thePage3 = stackPageAtpages(index3, GIV(pages));
callerContextOrNil2 = longAt((thePage3->baseAddress));
assert(addressCouldBeObj(callerContextOrNil2));
assert((callerContextOrNil2 == (nilObject()))
@@ -5289,8 +5290,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages))))));
- index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage));
- thePage = stackPageAtpages(index, GIV(pages));
+ index1 = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage));
+ thePage = stackPageAtpages(index1, GIV(pages));
if (theFP != ((thePage->headFP))) {
/* Since we've just deallocated a page we know that newStackPage won't deallocate an existing one. */
@@ -5304,8 +5305,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) theFP1)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP1)) <= (((char *) GIV(pages))))));
- index3 = pageIndexForstackBasePlus1bytesPerPage(theFP1, GIV(stackBasePlus1), GIV(bytesPerPage));
- thePage2 = stackPageAtpages(index3, GIV(pages));
+ index2 = pageIndexForstackBasePlus1bytesPerPage(theFP1, GIV(stackBasePlus1), GIV(bytesPerPage));
+ thePage2 = stackPageAtpages(index2, GIV(pages));
callerContextOrNil1 = longAt((thePage2->baseAddress));
assert(addressCouldBeObj(callerContextOrNil1));
assert((callerContextOrNil1 == (nilObject()))
@@ -5612,7 +5613,7 @@
/* begin frameCallerSavedIP: */
localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP));
localSP = localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory())
- ? ((((CogBlockMethod *) ((longAt(localFP + FoxMethod)) & MFMethodMask)))->cmNumArgs)
+ ? ((mframeCogMethod(localFP))->cmNumArgs)
: byteAt((localFP + FoxIFrameFlags) + 1))));
localFP = callersFPOrNull;
if ((((usqInt)localIP)) < (startOfMemory())) {
@@ -6523,7 +6524,7 @@
/* begin frameCallerStackPointer: */
assert(!(isBaseFrame(spouseFP)));
theSP = (spouseFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())
- ? ((((CogBlockMethod *) ((longAt(spouseFP + FoxMethod)) & MFMethodMask)))->cmNumArgs)
+ ? ((mframeCogMethod(spouseFP))->cmNumArgs)
: byteAt((spouseFP + FoxIFrameFlags) + 1))))) + BytesPerWord;
if (((((usqInt)(longAt(callerFP + FoxMethod)))) < (startOfMemory())
? ((longAt(callerFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0
@@ -13156,7 +13157,7 @@
/* begin frameCallerStackPointer: */
assert(!(isBaseFrame(spouseFP)));
theSP = (spouseFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())
- ? ((((CogBlockMethod *) ((longAt(spouseFP + FoxMethod)) & MFMethodMask)))->cmNumArgs)
+ ? ((mframeCogMethod(spouseFP))->cmNumArgs)
: byteAt((spouseFP + FoxIFrameFlags) + 1))))) + BytesPerWord;
if (((((usqInt)(longAt(callerFP + FoxMethod)))) < (startOfMemory())
? ((longAt(callerFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0
@@ -14243,7 +14244,7 @@
return null;
}
-static sqInt
+static CogMethod *
cmHomeMethod(CogBlockMethod * self_in_cmHomeMethod)
{
return ((CogMethod *) ((((usqInt)self_in_cmHomeMethod)) - ((self_in_cmHomeMethod->homeOffset))));
@@ -14669,6 +14670,7 @@
CogMethod *homeMethod;
assert(isMachineCodeFrame(GIV(framePointer)));
+ /* begin mframeCogMethod: */
cogMethod = ((CogBlockMethod *) ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodMask));
homeMethod = (((cogMethod->cmType)) == CMMethod
? ((CogMethod *) cogMethod)
@@ -14806,7 +14808,7 @@
methodHeader = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << (shiftForWord())));
assert((isNonImmediate(methodHeader))
&& ((((usqInt)methodHeader)) < (startOfMemory())));
- cogMethod = ((sqInt) (((CogMethod *) methodHeader)));
+ cogMethod = ((CogMethod *) methodHeader);
/* begin convertToMachineCodeFrame:bcpc: */
assert(!(isMachineCodeFrame(GIV(framePointer))));
if ((longAt(GIV(framePointer) + FoxSavedFP)) == 0) {
@@ -14825,7 +14827,7 @@
}
if ((byteAt((GIV(framePointer) + FoxIFrameFlags) + 3)) != 0) {
closure = longAt(GIV(framePointer) + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())
- ? ((((CogBlockMethod *) ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodMask)))->cmNumArgs)
+ ? ((mframeCogMethod(GIV(framePointer)))->cmNumArgs)
: byteAt((GIV(framePointer) + FoxIFrameFlags) + 1)))));
startBcpc = (((longAt((closure + BaseHeaderSize) + (ClosureStartPCIndex << (shiftForWord())))) >> 1)) - 1;
cogMethod2 = findMethodForStartBcpcinHomeMethod(startBcpc, cogMethod);
@@ -14851,6 +14853,7 @@
pc = pc1;
/* begin assertValidMachineCodeFrame: */
assert(isMachineCodeFrame(GIV(framePointer)));
+ /* begin mframeCogMethod: */
cogMethod1 = ((CogBlockMethod *) ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodMask));
homeMethod = (((cogMethod1->cmType)) == CMMethod
? ((CogMethod *) cogMethod1)
@@ -15476,7 +15479,7 @@
methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << (shiftForWord())));
assert((isNonImmediate(methodHeader1))
&& ((((usqInt)methodHeader1)) < (startOfMemory())));
- cogMethod = ((sqInt) (((CogMethod *) methodHeader1)));
+ cogMethod = ((CogMethod *) methodHeader1);
if (((cogMethod->selector)) == GIV(nilObj)) {
setSelectorOfto(cogMethod, selector);
}
@@ -15731,7 +15734,7 @@
assert(isMachineCodeFrame(GIV(framePointer)));
assert(frameIsBlockActivation(GIV(framePointer)));
closure = longAt(GIV(framePointer) + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())
- ? ((((CogBlockMethod *) ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodMask)))->cmNumArgs)
+ ? ((mframeCogMethod(GIV(framePointer)))->cmNumArgs)
: byteAt((GIV(framePointer) + FoxIFrameFlags) + 1)))));
/* Walk the closure's lexical chain to find the context or frame to return from (home). */
@@ -15759,11 +15762,11 @@
theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << (shiftForWord())));
if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) {
unwindContextOrNilOrZero = home;
- goto l3;
+ goto l1;
}
}
unwindContextOrNilOrZero = ctxtOrNilOrZero;
-l3: /* end findUnwindThroughContext: */;
+l1: /* end findUnwindThroughContext: */;
if (unwindContextOrNilOrZero == GIV(nilObj)) {
/* error: can't find home on chain; cannot return */
@@ -15775,10 +15778,10 @@
: (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) {
assert(isContext(frameContext(GIV(framePointer))));
ourContext = longAt(GIV(framePointer) + FoxThisContext);
- goto l1;
+ goto l2;
}
ourContext = marryFrameSP(GIV(framePointer), theSP);
- l1: /* end ensureFrameIsMarried:SP: */;
+ l2: /* end ensureFrameIsMarried:SP: */;
/* begin externalCannotReturn:from: */
/* begin push: */
longAtput((sp = GIV(stackPointer) - BytesPerWord), ourContext);
@@ -15833,8 +15836,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages))))));
- index2 = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage));
- thePage1 = stackPageAtpages(index2, GIV(pages));
+ index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage));
+ thePage1 = stackPageAtpages(index, GIV(pages));
callerContextOrNil = longAt((thePage1->baseAddress));
assert(addressCouldBeObj(callerContextOrNil));
assert((callerContextOrNil == (nilObject()))
@@ -15873,10 +15876,10 @@
: (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) {
assert(isContext(frameContext(GIV(framePointer))));
ourContext = longAt(GIV(framePointer) + FoxThisContext);
- goto l2;
+ goto l3;
}
ourContext = marryFrameSP(GIV(framePointer), theSP1);
- l2: /* end ensureFrameIsMarried:SP: */;
+ l3: /* end ensureFrameIsMarried:SP: */;
/* begin externalCannotReturn:from: */
/* begin push: */
longAtput((sp3 = GIV(stackPointer) - BytesPerWord), ourContext);
@@ -15895,8 +15898,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) frameToReturnTo)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) frameToReturnTo)) <= (((char *) GIV(pages))))));
- index1 = pageIndexForstackBasePlus1bytesPerPage(frameToReturnTo, GIV(stackBasePlus1), GIV(bytesPerPage));
- newPage = stackPageAtpages(index1, GIV(pages));
+ index4 = pageIndexForstackBasePlus1bytesPerPage(frameToReturnTo, GIV(stackBasePlus1), GIV(bytesPerPage));
+ newPage = stackPageAtpages(index4, GIV(pages));
if (newPage != GIV(stackPage)) {
/* begin frameCallerContext: */
theFP2 = (GIV(stackPage)->baseFP);
@@ -15905,8 +15908,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) theFP2)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP2)) <= (((char *) GIV(pages))))));
- index4 = pageIndexForstackBasePlus1bytesPerPage(theFP2, GIV(stackBasePlus1), GIV(bytesPerPage));
- thePage3 = stackPageAtpages(index4, GIV(pages));
+ index3 = pageIndexForstackBasePlus1bytesPerPage(theFP2, GIV(stackBasePlus1), GIV(bytesPerPage));
+ thePage3 = stackPageAtpages(index3, GIV(pages));
callerContextOrNil2 = longAt((thePage3->baseAddress));
assert(addressCouldBeObj(callerContextOrNil2));
assert((callerContextOrNil2 == (nilObject()))
@@ -15923,8 +15926,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages))))));
- index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage));
- thePage = stackPageAtpages(index, GIV(pages));
+ index1 = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage));
+ thePage = stackPageAtpages(index1, GIV(pages));
/* begin frameCallerContext: */
theFP1 = (thePage->baseFP);
assert(isBaseFrame(theFP1));
@@ -15932,8 +15935,8 @@
/* begin stackPageAt: */
/* begin pageIndexFor: */
assert((((((char *) theFP1)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP1)) <= (((char *) GIV(pages))))));
@@ Diff output truncated at 50000 characters. @@
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.972.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.972
Author: eem
Time: 6 December 2014, 12:25:08.632 pm
UUID: 741005af-763d-4a93-918d-014972c404ef
Ancestors: VMMaker.oscog-eem.971
and let's inline that puppy...
=============== Diff against VMMaker.oscog-eem.971 ===============
Item was changed:
----- Method: Cogit>>picAbortDiscriminatorValue (in category 'accessing') -----
picAbortDiscriminatorValue
"This value is used to decide between MNU processing
or interpretation in the closed PIC aborts."
+ <inline: true>
^0!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.971.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.971
Author: eem
Time: 6 December 2014, 12:17:14.424 pm
UUID: ed756b25-4d7e-45a8-8a3b-c06199675128
Ancestors: VMMaker.oscog-eem.970
Fix a devilishly tricky bug with 32-bit Spur and PICs
in the Cogit. In 32-bit Spur only zero is a valid cache
tag, that for Characters, due to SmallIntegers having
both 2r11 and 2r01 as valid tags. The cache check
prolog collapses these down onto 1 by anding with
1 and hence collapses Character's 2r10 to 0.
The cache tag is also tested in the PIC abort routine
to distinguish between an MNU abort and an interpret
abort. A PIC MNU entry jumps to code that first zeros
the cache tag (held in ClassReg) before calling the
abort routine, which tests ClassReg and selects the
relevant abort processing.
Hence in 32-bit Spur if a send site is linked for
Character and later extended to a PIC with an
interpret case, that interpret case will instead invoke
MNU processing. This is rare; first there needs to be a
send to a CHaracter, then a send to something else
which binds to something that must be interpreted.
Ouch.
The fix is simple; if a send site that was linked with a
zero cache tag (which can only happen in 32-bit Spur)
link to an open PIC instead of to a closed PIC, or in the
case of an MNU do not link.
Changes:
Rename compilePICProlog:, mnuCall and interpretCall to
the more accurate compilePICAbort:, picMNUAbort and
picInterpretAbort. Coment compilePICAbort: and
compileAbort. Name the zero value
picAbortDiscriminatorValue to make the code more
comprehensible/browsable.
Assert that the cache tag is not zero in ceCPICMiss:...
Refactor cogMNUPICSelector:methodOperand:numArgs:
to add receiver: parameter for the check for a zero
cache tag.
Eliminate some duplication introduced in early versions
of the ARM abort code. Specifically lose sendMissCall
mnuCall interpretCall & interpretLabel.
Fix image load for Spur32BitMMLECoSimulator.
Fix type regression in cogMethodOf: with
cCoerceSimple:to:; CogClass's version should be
marked <doNotGenerate>.
Fix type warnings in primitiveCopyObject and
printStackCallStackOf:.
=============== Diff against VMMaker.oscog-eem.970 ===============
Item was changed:
----- Method: CoInterpreter>>ceSend:super:to:numArgs: (in category 'trampolines') -----
ceSend: selector super: superNormalBar to: rcvr numArgs: numArgs
"Entry-point for an unlinked send in a CogMethod. Smalltalk stack looks like
receiver
args
head sp -> sender return pc
If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and
may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise
attempt to link the send site as efficiently as possible. All link attempts may fail; e.g.
because we're out of code memory.
Continue execution via either executeMethod or interpretMethodFromMachineCode:
depending on whether the target method is cogged or not."
<api>
| classTag errSelIdx cogMethod |
<inline: false>
<var: #cogMethod type: #'CogMethod *'>
<var: #newCogMethod type: #'CogMethod *'>
"self printExternalHeadFrame"
"self printStringOf: selector"
cogit assertCStackWellAligned.
self assert: (objectMemory addressCouldBeOop: rcvr).
self sendBreakpoint: selector receiver: rcvr.
superNormalBar = 0
ifTrue: [classTag := objectMemory fetchClassTagOf: rcvr]
ifFalse: [classTag := objectMemory classTagForClass: (self superclassOf: (self methodClassOf: (self frameMethodObject: framePointer)))].
argumentCount := numArgs.
(self lookupInMethodCacheSel: selector classTag: classTag)
ifTrue:"check for coggability because method is in the cache"
[self
ifAppropriateCompileToNativeCode: newMethod
selector: selector]
ifFalse:
[(objectMemory isOopForwarded: selector) ifTrue:
[^self
ceSend: (self handleForwardedSelectorFaultFor: selector)
super: superNormalBar
to: rcvr
numArgs: numArgs].
(objectMemory isForwardedClassTag: classTag) ifTrue:
[self assert: superNormalBar = 0.
^self
ceSend: selector
super: superNormalBar
to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc")
numArgs: numArgs].
messageSelector := selector.
(errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue:
[(errSelIdx = SelectorDoesNotUnderstand
and: [(cogMethod := cogit cogMNUPICSelector: messageSelector
+ receiver: rcvr
methodOperand: (self mnuMethodOrNilFor: rcvr)
numArgs: argumentCount) asUnsignedInteger
> cogit minCogMethodAddress]) ifTrue:
[cogit
linkSendAt: (stackPages longAt: stackPointer)
in: (self mframeHomeMethod: framePointer)
to: cogMethod
offset: (superNormalBar = 0
ifTrue: [cogit entryOffset]
ifFalse: [cogit noCheckEntryOffset])
receiver: rcvr].
self handleMNU: errSelIdx
InMachineCodeTo: rcvr
classForMessage: (objectMemory classForClassTag: classTag).
self assert: false "NOTREACHED"]].
"Method found and has a cog method. Attempt to link to it. The receiver's class may be young.
If the Cogit can't store young classes in inline caches we can link to an open PIC instead."
(self maybeMethodHasCogMethod: newMethod) ifTrue:
[cogMethod := self cogMethodOf: newMethod.
cogMethod selector = objectMemory nilObject
ifTrue: [cogit setSelectorOf: cogMethod to: selector]
ifFalse:
["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the
correct selector. If not, try and compile a new method with the correct selector."
cogMethod selector ~= selector ifTrue:
[(cogit cog: newMethod selector: selector) ifNotNil:
[:newCogMethod| cogMethod := newCogMethod]]].
cogMethod selector = selector
ifTrue:
[cogit
linkSendAt: (stackPages longAt: stackPointer)
in: (self mframeHomeMethod: framePointer)
to: cogMethod
offset: (superNormalBar = 0
ifTrue: [cogit entryOffset]
ifFalse: [cogit noCheckEntryOffset])
receiver: rcvr]
ifFalse: "If patchToOpenPICFor:.. returns we're out of code memory"
[cogit
patchToOpenPICFor: selector
numArgs: numArgs
receiver: rcvr].
instructionPointer := self popStack.
self executeNewMethod.
self assert: false "NOTREACHED"].
instructionPointer := self popStack.
^self interpretMethodFromMachineCode
"NOTREACHED"!
Item was changed:
----- Method: CogClass>>cCoerceSimple:to: (in category 'translation support') -----
cCoerceSimple: value to: cTypeString
+ <doNotGenerate>
"Type coercion for translation and simulation.
For simulation answer a suitable surrogate for the struct types"
^cTypeString caseOf:
{ [#'unsigned long'] -> [value].
[#sqInt] -> [value].
[#usqInt] -> [value].
[#sqLong] -> [value].
[#usqLong] -> [value].
[#'AbstractInstruction *'] -> [value].
[#'BytecodeFixup *'] -> [value].
[#'CogMethod *'] -> [value].
[#'char *'] -> [value].
[#'sqInt *'] -> [value].
[#'void *'] -> [value].
[#void] -> [value].
[#'void (*)()'] -> [value].
[#'void (*)(void)'] -> [value].
[#'unsigned long (*)(void)'] -> [value].
[#'void (*)(unsigned long,unsigned long)'] -> [value] }!
Item was changed:
CogClass subclass: #Cogit
+ instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd callerSavedRegMask postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceEnclosingObjectTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB numIRCs indexOfIRC theIRCs'
- instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd callerSavedRegMask postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceEnclosingObjectTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB numIRCs indexOfIRC theIRCs'
classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation FirstSpecialSelector HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumOopsPerIRC NumSendTrampolines NumTrampolines ProcessorClass ShouldNotJIT UnimplementedPrimitive YoungSelectorInPIC'
poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets'
category: 'VMMaker-JIT'!
Cogit class
instanceVariableNames: 'generatorTable primitiveTable'!
!Cogit commentStamp: 'eem 2/13/2013 15:37' prior: 0!
I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try
StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib)
I have concrete subclasses that implement different levels of optimization:
SimpleStackBasedCogit is the simplest code generator.
StackToRegisterMappingCogit is the current production code generator It defers pushing operands
to the stack until necessary and implements a register-based calling convention for low-arity sends.
StackToRegisterMappingCogit is an experimental code generator with support for counting
conditional branches, intended to support adaptive optimization.
coInterpreter <CoInterpreterSimulator>
the VM's interpreter with which I cooperate
methodZoneManager <CogMethodZoneManager>
the manager of the machine code zone
objectRepresentation <CogObjectRepresentation>
the object used to generate object accesses
processor <BochsIA32Alien|?>
the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk
simulatedTrampolines <Dictionary of Integer -> MessageSend>
the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time.
simulatedVariableGetters <Dictionary of Integer -> MessageSend>
the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time.
simulatedVariableSetters <Dictionary of Integer -> MessageSend>
the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time.
printRegisters printInstructions clickConfirm <Boolean>
flags controlling debug printing and code simulation
breakPC <Integer>
machine code pc breakpoint
cFramePointer cStackPointer <Integer>
the variables representing the C stack & frame pointers, which must change on FFI callback and return
selectorOop <sqInt>
the oop of the methodObj being compiled
methodObj <sqInt>
the bytecode method being compiled
initialPC endPC <Integer>
the start and end pcs of the methodObj being compiled
methodOrBlockNumArgs <Integer>
argument count of current method or block being compiled
needsFrame <Boolean>
whether methodObj or block needs a frame to execute
primitiveIndex <Integer>
primitive index of current method being compiled
methodLabel <CogAbstractOpcode>
label for the method header
blockEntryLabel <CogAbstractOpcode>
label for the start of the block dispatch code
stackOverflowCall <CogAbstractOpcode>
label for the call of ceStackOverflow in the method prolog
sendMissCall <CogAbstractOpcode>
label for the call of ceSICMiss in the method prolog
entryOffset <Integer>
offset of method entry code from start (header) of method
entry <CogAbstractOpcode>
label for the first instruction of the method entry code
noCheckEntryOffset <Integer>
offset of the start of a method proper (after the method entry code) from start (header) of method
noCheckEntry <CogAbstractOpcode>
label for the first instruction of start of a method proper
fixups <Array of <AbstractOpcode Label | nil>>
the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode
abstractOpcodes <Array of <AbstractOpcode>>
the code generated when compiling methodObj
byte0 byte1 byte2 byte3 <Integer>
individual bytes of current bytecode being compiled in methodObj
bytecodePointer <Integer>
bytecode pc (same as Smalltalk) of the current bytecode being compiled
opcodeIndex <Integer>
the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist)
numAbstractOpcodes <Integer>
the number of elements in abstractOpcocdes
blockStarts <Array of <BlockStart>>
the starts of blocks in the current method
blockCount
the index into blockStarts as they are being noted, and hence eventuakly teh total number of blocks in the current method
labelCounter <Integer>
a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about
ceStackOverflowTrampoline <Integer>
ceSend0ArgsTrampoline <Integer>
ceSend1ArgsTrampoline <Integer>
ceSend2ArgsTrampoline <Integer>
ceSendNArgsTrampoline <Integer>
ceSendSuper0ArgsTrampoline <Integer>
ceSendSuper1ArgsTrampoline <Integer>
ceSendSuper2ArgsTrampoline <Integer>
ceSendSuperNArgsTrampoline <Integer>
ceSICMissTrampoline <Integer>
ceCPICMissTrampoline <Integer>
ceStoreCheckTrampoline <Integer>
ceReturnToInterpreterTrampoline <Integer>
ceBaseFrameReturnTrampoline <Integer>
ceSendMustBeBooleanTrampoline <Integer>
ceClosureCopyTrampoline <Integer>
the various trampolines (system-call-like jumps from machine code to the run-time).
See Cogit>>generateTrampolines for the mapping from trampoline to run-time
routine and then read the run-time routine for a funcitonal description.
ceEnterCogCodePopReceiverReg <Integer>
the enilopmart (jump from run-time to machine-code)
methodZoneBase <Integer>
!
Cogit class
instanceVariableNames: 'generatorTable primitiveTable'!
Item was changed:
----- Method: Cogit class>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCCodeGenerator
#( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation'
'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass'
'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses'
'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters'
'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do:
[:simulationVariableNotNeededForRealVM|
aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM].
NewspeakVM ifFalse:
[#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines'
'ceImplicitReceiverTrampoline' 'ceEnclosingObjectTrampoline' 'cmDynSuperEntryOffset'
'numIRCs' 'indexOfIRC' 'theIRCs') do:
[:variableNotNeededInNormalVM|
aCCodeGenerator removeVariable: variableNotNeededInNormalVM]].
aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time"
aCCodeGenerator
addHeaderFile:'<stddef.h>'; "for e.g. offsetof"
addHeaderFile:'"sqCogStackAlignment.h"';
addHeaderFile:'"dispdbg.h"'; "must preceed cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up"
addHeaderFile:'"cogmethod.h"';
addHeaderFile:'#if COGMTVM';
addHeaderFile:'"cointerpmt.h"';
addHeaderFile:'#else';
addHeaderFile:'"cointerp.h"';
addHeaderFile:'#endif';
addHeaderFile:'"cogit.h"'.
aCCodeGenerator
var: #ceGetSP
declareC: 'unsigned long (*ceGetSP)(void)';
var: #ceCaptureCStackPointers
declareC: 'void (*ceCaptureCStackPointers)(void)';
var: #ceEnterCogCodePopReceiverReg
declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)';
var: #realCEEnterCogCodePopReceiverReg
declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)';
var: #ceCallCogCodePopReceiverReg
declareC: 'void (*ceCallCogCodePopReceiverReg)(void)';
var: #realCECallCogCodePopReceiverReg
declareC: 'void (*realCECallCogCodePopReceiverReg)(void)';
var: #ceCallCogCodePopReceiverAndClassRegs
declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)';
var: #realCECallCogCodePopReceiverAndClassRegs
declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)';
var: #ceFlushICache
declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)';
var: #ceCheckFeaturesFunction
declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)';
var: #ceTryLockVMOwner
declareC: 'unsigned long (*ceTryLockVMOwner)(void)';
var: #ceUnlockVMOwner
declareC: 'void (*ceUnlockVMOwner)(void)';
var: #postCompileHook
declareC: 'void (*postCompileHook)(CogMethod *, void *)';
var: #openPICList declareC: 'CogMethod *openPICList = 0';
var: #maxMethodBefore type: #'CogBlockMethod *'.
aCCodeGenerator
declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel"
var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel';
var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel';
var: #primInvokeLabel type: #'AbstractInstruction *'.
self declareC: #(abstractOpcodes stackCheckLabel
blockEntryLabel blockEntryNoContextSwitch
+ stackOverflowCall sendMiss entry noCheckEntry dynSuperEntry
+ picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1)
- stackOverflowCall sendMiss sendMissCall entry noCheckEntry dynSuperEntry
- mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1)
as: #'AbstractInstruction *'
in: aCCodeGenerator.
aCCodeGenerator
declareVar: #annotations type: #'InstructionAnnotation *';
declareVar: #blockStarts type: #'BlockStart *';
declareVar: #fixups type: #'BytecodeFixup *'.
aCCodeGenerator
var: #sendTrampolines
declareC: 'sqInt sendTrampolines[NumSendTrampolines]';
var: #superSendTrampolines
declareC: 'sqInt superSendTrampolines[NumSendTrampolines]';
var: #dynamicSuperSendTrampolines
declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]';
var: #trampolineAddresses
declareC: 'static char *trampolineAddresses[NumTrampolines*2]';
var: #objectReferencesInRuntime
declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]';
var: #labelCounter
type: #int;
var: #traceFlags
declareC: 'int traceFlags = 8 /* prim trace log on by default */';
var: #cStackAlignment
declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'.
aCCodeGenerator
declareVar: #CFramePointer type: #'void *';
declareVar: #CStackPointer type: #'void *';
declareVar: #minValidCallAddress type: #'unsigned long';
declareVar: #debugPrimCallStackOffset type: #'unsigned long'.
aCCodeGenerator vmClass generatorTable ifNotNil:
[:bytecodeGenTable|
aCCodeGenerator
var: #generatorTable
declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']',
(self tableInitializerFor: bytecodeGenTable
in: aCCodeGenerator);
var: #primitiveGeneratorTable
declareC: 'static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]',
(self tableInitializerFor: aCCodeGenerator vmClass primitiveTable
in: aCCodeGenerator)].
"In C the abstract opcode names clash with the Smalltak generator syntactic sugar.
Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic
sugar to avoid the clash."
(self organization listAtCategoryNamed: #'abstract instructions') do:
[:s|
aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)].
aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'!
Item was changed:
----- Method: Cogit>>cCoerce:to: (in category 'simulation only') -----
cCoerce: value to: cTypeString
+ "Type coercion. For translation a cast will be emmitted. When running in Smalltalk
+ answer a suitable wrapper for correct indexing."
- "Type coercion for translation only; just return the value when running in Smalltalk."
<doNotGenerate>
+ ^value
+ ifNil: [value]
+ ifNotNil: [value coerceTo: cTypeString sim: objectMemory]!
- ^value == nil
- ifTrue: [value]
- ifFalse: [value coerceTo: cTypeString sim: objectMemory]!
Item was changed:
----- Method: Cogit>>ceCPICMiss:receiver: (in category 'in-line cacheing') -----
ceCPICMiss: cPIC receiver: receiver
"Code entry closed PIC miss. A send has fallen
through a closed (finite) polymorphic inline cache.
Either extend it or patch the send site to an open PIC.
The stack looks like:
receiver
args
sp=> sender return address"
<var: #cPIC type: #'CogMethod *'>
<api>
| outerReturn newTargetMethodOrNil errorSelectorOrNil cacheTag result |
self cCode: ''
inSmalltalk:
[cPIC isInteger ifTrue:
[^self ceCPICMiss: (self cogMethodSurrogateAt: cPIC) receiver: receiver]].
(objectMemory isOopForwarded: receiver) ifTrue:
[^coInterpreter ceSendFromInLineCacheMiss: cPIC].
outerReturn := coInterpreter stackTop.
+ self deny: (backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue.
cPIC cPICNumCases < numPICCases
ifTrue:
[self lookup: cPIC selector
for: receiver
methodAndErrorSelectorInto:
[:method :errsel|
newTargetMethodOrNil := method.
errorSelectorOrNil := errsel]]
ifFalse: [newTargetMethodOrNil := errorSelectorOrNil := nil].
"We assume lookupAndCog:for: will *not* reclaim the method zone"
self assert: outerReturn = coInterpreter stackTop.
cacheTag := objectRepresentation inlineCacheTagForInstance: receiver.
(cPIC cPICNumCases >= numPICCases
or: [(errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand])
or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag)
or: [newTargetMethodOrNil isNil
or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue:
[result := self patchToOpenPICFor: cPIC selector
numArgs: cPIC cmNumArgs
receiver: receiver.
self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory"
^coInterpreter ceSendFromInLineCacheMiss: cPIC].
"Now extend the PIC with the new case."
self cogExtendPIC: cPIC
CaseNMethod: newTargetMethodOrNil
tag: cacheTag
isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand.
"Jump back into the pic at its entry in case this is an MNU."
coInterpreter
executeCogMethod: cPIC
fromLinkedSendWithReceiver: receiver
andCacheTag: (backEnd inlineCacheTagAt: outerReturn).
"NOTREACHED"
^nil!
Item was changed:
----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') -----
ceSICMiss: receiver
"An in-line cache check in a method has failed. The failing entry check has jumped
to the ceMethodAbort abort call at the start of the method which has called this routine.
If possible allocate a closed PIC for the current and existing classes.
The stack looks like:
receiver
args
sender return address
sp=> ceMethodAbort call return address
So we can find the method that did the failing entry check at
ceMethodAbort call return address - missOffset
and we can find the send site from the outer return address."
<api>
| pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result |
<var: #pic type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
"Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method."
innerReturn := coInterpreter popStack.
targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'.
(objectMemory isOopForwarded: receiver) ifTrue:
[^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
outerReturn := coInterpreter stackTop.
self assert: (outerReturn between: methodZoneBase and: methodZone freeStart).
entryPoint := backEnd callTargetFromReturnAddress: outerReturn.
self assert: targetMethod selector ~= objectMemory nilObject.
self cppIf: NewspeakVM ifTrue:
[self assert: (targetMethod asInteger + cmEntryOffset = entryPoint
or: [targetMethod asInteger + cmDynSuperEntryOffset = entryPoint]).
"Avoid the effort of implementing PICs for the relatively low dynamic frequency
dynamic super send and simply rebind the send site."
targetMethod asInteger + cmDynSuperEntryOffset = entryPoint ifTrue:
[^coInterpreter
ceDynamicSuperSend: targetMethod selector
to: receiver
numArgs: targetMethod cmNumArgs]].
self assert: targetMethod asInteger + cmEntryOffset = entryPoint.
self lookup: targetMethod selector
for: receiver
methodAndErrorSelectorInto:
[:method :errsel|
newTargetMethodOrNil := method.
errorSelectorOrNil := errsel].
"We assume lookupAndCog:for: will *not* reclaim the method zone"
self assert: outerReturn = coInterpreter stackTop.
cacheTag := objectRepresentation inlineCacheTagForInstance: receiver.
((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand])
or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag)
+ or: [(backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue
or: [newTargetMethodOrNil isNil
+ or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue:
- or: [objectMemory isYoung: newTargetMethodOrNil]]]) ifTrue:
[result := self patchToOpenPICFor: targetMethod selector
numArgs: targetMethod cmNumArgs
receiver: receiver.
self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory"
^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
"See if an Open PIC is already available."
pic := methodZone openPICWithSelector: targetMethod selector.
pic isNil ifTrue:
["otherwise attempt to create a closed PIC for the two cases."
pic := self cogPICSelector: targetMethod selector
numArgs: targetMethod cmNumArgs
Case0Method: targetMethod
Case1Method: newTargetMethodOrNil
tag: cacheTag
isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand.
(pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue:
["For some reason the PIC couldn't be generated, most likely a lack of code memory.
Continue as if this is an unlinked send."
pic asInteger = InsufficientCodeSpace ifTrue:
[coInterpreter callForCogCompiledCodeCompaction].
^coInterpreter ceSendFromInLineCacheMiss: targetMethod].
processor flushICacheFrom: pic asInteger to: pic asInteger + closedPICSize].
"Relink the send site to the pic. If to an open PIC then reset the cache tag to the selector,
for the benefit of the cacheTag assert check in checkIfValidObjectRef:pc:cogMethod:."
extent := pic cmType = CMOpenPIC
ifTrue:
[backEnd
rewriteInlineCacheAt: outerReturn
tag: targetMethod selector
target: pic asInteger + cmEntryOffset]
ifFalse:
[backEnd
rewriteCallAt: outerReturn
target: pic asInteger + cmEntryOffset].
processor flushICacheFrom: outerReturn - 1 - extent to: outerReturn - 1.
"Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)"
coInterpreter
executeCogMethod: pic
fromLinkedSendWithReceiver: receiver
andCacheTag: (backEnd inlineCacheTagAt: outerReturn).
"NOTREACHED"
^nil!
Item was removed:
- ----- Method: Cogit>>cogMNUPICSelector:methodOperand:numArgs: (in category 'in-line cacheing') -----
- cogMNUPICSelector: selector methodOperand: methodOperand numArgs: numArgs
- <api>
- "Attempt to create a one-case PIC for an MNU.
- The tag for the case is at the send site and so doesn't need to be generated."
- <returnTypeC: #'CogMethod *'>
- | startAddress headerSize size end |
- (objectMemory isYoung: selector) ifTrue:
- [^0].
- coInterpreter
- compilationBreak: selector
- point: (objectMemory numBytesOf: selector)
- isMNUCase: true.
- self assert: endCPICCase0 notNil.
- startAddress := methodZone allocate: closedPICSize.
- startAddress = 0 ifTrue:
- [coInterpreter callForCogCompiledCodeCompaction.
- ^0].
- methodLabel
- address: startAddress;
- dependent: nil.
- "stack allocate the various collections so that they
- are effectively garbage collected on return."
- self allocateOpcodes: numPICCases * 7 bytecodes: 0.
- self compileMNUCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *')
- methodOperand: methodOperand
- numArgs: numArgs.
- self computeMaximumSizes.
- headerSize := self sizeof: CogMethod.
- size := self generateInstructionsAt: startAddress + headerSize.
- end := self outputInstructionsAt: startAddress + headerSize.
- "The missOffset is the same as the interpretOffset."
- self assert: missOffset = (interpretCall address + interpretCall machineCodeSize - startAddress).
- self assert: startAddress + cmEntryOffset = entry address.
- ^self
- fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *')
- size: closedPICSize
- numArgs: numArgs
- numCases: 1
- hasMNUCase: true
- selector: selector !
Item was added:
+ ----- Method: Cogit>>cogMNUPICSelector:receiver:methodOperand:numArgs: (in category 'in-line cacheing') -----
+ cogMNUPICSelector: selector receiver: rcvr methodOperand: methodOperand numArgs: numArgs
+ <api>
+ "Attempt to create a one-case PIC for an MNU.
+ The tag for the case is at the send site and so doesn't need to be generated."
+ <returnTypeC: #'CogMethod *'>
+ | startAddress headerSize size end |
+ ((objectMemory isYoung: selector)
+ or: [(objectRepresentation inlineCacheTagForInstance: rcvr) = self picAbortDiscriminatorValue]) ifTrue:
+ [^0].
+ coInterpreter
+ compilationBreak: selector
+ point: (objectMemory numBytesOf: selector)
+ isMNUCase: true.
+ self assert: endCPICCase0 notNil.
+ startAddress := methodZone allocate: closedPICSize.
+ startAddress = 0 ifTrue:
+ [coInterpreter callForCogCompiledCodeCompaction.
+ ^0].
+ methodLabel
+ address: startAddress;
+ dependent: nil.
+ "stack allocate the various collections so that they
+ are effectively garbage collected on return."
+ self allocateOpcodes: numPICCases * 7 bytecodes: 0.
+ self compileMNUCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *')
+ methodOperand: methodOperand
+ numArgs: numArgs.
+ self computeMaximumSizes.
+ headerSize := self sizeof: CogMethod.
+ size := self generateInstructionsAt: startAddress + headerSize.
+ end := self outputInstructionsAt: startAddress + headerSize.
+ "The missOffset is the same as the interpretOffset."
+ self assert: missOffset = (picInterpretAbort address + picInterpretAbort machineCodeSize - startAddress).
+ self assert: startAddress + cmEntryOffset = entry address.
+ ^self
+ fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *')
+ size: closedPICSize
+ numArgs: numArgs
+ numCases: 1
+ hasMNUCase: true
+ selector: selector !
Item was changed:
----- Method: Cogit>>cogPICSelector:numArgs:Case0Method:Case1Method:tag:isMNUCase: (in category 'in-line cacheing') -----
cogPICSelector: selector numArgs: numArgs Case0Method: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase
"Attempt to create a two-case PIC for case0CogMethod and case1Method,case1Tag.
The tag for case0CogMethod is at the send site and so doesn't need to be generated.
case1Method may be any of
- a Cog method; link to its unchecked entry-point
- a CompiledMethod; link to ceInterpretMethodFromPIC:
- a CompiledMethod; link to ceMNUFromPICMNUMethod:receiver:"
<var: #case0CogMethod type: #'CogMethod *'>
<returnTypeC: #'CogMethod *'>
| startAddress headerSize size end |
(objectMemory isYoung: selector) ifTrue:
[^self cCoerceSimple: YoungSelectorInPIC to: #'CogMethod *'].
coInterpreter
compilationBreak: selector
point: (objectMemory numBytesOf: selector)
isMNUCase: isMNUCase.
startAddress := methodZone allocate: closedPICSize.
startAddress = 0 ifTrue:
[^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *'].
methodLabel
address: startAddress;
dependent: nil.
"stack allocate the various collections so that they
are effectively garbage collected on return."
self allocateOpcodes: numPICCases * 7 bytecodes: 0.
self compileCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *')
Case0: case0CogMethod
Case1Method: case1MethodOrNil
tag: case1Tag
isMNUCase: isMNUCase
numArgs: numArgs.
self computeMaximumSizes.
headerSize := self sizeof: CogMethod.
size := self generateInstructionsAt: startAddress + headerSize.
end := self outputInstructionsAt: startAddress + headerSize.
"The missOffset is th same as the interpretOffset."
+ self assert: missOffset = (picInterpretAbort address + picInterpretAbort machineCodeSize - startAddress).
- self assert: missOffset = (interpretCall address + interpretCall machineCodeSize - startAddress).
self assert: startAddress + cmEntryOffset = entry address.
self assert: endCPICCase0 address = (startAddress + firstCPICCaseOffset).
self assert: endCPICCase1 address = (startAddress + firstCPICCaseOffset + cPICCaseSize).
^self
fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *')
size: closedPICSize
numArgs: numArgs
numCases: 2
hasMNUCase: isMNUCase
selector: selector !
Item was changed:
----- Method: Cogit>>compileAbort (in category 'compile abstract instructions') -----
compileAbort
"The start of a CogMethod has a call to a run-time abort routine that either
handles an in-line cache failure or a stack overflow. The routine selects the
path depending on ReceiverResultReg; if zero it takes the stack overflow
path; if nonzero the in-line cache miss path. Neither of these paths returns.
The abort routine must be called; In the callee the method is located by
+ adding the relevant offset to the return address of the call.
+
+ N.B. This code must match that in compilePICAbort: so that the offset of the
+ return address of the call is the same in methods and closed PICs."
+ <returnTypeC: #'AbstractInstruction *'>
- adding the relevant offset to the return address of the call."
stackOverflowCall := self MoveCq: 0 R: ReceiverResultReg.
backEnd hasLinkRegister
ifTrue:
+ ["If there is a link register it must be saved (pushed onto the stack) before it
+ is smashed by the abort call, and hence needs to be manually handled here"
+ sendMiss := self PushR: LinkReg.
+ ^self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)]
- ["if we have a link register we will assume that it does not get automatically pushed onto the stack
- and thus needs to be manually handled here"
- sendMiss := self PushR: LinkReg.
- sendMissCall := self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)]
ifFalse:
+ [^sendMiss := self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)]!
- [sendMiss :=
- sendMissCall := self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)]!
Item was changed:
----- Method: Cogit>>compileCPIC:Case0:Case1Method:tag:isMNUCase:numArgs: (in category 'in-line cacheing') -----
compileCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs
"Compile the code for a two-case PIC for case0CogMethod and case1Method,case1Tag.
The tag for case0CogMethod is at the send site and so doesn't need to be generated.
case1Method may be any of
- a Cog method; jump to its unchecked entry-point
- a CompiledMethod; jump to the ceInterpretFromPIC trampoline
- nil; call ceMNUFromPIC"
<var: #cPIC type: #'CogMethod *'>
| operand targetEntry jumpNext |
<var: #case0CogMethod type: #'CogMethod *'>
<var: #targetEntry type: #'void *'>
<var: #jumpNext type: #'AbstractInstruction *'>
self assert: case1Method notNil.
+ self compilePICAbort: numArgs.
- self compilePICProlog: numArgs.
self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not.
(isMNUCase not
and: [coInterpreter methodHasCogMethod: case1Method])
ifTrue:
[operand := 0.
targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer]
ifFalse:
[self assert: (case1Method isNil or: [(objectMemory isYoungObject: case1Method) not]).
operand := case1Method.
+ targetEntry := case1Method isNil ifTrue: [picMNUAbort] ifFalse: [picInterpretAbort]].
- targetEntry := case1Method isNil ifTrue: [mnuCall] ifFalse: [interpretLabel]].
jumpNext := self compileCPICEntry.
self MoveCw: 0 R: SendNumArgsReg.
self JumpLong: case0CogMethod asInteger + cmNoCheckEntryOffset.
endCPICCase0 := self CmpCw: case1Tag R: TempReg.
jumpNext jmpTarget: endCPICCase0.
self MoveCw: operand R: SendNumArgsReg.
+ self JumpLongZero: (isMNUCase ifTrue: [picMNUAbort] ifFalse: [targetEntry]) asInteger.
- self JumpLongZero: (isMNUCase ifTrue: [mnuCall] ifFalse: [targetEntry]) asInteger.
endCPICCase1 := self MoveCw: cPIC asInteger R: ClassReg.
self JumpLong: (self cPICMissTrampolineFor: numArgs).
^0
!
Item was changed:
----- Method: Cogit>>compileClosedPICPrototype (in category 'in-line cacheing') -----
compileClosedPICPrototype
"Compile the abstract instructions for a full closed PIC used to initialize closedPICSize.
The loads into SendNumArgsReg are those for optional method objects which may be
used in MNU cases."
| numArgs jumpNext |
<var: #jumpNext type: #'AbstractInstruction *'>
numArgs := 0.
+ self compilePICAbort: numArgs.
- self compilePICProlog: numArgs.
jumpNext := self compileCPICEntry.
self MoveCw: 16r5EAF00D R: SendNumArgsReg.
self JumpLong: 16r5EEDCA5E.
jumpNext jmpTarget: (endCPICCase0 := self Label).
1 to: numPICCases - 1 do:
[:h|
self CmpCw: 16rBABE1F15+h R: TempReg.
self MoveCw: 16rBADA550 + h R: SendNumArgsReg.
self JumpLongZero: 16rBEDCA5E0.
h = 1 ifTrue:
[endCPICCase1 := self Label]].
self MoveCw: 16rAB5CE55 R: ClassReg.
self JumpLong: (self cPICMissTrampolineFor: numArgs).
^0!
Item was changed:
----- Method: Cogit>>compileMNUCPIC:methodOperand:numArgs: (in category 'in-line cacheing') -----
compileMNUCPIC: cPIC methodOperand: methodOperand numArgs: numArgs
"Compile the code for a one-case MNU PIC that calls ceMNUFromPIC for case0Tag
The tag for case0 is at the send site and so doesn't need to be generated."
<var: #cPIC type: #'CogMethod *'>
| jumpNext |
<var: #jumpNext type: #'AbstractInstruction *'>
+ self compilePICAbort: numArgs.
- self compilePICProlog: numArgs.
jumpNext := self compileCPICEntry.
self MoveCw: methodOperand R: SendNumArgsReg.
+ self JumpLong: picMNUAbort asInteger.
- self JumpLong: mnuCall asInteger.
jumpNext jmpTarget: (self MoveCw: cPIC asInteger R: ClassReg).
self JumpLong: (self cPICMissTrampolineFor: numArgs).
^0
!
Item was added:
+ ----- Method: Cogit>>compilePICAbort: (in category 'in-line cacheing') -----
+ compilePICAbort: numArgs
+ "The start of a PIC has a call to a run-time abort routine that either handles a dispatch to an
+ interpreted method or a dispatch of an MNU case. The routine selects the path by testing
+ ClassReg, which holds the inline cache tag; if equal to the picAbortDiscriminatorValue (zero)
+ it takes the MNU path; if nonzero the dispatch to interpreter path. Neither of these paths
+ returns. The abort routine must be called; In the callee the PIC is located by adding the
+ relevant offset to the return address of the call.
+
+ N.B. This code must match that in compileAbort so that the offset of the return address of
+ the call is the same in methods and closed PICs."
+ picMNUAbort := self MoveCq: self picAbortDiscriminatorValue R: ClassReg.
+ backEnd hasLinkRegister
+ ifTrue:
+ ["If there is a link register it must be saved (pushed onto the stack) before it
+ is smashed by the abort call, and hence needs to be manually handled here".
+ picInterpretAbort := self PushR: LinkReg.
+ self Call: (self picAbortTrampolineFor: numArgs)]
+ ifFalse:
+ [picInterpretAbort := self Call: (self picAbortTrampolineFor: numArgs)].
+ ^0!
Item was removed:
- ----- Method: Cogit>>compilePICProlog: (in category 'in-line cacheing') -----
- compilePICProlog: numArgs
- "The start of a PIC has a call to a run-time abort routine that either handles
- a dispatch to an interpreted method or a dispatch of an MNU case. The
- routine selects the path depending on ClassReg; if zero it takes the MNU
- path; if nonzero the dispatch to interpreter path. Neither of these paths
- returns. The abort routine must be called; In the callee the PIC is located
- by adding the relevant offset to the return address of the call."
- mnuCall := self MoveCq: 0 R: ClassReg.
- backEnd hasLinkRegister
- ifTrue:
- ["if we have a link register we will assume that it does not get automatically pushed onto the stack
- and thus needs to be manually handled here"
- interpretLabel := self PushR: LinkReg.
- interpretCall := self Call: (self picAbortTrampolineFor: numArgs)]
- ifFalse:
- [interpretLabel :=
- interpretCall := self Call: (self picAbortTrampolineFor: numArgs)].
- ^0!
Item was changed:
----- Method: Cogit>>computeEntryOffsets (in category 'initialization') -----
computeEntryOffsets
"Generate the entry code for a method to determine cmEntryOffset and cmNoCheckEntryOffset. We
need cmNoCheckEntryOffset up front to be able to generate the map starting from cmNoCheckEntryOffset"
"stack allocate the various collections so that they
are effectively garbage collected on return."
+ | sendMissCall |
+ <var: 'sendMissCall' type: #'AbstractInstruction *'>
self allocateOpcodes: 20 bytecodes: 0.
methodOrBlockNumArgs := 0.
+ sendMissCall := self compileAbort.
- self compileAbort.
self compileEntry.
self computeMaximumSizes.
self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod).
cmEntryOffset := entry address - methodZoneBase.
cmNoCheckEntryOffset := noCheckEntry address - methodZoneBase.
self cppIf: NewspeakVM
ifTrue: [cmDynSuperEntryOffset := dynSuperEntry address - methodZoneBase].
missOffset := sendMissCall address + sendMissCall machineCodeSize - methodZoneBase.
entryPointMask := objectMemory wordSize - 1.
[self cppIf: NewspeakVM
ifTrue: [(cmEntryOffset bitAnd: entryPointMask) = (cmNoCheckEntryOffset bitAnd: entryPointMask)
or: [(cmEntryOffset bitAnd: entryPointMask) = (cmDynSuperEntryOffset bitAnd: entryPointMask)
or: [(cmNoCheckEntryOffset bitAnd: entryPointMask) = (cmDynSuperEntryOffset bitAnd: entryPointMask)]]]
ifFalse: [(cmEntryOffset bitAnd: entryPointMask) = (cmNoCheckEntryOffset bitAnd: entryPointMask)]] whileTrue:
[entryPointMask := entryPointMask + entryPointMask + 1].
entryPointMask >= (methodZone roundUpLength: 1) ifTrue:
[self error: 'cannot differentiate checked and unchecked entry-points with current cog method alignment'].
checkedEntryAlignment := cmEntryOffset bitAnd: entryPointMask.
uncheckedEntryAlignment := cmNoCheckEntryOffset bitAnd: entryPointMask.
self assert: checkedEntryAlignment ~= uncheckedEntryAlignment.
self cppIf: NewspeakVM
ifTrue:
[cmDynSuperEntryOffset := dynSuperEntry address - methodZoneBase.
dynSuperEntryAlignment := cmDynSuperEntryOffset bitAnd: entryPointMask.
self assert: dynSuperEntryAlignment ~= checkedEntryAlignment.
self assert: dynSuperEntryAlignment ~= uncheckedEntryAlignment]!
Item was changed:
----- Method: Cogit>>genInnerPICAbortTrampoline: (in category 'initialization') -----
genInnerPICAbortTrampoline: name
"Generate the abort for a PIC. This abort performs either a call of
+ ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged target
+ or a call of ceMNUFromPICMNUMethod:receiver: to handle an MNU dispatch
+ in a closed PIC. It distinguishes the two by testing ClassReg. If the register
+ is zero then this is an MNU.
+
+ This poses a problem in 32-bit Spur, where zero is the cache tag for immediate
+ characters (tag pattern 2r10) because SmallIntegers have tag patterns 2r11
+ and 2r01, so anding with 1 reduces these to 0 & 1. We solve the ambiguity by
+ patching send sites with a 0 cache tag to open PICs instead of closed PICs."
- ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged
- target or a call of ceMNUFromPICMNUMethod:receiver: to handle an
- MNU dispatch in a closed PIC. It distinguishes the two by testing
- ClassReg. If the register is zero then this is an MNU."
<var: #name type: #'char *'>
| jumpMNUCase |
<var: #jumpMNUCase type: #'AbstractInstruction *'>
+ self CmpCq: self picAbortDiscriminatorValue R: ClassReg.
- self CmpCq: 0 R: ClassReg.
jumpMNUCase := self JumpZero: 0.
self compileTrampolineFor: #ceInterpretMethodFromPIC:receiver:
numArgs: 2
arg: SendNumArgsReg
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
pushLinkReg: true
resultReg: nil.
jumpMNUCase jmpTarget: self Label.
^self genTrampolineFor: #ceMNUFromPICMNUMethod:receiver:
called: name
numArgs: 2
arg: SendNumArgsReg
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
pushLinkReg: true
resultReg: nil
appendOpcodes: true!
Item was added:
+ ----- Method: Cogit>>picAbortDiscriminatorValue (in category 'accessing') -----
+ picAbortDiscriminatorValue
+ "This value is used to decide between MNU processing
+ or interpretation in the closed PIC aborts."
+ ^0!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveCopyObject (in category 'object access primitives') -----
primitiveCopyObject
"Primitive. Copy the state of the receiver from the argument.
Fail if receiver and argument are of a different class.
Fail if the receiver or argument are contexts (because of context-to-stack mapping).
Fail if receiver and argument have different lengths (for indexable objects).
Fail if the objects are not in a fit state to be copied (e.g. married contexts and Cogged methods)"
| rcvr arg length |
self methodArgumentCount >= 1 ifFalse:
[^self primitiveFailFor: PrimErrBadNumArgs].
arg := self stackTop.
rcvr := self stackValue: 1.
(objectMemory isImmediate: rcvr) ifTrue:
[^self primitiveFailFor: PrimErrBadReceiver].
(objectMemory isImmediate: arg) ifTrue:
[^self primitiveFailFor: PrimErrBadArgument].
(objectMemory fetchClassTagOfNonImm: rcvr)
~= (objectMemory fetchClassTagOfNonImm: arg) ifTrue:
[^self primitiveFailFor: PrimErrBadArgument].
(objectMemory isWordsOrBytesNonImm: rcvr)
ifTrue:
[length := objectMemory numBytesOf: rcvr.
((objectMemory formatOf: rcvr) = (objectMemory formatOf: arg)
and: [length = (objectMemory numBytesOf: arg)]) ifFalse:
[^self primitiveFailFor: PrimErrBadArgument].
+ self mem: (rcvr + objectMemory baseHeaderSize) asVoidPointer
+ cp: (arg + objectMemory baseHeaderSize) asVoidPointer
- self mem: rcvr + objectMemory baseHeaderSize
- cp: arg + objectMemory baseHeaderSize
y: length]
ifFalse:
[(self isAppropriateForCopyObject: rcvr) ifFalse:
[^self primitiveFailFor: PrimErrBadReceiver].
length := objectMemory numSlotsOf: rcvr.
((self isAppropriateForCopyObject: arg)
and: [length = (objectMemory lengthOf: arg)]) ifFalse:
[^self primitiveFailFor: PrimErrBadArgument].
0 to: length - 1 do:
[:i|
objectMemory
storePointer: i
ofObject: rcvr
withValue: (objectMemory fetchPointer: i ofObject: arg)]].
"Note: The above could be faster for young receivers but I don't think it'll matter"
self pop: self methodArgumentCount "pop arg; answer receiver"!
Item was changed:
----- Method: SimpleStackBasedCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') -----
compileOpenPIC: selector numArgs: numArgs
"Compile the code for an open PIC. Perform a probe of the first-level method
lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails."
| jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod |
<var: #jumpSelectorMiss type: #'AbstractInstruction *'>
<var: #jumpClassMiss type: #'AbstractInstruction *'>
<var: #itsAHit type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
+ self compilePICAbort: numArgs.
- self compilePICProlog: numArgs.
self cppIf: NewspeakVM ifTrue:
[self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod"
dynSuperEntry := self Nop].
entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg.
"Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:"
self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:"
self MoveR: ClassReg R: SendNumArgsReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg.
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
jumpClassMiss := self JumpNonZero: 0.
itsAHit := self Label.
"Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg"
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << objectMemory shiftForWord)
r: ClassReg
R: SendNumArgsReg.
"If the method is compiled jump to its unchecked entry-point, otherwise interpret it."
objectRepresentation
genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg.
self MoveR: TempReg R: ClassReg.
jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg.
+ jumpBCMethod jmpTarget: picInterpretAbort.
- jumpBCMethod jmpTarget: interpretLabel.
self AddCq: cmNoCheckEntryOffset R: ClassReg.
self JumpR: ClassReg.
"First probe missed. Do second of three probes. Shift hash right one and retry."
jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label).
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg.
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Second probe missed. Do last probe. Shift hash right two and retry."
jumpSelectorMiss jmpTarget: self Label.
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
objectMemory shiftForWord > 2 ifTrue:
[self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg].
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup."
jumpSelectorMiss jmpTarget: self Label.
backEnd genSaveStackPointers.
backEnd genLoadCStackPointers.
methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)).
self
compileCallFor: #ceSendFromInLineCacheMiss:
numArgs: 1
arg: SendNumArgsReg
arg: nil
arg: nil
arg: nil
resultReg: nil
saveRegs: false
"Note that this call does not return."!
Item was added:
+ ----- Method: Spur32BitMMLECoSimulator>>nextLongFrom: (in category 'initialization') -----
+ nextLongFrom: aStream
+ "Read a 32- or 64-bit quantity from the given (binary) stream."
+
+ ^aStream nextLittleEndianNumber: self wordSize!
Item was added:
+ ----- Method: Spur32BitMMLECoSimulator>>nextWord32From: (in category 'initialization') -----
+ nextWord32From: aStream
+ "Read a 32-bit quantity from the given (binary) stream."
+
+ ^aStream nextLittleEndianNumber: 4!
Item was changed:
----- Method: SpurMemoryManager>>cCoerce:to: (in category 'memory access') -----
cCoerce: value to: cTypeString
"Type coercion. For translation a cast will be emmitted. When running in Smalltalk
answer a suitable wrapper for correct indexing."
+ <doNotGenerate>
-
^value
ifNil: [value]
ifNotNil: [value coerceTo: cTypeString sim: self]!
Item was changed:
----- Method: StackInterpreter>>printStackCallStackOf: (in category 'debug printing') -----
printStackCallStackOf: frameOrContext
<api>
| theFP context |
<var: #theFP type: #'char *'>
(objectMemory addressCouldBeObj: frameOrContext) ifTrue:
[((objectMemory isContext: frameOrContext)
and: [self checkIsStillMarriedContext: frameOrContext currentFP: nil]) ifTrue:
+ [^self printStackCallStackOf: (self frameOfMarriedContext: frameOrContext) asInteger].
- [^self printStackCallStackOf: (self frameOfMarriedContext: frameOrContext)].
^nil].
theFP := frameOrContext asVoidPointer.
[context := self shortReversePrintFrameAndCallers: theFP.
((self isMarriedOrWidowedContext: context)
and:
[theFP := self frameOfMarriedContext: context.
self checkIsStillMarriedContext: context currentFP: theFP]) ifFalse:
[^nil]] repeat!
Item was changed:
----- Method: StackToRegisterMappingCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') -----
compileOpenPIC: selector numArgs: numArgs
"Compile the code for an open PIC. Perform a probe of the first-level method
lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails.
Override to push the register args when calling ceSendFromInLineCacheMiss:"
| jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod |
<var: #jumpSelectorMiss type: #'AbstractInstruction *'>
<var: #jumpClassMiss type: #'AbstractInstruction *'>
<var: #itsAHit type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
+ self compilePICAbort: numArgs.
- self compilePICProlog: numArgs.
self cppIf: NewspeakVM ifTrue:
[self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod"
dynSuperEntry := self Nop].
entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg.
"Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:"
self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:"
self MoveR: ClassReg R: SendNumArgsReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg.
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
jumpClassMiss := self JumpNonZero: 0.
itsAHit := self Label.
"Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg"
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << objectMemory shiftForWord)
r: ClassReg
R: SendNumArgsReg.
"If the method is compiled jump to its unchecked entry-point, otherwise interpret it."
objectRepresentation
genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg.
self MoveR: TempReg R: ClassReg.
jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg.
+ jumpBCMethod jmpTarget: picInterpretAbort.
- jumpBCMethod jmpTarget: interpretLabel.
self AddCq: cmNoCheckEntryOffset R: ClassReg.
self JumpR: ClassReg.
"First probe missed. Do second of three probes. Shift hash right one and retry."
jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label).
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg.
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Second probe missed. Do last probe. Shift hash right two and retry."
jumpSelectorMiss jmpTarget: self Label.
self MoveR: SendNumArgsReg R: ClassReg.
self annotate: (self XorCw: selector R: ClassReg) objRef: selector.
objectMemory shiftForWord > 2 ifTrue:
[self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg].
self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self annotate: (self CmpCw: selector R: TempReg) objRef: selector.
jumpSelectorMiss := self JumpNonZero: 0.
self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord)
r: ClassReg
R: TempReg.
self CmpR: SendNumArgsReg R: TempReg.
self JumpZero: itsAHit.
"Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup."
jumpSelectorMiss jmpTarget: self Label.
backEnd genPushRegisterArgsForNumArgs: numArgs.
self genSmalltalkToCStackSwitch.
methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)).
self
compileCallFor: #ceSendFromInLineCacheMiss:
numArgs: 1
arg: SendNumArgsReg
arg: nil
arg: nil
arg: nil
resultReg: nil
saveRegs: false
"Note that this call does not return."!
1
0
Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.97.mcz
==================== Summary ====================
Name: CMakeVMMakerSqueak-tty.97
Author: tty
Time: 6 December 2014, 2:29:44.727 pm
UUID: 292a20c9-306f-497d-95d5-942356a2e97b
Ancestors: CMakeVMMakerSqueak-tty.96
SqueakMacOSXPowerPCConfig configureXYZPlugin methods converted to configureByTemplateXYZPlugin methods.
All tests pass.
next up MacOSX32x86, etc
=============== Diff against CMakeVMMakerSqueak-tty.96 ===============
Item was added:
+ CMakeTemplate subclass: #CMakeIfAddDefinitionsElseAddDefinitions
+ instanceVariableNames: 'condition ifdefinitions elsedefinitions'
+ classVariableNames: ''
+ poolDictionaries: ''
+ category: 'CMakeVMMakerSqueak-CMakeTemplates'!
+
+ !CMakeIfAddDefinitionsElseAddDefinitions commentStamp: 'tty 12/5/2014 15:20' prior: 0!
+ A CMakeIfAddDefinitionsElseAddDefinitions looks something like this:
+
+ if (${WIN32})
+ add_definitions(-Werror-implicit-function-declaration)
+ else(${WIN32})
+ add_definitions(-DNO_ISNAN)
+ endif (${WIN32})'.
+
+ CPlatformConfig>>configureFloatMathPlugin is the motivation
+ CMakePlatformConfigForSqueak>>configureByTemplateFilePlugin is where this is used!
Item was added:
+ ----- Method: CMakeIfAddDefinitionsElseAddDefinitions>>condition:ifdefinitions:elsedefinitions: (in category 'accessing') -----
+ condition: cString ifdefinitions:iString elsedefinitions:eString
+ condition:=cString.
+ ifdefinitions:= iString.
+ elsedefinitions:=eString
+ self content:'
+ IF(', condition ,')
+ add_definitions(', ifdefinitions,')
+ ELSE(', condition ,')
+ add_definitions(', elsedefinitions,')
+ ENDIF(', condition ,')'
+ !
Item was added:
+ ----- Method: CMakeIfAddDefinitionsElseAddDefinitions>>initialize (in category 'initialize-release') -----
+ initialize
+ condition:='foo'.
+ ifdefinitions:='-Wifbar'.
+ elsedefinitions:='-Welsebar'.
+ self content:'
+ IF(', condition ,')
+ add_definitions(', ifdefinitions,')
+ ELSE(', condition ,')
+ add_definitions(', elsedefinitions,')
+ ENDIF(', condition ,')'
+
+ !
Item was added:
+ CMakeTemplate subclass: #CMakeIfPluginDependencies
+ instanceVariableNames: 'plugin dependencies'
+ classVariableNames: ''
+ poolDictionaries: ''
+ category: 'CMakeVMMakerSqueak-CMakeCustomTemplates'!
+
+ !CMakeIfPluginDependencies commentStamp: 'tty 12/4/2014 16:46' prior: 0!
+ A CMakeIfPluginDependencies Template looks something like this:
+
+ 'IF (MyPlugin_dependencies) "set dependencies"
+ add_dependencies(MyPlugin ${MyPlugin_dependencies})
+ ENDIF (MyPlugin_dependencies)'.!
Item was added:
+ ----- Method: CMakeIfPluginDependencies>>dependencies (in category 'accessing') -----
+ dependencies
+ ^ String streamContents: [:stream | dependencies asStringOn: stream delimiter: ' ' ]!
Item was added:
+ ----- Method: CMakeIfPluginDependencies>>initialize (in category 'initialize-release') -----
+ initialize
+ plugin:= 'foo'.
+ dependencies:= OrderedCollection with: 'bar' with: 'nun'.
+ self content:'
+ IF(',plugin, '_dependencies)
+ ADD_DEPENDENCIES(' , plugin, ' ' , self dependencies,')
+ ENDIF( ', plugin, '_dependencies)'
+
+ !
Item was added:
+ ----- Method: CMakeIfPluginDependencies>>plugin (in category 'accessing') -----
+ plugin
+
+ ^ plugin!
Item was added:
+ ----- Method: CMakeIfPluginDependencies>>plugin:dependencies: (in category 'initialize-release') -----
+ plugin: pString dependencies: anOrderedCollection
+ plugin:= pString.
+ dependencies:= anOrderedCollection.
+ self content:'
+ IF(',plugin, '_dependencies)
+ ADD_DEPENDENCIES( ', plugin, ' ' , self dependencies,')
+ ENDIF( ', plugin, '_dependencies)'
+ !
Item was changed:
----- Method: CMakeListAppend>>list:elements: (in category 'accessing') -----
list: aString elements: anObject
list:=aString.
elements := anObject.
+ self content:' list( APPEND ', list, ' "' , self elements, '")'
- self content:' list( APPEND ', list, ' ' , self elements, ')'
!
Item was changed:
CMakeGenerator subclass: #CMakePluginGeneratorForSqueak
+ instanceVariableNames: 'plugin vmGen internal extraRules doNotGenerate externalDependencies configDotCMake templates'
- instanceVariableNames: 'plugin vmGen internal extraRules doNotGenerate externalDependencies configDotCMake'
classVariableNames: ''
poolDictionaries: ''
category: 'CMakeVMMakerSqueak'!
!CMakePluginGeneratorForSqueak commentStamp: 'tty 7/8/2014 12:46' prior: 0!
A CMakePluginGeneratorForSqueak overides some CMakeVMPluginGenerator methods for squeak compatibility.
I also add Dictionary for storing a plugins config.cmake file
Instance Variables
!
Item was changed:
----- Method: CMakePluginGeneratorForSqueak>>generate:for:internal:extraRules: (in category 'squeak compatibility') -----
generate: aPlugin for: aCMakeVMGenerator internal: aBoolean extraRules: aBlock
doNotGenerate := false.
internal := aBoolean.
plugin := aPlugin.
vmGen := aCMakeVMGenerator.
extraRules := aBlock.
+ ^ self generateByTemplate!
- ^ self generate!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>generateByTemplate (in category 'squeak compatibility') -----
+ generateByTemplate
+ | name |
+
+ output := String new writeStream.
+ name := plugin moduleName.
+ templates:= OrderedCollection new.
+
+ templates
+ addLast:((CMakeMessage new) message: (internal ifTrue: [ 'Adding internal plugin: '] ifFalse: ['Adding external plugin: ']) , name);
+ addLast:((CMakeSet new) variable: #pluginName quotedValue: name);
+ addLast:((CMakeSet new) variable: #pluginSrc quotedValue: '${srcPluginsDir}/', name);
+ addLast:((CMakeSet new) variable: #pluginCross quotedValue: '${crossDir}/plugins/', name );
+ addLast:((CMakeSet new) variable: #pluginPlatform quotedValue: '${targetPlatform}/plugins/', name );
+ addLast:((CMakeSet new) variable: #LINKLIBS value: '' ). "clear LINKLIBS variable"
+ internal ifTrue: [ templates addLast:((CMakeAddDefinitions new) definitions: (OrderedCollection with: '-DSQUEAK_BUILTIN_PLUGIN' ))].
+ templates
+ addLast:((CMakeListAppend new) list: 'sources' elements: (OrderedCollection with: '${pluginSrc}/', name , '.c' ));
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${pluginSrc} ${pluginCross} ${targetPlatform}/plugins/${pluginName}'))." default include directories for plugin "
+ vmGen config configureByTemplatePlugin: plugin with: self.
+ extraRules ifNotNil: [ extraRules value: self ].
+ " generate a static lib for internal plugin, or shared for external"
+ internal
+ ifTrue: [ templates addLast:((CMakeAddLibrary new) library: name type: 'STATIC' sources: (OrderedCollection with: '${sources}'))]
+ ifFalse: [templates addLast:((CMakeAddLibrary new) library: name type: 'SHARED' sources: (OrderedCollection with: '${sources}'))].
+ vmGen config extraPluginSettings: self.
+ self isExternal
+ ifTrue: [ templates addLast:((CMakeTargetLinkLibraries new) target: self moduleName items: (OrderedCollection with: '${LINKLIBS}'))].
+ templates
+ addLast:((CMakeSetProperty new) scope: 'TARGET ', name property: 'LINK_FLAGS' values: (OrderedCollection with: '${linkFlags}')); " see senders of #linkFlags "
+ addLast:((CMakeIfPluginDependencies new) plugin: self moduleName dependencies: (OrderedCollection with: ' ${', self moduleName , '_dependencies}')).
+ templates do: [:each | self puts: each content].
+ self saveFile.
+
+
+ !
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>templates (in category 'accessing') -----
+ templates
+ ^templates!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>templates: (in category 'accessing') -----
+ templates: anOrderedCollection
+ templates := anOrderedCollection!
Item was added:
+ CMakeTemplate subclass: #CMakeSetProperty
+ instanceVariableNames: 'scope append appendstring property values'
+ classVariableNames: ''
+ poolDictionaries: ''
+ category: 'CMakeVMMakerSqueak-CMakeTemplates'!
+
+ !CMakeSetProperty commentStamp: 'tty 12/4/2014 15:58' prior: 0!
+ cmake --help-command set_property
+ set_property
+ ------------
+
+ Set a named property in a given scope.
+ ::
+
+ set_property(<GLOBAL |
+ DIRECTORY [dir] |
+ TARGET [target1 [target2 ...]] |
+ SOURCE [src1 [src2 ...]] |
+ TEST [test1 [test2 ...]] |
+ CACHE [entry1 [entry2 ...]]>
+ [APPEND] [APPEND_STRING]
+ PROPERTY <name> [value1 [value2 ...]])
+
+ Set one property on zero or more objects of a scope. The first
+ argument determines the scope in which the property is set. It must
+ be one of the following:
+
+ GLOBAL scope is unique and does not accept a name.
+
+ DIRECTORY scope defaults to the current directory but another
+ directory (already processed by CMake) may be named by full or
+ relative path.
+
+ TARGET scope may name zero or more existing targets.
+
+ SOURCE scope may name zero or more source files. Note that source
+ file properties are visible only to targets added in the same
+ directory (CMakeLists.txt).
+
+ TEST scope may name zero or more existing tests.
+
+ CACHE scope must name zero or more cache existing entries.
+
+ The required PROPERTY option is immediately followed by the name of
+ the property to set. Remaining arguments are used to compose the
+ property value in the form of a semicolon-separated list. If the
+ APPEND option is given the list is appended to any existing property
+ value.If the APPEND_STRING option is given the string is append to any
+ existing property value as string, i.e. it results in a longer string
+ and not a list of strings.
+ !
Item was added:
+ ----- Method: CMakeSetProperty>>append (in category 'accessing') -----
+ append
+
+ ^ append!
Item was added:
+ ----- Method: CMakeSetProperty>>appendstring (in category 'accessing') -----
+ appendstring
+
+ ^ appendstring!
Item was added:
+ ----- Method: CMakeSetProperty>>initialize (in category 'initialize-release') -----
+ initialize
+ scope:= '<GLOBAL | DIRECTORY [dir] |TARGET [target1 [target2 ...]] | SOURCE [src1 [src2 ...]] | TEST [test1 [test2 ...]] |CACHE [entry1 [entry2 ...]]>'.
+ append := ''.
+ appendstring:=''.
+ property := '<name>'.
+ values := OrderedCollection with: '[value1' with: '[value2...' with:']]' .
+ self content:' set_property(',self scope , ' PROPERTY ', self property , ' ' ,self values,')'!
Item was added:
+ ----- Method: CMakeSetProperty>>property (in category 'accessing') -----
+ property
+
+ ^ property!
Item was added:
+ ----- Method: CMakeSetProperty>>scope (in category 'accessing') -----
+ scope
+ ^ scope!
Item was added:
+ ----- Method: CMakeSetProperty>>scope:append:property:values: (in category 'accessing') -----
+ scope: sString append: aString property: pString values: anOrderedCollection
+ scope := sString.
+ append:= aString. "should this be aBoolean and then force append :=APPEND"
+ property:= pString.
+ values:= anOrderedCollection.
+ self content:' set_property(',self scope , ' ', self append , ' PROPERTY ', self property , ' ' self values,')'
+ !
Item was added:
+ ----- Method: CMakeSetProperty>>scope:appendString:property:values: (in category 'accessing') -----
+ scope: sString appendString: aString property: pString values: anOrderedCollection
+ scope := sString.
+ appendstring:= aString. "should this be aBoolean and then force appendstring:=APPEND_STRING"
+ property:= pString.
+ values:= anOrderedCollection.
+ self content:' set_property(',self scope , ' ', self appendstring , ' PROPERTY ', self property , ' ' self values,')'
+ !
Item was added:
+ ----- Method: CMakeSetProperty>>scope:property:values: (in category 'accessing') -----
+ scope: sString property: pString values: anOrderedCollection
+ scope := sString.
+ property:= pString.
+ values:= anOrderedCollection.
+ self content:' set_property(',self scope , ' PROPERTY ', self property , ' ', self values,')'
+ !
Item was added:
+ ----- Method: CMakeSetProperty>>values (in category 'accessing') -----
+ values
+ ^ String streamContents: [:stream | values asStringOn: stream delimiter: ' ' ]!
Item was changed:
----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testExtraPluginSettings (in category 'as yet unclassified') -----
testExtraPluginSettings
self flag:'tty'. "Is the self shouldnt sufficient?"
#(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
do:[:each |
(Smalltalk at:each)
allSubclassesDo:[:configuration | | o buildTypes vmGenerator pluginGenerator|
o:= configuration basicNew.
(o excludeFromBuild not) & (configuration isAbstractBaseClass not)
ifTrue:[
buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone).
buildTypes do:[:buildType |
o configureForBuildType: buildType.
vmGenerator:=CMakeVMGeneratorForSqueak new.
vmGenerator config: o.
vmGenerator output:(String new writeStream).
pluginGenerator := CMakePluginGeneratorForSqueak new.
pluginGenerator vmGenerator: vmGenerator.
pluginGenerator isInternal: false.
pluginGenerator output:(String new writeStream).
+ pluginGenerator templates: OrderedCollection new.
self shouldnt: [o extraPluginSettings: pluginGenerator] raise: Error]]]].
!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateB3DAcceleratorPlugin: aMaker
+
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/sqOpenGLRenderer.c'))
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateBitBltSimulation: (in category 'plugin extra rules') -----
+ configureByTemplateBitBltSimulation: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${pluginCross}'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/BitBltGeneric.c'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/BitBltDispatch.c'))
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateBochsIA32Plugin: (in category 'plugin extra rules') -----
+ configureByTemplateBochsIA32Plugin: aMaker
+
+ "this stuff is not ready for use yet"
+
+ " maker addCrossSources:
+ #( 'sqBochsIA32Plugin.cpp' )
+
+ "
+ aMaker doNotGenerate:true
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateCroquetPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateCroquetPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/TriBoxStub.c'))
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateFFIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateFFIPlugin: aMaker
+ self flag:'tty'. "comment below is from pharo code. I have no idea at the moment."
+ " it is incomplete right now, because in Cog this plugin are not used anymore"
+ aMaker doNotGenerate: true.
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/sqFFIPlugin.c')).
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateFilePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateFilePlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/sqFilePluginBasicPrims.c'))
+
+
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateFloatMathPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateFloatMathPlugin: aMaker
+ |cfiles pfiles|
+ cfiles:= #(
+ 'acos.c' 'acosh.c' 'asin.c' 'asinh.c' 'atan.c' 'atan2.c' 'atanh.c'
+ 'copysign.c' 'cos.c' 'cosh.c' 'exp.c' 'expm1.c' 'finite.c' 'fmod.c'
+ 'hypot.c' 'isnan.c' 'k_cos.c' 'k_rem_pio2.c' 'k_sin.c' 'k_tan.c' 'ldexp.c'
+ 'log.c' 'log10.c' 'log1p.c' 'modf.c' 'pow.c' 'rem_pio2.c' 'rint.c'
+ 'scalb.c' 'scalbn.c' 'sin.c' 'sinh.c' 'sqrt.c' 'tan.c' 'tanh.c' ).
+ pfiles:=OrderedCollection new. "Anybody who knows how to do this elegantly, please change this"
+ cfiles do:[:each | pfiles addLast:('$(pluginCross)/', each)].
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: pfiles);
+ addLast:((CMakeAddDefinitions new) definitions: (OrderedCollection with: '-O0')). "See Note 1."
+ self isLittleEndian
+ ifTrue: [
+ aMaker templates
+ addLast:((CMakeAddDefinitions new) definitions: (OrderedCollection with:'-D__LITTLE_ENDIAN=1' ))]. "See Note 2."
+
+ aMaker templates "See Note 3."
+ addLast:((CMakeIfAddDefinitionsElseAddDefinitions new)
+ condition:'${WIN32}'
+ ifdefinitions:'-Werror-implicit-function-declaration'
+ elsedefinitions:'-DNO_ISNAN')
+
+ "
+ Note 1. according to http://www.netlib.org/fdlibm/readme it should be compiled with no optimizations
+
+ Note 2. compile with -D__LITTLE_ENDIAN This macro is set automatically in fdlibm.h when compiled ith -m32 but
+ not when compiled with -m64 (Nicolas Cellier)
+
+ Note 3. It may be better to push these down to SqueakMacintoshConfig, SqueakUnixConfig, SqueakWindowsConfig.
+ I think it is clearer here.
+
+ In the mean time this template outputs the following:
+
+ if (${WIN32})
+ add_definitions(-Werror-implicit-function-declaration) <---push down to SqueakWindowsConfig
+ else(${WIN32})
+ add_definitions(-DNO_ISNAN) <---push down to SqueakUnix/MacConfigs
+ endif (${WIN32})'.
+
+ "!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateIA32ABIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateIA32ABIPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/ia32abicc.c')).
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateJPEGReadWriter2Plugin: (in category 'plugin extra rules') -----
+ configureByTemplateJPEGReadWriter2Plugin: aMaker
+ |cfiles pfiles|
+ cfiles:= #('Error.c' 'jcapimin.c' 'jcapistd.c' 'jccoefct.c' 'jccolor.c' 'jcdctmgr.c'
+ 'jchuff.c' 'jcinit.c' 'jcmainct.c' 'jcmarker.c' 'jcmaster.c' 'jcomapi.c' 'jcparam.c'
+ 'jcphuff.c' 'jcprepct.c' 'jcsample.c' 'jctrans.c' 'jdapimin.c' 'jdapistd.c'
+ 'jdatadst.c' 'jdatasrc.c' 'jdcoefct.c' 'jdcolor.c' 'jddctmgr.c' 'jdhuff.c'
+ 'jdinput.c' 'jdmainct.c' 'jdmarker.c' 'jdmaster.c' 'jdmerge.c' 'jdphuff.c' 'jdpostct.c'
+ 'jdsample.c' 'jdtrans.c' 'jerror.c' 'jfdctflt.c' 'jfdctfst.c' 'jfdctint.c'
+ 'jidctflt.c' 'jidctfst.c' 'jidctint.c' 'jidctred.c' 'jmemdatadst.c' 'jmemdatasrc.c'
+ 'jmemmgr.c' 'jmemnobs.c' 'jquant1.c' 'jquant2.c' 'jutils.c' ) .
+ pfiles:=OrderedCollection new. "Anybody who knows how to do this elegantly, please change this"
+ cfiles do:[:each | pfiles addLast:('$(pluginCross)/', each)].
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: pfiles).
+
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateMpeg3Plugin: (in category 'plugin extra rules') -----
+ configureByTemplateMpeg3Plugin: aMaker
+ |cfiles pfiles|
+ cfiles:=#( 'libmpeg/bitstream.c' 'libmpeg/changesForSqueak.c' 'libmpeg/audio/dct.c'
+ 'libmpeg/video/getpicture.c' 'libmpeg/audio/header.c' 'libmpeg/video/headers.c'
+ 'libmpeg/video/idct.c' 'libmpeg/audio/layer1.c' 'libmpeg/audio/layer2.c'
+ 'libmpeg/audio/layer3.c' 'libmpeg/libmpeg3.c' 'libmpeg/video/macroblocks.c'
+ 'libmpeg/video/mmxtest.c' 'libmpeg/video/motion.c' 'libmpeg/mpeg3atrack.c'
+ 'libmpeg/audio/mpeg3audio.c' 'libmpeg/mpeg3demux.c' 'libmpeg/mpeg3io.c'
+ 'libmpeg/mpeg3title.c' 'libmpeg/video/mpeg3video.c' 'libmpeg/mpeg3vtrack.c'
+ 'libmpeg/video/output.c' 'libmpeg/audio/pcm.c' 'libmpeg/video/reconstruct.c'
+ 'libmpeg/video/seek.c' 'libmpeg/video/slice.c' 'libmpeg/audio/synthesizers.c'
+ 'libmpeg/audio/tables.c' 'libmpeg/video/vlc.c' ).
+ pfiles:=OrderedCollection new. "Anybody who knows how to do this elegantly, please change this"
+ cfiles do:[:each | pfiles addLast:('$(pluginCross)/', each)].
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${pluginCross}/libmpeg ${pluginCross}/libmpeg/audio ${pluginCross}/libmpeg/video'));
+ addLast:((CMakeListAppend new) list:'sources' elements: pfiles).
+
+
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplatePlugin:with: (in category 'source generation') -----
+ configureByTemplatePlugin: aPlugin with: generator
+ "by-pass the pharo's CPlatformConf>>configurePlugin: with: so that I can use templates"
+ ^ self perform: ( 'configureByTemplate' , aPlugin name , ':' ) asSymbol with: generator.
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateRePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateRePlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '$(pluginCross)/pcre.c'
+ with: '$(pluginCross)/study.c'
+ with: '$(pluginCross)/get.c'
+ with: '$(pluginCross)/chartables.c'))
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateReentrantIA32FFIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateReentrantIA32FFIPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '$(pluginCross)/sqFFIPlugin.c'
+ with: '$(pluginCross)/sqFFITestFuncs.c'
+ with: '$(pluginCross)/sqManualSurface.c')).
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateSoundCodecPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSoundCodecPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection with: '$(pluginCross)/sqSoundCodecPluginBasicPrims.c')).
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateSoundGenerationPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSoundGenerationPlugin: aMaker
+ aMaker doNotGenerate: true.
+ "From Pharo comment: The sources in platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c
+ are out of date and need to be fixed before it can be built
+
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/sqOldSoundPrims.c'));
+ "!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateSurfacePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSurfacePlugin: aMaker
+ aMaker templates
+ addLast:((CMakeSet new) variable: #sources value: '');"remove default source file"
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/SurfacePlugin.c')).
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateThreadedIA32FFIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateThreadedIA32FFIPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '$(pluginCross)/sqFFIPlugin.c'
+ with: '$(pluginCross)/sqFFITestFuncs.c'
+ with: '$(pluginCross)/sqManualSurface.c')).
+
+ !
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>configureByTemplateUnixOSProcessPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateUnixOSProcessPlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin'));
+ addLast:((CMakeSet new) variable: #linkFlags value: '-undefined dynamic_lookup'). "THIS IS UGLY AND LAME!!!!!! (comment from Pharo code)"
+
+ !
Item was changed:
----- Method: Linux32ARMv6Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ aMaker isExternal
+ ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')].
+
+
- extraPluginSettingsBuild: maker
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
!
Item was changed:
----- Method: Linux32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ aMaker isExternal
+ ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')].
+
- extraPluginSettingsBuild: maker
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
!
Item was changed:
----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ aMaker isExternal
+ ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')].
+ aMaker templates addLast:((CMakeSet new) variable:'linkFlags' quotedValue:'${linkFlags} -m32').
+
+
+ " maker isExternal ifTrue: [
- extraPluginSettingsBuild: maker
- self flag:'tty'. "this dumps the libs into the executable's directory. This breaks the distribution convention squeak has had for a while. However, we probably should handle that in a packaging/redistribution step and not worry about it now"
- maker isExternal ifTrue: [
- "copy lib to outputDir "
maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
].
+ maker set: #linkFlags toString: '${linkFlags} -m32'"!
- maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was changed:
----- Method: SqueakBSDConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ aMaker isExternal
+ ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')].
+
- extraPluginSettingsBuild: maker
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
!
Item was added:
+ ----- Method: SqueakIOSConfig>>configureByTemplateB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateB3DAcceleratorPlugin: aMaker
+ self flag:'tty'. "consider portablility of /user/X11/include"
+ super configureByTemplateB3DAcceleratorPlugin: aMaker.
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '/usr/X11/include')); "for GL.h <--tty. I don't think this is portable. Revisit on refactor"
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '${pluginPlatform}/sqMacOpenGL.c'
+ with: '${pluginPlatform}/sqMacOpenGLInfo.c')).
+
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>configureByTemplateCroquetPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateCroquetPlugin: aMaker
+
+ super configureByTemplateCroquetPlugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacCroquet.c')).
+
+ !
Item was removed:
- ----- Method: SqueakIOSConfig>>configureClipboardExtendedPlugin: (in category 'plugin extra rules') -----
- configureClipboardExtendedPlugin: maker
- !
Item was changed:
----- Method: SqueakIOSConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
extraPluginSettingsBuild: aMaker
+ self flag: 'tty'. "I have no idea what this stuff is for. DO NOT take it as the work of somebody who does (:"
+ aMaker templates
+ addLast:((CMakeSet new) variable:'CMAKE_OSX_ARCHITECTURES' value:'i386');
+ addLast:((CMakeSetTargetProperties new)
+ target: aMaker moduleName
+ propertiesandvalues: (OrderedCollection with: 'COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""' )) .
+ aMaker isExternal
+ ifTrue:[
+ aMaker templates
+ addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}');
+ addLast:((CMakeSet new) variable:'EXECUTABLE_OUTPUT_PATH' value: self outputDir fullName);
+ addLast:((CMakeListAppend new) list: 'linkFlags' elements: (OrderedCollection with: '-undefined dynamic_lookup' ))].
+ aMaker templates
+ addLast:((CMakeSetTargetProperties new)
+ target: aMaker moduleName
+ propertiesandvalues: (OrderedCollection with: 'GCC_PREFIX_HEADER ${buildDir}/' , self executableName , '_Prefix.pch' )) .
- aMaker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'.
-
- aMaker
- setTargetProperty: 'COMPILE_FLAGS'
- to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'.
+
+
+
- aMaker isExternal ifTrue: [
- "copy result to results dir "
-
- aMaker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName.
- aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName.
- aMaker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ].
- "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'."
- aMaker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'.
-
!
Item was removed:
- ----- Method: SqueakMacOSX32x86Config>>configureClipboardExtendedPlugin: (in category 'plugin extra rules') -----
- configureClipboardExtendedPlugin: maker
- !
Item was changed:
----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
extraPluginSettingsBuild: aMaker
"Cog currently runs only in 32 bit mode"
+ self flag: 'tty'. "adapted from pharo code. I have no idea if this is appropriate for this platform"
+ aMaker templates
+ addLast:((CMakeSet new) variable:'CMAKE_OSX_ARCHITECTURES' value: 'i386')
+ !
- self flag: 'tty'. "cut-n-paste from pharo code. I have no idea if this is appropriate for this platform"
- aMaker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'!
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateB3DAcceleratorPlugin: aMaker
+ self flag:'tty'. "Consider portability of the include below"
+ super configureByTemplateB3DAcceleratorPlugin: aMaker.
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '/usr/X11/include')); "for GL.h <--tty portability problem?"
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '${pluginPlatform}/sqMacOpenGL.c'
+ with: '${pluginPlatform}/sqMacOpenGLInfo.c')).
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateCroquetPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateCroquetPlugin: aMaker
+ super configureByTemplateCroquetPlugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacCroquet.c'))
+
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateFFIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateFFIPlugin: aMaker
+ super configureByTemplateFFIPlugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '${pluginPlatform}/x86-sysv-MacIntel.c'
+ with: '${pluginPlatform}/x86-sysv-asm-MacIntel.S')).
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateFT2Plugin: (in category 'plugin extra rules') -----
+ configureByTemplateFT2Plugin: aMaker
+ | lib |
+ self flag:'tty'. "is internalFT2 still not supported?"
+ aMaker isExternal ifFalse: [self error: 'building internal FT2Plugin is not supported yet' ].
+ self flag:'tty'. "I haven't been down the addThirdpartyLibrary rabbit hole yet"
+ lib := self addThirdpartyLibrary: 'freetype2'.
+ aMaker templates "link plugin with freetype lib"
+ addLast:((CMakeListAppend new) list:'LINKLIBS' elements: (OrderedCollection with: (lib targetForLinking)));
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: lib includeDir)).
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateInternetConfigPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateInternetConfigPlugin: aMaker
+ self flag:'tty'. "pharo's configureInternetConfigPlugin has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacInternetConfiguration.c')).
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateJoystickTabletPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateJoystickTabletPlugin: aMaker
+ self flag:'tty'. "pharo's configureJoystickTabletPlugin has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast:((CMakeListAppend new)
+ list:'sources'
+ elements: (OrderedCollection
+ with: '${pluginPlatform}/HID_Error_Handler.c'
+ with: '${pluginPlatform}/HID_Name_Lookup.c'
+ with: '${pluginPlatform}/HID_Queue_Utilities.c'
+ with: '${pluginPlatform}/HID_Utilities.c'
+ with: '${pluginPlatform}/sqMacJoystickAndTablet.c')).
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateLocalePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateLocalePlugin: aMaker
+ self flag:'tty'. "pharo's configureLocalePlugin: has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacLocaleCarbon.c'))
+
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateMIDIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateMIDIPlugin: aMaker
+ self flag:'tty'. "pharo's configureMIDIPlugin: has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacMIDI.c')).
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateMpeg3Plugin: (in category 'plugin extra rules') -----
+ configureByTemplateMpeg3Plugin: aMaker
+
+ super configureByTemplateMpeg3Plugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacFileBits.c'))
+
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateObjectiveCPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateObjectiveCPlugin: aMaker
+ aMaker doNotGenerate: true!
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateQuicktimePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateQuicktimePlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new)
+ dirs: (OrderedCollection
+ with: '${pluginPlatform}'
+ with: '${crossDir}/plugins/SurfacePlugin'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacQuicktimeInteface.c')).
+ " not a typo , a file is named 'inteface' instead of 'interface' "
+ aMaker addFrameworksByTemplate: #( 'Carbon' 'QuickTime' ) maker: aMaker.!
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateSecurityPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSecurityPlugin: aMaker
+ self flag:'tty'. "pharo's configureSecurityPlugin: has a super call to an empty method that I omit here. "
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqMacSecurity.c')).
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateSerialPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSerialPlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/plugins/SerialPlugin' ));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${platformsDir}/unix/plugins/SerialPlugin/sqUnixSerial.c'))
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateSocketPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSocketPlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/plugins/SocketPlugin'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${platformsDir}/unix/plugins/SocketPlugin/sqUnixSocket.c')).
+
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateSoundGenerationPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSoundGenerationPlugin: maker
+ maker doNotGenerate: true.
+ "pharo code comment: The sources in platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c
+ are out of date and need to be fixed before it can be built
+
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '$(pluginCross)/sqOldSoundPrims.c'));
+ "
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateTestOSAPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateTestOSAPlugin: aMaker
+ aMaker addFrameworksByTemplate: #( 'Carbon' 'ApplicationServices' ).!
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>configureByTemplateUnixOSProcessPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateUnixOSProcessPlugin: aMaker
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin')).
+ !
Item was removed:
- ----- Method: SqueakMacOSXPowerPCConfig>>configureClipboardExtendedPlugin: (in category 'plugin extra rules') -----
- configureClipboardExtendedPlugin: maker
- !
Item was added:
+ ----- Method: SqueakMacintoshConfig>>addFrameworksByTemplate:maker: (in category 'cmake') -----
+ addFrameworksByTemplate: aCollection maker: aMaker
+ "for mac only "
+ self flag:'tty'. "TODO: replace the CMakeCommand with CMakeFindLibrary. cmake --help-command find_library"
+ aCollection
+ do: [:each |
+ aMaker templates
+ addLast:((CMakeCommand new) command: 'find_library' params:each , '_FMWK ', each );
+ addLast:((CMakeListAppend new) list:'LINKLIBS' elements: (OrderedCollection with: '${', each , '_FMWK}'))]!
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateAsynchFilePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateAsynchFilePlugin: aMaker
+ aMaker templates addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixAsynchFile.c'))
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateB3DAcceleratorPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateB3DAcceleratorPlugin: aMaker
+ super configureByTemplateB3DAcceleratorPlugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixOpenGL.c'))
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateDropPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateDropPlugin: aMaker
+
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin'));
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixDragDrop.c'))
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateFT2Plugin: (in category 'plugin extra rules') -----
+ configureByTemplateFT2Plugin: aMaker
+ self flag: 'tty'. "See portability comment below"
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'LINKLIBS' elements: (OrderedCollection with: 'freetype'));
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '/usr/include/freetype2')). "<---THIS IS NOT PORTABLE.."
+
+ "On a refactoring pass, the 'cmake .' commmand should be able to dig this library up generically and the argument to with: can be a variable"
+
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateFileCopyPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateFileCopyPlugin: aMaker
+
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixFileCopyPlugin.c'))
+
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateFilePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateFilePlugin: aMaker
+ super configureByTemplateFilePlugin: aMaker.
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixFile.c'))
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateInternetConfigPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateInternetConfigPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixInternetConfiguration.c'))
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateJoystickTabletPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateJoystickTabletPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixJoystickTablet.c'))
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateLocalePlugin: (in category 'plugin extra rules') -----
+ configureByTemplateLocalePlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixLocale.c'))
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateMIDIPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateMIDIPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixMIDI.c'))
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateSecurityPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSecurityPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixSecurity.c'))
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateSerialPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSerialPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixSerial.c'))
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateSocketPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSocketPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixSocket.c'))
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateSoundPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSoundPlugin: aMaker
+
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixSound.c'));
+ addLast:((CMakeListAppend new) list:'LINKLIBS' elements: (OrderedCollection with: 'asound'))
+
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateSqueakSSLPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateSqueakSSLPlugin: aMaker
+ aMaker templates
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixOpenSSL.c'));
+ addLast:((CMakeListAppend new) list:'LINKLIBS' elements: (OrderedCollection with: 'ssl'))
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateUUIDPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateUUIDPlugin: aMaker
+ self flag: 'tty'.
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '/usr/include/uuid')); "<---THIS IS NOT PORTABLE.."
+ addLast:((CMakeListAppend new) list:'sources' elements: (OrderedCollection with: '${pluginPlatform}/sqUnixUUID.c'))
+
+ "On a refactoring pass, the 'cmake .' commmand should be able to dig this library up generically and the argument to with: can be a variable"
+
+
+ !
Item was added:
+ ----- Method: SqueakUnixConfig>>configureByTemplateUnixOSProcessPlugin: (in category 'plugin extra rules') -----
+ configureByTemplateUnixOSProcessPlugin: aMaker
+ super configureByTemplateUnixOSProcessPlugin: aMaker.
+ aMaker templates
+ addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SocketPlugin'));
+ addLast:((CMakeAddDefinitions new) definitions: (OrderedCollection with: '-DSQAIO_H=\"sqaio.h\"'))
+
+
+ !
Item was changed:
----- Method: SqueakWin32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
extraPluginSettingsBuild: aMaker
-
- self flag:'tty'. "cut-n-paste from pharo code in CogWindowsConfig. caveat emptor"
self subclassResponsibility.
+ "
+ aMaker isExternal
+ ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')].
+
+ "!
- "
- aMaker isExternal ifTrue: [
- aMaker set: 'LIBRARY_OUTPUT_PATH' toString: '${outputDir}'.
-
- aMaker cmd: 'set_target_properties' params: aMaker moduleName , ' PROPERTIES PREFIX "" '
- ]"!
1
0
06 Dec '14
Revision: 3162
Author: eliot
Date: 2014-12-05 20:31:14 -0800 (Fri, 05 Dec 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.970
Revert those two cases; they were already covered.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogit.c
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogit.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursrc/vm/cogit.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -9936,7 +9936,6 @@
void *targetEntry;
assert(case1Method != null);
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
compilePICProlog(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
@@ -10030,7 +10029,6 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), 1);
compilePICProlog(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/nsspursrc/vm/cogit.c 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -9894,7 +9894,6 @@
void *targetEntry;
assert(case1Method != null);
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
compilePICProlog(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
@@ -9988,7 +9987,6 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), 1);
compilePICProlog(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/nsspursrc/vm/cogit.h 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Fri Dec 5 19:10:59 PST 2014
+ Fri Dec 5 20:30:57 PST 2014
Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/sistasrc/vm/cogit.c 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -9848,7 +9848,6 @@
void *targetEntry;
assert(case1Method != null);
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
compilePICProlog(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
@@ -9938,7 +9937,6 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), 1);
compilePICProlog(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
Modified: branches/Cog/sistasrc/vm/cogit.h
===================================================================
--- branches/Cog/sistasrc/vm/cogit.h 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/sistasrc/vm/cogit.h 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
Modified: branches/Cog/spursistasrc/vm/cogit.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/spursistasrc/vm/cogit.c 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -9816,7 +9816,6 @@
void *targetEntry;
assert(case1Method != null);
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
compilePICProlog(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
@@ -9906,7 +9905,6 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), 1);
compilePICProlog(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/spursistasrc/vm/cogit.h 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
Modified: branches/Cog/spursrc/vm/cogit.c
===================================================================
--- branches/Cog/spursrc/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/spursrc/vm/cogit.c 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -9471,7 +9471,6 @@
void *targetEntry;
assert(case1Method != null);
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
compilePICProlog(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
@@ -9561,7 +9560,6 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), 1);
compilePICProlog(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/spursrc/vm/cogit.h 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/src/vm/cogit.c 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -9505,7 +9505,6 @@
void *targetEntry;
assert(case1Method != null);
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
compilePICProlog(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
@@ -9595,7 +9594,6 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
- compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), 1);
compilePICProlog(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2014-12-06 03:12:21 UTC (rev 3161)
+++ branches/Cog/src/vm/cogit.h 2014-12-06 04:31:14 UTC (rev 3162)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
+ CCodeGenerator VMMaker.oscog-eem.970 uuid: 3869e39d-0172-4f38-9db5-cdca677eab92
*/
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.970.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.970
Author: eem
Time: 5 December 2014, 8:22:43.499 pm
UUID: 3869e39d-0172-4f38-9db5-cdca677eab92
Ancestors: VMMaker.oscog-eem.969
Revert those two cases; they were already covered.
=============== Diff against VMMaker.oscog-eem.969 ===============
Item was changed:
----- Method: Cogit>>compileCPIC:Case0:Case1Method:tag:isMNUCase:numArgs: (in category 'in-line cacheing') -----
compileCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs
"Compile the code for a two-case PIC for case0CogMethod and case1Method,case1Tag.
The tag for case0CogMethod is at the send site and so doesn't need to be generated.
case1Method may be any of
- a Cog method; jump to its unchecked entry-point
- a CompiledMethod; jump to the ceInterpretFromPIC trampoline
- nil; call ceMNUFromPIC"
<var: #cPIC type: #'CogMethod *'>
| operand targetEntry jumpNext |
<var: #case0CogMethod type: #'CogMethod *'>
<var: #targetEntry type: #'void *'>
<var: #jumpNext type: #'AbstractInstruction *'>
self assert: case1Method notNil.
- coInterpreter
- compilationBreak: cPIC selector
- point: (objectMemory numBytesOf: cPIC selector)
- isMNUCase: isMNUCase.
self compilePICProlog: numArgs.
self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not.
(isMNUCase not
and: [coInterpreter methodHasCogMethod: case1Method])
ifTrue:
[operand := 0.
targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer]
ifFalse:
[self assert: (case1Method isNil or: [(objectMemory isYoungObject: case1Method) not]).
operand := case1Method.
targetEntry := case1Method isNil ifTrue: [mnuCall] ifFalse: [interpretLabel]].
jumpNext := self compileCPICEntry.
self MoveCw: 0 R: SendNumArgsReg.
self JumpLong: case0CogMethod asInteger + cmNoCheckEntryOffset.
endCPICCase0 := self CmpCw: case1Tag R: TempReg.
jumpNext jmpTarget: endCPICCase0.
self MoveCw: operand R: SendNumArgsReg.
self JumpLongZero: (isMNUCase ifTrue: [mnuCall] ifFalse: [targetEntry]) asInteger.
endCPICCase1 := self MoveCw: cPIC asInteger R: ClassReg.
self JumpLong: (self cPICMissTrampolineFor: numArgs).
^0
!
Item was changed:
----- Method: Cogit>>compileMNUCPIC:methodOperand:numArgs: (in category 'in-line cacheing') -----
compileMNUCPIC: cPIC methodOperand: methodOperand numArgs: numArgs
"Compile the code for a one-case MNU PIC that calls ceMNUFromPIC for case0Tag
The tag for case0 is at the send site and so doesn't need to be generated."
<var: #cPIC type: #'CogMethod *'>
| jumpNext |
<var: #jumpNext type: #'AbstractInstruction *'>
- coInterpreter
- compilationBreak: cPIC selector
- point: (objectMemory numBytesOf: cPIC selector)
- isMNUCase: true.
self compilePICProlog: numArgs.
jumpNext := self compileCPICEntry.
self MoveCw: methodOperand R: SendNumArgsReg.
self JumpLong: mnuCall asInteger.
jumpNext jmpTarget: (self MoveCw: cPIC asInteger R: ClassReg).
self JumpLong: (self cPICMissTrampolineFor: numArgs).
^0
!
1
0
06 Dec '14
Revision: 3161
Author: eliot
Date: 2014-12-05 19:12:21 -0800 (Fri, 05 Dec 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.969
Two more cases where the mnu compilation break point needs to be checked.
Use numBytesOf: for length of selector.
Rename checkValidInlineCacheTag: to validInlineCacheTag:.
Add a debug lookup routine that only looks up (and follows forwarding pointers).
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/cogit.c
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/cogit.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/cogit.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spurstack64src/vm/gcc3x-interp.c
branches/Cog/spurstack64src/vm/interp.c
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nscogsrc/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -839,7 +839,6 @@
static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms;
static sqInt allYoungObjectsAgeInFullGC(void);
static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms;
-static sqInt checkValidInlineCacheTag(sqInt cacheTag) NoDbgRegParms;
static sqInt checkValidOopReference(sqInt anOop) NoDbgRegParms;
static sqInt compactClassFieldMask(void);
static sqInt couldBeObject(sqInt oop) NoDbgRegParms;
@@ -891,6 +890,7 @@
static sqInt shouldAnnotateObjectReference(sqInt anOop) NoDbgRegParms;
static sqInt slotOffsetOfInstVarIndex(sqInt index) NoDbgRegParms;
static sqInt smallIntegerIsOnlyImmediateType(void);
+static sqInt validInlineCacheTag(sqInt cacheTag) NoDbgRegParms;
static CogSimStackEntry * ensureSpilledAtfrom(CogSimStackEntry * self_in_ensureSpilledAtfrom, sqInt baseOffset, sqInt baseRegister) NoDbgRegParms;
static CogSimStackEntry * mergeAtfrom(CogSimStackEntry * self_in_mergeAtfrom, sqInt baseOffset, sqInt baseRegister) NoDbgRegParms;
static CogSimStackEntry * popToReg(CogSimStackEntry * self_in_popToReg, sqInt reg) NoDbgRegParms;
@@ -8903,7 +8903,7 @@
}
}
else {
- if (!(asserta(checkValidInlineCacheTag(cacheTag1)))) {
+ if (!(asserta(validInlineCacheTag(cacheTag1)))) {
return 5;
}
}
@@ -8915,7 +8915,7 @@
}
}
else {
- if (!(asserta(checkValidInlineCacheTag(cacheTag1)))) {
+ if (!(asserta(validInlineCacheTag(cacheTag1)))) {
return 7;
}
}
@@ -9005,7 +9005,7 @@
/* linked non-super send, cacheTag is a cacheTag */
- if (!(checkValidInlineCacheTag(selectorOrCacheTag))) {
+ if (!(validInlineCacheTag(selectorOrCacheTag))) {
print("cache tag leak in CM ");
printHex(((sqInt)cogMethod));
print(" @ ");
@@ -9366,7 +9366,7 @@
sqInt size;
sqInt target;
- compilationBreakpointisMNUCase((cPIC->selector), lengthOf((cPIC->selector)), isMNUCase);
+ compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
allocateOpcodesbytecodes(5, 0);
assert(!(inlineCacheTagIsYoung(caseNTag)));
assert((caseNMethod != null)
@@ -9501,7 +9501,7 @@
if (isYoung(selector)) {
return 0;
}
- compilationBreakpointisMNUCase(selector, lengthOf(selector), 1);
+ compilationBreakpointisMNUCase(selector, numBytesOf(selector), 1);
assert(endCPICCase0 != null);
startAddress = allocate(closedPICSize);
if (startAddress == 0) {
@@ -9539,7 +9539,7 @@
sqInt mapSize;
sqInt startAddress;
- compilationBreakpointisMNUCase(selector, lengthOf(selector), 0);
+ compilationBreakpointisMNUCase(selector, numBytesOf(selector), 0);
startAddress = allocate(openPICSize);
if (startAddress == 0) {
return ((CogMethod *) InsufficientCodeSpace);
@@ -9579,7 +9579,7 @@
if (isYoung(selector)) {
return ((CogMethod *) YoungSelectorInPIC);
}
- compilationBreakpointisMNUCase(selector, lengthOf(selector), isMNUCase);
+ compilationBreakpointisMNUCase(selector, numBytesOf(selector), isMNUCase);
startAddress = allocate(closedPICSize);
if (startAddress == 0) {
return ((CogMethod *) InsufficientCodeSpace);
@@ -9936,6 +9936,7 @@
void *targetEntry;
assert(case1Method != null);
+ compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
compilePICProlog(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
@@ -10029,6 +10030,7 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
+ compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), 1);
compilePICProlog(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
@@ -14009,7 +14011,7 @@
void
setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop)
{
- compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0);
+ compilationBreakpointisMNUCase(aSelectorOop, numBytesOf(aSelectorOop), 0);
assert(((cogMethod->cmType)) == CMMethod);
(cogMethod->selector = aSelectorOop);
if (isYoung(aSelectorOop)) {
@@ -15480,15 +15482,6 @@
}
static sqInt
-checkValidInlineCacheTag(sqInt cacheTag)
-{
- return (cacheTag == ConstZero)
- || ((((cacheTag & ((1 << (shiftForWord())) - 1)) == 0)
- && (((cacheTag >= (1 << (compactClassFieldLSB()))) && (cacheTag <= ((compactClassIndexOfHeader(-1)) << (compactClassFieldLSB()))))))
- || (checkValidObjectReference(cacheTag)));
-}
-
-static sqInt
checkValidOopReference(sqInt anOop)
{
return ((anOop & 1))
@@ -16631,6 +16624,15 @@
return 1;
}
+static sqInt
+validInlineCacheTag(sqInt cacheTag)
+{
+ return (cacheTag == ConstZero)
+ || ((((cacheTag & ((1 << (shiftForWord())) - 1)) == 0)
+ && (((cacheTag >= (1 << (compactClassFieldLSB()))) && (cacheTag <= ((compactClassIndexOfHeader(-1)) << (compactClassFieldLSB()))))))
+ || (checkValidObjectReference(cacheTag)));
+}
+
static CogSimStackEntry *
ensureSpilledAtfrom(CogSimStackEntry * self_in_ensureSpilledAtfrom, sqInt baseOffset, sqInt baseRegister)
{
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nscogsrc/vm/cogit.h 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1142,6 +1142,7 @@
static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag) NoDbgRegParms;
static sqInt lookupMethodInClass(sqInt class) NoDbgRegParms;
static sqInt lookupMethodNoMNUEtcInClass(sqInt class) NoDbgRegParms;
+sqInt lookupSelectorinClass(sqInt selector, sqInt class);
sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
static void mapInterpreterOops(void);
static sqInt markAndTraceAndMaybeFreeStackPages(sqInt fullGCFlag) NoDbgRegParms;
@@ -2097,7 +2098,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.968";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.969";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -4841,6 +4842,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l300;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4858,7 +4860,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- /* return self */
+ null;
l300: /* end baseFrameReturn */;
goto l299;
}
@@ -47695,6 +47697,80 @@
}
+/* Lookup selector in class. Answer the method or nil. This is a debugging
+ routine. */
+
+sqInt
+lookupSelectorinClass(sqInt selector, sqInt class)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt currentClass;
+ sqInt dictionary;
+ sqInt header;
+ sqInt index;
+ sqInt length;
+ sqInt mask;
+ sqInt meth;
+ sqInt methodArray;
+ sqInt nextSelector;
+ sqInt sz;
+ sqInt wrapAround;
+
+ currentClass = class;
+ while (currentClass != GIV(nilObj)) {
+ dictionary = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord())));
+ if (dictionary == GIV(nilObj)) {
+ return null;
+ }
+ /* begin lookupMethodFor:InDictionary: */
+ /* begin numSlotsOf: */
+ header = longAt(dictionary);
+ sz = ((header & TypeMask) == HeaderTypeSizeAndClass
+ ? (longAt(dictionary - (BytesPerWord * 2))) & AllButTypeMask
+ : header & SizeMask);
+ length = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord());
+ mask = (length - SelectorStart) - 1;
+
+ /* It is assumed that there are some nils in this dictionary, and search will
+ stop when one is encountered. However, if there are no nils, then wrapAround
+ will be detected the second time the loop gets to the end of the table. */
+
+ index = SelectorStart + (mask & (((selector & 1)
+ ? (selector >> 1)
+ : (((usqInt) (longAt(selector))) >> HashBitsOffset) & HashMaskUnshifted)));
+ wrapAround = 0;
+ while (1) {
+ nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
+ if (nextSelector == GIV(nilObj)) {
+ meth = null;
+ goto l1;
+ }
+
+ if (nextSelector == selector) {
+ methodArray = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord())));
+ meth = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
+ goto l1;
+ }
+ index += 1;
+ if (index == length) {
+ if (wrapAround) {
+ meth = null;
+ goto l1;
+ }
+ wrapAround = 1;
+ index = SelectorStart;
+ }
+ }
+ meth = null;
+ l1: /* end lookupMethodFor:InDictionary: */;
+ if (!(meth == null)) {
+ return meth;
+ }
+ currentClass = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
+ }
+ return null;
+}
+
+
/* make a Point xValue@yValue.
We know both will be integers so no value nor root checking is needed */
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
@@ -234,6 +234,7 @@
sqInt literalofMethod(sqInt offset, sqInt methodPointer);
void longPrintOop(sqInt oop);
sqInt longStoreBytecodeForHeader(sqInt methodHeader);
+sqInt lookupSelectorinClass(sqInt selector, sqInt class);
sqInt methodClassAssociationOf(sqInt methodPointer);
sqInt methodClassOf(sqInt methodPointer);
sqInt methodPrimitiveIndex(void);
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1145,6 +1145,7 @@
static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag) NoDbgRegParms;
static sqInt lookupMethodInClass(sqInt class) NoDbgRegParms;
static sqInt lookupMethodNoMNUEtcInClass(sqInt class) NoDbgRegParms;
+sqInt lookupSelectorinClass(sqInt selector, sqInt class);
sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
static void mapInterpreterOops(void);
static sqInt markAndTraceAndMaybeFreeStackPages(sqInt fullGCFlag) NoDbgRegParms;
@@ -2100,7 +2101,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.968";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.969";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -4850,6 +4851,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l300;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4867,7 +4869,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- /* return self */
+ null;
l300: /* end baseFrameReturn */;
goto l299;
}
@@ -47704,6 +47706,80 @@
}
+/* Lookup selector in class. Answer the method or nil. This is a debugging
+ routine. */
+
+sqInt
+lookupSelectorinClass(sqInt selector, sqInt class)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt currentClass;
+ sqInt dictionary;
+ sqInt header;
+ sqInt index;
+ sqInt length;
+ sqInt mask;
+ sqInt meth;
+ sqInt methodArray;
+ sqInt nextSelector;
+ sqInt sz;
+ sqInt wrapAround;
+
+ currentClass = class;
+ while (currentClass != GIV(nilObj)) {
+ dictionary = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord())));
+ if (dictionary == GIV(nilObj)) {
+ return null;
+ }
+ /* begin lookupMethodFor:InDictionary: */
+ /* begin numSlotsOf: */
+ header = longAt(dictionary);
+ sz = ((header & TypeMask) == HeaderTypeSizeAndClass
+ ? (longAt(dictionary - (BytesPerWord * 2))) & AllButTypeMask
+ : header & SizeMask);
+ length = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord());
+ mask = (length - SelectorStart) - 1;
+
+ /* It is assumed that there are some nils in this dictionary, and search will
+ stop when one is encountered. However, if there are no nils, then wrapAround
+ will be detected the second time the loop gets to the end of the table. */
+
+ index = SelectorStart + (mask & (((selector & 1)
+ ? (selector >> 1)
+ : (((usqInt) (longAt(selector))) >> HashBitsOffset) & HashMaskUnshifted)));
+ wrapAround = 0;
+ while (1) {
+ nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
+ if (nextSelector == GIV(nilObj)) {
+ meth = null;
+ goto l1;
+ }
+
+ if (nextSelector == selector) {
+ methodArray = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord())));
+ meth = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
+ goto l1;
+ }
+ index += 1;
+ if (index == length) {
+ if (wrapAround) {
+ meth = null;
+ goto l1;
+ }
+ wrapAround = 1;
+ index = SelectorStart;
+ }
+ }
+ meth = null;
+ l1: /* end lookupMethodFor:InDictionary: */;
+ if (!(meth == null)) {
+ return meth;
+ }
+ currentClass = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
+ }
+ return null;
+}
+
+
/* make a Point xValue@yValue.
We know both will be integers so no value nor root checking is needed */
Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nsspursrc/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -861,9 +861,9 @@
static sqInt numCharacterBits(void);
static sqInt numSmallIntegerBits(void);
static sqInt numSmallIntegerTagBits(void);
+static sqInt validInlineCacheTag(usqInt classIndexOrTagPattern) NoDbgRegParms;
static sqInt allYoungObjectsAgeInFullGC(void);
static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms;
-static sqInt checkValidInlineCacheTag(sqInt classIndexOrTagPattern) NoDbgRegParms;
static sqInt checkValidOopReference(sqInt anOop) NoDbgRegParms;
static sqInt couldBeObject(sqInt literal) NoDbgRegParms;
static sqInt createsClosuresInline(void);
@@ -8924,7 +8924,7 @@
}
}
else {
- if (!(asserta(checkValidInlineCacheTag(cacheTag1)))) {
+ if (!(asserta(validInlineCacheTag(cacheTag1)))) {
return 5;
}
}
@@ -8936,7 +8936,7 @@
}
}
else {
- if (!(asserta(checkValidInlineCacheTag(cacheTag1)))) {
+ if (!(asserta(validInlineCacheTag(cacheTag1)))) {
return 7;
}
}
@@ -9026,7 +9026,7 @@
/* linked non-super send, cacheTag is a cacheTag */
- if (!(checkValidInlineCacheTag(selectorOrCacheTag))) {
+ if (!(validInlineCacheTag(selectorOrCacheTag))) {
print("cache tag leak in CM ");
printHex(((sqInt)cogMethod));
print(" @ ");
@@ -9324,7 +9324,7 @@
sqInt size;
sqInt target;
- compilationBreakpointisMNUCase((cPIC->selector), lengthOf((cPIC->selector)), isMNUCase);
+ compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
allocateOpcodesbytecodes(5, 0);
assert(!(inlineCacheTagIsYoung(caseNTag)));
assert((caseNMethod != null)
@@ -9459,7 +9459,7 @@
if (isYoung(selector)) {
return 0;
}
- compilationBreakpointisMNUCase(selector, lengthOf(selector), 1);
+ compilationBreakpointisMNUCase(selector, numBytesOf(selector), 1);
assert(endCPICCase0 != null);
startAddress = allocate(closedPICSize);
if (startAddress == 0) {
@@ -9497,7 +9497,7 @@
sqInt mapSize;
sqInt startAddress;
- compilationBreakpointisMNUCase(selector, lengthOf(selector), 0);
+ compilationBreakpointisMNUCase(selector, numBytesOf(selector), 0);
startAddress = allocate(openPICSize);
if (startAddress == 0) {
return ((CogMethod *) InsufficientCodeSpace);
@@ -9537,7 +9537,7 @@
if (isYoung(selector)) {
return ((CogMethod *) YoungSelectorInPIC);
}
- compilationBreakpointisMNUCase(selector, lengthOf(selector), isMNUCase);
+ compilationBreakpointisMNUCase(selector, numBytesOf(selector), isMNUCase);
startAddress = allocate(closedPICSize);
if (startAddress == 0) {
return ((CogMethod *) InsufficientCodeSpace);
@@ -9894,6 +9894,7 @@
void *targetEntry;
assert(case1Method != null);
+ compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
compilePICProlog(numArgs);
assert(!(inlineCacheTagIsYoung(case1Tag)));
if ((!isMNUCase)
@@ -9987,6 +9988,7 @@
AbstractInstruction *jumpNext;
sqInt jumpTarget;
+ compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), 1);
compilePICProlog(numArgs);
jumpNext = compileCPICEntry();
/* begin MoveCw:R: */
@@ -13910,7 +13912,7 @@
void
setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop)
{
- compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0);
+ compilationBreakpointisMNUCase(aSelectorOop, numBytesOf(aSelectorOop), 0);
assert(((cogMethod->cmType)) == CMMethod);
(cogMethod->selector = aSelectorOop);
if (isYoung(aSelectorOop)) {
@@ -17387,7 +17389,17 @@
return 1;
}
+
+/* The two valid tag patterns are 0 (Character) and 1 (SmallInteger) */
+
static sqInt
+validInlineCacheTag(usqInt classIndexOrTagPattern)
+{
+ return (classIndexOrTagPattern <= 1)
+ || ((classAtIndex(classIndexOrTagPattern)) != null);
+}
+
+static sqInt
allYoungObjectsAgeInFullGC(void)
{
return 0;
@@ -17406,13 +17418,6 @@
}
static sqInt
-checkValidInlineCacheTag(sqInt classIndexOrTagPattern)
-{
- return (classIndexOrTagPattern <= (tagMask()))
- || ((classAtIndex(classIndexOrTagPattern)) != null);
-}
-
-static sqInt
checkValidOopReference(sqInt anOop)
{
return (isImmediate(anOop))
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nsspursrc/vm/cogit.h 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1330,6 +1330,7 @@
static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag) NoDbgRegParms;
static sqInt lookupMethodInClass(sqInt class) NoDbgRegParms;
static sqInt lookupMethodNoMNUEtcInClass(sqInt class) NoDbgRegParms;
+sqInt lookupSelectorinClass(sqInt selector, sqInt class);
sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
static void mapInterpreterOops(void);
static sqInt markAndTraceStackPages(sqInt fullGCFlag) NoDbgRegParms;
@@ -2346,7 +2347,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.968";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.969";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -67361,6 +67362,123 @@
}
+/* Lookup selector in class. Answer the method or nil. This is a debugging
+ routine. */
+
+sqInt
+lookupSelectorinClass(sqInt selector, sqInt class)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt currentClass;
+ sqInt dictionary;
+ sqInt hash;
+ sqInt index;
+ usqInt length;
+ sqInt mask;
+ sqInt meth;
+ sqInt methodArray;
+ sqInt nextSelector;
+ usqInt numSlots;
+ sqInt objOop;
+ sqInt objOop1;
+ sqInt objOop11;
+ sqInt objOop2;
+ sqInt wrapAround;
+
+ currentClass = class;
+ while (currentClass != GIV(nilObj)) {
+ /* begin followObjField:ofObject: */
+ objOop = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord())));
+ assert(isNonImmediate(objOop));
+ if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) {
+ objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop);
+ }
+ dictionary = objOop;
+ if (dictionary == GIV(nilObj)) {
+ return null;
+ }
+ /* begin lookupMethodFor:InDictionary: */
+ /* begin numSlotsOf: */
+ flag("endianness");
+ assert((classIndexOf(dictionary)) > (isForwardedObjectClassIndexPun()));
+ numSlots = byteAt(dictionary + 7);
+ length = (numSlots == 0xFF
+ ? longAt(dictionary - BaseHeaderSize)
+ : numSlots);
+ mask = (length - SelectorStart) - 1;
+
+ /* It is assumed that there are some nils in this dictionary, and search will
+ stop when one is encountered. However, if there are no nils, then wrapAround
+ will be detected the second time the loop gets to the end of the table. */
+
+ index = SelectorStart + (mask & (((selector & 3) != 0
+ ? ((selector & 1)
+ ? (selector >> 1)
+ : ((usqInt) (((usqInt)selector))) >> 2)
+ : (/* begin hashBitsOf: */
+ (hash = (long32At(selector + 4)) & 0x3FFFFF),
+ (hash == 0
+ ? ((hash = (newObjectHash()) & 0x3FFFFF),
+ /* begin setHashBitsOf:to: */
+ flag("endianness"),
+ assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))),
+ long32Atput(selector + 4, ((((long32At(selector + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash))
+ : 0),
+ hash))));
+ wrapAround = 0;
+ while (1) {
+ nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
+ if (nextSelector == GIV(nilObj)) {
+ meth = null;
+ goto l1;
+ }
+ if (((nextSelector & 3) == 0)
+ && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) {
+ nextSelector = fixFollowedFieldofObjectwithInitialValue(index + SelectorStart, dictionary, nextSelector);
+ }
+ if (nextSelector == selector) {
+ /* begin followObjField:ofObject: */
+ objOop2 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord())));
+ assert(isNonImmediate(objOop2));
+ if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) {
+ objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop2);
+ }
+ methodArray = objOop2;
+ /* begin followField:ofObject: */
+ objOop11 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
+ if (((objOop11 & 3) == 0)
+ && (((longAt(objOop11)) & 0x3FFFFF) == 8)) {
+ objOop11 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop11);
+ }
+ meth = objOop11;
+ goto l1;
+ }
+ index += 1;
+ if (index == length) {
+ if (wrapAround) {
+ meth = null;
+ goto l1;
+ }
+ wrapAround = 1;
+ index = SelectorStart;
+ }
+ }
+ meth = null;
+ l1: /* end lookupMethodFor:InDictionary: */;
+ if (!(meth == null)) {
+ return meth;
+ }
+ /* begin followField:ofObject: */
+ objOop1 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
+ if (((objOop1 & 3) == 0)
+ && (((longAt(objOop1)) & 0x3FFFFF) == 8)) {
+ objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop1);
+ }
+ currentClass = objOop1;
+ }
+ return null;
+}
+
+
/* make a Point xValue@yValue.
We know both will be integers so no value nor root checking is needed */
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
@@ -282,6 +282,7 @@
sqInt literalofMethod(sqInt offset, sqInt methodPointer);
void longPrintOop(sqInt oop);
sqInt longStoreBytecodeForHeader(sqInt methodHeader);
+sqInt lookupSelectorinClass(sqInt selector, sqInt class);
sqInt methodClassAssociationOf(sqInt methodPointer);
sqInt methodClassOf(sqInt methodPointer);
sqInt methodPrimitiveIndex(void);
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1333,6 +1333,7 @@
static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag) NoDbgRegParms;
static sqInt lookupMethodInClass(sqInt class) NoDbgRegParms;
static sqInt lookupMethodNoMNUEtcInClass(sqInt class) NoDbgRegParms;
+sqInt lookupSelectorinClass(sqInt selector, sqInt class);
sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
static void mapInterpreterOops(void);
static sqInt markAndTraceStackPages(sqInt fullGCFlag) NoDbgRegParms;
@@ -2349,7 +2350,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.968";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.969";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -67370,6 +67371,123 @@
}
+/* Lookup selector in class. Answer the method or nil. This is a debugging
+ routine. */
+
+sqInt
+lookupSelectorinClass(sqInt selector, sqInt class)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt currentClass;
+ sqInt dictionary;
+ sqInt hash;
+ sqInt index;
+ usqInt length;
+ sqInt mask;
+ sqInt meth;
+ sqInt methodArray;
+ sqInt nextSelector;
+ usqInt numSlots;
+ sqInt objOop;
+ sqInt objOop1;
+ sqInt objOop11;
+ sqInt objOop2;
+ sqInt wrapAround;
+
+ currentClass = class;
+ while (currentClass != GIV(nilObj)) {
+ /* begin followObjField:ofObject: */
+ objOop = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord())));
+ assert(isNonImmediate(objOop));
+ if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) {
+ objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop);
+ }
+ dictionary = objOop;
+ if (dictionary == GIV(nilObj)) {
+ return null;
+ }
+ /* begin lookupMethodFor:InDictionary: */
+ /* begin numSlotsOf: */
+ flag("endianness");
+ assert((classIndexOf(dictionary)) > (isForwardedObjectClassIndexPun()));
+ numSlots = byteAt(dictionary + 7);
+ length = (numSlots == 0xFF
+ ? longAt(dictionary - BaseHeaderSize)
+ : numSlots);
+ mask = (length - SelectorStart) - 1;
+
+ /* It is assumed that there are some nils in this dictionary, and search will
+ stop when one is encountered. However, if there are no nils, then wrapAround
+ will be detected the second time the loop gets to the end of the table. */
+
+ index = SelectorStart + (mask & (((selector & 3) != 0
+ ? ((selector & 1)
+ ? (selector >> 1)
+ : ((usqInt) (((usqInt)selector))) >> 2)
+ : (/* begin hashBitsOf: */
+ (hash = (long32At(selector + 4)) & 0x3FFFFF),
+ (hash == 0
+ ? ((hash = (newObjectHash()) & 0x3FFFFF),
+ /* begin setHashBitsOf:to: */
+ flag("endianness"),
+ assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))),
+ long32Atput(selector + 4, ((((long32At(selector + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash))
+ : 0),
+ hash))));
+ wrapAround = 0;
+ while (1) {
+ nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
+ if (nextSelector == GIV(nilObj)) {
+ meth = null;
+ goto l1;
+ }
+ if (((nextSelector & 3) == 0)
+ && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) {
+ nextSelector = fixFollowedFieldofObjectwithInitialValue(index + SelectorStart, dictionary, nextSelector);
+ }
+ if (nextSelector == selector) {
+ /* begin followObjField:ofObject: */
+ objOop2 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord())));
+ assert(isNonImmediate(objOop2));
+ if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) {
+ objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop2);
+ }
+ methodArray = objOop2;
+ /* begin followField:ofObject: */
+ objOop11 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
+ if (((objOop11 & 3) == 0)
+ && (((longAt(objOop11)) & 0x3FFFFF) == 8)) {
+ objOop11 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop11);
+ }
+ meth = objOop11;
+ goto l1;
+ }
+ index += 1;
+ if (index == length) {
+ if (wrapAround) {
+ meth = null;
+ goto l1;
+ }
+ wrapAround = 1;
+ index = SelectorStart;
+ }
+ }
+ meth = null;
+ l1: /* end lookupMethodFor:InDictionary: */;
+ if (!(meth == null)) {
+ return meth;
+ }
+ /* begin followField:ofObject: */
+ objOop1 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
+ if (((objOop1 & 3) == 0)
+ && (((longAt(objOop1)) & 0x3FFFFF) == 8)) {
+ objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop1);
+ }
+ currentClass = objOop1;
+ }
+ return null;
+}
+
+
/* make a Point xValue@yValue.
We know both will be integers so no value nor root checking is needed */
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- StackInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06
+ StackInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1101,6 +1101,7 @@
static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag) NoDbgRegParms;
static sqInt lookupMethodInClass(sqInt class) NoDbgRegParms;
static sqInt lookupMethodNoMNUEtcInClass(sqInt class) NoDbgRegParms;
+sqInt lookupSelectorinClass(sqInt selector, sqInt class);
static StackPage * makeBaseFrameFor(sqInt aContext) NoDbgRegParms;
sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
static void mapInterpreterOops(void);
@@ -2096,7 +2097,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.966";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.969";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -54225,6 +54226,123 @@
}
+/* Lookup selector in class. Answer the method or nil. This is a debugging
+ routine. */
+
+sqInt
+lookupSelectorinClass(sqInt selector, sqInt class)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt currentClass;
+ sqInt dictionary;
+ sqInt hash;
+ sqInt index;
+ usqInt length;
+ sqInt mask;
+ sqInt meth;
+ sqInt methodArray;
+ sqInt nextSelector;
+ usqInt numSlots;
+ sqInt objOop;
+ sqInt objOop1;
+ sqInt objOop11;
+ sqInt objOop2;
+ sqInt wrapAround;
+
+ currentClass = class;
+ while (currentClass != GIV(nilObj)) {
+ /* begin followObjField:ofObject: */
+ objOop = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord())));
+ assert(isNonImmediate(objOop));
+ if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) {
+ objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop);
+ }
+ dictionary = objOop;
+ if (dictionary == GIV(nilObj)) {
+ return null;
+ }
+ /* begin lookupMethodFor:InDictionary: */
+ /* begin numSlotsOf: */
+ flag("endianness");
+ assert((classIndexOf(dictionary)) > (isForwardedObjectClassIndexPun()));
+ numSlots = byteAt(dictionary + 7);
+ length = (numSlots == 0xFF
+ ? longAt(dictionary - BaseHeaderSize)
+ : numSlots);
+ mask = (length - SelectorStart) - 1;
+
+ /* It is assumed that there are some nils in this dictionary, and search will
+ stop when one is encountered. However, if there are no nils, then wrapAround
+ will be detected the second time the loop gets to the end of the table. */
+
+ index = SelectorStart + (mask & (((selector & 3) != 0
+ ? ((selector & 1)
+ ? (selector >> 1)
+ : ((usqInt) (((usqInt)selector))) >> 2)
+ : (/* begin hashBitsOf: */
+ (hash = (long32At(selector + 4)) & 0x3FFFFF),
+ (hash == 0
+ ? ((hash = (newObjectHash()) & 0x3FFFFF),
+ /* begin setHashBitsOf:to: */
+ flag("endianness"),
+ assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))),
+ long32Atput(selector + 4, ((((long32At(selector + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash))
+ : 0),
+ hash))));
+ wrapAround = 0;
+ while (1) {
+ nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
+ if (nextSelector == GIV(nilObj)) {
+ meth = null;
+ goto l1;
+ }
+ if (((nextSelector & 3) == 0)
+ && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) {
+ nextSelector = fixFollowedFieldofObjectwithInitialValue(index + SelectorStart, dictionary, nextSelector);
+ }
+ if (nextSelector == selector) {
+ /* begin followObjField:ofObject: */
+ objOop2 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord())));
+ assert(isNonImmediate(objOop2));
+ if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) {
+ objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop2);
+ }
+ methodArray = objOop2;
+ /* begin followField:ofObject: */
+ objOop11 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
+ if (((objOop11 & 3) == 0)
+ && (((longAt(objOop11)) & 0x3FFFFF) == 8)) {
+ objOop11 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop11);
+ }
+ meth = objOop11;
+ goto l1;
+ }
+ index += 1;
+ if (index == length) {
+ if (wrapAround) {
+ meth = null;
+ goto l1;
+ }
+ wrapAround = 1;
+ index = SelectorStart;
+ }
+ }
+ meth = null;
+ l1: /* end lookupMethodFor:InDictionary: */;
+ if (!(meth == null)) {
+ return meth;
+ }
+ /* begin followField:ofObject: */
+ objOop1 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
+ if (((objOop1 & 3) == 0)
+ && (((longAt(objOop1)) & 0x3FFFFF) == 8)) {
+ objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop1);
+ }
+ currentClass = objOop1;
+ }
+ return null;
+}
+
+
/* <Integer> */
/* Marry aContext with the base frame of a new stack page. Build the base
frame to reflect the context's state. Answer the new page. */
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- StackInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06
+ StackInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1098,6 +1098,7 @@
static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag) NoDbgRegParms;
static sqInt lookupMethodInClass(sqInt class) NoDbgRegParms;
static sqInt lookupMethodNoMNUEtcInClass(sqInt class) NoDbgRegParms;
+sqInt lookupSelectorinClass(sqInt selector, sqInt class);
static StackPage * makeBaseFrameFor(sqInt aContext) NoDbgRegParms;
sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
static void mapInterpreterOops(void);
@@ -2093,7 +2094,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.966";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.969";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -54216,6 +54217,123 @@
}
+/* Lookup selector in class. Answer the method or nil. This is a debugging
+ routine. */
+
+sqInt
+lookupSelectorinClass(sqInt selector, sqInt class)
+{ DECL_MAYBE_SQ_GLOBAL_STRUCT
+ sqInt currentClass;
+ sqInt dictionary;
+ sqInt hash;
+ sqInt index;
+ usqInt length;
+ sqInt mask;
+ sqInt meth;
+ sqInt methodArray;
+ sqInt nextSelector;
+ usqInt numSlots;
+ sqInt objOop;
+ sqInt objOop1;
+ sqInt objOop11;
+ sqInt objOop2;
+ sqInt wrapAround;
+
+ currentClass = class;
+ while (currentClass != GIV(nilObj)) {
+ /* begin followObjField:ofObject: */
+ objOop = longAt((currentClass + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord())));
+ assert(isNonImmediate(objOop));
+ if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) {
+ objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, currentClass, objOop);
+ }
+ dictionary = objOop;
+ if (dictionary == GIV(nilObj)) {
+ return null;
+ }
+ /* begin lookupMethodFor:InDictionary: */
+ /* begin numSlotsOf: */
+ flag("endianness");
+ assert((classIndexOf(dictionary)) > (isForwardedObjectClassIndexPun()));
+ numSlots = byteAt(dictionary + 7);
+ length = (numSlots == 0xFF
+ ? longAt(dictionary - BaseHeaderSize)
+ : numSlots);
+ mask = (length - SelectorStart) - 1;
+
+ /* It is assumed that there are some nils in this dictionary, and search will
+ stop when one is encountered. However, if there are no nils, then wrapAround
+ will be detected the second time the loop gets to the end of the table. */
+
+ index = SelectorStart + (mask & (((selector & 3) != 0
+ ? ((selector & 1)
+ ? (selector >> 1)
+ : ((usqInt) (((usqInt)selector))) >> 2)
+ : (/* begin hashBitsOf: */
+ (hash = (long32At(selector + 4)) & 0x3FFFFF),
+ (hash == 0
+ ? ((hash = (newObjectHash()) & 0x3FFFFF),
+ /* begin setHashBitsOf:to: */
+ flag("endianness"),
+ assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))),
+ long32Atput(selector + 4, ((((long32At(selector + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash))
+ : 0),
+ hash))));
+ wrapAround = 0;
+ while (1) {
+ nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
+ if (nextSelector == GIV(nilObj)) {
+ meth = null;
+ goto l1;
+ }
+ if (((nextSelector & 3) == 0)
+ && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) {
+ nextSelector = fixFollowedFieldofObjectwithInitialValue(index + SelectorStart, dictionary, nextSelector);
+ }
+ if (nextSelector == selector) {
+ /* begin followObjField:ofObject: */
+ objOop2 = longAt((dictionary + BaseHeaderSize) + (MethodArrayIndex << (shiftForWord())));
+ assert(isNonImmediate(objOop2));
+ if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) {
+ objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop2);
+ }
+ methodArray = objOop2;
+ /* begin followField:ofObject: */
+ objOop11 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
+ if (((objOop11 & 3) == 0)
+ && (((longAt(objOop11)) & 0x3FFFFF) == 8)) {
+ objOop11 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop11);
+ }
+ meth = objOop11;
+ goto l1;
+ }
+ index += 1;
+ if (index == length) {
+ if (wrapAround) {
+ meth = null;
+ goto l1;
+ }
+ wrapAround = 1;
+ index = SelectorStart;
+ }
+ }
+ meth = null;
+ l1: /* end lookupMethodFor:InDictionary: */;
+ if (!(meth == null)) {
+ return meth;
+ }
+ /* begin followField:ofObject: */
+ objOop1 = longAt((currentClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
+ if (((objOop1 & 3) == 0)
+ && (((longAt(objOop1)) & 0x3FFFFF) == 8)) {
+ objOop1 = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, currentClass, objOop1);
+ }
+ currentClass = objOop1;
+ }
+ return null;
+}
+
+
/* <Integer> */
/* Marry aContext with the base frame of a new stack page. Build the base
frame to reflect the context's state. Answer the new page. */
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Fri Dec 5 15:14:03 PST 2014
+ Fri Dec 5 19:10:59 PST 2014
Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c 2014-12-05 23:14:12 UTC (rev 3160)
+++ branches/Cog/sistasrc/vm/cogit.c 2014-12-06 03:12:21 UTC (rev 3161)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ CCodeGenerator VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.969 uuid: cdd723c1-bec0-42d5-970f-354702984955 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -833,7 +833,6 @@
static sqInt branchIfInstanceOfBehaviorsbranches(sqInt arrayObj, AbstractInstruction **branches) NoDbgRegParms;
static sqInt branchIfInstanceOfBehaviorbranches(sqInt classObj, AbstractInstruction **branches) NoDbgRegParms;
static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms;
-static sqInt checkValidInlineCacheTag(sqInt cacheTag) NoDbgRegParms;
static sqInt checkValidOopReference(sqInt anOop) NoDbgRegParms;
static sqInt classForInlineCacheTag(sqInt inlineCacheTag) NoDbgRegParms;
static sqInt compactClassFieldMask(void);
@@ -889,6 +888,7 @@
static sqInt shouldAnnotateObjectReference(sqInt anOop) NoDbgRegParms;
static sqInt slotOffsetOfInstVarIndex(sqInt index) NoDbgRegParms;
static sqInt smallIntegerIsOnlyImmediateType(void);
+static sqInt validInlineCacheTag(sqInt cacheTag) NoDbgRegParms;
static CogSimStackEntry * ensureSpilledAtfrom(CogSimStackEntry * self_in_ensureSpilledAtfrom, sqInt baseOffset, sqInt baseRegister) NoDbgRegParms;
static CogSimStackEntry * mergeAtfrom(CogSimStackEntry * self_in_mergeAtfrom, sqInt baseOffset, sqInt baseRegister) NoDbgRegParms;
static CogSimStackEntry * popToReg(CogSimStackEntry * self_in_popToReg, sqInt reg) NoDbgRegParms;
@@ -8839,7 +8839,7 @@
}
}
else {
- if (!(asserta(checkValidInlineCacheTag(cacheTag1)))) {
+ if (!(asserta(validInlineCacheTag(cacheTag1)))) {
return 5;
}
}
@@ -8851,7 +8851,7 @@
}
}
else {
- if (!(asserta(checkValidInlineCacheTag(cacheTag1)))) {
+ if (!(asserta(validInlineCacheTag(cacheTag1)))) {
return 7;
}
}
@@ -8927,7 +8927,7 @@
/* linked non-super send, cacheTag is a cacheTag */
- if (!(checkValidInlineCacheTag(selectorOrCacheTag))) {
+ if (!(validInlineCacheTag(selectorOrCacheTag))) {
print("cache tag leak in CM ");
printHex(((sqInt)cogMethod));
print(" @ ");
@@ -9288,7 +9288,7 @@
sqInt size;
sqInt target;
- compilationBreakpointisMNUCase((cPIC->selector), lengthOf((cPIC->selector)), isMNUCase);
+ compilationBreakpointisMNUCase((cPIC->selector), numBytesOf((cPIC->selector)), isMNUCase);
allocateOpcodesbytecodes(5, 0);
assert(!(inlineCacheTagIsYoung(caseNTag)));
assert((caseNMethod != null)
@@ -9423,7 +9423,7 @@
if (isYoung(selector)) {
return 0;
}
- compilationBreakpointisMNUCase(selector, lengthOf(selector), 1);
+ compilationBreakpointisMNUCase(selector, numBytesOf(selector), 1);
assert(endCPICCase0 != null);
startAddress = allocate(closedPICSize);
if (startAddress == 0) {
@@ -9461,7 +9461,7 @@
sqInt mapSize;
sqInt startAddress;
- compilationBreakpointisMNUCase(selector, lengthOf(selector), 0);
+ compilationBreakpointisMNUCase(selector, numBytesOf(selector), 0);
startAddress = allocate(openPICSize);
if (startAddress == 0) {
return ((CogMethod *) InsufficientCodeSpace);
@@ -9501,7 +9501,7 @@
if (isYoung(selector)) {
return ((CogMethod *) YoungSelectorInPIC);
}
@@ Diff output truncated at 50000 characters. @@
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.969.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.969
Author: eem
Time: 5 December 2014, 7:01:27.391 pm
UUID: cdd723c1-bec0-42d5-970f-354702984955
Ancestors: VMMaker.oscog-eem.968
Two more cases where the mnu compilation break
point needs to be checked.
Use numBytesOf: for length of selector.
Rename checkValidInlineCacheTag: to
validInlineCacheTag:. Implement it in the right place
in the obj rep hierarchy for Spur.
Add a debug lookup routine that only looks up (and follows forwarding pointers).
=============== Diff against VMMaker.oscog-eem.968 ===============
Item was added:
+ ----- Method: CogObjectRepresentation>>validInlineCacheTag: (in category 'debug support') -----
+ validInlineCacheTag: classIndexOrTagPattern
+ self subclassResponsibility!
Item was added:
+ ----- Method: CogObjectRepresentationFor32BitSpur>>validInlineCacheTag: (in category 'debug support') -----
+ validInlineCacheTag: classIndexOrTagPattern
+ "The two valid tag patterns are 0 (Character) and 1 (SmallInteger)"
+ <var: 'classIndexOrTagPattern' type: #usqInt>
+ ^classIndexOrTagPattern <= 1
+ or: [(objectMemory classAtIndex: classIndexOrTagPattern) notNil]!
Item was added:
+ ----- Method: CogObjectRepresentationFor64BitSpur>>validInlineCacheTag: (in category 'debug support') -----
+ validInlineCacheTag: classIndexOrTagPattern
+ "The three valid tag patterns are 1 (SmallInteger), 2 (Character) and 3 (SmallFloat64)."
+ ^(classIndexOrTagPattern >= 1
+ and: [classIndexOrTagPattern <= 3])
+ or: [(objectMemory classAtIndex: classIndexOrTagPattern) notNil]!
Item was removed:
- ----- Method: CogObjectRepresentationForSpur>>checkValidInlineCacheTag: (in category 'debug support') -----
- checkValidInlineCacheTag: classIndexOrTagPattern
- ^classIndexOrTagPattern <= objectMemory tagMask
- or: [(objectMemory classAtIndex: classIndexOrTagPattern) notNil]!
Item was removed:
- ----- Method: CogObjectRepresentationForSqueakV3>>checkValidInlineCacheTag: (in category 'garbage collection') -----
- checkValidInlineCacheTag: cacheTag
- ^cacheTag = ConstZero
- or: [((cacheTag bitAnd: 1 << objectMemory shiftForWord - 1) = 0
- and: [cacheTag
- between: 1 << objectMemory compactClassFieldLSB
- and: (objectMemory compactClassIndexOfHeader: -1) << objectMemory compactClassFieldLSB])
- or: [self checkValidObjectReference: cacheTag]]!
Item was added:
+ ----- Method: CogObjectRepresentationForSqueakV3>>validInlineCacheTag: (in category 'garbage collection') -----
+ validInlineCacheTag: cacheTag
+ ^cacheTag = ConstZero
+ or: [((cacheTag bitAnd: 1 << objectMemory shiftForWord - 1) = 0
+ and: [cacheTag
+ between: 1 << objectMemory compactClassFieldLSB
+ and: (objectMemory compactClassIndexOfHeader: -1) << objectMemory compactClassFieldLSB])
+ or: [self checkValidObjectReference: cacheTag]]!
Item was changed:
----- Method: Cogit>>checkIfValidOopRef:pc:cogMethod: (in category 'garbage collection') -----
checkIfValidOopRef: annotation pc: mcpc cogMethod: cogMethod
<var: #mcpc type: #'char *'>
annotation = IsObjectReference ifTrue:
[| literal |
literal := backEnd literalBeforeFollowingAddress: mcpc asInteger.
(objectRepresentation checkValidOopReference: literal) ifFalse:
[coInterpreter print: 'object ref leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr.
^1]].
(self isSendAnnotation: annotation) ifTrue:
[| entryPoint selectorOrCacheTag offset |
entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger.
entryPoint <= methodZoneBase
ifTrue:
[offset := entryPoint]
ifFalse:
[self
offsetAndSendTableFor: entryPoint
annotation: annotation
into: [:off :table| offset := off]].
selectorOrCacheTag := backEnd inlineCacheTagAt: mcpc asInteger.
(entryPoint > methodZoneBase
and: [offset ~= cmNoCheckEntryOffset
and: [(self cCoerceSimple: entryPoint - offset to: #'CogMethod *') cmType ~= CMOpenPIC]])
ifTrue: "linked non-super send, cacheTag is a cacheTag"
+ [(objectRepresentation validInlineCacheTag: selectorOrCacheTag) ifFalse:
- [(objectRepresentation checkValidInlineCacheTag: selectorOrCacheTag) ifFalse:
[coInterpreter print: 'cache tag leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr.
^1]]
ifFalse: "unlinked send or super send; cacheTag is a selector"
[(objectRepresentation checkValidOopReference: selectorOrCacheTag) ifFalse:
[coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr.
^1]]].
^0 "keep scanning"!
Item was changed:
----- Method: Cogit>>checkIfValidOopRefAndTarget:pc:cogMethod: (in category 'garbage collection') -----
checkIfValidOopRefAndTarget: annotation pc: mcpc cogMethod: cogMethod
<var: #mcpc type: #'char *'>
| literal entryPoint |
annotation = IsObjectReference ifTrue:
[literal := backEnd literalBeforeFollowingAddress: mcpc asInteger.
(self asserta: (objectRepresentation checkValidOopReference: literal)) ifFalse:
[^1].
((objectRepresentation couldBeObject: literal)
and: [objectMemory isReallyYoungObject: literal]) ifTrue:
[(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse:
[^2]]].
(self isSendAnnotation: annotation) ifTrue:
[(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmType = CMMethod) ifFalse:
[^3].
self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into:
[:offset :cacheTag :tagCouldBeObject|
tagCouldBeObject
ifTrue:
[(objectRepresentation couldBeObject: cacheTag)
ifTrue:
[(self asserta: (objectRepresentation checkValidOopReference: cacheTag)) ifFalse:
[^4]]
ifFalse:
+ [(self asserta: (objectRepresentation validInlineCacheTag: cacheTag)) ifFalse:
- [(self asserta: (objectRepresentation checkValidInlineCacheTag: cacheTag)) ifFalse:
[^5]].
((objectRepresentation couldBeObject: cacheTag)
and: [objectMemory isReallyYoungObject: cacheTag]) ifTrue:
[(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse:
[^6]]]
ifFalse:
+ [(self asserta: (objectRepresentation validInlineCacheTag: cacheTag)) ifFalse:
- [(self asserta: (objectRepresentation checkValidInlineCacheTag: cacheTag)) ifFalse:
[^7]]].
entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger.
entryPoint > methodZoneBase ifTrue:
["It's a linked send; find which kind."
self targetMethodAndSendTableFor: entryPoint into:
[:targetMethod :sendTable|
(self asserta: (targetMethod cmType = CMMethod
or: [targetMethod cmType = CMClosedPIC
or: [targetMethod cmType = CMOpenPIC]])) ifFalse:
[^8]]]].
^0 "keep scanning"!
Item was changed:
----- Method: Cogit>>cogExtendPIC:CaseNMethod:tag:isMNUCase: (in category 'in-line cacheing') -----
cogExtendPIC: cPIC CaseNMethod: caseNMethod tag: caseNTag isMNUCase: isMNUCase
"Extend the cPIC with the supplied case. If caseNMethod is cogged dispatch direct to
its unchecked entry-point. If caseNMethod is not cogged, jump to the fast interpreter
dispatch, and if isMNUCase then dispatch to fast MNU invocation and mark the cPIC as
having the MNU case for cache flushing."
<var: #cPIC type: #'CogMethod *'>
| operand target address size end |
"stack allocate the various collections so that they
are effectively garbage collected on return."
coInterpreter
compilationBreak: cPIC selector
+ point: (objectMemory numBytesOf: cPIC selector)
- point: (objectMemory lengthOf: cPIC selector)
isMNUCase: isMNUCase.
self allocateOpcodes: 5 bytecodes: 0.
self assert: (objectRepresentation inlineCacheTagIsYoung: caseNTag) not.
"Caller patches to open pic if caseNMethod is young."
self assert: (caseNMethod notNil and: [(objectMemory isYoung: caseNMethod) not]).
(isMNUCase not
and: [coInterpreter methodHasCogMethod: caseNMethod])
ifTrue:
[operand := 0.
+ target := (coInterpreter cogMethodOf: caseNMethod) asInteger + cmNoCheckEntryOffset]
- target := (coInterpreter cogMethodOf: caseNMethod) asInteger + cmNoCheckEntryOffset]
ifFalse:
[isMNUCase ifTrue:
[cPIC cpicHasMNUCase: true].
operand := caseNMethod.
target := cPIC asInteger
+ (isMNUCase
ifTrue: [self sizeof: CogMethod]
ifFalse: [self interpretOffset - backEnd callInstructionByteSize])].
self CmpCw: caseNTag R: TempReg.
self MoveCw: operand R: SendNumArgsReg.
self JumpLongZero: target.
self MoveCw: cPIC asInteger R: ClassReg.
self JumpLong: (self cPICMissTrampolineFor: cPIC cmNumArgs).
self computeMaximumSizes.
address := self addressOfEndOfCase: cPIC cPICNumCases - 1 inCPIC: cPIC.
size := self generateInstructionsAt: address.
end := self outputInstructionsAt: address.
processor flushICacheFrom: address to: cPIC asInteger + closedPICSize.
cPIC cPICNumCases: cPIC cPICNumCases + 1.
^0!
Item was changed:
----- Method: Cogit>>cogMNUPICSelector:methodOperand:numArgs: (in category 'in-line cacheing') -----
cogMNUPICSelector: selector methodOperand: methodOperand numArgs: numArgs
<api>
"Attempt to create a one-case PIC for an MNU.
The tag for the case is at the send site and so doesn't need to be generated."
<returnTypeC: #'CogMethod *'>
| startAddress headerSize size end |
(objectMemory isYoung: selector) ifTrue:
[^0].
coInterpreter
compilationBreak: selector
+ point: (objectMemory numBytesOf: selector)
- point: (objectMemory lengthOf: selector)
isMNUCase: true.
self assert: endCPICCase0 notNil.
startAddress := methodZone allocate: closedPICSize.
startAddress = 0 ifTrue:
[coInterpreter callForCogCompiledCodeCompaction.
^0].
methodLabel
address: startAddress;
dependent: nil.
"stack allocate the various collections so that they
are effectively garbage collected on return."
self allocateOpcodes: numPICCases * 7 bytecodes: 0.
self compileMNUCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *')
methodOperand: methodOperand
numArgs: numArgs.
self computeMaximumSizes.
headerSize := self sizeof: CogMethod.
size := self generateInstructionsAt: startAddress + headerSize.
end := self outputInstructionsAt: startAddress + headerSize.
"The missOffset is the same as the interpretOffset."
self assert: missOffset = (interpretCall address + interpretCall machineCodeSize - startAddress).
self assert: startAddress + cmEntryOffset = entry address.
^self
fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *')
size: closedPICSize
numArgs: numArgs
numCases: 1
hasMNUCase: true
selector: selector !
Item was changed:
----- Method: Cogit>>cogOpenPICSelector:numArgs: (in category 'in-line cacheing') -----
cogOpenPICSelector: selector numArgs: numArgs
"Create an Open PIC. Temporarily create a direct call of ceSendFromOpenPIC:.
Should become a probe of the first-level method lookup cache followed by a
call of ceSendFromOpenPIC: if the probe fails."
<returnTypeC: #'CogMethod *'>
| startAddress headerSize codeSize mapSize end |
coInterpreter
compilationBreak: selector
+ point: (objectMemory numBytesOf: selector)
- point: (objectMemory lengthOf: selector)
isMNUCase: false.
startAddress := methodZone allocate: openPICSize.
startAddress = 0 ifTrue:
[^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *'].
methodLabel
address: startAddress;
dependent: nil.
"stack allocate the various collections so that they
are effectively garbage collected on return."
self allocateOpcodes: 100 bytecodes: 0.
self compileOpenPIC: selector numArgs: numArgs.
self computeMaximumSizes.
methodLabel concretizeAt: startAddress.
headerSize := self sizeof: CogMethod.
codeSize := self generateInstructionsAt: startAddress + headerSize.
mapSize := self generateMapAt: startAddress + openPICSize - 1 start: startAddress + cmNoCheckEntryOffset.
self assert: entry address - startAddress = cmEntryOffset.
self assert: headerSize + codeSize + mapSize <= openPICSize.
end := self outputInstructionsAt: startAddress + headerSize.
^self
fillInOPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *')
size: openPICSize
numArgs: numArgs
selector: selector !
Item was changed:
----- Method: Cogit>>cogPICSelector:numArgs:Case0Method:Case1Method:tag:isMNUCase: (in category 'in-line cacheing') -----
cogPICSelector: selector numArgs: numArgs Case0Method: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase
"Attempt to create a two-case PIC for case0CogMethod and case1Method,case1Tag.
The tag for case0CogMethod is at the send site and so doesn't need to be generated.
case1Method may be any of
- a Cog method; link to its unchecked entry-point
- a CompiledMethod; link to ceInterpretMethodFromPIC:
- a CompiledMethod; link to ceMNUFromPICMNUMethod:receiver:"
<var: #case0CogMethod type: #'CogMethod *'>
<returnTypeC: #'CogMethod *'>
| startAddress headerSize size end |
(objectMemory isYoung: selector) ifTrue:
[^self cCoerceSimple: YoungSelectorInPIC to: #'CogMethod *'].
coInterpreter
compilationBreak: selector
+ point: (objectMemory numBytesOf: selector)
- point: (objectMemory lengthOf: selector)
isMNUCase: isMNUCase.
startAddress := methodZone allocate: closedPICSize.
startAddress = 0 ifTrue:
[^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *'].
methodLabel
address: startAddress;
dependent: nil.
"stack allocate the various collections so that they
are effectively garbage collected on return."
self allocateOpcodes: numPICCases * 7 bytecodes: 0.
self compileCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *')
Case0: case0CogMethod
Case1Method: case1MethodOrNil
tag: case1Tag
isMNUCase: isMNUCase
numArgs: numArgs.
self computeMaximumSizes.
headerSize := self sizeof: CogMethod.
size := self generateInstructionsAt: startAddress + headerSize.
end := self outputInstructionsAt: startAddress + headerSize.
"The missOffset is th same as the interpretOffset."
self assert: missOffset = (interpretCall address + interpretCall machineCodeSize - startAddress).
self assert: startAddress + cmEntryOffset = entry address.
self assert: endCPICCase0 address = (startAddress + firstCPICCaseOffset).
self assert: endCPICCase1 address = (startAddress + firstCPICCaseOffset + cPICCaseSize).
^self
fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *')
size: closedPICSize
numArgs: numArgs
numCases: 2
hasMNUCase: isMNUCase
selector: selector !
Item was changed:
----- Method: Cogit>>compileCPIC:Case0:Case1Method:tag:isMNUCase:numArgs: (in category 'in-line cacheing') -----
compileCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs
"Compile the code for a two-case PIC for case0CogMethod and case1Method,case1Tag.
The tag for case0CogMethod is at the send site and so doesn't need to be generated.
case1Method may be any of
- a Cog method; jump to its unchecked entry-point
- a CompiledMethod; jump to the ceInterpretFromPIC trampoline
- nil; call ceMNUFromPIC"
<var: #cPIC type: #'CogMethod *'>
| operand targetEntry jumpNext |
<var: #case0CogMethod type: #'CogMethod *'>
<var: #targetEntry type: #'void *'>
<var: #jumpNext type: #'AbstractInstruction *'>
self assert: case1Method notNil.
+ coInterpreter
+ compilationBreak: cPIC selector
+ point: (objectMemory numBytesOf: cPIC selector)
+ isMNUCase: isMNUCase.
self compilePICProlog: numArgs.
self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not.
(isMNUCase not
and: [coInterpreter methodHasCogMethod: case1Method])
ifTrue:
[operand := 0.
targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer]
ifFalse:
[self assert: (case1Method isNil or: [(objectMemory isYoungObject: case1Method) not]).
operand := case1Method.
targetEntry := case1Method isNil ifTrue: [mnuCall] ifFalse: [interpretLabel]].
jumpNext := self compileCPICEntry.
self MoveCw: 0 R: SendNumArgsReg.
self JumpLong: case0CogMethod asInteger + cmNoCheckEntryOffset.
endCPICCase0 := self CmpCw: case1Tag R: TempReg.
jumpNext jmpTarget: endCPICCase0.
self MoveCw: operand R: SendNumArgsReg.
self JumpLongZero: (isMNUCase ifTrue: [mnuCall] ifFalse: [targetEntry]) asInteger.
endCPICCase1 := self MoveCw: cPIC asInteger R: ClassReg.
self JumpLong: (self cPICMissTrampolineFor: numArgs).
^0
!
Item was changed:
----- Method: Cogit>>compileMNUCPIC:methodOperand:numArgs: (in category 'in-line cacheing') -----
compileMNUCPIC: cPIC methodOperand: methodOperand numArgs: numArgs
"Compile the code for a one-case MNU PIC that calls ceMNUFromPIC for case0Tag
The tag for case0 is at the send site and so doesn't need to be generated."
<var: #cPIC type: #'CogMethod *'>
| jumpNext |
<var: #jumpNext type: #'AbstractInstruction *'>
+ coInterpreter
+ compilationBreak: cPIC selector
+ point: (objectMemory numBytesOf: cPIC selector)
+ isMNUCase: true.
self compilePICProlog: numArgs.
jumpNext := self compileCPICEntry.
self MoveCw: methodOperand R: SendNumArgsReg.
self JumpLong: mnuCall asInteger.
jumpNext jmpTarget: (self MoveCw: cPIC asInteger R: ClassReg).
self JumpLong: (self cPICMissTrampolineFor: numArgs).
^0
!
Item was changed:
----- Method: Cogit>>setSelectorOf:to: (in category 'jit - api') -----
setSelectorOf: cogMethod to: aSelectorOop
<api>
"If a method is compiled to machine code via a block entry it won't have a selector.
A subsequent send can find the method and hence fill in the selector."
<var: #cogMethod type: #'CogMethod *'>
"self disassembleMethod: cogMethod"
coInterpreter
compilationBreak: aSelectorOop
+ point: (objectMemory numBytesOf: aSelectorOop)
- point: (objectMemory lengthOf: aSelectorOop)
isMNUCase: false.
self assert: cogMethod cmType = CMMethod.
cogMethod selector: aSelectorOop.
(objectMemory isYoung: aSelectorOop) ifTrue:
[methodZone ensureInYoungReferrers: cogMethod]!
Item was added:
+ ----- Method: StackInterpreter>>lookupSelector:inClass: (in category 'debug support') -----
+ lookupSelector: selector inClass: class
+ "Lookup selector in class. Answer the method or nil. This is a debugging routine."
+ | currentClass dictionary |
+ <api>
+
+ currentClass := class.
+ [currentClass ~= objectMemory nilObject] whileTrue:
+ [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass.
+ dictionary = objectMemory nilObject ifTrue:
+ [^nil].
+ (self lookupMethodFor: selector InDictionary: dictionary) ifNotNil:
+ [:meth| ^meth].
+ currentClass := self superclassOf: currentClass].
+ ^nil!
Item was changed:
+ ----- Method: StackInterpreter>>mnuBreak:point:receiver: (in category 'debug support') -----
- ----- Method: StackInterpreter>>mnuBreak:point:receiver: (in category 'debugging traps') -----
mnuBreak: selectorString point: selectorLength receiver: receiverOrNil
<doNotGenerate> "C version is in platforms/Cross/vm/dispdbg.h"
"self shortPrintFrameAndCallers: localFP"
| i |
breakSelectorLength negated = selectorLength ifTrue:
[i := breakSelectorLength negated.
[i > 0] whileTrue:
[(objectMemory byteAt: selectorString + i - 1) = (breakSelector at: i) asInteger
ifTrue: [(i := i - 1) = 0 ifTrue:
[self changed: #byteCountText.
self halt: 'MNU of '
, breakSelector,
(receiverOrNil
ifNotNil: [' to ', (self shortPrint: receiverOrNil)]
ifNil: [''])]]
ifFalse: [i := 0]]]!
Item was changed:
+ ----- Method: StackInterpreter>>sendBreak:point:receiver: (in category 'debug support') -----
- ----- Method: StackInterpreter>>sendBreak:point:receiver: (in category 'debugging traps') -----
sendBreak: selectorString point: selectorLength receiver: receiverOrNil
<doNotGenerate> "C version is in platforms/Cross/vm/dispdbg.h"
"self shortPrintFrameAndCallers: localFP"
| i |
breakSelectorLength = selectorLength ifTrue:
[i := breakSelectorLength.
[i > 0] whileTrue:
[(objectMemory byteAt: selectorString + i - 1) = (breakSelector at: i) asInteger
ifTrue: [(i := i - 1) = 0 ifTrue:
[self changed: #byteCountText.
self halt: 'Send of '
, breakSelector,
(receiverOrNil
ifNotNil: [' to ', (self shortPrint: receiverOrNil)]
ifNil: [''])]]
ifFalse: [i := 0]]]!
1
0