Vm-dev April 2016

vm-dev@lists.squeakfoundation.org

35 participants
202 discussions

Re: Slang question (was: Re: [squeak-dev] The Trunk: Collections-ul.685.mcz)
by Levente Uzonyi 08 Apr '16

08 Apr '16

Hi Dave, On Tue, 5 Apr 2016, David T. Lewis wrote: > I just got around to checking this for code generation for the interpreter VM > (VMMaker, not VMMaker.oscog). The #ifNil: is not translated at all, so I replaced > it with this: That's pretty interesting. The Cog branch behaves differently matchTable ifNil: [ will become if (!matchTable) { while matchTable = nil ifTrue: [ and matchTable == nil ifTrue: [ will both compile to if (matchTable == null) { just like in the main branch. All of these are correct, because null is just a macro to 0, but it's a bit surprising that "ifNil:" and "== nil ifTrue:" are not the same in Slang, while they are in Squeak. My main concern is how matchTable is initialized. The generated code is matchTable = arrayValueOf(stackValue(0)); matchTable -= 1; if (failed()) { return null; } which makes me think that matchTable will not be the C null pointer at all when the argument nil is passed to the primitive, because matchTable -= 1; would not yield an unsigned char* with 0 value unless arrayValueOf returns a pointer with the value 1 (assuming that sizeof(unsigned char) is 1). I haven't found where arrayValueOf was defined, so I can't tell if it has a chance to work at all. Levente P.S.: Since we're talking about C here, I CC'd the vm-dev list. > > matchTable = nil ifTrue: > > This produces the expected result, and can be compiled. > > There are other issues in the resulting VM, but they do not seem to be > related to Collections-ul.685 (I reverted to Collections-ul.684 with the > same results). I don't know the cause of those issues, but I will follow > up in a separate thread as needed. > > With respect to Collections-ul.685, replacing the ifNil: test as above > seems like the right thing to do. > > Dave > > > On Sun, Apr 03, 2016 at 06:00:13PM -0400, David T. Lewis wrote: >> Many people will not be familiar with this optimization, so a few words of >> explanation are in order for background: >> >> There is a mechanism for translating certain methods in the image directly >> into primitives for performance. This is normally not noticed, but you will >> find occasional refernces such at this one in the image: >> >> findSubstring: key in: body startingAt: start matchTable: matchTable >> <primitive: 'primitiveFindSubstring' module: 'MiscPrimitivePlugin'> >> >> This is a method that first tries to call a version of itself that has >> been translated to C. If the primitive fails, the normal Smalltalk method >> is executed. The hidden tricky bit is that MiscPrimitivePlugin, which >> lives in the VMMaker package, arranges for the #findSubstring:in:startingAt:matchTable: >> method in the image to be translated to C and installed as a primitive. >> This means that the generated VM is actually governed partly my methods >> in the main image (not in the VMMaker package). >> >> It also means that if one of these methods is changed in the image, it >> might accidentally result in unexpected (and possibly wrong) code being >> generated for the plugin in the VM. That is the reason that Levente is >> asking about the slang code generation in this case. >> >> Dave >> >> >> On Sun, Apr 03, 2016 at 07:45:13PM +0200, Levente Uzonyi wrote: >>> On Sun, 3 Apr 2016, commits(a)source.squeak.org wrote: >>> >>>> Levente Uzonyi uploaded a new version of Collections to project The Trunk: >>>> http://source.squeak.org/trunk/Collections-ul.685.mcz >>>> >>>> ==================== Summary ==================== >>>> >>>> Name: Collections-ul.685 >>>> Author: ul >>>> Time: 3 April 2016, 3:21:51.035808 am >>>> UUID: db8fd391-2306-4ccc-87d5-b5dee96a78ab >>>> Ancestors: Collections-eem.684 >>>> >>>> Use Spur's new character comparison abilities in some String methods. >>>> >>>> =============== Diff against Collections-eem.684 =============== >>>> >>>> Item was changed: >>>> ----- Method: ByteString>>findSubstring:in:startingAt:matchTable: (in >>>> category 'comparing') ----- >>>> findSubstring: key in: body startingAt: start matchTable: matchTable >>>> "Answer the index in the string body at which the substring key >>>> first occurs, at or beyond start. The match is determined using >>>> matchTable, which can be used to effect, eg, case-insensitive >>>> matches. If no match is found, zero will be returned. >>>> >>>> The algorithm below is not optimum -- it is intended to be >>>> translated to C which will go so fast that it wont matter." >>>> | index | >>>> <primitive: 'primitiveFindSubstring' module: 'MiscPrimitivePlugin'> >>>> <var: #key declareC: 'unsigned char *key'> >>>> <var: #body declareC: 'unsigned char *body'> >>>> <var: #matchTable declareC: 'unsigned char *matchTable'> >>>> >>>> key size = 0 ifTrue: [^ 0]. >>>> + matchTable ifNil: [ >>>> + start to: body size - key size + 1 do: [ :startIndex | >>>> + index := 0. >>>> + [ (body at: startIndex + index) == (key at: (index >>>> := index + 1)) ] whileTrue: [ >>>> + index = key size ifTrue: [ ^startIndex ] ] ]. >>>> + ^0 ]. >>> >>> I wonder if the #ifNil: check is correct in Slang. The generated code is >>> >>> ... >>> unsigned char *matchTable; >>> ... >>> matchTable = arrayValueOf(stackValue(0)); >>> matchTable -= 1; >>> ... >>> if (!(matchTable)) { >>> ... >>> >>> So, will the value of matchTable actually be NULL or not, when nil is >>> passed to the primitive. That -= 1 makes me think that it won't be NULL. >>> >>> Another thing is that the loop condition, while it's order of evaluation >>> is well defined in Smalltalk, will compile to C code containing undefined >>> behavior: >>> >>> while ((body[startIndex + index]) == (key[index += >>> 1])) { >>> >>> Since in C the evaluation of the left and right side of == can happen in >>> any order, the generated machine code may or may not be correct. >>> Is this is a difference between Smalltalk and Slang, or is it just a slip >>> in the code generator? >>> >>> Levente >>> >>>> (start max: 1) to: body size - key size + 1 do: >>>> [:startIndex | >>>> index := 1. >>>> [(matchTable at: (body at: startIndex+index-1) >>>> asciiValue + 1) >>>> = (matchTable at: (key at: index) asciiValue >>>> + 1)] >>>> whileTrue: >>>> [index = key size ifTrue: [^ startIndex]. >>>> index := index+1]]. >>>> ^ 0 >>>> " >>>> ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 1 matchTable: >>>> CaseSensitiveOrder 1 >>>> ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 2 matchTable: >>>> CaseSensitiveOrder 7 >>>> ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 8 matchTable: >>>> CaseSensitiveOrder 0 >>>> ' ' findSubstring: 'abc' in: 'abcdefABcd' startingAt: 2 matchTable: >>>> CaseSensitiveOrder 0 >>>> ' ' findSubstring: 'abc' in: 'abcdefABcd' startingAt: 2 matchTable: >>>> CaseInsensitiveOrder 7 >>>> "! > >

2 2

VM Maker: VMMaker.oscog-eem.1781.mcz
by commits＠source.squeak.org 08 Apr '16

