Vm-dev January 2022

vm-dev@lists.squeakfoundation.org

15 participants
50 discussions

VM Maker: VMMaker-dtl.432.mcz
by commits＠source.squeak.org 18 Jan '22

18 Jan '22

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.432.mcz ==================== Summary ==================== Name: VMMaker-dtl.432 Author: dtl Time: 17 January 2022, 6:29:43.114 pm UUID: 89fa5bee-431a-474e-96da-dd7640dd7227 Ancestors: VMMaker-dtl.431 Clean up type declarations in RePlugin, motivated by Debian package quality checker. Adopt Eliot's changes from oscog, then fix declarations for pcrePtr and extraPtr. Remove type casts that are no longer needed. No compiler warnings on gcc now. =============== Diff against VMMaker-dtl.431 =============== Item was changed: ----- Method: RePlugin class>>declareCVarsIn: (in category 'plugin code generation') ----- declareCVarsIn: cg cg addHeaderFile:'"rePlugin.h"'. "Memory Management Error Checking" cg var: 'netMemory' declareC: 'int netMemory = 0'. + cg var: 'numAllocs' declareC: 'int numAllocs = 0'. - cg var: 'numAllocs' declareC: 'int numAllocs = 0'. cg var: 'numFrees' declareC: 'int numFrees = 0'. cg var: 'lastAlloc' declareC: 'int lastAlloc = 0'. "Support Variables for Access to Receiver Instance Variables" + cg var: 'patternStrPtr' type: 'const char *'. + cg var: 'errorStrBuffer' type: 'const char *'. + cg var: 'errorOffset' type: 'int'. + cg var: 'pcrePtr' type: 'pcre *'. + cg var: 'extraPtr' type: 'pcre_extra *'.! - cg var: 'patternStrPtr' type: 'const char * '. - cg var: 'errorStrBuffer' type: 'const char * '.! Item was changed: ----- Method: RePlugin>>allocateByteArrayAndSetRcvrExtraPtrFrom: (in category 'rcvr linkage') ----- allocateByteArrayAndSetRcvrExtraPtrFrom: anExtraPtr | extraObject extraByteArrayPtr | + <var: #anExtraPtr type: 'pcre_extra *'> <var: #extraByteArrayPtr type: 'void *'> anExtraPtr ifFalse: [extraObject := interpreterProxy nilObject] ifTrue: [ "Allocate a Smalltalk ByteArray -- lastAlloc contains the length" extraObject := interpreterProxy instantiateClass: (interpreterProxy classByteArray) indexableSize: (self cCode: 'sizeof(real_pcre_extra)'). self loadRcvrFromStackAt: 0. "Assume garbage collection after instantiation" "Copy from the C bytecode buffer to the Smalltalk ByteArray" extraByteArrayPtr := interpreterProxy arrayValueOf: extraObject. + self cCode:'memcpy(extraByteArrayPtr, anExtraPtr, sizeof(real_pcre_extra))']. - self cCode:'memcpy(extraByteArrayPtr, (void *) anExtraPtr, sizeof(real_pcre_extra))']. "Set rcvrErrorStr from errorStr and Return" self rcvrExtraPtrFrom: extraObject. self touch: extraByteArrayPtr. ^extraObject. ! Item was changed: ----- Method: RePlugin>>allocateByteArrayAndSetRcvrPCREPtrFromPCRE: (in category 'rcvr linkage') ----- allocateByteArrayAndSetRcvrPCREPtrFromPCRE: aPCREPtr | patObject patByteArrayPtr | + <var: #aPCREPtr type: 'pcre *'> <var: #patByteArrayPtr type: 'void *'> "Allocate a Smalltalk ByteArray -- lastAlloc contains the length" patObject := interpreterProxy instantiateClass: (interpreterProxy classByteArray) indexableSize: lastAlloc. self loadRcvrFromStackAt: 0. "Assume garbage collection after instantiation" "Copy from the C bytecode buffer to the Smalltalk ByteArray" patByteArrayPtr := interpreterProxy arrayValueOf: patObject. + self cCode:'memcpy(patByteArrayPtr, aPCREPtr, lastAlloc)'. - self cCode:'memcpy(patByteArrayPtr, (void *) aPCREPtr, lastAlloc)'. "Set rcvrErrorStr from errorStr and Return" self rcvrPCREBufferFrom: patObject. self touch: patByteArrayPtr. ^patObject. ! Item was changed: ----- Method: RePlugin>>primPCRECompile (in category 're primitives') ----- primPCRECompile "<rcvr primPCRECompile>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Compile the regular expression in patternStr, and if the compilation is successful, attempt to optimize the compiled expression. Store the results in <pcrePtr> and <extratr>, or fill errorStr with a meaningful errorString and errorOffset with an indicator where the error was found, applying compileFlags throughout. Answer nil with a clean compile (regardless of whether an optimization is possible, and answer with the string otherwise." <export: true> self loadRcvrFromStackAt: 0. patternStrPtr := self rcvrPatternStrPtr. compileFlags := self rcvrCompileFlags. interpreterProxy failed ifTrue:[^ nil]. + pcrePtr := self cCode: 'pcre_compile(patternStrPtr, compileFlags, &errorStrBuffer, &errorOffset, NULL)'. - pcrePtr := self cCode: '(int) pcre_compile(patternStrPtr, compileFlags, - &errorStrBuffer, &errorOffset, NULL)'. pcrePtr ifTrue: [ self allocateByteArrayAndSetRcvrPCREPtrFromPCRE: pcrePtr. + extraPtr := self cCode: 'pcre_study(pcrePtr, compileFlags, &errorStrBuffer)'. - extraPtr := self cCode: '(int) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer)'. self allocateByteArrayAndSetRcvrExtraPtrFrom: extraPtr. + self rePluginFree: pcrePtr. + extraPtr ifTrue: [self rePluginFree: extraPtr asVoidPointer]. - self rePluginFree: (self cCoerce: pcrePtr to: 'void *'). - extraPtr ifTrue: [self rePluginFree: (self cCoerce: extraPtr to: 'void *')]. interpreterProxy failed ifTrue:[^ nil]. interpreterProxy pop: 1 thenPush: interpreterProxy nilObject] ifFalse: [ errorStr := self allocateStringAndSetRcvrErrorStrFromCStr: errorStrBuffer. self rcvrErrorOffsetFrom: errorOffset. interpreterProxy failed ifTrue:[^ nil]. interpreterProxy pop: 1 thenPush: errorStr].! Item was changed: ----- Method: RePlugin>>primPCREExec (in category 're primitives') ----- primPCREExec "<rcvr primPCREExec: searchObject>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Apply the regular expression (stored in <pcrePtr> and <extratr>, generated from calls to primPCRECompile), to smalltalk String searchObject using <matchOptions>. If there is no match, answer nil. Otherwise answer a ByteArray of offsets representing the results of the match." | searchObject searchBuffer length result matchSpacePtr matchSpaceSize | <export: true> <var:#searchBuffer type: 'char *'> <var:#matchSpacePtr type: 'int *'> "Load Parameters" searchObject := interpreterProxy stackObjectValue: 0. searchBuffer := interpreterProxy arrayValueOf: searchObject. length := interpreterProxy byteSizeOf: searchObject. self loadRcvrFromStackAt: 1. "Load Instance Variables" pcrePtr := self rcvrPCREBufferPtr. extraPtr := self rcvrExtraPtr. matchFlags := self rcvrMatchFlags. matchSpacePtr := self rcvrMatchSpacePtr. matchSpaceSize := self rcvrMatchSpaceSize. interpreterProxy failed ifTrue:[^ nil]. result := self + cCode: 'pcre_exec(pcrePtr, extraPtr, - cCode: 'pcre_exec((pcre *)pcrePtr, (pcre_extra *)extraPtr, searchBuffer, length, 0, matchFlags, matchSpacePtr, matchSpaceSize)'. interpreterProxy pop: 2; pushInteger: result. "empty call so compiler doesn't bug me about variables not used" self touch: searchBuffer; touch: matchSpacePtr; touch: matchSpaceSize; touch: length ! Item was changed: ----- Method: RePlugin>>primPCREExecfromto (in category 're primitives') ----- primPCREExecfromto "<rcvr primPCREExec: searchObject from: fromInteger to: toInteger>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Apply the regular expression (stored in <pcrePtr> and <extratr>, generated from calls to primPCRECompile), to smalltalk String searchObject using <matchOptions>, beginning at offset <fromInteger> and continuing until offset <toInteger>. If there is no match, answer nil. Otherwise answer a ByteArray of offsets representing the results of the match." | searchObject searchBuffer length result matchSpacePtr matchSpaceSize fromInteger toInteger | <export: true> <var:#searchBuffer type: 'char *'> <var:#matchSpacePtr type: 'int *'> "Load Parameters" toInteger := interpreterProxy stackIntegerValue: 0. fromInteger := interpreterProxy stackIntegerValue: 1. searchObject := interpreterProxy stackObjectValue: 2. searchBuffer := interpreterProxy arrayValueOf: searchObject. length := interpreterProxy byteSizeOf: searchObject. self loadRcvrFromStackAt: 3. "Validate parameters" interpreterProxy success: (1 <= fromInteger). interpreterProxy success: (toInteger<=length). fromInteger := fromInteger - 1. "Smalltalk offsets are 1-based" interpreterProxy success: (fromInteger<=toInteger). "adjust length, searchBuffer" length := toInteger - fromInteger. searchBuffer := searchBuffer + fromInteger. "Load Instance Variables" pcrePtr := self rcvrPCREBufferPtr. extraPtr := self rcvrExtraPtr. matchFlags := self rcvrMatchFlags. matchSpacePtr := self rcvrMatchSpacePtr. matchSpaceSize := self rcvrMatchSpaceSize. interpreterProxy failed ifTrue:[^ nil]. result := self + cCode: 'pcre_exec(pcrePtr, extraPtr, - cCode: 'pcre_exec((pcre *)pcrePtr, (pcre_extra *)extraPtr, searchBuffer, length, 0, matchFlags, matchSpacePtr, matchSpaceSize)'. interpreterProxy pop: 4; pushInteger: result. "empty call so compiler doesn't bug me about variables not used" self touch: searchBuffer; touch: matchSpacePtr; touch: matchSpaceSize; touch: length ! Item was changed: ----- Method: RePlugin>>primPCRENumSubPatterns (in category 're primitives') ----- primPCRENumSubPatterns "<rcvr primPCRENumSubPatterns>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Return the number of subpatterns captured by the compiled pattern." <export: true> | ncap | "Load Parameters" self loadRcvrFromStackAt: 0. "Load Instance Variables" pcrePtr := self rcvrPCREBufferPtr. + self cCode: 'pcre_fullinfo(pcrePtr, NULL, PCRE_INFO_CAPTURECOUNT, &ncap)' - self cCode: 'pcre_fullinfo((const pcre *)pcrePtr, NULL, PCRE_INFO_CAPTURECOUNT, &ncap)' inSmalltalk: [ncap := -1]. interpreterProxy pop: 1; pushInteger: ncap. ! Item was changed: ----- Method: RePlugin>>rcvrExtraPtr (in category 'rcvr linkage') ----- rcvrExtraPtr |extraObj| <inline: true> + <returnTypeC: 'pcre_extra'> extraObj := interpreterProxy fetchPointer: 3 ofObject: rcvr. ^self cCoerce: (extraObj = interpreterProxy nilObject ifTrue: [nil] ifFalse: [interpreterProxy arrayValueOf: extraObj]) + to: 'pcre_extra *'! - to: 'int'! Item was changed: ----- Method: RePlugin>>rcvrPCREBufferPtr (in category 'rcvr linkage') ----- rcvrPCREBufferPtr - <inline: true> + <returnTypeC: 'pcre *'> ^self cCoerce: (interpreterProxy fetchArray: 2 ofObject: rcvr) + to: 'pcre *'! - to: 'int'.! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.19.13'! - ^'4.19.12'!

1 0

bugs in DeflatePlugin?
by Florin Mateoc 15 Jan '22

15 Jan '22

Hi all, and Happy New Year! I think I just found a couple of bugs in the DeflatePlugin. They were causing errors in my JsSqueak, I don't fully understand why they don't seem to cause problems in Squeak. Anyway, after I fixed them, the primitives work and the PNGReadWriterTest tests are all succeeding for me. One is in #loadZipEncoderFrom: The method checks and then determines the writeStreamInstSize and then fetches the bitBuffer and bitPosition (the first two instvars of ZipEncoder, a direct subclass of WriteStream) from offsets writeStreamInstSize + 1 and writeStreamInstSize + 2, although the fetches are 0-based The other is in #primitiveZipSendBlock The method, still working on a ZipEncoder, at the end stores the modified values for bitBuffer and bitPosition at offset readStreamInstSize + 1 and readStreamInstSize + 2, which is just wrong. As I said, I don't quite get why this does not cause at least image-side errors if not VM crashes in Squeak, but they should probably be fixed anyway :) All the best, Florin

6 10

VM Maker: VMMaker.oscog-eem.3139.mcz
by commits＠source.squeak.org 15 Jan '22

15 Jan '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3139.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3139 Author: eem Time: 14 January 2022, 9:51:18.52117 pm UUID: 6f3e6215-11f9-48ff-aaf4-defb29288db8 Ancestors: VMMaker.oscog-eem.3138 In-image compilation: initialize the CoInterpreter well enough (in setUpForUseByFacade:) to not be misled into thinking profiling is in effect. =============== Diff against VMMaker.oscog-eem.3138 =============== Item was changed: ----- Method: CoInterpreter>>setUpForUseByFacade: (in category 'debug support') ----- setUpForUseByFacade: aCurrentImageCoInterpreterFacade "Set up variables with default values so that other initializations work. numStackPages needs to be initialized so that interpreterAllocationReserveBytes can be computed." <doNotGenerate> + numStackPages := 0. + method := newMethod := profileSemaphore := profileProcess := profileMethod := objectMemory nilObject! - numStackPages := 0! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>coInterpreter (in category 'accessing') ----- + coInterpreter + ^coInterpreter! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>cogit: (in category 'initialize-release') ----- cogit: aCogit cogit := aCogit. cogit objectMemory ifNil: [cogit instVarNamed: 'objectMemory' put: objectMemory]. coInterpreter cogit: aCogit. (objectMemory respondsTo: #cogit:) ifTrue: [objectMemory cogit: aCogit]. (objectMemory respondsTo: #coInterpreter:) ifTrue: [objectMemory coInterpreter: coInterpreter]. coInterpreter setUpForUseByFacade: self. + objectMemory setUpForUseByFacade: self! - objectMemory setUpForUseByFacade: self. - self initializeObjectMap! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>initialize (in category 'initialize-release') ----- initialize objectMemory := self class objectMemoryClass simulatorClass new. objectMemory allocateMemoryOfSize: 4*1024*1024. memory := objectMemory memory. objectMemory initializeFreeSpaceForFacadeFrom: self startOfMemory to: self variablesBase. coInterpreter := CoInterpreter new. coInterpreter instVarNamed: 'objectMemory' put: (false ifTrue: [objectMemory] ifFalse: [self]); instVarNamed: 'primitiveTable' put: (CArrayAccessor on: CoInterpreter primitiveTable copy). + variables := Dictionary new. + self initializeObjectMap! - variables := Dictionary new! Item was removed: - ----- Method: CurrentImageCoInterpreterFacade>>primitivePropertyFlags: (in category 'accessing') ----- - primitivePropertyFlags: primIndex - ^coInterpreter primitivePropertyFlags: primIndex! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>splObj: (in category 'accessing') ----- splObj: splObjIndex ^splObjIndex caseOf: { [ClassArray] -> [self oopForObject: Array]. + [ClassByteArray] -> [self oopForObject: ByteArray]. [ClassCharacter] -> [self oopForObject: Character]. [ClassLargeNegativeInteger] -> [self oopForObject: LargeNegativeInteger]. + [ClassLargePositiveInteger] -> [self oopForObject: LargePositiveInteger]. - [ClassLargePositiveInteger] -> [self oopForObject: LargePositiveInteger]. [ClassSmallInteger] -> [self oopForObject: SmallInteger]. [CompactClasses] -> [self oopForObject: Smalltalk compactClassesArray]. + [LowcodeContextMark] -> [self oopForObject: (Smalltalk globals at: #LowcodeNativeContext ifPresent: [:cls | cls signalingObject ]) ] - [LowcodeContextMark] -> [self oopForObject: (Smalltalk globals at: #LowcodeNativeContext ifPresent: [:cls | cls signalingObject ]) ] }!

1 0

Unexpected #resume behavior
by Jaromir Matas 14 Jan '22

14 Jan '22

Hi Eliot, all, I'm baffled by this example: p := [Semaphore new wait] fork. Processor yield. p resume explore I expected to get an error but the process just gets out of the semaphore and finishes happily. #resume comment says: Primitive. Allow the process that the receiver represents to continue. Put the receiver in line to become the activeProcess. *Fail if the receiver is already waiting in a queue (in a Semaphore or ProcessScheduler)*. Fail if the receiver's suspendedContext is not a context. The following works as expected - p sits at the semaphore: p := [Semaphore new wait] fork. Processor yield. p explore This works as well (with the new VM) - p backs up and sits before the wait: p := [Semaphore new wait] fork. Processor yield. p suspend. p explore And this works too indeed - p sits at the semaphore again after suspend. p := [Semaphore new wait] fork. Processor yield. p suspend. p resume explore Is this a bug? Or is the comment just outdated? I've been trying to figure out possible ways how to prevent resuming a process being terminated (other than setting its suspendedContext to nil) and this unexpected behavior gave me a real hard time :) Many thanks for your help. Best regards, Jaromir

1 1

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

14 Jan '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3138.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3138 Author: eem Time: 13 January 2022, 4:59:18.515788 pm UUID: 2fdd9be0-6469-4273-85a4-880cf37b04d7 Ancestors: VMMaker.oscog-eem.3137 Cog: Fix a slip in genPrimReturnEnterCogCodeEnilopmart:. The call to ceTakeProfileSample: should take nil as its argument; the old code passed TempReg (!!). Relatedly, better comment all users/implementors of the genMarshallNArgs:arg:arg:arg:arg: trampolineArgConstant: & trampolineArgValue: hack. Fix varying inferrence of the type of Spur's numPointerSlotsOf: by defining the retrn type of numPointerSlotsOf:format: as usqInt. =============== Diff against VMMaker.oscog-eem.3137 =============== Item was changed: ----- Method: CogARMCompiler>>genMarshallNArgs:arg:arg:arg:arg: (in category 'abi') ----- genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 "Generate the code to pass up to four arguments in a C run-time call. Hack: each argument is either a negative number, which encodes a constant, or a non-negative number, that of a register. + The encoding for constants is defined by trampolineArgConstant: & trampolineArgValue:. + Pass a constant as the result of trampolineArgConstant:. Run-time calls have no more than four arguments, so chosen so that on ARM, where in its C ABI the first four integer arguments are passed in registers, all arguments can be passed in registers. We defer to the back end to generate this code not so much that the back end knows whether it uses the stack or registers to pass arguments (it does, but...). In fact we defer for an extremely evil reason. Doing so allows the x64 (where up to 6 args are passed) to assign the register arguments in an order that allows some of the argument registers to be used for specific abstract registers, specifically ReceiverResultReg and ClassReg. This is evil, evil, evil, but also it's really nice to keep using the old register assignments the original author has grown accustomed to." <inline: true> numArgs = 0 ifTrue: [^self]. "Avoid arg regs being overwritten before they are read." numArgs > 1 ifTrue: [((cogit isTrampolineArgConstant: regOrConst1) not and: [regOrConst1 = CArg0Reg]) ifTrue: [cogit MoveR: regOrConst1 R: Extra0Reg. ^self genMarshallNArgs: numArgs arg: regOrConst0 arg: Extra0Reg arg: regOrConst2 arg: regOrConst3]. numArgs > 2 ifTrue: [((cogit isTrampolineArgConstant: regOrConst2) not and: [regOrConst2 = CArg0Reg or: [regOrConst2 = CArg1Reg]]) ifTrue: [cogit MoveR: regOrConst2 R: Extra1Reg. ^self genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: Extra1Reg arg: regOrConst3]. numArgs > 3 ifTrue: [((cogit isTrampolineArgConstant: regOrConst3) not and: [regOrConst3 = CArg0Reg or: [regOrConst3 = CArg1Reg or: [regOrConst3 = CArg2Reg]]]) ifTrue: [cogit MoveR: regOrConst3 R: Extra2Reg. ^self genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: Extra2Reg]]]]. (cogit isTrampolineArgConstant: regOrConst0) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst0) R: CArg0Reg] ifFalse: [regOrConst0 ~= CArg0Reg ifTrue: [cogit MoveR: regOrConst0 R: CArg0Reg]]. numArgs = 1 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst1) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst1) R: CArg1Reg] ifFalse: [regOrConst1 ~= CArg1Reg ifTrue: [cogit MoveR: regOrConst1 R: CArg1Reg]]. numArgs = 2 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst2) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst2) R: CArg2Reg] ifFalse: [regOrConst2 ~= CArg2Reg ifTrue: [cogit MoveR: regOrConst2 R: CArg2Reg]]. numArgs = 3 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst3) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst3) R: CArg3Reg] ifFalse: [regOrConst3 ~= CArg3Reg ifTrue: [cogit MoveR: regOrConst3 R: CArg3Reg]]! Item was changed: ----- Method: CogARMv8Compiler>>genMarshallNArgs:arg:arg:arg:arg: (in category 'abi') ----- genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 "Generate the code to pass up to four arguments in a C run-time call. Hack: each argument is either a negative number, which encodes a constant, or a non-negative number, that of a register. + The encoding for constants is defined by trampolineArgConstant: & trampolineArgValue:. + Pass a constant as the result of trampolineArgConstant:. Run-time calls have no more than four arguments, so chosen so that on ARM, where in its C ABI the first four integer arguments are passed in registers, all arguments can be passed in registers. We defer to the back end to generate this code not so much that the back end knows whether it uses the stack or registers to pass arguments (it does, but...). In fact we defer for an extremely evil reason. Doing so allows the x64 (where up to 6 args are passed) to assign the register arguments in an order that allows some of the argument registers to be used for specific abstract registers, specifically ReceiverResultReg and ClassReg. This is evil, evil, evil, but also it's really nice to keep using the old register assignments the original author has grown accustomed to." <inline: true> numArgs = 0 ifTrue: [^self]. "Avoid arg regs being overwritten before they are read." numArgs > 1 ifTrue: [((cogit isTrampolineArgConstant: regOrConst1) not and: [regOrConst1 = CArg0Reg]) ifTrue: [cogit MoveR: regOrConst1 R: Extra0Reg. ^self genMarshallNArgs: numArgs arg: regOrConst0 arg: Extra0Reg arg: regOrConst2 arg: regOrConst3]. numArgs > 2 ifTrue: [((cogit isTrampolineArgConstant: regOrConst2) not and: [regOrConst2 = CArg0Reg or: [regOrConst2 = CArg1Reg]]) ifTrue: [cogit MoveR: regOrConst2 R: Extra1Reg. ^self genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: Extra1Reg arg: regOrConst3]. numArgs > 3 ifTrue: [((cogit isTrampolineArgConstant: regOrConst3) not and: [regOrConst3 = CArg0Reg or: [regOrConst3 = CArg1Reg or: [regOrConst3 = CArg2Reg]]]) ifTrue: [cogit MoveR: regOrConst3 R: Extra2Reg. ^self genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: Extra2Reg]]]]. (cogit isTrampolineArgConstant: regOrConst0) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst0) R: CArg0Reg] ifFalse: [cogit MoveR: regOrConst0 R: CArg0Reg]. numArgs = 1 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst1) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst1) R: CArg1Reg] ifFalse: [cogit MoveR: regOrConst1 R: CArg1Reg]. numArgs = 2 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst2) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst2) R: CArg2Reg] ifFalse: [cogit MoveR: regOrConst2 R: CArg2Reg]. numArgs = 3 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst3) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst3) R: CArg3Reg] ifFalse: [cogit MoveR: regOrConst3 R: CArg3Reg]! Item was changed: ----- Method: CogAbstractInstruction>>genMarshallNArgs:arg:arg:arg:arg: (in category 'abi') ----- genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 "Generate the code to pass up to four arguments in a C run-time call. Hack: each argument is either a negative number, which encodes a constant, or a non-negative number, that of a register. + The encoding for constants is defined by trampolineArgConstant: & trampolineArgValue:. + Pass a constant as the result of trampolineArgConstant:. Run-time calls have no more than four arguments, so chosen so that on ARM, where in its C ABI the first four integer arguments are passed in registers, all arguments can be passed in registers. We defer to the back end to generate this code not so much that the back end knows whether it uses the stack or registers to pass arguments (it does, but...). In fact we defer for an extremely evil reason. Doing so allows the x64 (where up to 6 args are passed) to assign the register arguments in an order that allows some of the argument registers to be used for specific abstract registers, specifically ReceiverResultReg and ClassReg. This is evil, evil, evil, but also it's really nice to keep using the old register assignments the original author has grown accustomed to." <inline: true> ^self subclassResponsibility! Item was changed: ----- Method: CogIA32Compiler>>genMarshallNArgs:arg:arg:arg:arg: (in category 'abi') ----- genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 "Generate the code to pass up to four arguments in a C run-time call. Hack: each argument is either a negative number, which encodes a constant, or a non-negative number, that of a register. + The encoding for constants is defined by trampolineArgConstant: & trampolineArgValue:. + Pass a constant as the result of trampolineArgConstant:. Run-time calls have no more than four arguments, so chosen so that on ARM, where in its C ABI the first four integer arguments are passed in registers, all arguments can be passed in registers. We defer to the back end to generate this code not so much that the back end knows whether it uses the stack or registers to pass arguments (it does, but...). In fact we defer for an extremely evil reason. Doing so allows the x64 (where up to 6 args are passed) to assign the register arguments in an order that allows some of the argument registers to be used for specific abstract registers, specifically ReceiverResultReg and ClassReg. This is evil, evil, evil, but also it's really nice to keep using the old register assignments the original author has grown accustomed to." <inline: true> numArgs = 0 ifTrue: [^self]. numArgs > 1 ifTrue: [numArgs > 2 ifTrue: [numArgs > 3 ifTrue: [(cogit isTrampolineArgConstant: regOrConst3) ifFalse: [cogit PushR: regOrConst3] ifTrue: [cogit PushCq: (cogit trampolineArgValue: regOrConst3)]]. (cogit isTrampolineArgConstant: regOrConst2) ifFalse: [cogit PushR: regOrConst2] ifTrue: [cogit PushCq: (cogit trampolineArgValue: regOrConst2)]]. (cogit isTrampolineArgConstant: regOrConst1) ifFalse: [cogit PushR: regOrConst1] ifTrue: [cogit PushCq: (cogit trampolineArgValue: regOrConst1)]]. (cogit isTrampolineArgConstant: regOrConst0) ifFalse: [cogit PushR: regOrConst0] ifTrue: [cogit PushCq: (cogit trampolineArgValue: regOrConst0)]! Item was changed: ----- Method: CogMIPSELCompiler>>genMarshallNArgs:arg:arg:arg:arg: (in category 'abi') ----- genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 "Generate the code to pass up to four arguments in a C run-time call. Hack: each argument is either a negative number, which encodes a constant, or a non-negative number, that of a register. + The encoding for constants is defined by trampolineArgConstant: & trampolineArgValue:. + Pass a constant as the result of trampolineArgConstant:. Run-time calls have no more than four arguments, so chosen so that on ARM, where in its C ABI the first four integer arguments are passed in registers, all arguments can be passed in registers. We defer to the back end to generate this code not so much that the back end knows whether it uses the stack or registers to pass arguments (it does, but...). In fact we defer for an extremely evil reason. Doing so allows the x64 (where up to 6 args are passed) to assign the register arguments in an order that allows some of the argument registers to be used for specific abstract registers, specifically ReceiverResultReg and ClassReg. This is evil, evil, evil, but also it's really nice to keep using the old register assignments the original author has grown accustomed to." <inline: true> self flag: #OABI. numArgs = 0 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst0) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst0) R: A0] ifFalse: [cogit MoveR: regOrConst0 R: A0]. numArgs = 1 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst1) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst1) R: A1] ifFalse: [cogit MoveR: regOrConst1 R: A1]. numArgs = 2 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst2) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst2) R: A2] ifFalse: [cogit MoveR: regOrConst2 R: A2]. numArgs = 3 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst3) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst3) R: A3] ifFalse: [cogit MoveR: regOrConst3 R: A3]! Item was changed: ----- Method: CogX64Compiler>>genMarshallNArgs:arg:arg:arg:arg: (in category 'abi') ----- genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 "Generate the code to pass up to four arguments in a C run-time call. Hack: each argument is either a negative number, which encodes a positive constant, or a non-negative number, that of a register. + The encoding for constants is defined by trampolineArgConstant: & trampolineArgValue:. + Pass a constant as the result of trampolineArgConstant:. Run-time calls have no more than four arguments, so chosen so that on ARM32, where in its C ABI the first four integer arguments are passed in registers, all arguments can be passed in registers. We defer to the back end to generate this code not so much that the back end knows whether it uses the stack or registers to pass arguments (it does, but...). In fact we defer for an extremely evil reason. Doing so allows the x64 (where up to 6 args are passed) to assign the register arguments in an order that allows some of the argument registers to be used for specific abstract registers, specifically ReceiverResultReg and ClassReg. This is evil, evil, evil, but also it's really nice to keep using the old register assignments the original author has grown accustomed to. How can this possibly work? Look at Cogit class>>runtime for a list of the run-time calls and their arguments, including which arguments are passed in which registers. Look at CogX64Compiler's subclass implementations of initializeAbstractRegisters. There are no calls in which ReceiverResultReg (RDX) and/or ClassReg (RCX) are passed along with Arg0Reg and Arg1Reg, and none in which the use of either ReceiverResultReg or ClassReg conflict for args 3 & 4. So if args are assigned in order, the registers do not get overwritten. Yes, this is evil, but it's so nice to continue to use RCX & RDX. Argument registers for args 0 to 3 in SysV are RDI RSI RDX RCX, and in Win64 are RCX RDX R8 R9" <inline: true> SysV ifFalse: "WIN64 ABI allways reserve shadow space on the stack for callee to save up to 4 register parameters" [cogit SubCq: 32 R: RSP]. numArgs = 0 ifTrue: [^self]. self assert: numArgs <= 4. (cogit isTrampolineArgConstant: regOrConst0) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst0) R: CArg0Reg] "a.k.a. Arg0Reg" ifFalse: [regOrConst0 ~= CArg0Reg ifTrue: [cogit MoveR: regOrConst0 R: CArg0Reg]]. numArgs = 1 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst1) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst1) R: CArg1Reg] "a.k.a. Arg1Reg" ifFalse: [regOrConst1 ~= CArg1Reg ifTrue: [cogit MoveR: regOrConst1 R: CArg1Reg]]. numArgs = 2 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst2) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst2) R: CArg2Reg] "a.k.a. ReceiverResultReg (SysV) ClassReg (Win64)" ifFalse: [regOrConst2 ~= CArg2Reg ifTrue: [cogit MoveR: regOrConst2 R: CArg2Reg]]. numArgs = 3 ifTrue: [^self]. (cogit isTrampolineArgConstant: regOrConst3) ifTrue: [cogit MoveCq: (cogit trampolineArgValue: regOrConst3) R: CArg3Reg] "a.k.a. ClassReg (SysV) ReceiverResultReg (Win64)" ifFalse: [regOrConst3 ~= CArg3Reg ifTrue: [cogit MoveR: regOrConst3 R: CArg3Reg]]! Item was changed: ----- Method: Cogit>>compileCallFor:numArgs:arg:arg:arg:arg:floatResultReg:regsToSave: (in category 'initialization') ----- compileCallFor: aRoutine numArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 floatResultReg: resultRegOrNone regsToSave: regMask "Generate a call to aRoutine with up to 4 arguments. If resultRegOrNone is not NoReg assign the C result to resultRegOrNone. If saveRegs, save all registers. Hack: a negative arg value indicates an abstract register, a non-negative value + indicates a constant. The encoding for constants is defined by trampolineArgConstant: + & trampolineArgValue:. Pass a constant as the result of trampolineArgConstant:." - indicates a constant." <var: #aRoutine type: #'void *'> <inline: false> | regsToSave | regsToSave := resultRegOrNone = NoReg ifTrue: [regMask] ifFalse: [regMask bitClear: (self registerMaskFor: resultRegOrNone)]. cStackAlignment > objectMemory wordSize ifTrue: [backEnd genAlignCStackSavingRegisters: regsToSave numArgs: numArgs wordAlignment: cStackAlignment / objectMemory wordSize]. backEnd genSaveRegs: regsToSave; genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3. self CallFullRT: (self cCode: [aRoutine asUnsignedInteger] inSmalltalk: [self simulatedTrampolineFor: aRoutine]). resultRegOrNone ~= NoReg ifTrue: [backEnd cFloatResultToRd: resultRegOrNone]. backEnd genRemoveNArgsFromStack: numArgs; genRestoreRegs: regsToSave! Item was changed: ----- Method: Cogit>>compileCallFor:numArgs:arg:arg:arg:arg:resultReg:regsToSave: (in category 'initialization') ----- compileCallFor: aRoutine numArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 resultReg: resultRegOrNone regsToSave: regMask "Generate a call to aRoutine with up to 4 arguments. If resultRegOrNone is not NoReg assign the C result to resultRegOrNone. If saveRegs, save all registers. Hack: a negative arg value indicates an abstract register, a non-negative value + indicates a constant. The encoding for constants is defined by trampolineArgConstant: + & trampolineArgValue:. Pass a constant as the result of trampolineArgConstant:." - indicates a constant." <var: #aRoutine type: #'void *'> <inline: false> | regsToSave | regsToSave := resultRegOrNone = NoReg ifTrue: [regMask] ifFalse: [regMask bitClear: (self registerMaskFor: resultRegOrNone)]. cStackAlignment > objectMemory wordSize ifTrue: [backEnd genAlignCStackSavingRegisters: regsToSave numArgs: numArgs wordAlignment: cStackAlignment / objectMemory wordSize]. backEnd genSaveRegs: regsToSave; genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3. self CallFullRT: (self cCode: [aRoutine asUnsignedInteger] inSmalltalk: [self simulatedTrampolineFor: aRoutine]). backEnd genWriteCResultIntoReg: resultRegOrNone; genRemoveNArgsFromStack: numArgs; genRestoreRegs: regsToSave! Item was changed: ----- Method: Cogit>>compileCallFor:numArgs:arg:arg:arg:arg:resultReg:resultReg:regsToSave: (in category 'initialization') ----- compileCallFor: aRoutine numArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 resultReg: resultRegOrNone resultReg: resultReg2OrNone regsToSave: regMask "Generate a call to aRoutine with up to 4 arguments. If resultRegOrNone is not NoReg assign the C result to resultRegOrNone. If saveRegs, save all registers. Hack: a negative arg value indicates an abstract register, a non-negative value + indicates a constant. The encoding for constants is defined by trampolineArgConstant: + & trampolineArgValue:. Pass a constant as the result of trampolineArgConstant:." - indicates a constant." <var: #aRoutine type: #'void *'> <inline: false> | regsToSave | regsToSave := resultRegOrNone = NoReg ifTrue: [regMask] ifFalse: [regMask bitClear: (self registerMaskFor: resultRegOrNone)]. cStackAlignment > objectMemory wordSize ifTrue: [backEnd genAlignCStackSavingRegisters: regsToSave numArgs: numArgs wordAlignment: cStackAlignment / objectMemory wordSize]. backEnd genSaveRegs: regsToSave; genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3. self CallFullRT: (self cCode: [aRoutine asUnsignedInteger] inSmalltalk: [self simulatedTrampolineFor: aRoutine]). backEnd genWriteCResultIntoReg: resultRegOrNone; genWriteCSecondResultIntoReg: resultReg2OrNone; genRemoveNArgsFromStack: numArgs; genRestoreRegs: regsToSave! Item was changed: ----- Method: Cogit>>trampolineArgConstant: (in category 'initialization') ----- + trampolineArgConstant: booleanIntegerOrNil - trampolineArgConstant: booleanOrInteger "Encode true and false and 0 to N such that they can't be confused for register numbers (including NoReg) and can be tested for by isTrampolineArgConstant: and decoded by trampolineArgValue:" <inline: true> self cCode: [] + inSmalltalk: + [booleanIntegerOrNil isInteger ifFalse: + [^self trampolineArgConstant: (booleanIntegerOrNil + ifNil: [0] + ifNotNil: [booleanIntegerOrNil ifTrue: [1] ifFalse: [0]])]]. + self assert: booleanIntegerOrNil >= 0. + ^-2 - booleanIntegerOrNil "0...N => -2...-(N+2)"! - inSmalltalk: [booleanOrInteger isInteger ifFalse: [^self trampolineArgConstant: (booleanOrInteger ifTrue: [1] ifFalse: [0])]]. - self assert: booleanOrInteger >= 0. - ^-2 - booleanOrInteger "0...N => -2...-(N+2)"! Item was changed: ----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive:flags: (in category 'primitive generators') ----- compileInterpreterPrimitive: primitiveRoutine flags: flags "Compile a call to an interpreter primitive. Call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | jmp continueAfterProfileSample jumpToTakeSample | self deny: (backEnd hasVarBaseRegister and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). "Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers" self genExternalizePointersForPrimitiveCall. "Switch to the C stack." self genLoadCStackPointersForPrimCall. "Old old full prim trace is in VMMaker-eem.550 and prior. Old simpler full prim trace is in VMMaker-eem.2969 and prior." (coInterpreter recordPrimTraceForMethod: methodObj) ifTrue: [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self AddCq: methodOrBlockNumArgs R: TempReg]. "As small or smaller than move on most archs" self MoveR: TempReg Aw: coInterpreter argumentCountAddress. "If required, set primitiveFunctionPointer and newMethod" (flags anyMask: PrimCallNeedsPrimitiveFunction) ifTrue: [self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress]. (flags anyMask: PrimCallNeedsNewMethod+PrimCallMayEndureCodeCompaction) ifTrue: ["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness." (flags anyMask: PrimCallMayEndureCodeCompaction) ifTrue: [needsFrame := true]. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress]. "Invoke the primitive. If the primitive (potentially) contains a call-back then its code may disappear and consequently we cannot return here, sicne here may evaporate. Instead sideways-call the routine, substituting cePrimReturnEnterCogCode[Profiling] as the return address, so the call always returns there." self PrefetchAw: coInterpreter primFailCodeAddress. (flags anyMask: PrimCallMayEndureCodeCompaction) ifTrue: ["On Spur ceActivateFailingPrimitiveMethod: would like to retry if forwarders are found. So insist on PrimCallNeedsPrimitiveFunction being set too." objectMemory hasSpurMemoryManagerAPI ifTrue: [self assert: (flags anyMask: PrimCallNeedsPrimitiveFunction)]. backEnd genMarshallNArgs: 0 arg: nil arg: nil arg: nil arg: nil; genSubstituteReturnAddress: ((flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [cePrimReturnEnterCogCodeProfiling] ifFalse: [cePrimReturnEnterCogCode]). self JumpFullRT: primitiveRoutine asInteger. ^0]. "Call the C primitive routine." + backEnd genMarshallNArgs: 0 arg: nil arg: nil arg: nil arg: nil. + "If the primitive is in the interpreter then its address won't change relative to the code zone over time, + whereas if it is in a plugin its address could change if the module is un/re/over/loaded. + So if in the interpreter and in range use a normal call instruction." + ((flags anyMask: PrimCallIsInternalPrim) + and: [backEnd isWithinCallRange: primitiveRoutine asInteger]) + ifTrue: [self CallRT: primitiveRoutine asInteger] + ifFalse: [self CallFullRT: primitiveRoutine asInteger]. - backEnd genMarshallNArgs: 0 arg: 0 arg: 0 arg: 0 arg: 0. - self CallFullRT: primitiveRoutine asInteger. backEnd genRemoveNArgsFromStack: 0. objectRepresentation maybeCompileRetryOnPrimitiveFail: primitiveIndex. "Switch back to the Smalltalk stack. Stack better be in either of these two states: success: stackPointer -> result (was receiver) arg1 ... argN return pc failure: receiver arg1 ... stackPointer -> argN return pc" backEnd genLoadStackPointersForPrimCall: ClassReg. "genLoadStackPointersForPrimCall: leaves the stack in these states: NoLinkRegister LinkRegister success: result (was receiver) stackPointer -> result (was receiver) stackPointer -> arg1 arg1 ... ... argN argN return pc failure: receiver receiver arg1 arg1 ... ... argN stackPointer -> argN stackPointer -> return pc which corresponds to the stack on entry after pushRegisterArgs. In either case we can write the instructionPointer to top of stack or load it into the LinkRegister to reestablish the return pc." backEnd hasLinkRegister ifTrue: [self MoveAw: coInterpreter instructionPointerAddress R: LinkReg] ifFalse: [self MoveAw: coInterpreter instructionPointerAddress R: ClassReg. self MoveR: ClassReg Mw: 0 r: SPReg]. "Test primitive failure" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. self flag: 'ask concrete code gen if move sets condition codes?'. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "placing the test here attributes the tick to the primitive plus any checkForAndFollowForwardedPrimitiveState scanning, but attributes all of a failing primitive to the current method (in ceStackOverflow: on frame build)." (backEnd has64BitPerformanceCounter and: [flags anyMask: PrimCallCollectsProfileSamples]) ifTrue: [jumpToTakeSample := self genCheckForProfileTimerTick: (self registerMaskFor: NoReg)]. "Fetch result from stack" continueAfterProfileSample := self MoveMw: (backEnd hasLinkRegister ifTrue: [0] ifFalse: [objectMemory wordSize]) r: SPReg R: ReceiverResultReg. self RetN: objectMemory wordSize. "return to caller, popping receiver" (backEnd has64BitPerformanceCounter and: [flags anyMask: PrimCallCollectsProfileSamples]) ifTrue: [jumpToTakeSample jmpTarget: self Label. self genTakeProfileSample. backEnd genLoadStackPointerForPrimCall: ClassReg. backEnd hasLinkRegister ifTrue: [self MoveAw: coInterpreter instructionPointerAddress R: LinkReg] ifFalse: [self MoveAw: coInterpreter instructionPointerAddress R: ClassReg. self MoveR: ClassReg Mw: 0 r: SPReg]. self Jump: continueAfterProfileSample]. "Jump to restore of receiver reg and proceed to frame build for failure." jmp jmpTarget: self Label. "Restore receiver reg from stack. If on RISCs ret pc is in LinkReg, if on CISCs ret pc is on stack." self MoveMw: objectMemory wordSize * (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) r: SPReg R: ReceiverResultReg. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimReturnEnterCogCodeEnilopmart: (in category 'initialization') ----- genPrimReturnEnterCogCodeEnilopmart: profiling "Generate the substitute return code for an external or FFI primitive call. On success simply return, extracting numArgs from newMethod. On primitive failure call ceActivateFailingPrimitiveMethod: newMethod." | jmpSample continuePostSample jmpFail | <var: #jmpSample type: #'AbstractInstruction *'> <var: #continuePostSample type: #'AbstractInstruction *'> <var: #jmpFail type: #'AbstractInstruction *'> self zeroOpcodeIndex. backEnd hasVarBaseRegister ifTrue: [self MoveCq: self varBaseAddress R: VarBaseReg]. "Must happen sometime" "Test primitive failure" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. self flag: 'ask concrete code gen if move sets condition codes?'. self CmpCq: 0 R: TempReg. jmpFail := self JumpNonZero: 0. (profiling and: [backEnd has64BitPerformanceCounter]) ifTrue: [jmpSample := self genCheckForProfileTimerTick: (self registerMaskFor: NoReg). continuePostSample := self Label]. "Switch back to the Smalltalk stack. Stack better be in either of these two states: success: stackPointer -> result (was receiver) arg1 ... argN return pc failure: receiver arg1 ... stackPointer -> argN return pc We push the instructionPointer to reestablish the return pc in the success case, but leave it to ceActivateFailingPrimitiveMethod: to do so in the failure case." backEnd hasLinkRegister ifTrue: [backEnd genLoadStackPointers. "Switch back to Smalltalk stack." backEnd hasPCRegister ifTrue: [self PopR: ReceiverResultReg. "Pop result from stack" self MoveAw: coInterpreter instructionPointerAddress R: PCReg] "Return" ifFalse: [self MoveMw: 0 r: SPReg R: ReceiverResultReg. "Fetch result from stack" self MoveAw: coInterpreter instructionPointerAddress R: LinkReg. "Get ret pc" self RetN: objectMemory wordSize]] "Return, popping result from stack" ifFalse: [self MoveAw: coInterpreter instructionPointerAddress R: ClassReg. "Get return pc" backEnd genLoadStackPointers. "Switch back to Smalltalk stack." self MoveMw: 0 r: SPReg R: ReceiverResultReg. "Fetch result from stack" self MoveR: ClassReg Mw: 0 r: SPReg. "Restore return pc" self RetN: 0]. "Return, popping result from stack" "Primitive failed. Invoke C code to build the frame and continue." jmpFail jmpTarget: (self MoveAw: coInterpreter newMethodAddress R: SendNumArgsReg). "Reload sp with CStackPointer; easier than popping args of checkProfileTick." self MoveAw: self cStackPointerAddress R: SPReg. self compileCallFor: #ceActivateFailingPrimitiveMethod: numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil resultReg: NoReg regsToSave: self emptyRegisterMask. "On Spur ceActivateFailingPrimitiveMethod: may retry the primitive and return if successful. So continue by returning to the caller. Switch back to the Smalltalk stack. Stack should be in this state: success: stackPointer -> result (was receiver) arg1 ... argN return pc We can push the instructionPointer or load it into the LinkRegister to reestablish the return pc" self MoveAw: coInterpreter instructionPointerAddress R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]). backEnd genLoadStackPointers. backEnd hasLinkRegister ifTrue: [self MoveMw: 0 r: SPReg R: ReceiverResultReg] "Fetch result from stack" ifFalse: [self MoveMw: objectMemory wordSize r: SPReg R: ReceiverResultReg. "Fetch result from stack" self PushR: ClassReg]. "Restore return pc on CISCs" self RetN: objectMemory wordSize. "return to caller, popping receiver" (profiling and: [backEnd has64BitPerformanceCounter]) ifTrue: ["Call ceTakeProfileSample: to record sample and then continue. newMethod should be up-to-date. Need to save and restore the link reg around this call." jmpSample jmpTarget: self Label. + backEnd genMarshallNArgs: 1 arg: (self trampolineArgConstant: nil) arg: nil arg: nil arg: nil. - backEnd genMarshallNArgs: 1 arg: 0 arg: 0 arg: 0 arg: 0. self CallFullRT: (self cCode: [#ceTakeProfileSample: asUnsignedInteger] inSmalltalk: [self simulatedTrampolineFor: #ceTakeProfileSample:]). backEnd genRemoveNArgsFromStack: 1. self Jump: continuePostSample]! Item was changed: ----- Method: SpurMemoryManager>>numPointerSlotsOf:format: (in category 'object access') ----- numPointerSlotsOf: objOop format: fmt "Answer the number of pointer fields in the given object. Works with CompiledMethods, as well as ordinary objects." + <returnTypeC: #usqInt> <inline: #always> | contextSize numLiterals header | fmt <= self lastPointerFormat ifTrue: [(fmt = self indexablePointersFormat and: [self isContextNonImm: objOop]) ifTrue: ["contexts end at the stack pointer" contextSize := coInterpreter fetchStackPointerOf: objOop. ^CtxtTempFrameStart + contextSize]. ^self numSlotsOf: objOop "all pointers"]. fmt = self forwardedFormat ifTrue: [^1]. fmt < self firstCompiledMethodFormat ifTrue: [^0]. "no pointers" "CompiledMethod: contains both pointers and bytes" header := self methodHeaderOf: objOop. numLiterals := self literalCountOfMethodHeader: header. ^numLiterals + LiteralStart!

