Vm-dev October 2021

vm-dev@lists.squeakfoundation.org

9 participants
59 discussions

VM Maker: VMMakerUI-eem.49.mcz
by commits＠source.squeak.org 18 Oct '21

18 Oct '21

Eliot Miranda uploaded a new version of VMMakerUI to project VM Maker: http://source.squeak.org/VMMaker/VMMakerUI-eem.49.mcz ==================== Summary ==================== Name: VMMakerUI-eem.49 Author: eem Time: 17 October 2021, 6:04:39.6084 pm UUID: 041ca5cc-0316-41dc-aa4f-e1a3cf780180 Ancestors: VMMakerUI-eem.48 Part of VMMaker.oscog-eem.3093. Have setClickStepBreakBlock avoid stopping twice when click stepping in bytecode. Maintain clickstepping so that CoInteropreter's atEachStepBlock can avoid recursing. =============== Diff against VMMakerUI-eem.48 =============== Item was changed: ----- Method: Cogit>>setClickStepBreakBlock (in category '*VMMakerUI-user interface') ----- setClickStepBreakBlock "Set the break block to present a confirmer, breaking if true, and restoring the previous break block. If an open debugger on the receiver can be found, proceed it." <doNotGenerate> | previousBreakBlock previousAtEachStepBlock previousBreakPC previousSingleStep previousClickConfirm result | (breakBlock isNil or: [breakBlock method ~~ thisContext method]) ifTrue: [previousBreakBlock := breakBlock. previousAtEachStepBlock := coInterpreter atEachStepBlock. previousBreakPC := breakPC. previousSingleStep := singleStep. previousClickConfirm := clickConfirm. breakBlock := [:ign| (processor pc ~= previousBreakPC + and: [self inMachineCode + and: [(result := self promptClickStep) == true]]) - and: [(result := self promptClickStep) == true]) ifTrue: [false] ifFalse: [breakBlock := previousBreakBlock. coInterpreter atEachStepBlock: previousAtEachStepBlock. + breakPC := (previousBreakPC isBreakpointFor: processor pc) ifTrue: [false] ifFalse: [previousBreakPC]. - breakPC := previousBreakPC == true ifTrue: [false] ifFalse: [previousBreakPC]. singleStep := previousSingleStep. clickConfirm := previousClickConfirm. result ~~ #proceed]]. coInterpreter atEachStepBlock: + [clickStepping := true. + [previousAtEachStepBlock value] ensure: [clickStepping := false]. - [previousAtEachStepBlock value. (coInterpreter localIP ~= previousBreakPC + and: [self inMachineCode not + and: [(result := self promptClickStep) == true]]) ifFalse: - and: [(result := self promptClickStep) == true]) ifFalse: [breakBlock := previousBreakBlock. coInterpreter atEachStepBlock: previousAtEachStepBlock. + breakPC := (previousBreakPC isBreakpointFor: coInterpreter localIP) ifTrue: [false] ifFalse: [previousBreakPC]. - breakPC := previousBreakPC == true ifTrue: [false] ifFalse: [previousBreakPC]. singleStep := previousSingleStep. clickConfirm := previousClickConfirm. self halt]]. singleStep := breakPC := clickConfirm := result ~~ #proceed]. (World submorphs detect: [:m| m model isDebugger and: [(m model interruptedProcess suspendedContext ifNil: [false] "happens if we're debugging this very method..." ifNotNil: [:suspendedContext| suspendedContext findContextSuchThat: [:ctxt| (ctxt receiver == self and: [ctxt selector == #simulateCogCodeAt: or: [ctxt selector == #simulateLeafCallOf:]]) or: [ctxt receiver == coInterpreter and: [ctxt selector == #interpret or: [ctxt selector == #halt "initial launch doit"]]]]]) notNil]] ifNone: []) ifNotNil: [:debuggerWindow| WorldState addDeferredUIMessage: [debuggerWindow model proceed]]!

1 0

VM Maker: VMMaker.oscog-eem.3093.mcz
by commits＠source.squeak.org 18 Oct '21

18 Oct '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3093.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3093 Author: eem Time: 17 October 2021, 6:03:10.670295 pm UUID: 227cf68c-c73a-4827-99f6-55816c9d221d Ancestors: VMMaker.oscog-eem.3092 Simulation: add arnges to the breakpoint types. Have CoInterpreter;s atEachStepBlock check for breakpoints via breakPC. Fix printOop: and longPrintOop: for CompiledMethod, removing a long time wart. =============== Diff against VMMaker.oscog-eem.3092 =============== Item was changed: ----- Method: Array>>addBreakpoint: (in category '*VMMaker-breakpoints') ----- addBreakpoint: bkpt + (self size > 0 + and: [self allSatisfy: #isInteger]) ifTrue: + [(bkpt >= self last and: [bkpt - self first <= self size]) ifTrue: + [^self first to: bkpt]. + (bkpt <= self first and: [self last - bkpt <= self size]) ifTrue: + [^bkpt to: self last]]. ^self, {bkpt}! Item was changed: ----- Method: BlockClosure>>shouldStopIfAtPC: (in category '*VMMaker-interpreter simulator') ----- shouldStopIfAtPC: address <primitive: 202> + ^self cull: address! - ^self value: address! Item was changed: ----- Method: CogVMSimulator>>ensureDebugAtEachStepBlock (in category 'testing') ----- ensureDebugAtEachStepBlock atEachStepBlock := [printFrameAtEachStep ifTrue: [self printFrame: localFP WithSP: localSP]. printBytecodeAtEachStep ifTrue: [self printCurrentBytecodeOn: transcript]. byteCount = breakCount ifTrue: + ["printFrameAtEachStep :=" printBytecodeAtEachStep := true]. + cogit clickStepping ifFalse: + [((cogit breakPC isBreakpointFor: localIP) + and: [thisContext closure == atEachStepBlock]) ifTrue: + [self halt: 'bytecode breakpoint at ', (localIP hex allButFirst: 3)]]]! - ["printFrameAtEachStep :=" printBytecodeAtEachStep := true]]! Item was changed: CogClass subclass: #Cogit (excessive size, no diff calculated) Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator | backEnd | backEnd := CogCompilerClass basicNew. #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'nsSendCacheSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'ioHighResClock' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' + 'processorFrameValid' 'printRegisters' 'printInstructions' 'clickConfirm' 'clickStepping' 'singleStep' - 'processorFrameValid' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep' 'codeZoneIsExecutableNotWritable' 'debugAPISelector' 'shortCutTrampolineBlocks' 'perMethodProfile' 'instructionProfile') do: [:simulationVariableUnusedByRealVM| aCCodeGenerator removeVariable: simulationVariableUnusedByRealVM]. 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" "N.B. We *do not* include sq.h; it pulls in conflicting definitions now that sqVirtualMachine.h declares cointerp's functions, and declares some of them inaccurately for histrical reasons. We pull in CoInterpreter's api via cointerp.h which is accurate." aCCodeGenerator addHeaderFile:'"sqConfig.h"'; "config.h must be first on linux" addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'<stdio.h>'; addHeaderFile:'<stdlib.h>'; addHeaderFile:'<string.h>'; addHeaderFile:'"sqPlatformSpecific.h"'; "e.g. solaris overrides things for sqCogStackAlignment.h" addHeaderFile:'"sqMemoryAccess.h"'; 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: 'usqIntptr_t (*ceGetFP)(void)'; var: #ceGetSP declareC: 'usqIntptr_t (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceInvokeInterpret declareC: 'void (*ceInvokeInterpret)(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: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'; var: 'enumeratingCogMethod' type: #'CogMethod *'. aCCodeGenerator var: #ceTryLockVMOwner declareC: '#if COGMTVM\usqIntptr_t (*ceTryLockVMOwner)(usqIntptr_t)\#endif'. backEnd numICacheFlushOpcodes > 0 ifTrue: [aCCodeGenerator var: #ceFlushICache declareC: 'static void (*ceFlushICache)(usqIntptr_t from, usqIntptr_t to)']. aCCodeGenerator var: #ceFlushDCache declareC: '#if DUAL_MAPPED_CODE_ZONE\static void (*ceFlushDCache)(usqIntptr_t from, usqIntptr_t to)\#endif'; var: #codeToDataDelta declareC: '#if DUAL_MAPPED_CODE_ZONE\static sqInt codeToDataDelta\#else\# define codeToDataDelta 0\#endif'; var: #cFramePointerInUse declareC: '#if !!defined(cFramePointerInUse)\sqInt cFramePointerInUse\#endif'. 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 fullBlockNoContextSwitchEntry fullBlockEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 cPICEndOfCodeLabel) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #cPICPrototype type: #'CogMethod *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'; declareVar: #methodZoneBase type: #usqInt. aCCodeGenerator var: #ordinarySendTrampolines declareC: 'sqInt ordinarySendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'. BytecodeSetHasDirectedSuperSend ifTrue: [aCCodeGenerator var: #directedSuperSendTrampolines declareC: 'sqInt directedSuperSendTrampolines[NumSendTrampolines]'; var: #directedSuperBindingSendTrampolines declareC: 'sqInt directedSuperBindingSendTrampolines[NumSendTrampolines]']. NewspeakVM ifTrue: [aCCodeGenerator var: #selfSendTrampolines declareC: 'sqInt selfSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #implicitReceiverSendTrampolines declareC: 'sqInt implicitReceiverSendTrampolines[NumSendTrampolines]'; var: #outerSendTrampolines declareC: 'sqInt outerSendTrampolines[NumSendTrampolines]']. aCCodeGenerator addConstantForBinding: self bindingForNumTrampolines; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static usqInt objectReferencesInRuntime[NumObjRefsInRuntime+1]'; 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: #minValidCallAddress type: #'usqIntptr_t'. aCCodeGenerator vmClass generatorTable ifNotNil: [:bytecodeGenTable| aCCodeGenerator var: #generatorTable declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size printString, ']', (self tableInitializerFor: bytecodeGenTable in: aCCodeGenerator)]. "In C the abstract opcode names clash with the Smalltalk 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'. self declareFlagVarsAsByteIn: aCCodeGenerator! Item was removed: - ----- Method: Cogit>>breakAt: (in category 'simulation only') ----- - breakAt: address - ((breakPC isBreakpointFor: address) - and: [breakBlock shouldStopIfAtPC: address]) ifTrue: - [coInterpreter changed: #byteCountText. - self halt: 'machine code breakpoint at ', address]! Item was added: + ----- Method: Cogit>>breakpointFrom: (in category 'simulation only') ----- + breakpointFrom: string + | s | + s := string. + ^(s includes: $r) + ifTrue: + [Number readFrom: s readStream] + ifFalse: + [(#('0x' '-0x') detect: [:prefix| s beginsWith: prefix] ifNone: []) ifNotNil: + [:prefix| + s := s allButFirst: prefix size. + prefix first = $- ifTrue: [s := '-', s]]. + Integer readFrom: s readStream base: 16].! Item was added: + ----- Method: Cogit>>clickStepping (in category 'simulation only') ----- + clickStepping + <doNotGenerate> + ^clickStepping! Item was changed: ----- Method: Cogit>>promptForBreakPC (in category 'simulation only') ----- promptForBreakPC <doNotGenerate> + | s first bkpt idx | - | s first bkpt | s := UIManager default request: 'Break pc (hex, + to add, - to remove)'. s := s withBlanksTrimmed. s isEmpty ifTrue: [^self]. ('+-' includes: s first) ifTrue: [first := s first. s := s allButFirst]. (s isEmpty and: [first = $-]) ifTrue: [^self breakPC: nil]. + bkpt := self breakpointFrom: s. + (idx := s indexOfSubCollection: ' to: ') > 0 + ifTrue: + [| end | + (end := self breakpointFrom: (s allButFirst: idx + 4)) > bkpt ifTrue: + [bkpt := bkpt to: end]] + ifFalse: + [((methodZone addressIsLikelyCogMethod: bkpt) + and: [UIManager confirm: 'pc is method; break anywhere within method?']) ifTrue: + [bkpt := methodZone methodFor: bkpt]]. - bkpt := (s includes: $r) - ifTrue: - [Number readFrom: s readStream] - ifFalse: - [(#('0x' '-0x') detect: [:prefix| s beginsWith: prefix] ifNone: []) ifNotNil: - [:prefix| - s := s allButFirst: prefix size. - prefix first = $- ifTrue: [s := '-', s]]. - Integer readFrom: s readStream base: 16]. - ((methodZone addressIsLikelyCogMethod: bkpt) - and: [UIManager confirm: 'pc is method; break anywhere within method?']) ifTrue: - [bkpt := methodZone methodFor: bkpt]. first = $+ ifTrue: [^self breakPC: (breakPC addBreakpoint: bkpt)]. first = $- ifTrue: [^self breakPC: (breakPC removeBreakpoint: bkpt)]. + self breakPC: bkpt. + breakPC isActiveBreakpoint ifTrue: + [coInterpreter ensureDebugAtEachStepBlock]! - self breakPC: bkpt! Item was changed: ----- Method: Cogit>>setInterpreter: (in category 'initialization') ----- setInterpreter: aCoInterpreter "Initialization of the code generator in the simulator. These objects already exist in the generated C VM or are used only in the simulation." <doNotGenerate> coInterpreter := aCoInterpreter. objectMemory := aCoInterpreter objectMemory. methodZone := self class methodZoneClass new. objectRepresentation := objectMemory objectRepresentationClass forCogit: self methodZone: methodZone. methodZone setInterpreter: aCoInterpreter objectRepresentation: objectRepresentation cogit: self. generatorTable := self class generatorTable. processor := ProcessorClass new. simulatedAddresses := Dictionary new. coInterpreter class clusteredVariableNames do: [:cvn| self simulatedAddressFor: (cvn first = $C ifTrue: ['get', cvn] ifFalse: [cvn]) asSymbol]. simulatedTrampolines := Dictionary new. simulatedVariableGetters := Dictionary new. simulatedVariableSetters := Dictionary new. traceStores := 0. traceFlags := (InitializationOptions at: #linkedSendTrace ifAbsent: [false]) ifTrue: [257 "compileSendTrace + print"] ifFalse: [(InitializationOptions at: #recordPrimTrace ifAbsent: [true]) ifTrue: [8] "record prim trace on by default (see Cogit class>>decareCVarsIn:)" ifFalse: [0]]. + singleStep := printRegisters := printInstructions := clickConfirm := clickStepping := false. - singleStep := printRegisters := printInstructions := clickConfirm := false. backEnd := CogCompilerClass for: self. methodLabel := CogCompilerClass for: self. (literalsManager := backEnd class literalsManagerClass new) cogit: self. ordinarySendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). superSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). BytecodeSetHasDirectedSuperSend ifTrue: [directedSuperSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). directedSuperBindingSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). directedSendUsesBinding := false]. NewspeakVM ifTrue: [selfSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). dynamicSuperSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). implicitReceiverSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). outerSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines)]. "debug metadata" objectReferencesInRuntime := CArrayAccessor on: (Array new: NumObjRefsInRuntime). runtimeObjectRefIndex := 0. "debug metadata" trampolineAddresses := CArrayAccessor on: (Array new: NumTrampolines * 2). trampolineTableIndex := 0. extA := numExtB := extB := 0. compilationTrace ifNil: [compilationTrace := self class initializationOptions at: #compilationTrace ifAbsent: [0]]. debugOpcodeIndices := self class initializationOptions at: #debugOpcodeIndices ifAbsent: [Set new]. debugBytecodePointers := self class initializationOptions at: #debugBytecodePointers ifAbsent: [Set new]. self class initializationOptions at: #breakPC ifPresent: [:pc| breakPC := pc]! Item was changed: ----- Method: FullBlockClosure>>shouldStopIfAtPC: (in category '*VMMaker-interpreter simulator') ----- shouldStopIfAtPC: address <primitive: 207> + ^self cull: address! - ^self value: address! Item was added: + ----- Method: Interval>>addBreakpoint: (in category '*VMMaker-breakpoints') ----- + addBreakpoint: bkpt + bkpt = (stop + 1) ifTrue: + [^start to: bkpt]. + bkpt = (start - 1) ifTrue: + [^bkpt to: stop]. + ^{self}, {bkpt}! Item was added: + ----- Method: Interval>>isActiveBreakpoint (in category '*VMMaker-breakpoints') ----- + isActiveBreakpoint + ^stop > start! Item was added: + ----- Method: Interval>>isBreakpointFor: (in category '*VMMaker-breakpoints') ----- + isBreakpointFor: address + ^address >= start and: [address <= stop]! Item was added: + ----- Method: Interval>>menuPrompt (in category '*VMMaker-breakpoints') ----- + menuPrompt + ^' ', start hex, ' to: ', stop hex! Item was added: + ----- Method: Interval>>removeBreakpoint: (in category '*VMMaker-breakpoints') ----- + removeBreakpoint: bkpt + (self includes: bkpt) ifFalse: + [^self]. + bkpt = start ifTrue: + [^bkpt = (stop - 1) + ifTrue: [stop] + ifFalse: [bkpt + 1 to: stop]]. + bkpt = stop ifTrue: + [^bkpt = (start + 1) + ifTrue: [start] + ifFalse: [start to: bkpt - 1]]. + ^self asArray copyWithout: bkpt! Item was added: + ----- Method: Interval>>singleStepRequiredToTriggerIn: (in category '*VMMaker-breakpoints') ----- + singleStepRequiredToTriggerIn: aCogit + ^(start between: aCogit cogCodeBase and: aCogit methodZone limitZony) + or: [(stop between: aCogit cogCodeBase and: aCogit methodZone limitZony) + or: [stop < aCogit cogCodeBase and: [stop > aCogit methodZone limitZony]]]! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <export: true> "useful for VM debugging; use export: not api, so it will be accessible on win32 and won't be written to cointerp.h" | fmt lastIndex startIP column cls | (objectMemory isImmediate: oop) ifTrue: [^objectMemory printImmediateObject: oop on: transcript]. (objectMemory addressCouldBeObj: oop) ifFalse: [^objectMemory printCantBeObject: oop on: transcript]. (objectMemory isFreeObject: oop) ifTrue: [^objectMemory printFreeObject: oop on: transcript]. (objectMemory isForwarded: oop) ifTrue: [^objectMemory printForwarder: oop on: transcript]. (cls := objectMemory fetchClassOfNonImm: oop) ifNil: ['16r%lx has a nil class!!!!\n' f: transcript printf: oop] ifNotNil: [| className length | className := self nameOfClass: cls lengthInto: (self addressOf: length put: [:v| length := v]). '16r%lx: a(n) %.*s' f: transcript printf: {oop. length. className }. objectMemory hasSpurMemoryManagerAPI ifTrue: ['(%lx=>16r%lx)' f: transcript printf: { objectMemory compactClassIndexOf: oop. cls }]]. fmt := objectMemory formatOf: oop. ' format %lx' f: transcript printf: fmt. fmt > objectMemory lastPointerFormat ifTrue: [' nbytes %ld' f: transcript printf: (objectMemory numBytesOf: oop)] ifFalse: [(objectMemory isIndexableFormat: fmt) ifTrue: [| len | len := objectMemory lengthOf: oop. ' size %ld' f: transcript printf: len - (objectMemory fixedFieldsOf: oop format: fmt length: len)]]. objectMemory printHeaderTypeOf: oop on: transcript. self print: ' hash '; printHexnp: (objectMemory rawHashBitsOf: oop). self cr. (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: ["This will answer false if splObj: ClassAlien is nilObject" (self is: oop KindOfClass: (objectMemory splObj: ClassAlien)) ifTrue: [^' datasize %ld %s @ %p\n' f: transcript printf: {objectMemory sizeFieldOfAlien: oop. (self isIndirectAlien: oop) ifTrue: ['indirect'] ifFalse: [(self isPointerAlien: oop) ifTrue: ['pointer'] ifFalse: ['direct']]. (self startOfAlienData: oop) asUnsignedInteger }]. (self is: oop KindOfClass: (self superclassOf: (objectMemory splObj: ClassString))) ifTrue: [^objectMemory printStringDataOf: oop on: transcript]. ^objectMemory printNonPointerDataOf: oop on: transcript]. + startIP := fmt >= objectMemory firstCompiledMethodFormat + ifTrue: [(self startPCOfMethod: oop) / objectMemory wordSize] + ifFalse: [objectMemory numSlotsOf: oop]. - "this is nonsense. apologies." - startIP := (objectMemory lastPointerOf: oop) + objectMemory bytesPerOop - objectMemory baseHeaderSize / objectMemory bytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:i| | fieldOop | fieldOop := objectMemory fetchPointer: i - 1 ofObject: oop. self space; printNum: i - 1; space; printHex: fieldOop; space. (i = 1 and: [objectMemory isCompiledMethod: oop]) ifTrue: [self printMethodHeaderOop: fieldOop] ifFalse: [self printOopShortInner: fieldOop]. self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > lastIndex ifTrue: [self print: '...'; cr]] ifTrue: + [startIP := (self startPCOfMethod: oop) + 1. - [startIP := startIP * objectMemory wordSize + 1. lastIndex := objectMemory lengthOf: oop. + lastIndex - startIP > 256 ifTrue: + [lastIndex := startIP + 256]. - lastIndex - startIP > 100 ifTrue: - [lastIndex := startIP + 100]. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: + [(self cCode: ['%08p: '] inSmalltalk: ['16r%08x: ']) + f: transcript + printf: (oop+BaseHeaderSize+index-1) asUnsignedIntegerPtr]. - ['16r%08p: ' f: transcript printf: (oop + BaseHeaderSize + index - 1) asVoidPointer]. byte := objectMemory fetchByte: index - 1 ofObject: oop. '%02x/%-3d%c' f: transcript printf: { byte. byte. column = 8 ifTrue: [Character cr] ifFalse: [Character space] }. (column := column + 1) > 8 ifTrue: [column := 1]]. + (objectMemory lengthOf: oop) > lastIndex ifTrue: + [self print: '...']. (column between: 2 and: 7) ifTrue: [self cr]]! Item was changed: ----- Method: StackInterpreter>>printOop: (in category 'debug printing') ----- printOop: oop <export: true> "use export: not api, so it won't be written to cointerp.h" | cls fmt lastIndex startIP bytecodesPerLine column className length | <inline: false> (objectMemory isImmediate: oop) ifTrue: [^objectMemory printImmediateObject: oop on: transcript]. (objectMemory addressCouldBeObj: oop) ifFalse: [^objectMemory printCantBeObject: oop on: transcript]. (objectMemory isFreeObject: oop) ifTrue: [^objectMemory printFreeObject: oop on: transcript]. (objectMemory isForwarded: oop) ifTrue: [^objectMemory printForwarder: oop on: transcript]. (cls := objectMemory fetchClassOfNonImm: oop) ifNil: [^'16r%lx has a nil class!!!!\n' f: transcript printf: oop]. className := self nameOfClass: cls lengthInto: (self addressOf: length put: [:v| length := v]). '16r%lx: a(n) %.*s' f: transcript printf: {oop. length. className }. cls = (objectMemory splObj: ClassFloat) ifTrue: [^'\n%g\n' f: transcript printf: (objectMemory dbgFloatValueOf: oop)]. fmt := objectMemory formatOf: oop. fmt > objectMemory lastPointerFormat ifTrue: [' nbytes %ld' f: transcript printf: (objectMemory numBytesOf: oop)]. self cr. (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: ["This will answer false if splObj: ClassAlien is nilObject" (self is: oop KindOfClass: (objectMemory splObj: ClassAlien)) ifTrue: [^' datasize %ld %s @ %p\n' f: transcript printf: {objectMemory sizeFieldOfAlien: oop. (self isIndirectAlien: oop) ifTrue: ['indirect'] ifFalse: [(self isPointerAlien: oop) ifTrue: ['pointer'] ifFalse: ['direct']]. (self startOfAlienData: oop) asUnsignedInteger }]. (self is: oop KindOfClass: (self superclassOf: (objectMemory splObj: ClassString))) ifTrue: [^objectMemory printStringDataOf: oop on: transcript]. ^objectMemory printNonPointerDataOf: oop on: transcript]. + startIP := fmt >= objectMemory firstCompiledMethodFormat + ifTrue: [(self startPCOfMethod: oop) / objectMemory wordSize] + ifFalse: [objectMemory numSlotsOf: oop]. - "this is nonsense. apologies." - startIP := (objectMemory lastPointerOf: oop) + objectMemory bytesPerOop - objectMemory baseHeaderSize / objectMemory bytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| self cCode: [self printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space] inSmalltalk: [self space; printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space. self print: (self shortPrint: (objectMemory fetchPointer: index - 1 ofObject: oop))]. (index \\ self elementsPerPrintOopLine) = 0 ifTrue: [self cr]]. (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: [self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: + [startIP := (self startPCOfMethod: oop) + 1. - [startIP := startIP * objectMemory wordSize + 1. lastIndex := objectMemory lengthOf: oop. + lastIndex - startIP > 256 ifTrue: + [lastIndex := startIP + 256]. - lastIndex - startIP > 100 ifTrue: - [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: + [(self cCode: ['%08p: '] inSmalltalk: ['16r%08x: ']) + f: transcript + printf: (oop+BaseHeaderSize+index-1) asUnsignedIntegerPtr]. - ['0x%08p: ' f: transcript printf: (oop+BaseHeaderSize+index-1) asUnsignedIntegerPtr]. byte := objectMemory fetchByte: index - 1 ofObject: oop. + ' %02x/%-3d' f: transcript printf: { self cCoerceSimple: byte to: #int. self cCoerceSimple: byte to: #int }. - self cCode: 'printf(" %02x/%-3d", (int)byte,(int)byte)' - inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. + (objectMemory lengthOf: oop) > lastIndex ifTrue: + [self print: '...']. column = 1 ifFalse: [self cr]]!