08 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1781.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1781 Author: eem Time: 7 April 2016, 5:34:13.587756 pm UUID: 8db183ba-c100-4a9c-a562-3fe72dd965f6 Ancestors: VMMaker.oscog-eem.1780 First half of CoInterpreter support for CompiledBlock. Implement genPrimitiveFullClosureValue. Use just 3 primitive numbers for the flull closure value prims (the current situation with BlockClosure is a blunder which we can fix by switching to CompiledBlock).. Oull the assignment to isBlock out of scanMethod into the caller so that scanMethod can serve for CompiledMethod and CompiledBlock. [Perhaps still to do is to make the CompiledBlock support conditional on bytecode set when generating C]. =============== Diff against VMMaker.oscog-eem.1780 =============== Item was added: + ----- Method: CoInterpreter>>activateNewFullClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') ----- + activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch + "Similar to activateNewMethod but for Closure and newMethod." + | numCopied outerContext theMethod methodHeader numTemps | + <inline: true> + self break. + outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. + numCopied := self copiedValueCountOfFullClosure: blockClosure. + theMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. + self assert: (objectMemory isOopCompiledMethod: theMethod). + methodHeader := self rawHeaderOf: theMethod. + (self isCogMethodReference: methodHeader) ifTrue: + [^self + executeFullCogBlock: (self cogMethodOf: theMethod) + closure: blockClosure + mayContextSwitch: mayContextSwitch]. + "How do we know when to compile a block method? + One simple criterion is to check if the block is running within its inner context, + i.e. if the outerContext is married. + Even simpler is to remember the previous block entered via the interpreter and + compile if this is the same one. But we can thrash trying to compile an uncoggable + method unless we try and remember which ones can't be cogged. So also record + the last block method we failed to compile and avoid recompiling it." + (self methodWithHeaderShouldBeCogged: methodHeader) + ifTrue: + [theMethod = lastCoggableInterpretedBlockMethod + ifTrue: + [theMethod ~= lastUncoggableInterpretedBlockMethod ifTrue: + [cogit cogFullBlockMethod: theMethod numCopied: numCopied. + (self methodHasCogMethod: theMethod) ifTrue: + [^self executeFullCogBlock: (self cogMethodOf: theMethod) + closure: blockClosure + mayContextSwitch: mayContextSwitch]. + cogCompiledCodeCompactionCalledFor ifFalse: + [lastUncoggableInterpretedBlockMethod := theMethod]]] + ifFalse: + [lastCoggableInterpretedBlockMethod := theMethod]] + ifFalse: + [self maybeFlagMethodAsInterpreted: theMethod]. + + self push: instructionPointer. + self push: framePointer. + framePointer := stackPointer. + self push: theMethod. + self push: objectMemory nilObject. "FxThisContext field" + self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). + self push: 0. "FoxIFSavedIP" + "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." + self push: (objectMemory followField: FullClosureReceiverIndex ofObject: blockClosure). + + "Copy the copied values..." + 0 to: numCopied - 1 do: + [:i| + self push: (objectMemory + fetchPointer: i + FullClosureFirstCopiedValueIndex + ofObject: blockClosure)]. + + self assert: (self frameIsBlockActivation: framePointer). + self assert: (self frameHasContext: framePointer) not. + + methodHeader := objectMemory methodHeaderOf: theMethod. + numTemps := self temporaryCountOfMethodHeader: methodHeader. + + numArgs + numCopied + 1 to: numTemps do: [ :i | self push: objectMemory nilObject]. + + instructionPointer := (self initialPCForHeader: methodHeader method: theMethod) - 1. + + self setMethod: theMethod. + + "Now check for stack overflow or an event (interrupt, must scavenge, etc)" + stackPointer < stackLimit ifTrue: + [self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]! Item was added: + ----- Method: CoInterpreter>>executeFullCogBlock:closure:mayContextSwitch: (in category 'enilopmarts') ----- + executeFullCogBlock: cogMethod closure: closure mayContextSwitch: mayContextSwitch + "Execute a FullBlockClosure with a CogMethod. The caller has already pushed the block and + any arguments and the return pc. First push the return-to-interpreter trampoline, + then the entry-point and finally the receiver. We /do not/ push any register + argument(s) to reduce complications in block dispatch; effectively there are no + register arguments to blocks. Instead, the machine code block value primitives + push the reg args if necessary before dispatching to the block. Hence here, only + the receiver gets pushed. See genPrimitiveClosureValue" + <var: #cogMethod type: #'CogMethod *'> + cogit assertCStackWellAligned. + self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer. + self ensurePushedInstructionPointer. + self push: cogMethod asInteger + + (mayContextSwitch + ifTrue: [cogit fullBlockEntryOffset] + ifFalse: [cogit fullBlockNoContextSwitchEntryOffset]). + self push: closure. + cogit ceCallCogCodePopReceiverReg + "NOTREACHED"! Item was added: + ----- Method: CogObjectRepresentation>>genPrimitiveFullClosureValue (in category 'primitive generators') ----- + genPrimitiveFullClosureValue + "Defer to the cogit for this one, to match the split for genPrimitiveClosureValue." + <doNotGenerate> + ^cogit genPrimitiveFullClosureValue! 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 enumeratingCogMethod methodHeader initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager callerSavedRegMask postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry fullBlockStackOverflowCall fullBlockEntry cbEntryOffset fullBlockNoContextSwitchEntry cbNoSwitchEntryOffset picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes 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 ceEnclosingObjectTrampoline ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetFP ceGetSP ceCaptureCStackPointers ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer cPICPrototype cPICEndOfCodeOffset cPICEndOfCodeLabel maxCPICCases debugBytecodePointers debugOpcodeIndices disassemblingMethod' - 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 enumeratingCogMethod methodHeader initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager callerSavedRegMask postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes 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 ceEnclosingObjectTrampoline ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetFP ceGetSP ceCaptureCStackPointers ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer cPICPrototype cPICEndOfCodeOffset cPICEndOfCodeLabel maxCPICCases debugBytecodePointers debugOpcodeIndices disassemblingMethod' classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AltNumSpecialSelectors AnnotationConstantNames AnnotationShift AnnotationsWithBytecodePCs BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation FirstSpecialSelector HasBytecodePC IsAbsPCReference IsAnnotationExtension IsDirectedSuperSend IsDisplacementX2N IsNSDynamicSuperSend IsNSImplicitReceiverSend IsNSSelfSend IsNSSendCall IsObjectReference IsRelativeCall IsSendCall IsSuperSend MapEnd MaxCompiledPrimitiveIndex MaxStackAllocSize MaxX2NDisplacement NSCClassTagIndex NSCEnclosingObjectIndex NSCNumArgsIndex NSCSelectorIndex NSCTargetIndex NSSendIsPCAnnotated NumObjRefsInRuntime NumOopsPerNSC NumSpecialSelectors NumTrampolines ProcessorClass' poolDictionaries: 'CogAbstractRegisters CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMBytecodeConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 4/6/2015 15:56' 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 eventually the 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' 'nsSendCacheSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'selfSendTrampolines' 'dynamicSuperSendTrampolines' 'implicitReceiverSendTrampolines' 'outerSendTrampolines' 'ceEnclosingObjectTrampoline' '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 precede cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up" addHeaderFile:'"cogmethod.h"'. NewspeakVM ifTrue: [aCCodeGenerator addHeaderFile:'"nssendcache.h"']. aCCodeGenerator addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'. aCCodeGenerator var: #ceGetFP declareC: 'unsigned long (*ceGetFP)(void)'; 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 *)'; 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'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMiss entry noCheckEntry selfSendEntry dynSuperEntry + fullBlockStackOverflowCall fullBlockNoContextSwitchEntry fullBlockEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 cPICEndOfCodeLabel) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #ordinarySendTrampolines declareC: 'sqInt ordinarySendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #directedSuperSendTrampolines declareC: 'sqInt directedSuperSendTrampolines[NumSendTrampolines]'; var: #selfSendTrampolines declareC: 'sqInt selfSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #implicitReceiverSendTrampolines declareC: 'sqInt implicitReceiverSendTrampolines[NumSendTrampolines]'; var: #outerSendTrampolines declareC: 'sqInt outerSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static usqInt 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)]. "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 added: + ----- Method: Cogit>>cogFullBlockMethod:numCopied: (in category 'jit - api') ----- + cogFullBlockMethod: aMethodObj numCopied: numCopied + "Attempt to produce a machine code method for the bytecode method + object aMethodObj. N.B. If there is no code memory available do *NOT* + attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) + depend on the zone remaining constant across method generation." + <api> + <returnTypeC: #'CogMethod *'> + | cogMethod | + <var: #cogMethod type: #'CogMethod *'> + self cCode: [] inSmalltalk: "for debugging, allow excluding methods based on selector or methodClass" + [self halt class initializationOptions + at: #DoNotJIT + ifPresent: + [:excluded| + (excluded anySatisfy: [:exclude| aMethodObj = exclude]) ifTrue: + [coInterpreter transcript nextPutAll: 'EXCLUDING '; nextPutAll: aMethodObj; nextPutAll: ' (compiled block)'; cr; flush. + ^nil]]]. + self deny: (coInterpreter methodHasCogMethod: aMethodObj). + aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. + "If the generators for the alternate bytecode set are missing then interpret." + (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) + ifTrue: + [(self numElementsIn: generatorTable) <= 256 ifTrue: + [^nil]. + bytecodeSetOffset := 256] + ifFalse: + [bytecodeSetOffset := 0]. + objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj. + methodObj := aMethodObj. + methodHeader := objectMemory methodHeaderOf: aMethodObj. + cogMethod := self compileCogFullBlockMethod. + (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: + [cogMethod asInteger = InsufficientCodeSpace ifTrue: + [coInterpreter callForCogCompiledCodeCompaction]. + self maybeFreeCounters. + "Right now no errors should be reported, so nothing more to do." + "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)." + ^nil]. + "self cCode: '' + inSmalltalk: + [coInterpreter printCogMethod: cogMethod. + ""coInterpreter symbolicMethod: aMethodObj."" + self assertValidMethodMap: cogMethod." + "self disassembleMethod: cogMethod." + "printInstructions := clickConfirm := true""]." + ^cogMethod! Item was added: + ----- Method: Cogit>>compileCogFullBlockMethod (in category 'compile abstract instructions') ----- + compileCogFullBlockMethod + <returnTypeC: #'CogMethod *'> + | numBytecodes numBlocks numCleanBlocks result | + hasYoungReferent := (objectMemory isYoungObject: methodObj). + methodOrBlockNumArgs := coInterpreter argumentCountOf: methodObj. + inBlock := true. + postCompileHook := nil. + maxLitIndex := -1. + self assert: (coInterpreter primitiveIndexOf: methodObj) = 0. + initialPC := coInterpreter startPCOfMethod: methodObj. + "initial estimate. Actual endPC is determined in scanMethod." + endPC := objectMemory numBytesOf: methodObj. + numBytecodes := endPC - initialPC + 1. + self allocateOpcodes: (numBytecodes + 10) * self estimateOfAbstractOpcodesPerBytecodes + bytecodes: numBytecodes + ifFail: [^coInterpreter cCoerceSimple: MethodTooBig to: #'CogMethod *']. + (numBlocks := self scanMethod) < 0 ifTrue: + [^coInterpreter cCoerceSimple: numBlocks to: #'CogMethod *']. + self assert: numBlocks = 0. "blocks in full blocks are full blocks, they are not inlined." + numCleanBlocks := self scanForCleanBlocks. + self assert: numCleanBlocks = 0. "blocks in full blocks are full blocks, they are not inlined." + self allocateBlockStarts: numBlocks + numCleanBlocks. + blockCount := 0. + numCleanBlocks > 0 ifTrue: + [self addCleanBlockStarts]. + (self maybeAllocAndInitCounters + and: [self maybeAllocAndInitIRCs]) ifFalse: "Inaccurate error code, but it'll do. This will likely never fail." + [^coInterpreter cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. + + blockEntryLabel := nil. + methodLabel dependent: nil. + (result := self compileEntireFullBlockMethod) < 0 ifTrue: + [^coInterpreter cCoerceSimple: result to: #'CogMethod *']. + ^self generateCogFullBlock! Item was added: + ----- Method: Cogit>>compileEntireFullBlockMethod (in category 'compile abstract instructions') ----- + compileEntireFullBlockMethod + "Compile the abstract instructions for the entire method, including blocks." + | result | + self compileFullBlockEntry. + + "Frame build" + self compileFullBlockMethodFrameBuild. + "Method body" + (result := self compileMethodBody) < 0 ifTrue: + [^result]. + self assert: blockCount = 0. + ^0! Item was added: + ----- Method: Cogit>>compileFullBlockEntry (in category 'compile abstract instructions') ----- + compileFullBlockEntry + "Compile the abstract instructions for the entire method, including blocks." + | jumpNoContextSwitch | + + "Abort for stack overflow on full block activation (no inline cache miss possible). + The flag is SendNumArgsReg." + fullBlockStackOverflowCall := self MoveCq: 0 R: ReceiverResultReg. + backEnd hasLinkRegister ifTrue: [self PushR: LinkReg]. + "Since the only case in which this is called is the + stack overflow case we can reuse the trampoline." + self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs). + + "Entries" + "No context switch entry" + fullBlockNoContextSwitchEntry := self MoveCq: 0 R: SendNumArgsReg. + jumpNoContextSwitch := self Jump: 0. + + self AlignmentNops: (objectMemory wordSize max: 8). + "Context switch entry (use ReceiverResultReg as a non-zero value; it's shorter)." + fullBlockEntry := self MoveR: ReceiverResultReg R: SendNumArgsReg. + jumpNoContextSwitch jmpTarget: self Label. + + ^0! Item was added: + ----- Method: Cogit>>computeFullBlockEntryOffsets (in category 'initialization') ----- + computeFullBlockEntryOffsets + "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." + <var: 'sendMissCall' type: #'AbstractInstruction *'> + self allocateOpcodes: 24 bytecodes: 0. + methodOrBlockNumArgs := 0. + self compileFullBlockEntry. + self computeMaximumSizes. + self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod). + cbEntryOffset := fullBlockEntry address - methodZoneBase. + cbNoSwitchEntryOffset := fullBlockNoContextSwitchEntry address - methodZoneBase! Item was changed: ----- Method: Cogit>>initializeCodeZoneFrom:upTo: (in category 'initialization') ----- initializeCodeZoneFrom: startAddress upTo: endAddress <api> self initializeBackend. backEnd stopsFrom: startAddress to: endAddress - 1. self cCode: [self sqMakeMemoryExecutableFrom: startAddress To: endAddress] inSmalltalk: [self initializeProcessor]. codeBase := methodZoneBase := startAddress. minValidCallAddress := (codeBase min: coInterpreter interpretAddress) min: coInterpreter primitiveFailAddress. methodZone manageFrom: methodZoneBase to: endAddress. self maybeGenerateCheckFeatures. self maybeGenerateICacheFlush. self generateVMOwnerLockFunctions. self genGetLeafCallStackPointer. self generateStackPointerCapture. self generateTrampolines. self computeEntryOffsets. + self computeFullBlockEntryOffsets. self generateClosedPICPrototype. "repeat so that now the methodZone ignores the generated run-time" methodZone manageFrom: methodZoneBase to: endAddress. "N.B. this is assumed to be the last thing done in initialization; see Cogit>>initialized" self generateOpenPICPrototype! Item was changed: ----- Method: Cogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - if it contans an unknown bytecode Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. - inBlock := false. NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. self cppIf: NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]]. ^numBlocks! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForSqueak (in category 'class initialization') ----- initializePrimitiveTableForSqueak "Initialize the table of primitive generators. This does not include normal primitives implemented in the coInterpreter. N.B. primitives that don't have an explicit arg count (the integer following the generator) may be variadic." "SimpleStackBasedCogit initializePrimitiveTableForSqueak" MaxCompiledPrimitiveIndex := self objectRepresentationClass wordSize = 8 ifTrue: [555] ifFalse: [222]. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" (1 genPrimitiveAdd 1) (2 genPrimitiveSubtract 1) (3 genPrimitiveLessThan 1) (4 genPrimitiveGreaterThan 1) (5 genPrimitiveLessOrEqual 1) (6 genPrimitiveGreaterOrEqual 1) (7 genPrimitiveEqual 1) (8 genPrimitiveNotEqual 1) (9 genPrimitiveMultiply 1) (10 genPrimitiveDivide 1) (11 genPrimitiveMod 1) (12 genPrimitiveDiv 1) (13 genPrimitiveQuo 1) (14 genPrimitiveBitAnd 1) (15 genPrimitiveBitOr 1) (16 genPrimitiveBitXor 1) (17 genPrimitiveBitShift 1) "(18 primitiveMakePoint)" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 genPrimitiveFloatAt)" "(39 genPrimitiveFloatAtPut)" (40 genPrimitiveAsFloat 0) (41 genPrimitiveFloatAdd 1) (42 genPrimitiveFloatSubtract 1) (43 genPrimitiveFloatLessThan 1) (44 genPrimitiveFloatGreaterThan 1) (45 genPrimitiveFloatLessOrEqual 1) (46 genPrimitiveFloatGreaterOrEqual 1) (47 genPrimitiveFloatEqual 1) (48 genPrimitiveFloatNotEqual 1) (49 genPrimitiveFloatMultiply 1) (50 genPrimitiveFloatDivide 1) "(51 genPrimitiveTruncated)" "(52 genPrimitiveFractionalPart)" "(53 genPrimitiveExponent)" "(54 genPrimitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0) "(56 genPrimitiveSine)" "(57 genPrimitiveArctan)" "(58 genPrimitiveLogN)" "(59 genPrimitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) (61 genPrimitiveAtPut 2) (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) (64 genPrimitiveStringAtPut 2) "The stream primitives no longer pay their way; normal Smalltalk code is faster." (65 genFastPrimFail)"was primitiveNext" (66 genFastPrimFail) "was primitiveNextPut" (67 genFastPrimFail) "was primitiveAtEnd" "StorageManagement Primitives (68-79)" (68 genPrimitiveObjectAt 1) "Good for debugger/InstructionStream performance" "(69 primitiveObjectAtPut)" (70 genPrimitiveNew 0) (71 genPrimitiveNewWithArg 1) "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" (79 genPrimitiveNewMethod 2) "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" (83 genPrimitivePerform) "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "System Primitives (110-119)" (110 genPrimitiveIdentical 1) (111 genPrimitiveClass) "Support both class and Context>>objectClass:" "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" (169 genPrimitiveNotIdentical 1) (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" (171 genPrimitiveImmediateAsInteger 0) "Character>>value SmallFloat64>>asInteger" "(173 primitiveSlotAt 1)" "(174 primitiveSlotAtPut 2)" (175 genPrimitiveIdentityHash 0) "Behavior>>identityHash" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue 0) "value" (202 genPrimitiveClosureValue 1) "value:" (203 genPrimitiveClosureValue 2) "value:value:" (204 genPrimitiveClosureValue 3) "value:value:value:" (205 genPrimitiveClosureValue 4) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" + (207 genPrimitiveFullClosureValue) "value[:value:value:value:] et al" + "(208 genPrimitiveFullClosureValueWithArgs)" "valueWithArguments:" + (209 genPrimitiveFullClosureValueNoContextSwitch) "valueNoContextSwitch[:value:] et al" + "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue 0) "valueNoContextSwitch" (222 genPrimitiveClosureValue 1) "valueNoContextSwitch:" "SmallFloat primitives (540-559)" (541 genPrimitiveSmallFloatAdd 1) (542 genPrimitiveSmallFloatSubtract 1) (543 genPrimitiveSmallFloatLessThan 1) (544 genPrimitiveSmallFloatGreaterThan 1) (545 genPrimitiveSmallFloatLessOrEqual 1) (546 genPrimitiveSmallFloatGreaterOrEqual 1) (547 genPrimitiveSmallFloatEqual 1) (548 genPrimitiveSmallFloatNotEqual 1) (549 genPrimitiveSmallFloatMultiply 1) (550 genPrimitiveSmallFloatDivide 1) "(551 genPrimitiveSmallFloatTruncated 0)" "(552 genPrimitiveSmallFloatFractionalPart 0)" "(553 genPrimitiveSmallFloatExponent 0)" "(554 genPrimitiveSmallFloatTimesTwoPower 1)" (555 genPrimitiveSmallFloatSquareRoot 0) "(556 genPrimitiveSmallFloatSine 0)" "(557 genPrimitiveSmallFloatArctan 0)" "(558 genPrimitiveSmallFloatLogN 0)" "(559 genPrimitiveSmallFloatExp 0)" )! Item was added: + ----- Method: SimpleStackBasedCogit>>compileFullBlockMethodFrameBuild (in category 'compile abstract instructions') ----- + compileFullBlockMethodFrameBuild + "Build a frame for a block activation. See CoInterpreter class>>initializeFrameIndices. + closure (in ReceiverResultReg) + arg0 + ... + argN + caller's saved ip/this stackPage (for a base frame) + fp-> saved fp + method + context (uninitialized?) + receiver + first temp + ... + sp-> Nth temp + Avoid use of SendNumArgsReg which is the flag determining whether + context switch is allowed on stack-overflow." + <inline: false> + needsFrame ifFalse: [^self]. + backEnd hasLinkRegister ifTrue: + [self PushR: LinkReg]. + self PushR: FPReg. + self MoveR: SPReg R: FPReg. + "Think of ClassReg as ClosureReg" + self MoveR: ReceiverResultReg R: ClassReg. + "The block method field must have its MFMethodFlagIsBlockFlag bit set. + We arrange this using a labelOffset. A hack, but it works." + methodLabel addDependent: (self annotateAbsolutePCRef: + (self PushCw: methodLabel asInteger)). "method" + self annotate: (self PushCw: objectMemory nilObject) "context" + objRef: objectMemory nilObject. + "Fetch home receiver from outer context. closure is on stack and initially in ReceiverResultReg. + It is safe to use Arg0Reg because reg args are pushed by the value primitives if there are any.". + + self flag: 'we could do the following only if the block has inst var ref'. + "Use ReceiverResultReg for Context to agree with store check trampoline" + objectRepresentation + genLoadSlot: FullClosureReceiverIndex + sourceReg: ClassReg + destReg: Arg0Reg. + objectRepresentation + genEnsureOopInRegNotForwarded: Arg0Reg scratchReg: TempReg updatingSlot: FullClosureReceiverIndex in: ReceiverResultReg. + self MoveR: Arg0Reg R: ReceiverResultReg. + self PushR: ReceiverResultReg. "closure receiver" + "Push copied values; bytecode initializes temporaries" + self flag: 'numCopied needs to be passed as parameter'. + 0 to: self numCopied - 1 do: + [:i| + objectRepresentation + genLoadSlot: i + FullClosureFirstCopiedValueIndex + sourceReg: ClassReg + destReg: TempReg. + self PushR: TempReg]. + self MoveAw: coInterpreter stackLimitAddress R: TempReg. + self CmpR: TempReg R: SPReg. "N.B. FLAGS := SPReg - TempReg" + self JumpBelow: stackOverflowCall. + stackCheckLabel := (self annotateBytecode: self Label)! Item was added: + ----- Method: SimpleStackBasedCogit>>fullBlockEntryOffset (in category 'accessing') ----- + fullBlockEntryOffset + <api> + <cmacro> + ^cbEntryOffset! Item was added: + ----- Method: SimpleStackBasedCogit>>fullBlockNoContextSwitchEntryOffset (in category 'accessing') ----- + fullBlockNoContextSwitchEntryOffset + <api> + <cmacro> + ^cbNoSwitchEntryOffset! Item was added: + ----- Method: SimpleStackBasedCogit>>genPrimitiveFullClosureValue (in category 'primitive generators') ----- + genPrimitiveFullClosureValue + "Check the argument count. Fail if wrong. + Get the method from the outerContext and see if it is cogged. If so, jump to the + block entry or the no-context-switch entry, as appropriate, and we're done. If not, + invoke the interpreter primitive." + | jumpFailNArgs jumpFail3 jumpFail4 jumpBCMethod primitiveRoutine result | + <var: #jumpFail3 type: #'AbstractInstruction *'> + <var: #jumpFail4 type: #'AbstractInstruction *'> + <var: #jumpFailNArgs type: #'AbstractInstruction *'> + <var: #jumpBCMethod type: #'AbstractInstruction *'> + <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)()'> + objectRepresentation genLoadSlot: ClosureNumArgsIndex sourceReg: ReceiverResultReg destReg: TempReg. + self CmpCq: (objectMemory integerObjectOf: methodOrBlockNumArgs) R: TempReg. + jumpFailNArgs := self JumpNonZero: 0. + + "We defer unforwarding the receiver to the prologue; scanning blocks + for inst var refs and only unforwarding if the block refers to inst vars." + (false + and: [objectRepresentation hasSpurMemoryManagerAPI]) ifTrue: + [objectRepresentation + genLoadSlot: FullClosureReceiverIndex sourceReg: ReceiverResultReg destReg: SendNumArgsReg; + genEnsureOopInRegNotForwarded: SendNumArgsReg + scratchReg: TempReg + updatingSlot: FullClosureReceiverIndex + in: ReceiverResultReg]. + objectRepresentation genLoadSlot: FullClosureCompiledBlockIndex sourceReg: ReceiverResultReg destReg: SendNumArgsReg. + jumpFail3 := objectRepresentation genJumpImmediate: SendNumArgsReg. + objectRepresentation genGetFormatOf: SendNumArgsReg into: TempReg. + self CmpCq: objectMemory firstCompiledMethodFormat R: TempReg. + jumpFail4 := self JumpLess: 0. + objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: ClassReg. + jumpBCMethod := objectRepresentation genJumpImmediate: ClassReg. + + primitiveRoutine := coInterpreter + functionPointerForCompiledMethod: methodObj + primitiveIndex: primitiveIndex. + self AddCq: (primitiveRoutine = #primitiveFullClosureValueNoContextSwitch + ifTrue: [self fullBlockNoContextSwitchEntryOffset] + ifFalse: [self fullBlockEntryOffset]) + R: ClassReg. + self JumpR: TempReg. + jumpBCMethod jmpTarget: (jumpFail3 jmpTarget: (jumpFail4 jmpTarget: self Label)). + (result := self compileInterpreterPrimitive: primitiveRoutine) < 0 ifTrue: + [^result]. + jumpFailNArgs jmpTarget: self Label. + ^CompletePrimitive! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - how many counters it needs/conditional branches it contains Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. - inBlock := false. prevBCDescriptor := nil. numCounters := 0. NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC. (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [numCounters := numCounters + 1]]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. - inBlock := false. prevBCDescriptor := nil. NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks!