1 0

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

14 Jan '22

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.431.mcz ==================== Summary ==================== Name: VMMaker-dtl.431 Author: dtl Time: 11 January 2022, 8:59:59.706 pm UUID: 339d1c15-e6c0-48a3-bc6a-9455da5cc546 Ancestors: VMMaker-dtl.430 ZipPlugin fix by Marcel Taeumel, merged from oscog. Name: VMMaker.oscog-mt.3136 Author: mt Time: 11 January 2022, 1:45:31.576763 pm UUID: 0cac7e2e-8274-de48-8822-a05e61d28997 Ancestors: VMMaker.oscog-mt.3135 Addition to previous commit. #primitiveZipSendBlock is invoked from ZipEncoder, which is a WriteStream, not a ReadStream. Name: VMMaker.oscog-mt.3135 Author: mt Time: 11 January 2022, 12:20:29.464861 pm UUID: b93d7116-14bf-5543-8c8d-d06c66d5c1a5 Ancestors: VMMaker.oscog-eem.3134 Fixes an off-by-one bug in #loadZipEncoderFrom: and #primitiveZipSendBlock. Thanks to Florin Mateoc and Fabio Niephaus for reporting and testing this bug! See http://lists.squeakfoundation.org/pipermail/vm-dev/2022-January/037536.html =============== Diff against VMMaker-dtl.430 =============== Item was changed: ----- Method: DeflatePlugin>>determineSizeOfWriteStream: (in category 'primitive support') ----- determineSizeOfWriteStream: rcvr "Determine the inst size of the class above DeflateStream or ZipEncoder by looking for the first class whose inst size is less than 7." | class | class := interpreterProxy fetchClassOf: rcvr. [class ~= interpreterProxy nilObject and: [(interpreterProxy instanceSizeOf: class) >= 7]] whileTrue: [class := interpreterProxy superclassOf: class]. class = interpreterProxy nilObject ifTrue: [^false]. writeStreamInstSize := interpreterProxy instanceSizeOf: class. ^true + + "Possible classes of rcvr and (instSize) as of January 2022: + + ZipEncoder (8) <- WriteStream (5) + !! determineSizeOfWriteStream + primitiveZipSendBlock + + ZipWriteStream (20) <- DeflateStream (10) <- WriteStream (5) + !! determineSizeOfWriteStream: + primitiveDeflateBlock + + GZipWriteStream (20) <- ZipWriteStream (20) <- ... + "! - ! Item was changed: ----- Method: DeflatePlugin>>loadDeflateStreamFrom: (in category 'primitive support') ----- loadDeflateStreamFrom: rcvr | oop | <inline: false> ((interpreterProxy isPointers: rcvr) and: [(interpreterProxy slotSizeOf: rcvr) >= 15]) ifFalse: [^false]. oop := interpreterProxy fetchPointer: 0 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^false]. writeStreamInstSize = 0 ifTrue: [(self determineSizeOfWriteStream: rcvr) ifFalse: [^false]. "If the receiver wasn't valid then we derived writeStreamInstSize from an invalid source. discard it." (interpreterProxy slotSizeOf: rcvr) < (writeStreamInstSize + 5) ifTrue: [writeStreamInstSize := 0. ^false]]. zipCollection := interpreterProxy firstIndexableField: oop. zipCollectionSize := interpreterProxy byteSizeOf: oop. zipPosition := interpreterProxy fetchInteger: 1 ofObject: rcvr. zipReadLimit := interpreterProxy fetchInteger: 2 ofObject: rcvr. "zipWriteLimit := interpreterProxy fetchInteger: 3 ofObject: rcvr." + "hashHead" oop := interpreterProxy fetchPointer: writeStreamInstSize + 0 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateHashTableSize]) ifFalse: [^false]. zipHashHead := interpreterProxy firstIndexableField: oop. + + "hashTail" oop := interpreterProxy fetchPointer: writeStreamInstSize + 1 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateWindowSize]) ifFalse: [^false]. zipHashTail := interpreterProxy firstIndexableField: oop. + zipHashValue := interpreterProxy fetchInteger: writeStreamInstSize + 2 ofObject: rcvr. zipBlockPos := interpreterProxy fetchInteger: writeStreamInstSize + 3 ofObject: rcvr. "zipBlockStart := interpreterProxy fetchInteger: writeStreamInstSize + 4 ofObject: rcvr." + + "literals" oop := interpreterProxy fetchPointer: writeStreamInstSize + 5 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^false]. zipLiteralSize := interpreterProxy slotSizeOf: oop. zipLiterals := interpreterProxy firstIndexableField: oop. + "distances" oop := interpreterProxy fetchPointer: writeStreamInstSize + 6 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) >= zipLiteralSize]) ifFalse: [^false]. zipDistances := interpreterProxy firstIndexableField: oop. + "literalFreq" oop := interpreterProxy fetchPointer: writeStreamInstSize + 7 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateMaxLiteralCodes]) ifFalse: [^false]. zipLiteralFreq := interpreterProxy firstIndexableField: oop. + "distanceFreq" oop := interpreterProxy fetchPointer: writeStreamInstSize + 8 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateMaxDistanceCodes]) ifFalse: [^false]. zipDistanceFreq := interpreterProxy firstIndexableField: oop. zipLiteralCount := interpreterProxy fetchInteger: writeStreamInstSize + 9 ofObject: rcvr. zipMatchCount := interpreterProxy fetchInteger: writeStreamInstSize + 10 ofObject: rcvr. ^interpreterProxy failed not! Item was changed: ----- Method: DeflatePlugin>>loadZipEncoderFrom: (in category 'primitive support') ----- loadZipEncoderFrom: rcvr | oop | <inline: false> writeStreamInstSize = 0 ifTrue: [(self determineSizeOfWriteStream: rcvr) ifFalse: [^false]. "If the receiver wasn't valid then we derived writeStreamInstSize from an invalid source. discard it." (interpreterProxy slotSizeOf: rcvr) < (writeStreamInstSize + 3) ifTrue: [writeStreamInstSize := 0. ^false]]. ((interpreterProxy isPointers: rcvr) and: [(interpreterProxy slotSizeOf: rcvr) >= (writeStreamInstSize + 3)]) ifFalse: [^false]. + + "collection" oop := interpreterProxy fetchPointer: 0 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^interpreterProxy primitiveFail]. zipCollection := interpreterProxy firstIndexableField: oop. zipCollectionSize := interpreterProxy byteSizeOf: oop. zipPosition := interpreterProxy fetchInteger: 1 ofObject: rcvr. zipReadLimit := interpreterProxy fetchInteger: 2 ofObject: rcvr. "zipWriteLimit := interpreterProxy fetchInteger: 3 ofObject: rcvr." + + zipBitBuf := interpreterProxy fetchInteger: writeStreamInstSize + 0 ofObject: rcvr. + zipBitPos := interpreterProxy fetchInteger: writeStreamInstSize + 1 ofObject: rcvr. - zipBitBuf := interpreterProxy fetchInteger: writeStreamInstSize + 1 ofObject: rcvr. - zipBitPos := interpreterProxy fetchInteger: writeStreamInstSize + 2 ofObject: rcvr. ^interpreterProxy failed not! Item was changed: ----- Method: DeflatePlugin>>primitiveZipSendBlock (in category 'primitives') ----- primitiveZipSendBlock | distTree litTree distStream litStream rcvr result | <export: true> interpreterProxy methodArgumentCount = 4 ifFalse:[^interpreterProxy primitiveFail]. distTree := interpreterProxy stackObjectValue: 0. litTree := interpreterProxy stackObjectValue: 1. distStream := interpreterProxy stackObjectValue: 2. litStream := interpreterProxy stackObjectValue: 3. rcvr := interpreterProxy stackObjectValue: 4. interpreterProxy failed ifTrue:[^nil]. (self loadZipEncoderFrom: rcvr) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: distTree) and:[ (interpreterProxy slotSizeOf: distTree) >= 2]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: litTree) and:[ (interpreterProxy slotSizeOf: litTree) >= 2]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: litStream) and:[ (interpreterProxy slotSizeOf: litStream) >= 3]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: distStream) and:[ (interpreterProxy slotSizeOf: distStream) >= 3]) ifFalse:[^interpreterProxy primitiveFail]. self cCode:'' inSmalltalk:[ zipMatchLengthCodes := CArrayAccessor on: ZipWriteStream matchLengthCodes. zipDistanceCodes := CArrayAccessor on: ZipWriteStream distanceCodes. zipExtraLengthBits := CArrayAccessor on: ZipWriteStream extraLengthBits. zipExtraDistanceBits := CArrayAccessor on: ZipWriteStream extraDistanceBits. zipBaseLength := CArrayAccessor on: ZipWriteStream baseLength. zipBaseDistance := CArrayAccessor on: ZipWriteStream baseDistance]. result := self sendBlock: litStream with: distStream with: litTree with: distTree. interpreterProxy failed ifFalse:[ interpreterProxy storeInteger: 1 ofObject: rcvr withValue: zipPosition. + interpreterProxy storeInteger: writeStreamInstSize + 0 ofObject: rcvr withValue: zipBitBuf. + interpreterProxy storeInteger: writeStreamInstSize + 1 ofObject: rcvr withValue: zipBitPos. - interpreterProxy storeInteger: readStreamInstSize + 1 ofObject: rcvr withValue: zipBitBuf. - interpreterProxy storeInteger: readStreamInstSize + 2 ofObject: rcvr withValue: zipBitPos. ]. interpreterProxy failed ifFalse:[ interpreterProxy pop: 5. "rcvr + args" interpreterProxy pushInteger: result. ].! Item was changed: ----- Method: InflatePlugin>>determineSizeOfReadStream: (in category 'primitive support') ----- determineSizeOfReadStream: rcvr + "Determine the inst size of the class above InflateStream by - "Determine the inst size of the class above DeflateStream by looking for the first class whose inst size is less than 13." | class | class := interpreterProxy fetchClassOf: rcvr. [class ~= interpreterProxy nilObject and: [(interpreterProxy instanceSizeOf: class) >= 13]] whileTrue: [class := interpreterProxy superclassOf: class]. class = interpreterProxy nilObject ifTrue: [^false]. readStreamInstSize := interpreterProxy instanceSizeOf: class. + ^true + + "Possible classes of rcvr and (instSize) as of January 2022: + + FastInflateStream (14) <- InflateStream (14) <- ReadStream (4) + !! determineSizeOfReadStream: + primitiveInflateDecompressBlock + + GZipReadStream (14) <- FastInflateStream (14) <- ... + ZipReadStream (15) <- FastInflateStream (14) <- ... + ZLibReadStream (14) <- FastInflateStream (14) <- ... + "! - ^true!