1 0

VM Maker: VMMaker.oscog-eem.3092.mcz
by commits＠source.squeak.org 17 Oct '21

17 Oct '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3092.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3092 Author: eem Time: 17 October 2021, 12:10:30.907626 pm UUID: ab7ad37d-48ab-47f0-a48d-04e926c7684c Ancestors: VMMaker.oscog-eem.3091 Simulation: Adapt assertValidExternalStackPointers & assertProcessorStackPointersBelongToCurrentThread to FastCPrimitive calls, and hence simplify handleCallOrJumpSimulationTrap:. Use printf for neater bytecode printing, moved to the common superclass. Save & restore pc around "simulateLeafCallOf: ceCaptureCStackPointers" so inMachineCode isn;t confised by a stale value. Fix a speeling rorre (funciton) =============== Diff against VMMaker.oscog-eem.3091 =============== Item was changed: ----- Method: CCodeGenerator class>>initialize (in category 'class initialization') ----- initialize "CCodeGenerator initialize" NoRegParmsInAssertVMs := true + "If NoRegParmsInAssertVMs is true the generator spits out an attribute turning off register parameters for static functions in the Assert and Debug VMs which makes debugging easier, since all functions can be safely called from gdb. One might hope that -mregparm=0 would work but at least on Mac OS X's gcc 4.2.1 it does not and hence we have to use a per function attribute. Sigh..."! - "If NoRegParmsInAssertVMs is true the generator spits out an attribute turning off register parameters for static functions in the Assert and Debug VMs which makes debugging easier, since all functions can be safely called from gdb. One might hope that -mregparm=0 would work but at least on Mac OS X's gcc 4.2.1 it does not and hence we have to use a per funciton attribute. Sigh..."! Item was changed: ----- Method: CoInterpreter>>assertValidExternalStackPointers (in category 'debug support') ----- assertValidExternalStackPointers <doNotGenerate> "For use *ONLY* by routines coming in to the VM, i.e. handleCallOrJumpSimulationTrap:. This is because it nils localFP as a side-effect, and it does so so that the head frame can be determined reliably." + ((stackPage addressIsInPage: cogit processor sp) + and: [stackPage addressIsInPage: cogit processor fp]) + ifTrue: "This is for FastCPrimitive calls. Assume we're in such a call on the Smalltalk stack" + [self assert: (stackPointer - cogit processor sp between: 0 and: 64). + self assert: cogit processor fp < stackPage baseAddress. + self assert: cogit processor sp <= cogit processor fp. + self assert: cogit processor sp >= (stackPage realStackLimit - self stackLimitOffset)] + ifFalse: + [self assert: framePointer < stackPage baseAddress. + self assert: stackPointer < framePointer. + self assert: framePointer > stackPointer. + self assert: stackPointer >= (stackPage realStackLimit - self stackLimitOffset)]. - self assert: framePointer < stackPage baseAddress. - self assert: stackPointer < framePointer. - self assert: framePointer > stackPointer. - self assert: stackPointer >= (stackPage realStackLimit - self stackLimitOffset). self nilLocalFP! Item was changed: ----- Method: CoInterpreter>>enterSmalltalkExecutiveImplementation (in category 'initialization') ----- enterSmalltalkExecutiveImplementation "Main entry-point into the interpreter at each execution level, where an execution level is either the start of execution or reentry for a callback. Capture the C stack pointers so that calls from machine-code into the C run-time occur at this level. This is the actual implementation, separated from enterSmalltalkExecutive so the simulator can wrap it in an exception handler and hence simulate the Cogit's jump back into C code on interpreting; see ceInvokeInterpret. Conceptually, an invocation of interpret exists at each level of execution from the initial invocation through each callback. Entry to each execution level is through this function. It captures the C stack & frame pointers for this level of execution and then either invokes machine code or interpret, depending on whether the current frame (the effective entry-point into Smalltalk execution) is a machine code or interpreted frame. In addition, interpret captures the return address of its caller + (this function). The Cogit then uses the captured C stack pointers and return - (this funciton). The Cogit then uses the captured C stack pointers and return address to invoke interpret as if it had been called from this function." <inline: false> cogit assertCStackWellAligned. cogit ceCaptureCStackPointers. (self isMachineCodeFrame: framePointer) ifTrue: [self returnToExecutive: false postContextSwitch: true "NOTREACHED"]. self interpret. ^0! Item was changed: ----- Method: CoInterpreterMT>>assertProcessorStackPointersBelongToCurrentThread (in category 'simulation') ----- assertProcessorStackPointersBelongToCurrentThread <cmacro: '(ignored) 0'> "simulation only" | ownerIndex range | self assert: (ownerIndex := cogThreadManager getVMOwner) > 0. + self assert: (((stackPage addressIsInPage: cogit processor fp) and: [stackPage addressIsInPage: cogit processor sp]) + or: [range := self cStackRangeForThreadIndex: ownerIndex. + (range includes: cogit processor fp) and: [range includes: cogit processor sp]])! - range := self cStackRangeForThreadIndex: ownerIndex. - self assert: ((range includes: cogit processor fp) and: [range includes: cogit processor sp])! Item was changed: ----- Method: CogVMSimulator>>logSend: (in category 'debugging traps') ----- logSend: oop sendCount := sendCount + 1. (printSends or: [printBytecodeAtEachStep]) ifTrue: + [transcript ensureCr. + '%d/%d %.*s\n' + f: transcript + printf: { byteCount. sendCount. objectMemory numBytesOfBytes: oop. objectMemory firstIndexableField: oop }]! - [transcript print: byteCount; nextPut: $/; print: sendCount; space. - self printStringOf: oop. - transcript cr; flush]! Item was changed: ----- Method: CogVMSimulator>>maybeMapPrimitiveFunctionPointerBackToSomethingEvaluable (in category 'primitive support') ----- maybeMapPrimitiveFunctionPointerBackToSomethingEvaluable "In the real VM primitiveFunctionPointer is either an index (for quick primitives) or a proper function pointer to a primitive. In the simulator it may be a small index (corresponding to a quick primitive index), a symbol (corresponding to a function pointer) or an index into the externalPrimitiveTable, or an invalid address that references an evaluable in the simulatedTrampolines dictionary of the Cogit. The simulator expects dispatchFunctionPointer to be called with primitiveFunctionPointer being a symbol only for internal primitives. External + primitives must have their function pointer mapped back to an index. This - primitives must have their funciton pointer mapped back to an index. This method does the mapping back from fake addresses." <doNotGenerate> (primitiveFunctionPointer isInteger and: [self isExternalPrimitiveCall: newMethod]) ifTrue: "External prims must be evaluated by the right plugin..." [(cogit simulatedTrampolines at: primitiveFunctionPointer ifAbsent: nil) ifNotNil: [:evaluable| | pfp index externalIndex | "primitiveFunctionPointer := pfp" "(1 to: self mappedPluginEntries size) select: [:index| (self mappedPluginEntries at: index) third == evaluable]" pfp := primitiveFunctionPointer. index := self mappedPluginEntries findFirst: [:entry| entry third == evaluable]. self assert: index ~= 0. externalIndex := 1000 + (externalPrimitiveTable object indexOf: index ifAbsent: [self error: 'entry not found']). self assert: ((self pluginEntryFor: externalIndex) notNil and: [(self pluginEntryFor: externalIndex) third == evaluable]). primitiveFunctionPointer := externalIndex. ^self]]. ^super maybeMapPrimitiveFunctionPointerBackToSomethingEvaluable! Item was removed: - ----- Method: CogVMSimulator>>printCurrentBytecodeOn: (in category 'debug printing') ----- - printCurrentBytecodeOn: aStream - | code | - code := currentBytecode radix: 16. - aStream ensureCr; print: localIP - method - 3; tab. - bytecodeSetSelector > 0 ifTrue: - [aStream nextPutAll: 'ALT ']. - aStream - nextPut: (code size < 2 - ifTrue: [$0] - ifFalse: [code at: 1]); - nextPut: code last; space; - nextPutAll: (BytecodeTable at: currentBytecode + 1); - space; - nextPut: $(; print: byteCount + 1; nextPut: $)! Item was changed: ----- Method: Cogit>>ceCaptureCStackPointers (in category 'jit - api') ----- ceCaptureCStackPointers <api: 'extern void (*ceCaptureCStackPointers)()'> <doNotGenerate> + | savedpc | coInterpreter isCurrentImageFacade ifTrue: [^self]. + savedpc := processor pc. "this is so as not to mislead inMachineCode" self simulateLeafCallOf: ceCaptureCStackPointers. + processor pc: savedpc. thisContext sender selector == #generateStackPointerCapture ifTrue: [^self]. coInterpreter isThreadedVM ifTrue: [coInterpreter assertProcessorStackPointersBelongToCurrentThread]! Item was changed: ----- Method: Cogit>>handleCallOrJumpSimulationTrap: (in category 'simulation only') ----- handleCallOrJumpSimulationTrap: aProcessorSimulationTrap <doNotGenerate> | evaluable function memory result savedFramePointer savedStackPointer savedArgumentCount retpc invalidStackPointersExpected index | "Execution of a single instruction must be within the processorLock critical section to ensure simulation traps are executed atomically. However, at this point control is leaving machine code and entering the run-time and hence the lock must be released." processorLock primitiveExitCriticalSection. "This is a hack fix before we revise the simulators. When a jump call is made, the next pc is effectively the return address on the stack, not the instruction following the jump." aProcessorSimulationTrap type == #jump ifTrue: [processor hackFixNextPCOfJumpFor: aProcessorSimulationTrap using: objectMemory]. evaluable := simulatedTrampolines at: aProcessorSimulationTrap address ifAbsent: [self errorProcessingSimulationTrap: aProcessorSimulationTrap in: simulatedTrampolines]. function := evaluable isBlock ifTrue: ['aBlock; probably some plugin primitive'] ifFalse: [evaluable receiver == backEnd ifTrue: "this is for invoking ARMv5 floating-point intrinsics, and for the short-cut tracing trampolines" [^self handleABICallOrJumpSimulationTrap: aProcessorSimulationTrap evaluable: evaluable]. evaluable selector]. memory := coInterpreter memory. function == #interpret ifTrue: "i.e. we're here via ceInvokeInterpret/ceReturnToInterpreterTrampoline and should discard all state back to enterSmalltalkExecutiveImplementation" [self recordInstruction: {'(simulated jump call of '. aProcessorSimulationTrap address. '/'. function. ')'}. "self halt: evaluable selector." clickConfirm ifTrue: [(self confirm: 'skip jump to interpret?') ifFalse: [clickConfirm := false. self halt]]. processor simulateJumpCallOf: aProcessorSimulationTrap address memory: memory. coInterpreter reenterInterpreter. "NOTREACHED" self halt]. + (invalidStackPointersExpected := function == #ceBaseFrameReturn:) ifFalse: + [evaluable isBlock + ifTrue: "external primitives..." + ["The only acceptable exception to the rule are fast C primitive calls..." + (methodZone cogMethodContaining: (self mostLikelyPrimInvocationPC: processor pc or: (processor leafRetpcIn: memory))) + ifNil: [self assertf: 'call to block evaluable from non-external method'] + ifNotNil: [:cogMethod| + coInterpreter assertValidExternalStackPointers]] + ifFalse: + [coInterpreter assertValidExternalStackPointers]]. - (function == #ceBaseFrameReturn: - or: [function == #ceTakeProfileSample: - or: [function == #primitiveObjectAtPut]]) - ifTrue: [invalidStackPointersExpected := true] - ifFalse: - [invalidStackPointersExpected := false. - evaluable isBlock - ifTrue: "external primitives..." - ["The only acceptable exception to the rule are fast C primitive calls..." - (methodZone cogMethodContaining: (self mostLikelyPrimInvocationPC: processor pc or: (processor leafRetpcIn: memory))) - ifNil: [self assertf: 'call to block evaluable from non-external method'] - ifNotNil: [:cogMethod| - self assert: (self cogMethodHasExternalPrim: cogMethod). - (coInterpreter hasFastCLinkage: cogMethod methodObject) - ifTrue: [invalidStackPointersExpected := true. coInterpreter nilLocalFP] - ifFalse: [coInterpreter assertValidExternalStackPointers]]] - ifFalse: - [coInterpreter assertValidExternalStackPointers]]. processor simulateCallOf: aProcessorSimulationTrap address nextpc: aProcessorSimulationTrap nextpc memory: memory. retpc := processor retpcIn: memory. self recordInstruction: {'(simulated call of '. aProcessorSimulationTrap address. '/'. function. ')'}. savedFramePointer := coInterpreter framePointer. savedStackPointer := coInterpreter stackPointer. savedArgumentCount := coInterpreter argumentCount. result := ["self halt: evaluable selector." clickConfirm ifTrue: [(self confirm: 'skip run-time call?') ifFalse: [clickConfirm := false. self halt]]. evaluable valueWithArguments: (processor postCallArgumentsNumArgs: evaluable numArgs in: memory)] on: ReenterMachineCode do: [:ex| ex return: #continueNoReturn]. invalidStackPointersExpected ifFalse: [coInterpreter assertValidExternalStackPointers]. "Verify the stack layout assumption compileInterpreterPrimitive: makes, provided we've not called something that has built a frame, such as closure value or evaluate method, or switched frames, such as primitiveSignal, primitiveWait, primitiveResume, primitiveSuspend et al." (function beginsWith: 'primitive') ifTrue: [coInterpreter primFailCode = 0 ifTrue: [(CogVMSimulator stackAlteringPrimitives includes: function) ifFalse: ["This is a rare case (e.g. in Scorch where a married context's sender is set to nil on trapTrpped and hence the stack layout is altered." (function == #primitiveSlotAtPut and: [objectMemory isContext: (coInterpreter frameReceiver: coInterpreter framePointer)]) ifFalse: [self assert: savedFramePointer = coInterpreter framePointer. self assert: savedStackPointer + (savedArgumentCount * objectMemory wordSize) = coInterpreter stackPointer]]] ifFalse: [self assert: savedFramePointer = coInterpreter framePointer. self assert: savedStackPointer = coInterpreter stackPointer]]. result ~~ #continueNoReturn ifTrue: [self recordInstruction: {'(simulated return to '. processor retpcIn: memory. ')'}. processor simulateReturnIn: memory. self assert: processor pc = retpc. processor smashCallerSavedRegistersWithValuesFrom: 16r80000000 by: objectMemory wordSize]. self assert: (result isInteger "an oop result" or: [result == coInterpreter or: [result == objectMemory or: [(index := #(nil true false continueNoReturn) indexOf: result) > 0 and: [result := #(0 1 0 16rF00BA4) at: index. true]]]]). processor cResultRegister: (result ifNil: [0] ifNotNil: [result isInteger ifTrue: [result] ifFalse: [16rF00BA222]])! Item was changed: ----- Method: Integer>>coerceTo:sim: (in category '*VMMaker-interpreter simulator') ----- coerceTo: cTypeString sim: interpreter | bits unitSize | cTypeString last == $* ifTrue: "C pointer" [unitSize := cTypeString caseOf: { [#'char *'] -> [1]. [#'short *'] -> [2]. [#'int *'] -> [4]. [#'long long *'] -> [8]. [#'float *'] -> [^CFloatArray basicNew interpreter: interpreter address: self unitSize: 4; yourself]. [#'double *'] -> [^CFloatArray basicNew interpreter: interpreter address: self unitSize: 8; yourself]. [#'unsigned *'] -> [4]. [#'unsigned int *'] -> [4]. [#'unsigned char *'] -> [1]. [#'signed char *'] -> [1]. [#'unsigned short *'] -> [2]. [#'unsigned long long *'] -> [8]. [#'oop *'] -> [interpreter objectMemory bytesPerOop]. } otherwise: [interpreter objectMemory wordSize]. ^CArray basicNew interpreter: interpreter address: self unitSize: unitSize; yourself]. cTypeString first == $u ifTrue: [bits := cTypeString caseOf: { [#usqInt] -> [interpreter objectMemory wordSize * 8]. [#usqLong] -> [64]. [#unsigned] -> [32]. [#'unsigned char'] -> [8]. [#'unsigned int'] -> [8]. [#'unsigned long'] -> [48]. "LLP64 on Windows :-(" [#'unsigned long long'] -> [64]. [#'unsigned short'] -> [16]. } otherwise: [self error: 'unknown unsigned integer type name']. ^self bitAnd: 1 << bits - 1]. bits := cTypeString caseOf: { [#'sqIntptr_t'] -> [interpreter objectMemory wordSize * 8]. [#sqLong] -> [64]. [#char] -> [^self bitAnd: 255]. "char may be signed, may be unsigned; interpret as unsigned by default" [#'signed char'] -> [8]. [#'short'] -> [16]. [#int] -> [32]. [#long] -> [48]. "LLP64 on Windows :-(" [#'long long'] -> [64]. + [#'wint_t'] -> [24]. "unsigned short on Windows; int elsewhere" } otherwise: [self error: 'unknown signed integer type name']. ^(self bitAnd: (1 bitShift: bits) - 1) - ((self bitAnd: (1 bitShift: bits - 1)) bitShift: 1)! Item was changed: ----- Method: InterpreterPlugin>>expandDereferenceInterpreterProxyFunctionTable (in category 'initialize') ----- expandDereferenceInterpreterProxyFunctionTable "This is a dummy function that the VMPluginCodeGenerator expands into a + sequence of assignments from interpreterProxy functions to local function pointers." - sequence of assignments from interpreterProxy funcitons to local function pointers." <doNotGenerate>! Item was changed: ----- Method: SpurMemoryManager>>printImmediateObject:on: (in category 'debug printing interpreter support') ----- printImmediateObject: oop on: aStream <var: 'aStream' type: #'FILE *'> self assert: (self isImmediate: oop). (self isIntegerObject: oop) ifTrue: ['16r%lx=%ld\n' f: aStream printf: {oop. (self integerValueOf: oop) asInteger}]. (self isImmediateCharacter: oop) ifTrue: ['16r%lx=$%ld ($%lc)\n' f: aStream printf: {oop. (self characterValueOf: oop) asLong. + self cCoerce: (self characterValueOf: oop) to: #'wint_t'}]. - self cCoerce: (self characterValueOf: oop) to: 'wint_t'}]. (self isImmediateFloat: oop) ifTrue: ['16r%lx=%g\n' f: aStream printf: {oop. self floatValueOf: oop}]! Item was changed: ----- Method: StackInterpreter>>maybeMapPrimitiveFunctionPointerBackToSomethingEvaluable (in category 'primitive support') ----- maybeMapPrimitiveFunctionPointerBackToSomethingEvaluable "In the real VM primitiveFunctionPointer is either an index (for quick primitives) or a proper function pointer to a primitive. In the simulator it may be a small index (corresponding to a quick primitive index), a symbol (corresponding to a function pointer) or an index into the externalPrimitiveTable, or an invalid address that references an evaluable in the simulatedTrampolines dictionary of the Cogit. The simulator expects dispatchFunctionPointer to be called with primitiveFunctionPointer being a symbol only for internal primitives. External + primitives must have their function pointer mapped back to an index. This - primitives must have their funciton pointer mapped back to an index. This method does the reverse mapping." <doNotGenerate> (self isExternalPrimitiveCall: newMethod) ifTrue: "External prims must be evaluated by the right plugin..." [| pfp index externalIndex | pfp := primitiveFunctionPointer. index := self mappedPluginEntries findFirst: [:entry| entry second == primitiveFunctionPointer]. self assert: index ~= 0. externalIndex := 1000 + (externalPrimitiveTable object indexOf: index ifAbsent: [self error: 'entry not found']). self assert: ((self pluginEntryFor: externalIndex) notNil and: [(self pluginEntryFor: externalIndex) second == primitiveFunctionPointer]). primitiveFunctionPointer := externalIndex]! Item was added: + ----- Method: StackInterpreter>>printCurrentBytecodeOn: (in category 'debug printing') ----- + printCurrentBytecodeOn: aStream + <doNotGenerate> + aStream ensureCr. + (bytecodeSetSelector >= 256 + ifTrue: ['%d\tALT %02X %s (%d)'] + ifFalse: ['%d\t %02X %s (%d)']) + f: transcript + printf: {localIP - method - objectMemory bytesPerOop + 1. + currentBytecode. + BytecodeTable at: currentBytecode + 1. + self byteCount + 1 }. + transcript flush! Item was removed: - ----- Method: StackInterpreterSimulator>>printCurrentBytecodeOn: (in category 'debug printing') ----- - printCurrentBytecodeOn: aStream - | code | - code := currentBytecode radix: 16. - aStream ensureCr; print: localIP - method - 3; tab. - bytecodeSetSelector > 0 ifTrue: - [aStream nextPutAll: 'ALT ']. - aStream - nextPut: (code size < 2 - ifTrue: [$0] - ifFalse: [code at: 1]); - nextPut: code last; space; - nextPutAll: (BytecodeTable at: currentBytecode + 1); - space; - nextPut: $(; print: byteCount + 1; nextPut: $); - cr; - flush!

1 0

VM Maker: VMMakerUI-eem.48.mcz
by commits＠source.squeak.org 17 Oct '21

17 Oct '21

Eliot Miranda uploaded a new version of VMMakerUI to project VM Maker: http://source.squeak.org/VMMaker/VMMakerUI-eem.48.mcz ==================== Summary ==================== Name: VMMakerUI-eem.48 Author: eem Time: 17 October 2021, 12:03:32.740449 pm UUID: e0f79b6c-13da-48bf-81a6-daf20467334e Ancestors: VMMakerUI-eem.47 Make click step work from an initial launch doit. =============== Diff against VMMakerUI-eem.47 =============== Item was changed: ----- Method: Cogit>>setClickStepBreakBlock (in category '*VMMakerUI-user interface') ----- setClickStepBreakBlock "Set the break block to present a confirmer, breaking if true, and restoring the previous break block. If an open debugger on the receiver can be found, proceed it." <doNotGenerate> | previousBreakBlock previousAtEachStepBlock previousBreakPC previousSingleStep previousClickConfirm result | (breakBlock isNil or: [breakBlock method ~~ thisContext method]) ifTrue: [previousBreakBlock := breakBlock. previousAtEachStepBlock := coInterpreter atEachStepBlock. previousBreakPC := breakPC. previousSingleStep := singleStep. previousClickConfirm := clickConfirm. breakBlock := [:ign| (processor pc ~= previousBreakPC and: [(result := self promptClickStep) == true]) ifTrue: [false] ifFalse: [breakBlock := previousBreakBlock. coInterpreter atEachStepBlock: previousAtEachStepBlock. breakPC := previousBreakPC == true ifTrue: [false] ifFalse: [previousBreakPC]. singleStep := previousSingleStep. clickConfirm := previousClickConfirm. result ~~ #proceed]]. coInterpreter atEachStepBlock: [previousAtEachStepBlock value. (coInterpreter localIP ~= previousBreakPC and: [(result := self promptClickStep) == true]) ifFalse: [breakBlock := previousBreakBlock. coInterpreter atEachStepBlock: previousAtEachStepBlock. breakPC := previousBreakPC == true ifTrue: [false] ifFalse: [previousBreakPC]. singleStep := previousSingleStep. clickConfirm := previousClickConfirm. self halt]]. singleStep := breakPC := clickConfirm := result ~~ #proceed]. (World submorphs detect: [:m| m model isDebugger and: [(m model interruptedProcess suspendedContext ifNil: [false] "happens if we're debugging this very method..." ifNotNil: [:suspendedContext| suspendedContext findContextSuchThat: [:ctxt| (ctxt receiver == self and: [ctxt selector == #simulateCogCodeAt: or: [ctxt selector == #simulateLeafCallOf:]]) or: [ctxt receiver == coInterpreter + and: [ctxt selector == #interpret or: [ctxt selector == #halt "initial launch doit"]]]]]) notNil]] + ifNone: []) + ifNotNil: + [:debuggerWindow| + WorldState addDeferredUIMessage: + [debuggerWindow model proceed]]! - and: [ctxt selector == #interpret]]]]) notNil]] - ifNone: []) ifNotNil: - [:debuggerWindow| - WorldState addDeferredUIMessage: - [debuggerWindow model proceed]]!

1 0

VM Maker: VMMaker.oscog-eem.3091.mcz
by commits＠source.squeak.org 16 Oct '21

16 Oct '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3091.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3091 Author: eem Time: 15 October 2021, 7:16:26.376829 pm UUID: 264f2183-0530-4514-8a64-3e03a75335fa Ancestors: VMMaker.oscog-eem.3090 ARMv8 8.1: fix generateLowLevelTryLock: so that it answers if vmOwner is set to the desired value (i.e. if already set to the desired value, still answer true). Comment the cack-handed hack in withProcessorHaltedDo: and have the code not destroy a break pc within ceTryLockVMOwner. firstMappedPCFor: needs a guard. Fix a couple of comments. =============== Diff against VMMaker.oscog-eem.3090 =============== Item was changed: ----- Method: CogARMCompiler>>hasDoublePrecisionFloatingPointSupport (in category 'testing') ----- hasDoublePrecisionFloatingPointSupport - "might be true, but is for the forseeable future disabled" ^true! Item was changed: ----- Method: CogARMv8Compiler>>generateLowLevelTryLock: (in category 'multi-threading') ----- generateLowLevelTryLock: vmOwnerLockAddress "Generate a function that attempts to lock the vmOwnerLock to the argument and answers if it succeeded." <inline: true> | lockValueReg vmOwnerLockAddressReg br statusReg ldaxr | vmOwnerLockAddress = 0 ifTrue: [cogit MoveCq: 1 R: ABIResultReg; RetN: 0. ^self]. "spiffy 8.1 version using CASAL..." lockValueReg := CArg1Reg. "Holds the value of lock if unlocked (zero), receives the existing value of the lock" vmOwnerLockAddressReg := CArg2Reg. self hasAtomicInstructions ifTrue: [cogit MoveCq: 0 R: lockValueReg; MoveCq: vmOwnerLockAddress R: vmOwnerLockAddressReg; + gen: CASAL operand: lockValueReg operand: CArg0Reg operand: vmOwnerLockAddressReg. + br := cogit gen: CBNZ operand: 0 operand: lockValueReg. + cogit + MoveCq: 1 R: ABIResultReg; - gen: CASAL operand: lockValueReg operand: CArg0Reg operand: vmOwnerLockAddressReg; - CmpCq: 0 R: lockValueReg; - gen: CCMPNE operand: ABIResultReg operand: lockValueReg operand: 0 "nzcv all false"; "i.e. if NE to 0, then is it already set to the argument?" - gen: CSET operand: ABIResultReg operand: EQ; RetN: 0. + br jmpTarget: (cogit CmpR: ABIResultReg R: lockValueReg). + cogit + gen: CSET operand: ABIResultReg operand: EQ; "i.e. if NE to 0, then is it already set to the argument?" + RetN: 0. ^self]. "frumpy 8.0 version using LDAXR/STLXR" cogit MoveCq: vmOwnerLockAddress R: vmOwnerLockAddressReg. cogit MoveCq: 0 R: (statusReg := CArg3Reg). "STLXR sets a word status register; clearing the top bits means it's a non-issue" ldaxr := cogit gen: LDAXR operand: lockValueReg operand: vmOwnerLockAddressReg. br := cogit gen: CBNZ operand: 0 operand: lockValueReg. cogit gen: STLXR operand: CArg0Reg operand: vmOwnerLockAddressReg operand: statusReg. cogit gen: CBNZ operand: ldaxr asUnsignedInteger operand: statusReg. "Since CArg0Reg is never zero, merely returning answers true" cogit RetN: 0. br jmpTarget: (cogit gen: CLREX). cogit CmpR: ABIResultReg R: lockValueReg. cogit gen: CSET operand: ABIResultReg operand: EQ. "i.e. if NE to 0, then is it already set to the argument?" cogit RetN: 0. ^self! Item was changed: ----- Method: CogIA32Compiler>>generateLowLevelTryLock: (in category 'multi-threading') ----- generateLowLevelTryLock: vmOwnerLockAddress + "Generate a function that attempts to lock the vmOwnerLock and answers if it succeeded." - "Generate a function that attempts to lock the vmOwnerLock and answers - true if it succeeded." <inline: true> | valueReg | vmOwnerLockAddress = 0 ifTrue: [cogit MoveCq: 1 R: ABIResultReg; RetN: 0. ^self]. valueReg := cogit availableRegisterOrNoneIn: (ABICallerSavedRegisterMask bitClear: 1 << EAX). cogit MoveMw: 4 r: ESP R: valueReg; MoveCq: 0 R: EAX; gen: LOCK; gen: CMPXCHGRAw operand: valueReg operand: vmOwnerLockAddress; gen: SETE operand: ABIResultReg; "a.k.a. EAX" RetN: 0! Item was changed: ----- Method: Cogit>>firstMappedPCFor: (in category 'method map') ----- firstMappedPCFor: cogMethod <var: #cogMethod type: #'CogMethod *'> <inline: true> + ^(cogMethod cmType < CMClosedPIC and: [cogMethod cmIsFullBlock]) - ^cogMethod cmIsFullBlock ifTrue: [cogMethod asUnsignedInteger + cbNoSwitchEntryOffset] ifFalse: [cogMethod asUnsignedInteger + cmNoCheckEntryOffset]! Item was changed: ----- Method: Cogit>>withProcessorHaltedDo: (in category 'simulation processor access') ----- withProcessorHaltedDo: aBlock ^processorLock critical: + ["This is a kack-handed attempt at stopping all other threads while this routine is running. + Anyway, don't set breakPC to true if trying to break within ceTryLockVMOwner" + | oldBreakPC oldSingleStep | - [| oldBreakPC oldSingleStep | oldBreakPC := breakPC. oldSingleStep := singleStep. + singleStep := true. + (breakPC isInteger and: [breakPC between: ceTryLockVMOwner and: ceGetFP - 1]) ifFalse: + [breakPC := true]. - breakPC := singleStep := true. aBlock ensure: [singleStep := oldSingleStep. breakPC := oldBreakPC]]!

1 0

VM Maker: Cog-eem.444.mcz
by commits＠source.squeak.org 16 Oct '21

16 Oct '21

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.444.mcz ==================== Summary ==================== Name: Cog-eem.444 Author: eem Time: 15 October 2021, 6:01:34.301286 pm UUID: 6bba95a6-248c-429e-bacc-9912f1d0cc14 Ancestors: Cog-eem.443 Fix a slip in instruction decode in GdbARMv8Alien>>handleFailingLoadStore:at:in: which confused CASAL for a STLXR. Make the inst vars of SpurImagePreener and SpurMtoNBitImageConverter line up (oldHeap=>sourceHeap,newHeap=>targetHeap). It may be worth adding a common superclass at some point. =============== Diff against Cog-eem.443 =============== Item was changed: ----- Method: GdbARMv8Alien>>handleFailingLoadStore:at:in: (in category 'error handling') ----- handleFailingLoadStore: instruction at: pc in: memoryArray "<DoubleWordArray|ByteArray>" "C4.1.4 Loads and Stores C4-266 This section describes the encoding of the Loads and Stores group. The encodings in this section are decoded from A64 instruction set encoding on page C4-252. Table C4-5 Encoding table for the Loads and Stores group op0 31:28 1 op1 26 0 op2 24:23 x op3 21:16 x op4 11:10 op0 op2 op3 op4 xx11 0x 0xxxxx 00 Load/store register (unscaled immediate) on page C4-283 xx11 0x 0xxxxx 01 Load/store register (immediate post-indexed) on page C4-284 xx11 0x 0xxxxx 10 Load/store register (unprivileged) on page C4-286 xx11 0x 0xxxxx 11 Load/store register (immediate pre-indexed) on page C4-286 xx11 0x 1xxxxx 00 Atomic memory operations on page C4-288 xx11 0x 1xxxxx 10 Load/store register (register offset) on page C4-295 xx11 0x 1xxxxx x1 Load/store register (pac) on page C4-297 + xx11 1x 1xxxxx - Load/store register (unsigned immediate) on page C4-297 - xx11 1x 1xxxxx - Load/store register (unsigned immediate) on page C4-297" + Load/store exclusive table starts on page C4-277 (. implies a bit) + |size..|0 0 1 0 0 0|o2.|L.|o1.|Rs.....|o0.|Rt2.....|Rn.....|Rt.....| + o2 = bit 23, L=bit 22, o1 = bit 21, o0 = bit 15" + | op0op2 size op4 rm rn rt opc v offsetFromImm addr shift | "self disassembleInstructionAt: self pc In: memoryArray" size := instruction bitShift: -30. opc := (instruction bitShift: -22) bitAnd: 3. op4 := (instruction bitShift: -10) bitAnd: 3. rn := (instruction bitShift: -5) bitAnd: 31. rt := instruction bitAnd: 31. (rn = 31 and: [self sp anyMask: 15]) ifTrue: [self reportStackAlignmentVolation]. "op0 = xx11 op2 = 0x" (op0op2 := (instruction bitShift: -23) bitAnd: 2r1100010) = 2r1100000 ifFalse: [offsetFromImm := ARMv8A64Opcodes extractOffsetFromLoadStore: instruction. (v := instruction >> 26 bitAnd: 1) = 0 ifFalse: [self halt]. addr := (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm. op0op2 = 2r1100010 ifTrue: "Load/store register (unsigned immediate) on page C4-297" [^(opc = 0 ifTrue: [ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr type: #write accessor: ((self registerStateGettersForSizes: size) at: rt + 1)] ifFalse: [ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr type: #read accessor: ((self registerStateSettersForSizes: size) at: rt + 1)]) signal]. op0op2 = 2r1000010 ifTrue: "Load/store register pair (signed immediate) on page C4-282" [| rt2 | rt2 := (instruction bitShift: -10) bitAnd: 31. ^opc = 0 ifTrue: [(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr type: #write accessor: ((self registerStateGettersForSizes: size + 1) at: rt + 1)) signal. (ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr + 8 type: #write accessor: ((self registerStateGettersForSizes: size + 1) at: rt2 + 1)) signal] ifFalse: [(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr type: #read accessor: ((self registerStateSettersForSizes: size + 1) at: rt + 1)) signal. (ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr + 8 type: #read accessor: ((self registerStateSettersForSizes: size + 1) at: rt2 + 1)) signal]]. + + op0op2 = 0 ifTrue: "LDAXR/STLXR register on page C4-279" - op0op2 = 0 ifTrue: "LDAXR/STRXR register on page C4-279" [| result rs | self assert: size = 3. opc = 1 ifTrue: [^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr type: #read accessor: (self registerStateSetters at: rt + 1)) signal]. + opc = 0 ifTrue: + [result := (ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: addr + type: #write + accessor: (self registerStateGetters at: rt + 1)) signal. + rs := instruction >> 16 bitAnd: 31. + "For now assume the write succeeded..." + self perform: ((self registerStateSettersForSizes: 2) at: rs + 1) + with: 0. + ^result]]]. - result := (ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: addr - type: #write - accessor: (self registerStateGetters at: rt + 1)) signal. - rs := instruction >> 16 bitAnd: 31. - "For now assume the write succeeded..." - self perform: ((self registerStateSettersForSizes: 2) at: rs + 1) - with: 0. - ^result]. - self halt: 'undecoded failing load/store']. ((instruction bitShift: -21) noMask: 1) ifTrue: "op3 = 0xxxxx" [offsetFromImm := ((instruction bitShift: -12) bitAnd: 16r1FF) bitShift: size. opc = 0 ifTrue:"C4-286 opc = 0 => store" [self assert: size = 3. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm type: #write accessor: (self registerStateGetters at: rt + 1)) signal]. opc = 1 ifTrue: [^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: (self registerStateGetters at: rn + 1)) + offsetFromImm type: #read accessor: ((self registerStateSettersForSizes: size) at: rt + 1)) signal]. self halt: 'op3 = 0xxxxx opc > 1']. "op0 op2 op3 op4 xx11 0x 1xxxxx 10 Load/store register (register offset) on page C4-295 (296/297)" v := instruction >> 26 bitAnd: 1. rm := instruction >> 16 bitAnd: 31. shift := instruction anyMask: 1 << 12. (size = 3 and: [v = 0]) ifTrue: [addr := (self perform: (self registerStateGetters at: rn + 1)) + (shift ifTrue: [(self perform: (self registerStateGetters at: rm + 1)) << size] ifFalse: [self perform: (self registerStateGetters at: rm + 1)]). opc = 0 ifTrue: "STR (register) - 64-bit variant on page C6-1242" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr type: #write accessor: (self registerStateGetters at: rt + 1)) signal]. opc = 1 ifTrue: "LDR (register) - 64-bit variant on page C6-981" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: addr type: #read accessor: (self registerStateSetters at: rt + 1)) signal]. (opc = 3 and: [instruction >> 10 allMask: 63]) ifTrue: "CASAL C4-278/C6-829" [^(CompareAndSwapSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: (self registerStateGetters at: rn + 1)) type: #write accessor: (self registerStateSetters at: rm + 1)) expectedValue: (self perform: (self registerStateGetters at: rm + 1)); storedValue: (self perform: (self registerStateGetters at: rt + 1)); signal]. self halt: 'op3 = 1xxxxx opc > 1']. self halt: 'op3 = 1xxxxx size ~= 3'! Item was changed: SimulatorHarness subclass: #SpurImagePreener + instanceVariableNames: 'map reverseMap sourceHeap targetHeap sourceInterpreter targetInterpreter imageHeaderFlags savedWindowSize writeDefaultHeader wordSize' - instanceVariableNames: 'oldHeap newHeap map reverseMap oldInterpreter newInterpreter imageHeaderFlags savedWindowSize writeDefaultHeader wordSize' classVariableNames: '' poolDictionaries: 'VMObjectIndices' category: 'Cog-Bootstrapping'! + !SpurImagePreener commentStamp: 'eem 10/12/2021 17:42' prior: 0! - !SpurImagePreener commentStamp: 'eem 10/12/2021 16:58' prior: 0! A SpurImagePreener is a simple image rewriter for Spur images that eliminates free space and hence shrinks the preened image. Use via e.g. + SpurImagePreener new preenImage: 'trunk' + which will produce trunk-preen.image and trunk-preen.changes from trunk.image and trunk.changes. - SpurImagePreener new preenImage: 'spur' - which will produce spur-preen.image and spur-preen.changes from spur.image and spur.changes, etc. Instance Variables imageHeaderFlags: <Integer> map: <Dictionary> - newHeap: <Spur[32|64]BitMMLESimulator> - newInterpreter: <StackInterpreterSimulatorLSB> - oldHeap: <Spur[32|64]BitMMLESimulator> - oldInterpreter: <StackInterpreterSimulatorLSB> reverseMap: <Dictionary> savedWindowSize: <Integer> + sourceHeap: <Spur[32|64]BitMMLESimulator> + sourceInterpreter: <StackInterpreterSimulatorLSB> + targetHeap: <Spur[32|64]BitMMLESimulator> + targetInterpreter: <StackInterpreterSimulatorLSB> imageHeaderFlags - flags word in image header map + - map from oops in target image to oops in source image - - map from oops in old image to oops in new image + sourceHeap + - the unpreened heap - newHeap - - the preened heap + sourceInterpreter + - the interpreter wrapping the unpreened heap - newInterpreter - - the interpreter wrapping the preened heap + targetHeap - oldHeap - the heap to be preened + targetInterpreter - oldInterpreter - the interpreter wrapping the heap to be preened reverseMap + - map from oops in source image to oops in target image - - map from oops in new image to oops in old image savedWindowSize - screen size word in mage header ! Item was changed: ----- Method: SpurImagePreener>>cloneFreeLists: (in category 'bootstrap image') ----- cloneFreeLists: oldObj | newObj | + newObj := targetHeap + allocateSlots: targetHeap numFreeLists + format: targetHeap wordIndexableFormat + classIndex: targetHeap wordSizeClassIndexPun. - newObj := newHeap - allocateSlots: newHeap numFreeLists - format: newHeap wordIndexableFormat - classIndex: newHeap wordSizeClassIndexPun. reverseMap at: newObj put: oldObj. ^map at: oldObj put: newObj! Item was changed: ----- Method: SpurImagePreener>>cloneObject: (in category 'bootstrap image') ----- cloneObject: oldObj | newObj hash | + newObj := targetHeap + allocateSlots: (sourceHeap numSlotsOf: oldObj) + format: (sourceHeap formatOf: oldObj) + classIndex: (sourceHeap classIndexOf: oldObj). + (hash := sourceHeap rawHashBitsOf: oldObj) ~= 0 ifTrue: + [targetHeap setHashBitsOf: newObj to: hash]. + (sourceHeap isImmutable: oldObj) ifTrue: + [targetHeap setIsImmutableOf: newObj to: true]. + (sourceHeap isPinned: oldObj) ifTrue: + [targetHeap setIsPinnedOf: newObj to: true]. + self deny: (sourceHeap isRemembered: oldObj). + self deny: (sourceHeap isMarked: oldObj). + self deny: (sourceHeap isGrey: oldObj). - newObj := newHeap - allocateSlots: (oldHeap numSlotsOf: oldObj) - format: (oldHeap formatOf: oldObj) - classIndex: (oldHeap classIndexOf: oldObj). - (hash := oldHeap rawHashBitsOf: oldObj) ~= 0 ifTrue: - [newHeap setHashBitsOf: newObj to: hash]. - (oldHeap isImmutable: oldObj) ifTrue: - [newHeap setIsImmutableOf: newObj to: true]. - (oldHeap isPinned: oldObj) ifTrue: - [newHeap setIsPinnedOf: newObj to: true]. - self deny: (oldHeap isRemembered: oldObj). - self deny: (oldHeap isMarked: oldObj). - self deny: (oldHeap isGrey: oldObj). reverseMap at: newObj put: oldObj. ^map at: oldObj put: newObj! Item was changed: ----- Method: SpurImagePreener>>cloneObjects (in category 'bootstrap image') ----- cloneObjects "Clone all normal objects. Of hidden objects only clone the freeLists object and the classTableRoot and class table pages. In particular, dont clone objStacks. The refs to the objStacks are nilled out in fillInHeap." | i freeListsObject | i := 0. + freeListsObject := sourceHeap freeListsObject. + sourceHeap allOldSpaceObjectsDo: - freeListsObject := oldHeap freeListsObject. - oldHeap allOldSpaceObjectsDo: [:obj| (i := i + 1) >= 100000 ifTrue: [Transcript nextPut: $:; flush. i := 0]. obj = freeListsObject ifTrue: [self cloneFreeLists: obj] ifFalse: [(self shouldClone: obj) ifTrue: [self cloneObject: obj]]]! Item was changed: ----- Method: SpurImagePreener>>fillInBitsObject:from: (in category 'bootstrap image') ----- fillInBitsObject: newObj from: oldObj + 0 to: (sourceHeap numSlotsOf: oldObj) - 1 do: - 0 to: (oldHeap numSlotsOf: oldObj) - 1 do: [:i| + targetHeap - newHeap storePointerUnchecked: i ofObject: newObj + withValue: (sourceHeap fetchPointer: i ofObject: oldObj)]! - withValue: (oldHeap fetchPointer: i ofObject: oldObj)]! Item was changed: ----- Method: SpurImagePreener>>fillInClassTable (in category 'bootstrap image') ----- fillInClassTable + self fillInPointerObject: (map at: sourceHeap classTableRootObj) from: sourceHeap classTableRootObj! - self fillInPointerObject: (map at: oldHeap classTableRootObj) from: oldHeap classTableRootObj! Item was changed: ----- Method: SpurImagePreener>>fillInCompiledMethod:from: (in category 'bootstrap image') ----- fillInCompiledMethod: newObj from: oldObj "oldInterpreter printOop: oldObj" "newInterpreter printOop: newObj" + 0 to: (sourceHeap numPointerSlotsOf: oldObj) - 1 do: - 0 to: (oldHeap numPointerSlotsOf: oldObj) - 1 do: [:i| | oldOop newOop | + oldOop := sourceHeap fetchPointer: i ofObject: oldObj. - oldOop := oldHeap fetchPointer: i ofObject: oldObj. newOop := self mapOop: oldOop. + targetHeap - newHeap storePointerUnchecked: i ofObject: newObj withValue: newOop]. + (sourceInterpreter startPCOfMethod: oldObj) + to: (sourceHeap numBytesOf: oldObj) - 1 - (oldInterpreter startPCOfMethod: oldObj) - to: (oldHeap numBytesOf: oldObj) - 1 do: [:j| + targetHeap - newHeap storeByte: j ofObject: newObj + withValue: (sourceHeap fetchByte: j ofObject: oldObj)]! - withValue: (oldHeap fetchByte: j ofObject: oldObj)]! Item was changed: ----- Method: SpurImagePreener>>fillInHeap (in category 'bootstrap image') ----- fillInHeap | heapEnd freeListsObj | + heapEnd := targetHeap freeStart. + targetHeap + nilObject: (map at: sourceHeap nilObject); + falseObject: (map at: sourceHeap falseObject); + trueObject: (map at: sourceHeap trueObject); + specialObjectsOop: (map at: sourceHeap specialObjectsOop); + lastHash: sourceHeap lastHash; + setHiddenRootsObj: (map at: sourceHeap classTableRootObj). + targetHeap segmentManager + initSegmentForInImageCompilationFrom: targetHeap nilObject + to: heapEnd + targetHeap bridgeSize. + freeListsObj := targetHeap objectAfter: targetHeap trueObject. - heapEnd := newHeap freeStart. - newHeap - nilObject: (map at: oldHeap nilObject); - falseObject: (map at: oldHeap falseObject); - trueObject: (map at: oldHeap trueObject); - specialObjectsOop: (map at: oldHeap specialObjectsOop); - lastHash: oldHeap lastHash; - setHiddenRootsObj: (map at: oldHeap classTableRootObj). - newHeap segmentManager - initSegmentForInImageCompilationFrom: newHeap nilObject - to: heapEnd + newHeap bridgeSize. - freeListsObj := newHeap objectAfter: newHeap trueObject. "Nil-out the free lists." + targetHeap + fillObj: freeListsObj numSlots: (targetHeap numSlotsOf: freeListsObj) with: 0; - newHeap - fillObj: freeListsObj numSlots: (newHeap numSlotsOf: freeListsObj) with: 0; initializeFreeSpacePostLoad: freeListsObj; initializePostBootstrap; + setEndOfMemory: (targetHeap segmentManager bridgeAt: 0) + targetHeap baseHeaderSize! - setEndOfMemory: (newHeap segmentManager bridgeAt: 0) + newHeap baseHeaderSize! Item was changed: ----- Method: SpurImagePreener>>fillInObjects (in category 'bootstrap image') ----- fillInObjects "oldInterpreter printOop: oldObj" | i | + {sourceHeap markStack. sourceHeap weaklingStack. sourceHeap mournQueue} do: - {oldHeap markStack. oldHeap weaklingStack. oldHeap mournQueue} do: [:obj| + obj ~= sourceHeap nilObject ifTrue: + [map at: obj put: (map at: sourceHeap nilObject)]]. - obj ~= oldHeap nilObject ifTrue: - [map at: obj put: (map at: oldHeap nilObject)]]. i := 0. + sourceHeap allObjectsDo: - oldHeap allObjectsDo: [:oldObj| (i := i + 1) >= 10000 ifTrue: [Transcript nextPut: $.; flush. i := 0]. (map at: oldObj ifAbsent: nil) ifNotNil: [:newObj| | format | + (targetHeap numSlotsOf: newObj) > 0 ifTrue: "filter-out filtered objStack pages" + [format := sourceHeap formatOf: oldObj. + (targetHeap isPointersFormat: format) - (newHeap numSlotsOf: newObj) > 0 ifTrue: "filter-out filtered objStack pages" - [format := oldHeap formatOf: oldObj. - (newHeap isPointersFormat: format) ifTrue: [self fillInPointerObject: newObj from: oldObj] ifFalse: + [(targetHeap isCompiledMethodFormat: format) - [(newHeap isCompiledMethodFormat: format) ifTrue: [self fillInCompiledMethod: newObj from: oldObj] ifFalse: [self fillInBitsObject: newObj from: oldObj]]]] ifNil: [self assert: (self isUnmappedObject: oldObj)]]! Item was changed: ----- Method: SpurImagePreener>>fillInPointerObject:from: (in category 'bootstrap image') ----- fillInPointerObject: newObj from: oldObj + 0 to: (sourceHeap numSlotsOf: oldObj) - 1 do: - 0 to: (oldHeap numSlotsOf: oldObj) - 1 do: [:i| + targetHeap - newHeap storePointerUnchecked: i ofObject: newObj + withValue: (self mapOop: (sourceHeap fetchPointer: i ofObject: oldObj))]! - withValue: (self mapOop: (oldHeap fetchPointer: i ofObject: oldObj))]! Item was changed: ----- Method: SpurImagePreener>>initMaps (in category 'initialize-release') ----- initMaps + map := Dictionary new: sourceHeap memory size // 32. + reverseMap := Dictionary new: sourceHeap memory size // 32! - map := Dictionary new: oldHeap memory size // 32. - reverseMap := Dictionary new: oldHeap memory size // 32! Item was changed: ----- Method: SpurImagePreener>>isUnmappedObject: (in category 'bootstrap image') ----- isUnmappedObject: obj "Answer if obj is an object that is not cloned by the bootstrap." + ^obj = sourceHeap freeListsObject + or: [(sourceHeap isValidObjStackPage: obj)]! - ^obj = oldHeap freeListsObject - or: [(oldHeap isValidObjStackPage: obj)]! Item was changed: ----- Method: SpurImagePreener>>mapOop: (in category 'bootstrap image') ----- mapOop: obj "oldInterpreter printOop: obj" ^map at: obj ifAbsent: + [(sourceHeap isImmediate: obj) - [(oldHeap isImmediate: obj) ifTrue: [obj] ifFalse: [self error: 'cannot map']]! Item was changed: ----- Method: SpurImagePreener>>on: (in category 'public access') ----- on: imageName wordSize ifNil: [wordSize := self determineWordSizeFrom: imageName]. + (sourceInterpreter := self newInterpreter) openOn: imageName extraMemory: 0. + sourceHeap := sourceInterpreter objectMemory. + imageHeaderFlags := sourceInterpreter getImageHeaderFlags. + savedWindowSize ifNil: [savedWindowSize := sourceInterpreter savedWindowSize]. + targetInterpreter := self newInterpreter. + targetHeap := targetInterpreter objectMemory. + targetHeap + allocateMemoryOfSize: sourceHeap oldSpaceSize - (oldInterpreter := self newInterpreter) openOn: imageName extraMemory: 0. - oldHeap := oldInterpreter objectMemory. - imageHeaderFlags := oldInterpreter getImageHeaderFlags. - savedWindowSize ifNil: [savedWindowSize := oldInterpreter savedWindowSize]. - newInterpreter := self newInterpreter. - newHeap := newInterpreter objectMemory. - newHeap - allocateMemoryOfSize: oldHeap oldSpaceSize newSpaceSize: self newSpaceSize stackSize: 16 * 1024 codeSize: 0. + targetHeap bootstrapping: true. - newHeap bootstrapping: true. self initMaps! Item was changed: ----- Method: SpurImagePreener>>reportSizes (in category 'bootstrap image') ----- reportSizes | change oldHeapSize newHeapSize | + oldHeapSize := sourceHeap oldSpaceSize. + targetHeap segmentManager computeTotalHeapSizeIncludingBridges. "To avoid assert fail" + newHeapSize := targetHeap oldSpaceSize. - oldHeapSize := oldHeap oldSpaceSize. - newHeap segmentManager computeTotalHeapSizeIncludingBridges. "To avoid assert fail" - newHeapSize := newHeap oldSpaceSize. change := newHeapSize - oldHeapSize / oldHeapSize. Transcript nextPutAll: 'done.'; cr; nextPutAll: 'old heap size: '; nextPutAll: oldHeapSize asStringWithCommas; tab; nextPutAll: 'initial new heap size: '; nextPutAll: newHeapSize asStringWithCommas; cr; nextPutAll: 'change: '; print: change * 100.0 maxDecimalPlaces: 2; nextPut: $%; cr; flush. + newHeapSize := targetHeap endOfMemory + - targetHeap scavenger eden limit + - targetHeap totalFreeListBytes. - newHeapSize := newHeap endOfMemory - - newHeap scavenger eden limit - - newHeap totalFreeListBytes. change := newHeapSize - oldHeapSize / oldHeapSize. Transcript nextPutAll: 'final new heap size: '; nextPutAll: newHeapSize asStringWithCommas; tab; nextPutAll: 'change: '; print: change * 100.0 maxDecimalPlaces: 2; nextPut: $%; cr; flush! Item was changed: ----- Method: SpurImagePreener>>shouldClone: (in category 'bootstrap image') ----- shouldClone: obj + ^(sourceHeap isValidObjStackPage: obj) not! - ^(oldHeap isValidObjStackPage: obj) not! Item was changed: ----- Method: SpurImagePreener>>writeSnapshot:headerFlags:screenSize: (in category 'snapshot') ----- writeSnapshot: imageFileName headerFlags: headerFlags screenSize: screenSizeInteger + targetHeap - newHeap checkFreeSpace; runLeakCheckerForFullGC. writeDefaultHeader == true ifTrue: + [targetInterpreter - [newInterpreter desiredEdenBytes: 0; desiredNumStackPages: 0; setDesiredCogCodeSize: 0; setMaxExtSemSizeTo: 0]. + targetInterpreter - newInterpreter setImageHeaderFlagsFrom: headerFlags; setDisplayForm: nil; setSavedWindowSize: savedWindowSize; imageName: imageFileName; writeImageFileIO. Transcript cr; show: 'Done!!'! Item was changed: SimulatorHarness subclass: #SpurMtoNBitImageConverter + instanceVariableNames: 'map reverseMap sourceHeap targetHeap sourceInterpreter targetInterpreter imageHeaderFlags savedWindowSize literalMap' - instanceVariableNames: 'sourceHeap targetHeap map reverseMap sourceInterpreter targetInterpreter imageHeaderFlags savedWindowSize literalMap' classVariableNames: '' poolDictionaries: 'VMObjectIndices VMSqueakClassIndices' category: 'Cog-Bootstrapping'!

1 0

[OpenSmalltalk/opensmalltalk-vm] 99f111: CogVM source as per VMMaker.oscog-eem.3090
by Eliot Miranda 15 Oct '21

15 Oct '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 99f1116c0f7a4ba9a0bf88cf7deb276325aa2d79 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/99f1116c0f7a4ba9a0… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2021-10-15 (Fri, 15 Oct 2021) Changed paths: M src/plugins/B2DPlugin/B2DPlugin.c M src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/CameraPlugin/CameraPlugin.c M src/plugins/CroquetPlugin/CroquetPlugin.c M src/plugins/DESPlugin/DESPlugin.c M src/plugins/DSAPrims/DSAPrims.c M src/plugins/FileAttributesPlugin/FileAttributesPlugin.c M src/plugins/FileCopyPlugin/FileCopyPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/Float64ArrayPlugin/Float64ArrayPlugin.c M src/plugins/FloatArrayPlugin/FloatArrayPlugin.c M src/plugins/HostWindowPlugin/HostWindowPlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/ImmX11Plugin/ImmX11Plugin.c M src/plugins/InternetConfigPlugin/InternetConfigPlugin.c M src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c M src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c M src/plugins/Klatt/Klatt.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MD5Plugin/MD5Plugin.c M src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c M src/plugins/Mpeg3Plugin/Mpeg3Plugin.c M src/plugins/SHA2Plugin/SHA2Plugin.c M src/plugins/ScratchPlugin/ScratchPlugin.c M src/plugins/SerialPlugin/SerialPlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/plugins/SoundCodecPrims/SoundCodecPrims.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/Squeak3D/Squeak3D.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnicodePlugin/UnicodePlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c M src/plugins/WeDoPlugin/WeDoPlugin.c M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.cog/interp.h M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur32.stack/validImage.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.cog/interp.h M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/spur64.stack/validImage.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3090 Spur: Add explicit accessor depths for primitiveStringAt[Put] (correcting the ommission to mirror primitiveAt[Put]) and primitiveExternalCall. Fix a slip in printOopShortInner:. Run primitiveSpurStringReplace and primitiveSpurFloatArrayAt[Put] on the Smalltalk stack; the latter with 2x stack alignment. Spur Cogit: Fix code generation bug on primitive failure with no accessor depth when running primitives on the Smalltalk stack (FastCPrimitive). On CISCs the old code offset the stack pointer incorrectly, resulting in a hard crash soon after. Also allow compileInterpreterPrimitive to invoke compileOnStackExternalPrimitive:flags:. Nuke the useless minValidCallAddress Spur Slang: Reimplement finding of the transitive closure and length of accessor chains for computing primitive accessor depth. The algorithm now has some semblance of correctness and comprehensibility. Refactor so that accessorChainsForMethod:interpreterClass: => accessorDepthForMethod:interpreterClass:, and includes accessorDepthForChain:. Fix a bad bug with computing accessor depths of clich√©s such as primitiveStrigReplace: primitiveFoo objectMemory hasSpurMemoryManagerAPI ifTrue: [self primitiveFooSpur] ifFalse: [self primitiveFooV3] The old code missed the connection and computed a -1 accessor depth. Format the macrology for global interpreter variables, and the primitiveAccessorDepthTable, a little nicer. Minor cleanups to a few primitives (e.g. we now have cppIf:ifFalse:).

1 0

VM Maker: VMMaker.oscog-eem.3090.mcz
by commits＠source.squeak.org 15 Oct '21

15 Oct '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3090.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3090 Author: eem Time: 15 October 2021, 12:50:03.820019 pm UUID: 3e2b8343-01bb-4169-ba4c-aecf82b4dcfc Ancestors: VMMaker.oscog-eem.3089 Spur Slang: Reimplement finding of the transitive closure and length of accessor chains for computing primitive accessor depth. The algorithm now has some semblance of correctness and comprehensibility. Refactor so that accessorChainsForMethod:interpreterClass: => accessorDepthForMethod:interpreterClass:, and includes accessorDepthForChain:. Add explicit accessor depths for primitiveStringAt[Put] (correcting the ommission to mirror primitiveAt[Put]) and primitiveExternalCall. Minor cleanups to a few primitives (e.g. we now have cppIf:ifFalse:). Don't crate a new CCodeGenerator just to compute the primitiveAccessorDepthTable. =============== Diff against VMMaker.oscog-eem.3089 =============== Item was removed: - ----- Method: CCodeGenerator>>accessorChainsForMethod:interpreterClass: (in category 'spur primitive compilation') ----- - accessorChainsForMethod: method interpreterClass: interpreterClass - "Answer a set of access paths from arguments through objects, in the method, assuming - it is a primitive. This is in support of Spur's lazy become. A primitive may fail because it - may encounter a forwarder. The primitive failure code needs to know to what depth it - must follow arguments to follow forwarders and, if any are found and followed, retry the - primitive. This method determines that depth. It starts by collecting references to the - stack and then follows these through assignments to variables and use of accessor - methods such as fetchPointer:ofObject:. For example - | obj field | - obj := self stackTop. - field := objectMemory fetchPointer: 1 ofObject: obj. - self storePointer: 1 ofObject: field withValue: (self stackValue: 1) - has depth 2, since field is accessed, and field is an element of obj." - - | accessors assignments roots chains extendedChains extended lastPass | - self accessorsAndAssignmentsForMethod: method - actuals: (self actualsForMethod: method) - depth: 0 - interpreterClass: interpreterClass - into: [:theRoots :theAccessors :theAssignments| - roots := theRoots. - accessors := theAccessors. - assignments := theAssignments]. - "Compute the transitive closure of assignments of accessor sends or variables to variables from the roots. - Start from the stack accesses (the roots). - On the last pass look only for accessors of the targets of the tip assignments." - chains := OrderedCollection new. - roots do: - [:root| - chains - addAll: (assignments - select: [:assignment| assignment expression = root] - thenCollect: [:assignment| OrderedCollection with: assignment]); - addAll: (accessors - select: [:accessor| accessor anySatisfy: [:subnode| subnode = root]] - thenCollect: [:accessor| OrderedCollection with: accessor])]. - lastPass := false. - [extended := false. - extendedChains := OrderedCollection new: chains size * 2. - chains do: - [:chain| | tip refs accessorRefs variableRefs | - chain last isAssignment - ifTrue: - [tip := chain last variable. - refs := accessors select: [:send| send args anySatisfy: [:arg| tip isSameAs: arg]]] - ifFalse: - [tip := chain last. - refs := #()]. - lastPass ifFalse: - [accessorRefs := refs collect: [:send| - assignments - detect: [:assignment| - assignment expression = send - and: [(chain includes: assignment) not]] - ifNone: []] - thenSelect: [:assignmentOrNil| assignmentOrNil notNil]. - variableRefs := assignments select: - [:assignment| - (tip isSameAs: assignment expression) - and: [(tip isSameAs: assignment variable) not - and: [(chain includes: assignment) not]]]. - refs := (Set withAll: accessorRefs) addAll: variableRefs; yourself]. - refs isEmpty - ifTrue: - [extendedChains add: chain] - ifFalse: - [lastPass ifFalse: [extended := true]. - self assert: (refs noneSatisfy: [:assignment| chain includes: assignment]). - extendedChains addAll: (refs collect: [:assignment| chain, {assignment}])]]. - extended or: [lastPass not]] whileTrue: - [chains := extendedChains. - extended ifFalse: [lastPass := true]]. - ^chains! Item was changed: ----- Method: CCodeGenerator>>accessorDepthForChain: (in category 'spur primitive compilation') ----- + accessorDepthForChain: chain "SequenceableCollection" + "Answer the actual number of accessors in an access chain, counting actual references. + + Consider this chain from primitiveSpurStringReplace: + repl := self stackValue: 1 . oop := objectMemory fetchPointer: srcDelta + i ofObject: repl . objectMemory storePointerUnchecked: i ofObject: array withValue: oop + The length of this chain is 2, because oop is derived from repl by the second statement, but is not part of the final access. There is another chain: + array := self stackValue: 4 . objectMemory storePointerUnchecked: i ofObject: array withValue: oop + which does make use of the final accessor. So in following chains we find and follow variables. + + Nested accessors are also possible, e.g. + self fetchPointer: i ofObject: (self fetchPointer: j ofObject: (self fetchPointer: k ofObject: var)) + So we must also consider the height of each accessor expression." + + | accessorDepth chainVariable | - accessorDepthForChain: chain "OrderedCollection" - "Answer the actual number of accessors in the access chain, filtering out assignments of variables to variables." - | accessorDepth | accessorDepth := 0. + chainVariable := nil. chain do: + [:node| | accessor | + accessor := node isAssignment + ifTrue: [node expression] + ifFalse: [self assert: node isSend. node]. + accessorDepth:= accessorDepth + (self depthOfAccessor: accessor for: chainVariable). + node isAssignment ifTrue: + [chainVariable := node variable]]. - [:node| - ((node isAssignment and: [node expression isVariable]) - or: [node isSend and: [SpurMemoryManager isSameLevelObjectAccessor: node selector]]) ifFalse: - [accessorDepth := accessorDepth + 1]]. ^accessorDepth! Item was changed: ----- Method: CCodeGenerator>>accessorDepthForMethod: (in category 'spur primitive compilation') ----- + accessorDepthForMethod: method "TMethod" - accessorDepthForMethod: method "Compute the depth the method traverses object structure, assuming it is a primitive. This is in support of Spur's lazy become. A primitive may fail because it may encounter a forwarder. The primitive failure code needs to know to what depth it must follow + arguments to find and forwarders and, if any are found, retry the primitive. + - arguments to follow forwarders and, if any are found and followed, retry the primitive. This method determines that depth. It starts by collecting references to the stack and then follows these through assignments to variables and use of accessor methods such as fetchPointer:ofObject:. For example | obj field | obj := self stackTop. field := objectMemory fetchPointer: 1 ofObject: obj. self storePointer: 1 ofObject: field withValue: (self stackValue: 1) has depth 2, since field is accessed, and field is an element of obj. + The information is cached since it needs to be computed *before* inlining." - The information is cached since it needs to be computed *before* inlining" ^accessorDepthCache at: method smalltalkSelector ifAbsentPut: [beganInlining ifTrue: [(method export or: [vmClass notNil or: [vmClass primitiveTable includes: method smalltalkSelector]]) ifTrue: [-1] ifFalse: [self error: 'it is too late to compute accessor depths!!']] ifFalse: [((method definingClass includesSelector: method smalltalkSelector) ifTrue: [(method definingClass >> method smalltalkSelector) pragmaAt: #accessorDepth:]) + ifNotNil: [:pragma| pragma arguments first] ifNil: ["Deal with the primitiveFoo objectMemory hasSpurMemoryManagerAPI ifTrue: [self primitiveFooSpur] ifFalse: [self primitiveFooV3] cliché" + method extractSpurPrimitiveSelector + ifNotNil: + [:actualSelector| | subMethod | + (subMethod := self methodNamed: actualSelector) ifNil: + [subMethod := self compileToTMethodSelector: actualSelector in: method definingClass]. + self accessorDepthForMethod: subMethod] + ifNil: [self accessorDepthForMethod: method interpreterClass: (vmClass ifNil: [StackInterpreter])]]]]! - method extractSpurPrimitiveSelector ifNotNil: - [:actualSelector| | subMethod | - (subMethod := self methodNamed: actualSelector) ifNil: - [subMethod := self compileToTMethodSelector: actualSelector in: method definingClass]. - ^self accessorDepthForMethod: subMethod]. - ((self - accessorChainsForMethod: method - interpreterClass: (vmClass ifNil: [StackInterpreter])) - inject: 0 - into: [:length :chain| length max: (self accessorDepthForChain: chain)]) - 1] - ifNotNil: [:pragma| pragma arguments first]]]! Item was added: + ----- Method: CCodeGenerator>>accessorDepthForMethod:interpreterClass: (in category 'spur primitive compilation') ----- + accessorDepthForMethod: method interpreterClass: interpreterClass + "Answer the maximal length of access paths from arguments through objects, in the method, + assuming it is a primitive. This is in support of Spur's lazy become. A primitive may fail because + it may encounter a forwarder. The primitive failure code needs to know to what depth it must + follow arguments to follow forwarders and, if any are found and followed, retry the primitive. + This method determines that depth. It starts by collecting references to the stack and then follows + these through assignments to variables and use of accessor methods such as fetchPointer:ofObject:. + For example + | obj field | + obj := self stackTop. + field := objectMemory fetchPointer: 1 ofObject: obj. + self storePointer: 1 ofObject: field withValue: (self stackValue: 1) + has depth 2, since field is accessed, and field is an element of obj." + + | chains | + chains := self accessorsAndAssignmentsForMethod: method + actuals: (self actualsForMethod: method) + depth: 0 + interpreterClass: interpreterClass + into: [:roots :accessors :assignments| + self transitiveClosureOfAccessorChainRoots: roots accessors: accessors assignments: assignments]. + "Now compute the maximal length and subtract 1. The depth for a stack access is 0. + The depth of an access to an object taken from the stack is 1, etc. And the depth for no access is -1." + ^(chains + inject: 0 + into: [:maximumLength :chain| maximumLength max: (self accessorDepthForChain: chain)]) - 1! Item was added: + ----- Method: CCodeGenerator>>depthOfAccessor:for: (in category 'spur primitive compilation') ----- + depthOfAccessor: accessor for: chainVariableOrNil + "Compute the accessor depth for a send. This is potentially greater than one for a nested access + such as self fetchPointer: i ofObject: (self fetchPointer: j ofObject: (self fetchPointer: k ofObject: var)). + If chainVariableOrNil is not nil then an access is only meaningful if it is an access of chainVariableOrNil." + + | keywords accessIndex objectAccessed | + accessor isSend ifFalse: + [^0]. + (StackInterpreter isStackAccessor: accessor selector) ifTrue: + [^1]. + keywords := accessor selector keywords. + accessIndex := keywords + indexOf: 'ofObject:' + ifAbsent: + [^(accessor args + inject: ((StackInterpreter isObjectAccessor: accessor selector) + ifTrue: [1] + ifFalse: [0]) + into: + [:best :node| + node isSend + ifTrue: [best max: (self depthOfAccessor: node for: chainVariableOrNil)] + ifFalse: [best]])]. + objectAccessed := accessor args at: accessIndex. + chainVariableOrNil ifNil: + [^1 + (self depthOfAccessor: objectAccessed for: chainVariableOrNil)]. + objectAccessed isSend ifFalse: + [^(objectAccessed isSameAs: chainVariableOrNil) + ifTrue: [1] + ifFalse: [0]]. + (objectAccessed anySatisfy: [:node| node isSameAs: chainVariableOrNil]) ifFalse: + [^0]. + ^1 + (self depthOfAccessor: objectAccessed for: chainVariableOrNil)! Item was added: + ----- Method: CCodeGenerator>>transitiveClosureOfAccessorChainRoots:accessors:assignments: (in category 'spur primitive compilation') ----- + transitiveClosureOfAccessorChainRoots: roots accessors: accessors assignments: assignments + "Compute the transitive closure of accessor and assignment expressions from the roots. + Start from the stack accesses (the roots)." + | chains chainSets expressions extended extendedChains | + chains := OrderedCollection new. + roots do: + [:root| + chains + addAll: (assignments + select: [:assignment| assignment expression isSameAs: root] + thenCollect: [:assignment| {assignment}]); + addAll: (accessors + select: [:accessor| accessor anySatisfy: [:subnode| subnode isSameAs: root]] + thenCollect: [:accessor| {accessor}])]. + chains isEmpty ifTrue: + [^roots collect: [:root| {root}]]. + "chainSets are the visited sets for each chain root. For example, in primiitveSpurStringReplace + objectMemory storeByte: i ofObject: array withValue: (objectMemory fetchByte: srcDelta + i ofObject: repl) + is reachable both from + array := self stackValue: 4 + and from + repl := self stackValue: 1. + If there is only a single visited set we will compute only one of these paths." + chainSets := Dictionary new. + chains do: + [:tuple| chainSets at: tuple first put: (Set with: tuple first)]. + (expressions := Set new) + addAll: accessors; + addAll: assignments. + [extended := false. + extendedChains := OrderedCollection new: chains size * 2. + chains do: + [:chain| | visited | + visited := chainSets at: chain first. + chain last isAssignment + ifTrue: "extend with any and all new references to the variable at the end of the chain." + [| tip | + tip := chain last variable. + (expressions select: [:expr| (visited includes: expr) not and: [expr anySatisfy: [:node| tip isSameAs: node]]]) + ifEmpty: [extendedChains addLast: chain] + ifNotEmpty: + [:refs| + extendedChains addAll: ((visited addAll: refs) collect: [:ref| chain, {ref}]). + extended := true]] + ifFalse: + [extendedChains addLast: chain]]. + extended] whileTrue: + [chains := extendedChains]. + ^extendedChains! Item was changed: ----- Method: FilePlugin>>primitiveFileStdioHandles (in category 'file primitives') ----- primitiveFileStdioHandles "Answer an Array of file handles for standard in, standard out and standard error, with nil in entries that are unvailable, e.g. because the platform does not provide standard error, etc. Fail if an error occurs determining the stdio handles, if the security plugin denies access or if memory runs out." - | fileRecords result validMask | <export: true> + | fileRecords result validMask | <var: 'fileRecords' declareC: 'SQFile fileRecords[3]'> + self cCode: '' inSmalltalk: [fileRecords := Array new: 3]. sHFAfn ~= 0 ifTrue: [(self cCode: ' ((sqInt (*)(void))sHFAfn)()' inSmalltalk: [true]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrUnsupported]]. - self cCode: '' inSmalltalk: [fileRecords := Array new: 3]. validMask := self sqFileStdioHandlesInto: fileRecords. validMask < 0 ifTrue: [^interpreterProxy primitiveFailForOSError: validMask]. result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 3. result = nil ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy pushRemappableOop: result. 0 to: 2 do: [:index| (validMask bitAnd: (1 << index)) ~= 0 ifTrue: [result := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: self fileRecordSize. result = nil ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: index ofObject: interpreterProxy topRemappableOop withValue: result. self cCode: [self memcpy: (interpreterProxy firstIndexableField: result) _: (self addressOf: (fileRecords at: index)) _: self fileRecordSize] inSmalltalk: [(interpreterProxy firstIndexableField: result) unitSize: interpreterProxy wordSize; at: 0 put: (fileRecords at: index + 1)]]]. "In the non-Spur threaded VM ensure the handles are old, so that sqFileReadIntoAt is unaffected by incremental GCs. See platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c. The Spur VM uses pinning, so it doesn't need the GC." self cppIf: COGMTVM ifTrue: [self cppIf: SPURVM - ifTrue: [] ifFalse: [interpreterProxy fullGC]]. result := interpreterProxy popRemappableOop. interpreterProxy methodReturnValue: result! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFormPrint (in category 'I/O primitives') ----- primitiveFormPrint "On platforms that support it, this primitive prints the receiver, assumed to be a Form, to the default printer." | landscapeFlag vScale hScale rcvr bitsArray w h + depth pixelsPerWord wordsPerLine bitsArraySize | - depth pixelsPerWord wordsPerLine bitsArraySize ok | - - <var: #vScale type: #double> - <var: #hScale type: #double> landscapeFlag := self booleanValueOf: self stackTop. vScale := objectMemory floatValueOf: (self stackValue: 1). hScale := objectMemory floatValueOf: (self stackValue: 2). rcvr := self stackValue: 3. ((objectMemory isPointers: rcvr) and: [(objectMemory lengthOf: rcvr) >= 4]) ifFalse: [self success: false]. self successful ifTrue: [bitsArray := objectMemory fetchPointer: 0 ofObject: rcvr. w := self fetchInteger: 1 ofObject: rcvr. h := self fetchInteger: 2 ofObject: rcvr. depth := self fetchInteger: 3 ofObject: rcvr. (w > 0 and: [h > 0]) ifFalse: [self success: false]. pixelsPerWord := 32 // depth. wordsPerLine := (w + (pixelsPerWord - 1)) // pixelsPerWord. (objectMemory isWordsOrBytes: bitsArray) ifTrue: [bitsArraySize := objectMemory numBytesOf: bitsArray. + self success: bitsArraySize = (wordsPerLine * h * 4)] - self success: (bitsArraySize = (wordsPerLine * h * 4))] ifFalse: [self success: false]]. self successful ifTrue: + [self success: (self ioFormPrint: bitsArray + BaseHeaderSize _: w _: h _: depth _: hScale _: vScale _: landscapeFlag). + self successful ifTrue: + [self methodReturnReceiver]]! - [ok := self cCode: 'ioFormPrint(bitsArray + BaseHeaderSize, w, h, depth, hScale, vScale, landscapeFlag)'. - self success: ok]. - self successful ifTrue: - [self pop: 3] "pop hScale, vScale, and landscapeFlag; leave rcvr on stack"! Item was changed: ----- Method: InterpreterPrimitives>>primitiveIntegerAt (in category 'indexing primitives') ----- primitiveIntegerAt + objectMemory hasSpurMemoryManagerAPI - SPURVM ifTrue: [self primitiveSpurIntegerAt] "Answer the signed integer element of a pure bits receiver" ifFalse: [self primitiveV3IntegerAt] "Answer the 32 bit signed integer contents of a words receiver"! Item was changed: ----- Method: InterpreterPrimitives>>primitiveIntegerAtPut (in category 'indexing primitives') ----- primitiveIntegerAtPut + objectMemory hasSpurMemoryManagerAPI - SPURVM ifTrue: [self primitiveSpurIntegerAtPut] "Assign an indexable variable of a pure bits receiver with a signed integer." ifFalse: [self primitiveV3IntegerAtPut] "Assign an indexable variable of a words receiver with a 32 bit signed integer."! Item was changed: ----- Method: InterpreterPrimitives>>primitiveStringAt (in category 'indexing primitives') ----- primitiveStringAt + <accessorDepth: 0> + self commonAt: true! - - self commonAt: true.! Item was changed: ----- Method: InterpreterPrimitives>>primitiveStringAtPut (in category 'indexing primitives') ----- primitiveStringAtPut + <accessorDepth: 0> + self commonAtPut: true! - - self commonAtPut: true.! Item was removed: - ----- Method: SpurMemoryManager class>>isSameLevelObjectAccessor: (in category 'translation') ----- - isSameLevelObjectAccessor: selector - "For accessor depth calculation, answer if selector doesn't traverse into an object, merely deriving a pointer from it." - ^#(arrayValueOf: firstFixedField: firstIndexableField:) includes: selector! Item was changed: ----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator | vmClass | self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" vmClass := aCCodeGenerator vmClass. "Generate primitiveTable etc based on vmClass, not just StackInterpreter" aCCodeGenerator addHeaderFile: '<stdio.h> /* for printf */'; addHeaderFile: '<stdlib.h> /* for e.g. alloca */'; addHeaderFile: '<setjmp.h>'; addHeaderFile: '<wchar.h> /* for wint_t */'; addHeaderFile: '"vmCallback.h"'; addHeaderFile: '"sqMemoryFence.h"'; addHeaderFile: '"sqImageFileAccess.h"'; addHeaderFile: '"sqSetjmpShim.h"'; addHeaderFile: '"dispdbg.h"'. LowcodeVM ifTrue: [aCCodeGenerator addHeaderFile: '"sqLowcodeFFI.h"']. vmClass declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'. aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. aCCodeGenerator declareVar: #sendTrace type: 'volatile int'; declareVar: #byteCount type: #usqLong. "see dispdbg.h" "These need to be pointers or unsigned." self declareC: #(instructionPointer method newMethod) as: #usqInt in: aCCodeGenerator. "These are all pointers; char * because Slang has no support for C pointer arithmetic." self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit breakSelector) as: #'char *' in: aCCodeGenerator. aCCodeGenerator var: #breakSelectorLength declareC: 'sqInt breakSelectorLength = MinSmallInteger'. self declareC: #(stackPage overflowedPage) as: #'StackPage *' in: aCCodeGenerator. aCCodeGenerator var: #transcript type: #'FILE *'. aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." "This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS is not defined, for the benefit of the interpreter on slow machines." aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). MULTIPLEBYTECODESETS == false ifTrue: [aCCodeGenerator removeVariable: 'bytecodeSetSelector']. BytecodeSetHasExtensions == false ifTrue: [aCCodeGenerator removeVariable: 'extA'; removeVariable: 'extB']. aCCodeGenerator var: #methodCache declareC: 'sqIntptr_t methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. NewspeakVM ifTrue: [aCCodeGenerator var: #nsMethodCache declareC: 'sqIntptr_t nsMethodCache[NSMethodCacheSize + 1 /* ', (NSMethodCacheSize + 1) printString, ' */]'] ifFalse: [aCCodeGenerator removeVariable: #nsMethodCache; removeVariable: 'localAbsentReceiver'; removeVariable: 'localAbsentReceiverOrZero']. AtCacheTotalSize isInteger ifTrue: [aCCodeGenerator var: #atCache declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]']. aCCodeGenerator var: #primitiveTable declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', vmClass primitiveTableString. vmClass primitiveTable do: [:symbolOrNot| (symbolOrNot isSymbol and: [symbolOrNot ~~ #primitiveFail]) ifTrue: [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: [:tMethod| tMethod returnType: #void]]]. vmClass objectMemoryClass hasSpurMemoryManagerAPI ifTrue: [aCCodeGenerator var: #primitiveAccessorDepthTable type: 'signed char' sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */' + array: (vmClass primitiveAccessorDepthTableUsing: aCCodeGenerator)] - array: vmClass primitiveAccessorDepthTable] ifFalse: [aCCodeGenerator removeVariable: #primitiveAccessorDepthTable]. aCCodeGenerator var: #displayBits type: #'void *'; var: #primitiveCalloutPointer declareC: 'void *primitiveCalloutPointer = (void *)-1'. self declareC: #(displayWidth displayHeight displayDepth) as: #int in: aCCodeGenerator. aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)()'; var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'; var: #interruptCheckChain declareC: 'void (*interruptCheckChain)(void) = 0'; var: #showSurfaceFn declareC: 'int (*showSurfaceFn)(sqIntptr_t, int, int, int, int)'; var: #jmpBuf declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'; var: #suspendedCallbacks declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'; var: #suspendedMethods declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs "these are high-frequency enough that they're overflowing quite quickly on modern hardware" statProcessSwitch statIOProcessEvents statForceInterruptCheck statCheckForEvents statStackOverflow statStackPageDivorce statIdleUsecs) in: aCCodeGenerator. aCCodeGenerator var: #nextProfileTick type: #sqLong. aCCodeGenerator var: #reenterInterpreter type: 'jmp_buf'. LowcodeVM ifTrue: [aCCodeGenerator var: #lowcodeCalloutState type: #'sqLowcodeCalloutState*'. self declareC: #(nativeSP nativeStackPointer shadowCallStackPointer) as: #'char *' in: aCCodeGenerator] ifFalse: [#(lowcodeCalloutState nativeSP nativeStackPointer shadowCallStackPointer) do: [:var| aCCodeGenerator removeVariable: var]]! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter class>>primitiveAccessorDepthTable (in category 'constants') ----- primitiveAccessorDepthTable | cg | cg := CCodeGenerator new. cg vmClass: StackInterpreter. + ^self primitiveAccessorDepthTableUsing: cg! - ^self primitiveTable collect: - [:thing| | implementingClass method | - (thing isInteger "quick prims, 0 for fast primitve fail" - or: [thing == #primitiveFail - or: [(implementingClass := self primitivesClass whichClassIncludesSelector: thing) isNil]]) - ifTrue: [-1] - ifFalse: - [method := cg compileToTMethodSelector: thing in: implementingClass. - cg accessorDepthForMethod: method]]! Item was added: + ----- Method: StackInterpreter class>>primitiveAccessorDepthTableUsing: (in category 'constants') ----- + primitiveAccessorDepthTableUsing: aCCodeGenerator + ^self primitiveTable collect: + [:thing| | implementingClass | + (thing isInteger "quick prims, 0 for fast primitve fail" + or: [thing == #primitiveFail + or: [(implementingClass := self primitivesClass whichClassIncludesSelector: thing) isNil]]) + ifTrue: [-1] + ifFalse: + [aCCodeGenerator accessorDepthForMethod: + ((aCCodeGenerator methodNamed: thing) ifNil: + [aCCodeGenerator compileToTMethodSelector: thing in: implementingClass])]]! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveExternalCall (in category 'plugin primitives') ----- primitiveExternalCall "Call an external primitive. External primitive methods first literals are an array of * The module name (String | Symbol) * The function name (String | Symbol) * The session ID (SmallInteger) [OBSOLETE], or in Spur, the metadata (accessorDepth and flags; Integer)) * The function index (Integer) in the externalPrimitiveTable For fast interpreter dispatch in subsequent invocations the primitiveFunctionPointer in the method cache is rewritten, either to the function itself, or to zero if the external function is not found. This allows for fast responses as long as the method stays in the cache. The cache rewrite relies on lastMethodCacheProbeWrite which is set in addNewMethodToCache:. Now that the VM flushes function addresses from its tables, the session ID is obsolete, but it is kept for backward compatibility. Also, a failed lookup is reported specially. If a method has been looked up and not been found, the function address is stored as -1 (i.e., the SmallInteger -1 to distinguish from 16rFFFFFFFF which may be returned from lookup), and the primitive fails with PrimErrNotFound." + <accessorDepth: 0> "because the primitive accesses newMethod's first literal, which is checked for explicitly in checkForAndFollowForwardedPrimitiveState" | lit addr index | <var: #addr declareC: 'void (*addr)()'> "Check for it being a method for primitiveDoPrimitiveWithArgs. Fetch the first literal of the method; check its an Array of length 4. Look at the function index in case it has been loaded before" ((objectMemory isOopCompiledMethod: newMethod) and: [(objectMemory literalCountOf: newMethod) > 0 and: [lit := self literal: 0 ofMethod: newMethod. (objectMemory isArray: lit) and: [(objectMemory numSlotsOf: lit) = 4 and: [index := objectMemory fetchPointer: ExternalCallLiteralTargetFunctionIndex ofObject: lit. objectMemory isIntegerObject: index]]]]) ifFalse: [^self primitiveFailFor: PrimErrBadMethod]. index := objectMemory integerValueOf: index. "Check if we have already looked up the function and failed." index < 0 ifTrue: ["Function address was not found in this session, Void the primitive function." self rewriteMethodCacheEntryForExternalPrimitiveToFunction: 0. ^self primitiveFailFor: PrimErrNotFound]. "Try to call the function directly" (index > 0 and: [index <= MaxExternalPrimitiveTableSize]) ifTrue: [addr := externalPrimitiveTable at: index - 1. addr ~= 0 ifTrue: [self rewriteMethodCacheEntryForExternalPrimitiveToFunction: (self cCode: 'addr' inSmalltalk: [1000 + index]). self callExternalPrimitive: addr. "On Spur, sets primitiveFunctionPointer" self maybeRetryPrimitiveOnFailure. ^nil]. "if we get here, then an index to the external prim was kept on the ST side although the underlying prim table was already flushed" ^self primitiveFailFor: PrimErrNamedInternal]. "Clean up session id/metadata and external primitive index" objectMemory storePointerUnchecked: ExternalCallLiteralFlagsIndex ofObject: lit withValue: ConstZero. objectMemory storePointerUnchecked: ExternalCallLiteralTargetFunctionIndex ofObject: lit withValue: ConstZero. "The function has not been loaded yet. Attempt to link it, cache it, and call it." addr := self linkExternalCall: lit errInto: (self addressOf: primFailCode put: [:v| primFailCode := v]). addr = 0 ifTrue: [self assert: (objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit) = ConstZero. ^self primitiveFailFor: (primFailCode = 0 ifTrue: [PrimErrNotFound] ifFalse: [primFailCode])]. self callExternalPrimitive: addr. self maybeRetryPrimitiveOnFailure ! Item was removed: - ----- Method: VMPluginCodeGenerator>>accessorChainsForMethod:interpreterClass: (in category 'spur primitive compilation') ----- - accessorChainsForMethod: method interpreterClass: interpreterClass - inProgressSelectors := Set new. - ^[super accessorChainsForMethod: method interpreterClass: interpreterClass] ensure: - [inProgressSelectors := nil]! Item was added: + ----- Method: VMPluginCodeGenerator>>accessorDepthForMethod:interpreterClass: (in category 'spur primitive compilation') ----- + accessorDepthForMethod: method "TMethod" interpreterClass: interpreterClass + inProgressSelectors := Set new. + ^[super accessorDepthForMethod: method interpreterClass: interpreterClass] ensure: + [inProgressSelectors := nil]!

1 0

VM Maker: VMMaker.oscog-eem.3089.mcz
by commits＠source.squeak.org 15 Oct '21

15 Oct '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3089.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3089 Author: eem Time: 14 October 2021, 5:29:32.790185 pm UUID: 977cad5a-ad86-483c-81e5-2fcd9ef9bd33 Ancestors: VMMaker.oscog-eem.3088 Spur Cogit: Fix code generation bug on primitive failure with no accessor depth when running primitives on the Smalltalk stack (FastCPrimitive). On CISCs the old code offset the stack pointer incorrectly, resulting in a hard crash soon after. Also allow compileInterpreterPrimitive to invoke compileOnStackExternalPrimitive:flags:. Run primitiveSpurStringReplace and primitiveSpurFloatArrayAt[Put] on the Smalltalk stack; the latter with 2x stack alignment. Fix a bad bug with computing accessor depths of clichés such as primitiveStringReplace: primitiveFoo objectMemory hasSpurMemoryManagerAPI ifTrue: [self primitiveFooSpur] ifFalse: [self primitiveFooV3] The old code missed the connection and computed a -1 accessor depth. Fix a slip in printOopShortInner:. Nuke the useless minValidCallAddress Slang: format the macrology for global interpreter variables, and the primitiveAccessorDepthTable, a little nicer. =============== Diff against VMMaker.oscog-eem.3088 =============== Item was changed: ----- Method: CCodeGenerator>>accessorDepthForMethod: (in category 'spur primitive compilation') ----- accessorDepthForMethod: method "Compute the depth the method traverses object structure, assuming it is a primitive. This is in support of Spur's lazy become. A primitive may fail because it may encounter a forwarder. The primitive failure code needs to know to what depth it must follow arguments to follow forwarders and, if any are found and followed, retry the primitive. This method determines that depth. It starts by collecting references to the stack and then follows these through assignments to variables and use of accessor methods such as fetchPointer:ofObject:. For example | obj field | obj := self stackTop. field := objectMemory fetchPointer: 1 ofObject: obj. self storePointer: 1 ofObject: field withValue: (self stackValue: 1) has depth 2, since field is accessed, and field is an element of obj. The information is cached since it needs to be computed *before* inlining" ^accessorDepthCache at: method smalltalkSelector ifAbsentPut: [beganInlining ifTrue: [(method export or: [vmClass notNil or: [vmClass primitiveTable includes: method smalltalkSelector]]) ifTrue: [-1] ifFalse: [self error: 'it is too late to compute accessor depths!!']] ifFalse: [((method definingClass includesSelector: method smalltalkSelector) ifTrue: [(method definingClass >> method smalltalkSelector) pragmaAt: #accessorDepth:]) ifNil: + ["Deal with the + primitiveFoo + objectMemory hasSpurMemoryManagerAPI + ifTrue: [self primitiveFooSpur] + ifFalse: [self primitiveFooV3] + cliché" + method extractSpurPrimitiveSelector ifNotNil: + [:actualSelector| | subMethod | + (subMethod := self methodNamed: actualSelector) ifNil: + [subMethod := self compileToTMethodSelector: actualSelector in: method definingClass]. + ^self accessorDepthForMethod: subMethod]. + ((self - [((self accessorChainsForMethod: method interpreterClass: (vmClass ifNil: [StackInterpreter])) inject: 0 into: [:length :chain| length max: (self accessorDepthForChain: chain)]) - 1] ifNotNil: [:pragma| pragma arguments first]]]! Item was changed: ----- Method: CCodeGenerator>>arrayInitializerCalled:for:sizeString:type: (in category 'utilities') ----- arrayInitializerCalled: varName for: array sizeString: sizeStringOrNil type: cType "array is a literal array or a CArray on some array." ^String streamContents: + [:s| | sequence lastLine index newLine atNewline | - [:s| | sequence lastLine index newLine allIntegers | sequence := array isCollection ifTrue: [array] ifFalse: [array object]. - "this is to align -ve and +ve integers nicely in the primitiveAccessorDepthTable" - allIntegers := sequence allSatisfy: [:element| element isInteger]. lastLine := index := 0. newLine := [sequence size >= 20 ifTrue: [s cr; nextPutAll: '/*'; print: index; nextPutAll: '*/'; tab] ifFalse: [s crtab: 2]. + lastLine := s position. + atNewline := true]. - lastLine := s position]. s nextPutAll: cType; space; nextPutAll: varName; nextPut: $[. sizeStringOrNil ifNotNil: [s nextPutAll: sizeStringOrNil]. s nextPutAll: '] = '. sequence isString ifTrue: [s nextPutAll: (self cLiteralFor: sequence)] ifFalse: + [| mixedSigns | + "this is to align -ve and +ve integers nicely in the primitiveAccessorDepthTable" + mixedSigns := (sequence allSatisfy: [:element| element isInteger]) + and: [(sequence anySatisfy: [:element| element < 0]) + and: [sequence anySatisfy: [:element| element > 0]]]. + s nextPut: ${. - [s nextPut: ${. newLine value. sequence do: [:element| + (mixedSigns and: [atNewline and: [element >= 0]]) ifTrue: + [s space]. + (mixedSigns - (allIntegers and: [element < 0 and: [s peekLast = Character space]]) ifTrue: [s skip: -1]. s nextPutAll: (self cLiteralFor: element). index := index + 1] separatedBy: + [atNewline := false. + s nextPut: $,. - [s nextPut: $,. ((s position - lastLine) >= 76 or: [(index \\ 20) = 0]) ifTrue: [newLine value] ifFalse: [s space]]. s crtab; nextPut: $}]]! Item was changed: ----- Method: CCodeGeneratorGlobalStructure>>emitCVariablesOn: (in category 'C code generator') ----- emitCVariablesOn: aStream "Store the global variable declarations on the given stream. Break logic into vars for structure and vars for non-structure." | structure nonstruct | structure := WriteStream on: (String new: 32768). nonstruct := WriteStream on: (String new: 32768). aStream nextPutAll: '/*** Variables ***/'; cr. structure nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; nextPutAll: '# define _iss /* define in-struct static as void */'; cr; nextPutAll: 'static struct foo {'; cr; nextPutAll: '#else'; cr; nextPutAll: '# define _iss static'; cr; nextPutAll: '#endif'; cr. (self segregateByGroupingSizeAndVisibility: self buildSortedVariablesCollection) do: [ :var | | varString inStruct target | target := (inStruct := self placeInStructure: (varString := var asString)) ifTrue: [structure] ifFalse: [nonstruct]. (self variableDeclarationStringsForVariable: varString) do: [:decl| decl first == $# ifTrue: [target nextPutAll: decl; cr] ifFalse: [self isGeneratingPluginCode ifTrue: [varString = 'interpreterProxy' ifTrue: "quite special..." [self preDeclareInterpreterProxyOn: target] ifFalse: [target nextPutAll: 'static ']] ifFalse: [(vmClass mustBeGlobal: varString) ifFalse: [target nextPutAll: (inStruct ifTrue: ['_iss '] ifFalse: ['static '])]]. target nextPutAll: decl; nextPut: $;; cr]]]. structure nextPutAll: '#undef _iss'; cr; nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; nextPutAll: ' } fum;'; cr; + nextPutAll: '# if SQ_USE_GLOBAL_STRUCT_REG';cr; + nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT /* using a global reg pointer */'; cr; + nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT /* using a global reg pointer */'; cr; + nextPutAll: '# else';cr; + nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT register struct foo * foo = &fum;'; cr; + nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT volatile register struct foo * foo = &fum;'; cr; + nextPutAll: '# endif';cr; - nextPutAll: ' #if SQ_USE_GLOBAL_STRUCT_REG';cr; - nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT /* using a global reg pointer */'; cr; - nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT /* using a global reg pointer */'; cr; - nextPutAll:'#else';cr; - nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT register struct foo * foo = &fum;'; cr; - nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT volatile register struct foo * foo = &fum;'; cr; - nextPutAll: '#endif';cr; nextPutAll: '# define GIV(interpreterInstVar) (foo->interpreterInstVar)'; cr; nextPutAll: '#else'; cr; nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT /* oh, no mr bill!! */'; cr; nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT /* oh no, mr bill!! */'; cr; nextPutAll: '# define GIV(interpreterInstVar) interpreterInstVar'; cr; nextPutAll: '#endif'; cr. "if the machine needs the fum structure defining locally, do it now; global register users don't need that, but DO need some batshit insane C macro fudging in order to convert the define of USE_GLOBAL_STRUCT_REG into a simple string to use in the asm clause below. Sigh." structure nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; + nextPutAll: '# if SQ_USE_GLOBAL_STRUCT_REG';cr; + nextPutAll: '# define fooxstr(s) foostr(s)'; cr; + nextPutAll: '# define foostr(s) #s'; cr; - nextPutAll: '#if SQ_USE_GLOBAL_STRUCT_REG';cr; - nextPutAll: '#define fooxstr(s) foostr(s)'; cr; - nextPutAll: '#define foostr(s) #s'; cr; nextPutAll: 'register struct foo * foo asm(fooxstr(USE_GLOBAL_STRUCT_REG));'; cr; + nextPutAll: '# else'; cr; - nextPutAll: '#else'; cr; nextPutAll: 'static struct foo * foo = &fum;'; cr; + nextPutAll: '# endif'; cr; - nextPutAll: '#endif'; cr; nextPutAll: '#endif'; cr. aStream nextPutAll: structure contents; nextPutAll: nonstruct contents; cr! Item was changed: ----- Method: CoInterpreter>>primitivePropertyFlagsForSpur: (in category 'cog jit support') ----- primitivePropertyFlagsForSpur: primIndex <inline: true> "Answer any special requirements of the given primitive. Spur always needs to set primitiveFunctionPointer and newMethod so primitives can retry on failure due to forwarders." | baseFlags | + self cCode: [] inSmalltalk: [#( primitiveObjectAtPut primitiveCopyObject primitiveSpurStringReplace + primitiveSpurFloatArrayAt primitiveSpurFloatArrayAtPut + primitiveExternalCall primitiveCalloutToFFI)]. "For senders..." - self cCode: [] inSmalltalk: [#(primitiveObjectAtPut primitiveExternalCall primitiveCalloutToFFI)]. "For senders..." baseFlags := profileSemaphore = objectMemory nilObject ifTrue: [0] ifFalse: [PrimCallCollectsProfileSamples]. + (primIndex = PrimNumberObjectAtPut + or: [primIndex = PrimNumberCopyObject + or: [primIndex = PrimNumberStringReplace]]) ifTrue: - or: [primIndex = PrimNumberCopyObject]) ifTrue: [^baseFlags + PrimCallOnSmalltalkStack]. + (primIndex = PrimNumberFloatArrayAt + or: [primIndex = PrimNumberFloatArrayAtPut]) ifTrue: + [^baseFlags + PrimCallOnSmalltalkStack + PrimCallOnSmalltalkStackAlign2x]. + baseFlags := baseFlags + PrimCallNeedsPrimitiveFunction + PrimCallNeedsNewMethod. (self isCalloutPrimitiveIndex: primIndex) ifTrue: "For callbacks & module unloading" [^baseFlags + PrimCallMayEndureCodeCompaction + PrimCallIsExternalCall]. (self isCodeCompactingPrimitiveIndex: primIndex) ifTrue: "For code reclamations" [^baseFlags bitOr: PrimCallMayEndureCodeCompaction]. ^baseFlags! Item was changed: ----- Method: CogARMCompiler>>rewriteTransferAt:target: (in category 'inline cacheing') ----- rewriteTransferAt: callSiteReturnAddress target: callTargetAddress "Rewrite a call/jump instruction to call a different target. This variant is used to link PICs in ceSendMiss et al, and to rewrite call/jumps in CPICs. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | callDistance instr | "for debug - [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." - (cogit initialized and: [callTargetAddress < cogit minCallAddress]) ifTrue: - [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - (callSiteReturnAddress + 8 "pc offset"- 4 "return offset")) signedIntToLong. self assert: (self isInImmediateJumpRange: callDistance). "we don't support long call updates, yet" instr := self instructionBeforeAddress: callSiteReturnAddress. self assert: ((self instructionIsB: instr) or: [self instructionIsBL: instr]). objectMemory longAt: (self instructionAddressBefore: callSiteReturnAddress) put: ((instr bitAnd: 16rFF000000) bitOr: (callDistance // 4 bitAnd: 16rFFFFFF)). self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) = callTargetAddress. ^4! Item was changed: ----- Method: CogARMv8Compiler>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress "Rewrite an inline cache to call a different target for a new tag. This variant is used to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code change which is used to compute the range of the icache to flush. N.B. On 64-bit platforms the inline cache tag is only 32-bits wide, hence this code is very similar to that for ARM32 CogOutOfLineLiteralsARMCompiler." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | call callDistance | - (cogit initialized and: [callTargetAddress < cogit minCallAddress]) ifTrue: - [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - (callSiteReturnAddress - 4 "return offset")) signedIntToLong. self assert: (self isInImmediateJumpRange: callDistance). "we don't support long call updates here" call := self bl: callDistance. cogit codeLong32At: (self instructionAddressBefore: callSiteReturnAddress) put: call; codeLong32At: (self pcRelativeAddressAt: callSiteReturnAddress - 8) put: cacheTag signedIntToLong. self assert: (self inlineCacheTagAt: callSiteReturnAddress) signedIntFromLong = cacheTag. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 8 to: (self pcRelativeAddressAt: callSiteReturnAddress - 8)]." ^4! Item was changed: ----- Method: CogIA32Compiler>>rewriteCallAt:target: (in category 'inline cacheing') ----- rewriteCallAt: callSiteReturnAddress target: callTargetAddress "Rewrite a call instruction to call a different target. This variant is used to link PICs in ceSendMiss et al, and to rewrite cached primitive calls. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | callDistance | "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." - (cogit initialized and: [callTargetAddress < cogit minCallAddress]) ifTrue: - [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - callSiteReturnAddress) signedIntToLong. objectMemory byteAt: callSiteReturnAddress - 1 put: (callDistance >> 24 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 2 put: (callDistance >> 16 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 3 put: (callDistance >> 8 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 4 put: (callDistance bitAnd: 16rFF). self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) = callTargetAddress. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." ^5! Item was changed: ----- Method: CogIA32Compiler>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress "Rewrite an inline cache to call a different target for a new tag. This variant is used to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | callDistance | "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." - (cogit initialized and: [callTargetAddress < cogit minCallAddress]) ifTrue: - [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - callSiteReturnAddress) signedIntToLong. objectMemory byteAt: callSiteReturnAddress - 1 put: (callDistance >> 24 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 2 put: (callDistance >> 16 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 3 put: (callDistance >> 8 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 4 put: (callDistance bitAnd: 16rFF); byteAt: callSiteReturnAddress - 6 put: (cacheTag >> 24 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 7 put: (cacheTag >> 16 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 8 put: (cacheTag >> 8 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 9 put: (cacheTag bitAnd: 16rFF). self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) = callTargetAddress. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." ^10! Item was changed: ----- Method: CogInLineLiteralsARMCompiler>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress "Rewrite an inline cache to call a different target for a new tag. This variant is used to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | call callDistance | - (cogit initialized and: [callTargetAddress < cogit minCallAddress]) ifTrue: - [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - (callSiteReturnAddress + 8 "pc offset"- 4 "return offset")) signedIntToLong. self assert: (self isInImmediateJumpRange: callDistance). "we don't support long call updates here" call := self bl: callDistance. objectMemory longAt: (self instructionAddressBefore: callSiteReturnAddress ) put: call. self insert32BitOperand: cacheTag into4InstructionsPreceding: (self instructionAddressBefore: callSiteReturnAddress ). self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) = callTargetAddress. self assert: (self extract32BitOperandFrom4InstructionsPreceding: (self instructionAddressBefore: callSiteReturnAddress )) = cacheTag. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 20 to: callSiteReturnAddress - 1]." ^20! Item was changed: ----- Method: CogOutOfLineLiteralsARMCompiler>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress "Rewrite an inline cache to call a different target for a new tag. This variant is used to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | call callDistance | - (cogit initialized and: [callTargetAddress < cogit minCallAddress]) ifTrue: - [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - (callSiteReturnAddress + 8 "pc offset"- 4 "return offset")) signedIntToLong. self assert: (self isInImmediateJumpRange: callDistance). "we don't support long call updates here" call := self bl: callDistance. objectMemory longAt: (self instructionAddressBefore: callSiteReturnAddress ) put: call; longAt: (self pcRelativeAddressAt: callSiteReturnAddress - 8) put: cacheTag. self assert: (self inlineCacheTagAt: callSiteReturnAddress) = cacheTag. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 8 to: (self pcRelativeAddressAt: callSiteReturnAddress - 8)]." ^4! Item was changed: ----- Method: CogX64Compiler>>rewriteCallAt:target: (in category 'inline cacheing') ----- rewriteCallAt: callSiteReturnAddress target: callTargetAddress "Rewrite a call instruction to call a different target. This variant is used to link PICs in ceSendMiss et al, and to rewrite cached primitive calls. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | callDistance | "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." - (cogit initialized and: [callTargetAddress < cogit minCallAddress]) ifTrue: - [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - callSiteReturnAddress) signedIntToLong. objectMemory byteAt: callSiteReturnAddress - 1 put: (callDistance >> 24 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 2 put: (callDistance >> 16 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 3 put: (callDistance >> 8 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 4 put: (callDistance bitAnd: 16rFF). self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) = callTargetAddress. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." ^5! Item was changed: ----- Method: CogX64Compiler>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress "Rewrite an inline cache to call a different target for a new tag. This variant is used to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code change which is used to compute the range of the icache to flush. N.B. On 64-bit platforms the inline cache tag is only 32-bits wide, hence this code is identical to that for the IA32." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | callDistance | "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 12 to: callSiteReturnAddress - 1]." - (cogit initialized and: [callTargetAddress < cogit minCallAddress]) ifTrue: - [self error: 'linking callsite to invalid address']. callDistance := (callTargetAddress - callSiteReturnAddress) signedIntToLong. objectMemory byteAt: callSiteReturnAddress - 1 put: (callDistance >> 24 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 2 put: (callDistance >> 16 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 3 put: (callDistance >> 8 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 4 put: (callDistance bitAnd: 16rFF); byteAt: callSiteReturnAddress - 6 put: (cacheTag >> 24 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 7 put: (cacheTag >> 16 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 8 put: (cacheTag >> 8 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 9 put: (cacheTag bitAnd: 16rFF). self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) = callTargetAddress. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 12 to: callSiteReturnAddress - 1]." ^12! Item was changed: CogClass subclass: #Cogit (excessive size, no diff calculated) Item was changed: ----- Method: Cogit>>initializeCodeZoneFrom:upTo: (in category 'initialization') ----- initializeCodeZoneFrom: startAddress upTo: endAddress <api> self initializeBackend. self sqMakeMemoryExecutableFrom: startAddress To: endAddress CodeToDataDelta: (self cppIf: #DUAL_MAPPED_CODE_ZONE ifTrue: [self addressOf: codeToDataDelta put: [:v| codeToDataDelta := v]] ifFalse: [nil]). codeBase := methodZoneBase := startAddress. backEnd stopsFrom: startAddress to: endAddress - 1. self cCode: '' inSmalltalk: [self initializeProcessor. backEnd stopsFrom: 0 to: guardPageSize - 1. backEnd has64BitPerformanceCounter ifTrue: [self initializeSimulationIOHighResClockForProfiling]]. - minValidCallAddress := (codeBase min: coInterpreter interpretAddress) - min: coInterpreter primitiveFailAddress. methodZone manageFrom: methodZoneBase to: endAddress. self assertValidDualZone. backEnd detectFeatures. self maybeGenerateCacheFlush. self generateVMOwnerLockFunctions. self genGetLeafCallStackPointers. self generateStackPointerCapture. self generateTrampolines. self computeEntryOffsets. self computeFullBlockEntryOffsets. self generateClosedPICPrototype. self alignMethodZoneBase. "None of the above is executed beyond ceCheckFeatures, so a bulk flush now is the leanest thing to do." backEnd flushICacheFrom: startAddress to: methodZoneBase asUnsignedInteger. self maybeFlushWritableZoneFrom: startAddress to: methodZoneBase asUnsignedInteger. "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. This is done only to compute openPICSize; the generated code is discarded." self generateOpenPICPrototype! Item was removed: - ----- Method: Cogit>>minCallAddress (in category 'accessing') ----- - minCallAddress - <cmacro: '() minValidCallAddress'> - ^minValidCallAddress! Item was changed: ----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive (in category 'primitive generators') ----- compileInterpreterPrimitive <inline: true> | primitiveRoutine flags | <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> primitiveRoutine := coInterpreter functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex primitivePropertyFlagsInto: (self addressOf: flags put: [:val| flags := val]). + (objectRepresentation hasSpurMemoryManagerAPI + and: [flags anyMask: PrimCallOnSmalltalkStack]) ifTrue: + [^self compileOnStackExternalPrimitive: primitiveRoutine flags: flags]. - self deny: (flags anyMask: PrimCallOnSmalltalkStack). ^self compileInterpreterPrimitive: primitiveRoutine flags: flags! Item was changed: ----- Method: SimpleStackBasedCogit>>compileOnStackExternalPrimitive:flags: (in category 'primitive generators') ----- compileOnStackExternalPrimitive: primitiveRoutine flags: flags "Compile a fast call of a C primitive using the current stack page, avoiding the stack switch except on failure. This convention still uses stackPointer and argumentCount to access operands. Push all operands to the stack, assign stackPointer, argumentCount, and zero primFailCode. Make the call (saving a LinkReg if required). Test for failure and return. On failure on Spur, if there is an accessor depth, assign framePointer and newMethod, do the stack switch, call checkForAndFollowForwardedPrimitiveState, and loop back if forwarders are found. Fall through to frame build." <option: #SpurObjectMemory> <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> + | calleeSavedRegisterMask linkRegSaveRegister spRegSaveRegister jmpFail retry continueAfterProfileSample jumpToTakeSample | - | calleeSavedRegisterMask linkRegSaveRegister spRegSaveRegister jmp retry continueAfterProfileSample jumpToTakeSample | self assert: (objectRepresentation hasSpurMemoryManagerAPI and: [flags anyMask: PrimCallOnSmalltalkStack]). self deny: (backEnd hasVarBaseRegister and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). (coInterpreter recordFastCCallPrimTraceForMethod: methodObj) ifTrue: [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self AddCq: methodOrBlockNumArgs R: TempReg]. "As small or smaller than move on most archs" self MoveR: TempReg Aw: coInterpreter argumentCountAddress. self genExternalizeStackPointerForFastPrimitiveCall. "We may need to save LinkReg and/or SPReg, and given the stack machinations it is much easier to save them in callee saved registers than on the stack itself." calleeSavedRegisterMask := ABICalleeSavedRegisterMask bitClear: (self registerMaskFor: ClassReg). backEnd hasLinkRegister ifTrue: [linkRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. self deny: linkRegSaveRegister = NoReg. self MoveR: LinkReg R: linkRegSaveRegister. calleeSavedRegisterMask := calleeSavedRegisterMask bitClear: (self registerMaskFor: linkRegSaveRegister)]. spRegSaveRegister := NoReg. (SPReg ~= NativeSPReg and: [(self isCalleeSavedReg: SPReg) not]) ifTrue: [spRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. self deny: spRegSaveRegister = NoReg. self MoveR: SPReg R: spRegSaveRegister]. retry := self Label. (flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [self AndCq: (objectMemory wordSize * 2 - 1) bitInvert R: SPReg R: NativeSPReg] ifFalse: [SPReg ~= NativeSPReg ifTrue: [backEnd genLoadNativeSPRegWithAlignedSPReg]]. backEnd genMarshallNArgs: 0 arg: 0 arg: 0 arg: 0 arg: 0. self CallFullRT: primitiveRoutine asInteger. backEnd genRemoveNArgsFromStack: 0. + "test primFailCode and jump to failure sequence if non-zero" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. spRegSaveRegister ~= NoReg ifTrue: [self MoveR: spRegSaveRegister R: SPReg]. self CmpCq: 0 R: TempReg. + jmpFail := self JumpNonZero: 0. - jmp := self JumpNonZero: 0. "Remember to restore the native stack pointer to point to the C stack, otherwise the Smalltalk frames will get overwritten on an interrupt." SPReg ~= NativeSPReg ifTrue: [backEnd genLoadCStackPointer]. "placing the test here attributes the tick to the primitive plus any checkForAndFollowForwardedPrimitiveState scanning, but attributes all of a failing primitive to the current method (in ceStackOverflow: on frame build)." (backEnd has64BitPerformanceCounter and: [flags anyMask: PrimCallCollectsProfileSamples]) ifTrue: [jumpToTakeSample := self genCheckForProfileTimerTick: (self registerMaskFor: NoReg)]. "At this point the primitive has cut back stackPointer to point to the result." continueAfterProfileSample := self MoveAw: coInterpreter stackPointerAddress R: TempReg. "get result and restore retpc" backEnd hasLinkRegister ifTrue: [self MoveMw: 0 r: TempReg R: ReceiverResultReg; AddCq: objectMemory wordSize R: TempReg R: SPReg; MoveR: linkRegSaveRegister R: LinkReg] ifFalse: [| retpcOffset | "The original retpc is (argumentCount + 1) words below stackPointer." retpcOffset := (methodOrBlockNumArgs + 1 * objectMemory wordSize) negated. self MoveMw: retpcOffset r: TempReg R: ClassReg; "get retpc" MoveR: TempReg R: SPReg; MoveMw: 0 r: TempReg R: ReceiverResultReg; MoveR: ClassReg Mw: 0 r: TempReg "put it back on stack for the return..."]. self RetN: 0. (backEnd has64BitPerformanceCounter and: [flags anyMask: PrimCallCollectsProfileSamples]) ifTrue: [jumpToTakeSample jmpTarget: self Label. self genTakeProfileSample. self Jump: continueAfterProfileSample]. + "primitive failure. if there is an accessor depth, scan and retry on failure (but what if faling for out of memory?)" + jmpFail jmpTarget: self Label. - jmp jmpTarget: self Label. (coInterpreter accessorDepthForPrimitiveMethod: methodObj) >= 0 ifTrue: [| skip | "Given that following primitive state to the accessor depth is recursive, we're asking for trouble if we run the fixup on the Smalltalk stack page. Run it on the full C stack instead. This won't be a performance issue since primitive failure should be very rare." self MoveR: FPReg Aw: coInterpreter framePointerAddress. self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self genLoadCStackPointersForPrimCall. backEnd genMarshallNArgs: 0 arg: 0 arg: 0 arg: 0 arg: 0. self CallFullRT: (self cCode: [#checkForAndFollowForwardedPrimitiveState asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #checkForAndFollowForwardedPrimitiveState]). backEnd genLoadStackPointersForPrimCall: ClassReg. self CmpCq: 0 R: ABIResultReg. skip := self JumpZero: 0. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. self Jump: retry. skip jmpTarget: self Label] ifFalse: "must reload SPReg to undo any alignment change," [(flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: + [backEnd hasLinkRegister + ifTrue: + [self MoveAw: coInterpreter stackPointerAddress R: SPReg] + ifFalse: "remember to include return address; use scratch to avoid an interrupt overwriting retpc" + [self MoveAw: coInterpreter stackPointerAddress R: TempReg. + self SubCq: objectRepresentation wordSize R: TempReg. + self MoveR: TempReg R: SPReg]]]. - [backEnd genLoadStackPointersForPrimCall: ClassReg]]. "Remember to restore the native stack pointer to point to the C stack, otherwise the Smalltalk frames will get overwritten on an interrupt." SPReg ~= NativeSPReg ifTrue: [backEnd genLoadCStackPointer]. "The LinkRegister now contains the return address either of the primitive call or of checkForAndFollowForwardedPrimitiveState. It must be restored to the return address of the send invoking this primtiive method." backEnd hasLinkRegister ifTrue: [self MoveR: linkRegSaveRegister R: LinkReg]. "Finally remember to reload ReceiverResultReg if required. Even if arguments have been pushed, the prolog sequence assumes it is live." (self register: ReceiverResultReg isInMask: ABICallerSavedRegisterMask) ifTrue: [self MoveMw: (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) * objectMemory wordSize r: SPReg R: ReceiverResultReg]. "continue to frame build..." ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>compilePrimitive (in category 'primitive generators') ----- compilePrimitive "Compile a primitive. If possible, performance-critical primitives will be generated by their own routines (primitiveGenerator). Otherwise, if there is a primitive at all, we call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <inline: false> | primitiveDescriptor primitiveRoutine flags | <var: #primitiveDescriptor type: #'PrimitiveDescriptor *'> <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> primitiveIndex = 0 ifTrue: [^0]. "If a descriptor specifies an argument count (by numArgs >= 0) then it must match for the generated code to be correct. For example for speed many primitives use ResultReceiverReg instead of accessing the stack, so the receiver better be at numArgs down the stack. Use the interpreter version if not." ((primitiveDescriptor := self primitiveGeneratorOrNil) notNil and: [primitiveDescriptor primitiveGenerator notNil and: [(primitiveDescriptor primNumArgs < 0 "means generator doesn't care" or: [primitiveDescriptor primNumArgs = (coInterpreter argumentCountOf: methodObj)])]]) ifTrue: [| opcodeIndexAtPrimitive code | "Note opcodeIndex so that any arg load instructions for unimplemented primitives can be discarded." opcodeIndexAtPrimitive := opcodeIndex. code := objectRepresentation perform: primitiveDescriptor primitiveGenerator. (code < 0 and: [code ~= UnimplementedPrimitive]) ifTrue: "Generator failed, so no point continuing..." [^code]. "If the primitive can never fail then there is nothing more that needs to be done." code = UnfailingPrimitive ifTrue: [^0]. "If the machine code version handles all cases the only reason to call the interpreter primitive is to reap the primitive error code. Don't bother if it isn't used." (code = CompletePrimitive and: [(self methodUsesPrimitiveErrorCode: methodObj header: methodHeader) not]) ifTrue: [^0]. "Discard any arg load code generated by the primitive generator." code = UnimplementedPrimitive ifTrue: [opcodeIndex := opcodeIndexAtPrimitive]]. primitiveRoutine := coInterpreter functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex primitivePropertyFlagsInto: (self addressOf: flags put: [:val| flags := val]). (flags anyMask: PrimCallDoNotJIT) ifTrue: [^ShouldNotJIT]. (primitiveRoutine = 0 "no primitive" or: [primitiveRoutine = (self cCoerceSimple: #primitiveFail to: 'void (*)(void)')]) ifTrue: [^self genFastPrimFail]. (objectRepresentation hasSpurMemoryManagerAPI and: [flags anyMask: PrimCallOnSmalltalkStack]) ifTrue: [^self compileOnStackExternalPrimitive: primitiveRoutine flags: flags]. - minValidCallAddress := minValidCallAddress min: primitiveRoutine asUnsignedInteger. ^self compileInterpreterPrimitive: primitiveRoutine flags: flags! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter>>printOopShortInner: (in category 'debug printing') ----- printOopShortInner: oop | classOop name nameLen | <var: #name type: #'char *'> <inline: false> (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: [^'$%c(%x)' f: transcript printf: { objectMemory characterValueOf: oop. objectMemory characterValueOf: oop }]. (objectMemory isIntegerObject: oop) ifTrue: [^'%ld(16r%lx)' f: transcript printf: { objectMemory integerValueOf: oop. objectMemory integerValueOf: oop }]. (objectMemory isImmediateFloat: oop) ifTrue: + [^'%g(16r%lx)' f: transcript printf: {objectMemory dbgFloatValueOf: oop. oop}]. - ['%g(16r%lx)' f: transcript printf: {objectMemory dbgFloatValueOf: oop. oop}]. ^'unknown immediate 16r%lx' f: transcript printf: oop]. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop])]. (objectMemory isFreeObject: oop) ifTrue: [^self print: ' is a free chunk']. (objectMemory isForwarded: oop) ifTrue: [| target | target := objectMemory followForwarded: oop. ^' is a forwarder to 16r%lx' f: transcript printf: target]. (self isFloatObject: oop) ifTrue: [^self printFloat: (objectMemory dbgFloatValueOf: oop)]. classOop := objectMemory fetchClassOfNonImm: oop. (objectMemory addressCouldBeObj: classOop) ifFalse: [^self print: 'a ??']. (objectMemory numSlotsOf: classOop) = metaclassNumSlots ifTrue: [^self printNameOfClass: oop count: 5]. oop = objectMemory nilObject ifTrue: [^self print: 'nil']. oop = objectMemory trueObject ifTrue: [^self print: 'true']. oop = objectMemory falseObject ifTrue: [^self print: 'false']. nameLen := self lengthOfNameOfClass: classOop. nameLen = 0 ifTrue: [^self print: 'a ??']. name := self nameOfClass: classOop. nameLen = 10 ifTrue: [(self strncmp: name _: 'ByteString' _: 10) = 0 "strncmp is weird" ifTrue: [^self printChar: $'; printStringOf: oop; printChar: $']. (self strncmp: name _: 'ByteSymbol' _: 10) = 0 "strncmp is weird" ifTrue: [self printChar: $#; printStringOf: oop. ^self]]. (nameLen = 9 and: [(self strncmp: name _: 'Character' _: 9) = 0]) ifTrue: [^self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))]. 'a(n) %.*s' f: transcript printf: { nameLen. name }. "Try to spot association-like things; they're all subclasses of LookupKey" ((objectMemory isPointersNonImm: oop) and: [(objectMemory instanceSizeOf: classOop) = (ValueIndex + 1) and: [(objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop))]]) ifTrue: [| classLookupKey | classLookupKey := objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation). [classLookupKey = objectMemory nilObject ifTrue: [^self]. (objectMemory instanceSizeOf: classLookupKey) = (KeyIndex + 1)] whileFalse: [classLookupKey := self superclassOf: classLookupKey]. (self includesBehavior: classOop ThatOf: classLookupKey) ifTrue: [self space; printOopShortInner: (objectMemory fetchPointer: KeyIndex ofObject: oop); print: ' -> '; printHexnp: (objectMemory fetchPointer: ValueIndex ofObject: oop)]]! Item was added: + ----- Method: TMethod>>extractSpurPrimitiveSelector (in category 'primitive compilation') ----- + extractSpurPrimitiveSelector + "If the receiver is a cliché of the form + primitiveFoo + objectMemory hasSpurMemoryManagerAPI + ifTrue: [self primitiveFooSpur] + ifFalse: [self primitiveFooV3] + then answer the Spur primitive selector, otherwise answer nil." + "self sn browseAllSelect: + [:m| + (m selector beginsWith: #primitive) + and: [(m sendsSelector: #hasSpurMemoryManagerAPI) + and: [(m asTranslationMethodOfClass: TMethod) extractSpurPrimitiveSelector notNil]]]" + | firstStmt | + ((firstStmt := parseTree statements first) isSend + and: [firstStmt receiver isSend + and: [firstStmt receiver selector == #hasSpurMemoryManagerAPI + and: [firstStmt numArgs = 2]]]) ifFalse: + [^nil]. + firstStmt args + with: firstStmt selector keywords + do: [:block :kwd| | send | + (kwd = #ifTrue: + and: [block isStmtList + and: [block statements size = 1 + and: [(send := block statements first) isSend + and: [send numArgs = 0 and: [send selector beginsWith: #primitive]]]]]) ifTrue: + [^send selector]]. + ^nil! Item was changed: SharedPool subclass: #VMBytecodeConstants instanceVariableNames: '' + classVariableNames: 'BytecodeSetHasDirectedSuperSend CtxtTempFrameStart LargeContextBit LargeContextSize LargeContextSlots NewsqueakV4BytecodeSet PrimNumberDoExternalCall PrimNumberDoPrimitive PrimNumberExternalCall PrimNumberFFICall PrimNumberFloatArrayAt PrimNumberFloatArrayAtPut PrimNumberFlushExternalPrimitives PrimNumberInstVarAt PrimNumberShallowCopy PrimNumberSlotAt PrimNumberStringReplace PrimNumberUnloadModule SistaV1BytecodeSet SmallContextSize SmallContextSlots SqueakV3PlusClosuresBytecodeSet' - classVariableNames: 'BytecodeSetHasDirectedSuperSend CtxtTempFrameStart LargeContextBit LargeContextSize LargeContextSlots NewsqueakV4BytecodeSet PrimNumberDoExternalCall PrimNumberDoPrimitive PrimNumberExternalCall PrimNumberFFICall PrimNumberFlushExternalPrimitives PrimNumberInstVarAt PrimNumberShallowCopy PrimNumberSlotAt PrimNumberUnloadModule SistaV1BytecodeSet SmallContextSize SmallContextSlots SqueakV3PlusClosuresBytecodeSet' poolDictionaries: 'VMBasicConstants' category: 'VMMaker-Interpreter'! !VMBytecodeConstants commentStamp: '<historical>' prior: 0! self ensureClassPool. #(CtxtTempFrameStart LargeContextBit LargeContextSize SmallContextSize) do: [:k| self classPool declare: k from: ObjectMemory classPool]!

1 0

[OpenSmalltalk/opensmalltalk-vm] 9852ca: Remove Terf AEC code committed by mistake. [ci skip]
by Eliot Miranda 14 Oct '21

14 Oct '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 9852caf7d43318c7d088ebe3916e09112ca88ac2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9852caf7d43318c7d0… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2021-10-14 (Thu, 14 Oct 2021) Changed paths: M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m Log Message: ----------- Remove Terf AEC code committed by mistake. [ci skip]

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2021