1 0

VM Maker: VMMaker.oscog-eem.1780.mcz
by commits＠source.squeak.org 08 Apr '16

08 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1780.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1780 Author: eem Time: 7 April 2016, 5:29:12.636568 pm UUID: 4b90904a-80a2-4646-adc3-e5496b2fd317 Ancestors: VMMaker.oscog-eem.1779 Eliminate duplicate initialization of the CoInterpreter hierarchy. =============== Diff against VMMaker.oscog-eem.1779 =============== Item was changed: ----- Method: CogVMSimulator class>>initializeWithOptions:objectMemoryClass: (in category 'class initialization') ----- initializeWithOptions: optionsDictionaryOrArray objectMemoryClass: objectMemoryClassOrNil "The relevant ObjectMemory, Interpreter and Cogit classes must be initialized in order. This happens notionally every time we start the simulator, but in fact happens when ever we instantiate a simulator." initializationOptions := optionsDictionaryOrArray isArray ifTrue: [Dictionary newFromPairs: optionsDictionaryOrArray] ifFalse: [optionsDictionaryOrArray]. (objectMemoryClassOrNil ifNil: [self objectMemoryClass]) initializeWithOptions: initializationOptions. - self initializeWithOptions: initializationOptions. - ((initializationOptions at: #COGMTVM ifAbsent: [false]) ifTrue: [CoInterpreterMT] ifFalse: [CoInterpreter]) initializeWithOptions: initializationOptions. ByteCountsPerMicrosecond := initializationOptions at: #ByteCountsPerMicrosecond ifAbsent: [100]. (self cogitClass withAllSuperclasses copyUpTo: Cogit) reverseDo: [:c| c initializeWithOptions: initializationOptions]!

1 0

VM Maker: VMMaker.oscog-eem.1779.mcz
by commits＠source.squeak.org 08 Apr '16

08 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1779.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1779 Author: eem Time: 7 April 2016, 5:26:14.093395 pm UUID: eb3139fc-9d6f-432c-83b9-099675dcb37d Ancestors: VMMaker.oscog-eem.1778 Fix simulation of the LargeIntegersPlugin. The issue is that interpreterProxy firstIndexableField: answers a CArray whose unitSize reflects the object's unit size, and becuase LargeIntegers are byte objects, the CArray is a byte accssor by default. So add InterpreterPlugin>>firstIndexableField:as:, which uses cCoerce:to: to provide a CArray typed as requested, and use it everywhere the LargeIntegersPlugin takes the firstIndexableField of a LargeInteger, and cast to #'unsigned int *'. Go some way to speed up the warppers by a) improving CArray>at:[put:] to assume unitSize is a suitable power of two, and b) add CFloatArray to access float or double Later on we can add CUnsignedIntegerArray, as required. N.B. While this fixes simulation of the LargeIntegerPlugin there is still something wrong under simulation in whatever produces large fonts. Start up the Squeak 5.0 release image with the "Squeak 5.0 Release Notes" text in huge letters in a workspace towards the front and you'll notice that in the simulator none of the large fonts are displayed, although the text from "Fast Become" works fine. =============== Diff against VMMaker.oscog-eem.1778 =============== Item was changed: ----- Method: CArray>>at: (in category 'accessing') ----- at: offset + | address | + address := unitSize * offset + self ptrAddress. + ^unitSize <= 2 + ifTrue: + [unitSize = 1 + ifTrue: [interpreter byteAt: address] + ifFalse: [interpreter shortAt: address]] + ifFalse: + [unitSize = 4 + ifTrue: [interpreter long32At: address] + ifFalse: [interpreter long64At: address]]! - | ptrAddress | - ptrAddress := self ptrAddress. - unitSize = 1 ifTrue: [^ interpreter byteAt: ptrAddress + offset]. - unitSize = 2 ifTrue: [^ interpreter shortAt: ptrAddress + (offset * 2)]. - unitSize = 4 ifTrue: [^ interpreter long32At: ptrAddress + (offset * 4)]. - unitSize = 8 ifTrue: [^ interpreter long64At: ptrAddress + (offset * 8)]. - self halt: 'Can''t handle unitSize ', unitSize printString! Item was changed: ----- Method: CArray>>at:put: (in category 'accessing') ----- at: offset put: val + | address | + address := unitSize * offset + self ptrAddress. + ^unitSize <= 2 + ifTrue: + [unitSize = 1 + ifTrue: [interpreter byteAt: address put: val] + ifFalse: [interpreter shortAt: address put: val]] + ifFalse: + [unitSize = 4 + ifTrue: [interpreter long32At: address put: val] + ifFalse: [interpreter long64At: address put: val]]! - | ptrAddress | - ptrAddress := self ptrAddress. - unitSize = 1 ifTrue: [^ interpreter byteAt: ptrAddress + offset put: val]. - unitSize = 2 ifTrue: [^ interpreter byteAt: ptrAddress + (offset * 2) put: val]. - unitSize = 4 ifTrue: [^ interpreter long32At: ptrAddress + (offset * 4) put: val]. - unitSize = 8 ifTrue: [^ interpreter long64At: ptrAddress + (offset * 8) put: val]. - self halt: 'Can''t handle unitSize ', unitSize printString! Item was changed: ----- Method: CArray>>interpreter:address:unitSize: (in category 'private') ----- interpreter: interpreterSimulator address: arrayAddress unitSize: numBytes interpreter := interpreterSimulator. arrayBaseAddress := arrayAddress. + self unitSize: numBytes. + ptrOffset := 0! - unitSize := numBytes. - ptrOffset := 0. - ! Item was changed: ----- Method: CArray>>unitSize: (in category 'accessing') ----- unitSize: n + (n isPowerOfTwo and: [n <= 8]) ifFalse: + [self error: 'unitSize must be 1, 2, 4 or 8']. unitSize := n! Item was added: + CArray subclass: #CFloatArray + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-InterpreterSimulation'! + + !CFloatArray commentStamp: 'eem 4/7/2016 09:39' prior: 0! + A CFloatArray is a subclass of CArray that provides access via C float or double values! Item was added: + ----- Method: CFloatArray>>at: (in category 'accessing') ----- + at: offset + | address | + address := unitSize * offset + self ptrAddress. + ^unitSize >= 4 + ifTrue: + [unitSize = 4 + ifTrue: [Float fromIEEE32Bit: (interpreter long32At: address)] + ifFalse: [Float fromIEEE64BitWord: (interpreter long64At: address)]] + ifFalse: + [self error: 'unitSize must be 4 or 8']! Item was added: + ----- Method: CFloatArray>>at:put: (in category 'accessing') ----- + at: offset put: val + | address | + address := unitSize * offset + self ptrAddress. + ^unitSize >= 4 + ifTrue: + [unitSize = 4 + ifTrue: [interpreter long32At: address put: val] + ifFalse: [interpreter long64At: address put: val]] + ifFalse: + [self error: 'unitSize must be 4 or 8']! Item was changed: ----- Method: Integer>>coerceTo:sim: (in category '*VMMaker-interpreter simulator') ----- coerceTo: cTypeString sim: interpreter | unitSize | cTypeString last = $* ifTrue: "C pointer" [unitSize := cTypeString caseOf: { ['char *'] -> [1]. ['short *'] -> [2]. ['int *'] -> [4]. + ['float *'] -> [^CFloatArray basicNew interpreter: interpreter address: self unitSize: 4; yourself]. + ['double *'] -> [^CFloatArray basicNew interpreter: interpreter address: self unitSize: 8; yourself]. - ['long *'] -> [interpreter wordSize]. - ['float *'] -> [4]. - ['double *'] -> [8]. ['unsigned *'] -> [4]. ['unsigned int *'] -> [4]. + ['unsigned char *'] -> [1]. + ['signed char *'] -> [1]. + ['unsigned short *'] -> [2]. - ['unsigned char *'] -> [4]. - ['unsigned short *'] -> [4]. ['oop *'] -> [interpreter bytesPerOop]. } + otherwise: [interpreter wordSize]. - otherwise: [ (cTypeString beginsWith: 'char') ifTrue: [1] ifFalse: [interpreter wordSize] ]. ^CArray basicNew interpreter: interpreter address: self unitSize: unitSize; yourself]. + ^self "C number (int, char, float, etc)"! - ^ self "C number (int, char, float, etc)"! Item was added: + ----- Method: InterpreterPlugin>>firstIndexableField:as: (in category 'casting support') ----- + firstIndexableField: obj as: cType + <inline: true> + ^interpreterProxy cCoerce: (interpreterProxy firstIndexableField: obj) to: cType! Item was changed: ----- Method: LargeIntegersPlugin>>createLargeFromSmallInteger: (in category 'oop util') ----- createLargeFromSmallInteger: anOop "anOop has to be a SmallInteger!!" | val res pDigit byteSize digitSize | <var: #pDigit type: #'unsigned int *'> val := interpreterProxy integerValueOf: anOop. byteSize := self byteSizeOfCSI: val. res := self createLargeIntegerNeg: val < 0 byteLength: byteSize. + pDigit := self firstIndexableField: res as: #'unsigned int *'. - pDigit := interpreterProxy firstIndexableField: res. digitSize := byteSize + 3 // 4. 1 to: digitSize do: [:ix | self cDigitOf: pDigit at: ix - 1 put: (self digitOfCSI: val at: ix)]. ^ res! Item was changed: ----- Method: LargeIntegersPlugin>>digit:Lshift: (in category 'oop functions') ----- digit: anOop Lshift: shiftCount "Attention: this method invalidates all oop's!! Only newOop is valid at return." "Does not normalize." | newOop highBit newDigitLen newByteLen oldDigitLen | oldDigitLen := self digitSizeOfLargeInt: anOop. + (highBit := self cDigitHighBit: (self firstIndexableField: anOop as: #'unsigned int *') - (highBit := self cDigitHighBit: (interpreterProxy firstIndexableField: anOop) len: oldDigitLen) = 0 ifTrue: [^ interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: anOop) indexableSize: 1]. newByteLen := highBit + shiftCount + 7 // 8. self remapOop: anOop in: [newOop := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: anOop) indexableSize: newByteLen]. newDigitLen := newByteLen + 3 // 4. self cDigitLshift: shiftCount + from: (self firstIndexableField: anOop as: #'unsigned int *') - from: (interpreterProxy firstIndexableField: anOop) len: oldDigitLen + to: (self firstIndexableField: newOop as: #'unsigned int *') - to: (interpreterProxy firstIndexableField: newOop) len: newDigitLen. ^ newOop! Item was changed: ----- Method: LargeIntegersPlugin>>digit:Rshift:lookfirst: (in category 'oop functions') ----- digit: anOop Rshift: shiftCount lookfirst: a "Attention: this method invalidates all oop's!! Only newBytes is valid at return." "Shift right 32*digitShift+bitShift bits, 0<=bitShift<32. Discard all digits beyond a, and all zeroes at or below a." "Does not normalize." | newByteLen newOop oldBitLen newBitLen oldDigitLen newDigitLen | + oldBitLen := self cDigitHighBit: (self firstIndexableField: anOop as: #'unsigned int *') len: a. - oldBitLen := self cDigitHighBit: (interpreterProxy firstIndexableField: anOop) len: a. oldDigitLen := oldBitLen + 31 // 32. newBitLen := oldBitLen - shiftCount. newBitLen <= 0 ifTrue: ["All bits lost" ^ interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: anOop) indexableSize: 0]. newByteLen := newBitLen + 7 // 8. newDigitLen := newByteLen + 3 // 4. self remapOop: anOop in: [newOop := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: anOop) indexableSize: newByteLen]. self cDigitRshift: shiftCount + from: (self firstIndexableField: anOop as: #'unsigned int *') - from: (interpreterProxy firstIndexableField: anOop) len: oldDigitLen + to: (self firstIndexableField: newOop as: #'unsigned int *') - to: (interpreterProxy firstIndexableField: newOop) len: newDigitLen. ^ newOop! Item was changed: ----- Method: LargeIntegersPlugin>>digitAddLarge:with: (in category 'oop functions') ----- digitAddLarge: firstInteger with: secondInteger "Does not need to normalize!!" | over firstDigitLen secondDigitLen shortInt shortDigitLen longInt longDigitLen sum newSum neg | <var: #over type: #'unsigned int'> firstDigitLen := self digitSizeOfLargeInt: firstInteger. secondDigitLen := self digitSizeOfLargeInt: secondInteger. neg := (interpreterProxy fetchClassOf: firstInteger) = interpreterProxy classLargeNegativeInteger. firstDigitLen <= secondDigitLen ifTrue: [shortInt := firstInteger. shortDigitLen := firstDigitLen. longInt := secondInteger. longDigitLen := secondDigitLen] ifFalse: [shortInt := secondInteger. shortDigitLen := secondDigitLen. longInt := firstInteger. longDigitLen := firstDigitLen]. " sum := Integer new: len neg: firstInteger negative." self remapOop: #(shortInt longInt ) in: [sum := self createLargeIntegerNeg: neg digitLength: longDigitLen]. over := self + cDigitAdd: (self firstIndexableField: shortInt as: #'unsigned int *') - cDigitAdd: (interpreterProxy firstIndexableField: shortInt) len: shortDigitLen + with: (self firstIndexableField: longInt as: #'unsigned int *') - with: (interpreterProxy firstIndexableField: longInt) len: longDigitLen + into: (self firstIndexableField: sum as: #'unsigned int *'). - into: (interpreterProxy firstIndexableField: sum). over > 0 ifTrue: ["sum := sum growby: 1." self remapOop: sum in: [newSum := self createLargeIntegerNeg: neg byteLength: longDigitLen * 4 + 1]. self + cDigitCopyFrom: (self firstIndexableField: sum as: #'unsigned int *') + to: (self firstIndexableField: newSum as: #'unsigned int *') - cDigitCopyFrom: (interpreterProxy firstIndexableField: sum) - to: (interpreterProxy firstIndexableField: newSum) len: longDigitLen. sum := newSum. "C index!!" + self cDigitOf: (self firstIndexableField: sum as: #'unsigned int *') - self cDigitOf: (interpreterProxy cCoerce: (interpreterProxy firstIndexableField: sum) to: 'unsigned int *') at: longDigitLen put: over] ifFalse: [sum := neg ifTrue: [self normalizeNegative: sum] ifFalse: [self normalizePositive: sum]]. ^ sum! Item was changed: ----- Method: LargeIntegersPlugin>>digitBitLogic:with:opIndex: (in category 'oop functions') ----- digitBitLogic: firstInteger with: secondInteger opIndex: opIx "Bit logic here is only implemented for positive integers or Zero; if rec or arg is negative, it fails." | firstLarge secondLarge firstLen secondLen shortLen shortLarge longLen longLarge result | (interpreterProxy isIntegerObject: firstInteger) ifTrue: [(interpreterProxy integerValueOf: firstInteger) < 0 ifTrue: [^ interpreterProxy primitiveFail]. "convert it to a not normalized LargeInteger" self remapOop: secondInteger in: [firstLarge := self createLargeFromSmallInteger: firstInteger]] ifFalse: [(interpreterProxy fetchClassOf: firstInteger) = interpreterProxy classLargeNegativeInteger ifTrue: [^ interpreterProxy primitiveFail]. firstLarge := firstInteger]. (interpreterProxy isIntegerObject: secondInteger) ifTrue: [(interpreterProxy integerValueOf: secondInteger) < 0 ifTrue: [^ interpreterProxy primitiveFail]. "convert it to a not normalized LargeInteger" self remapOop: firstLarge in: [secondLarge := self createLargeFromSmallInteger: secondInteger]] ifFalse: [(interpreterProxy fetchClassOf: secondInteger) = interpreterProxy classLargeNegativeInteger ifTrue: [^ interpreterProxy primitiveFail]. secondLarge := secondInteger]. firstLen := self byteSizeOfLargeInt: firstLarge. secondLen := self byteSizeOfLargeInt: secondLarge. firstLen < secondLen ifTrue: [shortLen := firstLen. shortLarge := firstLarge. longLen := secondLen. longLarge := secondLarge] ifFalse: [shortLen := secondLen. shortLarge := secondLarge. longLen := firstLen. longLarge := firstLarge]. self remapOop: #(shortLarge longLarge ) in: [result := interpreterProxy instantiateClass: interpreterProxy classLargePositiveInteger indexableSize: longLen]. self cDigitOp: opIx + short: (self firstIndexableField: shortLarge as: #'unsigned int *') - short: (interpreterProxy firstIndexableField: shortLarge) len: shortLen + 3 // 4 + long: (self firstIndexableField: longLarge as: #'unsigned int *') - long: (interpreterProxy firstIndexableField: longLarge) len: longLen + 3 // 4 + into: (self firstIndexableField: result as: #'unsigned int *'). - into: (interpreterProxy firstIndexableField: result). interpreterProxy failed ifTrue: [^ 0]. ^ self normalizePositive: result! Item was changed: ----- Method: LargeIntegersPlugin>>digitCompareLarge:with: (in category 'oop functions') ----- digitCompareLarge: firstInteger with: secondInteger "Compare the magnitude of firstInteger with that of secondInteger. Return a code of 1, 0, -1 for firstInteger >, = , < secondInteger" | firstDigitLen secondDigitLen | firstDigitLen := self digitSizeOfLargeInt: firstInteger. secondDigitLen := self digitSizeOfLargeInt: secondInteger. secondDigitLen ~= firstDigitLen ifTrue: [secondDigitLen > firstDigitLen ifTrue: [^ -1 asOop: SmallInteger] ifFalse: [^ 1 asOop: SmallInteger]]. ^ (self + cDigitCompare: (self firstIndexableField: firstInteger as: #'unsigned int *') + with: (self firstIndexableField: secondInteger as: #'unsigned int *') - cDigitCompare: (interpreterProxy firstIndexableField: firstInteger) - with: (interpreterProxy firstIndexableField: secondInteger) len: firstDigitLen) asOop: SmallInteger! Item was changed: ----- Method: LargeIntegersPlugin>>digitDivLarge:with:negative: (in category 'oop functions') ----- digitDivLarge: firstInteger with: secondInteger negative: neg "Does not normalize." "Division by zero has to be checked in caller." | firstDigitLen secondDigitLen quoDigitLen d div rem quo result | firstDigitLen := self digitSizeOfLargeInt: firstInteger. secondDigitLen := self digitSizeOfLargeInt: secondInteger. quoDigitLen := firstDigitLen - secondDigitLen + 1. quoDigitLen <= 0 ifTrue: [self remapOop: firstInteger in: [result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2]. result stAt: 1 put: (0 asOop: SmallInteger). result stAt: 2 put: firstInteger. ^ result]. "set rem and div to copies of firstInteger and secondInteger, respectively. However, to facilitate use of Knuth's algorithm, multiply rem and div by 2 (that is, shift) until the high word of div is >=16r80000000" d := 32 - (self cHighBit32: (self unsafeDigitOfLargeInt: secondInteger at: secondDigitLen)). self remapOop: firstInteger in: [div := self digit: secondInteger Lshift: d. div := self largeInt: div growTo: (self digitSizeOfLargeInt: div) + 1 * 4]. self remapOop: div in: [rem := self digit: firstInteger Lshift: d. (self digitSizeOfLargeInt: rem) = firstDigitLen ifTrue: [rem := self largeInt: rem growTo: firstDigitLen + 1 * 4]]. self remapOop: #(div rem ) in: [quo := self createLargeIntegerNeg: neg digitLength: quoDigitLen]. self + cDigitDiv: (self firstIndexableField: div as: #'unsigned int *') - cDigitDiv: (interpreterProxy firstIndexableField: div) len: (self digitSizeOfLargeInt: div) + rem: (self firstIndexableField: rem as: #'unsigned int *') - rem: (interpreterProxy firstIndexableField: rem) len: (self digitSizeOfLargeInt: rem) + quo: (self firstIndexableField: quo as: #'unsigned int *') - quo: (interpreterProxy firstIndexableField: quo) len: (self digitSizeOfLargeInt: quo). self remapOop: #(quo ) in: [rem := self digit: rem Rshift: d lookfirst: (self digitSizeOfLargeInt: div) - 1]. "^ Array with: quo with: rem" self remapOop: #(quo rem ) in: [result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2]. result stAt: 1 put: quo. result stAt: 2 put: rem. ^ result! Item was changed: ----- Method: LargeIntegersPlugin>>digitMontgomery:times:modulo:mInvModB: (in category 'oop functions') ----- digitMontgomery: firstLarge times: secondLarge modulo: thirdLarge mInvModB: mInv <var: #mInv type: #'unsigned int'> | firstLen secondLen thirdLen prod | firstLen := self digitSizeOfLargeInt: firstLarge. secondLen := self digitSizeOfLargeInt: secondLarge. thirdLen := self digitSizeOfLargeInt: thirdLarge. + (firstLen <= thirdLen and: [secondLen <= thirdLen]) ifFalse: [^interpreterProxy primitiveFail]. + self remapOop: #(firstLarge secondLarge thirdLarge) + in: [prod := interpreterProxy instantiateClass: interpreterProxy classLargePositiveInteger indexableSize: thirdLen * 4]. - firstLen <= thirdLen ifFalse: [^interpreterProxy primitiveFail]. - secondLen <= thirdLen ifFalse: [^interpreterProxy primitiveFail]. - self remapOop: #(firstLarge secondLarge thirdLarge) in: [prod := interpreterProxy instantiateClass: interpreterProxy classLargePositiveInteger indexableSize: thirdLen * 4]. self + cDigitMontgomery: (self firstIndexableField: firstLarge as: #'unsigned int *') + len: firstLen + times: (self firstIndexableField: secondLarge as: #'unsigned int *') + len: secondLen + modulo: (self firstIndexableField: thirdLarge as: #'unsigned int *') + len: thirdLen + mInvModB: mInv + into: (self firstIndexableField: prod as: #'unsigned int *'). - cDigitMontgomery: (interpreterProxy firstIndexableField: firstLarge) - len: firstLen - times: (interpreterProxy firstIndexableField: secondLarge) - len: secondLen - modulo: (interpreterProxy firstIndexableField: thirdLarge) - len: thirdLen - mInvModB: mInv - into: (interpreterProxy firstIndexableField: prod). ^self normalizePositive: prod! Item was changed: ----- Method: LargeIntegersPlugin>>digitMultiplyLarge:with:negative: (in category 'oop functions') ----- digitMultiplyLarge: firstInteger with: secondInteger negative: neg "Normalizes." | firstLen secondLen shortInt shortLen longInt longLen prod | firstLen := self byteSizeOfLargeInt: firstInteger. secondLen := self byteSizeOfLargeInt: secondInteger. firstLen <= secondLen ifTrue: [shortInt := firstInteger. shortLen := firstLen. longInt := secondInteger. longLen := secondLen] ifFalse: [shortInt := secondInteger. shortLen := secondLen. longInt := firstInteger. longLen := firstLen]. + self remapOop: #(shortInt longInt) in: [prod := self createLargeIntegerNeg: neg byteLength: longLen + shortLen]. - self remapOop: #(shortInt longInt ) in: [prod := self createLargeIntegerNeg: neg byteLength: longLen + shortLen]. self + cDigitMultiply: (self firstIndexableField: shortInt as: #'unsigned int *') - cDigitMultiply: (interpreterProxy firstIndexableField: shortInt) len: shortLen + 3 // 4 + with: (self firstIndexableField: longInt as: #'unsigned int *') - with: (interpreterProxy firstIndexableField: longInt) len: longLen + 3 // 4 + into: (self firstIndexableField: prod as: #'unsigned int *') - into: (interpreterProxy firstIndexableField: prod) len: longLen + shortLen + 3 // 4. ^neg ifTrue: [self normalizeNegative: prod] ifFalse: [self normalizePositive: prod]! Item was changed: ----- Method: LargeIntegersPlugin>>digitSubLarge:with: (in category 'oop functions') ----- digitSubLarge: firstInteger with: secondInteger "Normalizes." | firstDigitLen secondDigitLen larger largeDigitLen smaller smallerDigitLen neg resDigitLen res firstNeg | firstNeg := (interpreterProxy fetchClassOf: firstInteger) = interpreterProxy classLargeNegativeInteger. firstDigitLen := self digitSizeOfLargeInt: firstInteger. secondDigitLen := self digitSizeOfLargeInt: secondInteger. firstDigitLen = secondDigitLen ifTrue: [[firstDigitLen > 1 and: [(self unsafeDigitOfLargeInt: firstInteger at: firstDigitLen) = (self unsafeDigitOfLargeInt: secondInteger at: firstDigitLen)]] whileTrue: [firstDigitLen := firstDigitLen - 1]. secondDigitLen := firstDigitLen]. (firstDigitLen < secondDigitLen or: [firstDigitLen = secondDigitLen and: [(self unsafeDigitOfLargeInt: firstInteger at: firstDigitLen) < (self unsafeDigitOfLargeInt: secondInteger at: firstDigitLen)]]) ifTrue: [larger := secondInteger. largeDigitLen := secondDigitLen. smaller := firstInteger. smallerDigitLen := firstDigitLen. neg := firstNeg == false] ifFalse: [larger := firstInteger. largeDigitLen := firstDigitLen. smaller := secondInteger. smallerDigitLen := secondDigitLen. neg := firstNeg]. resDigitLen := largeDigitLen. self remapOop: #(smaller larger) in: [res := self createLargeIntegerNeg: neg digitLength: resDigitLen]. self + cDigitSub: (self firstIndexableField: smaller as: #'unsigned int *') - cDigitSub: (interpreterProxy firstIndexableField: smaller) len: smallerDigitLen + with: (self firstIndexableField: larger as: #'unsigned int *') - with: (interpreterProxy firstIndexableField: larger) len: largeDigitLen + into: (self firstIndexableField: res as: #'unsigned int *'). - into: (interpreterProxy firstIndexableField: res). ^neg ifTrue: [self normalizeNegative: res] ifFalse: [self normalizePositive: res]! Item was changed: ----- Method: LargeIntegersPlugin>>highBitOfLargeInt: (in category 'util') ----- highBitOfLargeInt: anOop <inline: true> ^ self + cDigitHighBit: (self firstIndexableField: anOop as: #'unsigned int *') - cDigitHighBit: (interpreterProxy firstIndexableField: anOop) len: (self digitSizeOfLargeInt: anOop)! Item was changed: ----- Method: LargeIntegersPlugin>>largeInt:growTo: (in category 'oop util') ----- largeInt: aBytesObject growTo: newByteLen "Attention: this method invalidates all oop's!! Only newBytes is valid at return." "Does not normalize." | newBytes oldDigitLen newDigitLen copyLen | self remapOop: aBytesObject in: [newBytes := interpreterProxy instantiateClass: (interpreterProxy fetchClassOf: aBytesObject) indexableSize: newByteLen]. newDigitLen := newByteLen + 3 // 4. oldDigitLen := self digitSizeOfLargeInt: aBytesObject. + copyLen := oldDigitLen < newDigitLen + ifTrue: [oldDigitLen] + ifFalse: [newDigitLen]. - oldDigitLen < newDigitLen - ifTrue: [copyLen := oldDigitLen] - ifFalse: [copyLen := newDigitLen]. self + cDigitCopyFrom: (self firstIndexableField: aBytesObject as: #'unsigned int *') + to: (self firstIndexableField: newBytes as: #'unsigned int *') - cDigitCopyFrom: (interpreterProxy firstIndexableField: aBytesObject) - to: (interpreterProxy firstIndexableField: newBytes) len: copyLen. + ^newBytes! - ^ newBytes! Item was changed: ----- Method: LargeIntegersPlugin>>unsafeByteOfLargeInt:at: (in category 'util') ----- unsafeByteOfLargeInt: bytesObj at: ix "Argument bytesObj must not be aSmallInteger!!" <inline: true> <returnTypeC: #'unsigned char'> + ^(self firstIndexableField: bytesObj as: #'unsigned char *') at: ix - 1! - ^(interpreterProxy cCoerce: (interpreterProxy firstIndexableField: bytesObj) to: #'unsigned char *') at: ix - 1! Item was changed: ----- Method: LargeIntegersPlugin>>unsafeDigitOfLargeInt:at: (in category 'util') ----- unsafeDigitOfLargeInt: anOop at: ix "Argument must not be aSmallInteger!!" <inline: true> <returnTypeC: #'unsigned int'> + ^self cDigitOf: (self firstIndexableField: anOop as: #'unsigned int *') at: ix - 1! - ^self cDigitOf: (interpreterProxy cCoerce: (interpreterProxy firstIndexableField: anOop) to: #'unsigned int *') at: ix - 1!

1 0

outage
by Eliot Miranda 07 Apr '16

07 Apr '16

Ben, Nicolas, you've raised important issues in recent messages. Alas my internet connexion is down and I can't respond until it's back. Forgive the blackout period. "It'll be a few hours", said support... _,,,^..^,,,_ (phone)

1 0

VMMaker missing dependents
by Ben Coman 07 Apr '16

07 Apr '16

Just notice in Squeak 5.0 I tried loading VMMaker.oscog-eem.1778 and got Warning: This package depends on the following classes: FFIConstants KlattResonatorIndices cheers -ben

2 2

VM Maker: VMMaker.oscog-eem.1778.mcz
by commits＠source.squeak.org 07 Apr '16

07 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1778.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1778 Author: eem Time: 6 April 2016, 7:48:57.63562 pm UUID: cdfc4d49-1f47-4ec4-a4e1-af37cd734fed Ancestors: VMMaker.oscog-eem.1777 Split the FullBlockClosure>>value[:...] support into its own set of primitives (531 through 538). Make these optional, depending on SistaV1BytecodeSet. No longer follow the method and context fields in a closure in activateNewClosureMethod:numArgs:mayContextSwitch:; the caller will have failed if these are forwarders, so there is no need to check again. Simulator: Fix StackInterpreterSimulator>>endPCOf: for CompiledBlocks, where a blockReturn is the last bytecode of a block method. Slang: To allow methods to be optional upon a bytecode set add the name of the bytecode set as a key to the value true in initializationOptions in all of the bytecode set initializers, with names SqueakV3PlusClosuresBytecodeSet, NewsqueakV4BytecodeSet, SistaV1BytecodeSet. =============== Diff against VMMaker.oscog-eem.1777 =============== Item was changed: ----- Method: CoInterpreter>>activateNewClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') ----- activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch "Similar to activateNewMethod but for Closure and newMethod. Override to handle the various interpreter/machine code transitions and to create an appropriate frame layout." | numCopied outerContext theMethod methodHeader inInterpreter closureIP switched | <inline: true> + outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. + self assert: (objectMemory isContext: outerContext). - outerContext := objectMemory followField: ClosureOuterContextIndex ofObject: blockClosure. self assert: outerContext ~= blockClosure. numCopied := self copiedValueCountOfClosure: blockClosure. + theMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. + self assert: (objectMemory isOopCompiledMethod: theMethod). - theMethod := objectMemory followField: MethodIndex ofObject: outerContext. methodHeader := self rawHeaderOf: theMethod. (self isCogMethodReference: methodHeader) ifTrue: [^self executeCogBlock: (self cogMethodOf: theMethod) closure: blockClosure mayContextSwitch: mayContextSwitch]. "How do we know when to compile a block method? One simple criterion is to check if the block is running within its inner context, i.e. if the outerContext is married. Even simpler is to remember the previous block entered via the interpreter and compile if this is the same one. But we can thrash trying to compile an uncoggable method unless we try and remember which ones can't be cogged. So also record the last block method we failed to compile and avoid recompiling it." (self methodWithHeaderShouldBeCogged: methodHeader) ifTrue: [theMethod = lastCoggableInterpretedBlockMethod ifTrue: [theMethod ~= lastUncoggableInterpretedBlockMethod ifTrue: [cogit cog: theMethod selector: objectMemory nilObject. (self methodHasCogMethod: theMethod) ifTrue: [^self executeCogBlock: (self cogMethodOf: theMethod) closure: blockClosure mayContextSwitch: mayContextSwitch]. cogCompiledCodeCompactionCalledFor ifFalse: [lastUncoggableInterpretedBlockMethod := theMethod]]] ifFalse: [lastCoggableInterpretedBlockMethod := theMethod]] ifFalse: [self maybeFlagMethodAsInterpreted: theMethod]. self assert: (self methodHasCogMethod: theMethod) not. "Because this is an uncogged method we need to continue via the interpreter. We could have been reached either from the interpreter, in which case we should simply return, or from a machine code frame or from a compiled primitive. In these latter two cases we must longjmp back to the interpreter. The instructionPointer tells us which path we took. If the sender was an interpreter frame but called through a (failing) primitive then make sure we restore the saved instruction pointer and avoid pushing ceReturnToInterpreterPC which is only valid between an interpreter caller frame and a machine code callee frame." (inInterpreter := instructionPointer >= objectMemory startOfMemory) ifFalse: [instructionPointer = cogit ceReturnToInterpreterPC ifTrue: [instructionPointer := self iframeSavedIP: framePointer]]. self push: instructionPointer. self push: framePointer. framePointer := stackPointer. self push: theMethod. self push: objectMemory nilObject. "FxThisContext field" self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). self push: 0. "FoxIFSavedIP" + "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." self push: (objectMemory followField: ReceiverIndex ofObject: outerContext). "Copy the copied values..." 0 to: numCopied - 1 do: [:i| self push: (objectMemory fetchPointer: i + ClosureFirstCopiedValueIndex ofObject: blockClosure)]. self assert: (self frameIsBlockActivation: framePointer). self assert: (self frameHasContext: framePointer) not. "The initial instructions in the block nil-out remaining temps." "the instruction pointer is a pointer variable equal to method oop + ip + BaseHeaderSize -1 for 0-based addressing of fetchByte -1 because it gets incremented BEFORE fetching currentByte" closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure. instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2. self setMethod: theMethod methodHeader: methodHeader. "Now check for stack overflow or an event (interrupt, must scavenge, etc)" switched := false. stackPointer < stackLimit ifTrue: [switched := self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]. self returnToExecutive: inInterpreter postContextSwitch: switched! Item was changed: ----- Method: InterpreterPrimitives>>primitiveClosureValue (in category 'control primitives') ----- primitiveClosureValue | blockClosure numArgs closureMethod outerContext | blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. argumentCount = numArgs ifFalse: [^self primitiveFail]. + "Somewhat paranoiac checks we need while debugging that we may be able to discard + in a robust system." + outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. + (objectMemory isContext: outerContext) ifFalse: + [^self primitiveFail]. - (self is: blockClosure instanceOf: (objectMemory splObj: ClassBlockClosure) compactClassIndex: ClassBlockClosureCompactIndex) - ifTrue: - [ "Somewhat paranoiac checks we need while debugging that we may be able to discard - in a robust system." - outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. - (objectMemory isContext: outerContext) ifFalse: - [^self primitiveFail]. - closureMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. - "Check if the closure's method is actually a CompiledMethod." - (objectMemory isOopCompiledMethod: closureMethod) ifFalse: - [^self primitiveFail]. + closureMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. + "Check if the closure's method is actually a CompiledMethod." + (objectMemory isOopCompiledMethod: closureMethod) ifFalse: + [^self primitiveFail]. + + self activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true! - "Note we use activateNewMethod, not executeNewMethod, to avoid - quickCheckForInterrupts. Don't check until we have a full activation." - self activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true ] - ifFalse: - [ closureMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. - (objectMemory isOopCompiledMethod: closureMethod) - ifFalse: [ ^ self primitiveFail ]. - "Note we use activateNewMethod, not executeNewMethod, to avoid - quickCheckForInterrupts. Don't check until we have a full activation." - self activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true ]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveClosureValueNoContextSwitch (in category 'control primitives') ----- primitiveClosureValueNoContextSwitch "An exact clone of primitiveClosureValue except that this version will not check for interrupts on stack overflow. It may invoke the garbage collector but will not switch processes. See checkForInterruptsMayContextSwitch:" <api> | blockClosure numArgs closureMethod outerContext | blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. argumentCount = numArgs ifFalse: [^self primitiveFail]. "Somewhat paranoiac checks we need while debugging that we may be able to discard in a robust system." outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. (objectMemory isContext: outerContext) ifFalse: [^self primitiveFail]. + closureMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. "Check if the closure's method is actually a CompiledMethod." (objectMemory isOopCompiledMethod: closureMethod) ifFalse: [^self primitiveFail]. - "Note we use activateNewMethod, not executeNewMethod, to avoid - quickCheckForInterrupts. Don't check until we have a full activation." self activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: false! Item was changed: ----- Method: InterpreterPrimitives>>primitiveClosureValueWithArgs (in category 'control primitives') ----- primitiveClosureValueWithArgs | argumentArray arraySize blockClosure numArgs closureMethod index outerContext | argumentArray := self stackTop. (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFail]. "Check for enough space in thisContext to push all args" arraySize := objectMemory numSlotsOf: argumentArray. (self roomToPushNArgs: arraySize) ifFalse: [^self primitiveFail]. blockClosure := self stackValue: argumentCount. numArgs := self argumentCountOfClosure: blockClosure. arraySize = numArgs ifFalse: [^self primitiveFail]. "Somewhat paranoiac checks we need while debugging that we may be able to discard in a robust system." outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. (objectMemory isContext: outerContext) ifFalse: [^self primitiveFail]. closureMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. "Check if the closure's method is actually a CompiledMethod." (objectMemory isOopCompiledMethod: closureMethod) ifFalse: [^self primitiveFail]. self popStack. "Copy the arguments to the stack, and activate" index := 1. + [index <= numArgs] whileTrue: - [index <= numArgs] - whileTrue: [self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray). index := index + 1]. - "Note we use activateNewMethod, not executeNewMethod, to avoid - quickCheckForInterrupts. Don't check until we have a full activation." self activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true! Item was added: + ----- Method: InterpreterPrimitives>>primitiveFullClosureValue (in category 'control primitives') ----- + primitiveFullClosureValue + <option: #SistaV1BytecodeSet> + | blockClosure numArgs closureMethod | + blockClosure := self stackValue: argumentCount. + numArgs := self argumentCountOfClosure: blockClosure. + argumentCount = numArgs ifFalse: + [^self primitiveFail]. + + closureMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. + (objectMemory isOopCompiledMethod: closureMethod) ifFalse: + [^self primitiveFail]. + + self activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true! Item was added: + ----- Method: InterpreterPrimitives>>primitiveFullClosureValueNoContextSwitch (in category 'control primitives') ----- + primitiveFullClosureValueNoContextSwitch + "An exact clone of primitiveFullClosureValue except that this version will not + check for interrupts on stack overflow. It may invoke the garbage collector + but will not switch processes. See checkForInterruptsMayContextSwitch:" + <api> + <option: #SistaV1BytecodeSet> + | blockClosure numArgs closureMethod | + blockClosure := self stackValue: argumentCount. + numArgs := self argumentCountOfClosure: blockClosure. + argumentCount = numArgs ifFalse: + [^self primitiveFail]. + + closureMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. + (objectMemory isOopCompiledMethod: closureMethod) ifFalse: + [^self primitiveFail]. + + self activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: false! Item was added: + ----- Method: InterpreterPrimitives>>primitiveFullClosureValueWithArgs (in category 'control primitives') ----- + primitiveFullClosureValueWithArgs + <option: #SistaV1BytecodeSet> + | argumentArray arraySize blockClosure numArgs closureMethod index | + argumentArray := self stackTop. + (objectMemory isArray: argumentArray) ifFalse: + [^self primitiveFail]. + + "Check for enough space in thisContext to push all args" + arraySize := objectMemory numSlotsOf: argumentArray. + (self roomToPushNArgs: arraySize) ifFalse: + [^self primitiveFail]. + + blockClosure := self stackValue: argumentCount. + numArgs := self argumentCountOfClosure: blockClosure. + arraySize = numArgs ifFalse: + [^self primitiveFail]. + + + closureMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. + (objectMemory isOopCompiledMethod: closureMethod) ifFalse: + [^self primitiveFail]. + + self popStack. + + "Copy the arguments to the stack, and activate" + index := 1. + [index <= numArgs] whileTrue: + [self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray). + index := index + 1]. + + self activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: true! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForNewspeakV4 (in category 'initialization') ----- initializeBytecodeTableForNewspeakV4 "StackInterpreter initializeBytecodeTableForNewspeakV4" "Note: This table will be used to generate a C switch statement." + initializationOptions at: #NewsqueakV4BytecodeSet put: true. + BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForNewsqueakV4. LongStoreBytecode := 234. self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 extPushPseudoVariableOrOuterBytecode) ( 78 pushConstantZeroBytecode) ( 79 pushConstantOneBytecode) ( 80 bytecodePrimAdd) ( 81 bytecodePrimSubtract) ( 82 bytecodePrimLessThanV4) "for booleanCheatV4:" ( 83 bytecodePrimGreaterThanV4) "for booleanCheatV4:" ( 84 bytecodePrimLessOrEqualV4) "for booleanCheatV4:" ( 85 bytecodePrimGreaterOrEqualV4) "for booleanCheatV4:" ( 86 bytecodePrimEqualV4) "for booleanCheatV4:" ( 87 bytecodePrimNotEqualV4) "for booleanCheatV4:" ( 88 bytecodePrimMultiply) ( 89 bytecodePrimDivide) ( 90 bytecodePrimMod) ( 91 bytecodePrimMakePoint) ( 92 bytecodePrimBitShift) ( 93 bytecodePrimDiv) ( 94 bytecodePrimBitAnd) ( 95 bytecodePrimBitOr) ( 96 bytecodePrimAt) ( 97 bytecodePrimAtPut) ( 98 bytecodePrimSize) ( 99 bytecodePrimNext) (100 bytecodePrimNextPut) (101 bytecodePrimAtEnd) (102 bytecodePrimIdenticalV4) "for booleanCheatV4:" (103 bytecodePrimClass) (104 bytecodePrimSpecialSelector24) "was blockCopy:" (105 bytecodePrimValue) (106 bytecodePrimValueWithArg) (107 bytecodePrimDo) (108 bytecodePrimNew) (109 bytecodePrimNewWithArg) (110 bytecodePrimPointX) (111 bytecodePrimPointY) (112 127 sendLiteralSelector0ArgsBytecode) (128 143 sendLiteralSelector1ArgBytecode) (144 159 sendLiteralSelector2ArgsBytecode) (160 175 sendAbsentImplicit0ArgsBytecode) (176 183 storeAndPopReceiverVariableBytecode) (184 191 storeAndPopTemporaryVariableBytecode) (192 199 shortUnconditionalJump) (200 207 shortConditionalJumpTrue) (208 215 shortConditionalJumpFalse) (216 returnReceiver) (217 returnTopFromMethod) (218 extReturnTopFromBlock) (219 duplicateTopBytecode) (220 popStackBytecode) (221 extNopBytecode) (222 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 extPushIntegerBytecode) (230 longPushTemporaryVariableBytecode) (231 pushNewArrayBytecode) (232 extStoreReceiverVariableBytecode) (233 extStoreLiteralVariableBytecode) (234 longStoreTemporaryVariableBytecode) (235 extStoreAndPopReceiverVariableBytecode) (236 extStoreAndPopLiteralVariableBytecode) (237 longStoreAndPopTemporaryVariableBytecode) (238 extSendBytecode) (239 extSendSuperBytecode) (240 extSendAbsentImplicitBytecode) (241 extSendAbsentDynamicSuperBytecode) (242 extUnconditionalJump) (243 extJumpIfTrue) (244 extJumpIfFalse) (245 extSendAbsentSelfBytecode) (246 248 unknownBytecode) "3 byte bytecodes" (249 callPrimitiveBytecode) (250 pushRemoteTempLongBytecode) (251 storeRemoteTempLongBytecode) (252 storeAndPopRemoteTempLongBytecode) (253 extPushClosureBytecode) (254 extSendAbsentOuterBytecode) (255 unknownBytecode) )! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSistaV1 (in category 'initialization') ----- initializeBytecodeTableForSistaV1 "See e.g. the cass comment for EncoderForSistaV1" "StackInterpreter initializeBytecodeTableForSistaV1" "Note: This table will be used to generate a C switch statement." + initializationOptions at: #SistaV1BytecodeSet put: true. + BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForSistaV1. BytecodeSetHasDirectedSuperSend := true. - self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 pushConstantTrueBytecode) ( 78 pushConstantFalseBytecode) ( 79 pushConstantNilBytecode) ( 80 pushConstantZeroBytecode) ( 81 pushConstantOneBytecode) ( 82 extPushPseudoVariable) ( 83 duplicateTopBytecode) ( 84 87 unknownBytecode) ( 88 returnReceiver) ( 89 returnTrue) ( 90 returnFalse) ( 91 returnNil) ( 92 returnTopFromMethod) ( 93 returnNilFromBlock) ( 94 returnTopFromBlock) ( 95 extNopBytecode) ( 96 bytecodePrimAdd) ( 97 bytecodePrimSubtract) ( 98 bytecodePrimLessThanSistaV1) "for booleanCheatSistaV1:" ( 99 bytecodePrimGreaterThanSistaV1) "for booleanCheatSistaV1:" (100 bytecodePrimLessOrEqualSistaV1) "for booleanCheatSistaV1:" (101 bytecodePrimGreaterOrEqualSistaV1) "for booleanCheatSistaV1:" (102 bytecodePrimEqualSistaV1) "for booleanCheatSistaV1:" (103 bytecodePrimNotEqualSistaV1) "for booleanCheatSistaV1:" (104 bytecodePrimMultiply) (105 bytecodePrimDivide) (106 bytecodePrimMod) (107 bytecodePrimMakePoint) (108 bytecodePrimBitShift) (109 bytecodePrimDiv) (110 bytecodePrimBitAnd) (111 bytecodePrimBitOr) (112 bytecodePrimAt) (113 bytecodePrimAtPut) (114 bytecodePrimSize) (115 bytecodePrimNext) "i.e. a 0 arg special selector" (116 bytecodePrimNextPut) "i.e. a 1 arg special selector" (117 bytecodePrimAtEnd) (118 bytecodePrimIdenticalSistaV1) "for booleanCheatSistaV1:" (119 bytecodePrimClass) (120 bytecodePrimSpecialSelector24) "was blockCopy:" (121 bytecodePrimValue) (122 bytecodePrimValueWithArg) (123 bytecodePrimDo) "i.e. a 1 arg special selector" (124 bytecodePrimNew) "i.e. a 0 arg special selector" (125 bytecodePrimNewWithArg) "i.e. a 1 arg special selector" (126 bytecodePrimPointX) "i.e. a 0 arg special selector" (127 bytecodePrimPointY) "i.e. a 0 arg special selector" (128 143 sendLiteralSelector0ArgsBytecode) (144 159 sendLiteralSelector1ArgBytecode) (160 175 sendLiteralSelector2ArgsBytecode) (176 183 shortUnconditionalJump) (184 191 shortConditionalJumpTrue) (192 199 shortConditionalJumpFalse) (200 207 storeAndPopReceiverVariableBytecode) (208 215 storeAndPopTemporaryVariableBytecode) (216 popStackBytecode) (217 unconditionnalTrapBytecode) (218 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 longPushTemporaryVariableBytecode) (230 pushClosureTempsBytecode) (231 pushNewArrayBytecode) (232 extPushIntegerBytecode) (233 extPushCharacterBytecode) (234 extSendBytecode) (235 extSendSuperBytecode) (236 unknownBytecode) (237 extUnconditionalJump) (238 extJumpIfTrue) (239 extJumpIfFalse) (240 extSistaStoreAndPopReceiverVariableBytecode) (241 extSistaStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extSistaStoreReceiverVariableBytecode) (244 extSistaStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 unknownBytecode) "reserved for Push Float" (250 extPushClosureBytecode) (251 extPushRemoteTempOrInstVarLongBytecode) (252 extStoreRemoteTempOrInstVarLongBytecode) (253 extStoreAndPopRemoteTempOrInstVarLongBytecode) (254 extJumpIfNotInstanceOfBehaviorsOrPopBytecode) (255 extPushFullClosureBytecode) )! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'initialization') ----- initializeBytecodeTableForSqueakV3PlusClosures "StackInterpreter initializeBytecodeTableForSqueakV3PlusClosures" "Note: This table will be used to generate a C switch statement." + initializationOptions at: #SqueakV3PlusClosuresBytecodeSet put: true. + BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForV3PlusClosures. LongStoreBytecode := 129. self table: BytecodeTable from: #( ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushTemporaryVariableBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 95 pushLiteralVariableBytecode) ( 96 103 storeAndPopReceiverVariableBytecode) (104 111 storeAndPopTemporaryVariableBytecode) (112 pushReceiverBytecode) (113 pushConstantTrueBytecode) (114 pushConstantFalseBytecode) (115 pushConstantNilBytecode) (116 pushConstantMinusOneBytecode) (117 pushConstantZeroBytecode) (118 pushConstantOneBytecode) (119 pushConstantTwoBytecode) (120 returnReceiver) (121 returnTrue) (122 returnFalse) (123 returnNil) (124 returnTopFromMethod) (125 returnTopFromBlock) (126 127 unknownBytecode) (128 extendedPushBytecode) (129 extendedStoreBytecode) (130 extendedStoreAndPopBytecode) (131 singleExtendedSendBytecode) (132 doubleExtendedDoAnythingBytecode) (133 singleExtendedSuperBytecode) (134 secondExtendedSendBytecode) (135 popStackBytecode) (136 duplicateTopBytecode) (137 pushActiveContextBytecode) (138 pushNewArrayBytecode)), ((initializationOptions at: #SpurObjectMemory ifAbsent: [false]) ifTrue: [#((139 callPrimitiveBytecode))] "V3PlusClosures on Spur" ifFalse: [#((139 unknownBytecode))]), "V3PlusClosures on V3" #( (140 pushRemoteTempLongBytecode) (141 storeRemoteTempLongBytecode) (142 storeAndPopRemoteTempLongBytecode) (143 pushClosureCopyCopiedValuesBytecode) (144 151 shortUnconditionalJump) (152 159 shortConditionalJumpFalse) (160 167 longUnconditionalJump) (168 171 longJumpIfTrue) (172 175 longJumpIfFalse) "176-191 were sendArithmeticSelectorBytecode" (176 bytecodePrimAdd) (177 bytecodePrimSubtract) (178 bytecodePrimLessThan) (179 bytecodePrimGreaterThan) (180 bytecodePrimLessOrEqual) (181 bytecodePrimGreaterOrEqual) (182 bytecodePrimEqual) (183 bytecodePrimNotEqual) (184 bytecodePrimMultiply) (185 bytecodePrimDivide) (186 bytecodePrimMod) (187 bytecodePrimMakePoint) (188 bytecodePrimBitShift) (189 bytecodePrimDiv) (190 bytecodePrimBitAnd) (191 bytecodePrimBitOr) "192-207 were sendCommonSelectorBytecode" (192 bytecodePrimAt) (193 bytecodePrimAtPut) (194 bytecodePrimSize) (195 bytecodePrimNext) (196 bytecodePrimNextPut) (197 bytecodePrimAtEnd) (198 bytecodePrimIdentical) (199 bytecodePrimClass) (200 bytecodePrimSpecialSelector24) (201 bytecodePrimValue) (202 bytecodePrimValueWithArg) (203 bytecodePrimDo) (204 bytecodePrimNew) (205 bytecodePrimNewWithArg) (206 bytecodePrimPointX) (207 bytecodePrimPointY) (208 223 sendLiteralSelector0ArgsBytecode) (224 239 sendLiteralSelector1ArgBytecode) (240 255 sendLiteralSelector2ArgsBytecode) )! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter>>activateNewClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') ----- activateNewClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch "Similar to activateNewMethod but for Closure and newMethod." | numCopied outerContext theMethod closureIP | <inline: true> + outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. + self assert: (objectMemory isContext: outerContext). - outerContext := objectMemory followField: ClosureOuterContextIndex ofObject: blockClosure. numCopied := self copiedValueCountOfClosure: blockClosure. + theMethod := objectMemory fetchPointer: MethodIndex ofObject: outerContext. + self assert: (objectMemory isOopCompiledMethod: theMethod). - theMethod := objectMemory followField: MethodIndex ofObject: outerContext. self push: instructionPointer. self push: framePointer. framePointer := stackPointer. self push: theMethod. self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). self push: objectMemory nilObject. "FxThisContext field" + "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." self push: (objectMemory followField: ReceiverIndex ofObject: outerContext). "Copy the copied values..." 0 to: numCopied - 1 do: [:i| self push: (objectMemory fetchPointer: i + ClosureFirstCopiedValueIndex ofObject: blockClosure)]. self assert: (self frameIsBlockActivation: framePointer). self assert: (self frameHasContext: framePointer) not. "The initial instructions in the block nil-out remaining temps." "the instruction pointer is a pointer variable equal to method oop + ip + BaseHeaderSize -1 for 0-based addressing of fetchByte -1 because it gets incremented BEFORE fetching currentByte" closureIP := self quickFetchInteger: ClosureStartPCIndex ofObject: blockClosure. instructionPointer := theMethod + closureIP + objectMemory baseHeaderSize - 2. self setMethod: theMethod. "Now check for stack overflow or an event (interrupt, must scavenge, etc)" stackPointer < stackLimit ifTrue: [self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]! Item was changed: ----- Method: StackInterpreter>>activateNewFullClosureMethod:numArgs:mayContextSwitch: (in category 'control primitives') ----- activateNewFullClosureMethod: blockClosure numArgs: numArgs mayContextSwitch: mayContextSwitch "Similar to activateNewMethod but for Closure and newMethod." | numCopied outerContext theMethod methodHeader numTemps | <inline: true> outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: blockClosure. numCopied := self copiedValueCountOfFullClosure: blockClosure. + theMethod := objectMemory fetchPointer: FullClosureCompiledBlockIndex ofObject: blockClosure. + self assert: (objectMemory isOopCompiledMethod: theMethod). - - theMethod := objectMemory followField: FullClosureCompiledBlockIndex ofObject: blockClosure. self push: instructionPointer. self push: framePointer. framePointer := stackPointer. self push: theMethod. self push: (self encodeFrameFieldHasContext: false isBlock: true numArgs: numArgs). self push: objectMemory nilObject. "FxThisContext field" + "Because inst var access is not checked, we must follow the receiver in Spur to ensure it is valid." self push: (objectMemory followField: FullClosureReceiverIndex ofObject: blockClosure). "Copy the copied values..." 0 to: numCopied - 1 do: [:i| self push: (objectMemory fetchPointer: i + FullClosureFirstCopiedValueIndex ofObject: blockClosure)]. self assert: (self frameIsBlockActivation: framePointer). self assert: (self frameHasContext: framePointer) not. + methodHeader := objectMemory methodHeaderOf: theMethod. - methodHeader := objectMemory methodHeaderOf: newMethod. numTemps := self temporaryCountOfMethodHeader: methodHeader. + - numArgs + numCopied + 1 to: numTemps do: [ :i | self push: objectMemory nilObject]. + instructionPointer := (self initialPCForHeader: methodHeader method: theMethod) - 1. - instructionPointer := (self initialPCForHeader: methodHeader method: newMethod) - 1. self setMethod: theMethod. "Now check for stack overflow or an event (interrupt, must scavenge, etc)" stackPointer < stackLimit ifTrue: [self handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch]! Item was changed: ----- Method: StackInterpreterSimulator>>endPCOf: (in category 'compiled methods') ----- endPCOf: aMethod "Determine the endPC of a method in the heap using interpretation that looks for returns." <var: #descriptor type: #'BytecodeDescriptor *'> | pc end farthestContinuation prim encoderClass inst is | (prim := self primitiveIndexOf: aMethod) > 0 ifTrue: [(self isQuickPrimitiveIndex: prim) ifTrue: [^(self startPCOfMethod: aMethod) - 1]]. encoderClass := self encoderClassForHeader: (objectMemory methodHeaderOf: aMethod). is := (InstructionStream on: (VMCompiledMethodProxy new for: aMethod coInterpreter: self objectMemory: objectMemory)). pc := farthestContinuation := self startPCOfMethod: aMethod. end := objectMemory numBytesOf: aMethod. is pc: pc + 1. [pc <= end] whileTrue: [inst := encoderClass interpretNextInstructionFor: MessageCatcher new in: is. inst selector caseOf: { [#pushClosureCopyNumCopiedValues:numArgs:blockSize:] -> [is pc: is pc + inst arguments last. farthestContinuation := farthestContinuation max: pc]. [#jump:] -> [farthestContinuation := farthestContinuation max: pc + inst arguments first]. [#jump:if:] -> [farthestContinuation := farthestContinuation max: pc + inst arguments first]. [#methodReturnConstant:] -> [pc >= farthestContinuation ifTrue: [end := pc]]. [#methodReturnReceiver] -> [pc >= farthestContinuation ifTrue: [end := pc]]. + [#methodReturnTop] -> [pc >= farthestContinuation ifTrue: [end := pc]]. + "This is for CompiledBlock/FullBlockClosure. Since the response to pushClosure... above + skips over all block bytecoes, we will only see a blockReturnTop if it is at the top level, + and so it must be a blockReturnTop in a CompiledBlock for a FullBlockClosure." + [#blockReturnTop] -> [pc >= farthestContinuation ifTrue: [end := pc]] } - [#methodReturnTop] -> [pc >= farthestContinuation ifTrue: [end := pc]] } otherwise: []. pc := is pc - 1]. ^end!

1 0

VM Maker: VMMaker.oscog-eem.1777.mcz
by commits＠source.squeak.org 07 Apr '16

07 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1777.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1777 Author: eem Time: 6 April 2016, 6:31:28.51167 pm UUID: a1efdb25-0231-43f2-bf60-5e6eb78dbf3a Ancestors: VMMaker.oscog-eem.1776 Simulator: Rationalize cCoerce:to:. Put one implementation in VMClass and override only in the Cogit (which defers to objectMemory) and InterpreterPlugin which simply answers the value. N.B. This means that in the InterpreterPlugin hierarchy if you want null coercion (as for example in BalloonEngineBase>>initColorTransform) you sent cCoerce:to: to self, but if you want the proper coercion of oops you /must/ send cCoerce:to: to interpreterProxy. Fix just such a coercion slip in LargeIntegersPlugin>>digitAddLarge:with: =============== Diff against VMMaker.oscog-eem.1776 =============== Item was removed: - ----- Method: CogVMSimulator>>cCoerce:to: (in category 'memory access') ----- - cCoerce: value to: cTypeString - "Type coercion for translation only; just return the value when running in Smalltalk." - - ^value == nil - ifTrue: [value] - ifFalse: [value coerceTo: cTypeString sim: self]! Item was added: + ----- Method: InterpreterPlugin>>cCoerce:to: (in category 'simulation') ----- + cCoerce: value to: cType + "Type coercion for translation only; just return the value when running in Smalltalk. + This overrides the generic coercion method in VMClass. For some reason we are the exception. + If we want that style of coercion we can send cCoerce:to: to interpreterProxy, not self." + + ^value! Item was removed: - ----- Method: InterpreterSimulator>>cCoerce:to: (in category 'memory access') ----- - cCoerce: value to: cTypeString - "Type coercion for translation only; just return the value when running in Smalltalk." - - ^value == nil - ifTrue: [value] - ifFalse: [value coerceTo: cTypeString sim: self]! Item was changed: ----- Method: LargeIntegersPlugin>>digitAddLarge:with: (in category 'oop functions') ----- digitAddLarge: firstInteger with: secondInteger "Does not need to normalize!!" | over firstDigitLen secondDigitLen shortInt shortDigitLen longInt longDigitLen sum newSum neg | <var: #over type: #'unsigned int'> firstDigitLen := self digitSizeOfLargeInt: firstInteger. secondDigitLen := self digitSizeOfLargeInt: secondInteger. neg := (interpreterProxy fetchClassOf: firstInteger) = interpreterProxy classLargeNegativeInteger. firstDigitLen <= secondDigitLen ifTrue: [shortInt := firstInteger. shortDigitLen := firstDigitLen. longInt := secondInteger. longDigitLen := secondDigitLen] ifFalse: [shortInt := secondInteger. shortDigitLen := secondDigitLen. longInt := firstInteger. longDigitLen := firstDigitLen]. " sum := Integer new: len neg: firstInteger negative." self remapOop: #(shortInt longInt ) in: [sum := self createLargeIntegerNeg: neg digitLength: longDigitLen]. over := self cDigitAdd: (interpreterProxy firstIndexableField: shortInt) len: shortDigitLen with: (interpreterProxy firstIndexableField: longInt) len: longDigitLen into: (interpreterProxy firstIndexableField: sum). over > 0 ifTrue: ["sum := sum growby: 1." self remapOop: sum in: [newSum := self createLargeIntegerNeg: neg byteLength: longDigitLen * 4 + 1]. self cDigitCopyFrom: (interpreterProxy firstIndexableField: sum) to: (interpreterProxy firstIndexableField: newSum) len: longDigitLen. sum := newSum. "C index!!" + self cDigitOf: (interpreterProxy cCoerce: (interpreterProxy firstIndexableField: sum) to: 'unsigned int *') - self cDigitOf: (self cCoerce: (interpreterProxy firstIndexableField: sum) to: 'unsigned int *') at: longDigitLen put: over] ifFalse: [sum := neg ifTrue: [self normalizeNegative: sum] ifFalse: [self normalizePositive: sum]]. ^ sum! Item was removed: - ----- Method: NewCoObjectMemorySimulator>>cCoerce:to: (in category 'memory access') ----- - cCoerce: value to: cTypeString - "Type coercion for translation only; just return the value when running in Smalltalk." - - ^value == nil - ifTrue: [value] - ifFalse: [value coerceTo: cTypeString sim: self]! Item was removed: - ----- Method: NewObjectMemorySimulator>>cCoerce:to: (in category 'memory access') ----- - cCoerce: value to: cTypeString - "Type coercion for translation only; just return the value when running in Smalltalk." - - ^value == nil - ifTrue: [value] - ifFalse: [value coerceTo: cTypeString sim: self]! Item was removed: - ----- 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 removed: - ----- Method: StackInterpreterSimulator>>cCoerce:to: (in category 'memory access') ----- - cCoerce: value to: cTypeString - "Type coercion for translation only; just return the value when running in Smalltalk." - - ^value == nil - ifTrue: [value] - ifFalse: [value coerceTo: cTypeString sim: self]! Item was added: + ----- Method: VMClass>>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]!

1 0

VM Maker: VMMaker.oscog-eem.1776.mcz
by commits＠source.squeak.org 07 Apr '16

07 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1776.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1776 Author: eem Time: 6 April 2016, 6:15:12.993129 pm UUID: ffb1c333-7c42-4f80-a951-74db178aab65 Ancestors: VMMaker.oscog-eem.1775 Simulator: Several fixes for coercion given Nicolas' new 32-bit LargeInteger plugin code. The LargeIntegersPlugin needs to coerce the arguments to cDigitOf:at:[put:] correctly during simulation. Coercion needs to support #'unsigned int *'. Hack read & write in the FilePluginSimulator which should declare the pointer args byteArrayIndex correctly and access them via at: but for historical reasons treated them as integers. =============== Diff against VMMaker.oscog-eem.1775 =============== Item was added: + ----- Method: CArray>>asCArrayAccessorUnitSize: (in category 'converting') ----- + asCArrayAccessorUnitSize: requiredUnitSize + self assert: ptrOffset = 0. + ^CArrayAccessor on: (requiredUnitSize = unitSize + ifTrue: [self] + ifFalse: [self shallowCopy unitSize: requiredUnitSize])! Item was added: + ----- Method: CArray>>cPtrAsOop (in category 'accessing') ----- + cPtrAsOop + ^arrayBaseAddress + ptrOffset! Item was changed: ----- Method: CArray>>coerceTo:sim: (in category 'converting') ----- coerceTo: cTypeString sim: interpreterSimulator ^cTypeString caseOf: { ['int'] -> [self ptrAddress]. + ['float *'] -> [(self asCArrayAccessorUnitSize: 4) asFloatAccessor]. + ['unsigned int *'] -> [(self asCArrayAccessorUnitSize: 4) asUnsignedIntAccessor]. + ['int *'] -> [(self asCArrayAccessorUnitSize: 4) asIntAccessor]. - ['float *'] -> [self asCArrayAccessor asFloatAccessor]. - ['int *'] -> [self asCArrayAccessor asIntAccessor]. ['char *'] -> [self shallowCopy unitSize: 1; yourself]. ['unsigned char *'] -> [self shallowCopy unitSize: 1; yourself]. ['unsigned'] -> [self ptrAddress]. ['sqInt'] -> [self ptrAddress]. ['usqInt'] -> [self ptrAddress] }! Item was added: + ----- Method: CArray>>unsignedIntAt: (in category 'accessing') ----- + unsignedIntAt: index + ^self at: index! Item was added: + ----- Method: CArray>>unsignedIntAt:put: (in category 'accessing') ----- + unsignedIntAt: index put: unsignedInt + ^ self at: index put: unsignedInt! Item was added: + ----- Method: CObjectAccessor>>asUnsignedIntAccessor (in category 'converting') ----- + asUnsignedIntAccessor + + ^ self asPluggableAccessor + atBlock: [:obj :index | obj unsignedIntAt: index] + atPutBlock: [:obj :index :value | obj unsignedIntAt: index put: value]! Item was changed: ----- Method: FilePluginSimulator>>sqFile:Read:Into:At: (in category 'simulation') ----- + sqFile: file Read: count Into: byteArrayIndexArg At: startIndex + | interpreter byteArrayIndex | - sqFile: file Read: count Into: byteArrayIndex At: startIndex - | interpreter | interpreter := interpreterProxy interpreter. + byteArrayIndex := byteArrayIndexArg isInteger ifTrue: [byteArrayIndexArg] ifFalse: [byteArrayIndexArg cPtrAsOop]. [[startIndex to: startIndex + count - 1 do: [ :i | file atEnd ifTrue: [(file isKindOf: FakeStdinStream) ifTrue: [file atEnd: false]. ^i - startIndex]. interpreter byteAt: byteArrayIndex + i put: file next asInteger]] on: Error do: [:ex| (file isKindOf: TranscriptStream) ifFalse: [ex pass]. ^0]] ensure: [self recordStateOf: file]. ^count! Item was changed: ----- Method: FilePluginSimulator>>sqFile:Write:From:At: (in category 'simulation') ----- + sqFile: file Write: count From: byteArrayIndexArg At: startIndex + | interpreter byteArrayIndex | - sqFile: file Write: count From: byteArrayIndex At: startIndex - | interpreter | interpreter := interpreterProxy interpreter. + byteArrayIndex := byteArrayIndexArg isInteger ifTrue: [byteArrayIndexArg] ifFalse: [byteArrayIndexArg cPtrAsOop]. file isBinary ifTrue: [startIndex to: startIndex + count - 1 do: [ :i | file nextPut: (interpreter byteAt: byteArrayIndex + i)]] ifFalse: [startIndex to: startIndex + count - 1 do: [ :i | | byte | byte := interpreter byteAt: byteArrayIndex + i. file nextPut: (Character value: (byte == 12 "lf" ifTrue: [15"cr"] ifFalse: [byte]))]]. self recordStateOf: file. ^count! Item was changed: ----- Method: Integer>>coerceTo:sim: (in category '*VMMaker-interpreter simulator') ----- coerceTo: cTypeString sim: interpreter | unitSize | + cTypeString last = $* ifTrue: "C pointer" + [unitSize := cTypeString caseOf: { - cTypeString last = $* ifTrue: [ "C pointer" - unitSize := cTypeString caseOf: { ['char *'] -> [1]. ['short *'] -> [2]. ['int *'] -> [4]. ['long *'] -> [interpreter wordSize]. ['float *'] -> [4]. ['double *'] -> [8]. ['unsigned *'] -> [4]. + ['unsigned int *'] -> [4]. + ['unsigned char *'] -> [4]. + ['unsigned short *'] -> [4]. ['oop *'] -> [interpreter bytesPerOop]. } otherwise: [ (cTypeString beginsWith: 'char') ifTrue: [1] ifFalse: [interpreter wordSize] ]. + ^CArray basicNew - ^(CArray basicNew) interpreter: interpreter address: self unitSize: unitSize; + yourself]. - yourself. - ]. ^ self "C number (int, char, float, etc)"! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitOf:at: (in category 'C core util') ----- cDigitOf: cPointer at: zeroBasedDigitIndex <inline: true> <returnTypeC: #'unsigned int'> <var: 'cPointer' type: #'unsigned int *'> + ^self byteSwapped32IfBigEndian: ((self cCode: [cPointer] inSmalltalk: [interpreterProxy cCoerce: cPointer to: #'unsigned int *']) at: zeroBasedDigitIndex)! - ^self byteSwapped32IfBigEndian: (cPointer at: zeroBasedDigitIndex)! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitOf:at:put: (in category 'C core util') ----- cDigitOf: cPointer at: zeroBasedDigitIndex put: aValue <inline: true> <returnTypeC: #'unsigned int'> <var: 'cPointer' type: #'unsigned int *'> <var: 'aValue' type: #'unsigned int'> + ^(self cCode: [cPointer] inSmalltalk: [interpreterProxy cCoerce: cPointer to: #'unsigned int *']) + at: zeroBasedDigitIndex + put: (self byteSwapped32IfBigEndian: aValue)! - ^cPointer at: zeroBasedDigitIndex put: (self byteSwapped32IfBigEndian: aValue)!

1 0

VM Maker: VMMaker.oscog-eem.1775.mcz
by commits＠source.squeak.org 07 Apr '16

07 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1775.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1775 Author: eem Time: 6 April 2016, 5:43:29.382334 pm UUID: 643dcc90-05cd-4945-9531-0bb9538805e0 Ancestors: VMMaker.oscog-cb.1774 Simulator: Set SPURVM correctly on initialization. Old code would always set it to false. =============== Diff against VMMaker.oscog-cb.1774 =============== Item was changed: ----- Method: SpurMemoryManager class>>initBytesPerWord: (in category 'class initialization') ----- initBytesPerWord: wordSize BytesPerWord := BytesPerOop := wordSize. "N.B. This is *not* output when generating the interpreter file. It is left to the various sqConfig.h files to define correctly." + VMBIGENDIAN := Smalltalk endianness == #big. + SPURVM := true! - VMBIGENDIAN := Smalltalk endianness == #big! Item was changed: ----- Method: VMClass class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants "Falsify the `what type of VM is this?' flags that are defined in the various interp.h files. Subclass implementations need to include a super initializeMiscConstants" | omc | VMBIGENDIAN class. "Mention this for the benefit of CCodeGenerator>>emitCConstantsOn:" SPURVM := STACKVM := COGVM := COGMTVM := false. initializationOptions ifNil: [self initializationOptions: Dictionary new]. omc := initializationOptions at: #ObjectMemory ifAbsent: nil. (omc isNil and: [self defaultObjectMemoryClass notNil]) ifTrue: [omc := initializationOptions at: #ObjectMemory put: self defaultObjectMemoryClass name]. initializationOptions at: #SqueakV3ObjectMemory "the good ole default" ifAbsentPut: (omc ifNil: [true] ifNotNil: [(Smalltalk at: omc) includesBehavior: ObjectMemory]); at: #SpurObjectMemory "the new contender" ifAbsentPut: (omc ifNil: [false] ifNotNil: [(Smalltalk at: omc) includesBehavior: SpurMemoryManager]). "Use ifAbsentPut: so that they will get copied back to the VMMaker's options and dead code will likely be eliminated." PharoVM := initializationOptions at: #PharoVM ifAbsentPut: [false]. NewspeakVM := initializationOptions at: #NewspeakVM ifAbsentPut: [false]. SistaVM := initializationOptions at: #SistaVM ifAbsentPut: [false]. "But not these; they're compile-time" MULTIPLEBYTECODESETS := initializationOptions at: #MULTIPLEBYTECODESETS ifAbsent: [false]. IMMUTABILITY := initializationOptions at: #IMMUTABILITY ifAbsent: [false]. "These must be set only if specified, not defaulted, because they are set on the command line or in include files." initializationOptions at: #VMBIGENDIAN ifPresent: [:value| VMBIGENDIAN := value]; + at: #ObjectMemory ifPresent: [:value| SPURVM := value beginsWith: 'Spur']; at: #STACKVM ifPresent: [:value| STACKVM := value]; at: #COGVM ifPresent: [:value| COGVM := initializationOptions at: #COGVM]; at: #COGMTVM ifPresent: [:value| COGMTVM := initializationOptions at: #COGMTVM]!

1 0

← Newer
1
...
13
14
15
16
17
18
19
20
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2016