1 0

VM Maker: VMMaker.oscog-eem.3137.mcz
by commits＠source.squeak.org 12 Jan '22

12 Jan '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3137.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3137 Author: eem Time: 11 January 2022, 8:50:04.810202 pm UUID: bf7c9af8-02ad-4d4b-b0c9-95bb93d59019 Ancestors: VMMaker.oscog-mt.3136 In-image compilation: fix issues with converting method header formats and with accessing primitive property flags via functionPointerForCompiledMethod:primitiveIndex:primitivePropertyFlagsInto:. The fundamental fix is to have the facade's CoInterpreter's objectMemory set to the facade, hence indirecting through the facade to get to the actual obejctMemory. =============== Diff against VMMaker.oscog-mt.3136 =============== Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>functionPointerForCompiledMethod:primitiveIndex:primitivePropertyFlagsInto: (in category 'accessing') ----- functionPointerForCompiledMethod: methodOop primitiveIndex: primIndex primitivePropertyFlagsInto: flagsPtr + primIndex = PrimNumberExternalCall ifTrue: + [flagsPtr + at: 0 + put: (coInterpreter + primitivePropertyFlagsFor: (self primitiveMethodForMethodContainingExternalPrimitive: methodOop) + primitiveIndex: primIndex). + ^self oopForObject: ((self objectForOop: methodOop) literalAt: 1) second]. + ^(coInterpreter functionPointerForCompiledMethod: methodOop primitiveIndex: primIndex primitivePropertyFlagsInto: flagsPtr) ifNotNil: + [:symbol| self addressForLabel: symbol]! - ^([coInterpreter - functionPointerForCompiledMethod: methodOop - primitiveIndex: primIndex - primitivePropertyFlagsInto: flagsPtr] - on: Error - do: [:ex| - #someExternalPrimitive]) ifNotNil: - [:symbol| - self addressForLabel: symbol]! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>initialize (in category 'initialize-release') ----- initialize objectMemory := self class objectMemoryClass simulatorClass new. objectMemory allocateMemoryOfSize: 4*1024*1024. memory := objectMemory memory. objectMemory initializeFreeSpaceForFacadeFrom: self startOfMemory to: self variablesBase. coInterpreter := CoInterpreter new. coInterpreter instVarNamed: 'objectMemory' + put: (false ifTrue: [objectMemory] ifFalse: [self]); - put: objectMemory; instVarNamed: 'primitiveTable' put: (CArrayAccessor on: CoInterpreter primitiveTable copy). variables := Dictionary new! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>isBytes: (in category 'testing') ----- + isBytes: anOop + ^(self objectForOop: anOop) class isBytes! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>numBytesOfBytes: (in category 'accessing') ----- + numBytesOfBytes: objOop + ^self numBytesOf: objOop! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>primitiveIndexOfMethod:header: (in category 'accessing') ----- primitiveIndexOfMethod: anOop header: header | method | method := self objectForOop: anOop. - self assert: (self objectForOop: header) = method header. ^method primitive! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>primitiveMethodForMethodContainingExternalPrimitive: (in category 'cog jit support') ----- + primitiveMethodForMethodContainingExternalPrimitive: methodOop + "Look up a primitive in a method and answer that method." + | candidates literal method | + method := self objectForOop: methodOop. + self assert: method primitive = PrimNumberExternalCall. + literal := method literalAt: 1. + candidates := self sn + allImplementorsOf: literal second + localTo: (literal first basicSize = 0 + ifTrue: [InterpreterPrimitives] + ifFalse: [InterpreterPlugin allSubclasses + detect: [:pluginClass| pluginClass moduleName = literal first]]). + self assert: candidates size = 1. + ^candidates first compiledMethod! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>primitivePropertyFlags:numArgs: (in category 'accessing') ----- + primitivePropertyFlags: primIndex numArgs: numArgs + ^coInterpreter primitivePropertyFlags: primIndex numArgs: numArgs! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>rawHeaderOf: (in category 'accessing') ----- rawHeaderOf: aMethodOop + self subclassResponsibility! - | method header correctedHeader headerOop | - method := self objectForOop: aMethodOop. - header := method header. - - "(index 0) 15 bits: number of literals (#numLiterals) - (index 15) 1 bit: jit without counters - reserved for methods that have been optimized by Sista - (index 16) 1 bit: has primitive - (index 17) 1 bit: whether a large frame size is needed (#frameSize => either SmallFrame or LargeFrame) - (index 18) 6 bits: number of temporary variables (#numTemps) - (index 24) 4 bits: number of arguments to the method (#numArgs) - (index 28) 2 bits: reserved for an access modifier (00-unused, 01-private, 10-protected, 11-public), although accessors for bit 29 exist (see #flag). - sign bit: 1 bit: selects the instruction set, >= 0 Primary, < 0 Secondary (#signFlag)" - - correctedHeader := self wordSize = Smalltalk wordSize - ifTrue: [header] - ifFalse: - [(header bitAnd: (1 bitShift: 30) - 1) - - (header < 0 ifTrue: [2 raisedTo: self wordSize * 8] ifFalse: [0])]. - headerOop := objectMemory integerObjectOf: correctedHeader. - headerOop := headerOop bitAnd: (2 raisedTo: self wordSize * 8) - 1. - self assert: (objectMemory literalCountOfMethodHeader: headerOop) = method numLiterals. - self assert: (coInterpreter argumentCountOfMethodHeader: headerOop) = method numArgs. - self assert: (coInterpreter temporaryCountOfMethodHeader: headerOop) = method numTemps. - self assert: (objectMemory headerIndicatesAlternateBytecodeSet: headerOop) = method signFlag. - headerToMethodMap - at: headerOop - ifPresent: [:existing| self assert: existing == method] - ifAbsentPut: [method]. - ^headerOop! Item was removed: - ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>functionPointerForCompiledMethod:primitiveIndex:primitivePropertyFlagsInto: (in category 'cog jit support') ----- - functionPointerForCompiledMethod: methodOop primitiveIndex: primIndex primitivePropertyFlagsInto: flagsPtr - primIndex = PrimNumberExternalCall ifTrue: - [flagsPtr - at: 0 - put: (coInterpreter - primitivePropertyFlagsFor: (self primitiveMethodForMethodContainingExternalPrimitive: methodOop) - primitiveIndex: primIndex). - ^self oopForObject: ((self objectForOop: methodOop) literalAt: 1) second]. - ^super functionPointerForCompiledMethod: methodOop primitiveIndex: primIndex primitivePropertyFlagsInto: flagsPtr! Item was removed: - ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>primitiveMethodForMethodContainingExternalPrimitive: (in category 'cog jit support') ----- - primitiveMethodForMethodContainingExternalPrimitive: methodOop - "Look up a primitive in a method and answer that method." - | candidates literal method | - method := self objectForOop: methodOop. - self assert: method primitive = PrimNumberExternalCall. - literal := method literalAt: 1. - candidates := self sn - allImplementorsOf: literal second - localTo: (literal first basicSize = 0 - ifTrue: [InterpreterPrimitives] - ifFalse: [InterpreterPlugin allSubclasses - detect: [:pluginClass| pluginClass moduleName = literal first]]). - self assert: candidates size = 1. - ^candidates first compiledMethod! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>rawHeaderOf: (in category 'accessing') ----- + rawHeaderOf: aMethodOop + | method header correctedHeader headerOop | + method := aMethodOop isCompiledCode + ifTrue: [aMethodOop] + ifFalse: [self objectForOop: aMethodOop]. + header := method header. + + "(index 0) 15 bits: number of literals (#numLiterals) + (index 15) 1 bit: jit without counters - reserved for methods that have been optimized by Sista + (index 16) 1 bit: has primitive + (index 17) 1 bit: whether a large frame size is needed (#frameSize => either SmallFrame or LargeFrame) + (index 18) 6 bits: number of temporary variables (#numTemps) + (index 24) 4 bits: number of arguments to the method (#numArgs) + (index 28) 2 bits: reserved for an access modifier (00-unused, 01-private, 10-protected, 11-public), although accessors for bit 29 exist (see #flag). + sign bit: 1 bit: selects the instruction set, >= 0 Primary, < 0 Secondary (#signFlag)" + + correctedHeader := self wordSize = Smalltalk wordSize + ifTrue: [header] + ifFalse: [(header bitAnd: (1 bitShift: 30) - 1) + + (header < 0 + ifTrue: [1 bitShift: self wordSize * 8 - objectMemory numTagBits] + ifFalse: [0])]. + headerOop := objectMemory integerObjectOf: correctedHeader. + self assert: (objectMemory literalCountOfMethodHeader: headerOop) = method numLiterals. + self assert: (coInterpreter argumentCountOfMethodHeader: headerOop) = method numArgs. + self assert: (coInterpreter temporaryCountOfMethodHeader: headerOop) = method numTemps. + self assert: (objectMemory headerIndicatesAlternateBytecodeSet: headerOop) = method signFlag. + headerToMethodMap + at: headerOop + ifPresent: [:existing| self assert: existing == method] + ifAbsentPut: [method]. + ^headerOop! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation>>rawHeaderOf: (in category 'accessing') ----- + rawHeaderOf: aMethodOop + | method header correctedHeader headerOop | + method := aMethodOop isCompiledCode + ifTrue: [aMethodOop] + ifFalse: [self objectForOop: aMethodOop]. + header := method header. + "original (+ve header): + (index 0) 9 bits: main part of primitive number (#primitive) + (index 9) 8 bits: number of literals (#numLiterals) + (index 17) 1 bit: whether a large frame size is needed (#frameSize) + (index 18) 6 bits: number of temporary variables (#numTemps) + (index 24) 4 bits: number of arguments to the method (#numArgs) + (index 28) 1 bit: high-bit of primitive number (#primitive) + (index 29) 1 bit: flag bit, ignored by the VM (#flag)" + + "new: (-ve header) + (index 0) 15 bits: number of literals (#numLiterals) + (index 15) 1 bit: jit without counters - reserved for methods that have been optimized by Sista + (index 16) 1 bit: has primitive + (index 17) 1 bit: whether a large frame size is needed (#frameSize => either SmallFrame or LargeFrame) + (index 18) 6 bits: number of temporary variables (#numTemps) + (index 24) 4 bits: number of arguments to the method (#numArgs) + (index 28) 2 bits: reserved for an access modifier (00-unused, 01-private, 10-protected, 11-public), although accessors for bit 29 exist (see #flag). + sign bit: 1 bit: selects the instruction set, >= 0 Primary, < 0 Secondary (#signFlag)" + + "This could be smarter. If MULTIPLEBYTECODESETS is in effect we can switch hit. If not, we can map to the relevant format. + For now we just reinterpret the method itself, answering a header in the format its bytecode set dictates..." + correctedHeader := header >= 0 + ifTrue: + [method numLiterals > 255 ifTrue: [self error: 'cannot map method to the old header format']. + (method primitive bitAnd: 16r1FF) + + (method numLiterals bitShift: 9) + + (header bitAnd: 16r3FFFF bitInvert)] + ifFalse: + [self wordSize = Smalltalk wordSize + ifTrue: [header] + ifFalse: [(header bitAnd: (1 bitShift: 30) - 1) + (1 bitShift: 30)]]. + headerOop := objectMemory integerObjectOf: correctedHeader. + self assert: (objectMemory literalCountOfMethodHeader: headerOop) = method numLiterals. + self assert: (coInterpreter argumentCountOfMethodHeader: headerOop) = method numArgs. + self assert: (coInterpreter temporaryCountOfMethodHeader: headerOop) = method numTemps. + self assert: (objectMemory headerIndicatesAlternateBytecodeSet: headerOop) = method signFlag. + headerToMethodMap + at: headerOop + ifPresent: [:existing| self assert: existing == method] + ifAbsentPut: [method]. + ^headerOop!

1 0

[OpenSmalltalk/opensmalltalk-vm] 793fbe: CogVM source as per VMMaker.oscog-mt.3136
by Eliot Miranda 11 Jan '22

11 Jan '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 793fbec6b38dd2318f838a8738d45ca81a26a18a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/793fbec6b38dd2318f… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-01-11 (Tue, 11 Jan 2022) Changed paths: M src/plugins/ZipPlugin/ZipPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-mt.3136 Ancestors: VMMaker.oscog-mt.3135 Fixes an off-by-one bug in #loadZipEncoderFrom: and #primitiveZipSendBlock. Thanks to Florin Mateoc and Fabio Niephaus for reporting and testing this bug! See http://lists.squeakfoundation.org/pipermail/vm-dev/2022-January/037536.html

1 0

VM Maker: VMMaker.oscog-mt.3136.mcz
by commits＠source.squeak.org 11 Jan '22

11 Jan '22

Marcel Taeumel uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-mt.3136.mcz ==================== Summary ==================== Name: VMMaker.oscog-mt.3136 Author: mt Time: 11 January 2022, 1:45:31.576763 pm UUID: 0cac7e2e-8274-de48-8822-a05e61d28997 Ancestors: VMMaker.oscog-mt.3135 Addition to previous commit. #primitiveZipSendBlock is invoked from ZipEncoder, which is a WriteStream, not a ReadStream. =============== Diff against VMMaker.oscog-mt.3135 =============== Item was changed: ----- Method: DeflatePlugin>>primitiveZipSendBlock (in category 'primitives') ----- primitiveZipSendBlock | distTree litTree distStream litStream rcvr result | <export: true> interpreterProxy methodArgumentCount = 4 ifFalse:[^interpreterProxy primitiveFail]. distTree := interpreterProxy stackObjectValue: 0. litTree := interpreterProxy stackObjectValue: 1. distStream := interpreterProxy stackObjectValue: 2. litStream := interpreterProxy stackObjectValue: 3. rcvr := interpreterProxy stackObjectValue: 4. interpreterProxy failed ifTrue:[^nil]. (self loadZipEncoderFrom: rcvr) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: distTree) and:[ (interpreterProxy slotSizeOf: distTree) >= 2]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: litTree) and:[ (interpreterProxy slotSizeOf: litTree) >= 2]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: litStream) and:[ (interpreterProxy slotSizeOf: litStream) >= 3]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: distStream) and:[ (interpreterProxy slotSizeOf: distStream) >= 3]) ifFalse:[^interpreterProxy primitiveFail]. self cCode:'' inSmalltalk:[ zipMatchLengthCodes := CArrayAccessor on: ZipWriteStream matchLengthCodes. zipDistanceCodes := CArrayAccessor on: ZipWriteStream distanceCodes. zipExtraLengthBits := CArrayAccessor on: ZipWriteStream extraLengthBits. zipExtraDistanceBits := CArrayAccessor on: ZipWriteStream extraDistanceBits. zipBaseLength := CArrayAccessor on: ZipWriteStream baseLength. zipBaseDistance := CArrayAccessor on: ZipWriteStream baseDistance]. result := self sendBlock: litStream with: distStream with: litTree with: distTree. interpreterProxy failed ifFalse:[ interpreterProxy storeInteger: 1 ofObject: rcvr withValue: zipPosition. + interpreterProxy storeInteger: writeStreamInstSize + 0 ofObject: rcvr withValue: zipBitBuf. + interpreterProxy storeInteger: writeStreamInstSize + 1 ofObject: rcvr withValue: zipBitPos. - interpreterProxy storeInteger: readStreamInstSize + 0 ofObject: rcvr withValue: zipBitBuf. - interpreterProxy storeInteger: readStreamInstSize + 1 ofObject: rcvr withValue: zipBitPos. ]. interpreterProxy failed ifFalse:[ interpreterProxy pop: 5. "rcvr + args" interpreterProxy pushInteger: result. ].!

1 0

VM Maker: VMMaker.oscog-mt.3136.mcz
by commits＠source.squeak.org 11 Jan '22

11 Jan '22

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2022