Vm-dev September 2016

vm-dev@lists.squeakfoundation.org

30 participants
102 discussions

VM Maker: VMMaker.oscog-cb.1934.mcz
by commits＠source.squeak.org 05 Sep '16

05 Sep '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1934.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1934 Author: cb Time: 5 September 2016, 10:45:14.790485 am UUID: efe94566-a80f-410f-9032-ca403fc2ce05 Ancestors: VMMaker.oscog-nice.1933 Re-enabled full block compilation to machine code. Fixes related to bc to mc pc mapping in full block Made stack check assert more robust. Added convenience to simulate Pharo images. =============== Diff against VMMaker.oscog-nice.1933 =============== Item was added: + ----- Method: CArrayAccessor>>at:ifAbsent: (in category 'accessing') ----- + at: index ifAbsent: aBlock + "This is a simulation-time-only convenience..." + ^object at: index + offset + 1 ifAbsent: aBlock! Item was changed: ----- Method: CogVMSimulator>>maybeCheckStackDepth:sp:pc: (in category 'debug support') ----- maybeCheckStackDepth: delta sp: sp pc: mcpc | asp bcpc startbcpc cogHomeMethod cogBlockMethod csp debugStackPointers | debugStackDepthDictionary ifNil: [^self]. (self isMachineCodeFrame: framePointer) ifFalse: [^self]. cogBlockMethod := self mframeCogMethod: framePointer. cogHomeMethod := self asCogHomeMethod: cogBlockMethod. debugStackPointers := debugStackDepthDictionary at: cogHomeMethod methodObject ifAbsentPut: [self debugStackPointersFor: cogHomeMethod methodObject]. startbcpc := cogHomeMethod = cogBlockMethod ifTrue: [self startPCOfMethod: cogHomeMethod methodObject] ifFalse: [self startPCOfClosure: (self pushedReceiverOrClosureOfFrame: framePointer)]. bcpc := cogit bytecodePCFor: mcpc startBcpc: startbcpc in: cogBlockMethod. self assert: bcpc ~= 0. cogBlockMethod ~= cogHomeMethod ifTrue: [| lastbcpc | lastbcpc := cogit lastBytecodePCForBlockAt: startbcpc in: cogHomeMethod methodObject. bcpc > lastbcpc ifTrue: [bcpc := lastbcpc]]. asp := self stackPointerIndexForFrame: framePointer WithSP: sp + objectMemory wordSize. + csp := debugStackPointers at: bcpc ifAbsent: [-1]. - csp := debugStackPointers at: bcpc. "Compensate lazily for absent receiver sends." (NewspeakVM and: [asp - delta = csp and: [cogit isAbsentReceiverSendAt: mcpc in: cogHomeMethod]]) ifTrue: [csp := debugStackPointers at: bcpc put: csp + 1]. self assert: asp - delta + 1 = csp! Item was changed: ----- Method: Cogit>>compileEntireFullBlockMethod: (in category 'compile abstract instructions') ----- compileEntireFullBlockMethod: numCopied "Compile the abstract instructions for the entire full block method." <option: #SistaV1BytecodeSet> | result | self preenMethodLabel. self compileFullBlockEntry. "Frame build" self compileFullBlockMethodFrameBuild: numCopied. "Method body" (result := self compileMethodBody) < 0 ifTrue: [^result]. self assert: blockCount = 0. + ^0! - ^-1! Item was changed: ----- Method: Cogit>>mapFor:bcpc:performUntil:arg: (in category 'method map') ----- mapFor: cogMethod bcpc: startbcpc performUntil: functionSymbol arg: arg "Machine-code <-> bytecode pc mapping support. Evaluate functionSymbol for each mcpc, bcpc pair in the map until the function returns non-zero, answering that result, or 0 if it fails to. To cut down on number of arguments. and to be usable for both pc-mapping and method introspection, we encode the annotation and the isBackwardBranch flag in the same parameter. Guilty as charged." <var: #cogMethod type: #'CogBlockMethod *'> <var: #functionSymbol declareC: 'sqInt (*functionSymbol)(BytecodeDescriptor *desc, sqInt annotationAndIsBackwardBranch, char *mcpc, sqInt bcpc, void *arg)'> <var: #arg type: #'void *'> <inline: true> | isInBlock mcpc bcpc endbcpc map mapByte homeMethod aMethodObj result latestContinuation byte descriptor bsOffset nExts annotation | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #homeMethod type: #'CogMethod *'> self assert: cogMethod stackCheckOffset > 0. mcpc := cogMethod asUnsignedInteger + cogMethod stackCheckOffset. "The stack check maps to the start of the first bytecode, the first bytecode being effectively after frame build." result := self perform: functionSymbol with: nil with: 0 + (HasBytecodePC << 1) with: (self cCoerceSimple: mcpc to: #'char *') with: startbcpc with: arg. result ~= 0 ifTrue: [^result]. bcpc := startbcpc. "In both CMMethod and CMBlock cases find the start of the map and skip forward to the bytecode pc map entry for the stack check." cogMethod cmType = CMMethod ifTrue: + [isInBlock := cogMethod cmIsFullBlock. - [isInBlock := false. homeMethod := self cCoerceSimple: cogMethod to: #'CogMethod *'. self assert: startbcpc = (coInterpreter startPCOfMethodHeader: homeMethod methodHeader). map := self mapStartFor: homeMethod. annotation := (objectMemory byteAt: map) >> AnnotationShift. self assert: (annotation = IsAbsPCReference or: [annotation = IsObjectReference or: [annotation = IsRelativeCall or: [annotation = IsDisplacementX2N]]]). latestContinuation := startbcpc. aMethodObj := homeMethod methodObject. endbcpc := (objectMemory numBytesOf: aMethodObj) - 1. bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. "If the method has a primitive, skip it and the error code store, if any; Logically. these come before the stack check and so must be ignored." bcpc := bcpc + (self deltaToSkipPrimAndErrorStoreIn: aMethodObj header: homeMethod methodHeader)] ifFalse: [isInBlock := true. self assert: bcpc = cogMethod startpc. homeMethod := cogMethod cmHomeMethod. map := self findMapLocationForMcpc: cogMethod asUnsignedInteger + (self sizeof: CogBlockMethod) inMethod: homeMethod. self assert: map ~= 0. annotation := (objectMemory byteAt: map) >> AnnotationShift. self assert: (annotation >> AnnotationShift = HasBytecodePC "fiducial" or: [annotation >> AnnotationShift = IsDisplacementX2N]). [(annotation := (objectMemory byteAt: map) >> AnnotationShift) ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. "skip fiducial; i.e. the map entry for the pc immediately following the method header." aMethodObj := homeMethod methodObject. bcpc := startbcpc - (self blockCreationBytecodeSizeForHeader: homeMethod methodHeader). bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. endbcpc := self nextBytecodePCFor: descriptor at: bcpc exts: -1 in: aMethodObj. bcpc := startbcpc]. nExts := 0. self inlineCacheTagsAreIndexes ifTrue: [enumeratingCogMethod := homeMethod]. "Now skip up through the bytecode pc map entry for the stack check." [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. [(mapByte := objectMemory byteAt: map) ~= MapEnd] whileTrue: "defensive; we exit on bcpc" [mapByte >= FirstAnnotation ifTrue: [| nextBcpc isBackwardBranch | annotation := mapByte >> AnnotationShift. mcpc := mcpc + ((mapByte bitAnd: DisplacementMask) * backEnd codeGranularity). (self isPCMappedAnnotation: annotation) ifTrue: [(annotation = IsSendCall and: [(mapByte := objectMemory byteAt: map - 1) >> AnnotationShift = IsAnnotationExtension]) ifTrue: [annotation := annotation + (mapByte bitAnd: DisplacementMask). map := map - 1]. [byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. isInBlock ifTrue: [bcpc >= endbcpc ifTrue: [^0]] ifFalse: [(descriptor isReturn and: [bcpc >= latestContinuation]) ifTrue: [^0]. (descriptor isBranch or: [descriptor isBlockCreation]) ifTrue: [| targetPC | targetPC := self latestContinuationPCFor: descriptor at: bcpc exts: nExts in: aMethodObj. latestContinuation := latestContinuation max: targetPC]]. nextBcpc := self nextBytecodePCFor: descriptor at: bcpc exts: nExts in: aMethodObj. descriptor isMapped or: [isInBlock and: [descriptor isMappedInBlock]]] whileFalse: [bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. isBackwardBranch := descriptor isBranch and: [self isBackwardBranch: descriptor at: bcpc exts: nExts in: aMethodObj]. result := self perform: functionSymbol with: descriptor with: (isBackwardBranch ifTrue: [annotation << 1 + 1] ifFalse: [annotation << 1]) with: (self cCoerceSimple: mcpc to: #'char *') with: bcpc with: arg. result ~= 0 ifTrue: [^result]. bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]] ifFalse: [self assert: (mapByte >> AnnotationShift = IsDisplacementX2N or: [mapByte >> AnnotationShift = IsAnnotationExtension]). mapByte < (IsAnnotationExtension << AnnotationShift) ifTrue: [mcpc := mcpc + ((mapByte - DisplacementX2N << AnnotationShift) * backEnd codeGranularity)]]. map := map - 1]. ^0! Item was changed: ----- Method: StackInterpreter>>ioLoadExternalFunction:OfLength:FromModule:OfLength:AccessorDepthInto: (in category 'primitive support') ----- ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength AccessorDepthInto: accessorDepthPtr "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" <doNotGenerate> | pluginString functionString | pluginString := String new: moduleLength. 1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)]. + "Pharo images as of 2016 use the FFI plugin (for getenv:?). We can't simulate such function loads. So ignore" + pluginString = 'SqueakFFIPrims' ifTrue: + [self transcript cr; show: 'ignoring function load from SqueakFFIPrims'. + ^0]. functionString := String new: functionLength. 1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)]. ^self ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileFullBlockMethodFrameBuild: (in category 'compile abstract instructions') ----- compileFullBlockMethodFrameBuild: numCopied <option: #SistaV1BytecodeSet> needsFrame ifFalse: + [ self assert: methodOrBlockNumArgs = 0. "Else calling convention would have put args in regs while block activation expects them on stack" + self initSimStackForFramelessMethod: initialPC. - [self initSimStackForFramelessMethod: initialPC. ^self]. super compileFullBlockMethodFrameBuild: numCopied. self initSimStackForFramefulMethod: initialPC!

1 0

[OpenSmalltalk/opensmalltalk-vm] 456992: CogVM source as per VMMaker.oscog-nice.1933
by GitHub 05 Sep '16

05 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 456992cac8ac6d607603301c3d19d016998d90ae https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/456992cac8ac6d6076… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-09-05 (Mon, 05 Sep 2016) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-nice.1933 Fix incorrect type inferencing for asUnsignedLongLong which causes a bug in the v3 format VM in fetchLong64:ofObject:. This breaks large integer arithmetic. In this case, type inferencing is used for correct unsigned casting before left shifting. TODO: verify that all selectors translated via initializeCTranslationDictionary have correct type inferencing in returnTypeForSend:in:ifNil: Sista: The jumpIfNotInstanceOfOrPop bytecode was interesting but hard to tackle in many places, leading to hard to write assertion in the JIT. It has been changed so that it now always consumes the top of the stack, jumping if the top of the stack is not an instance of one of the class specified in the literal. This way that bytecode can also be used easily to optimize PICs. Fixed machine code generation of UByteNumBytes

1 0

VM Maker: VMMaker.oscog-nice.1933.mcz
by commits＠source.squeak.org 03 Sep '16

03 Sep '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1933.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1933 Author: nice Time: 3 September 2016, 3:34:34.796713 pm UUID: 18f1dc32-84e8-43aa-baba-937ea911b845 Ancestors: VMMaker.oscog-cb.1932 Fix incorrect type inferencing for asUnsignedLongLong which causes a bug in the v3 format image (in fetchLong64:ofObject:). In this case, type inferencing is used for correct unsigned casting before left shifting. TODO: verify that all selectors translated via initializeCTranslationDictionary have correct type inferencing in returnTypeForSend:in:ifNil: =============== Diff against VMMaker.oscog-cb.1932 =============== Item was changed: ----- Method: CCodeGenerator>>returnTypeForSend:in:ifNil: (in category 'type inference') ----- returnTypeForSend: sendNode in: aTMethod ifNil: typeIfNil "Answer the return type for a send. Unbound sends default to typeIfNil. Methods with types as yet unknown have a type determined either by the kernelReturnTypes or the table below, or, if they are in neither set, then nil. The inferred type should match as closely as possible the C type of generated expessions so that inlining would not change the expression. If there is a method for sel but its return type is as yet unknown it mustn't be defaulted, since on a subsequent pass its type may be computable." | sel methodOrNil | methodOrNil := self anyMethodNamed: (sel := sendNode selector). (methodOrNil notNil and: [methodOrNil returnType notNil]) ifTrue: [^self baseTypeForType: methodOrNil returnType]. ^kernelReturnTypes at: sel ifAbsent: [sel caseOf: { [#integerValueOf:] -> [#sqInt]. [#isIntegerObject:] -> [#int]. [#negated] -> [self promoteArithmeticTypes: (self typeFor: sendNode receiver in: aTMethod) and: #int]. [#+] -> [self typeForArithmetic: sendNode in: aTMethod]. [#-] -> [self typeForArithmetic: sendNode in: aTMethod]. [#*] -> [self typeForArithmetic: sendNode in: aTMethod]. [#/] -> [self typeForArithmetic: sendNode in: aTMethod]. [#//] -> [self typeForArithmetic: sendNode in: aTMethod]. [#\\] -> [self typeForArithmetic: sendNode in: aTMethod]. [#rem:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#quo:] -> [self typeForArithmetic: sendNode in: aTMethod]. "C99 Sec Bitwise shift operators ... 3 Sematics ... The integer promotions are performed on each of the operands. The type of the result is that of the promoted left operand..." [#>>] -> [self typeFor: sendNode receiver in: aTMethod]. [#<<] -> [self typeFor: sendNode receiver in: aTMethod]. [#addressOf:] -> [(self typeFor: sendNode receiver in: aTMethod) ifNil: [#sqInt] ifNotNil: [:type| type, (type last isLetter ifTrue: [' *'] ifFalse: ['*'])]]. [#at:] -> [self typeForDereference: sendNode in: aTMethod]. [#bitAnd:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitOr:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitXor:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitClear:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitInvert32] -> [#'unsigned int']. [#bitInvert64] -> [self promoteArithmeticTypes: (self typeFor: sendNode receiver in: aTMethod) and: #int]. [#byteSwap32] -> [#'unsigned int']. [#byteSwap64] -> [#'unsigned long long']. [#byteSwapped32IfBigEndian:] -> [#'unsigned int']. [#byteSwapped64IfBigEndian:] -> [#'unsigned long long']. [#=] -> [#int]. [#~=] -> [#int]. [#==] -> [#int]. [#~~] -> [#int]. [#<] -> [#int]. [#<=] -> [#int]. [#>] -> [#int]. [#>=] -> [#int]. [#between:and:] -> [#int]. [#anyMask:] -> [#int]. [#allMask:] -> [#int]. [#noMask:] -> [#int]. [#isNil] -> [#int]. [#notNil] -> [#int]. [#&] -> [#int]. [#|] -> [#int]. [#not] -> [#int]. [#asFloat] -> [#double]. [#atan] -> [#double]. [#exp] -> [#double]. [#log] -> [#double]. [#sin] -> [#double]. [#sqrt] -> [#double]. [#asLong] -> [#long]. [#asInteger] -> [#sqInt]. [#asUnsignedInteger] -> [#usqInt]. [#asUnsignedLong] -> [#'unsigned long']. + [#asUnsignedLongLong] -> [#'unsigned long long']. [#asVoidPointer] -> [#'void *']. [#signedIntToLong] -> [#usqInt]. "c.f. generateSignedIntToLong:on:indent:" [#signedIntToShort] -> [#usqInt]. "c.f. generateSignedIntToShort:on:indent:" [#cCoerce:to:] -> [sendNode args last value]. [#cCoerceSimple:to:] -> [sendNode args last value]. [#sizeof:] -> [#'unsigned long']. "Technically it's a size_t but it matches unsigned long on target architectures so far..." [#ifTrue:ifFalse:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifFalse:ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifFalse:] -> [self typeForConditional: sendNode in: aTMethod]. [#and:] -> [#sqInt]. [#or:] -> [#sqInt] } otherwise: "If there /is/ a method for sel but its return type is as yet unknown it /mustn't/ be defaulted, since on a subsequent pass its type may be computable. Only default unbound selectors." [methodOrNil ifNotNil: [nil] ifNil: [typeIfNil]]]!

1 0

[OpenSmalltalk/opensmalltalk-vm] f39cb1: Wrestle once again with the worst code in the syst...
by GitHub 02 Sep '16

02 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: f39cb11bf2689aded27e237eea0ee992ca0e2d01 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f39cb11bf2689aded2… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m Log Message: ----------- Wrestle once again with the worst code in the system. The recent fixes for Sierra to platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m broke it for bundles. Simplify the code by splitting tryLoading into tryLoadingVariations which handles adding optional lib prefix and .so or .dylib suffixes, and tryLoadingBundle which constructs the full module.bundle/Contents/MacOS/module form. Be very careful with stringByAppendingPathComponent: which will /not/ append a slash if given a null string to append to a path. It would be really nice if the system didn't try and open a file some 96 times on MacOS when trying to load a plugin.

1 0

C-Based Toolchain Hardening
by Ben Coman 02 Sep '16

02 Sep '16

The more experienced here probably know a lot of this, but I found it quite interesting so I thought I'd share... https://www.owasp.org/index.php/C-Based_Toolchain_Hardening My biggest take away is the emphasis on using asserts. My professional C programming experience was only a short stint 20 years ago in a graduate position where asserts were never discussed. So I've never used asserts and it was particularly enlightening to read... "in the time it takes for you to write a printf or NSLog statement, you could have written an assert. Unlike the printf or NSLog which are often removed when no longer needed, the assert stays active forever." In relation to my own (potential) contributions to the VM, I'd be interested to learn if there are any particular aspects from that article that particularly: * resonate with current practices * areas that could be improved * are adverse to personal experience Of course there are already production, debug and assert builds. And it concurs with what I've read on the list about avoiding autotools. The problem with dependency rebuilds when CFLAGS change between production/debug builds was enlightening (if obvious in hindsight). I guess this is why each build type has its own directory. One thing I don't quite get is "Everywhere you place an if statement for validation or checking, you should have an assert. Everywhere you have an assert for validation or checking, you should have an if statement. They go hand-in-hand." Indeed, perusing asserts in the repository [1] doesn't show any nearby if statements, so maybe that statement is a stretch?? [1] https://github.com/OpenSmalltalk/opensmalltalk-vm/search?l=c&q=assert&type=… cheers -ben

2 1

VM Maker: VMMaker.oscog-cb.1932.mcz
by commits＠source.squeak.org 02 Sep '16

02 Sep '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1932.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1932 Author: cb Time: 2 September 2016, 11:24:18.041558 am UUID: 9d80a630-31aa-40dc-9b38-917293281995 Ancestors: VMMaker.oscog-cb.1931 The jumpIfNotInstanceOfOrPop bytecode was interesting but hard to tackle in many places, leading to hard to write assertion in the JIT. I've changed it so that it now always consumes the top of the stack, jumping if the top of the stack is not an instance of one of the class specified in the literal. This way that bytecode can also be used easily to optimize PICs. =============== Diff against VMMaker.oscog-cb.1931 =============== Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "SimpleStackBasedCogit initializeBytecodeTableForSistaV1" BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode) (1 76 76 genPushReceiverBytecode) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 117 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) "stores" (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 unknownBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genSistaExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 241 241 genSistaExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genSistaExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 244 244 genSistaExtStoreLiteralVariableBytecode isMappedIfImmutability) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 genExtPushFullClosureBytecode) (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 251 251 genExtPushRemoteTempOrInstVarLongBytecode) (3 252 252 genExtStoreRemoteTempOrInstVarLongBytecode isMappedIfImmutability) (3 253 253 genExtStoreAndPopRemoteTempOrInstVarLongBytecode isMappedIfImmutability) + (3 254 254 genExtJumpIfNotInstanceOfBehaviorsBytecode) - (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode) (3 255 255 unknownBytecode))! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtJumpIfNotInstanceOfBehaviorsBytecode (in category 'bytecode generators') ----- + genExtJumpIfNotInstanceOfBehaviorsBytecode + "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" + "Non supported in non Sista VMs" + ^EncounteredUnknownBytecode + ! Item was removed: - ----- Method: SimpleStackBasedCogit>>genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode (in category 'bytecode generators') ----- - genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode - "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" - "Non supported in non Sista VMs" - ^EncounteredUnknownBytecode - ! Item was added: + ----- Method: SistaCogit>>genExtJumpIfNotInstanceOfBehaviorsBytecode (in category 'bytecode generators') ----- + genExtJumpIfNotInstanceOfBehaviorsBytecode + "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" + + | reg literal distance targetFixUp | + + "We loose the information of in which register is stack top + when jitting the branch target so we need to flush everything. + We could use a fixed register here...." + reg := self allocateRegForStackEntryAt: 0. + self ssTop popToReg: reg. + self ssFlushTo: simStackPtr. "flushed but the value is still in reg" + + self genPopStackBytecode. + + literal := self getLiteral: (extA * 256 + byte1). + extA := 0. + distance := extB * 256 + byte2. + extB := 0. + + targetFixUp := self cCoerceSimple: (self ensureFixupAt: bytecodePC + 3 + distance - initialPC) to: #'AbstractInstruction *'. + + (objectMemory isArrayNonImm: literal) + ifTrue: [objectRepresentation branchIf: reg notInstanceOfBehaviors: literal target: targetFixUp] + ifFalse: [objectRepresentation branchIf: reg notInstanceOfBehavior: literal target: targetFixUp]. + + ^0! Item was removed: - ----- Method: SistaCogit>>genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode (in category 'bytecode generators') ----- - genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode - "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" - - | reg literal distance targetFixUp | - - "We loose the information of in which register is stack top - when jitting the branch target so we need to flush everything. - We could use a fixed register here...." - reg := self allocateRegForStackEntryAt: 0. - self ssTop popToReg: reg. - self ssFlushTo: simStackPtr. "flushed but the value is still in reg" - - self genPopStackBytecode. - - literal := self getLiteral: (extA * 256 + byte1). - extA := 0. - distance := extB * 256 + byte2. - extB := 0. - - targetFixUp := self cCoerceSimple: (self ensureFixupAt: bytecodePC + 3 + distance - initialPC) to: #'AbstractInstruction *'. - - (objectMemory isArrayNonImm: literal) - ifTrue: [objectRepresentation branchIf: reg notInstanceOfBehaviors: literal target: targetFixUp] - ifFalse: [objectRepresentation branchIf: reg notInstanceOfBehavior: literal target: targetFixUp]. - - ^0! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSistaV1 (in category 'initialization') ----- initializeBytecodeTableForSistaV1 "See e.g. the cass comment for EncoderForSistaV1" "StackInterpreter initializeBytecodeTableForSistaV1" "Note: This table will be used to generate a C switch statement." initializationOptions at: #SistaV1BytecodeSet put: (SistaV1BytecodeSet := true). BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForSistaV1. BytecodeSetHasDirectedSuperSend := true. LongStoreBytecode := 245. self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 pushConstantTrueBytecode) ( 78 pushConstantFalseBytecode) ( 79 pushConstantNilBytecode) ( 80 pushConstantZeroBytecode) ( 81 pushConstantOneBytecode) ( 82 extPushPseudoVariable) ( 83 duplicateTopBytecode) ( 84 87 unknownBytecode) ( 88 returnReceiver) ( 89 returnTrue) ( 90 returnFalse) ( 91 returnNil) ( 92 returnTopFromMethod) ( 93 returnNilFromBlock) ( 94 returnTopFromBlock) ( 95 extNopBytecode) ( 96 bytecodePrimAdd) ( 97 bytecodePrimSubtract) ( 98 bytecodePrimLessThanSistaV1) "for booleanCheatSistaV1:" ( 99 bytecodePrimGreaterThanSistaV1) "for booleanCheatSistaV1:" (100 bytecodePrimLessOrEqualSistaV1) "for booleanCheatSistaV1:" (101 bytecodePrimGreaterOrEqualSistaV1) "for booleanCheatSistaV1:" (102 bytecodePrimEqualSistaV1) "for booleanCheatSistaV1:" (103 bytecodePrimNotEqualSistaV1) "for booleanCheatSistaV1:" (104 bytecodePrimMultiply) (105 bytecodePrimDivide) (106 bytecodePrimMod) (107 bytecodePrimMakePoint) (108 bytecodePrimBitShift) (109 bytecodePrimDiv) (110 bytecodePrimBitAnd) (111 bytecodePrimBitOr) (112 bytecodePrimAt) (113 bytecodePrimAtPut) (114 bytecodePrimSize) (115 bytecodePrimNext) "i.e. a 0 arg special selector" (116 bytecodePrimNextPut) "i.e. a 1 arg special selector" (117 bytecodePrimAtEnd) (118 bytecodePrimIdenticalSistaV1) "for booleanCheatSistaV1:" (119 bytecodePrimClass) (120 bytecodePrimSpecialSelector24) "was blockCopy:" (121 bytecodePrimValue) (122 bytecodePrimValueWithArg) (123 bytecodePrimDo) "i.e. a 1 arg special selector" (124 bytecodePrimNew) "i.e. a 0 arg special selector" (125 bytecodePrimNewWithArg) "i.e. a 1 arg special selector" (126 bytecodePrimPointX) "i.e. a 0 arg special selector" (127 bytecodePrimPointY) "i.e. a 0 arg special selector" (128 143 sendLiteralSelector0ArgsBytecode) (144 159 sendLiteralSelector1ArgBytecode) (160 175 sendLiteralSelector2ArgsBytecode) (176 183 shortUnconditionalJump) (184 191 shortConditionalJumpTrue) (192 199 shortConditionalJumpFalse) (200 207 storeAndPopReceiverVariableBytecode) (208 215 storeAndPopTemporaryVariableBytecode) (216 popStackBytecode) (217 unconditionnalTrapBytecode) (218 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 longPushTemporaryVariableBytecode) (230 unknownBytecode) (231 pushNewArrayBytecode) (232 extPushIntegerBytecode) (233 extPushCharacterBytecode) (234 extSendBytecode) (235 extSendSuperBytecode) (236 unknownBytecode) (237 extUnconditionalJump) (238 extJumpIfTrue) (239 extJumpIfFalse) (240 extSistaStoreAndPopReceiverVariableBytecode) (241 extSistaStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extSistaStoreReceiverVariableBytecode) (244 extSistaStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 extPushFullClosureBytecode) (250 extPushClosureBytecode) (251 extPushRemoteTempOrInstVarLongBytecode) (252 extStoreRemoteTempOrInstVarLongBytecode) (253 extStoreAndPopRemoteTempOrInstVarLongBytecode) + (254 extJumpIfNotInstanceOfBehaviorsBytecode) - (254 extJumpIfNotInstanceOfBehaviorsOrPopBytecode) (255 unknownBytecode) )! Item was added: + ----- Method: StackInterpreter>>extJumpIfNotInstanceOfBehaviorsBytecode (in category 'sista bytecodes') ----- + extJumpIfNotInstanceOfBehaviorsBytecode + "254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" + | tosClassTag literal distance | + SistaVM ifFalse: [^self respondToUnknownBytecode]. + tosClassTag := objectMemory fetchClassTagOf: self internalPopStack. + literal := self literal: extA << 8 + self fetchByte. + distance := extB << 8 + self fetchByte. + extA := 0. + extB := 0. + (objectMemory isArrayNonImm: literal) + ifTrue: + [0 to: (objectMemory numSlotsOf: literal) asInteger - 1 do: [:i | + tosClassTag = (objectMemory rawClassTagForClass: (objectMemory fetchPointer: i ofObject: literal)) + ifTrue: [ ^ self fetchNextBytecode ] ]. + localIP := localIP + distance. + ^ self fetchNextBytecode] + ifFalse: + [tosClassTag ~= (objectMemory rawClassTagForClass: literal) ifTrue: + [localIP := localIP + distance. + ^ self fetchNextBytecode]]. + self fetchNextBytecode! Item was removed: - ----- Method: StackInterpreter>>extJumpIfNotInstanceOfBehaviorsOrPopBytecode (in category 'sista bytecodes') ----- - extJumpIfNotInstanceOfBehaviorsOrPopBytecode - "254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" - | tosClassTag literal distance | - SistaVM ifFalse: [^self respondToUnknownBytecode]. - tosClassTag := objectMemory fetchClassTagOf: self internalStackTop. - literal := self literal: extA << 8 + self fetchByte. - distance := extB << 8 + self fetchByte. - extA := 0. - extB := 0. - (objectMemory isArrayNonImm: literal) - ifTrue: - [0 to: (objectMemory numSlotsOf: literal) asInteger - 1 do: [:i | - tosClassTag = (objectMemory rawClassTagForClass: (objectMemory fetchPointer: i ofObject: literal)) - ifTrue: - [ self internalPopStack. - ^ self fetchNextBytecode ] ]. - localIP := localIP + distance. - ^ self fetchNextBytecode] - ifFalse: - [tosClassTag ~= (objectMemory rawClassTagForClass: literal) ifTrue: - [localIP := localIP + distance. - ^ self fetchNextBytecode]]. - self internalPopStack. - self fetchNextBytecode! Item was removed: - ----- Method: StackInterpreter>>extTrapIfNotInstanceOfBehaviorsBytecode (in category 'sista bytecodes') ----- - extTrapIfNotInstanceOfBehaviorsBytecode - "SistaV1: * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" - | tos tosClassTag literal | - tos := self internalStackTop. - tosClassTag := objectMemory fetchClassTagOf: tos. - literal := self literal: extA << 8 + self fetchByte. - extA := 0. - (objectMemory isArrayNonImm: literal) - ifTrue: - [| i | - i := (objectMemory numSlotsOf: literal) asInteger. - [(i := i -1) < 0 - or: [tosClassTag = (objectMemory rawClassTagForClass: (objectMemory fetchPointer: i ofObject: literal))]] whileTrue. - i < 0 ifTrue: - [^self respondToSistaTrap]] - ifFalse: - [tosClassTag ~= (objectMemory rawClassTagForClass: literal) ifTrue: - [^self respondToSistaTrap]]. - self internalPopStack. - self fetchNextBytecode! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "StackToRegisterMappingCogit initializeBytecodeTableForSistaV1" numPushNilsFunction := #sistaV1:Num:Push:Nils:. pushNilSizeFunction := #sistaV1PushNilSize:numInitialNils:. BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1) (1 16 31 genPushLitVarDirSup16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 96 genSpecialSelectorArithmetic isMapped AddRR) (1 97 97 genSpecialSelectorArithmetic isMapped SubRR) (1 98 98 genSpecialSelectorComparison isMapped JumpLess) (1 99 99 genSpecialSelectorComparison isMapped JumpGreater) (1 100 100 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 101 101 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 102 102 genSpecialSelectorComparison isMapped JumpZero) (1 103 103 genSpecialSelectorComparison isMapped JumpNonZero) (1 104 109 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 110 110 genSpecialSelectorArithmetic isMapped AndRR) (1 111 111 genSpecialSelectorArithmetic isMapped OrRR) (1 112 117 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef is1ByteInstVarStore isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLitVarDirSupBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 unknownBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genSistaExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 241 241 genSistaExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genSistaExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 244 244 genSistaExtStoreLiteralVariableBytecode isMappedIfImmutability) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 genExtPushFullClosureBytecode) (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 251 251 genExtPushRemoteTempOrInstVarLongBytecode) (3 252 252 genExtStoreRemoteTempOrInstVarLongBytecode isMappedIfImmutability) (3 253 253 genExtStoreAndPopRemoteTempOrInstVarLongBytecode isMappedIfImmutability) + (3 254 254 genExtJumpIfNotInstanceOfBehaviorsBytecode branch v4:Long:BranchIfNotInstanceOf:Distance:) - (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode branch v4:Long:BranchIfNotInstanceOf:Distance:) (3 255 255 unknownBytecode))!

1 0

VM Maker: VMMaker.oscog-cb.1931.mcz
by commits＠source.squeak.org 01 Sep '16

01 Sep '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1931.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1931 Author: cb Time: 1 September 2016, 6:27:59.493903 pm UUID: 48d66455-0094-45bf-9cc9-a55015674de7 Ancestors: VMMaker.oscog-eem.1930 Fixed machine code generation of UByteNumBytes =============== Diff against VMMaker.oscog-eem.1930 =============== Item was changed: ----- Method: SistaCogit>>genUnaryInlinePrimitive: (in category 'inline primitive generators') ----- genUnaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#unaryInlinePrimitive:" | rcvrReg resultReg | rcvrReg := self allocateRegForStackEntryAt: 0. resultReg := self allocateRegNotConflictingWith: (self registerMaskFor: rcvrReg). prim caseOf: { "00 unchecked class" [1] -> "01 unchecked pointer numSlots" [self ssTop popToReg: rcvrReg. self ssPop: 1. objectRepresentation genGetNumSlotsOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInReg: resultReg]. "02 unchecked pointer basicSize" [3] -> "03 unchecked byte numBytes" + [self ssTop popToReg: rcvrReg. + self ssPop: 1. + objectRepresentation - [objectRepresentation genGetNumBytesOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInReg: resultReg]. "04 unchecked short16Type format numShorts" "05 unchecked word32Type format numWords" "06 unchecked doubleWord64Type format numDoubleWords" [11] -> "11 unchecked fixed pointer basicNew" [self ssTop type ~= SSConstant ifTrue: [^EncounteredUnknownBytecode]. (objectRepresentation genGetInstanceOf: self ssTop constant into: resultReg initializingIf: self extBSpecifiesInitializeInstance) ~= 0 ifTrue: [^ShouldNotJIT]. "e.g. bad class" self ssPop: 1] } otherwise: [^EncounteredUnknownBytecode]. extB := 0. self ssPushRegister: resultReg. ^0!

1 0

[OpenSmalltalk/opensmalltalk-vm] a63c4f: CogVM source as per VMMaker.oscog-eem.1930
by GitHub 01 Sep '16

01 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: a63c4f1099a06b3805eb7baedcdc55334f96bc9a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a63c4f1099a06b3805… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-09-01 (Thu, 01 Sep 2016) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/interp.h M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/interp.h M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1930 Cogit: Implement compacting CPICs on method zone reclamation rather than freeing CPICs that have one or more freed entries. This for more stable analysis in the Sista VM. Make MaxCPICCases a constant (class var) rather thnan a variable. Cogit SistaV1/FullBlocks: When a loop is taken enough time to trigger jit compilation, it needs in the SistaV1 bytecode set to check if the activation is a full block and call the correct JIT compiler method if this is the case. SistaV1 bytecode set needs to define its primitive error code bytecode (long temporary store bytecode) Now that the trampoline for context inst var store can be called on single contexts, we need to update the trampoline to work with single contexts Comment the register saving convention for the context inst var access trampolines in the JIT. Added immutability check in maybe context object store in jitted code. Added an annotation for inst var store in the SistaV1 bytecode set to tip the JIT if the mutated object may be a context or not. StackSpur VM are now generated with dual bytecode set support. Quick fix on the push nil functions for the sista bytecode set. Added support from error code while scanning block bodies. VMMaker.oscog-cb.1920 This commit makes a difference between the usage of the sistaV1 bytecode set and the Sista VM. It is now possible to compile the VM with the SistaV1 bytecode set but without the SistaVM option. This way, one can use and stabilize: - directed super sends - full block closures without using unsafe operations and traps. I believe we'll migrate to the sista runtime in multiple steps, and the first step is to use those features and have images compatible with those features without runtime optimizations. The SistaV1 bytecode set allows to use directed super send and full block closures. Enabling the bytecode set enables those features. (SistaV1BytecodeSet option) The SistaVM option, combined with SistaCogit, enables the profiling counters, the unsafe operations and traps. If disabled, the bytecodes from the SistaV1 bytecode set corresponding to traps or unsafe operations are considered unknown bytecodes. All unsafe operations and traps related JIT code is now in SistaCogit. Those bytecodes are considered as unknown bytecodes in superclasses. I've also changed some flag logic, as the flag marking optimized method is bit 16 (previously upper literal bit) and not the flag bit.

1 0

VM Maker: VMMaker.oscog-eem.1930.mcz
by commits＠source.squeak.org 01 Sep '16

01 Sep '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1930.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1930 Author: eem Time: 1 September 2016, 5:40:11.487941 pm UUID: e01f4bfc-2f0a-40e1-9491-d744cde15034 Ancestors: VMMaker.oscog-cb.1929 Implement compacting CPICs on method zone reclamation rather than freeing CPICs that have one or more freed entries. This for more stable analysis in the Sista VM. Make MaxCPICCases a constant (class var) rather thnan a variable. =============== Diff against VMMaker.oscog-cb.1929 =============== Item was changed: CogClass subclass: #Cogit + instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj enumeratingCogMethod methodHeader initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry fullBlockEntry cbEntryOffset fullBlockNoContextSwitchEntry cbNoSwitchEntryOffset picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetFP ceGetSP ceCaptureCStackPointers ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer cPICPrototype cPICEndOfCodeOffset cPICEndOfCodeLabel debugBytecodePointers debugOpcodeIndices disassemblingMethod' + classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AltNumSpecialSelectors AnnotationConstantNames AnnotationShift AnnotationsWithBytecodePCs BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation FirstSpecialSelector HasBytecodePC IsAbsPCReference IsAnnotationExtension IsDirectedSuperSend IsDisplacementX2N IsNSDynamicSuperSend IsNSImplicitReceiverSend IsNSSelfSend IsNSSendCall IsObjectReference IsRelativeCall IsSendCall IsSuperSend MapEnd MaxCPICCases MaxCompiledPrimitiveIndex MaxStackAllocSize MaxX2NDisplacement NSCClassTagIndex NSCEnclosingObjectIndex NSCNumArgsIndex NSCSelectorIndex NSCTargetIndex NSSendIsPCAnnotated NeedsFixupFlag NumObjRefsInRuntime NumOopsPerNSC NumSpecialSelectors NumTrampolines ProcessorClass' - instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj enumeratingCogMethod methodHeader initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry fullBlockEntry cbEntryOffset fullBlockNoContextSwitchEntry cbNoSwitchEntryOffset picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetFP ceGetSP ceCaptureCStackPointers ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer cPICPrototype cPICEndOfCodeOffset cPICEndOfCodeLabel maxCPICCases debugBytecodePointers debugOpcodeIndices disassemblingMethod' - classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AltNumSpecialSelectors AnnotationConstantNames AnnotationShift AnnotationsWithBytecodePCs BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation FirstSpecialSelector HasBytecodePC IsAbsPCReference IsAnnotationExtension IsDirectedSuperSend IsDisplacementX2N IsNSDynamicSuperSend IsNSImplicitReceiverSend IsNSSelfSend IsNSSendCall IsObjectReference IsRelativeCall IsSendCall IsSuperSend MapEnd MaxCompiledPrimitiveIndex MaxStackAllocSize MaxX2NDisplacement NSCClassTagIndex NSCEnclosingObjectIndex NSCNumArgsIndex NSCSelectorIndex NSCTargetIndex NSSendIsPCAnnotated NeedsFixupFlag NumObjRefsInRuntime NumOopsPerNSC NumSpecialSelectors NumTrampolines ProcessorClass' poolDictionaries: 'CogAbstractRegisters CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMBytecodeConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 4/6/2015 15:56' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventually the total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was changed: ----- Method: Cogit class>>initializeMiscConstants (in category 'class initialization') ----- initializeMiscConstants super initializeMiscConstants. Debug := initializationOptions at: #Debug ifAbsent: [false]. (initializationOptions includesKey: #EagerInstructionDecoration) ifTrue: [EagerInstructionDecoration := initializationOptions at: #EagerInstructionDecoration] ifFalse: [EagerInstructionDecoration ifNil: [EagerInstructionDecoration := false]]. "speeds up single stepping but could lose fidelity" ProcessorClass := (initializationOptions at: #ISA ifAbsentPut: [self objectMemoryClass defaultISA]) caseOf: { [#X64] -> [BochsX64Alien]. [#IA32] -> [BochsIA32Alien]. [#ARMv5] -> [GdbARMAlien]. [#MIPSEL] -> [MIPSELSimulator] }. CogCompilerClass := self activeCompilerClass. (CogCompilerClass withAllSuperclasses copyUpTo: CogAbstractInstruction) reverseDo: [:compilerClass| compilerClass initialize; initializeAbstractRegisters]. self objectMemoryClass objectRepresentationClass initializeMiscConstants. "Our criterion for which methods to JIT is literal count. The default value is 60 literals or less." MaxLiteralCountForCompile := initializationOptions at: #MaxLiteralCountForCompile ifAbsent: [60]. "we special-case 0, 1 & 2 argument sends, N is numArgs >= 3" NumSendTrampolines := 4. "Currently not even the ceImplicitReceiverTrampoline contains object references." NumObjRefsInRuntime := 0. + "6 is a fine number for the max number of PCI entries. 8 is too large." + MaxCPICCases := 6. NSCSelectorIndex := (NSSendCache instVarNames indexOf: #selector) - 1. NSCNumArgsIndex := (NSSendCache instVarNames indexOf: #numArgs) - 1. NSCClassTagIndex := (NSSendCache instVarNames indexOf: #classTag) - 1. NSCEnclosingObjectIndex := (NSSendCache instVarNames indexOf: #enclosingObject) - 1. NSCTargetIndex := (NSSendCache instVarNames indexOf: #target) - 1. NumOopsPerNSC := NSSendCache instVarNames size. "Max size to alloca when compiling. Mac OS X 10.6.8 segfaults approaching 8Mb. Linux 2.6.9 segfaults above 11Mb. WIndows XP segfaults approaching 2Mb." MaxStackAllocSize := 1024 * 1024 * 3 / 2 ! Item was changed: ----- Method: Cogit>>addressOfEndOfCase:inCPIC: (in category 'in-line cacheing') ----- addressOfEndOfCase: n inCPIC: cPIC "calculate the end of the n'th case statement - which is complicated because we have case 1 right at the top of our CPIC and then build up from the last one. Yes I know this sounds strange, but trust me - I'm an Engineer, we do things backwards all the emit" <var: #cPIC type: #'CogMethod *'> + self assert: (n >= 1and: [n <= MaxCPICCases]). - self assert: (n >= 1and: [n <= maxCPICCases]). ^n = 1 ifTrue: [cPIC asInteger + firstCPICCaseOffset] + ifFalse: [cPIC asInteger + firstCPICCaseOffset + (MaxCPICCases + 1 - n * cPICCaseSize)]! - ifFalse: [cPIC asInteger + firstCPICCaseOffset + (maxCPICCases + 1 - n * cPICCaseSize)]! Item was changed: ----- Method: Cogit>>cPIC:HasTarget: (in category 'in-line cacheing') ----- cPIC: cPIC HasTarget: targetMethod "Are any of the jumps from this CPIC to targetMethod?" <var: #cPIC type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> | pc target | target := targetMethod asUnsignedInteger + cmNoCheckEntryOffset. pc := cPIC asInteger + firstCPICCaseOffset. "Since this is a fast test doing simple compares we don't need to care that some cases have nonsense addresses in there. Just zip on through." "First jump is unconditional; subsequent ones are conditional" target = (backEnd jumpLongTargetBeforeFollowingAddress: pc) ifTrue: [^true]. + 2 to: MaxCPICCases do: - 2 to: maxCPICCases do: [:i| pc := pc + cPICCaseSize. target = (backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc) ifTrue: [^true]]. ^false! Item was added: + ----- Method: Cogit>>cPICCompactAndIsNowEmpty: (in category 'in-line cacheing') ----- + cPICCompactAndIsNowEmpty: cPIC + "Scan the CPIC for target methods that have been freed and eliminate them. + Since the first entry cannot be eliminated, answer that the PIC should be + freed if the first entry is to a free target. Answer if the PIC is now empty or should be freed." + <var: #cPIC type: #'CogMethod *'> + | pc entryPoint targetMethod targets tags methods used | + <var: #targetMethod type: #'CogMethod *'> + <var: #tags declareC: 'int tags[MaxCPICCases]'> + <var: #targets declareC: 'sqInt targets[MaxCPICCases]'> + <var: #methods declareC: 'sqInt methods[MaxCPICCases]'> + self cCode: [] inSmalltalk: + [tags := CArrayAccessor on: (Array new: MaxCPICCases). + targets := CArrayAccessor on: (Array new: MaxCPICCases). + methods := CArrayAccessor on: (Array new: MaxCPICCases)]. + used := 0. + 1 to: cPIC cPICNumCases do: + [:i| | valid | + pc := self addressOfEndOfCase: i inCPIC: cPIC. + entryPoint := i = 1 + ifTrue: [backEnd jumpLongTargetBeforeFollowingAddress: pc] + ifFalse: [backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc]. + valid := true. + "Collect all target triples except for triples whose entry-point is a freed method" + (cPIC containsAddress: entryPoint) ifFalse: + [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. + self assert: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMFree]). + targetMethod cmType = CMFree ifTrue: + [i = 1 ifTrue: [^true]. "cannot filter out the first entry cuz classTag is at pont of send." + valid := false]]. + valid ifTrue: + [tags at: used put: (i > 1 ifTrue: [backEnd literal32BeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize]). + targets at: used put: entryPoint. + methods at: used put: (backEnd literalBeforeFollowingAddress: pc - (i = 1 + ifTrue: [backEnd jumpLongByteSize] + ifFalse: [backEnd jumpLongConditionalByteSize + backEnd cmpC32RTempByteSize])). + used := used + 1]]. + used = cPIC cPICNumCases ifTrue: + [^false]. + used = 0 ifTrue: + [^true]. + cPIC cPICNumCases: used. + used = 1 ifTrue: + [pc := self addressOfEndOfCase: 2 inCPIC: cPIC. + self rewriteCPIC: cPIC caseJumpTo: pc. + ^false]. + "the first entry cannot change..." + 1 to: used - 1 do: + [:i| + pc := self addressOfEndOfCase: i + 1 inCPIC: cPIC. + self rewriteCPICCaseAt: pc tag: (tags at: i) objRef: (methods at: i) target: (targets at: i)]. + + "finally, rewrite the jump 3 instr before firstCPICCaseOffset to jump to the beginning of this new case" + self rewriteCPIC: cPIC caseJumpTo: pc - cPICCaseSize. + ^false! Item was changed: ----- Method: Cogit>>ceCPICMiss:receiver: (in category 'in-line cacheing') ----- ceCPICMiss: cPIC receiver: receiver "Code entry closed PIC miss. A send has fallen through a closed (finite) polymorphic inline cache. Either extend it or patch the send site to an open PIC. The stack looks like: receiver args sp=> sender return address" <var: #cPIC type: #'CogMethod *'> <api> | outerReturn newTargetMethodOrNil errorSelectorOrNil cacheTag result | self cCode: '' inSmalltalk: [cPIC isInteger ifTrue: [^self ceCPICMiss: (self cogMethodSurrogateAt: cPIC) receiver: receiver]]. (objectMemory isOopForwarded: receiver) ifTrue: [^coInterpreter ceSendFromInLineCacheMiss: cPIC]. outerReturn := coInterpreter stackTop. self deny: (backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue. + cPIC cPICNumCases < MaxCPICCases - cPIC cPICNumCases < maxCPICCases ifTrue: [self lookup: cPIC selector for: receiver methodAndErrorSelectorInto: [:method :errsel| newTargetMethodOrNil := method. errorSelectorOrNil := errsel]] ifFalse: [newTargetMethodOrNil := errorSelectorOrNil := nil]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. + (cPIC cPICNumCases >= MaxCPICCases - (cPIC cPICNumCases >= maxCPICCases or: [(errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue: [result := self patchToOpenPICFor: cPIC selector numArgs: cPIC cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: cPIC]. "Now extend the PIC with the new case." self cogExtendPIC: cPIC CaseNMethod: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. "Jump back into the pic at its entry in case this is an MNU." coInterpreter executeCogPIC: cPIC fromLinkedSendWithReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil! Item was changed: ----- Method: Cogit>>cogMethodDoesntLookKosher: (in category 'debugging') ----- cogMethodDoesntLookKosher: cogMethod "Check that the header fields onf a non-free method are consistent with the type. Answer 0 if it is ok, otherwise answer a code for the error." <api> <inline: false> <var: #cogMethod type: #'CogMethod *'> ((cogMethod blockSize bitAnd: objectMemory wordSize - 1) ~= 0 or: [cogMethod blockSize < (self sizeof: CogMethod) or: [cogMethod blockSize >= 32768]]) ifTrue: [^1]. cogMethod cmType = CMFree ifTrue: [^2]. cogMethod cmType = CMMethod ifTrue: [(objectMemory isIntegerObject: cogMethod methodHeader) ifFalse: [^11]. (objectRepresentation couldBeObject: cogMethod methodObject) ifFalse: [^12]. (cogMethod stackCheckOffset > 0 and: [cogMethod stackCheckOffset < cmNoCheckEntryOffset]) ifTrue: [^13]. ^0]. cogMethod cmType = CMOpenPIC ifTrue: [cogMethod blockSize ~= openPICSize ifTrue: [^21]. cogMethod methodHeader ~= 0 ifTrue: [^22]. "Check the nextOpenPIC link unless we're compacting" cogMethod objectHeader >= 0 ifTrue: [(cogMethod methodObject ~= 0 and: [cogMethod methodObject < methodZoneBase or: [cogMethod methodObject > (methodZone freeStart - openPICSize) or: [(cogMethod methodObject bitAnd: objectMemory wordSize - 1) ~= 0 or: [(self cCoerceSimple: cogMethod methodObject to: #'CogMethod *') cmType ~= CMOpenPIC]]]]) ifTrue: [^23]]. cogMethod stackCheckOffset ~= 0 ifTrue: [^24]. ^0]. cogMethod cmType = CMClosedPIC ifTrue: [cogMethod blockSize ~= closedPICSize ifTrue: [^31]. + (cogMethod cPICNumCases between: 1 and: MaxCPICCases) ifFalse: - (cogMethod cPICNumCases between: 1 and: maxCPICCases) ifFalse: [^32]. cogMethod methodHeader ~= 0 ifTrue: [^33]. cogMethod methodObject ~= 0 ifTrue: [^34]. ^0]. ^9! Item was changed: ----- Method: Cogit>>compactCogCompiledCode (in category 'jit - api') ----- compactCogCompiledCode <api> self assert: self noCogMethodsMaximallyMarked. coInterpreter markActiveMethodsAndReferents. methodZone freeOlderMethodsForCompaction. + self compactPICsWithFreedTargets. - self freePICsWithFreedTargets. methodZone planCompaction. coInterpreter updateStackZoneReferencesToCompiledCodePreCompaction. methodZone relocateMethodsPreCompaction. methodZone compactCompiledCode. self assert: self allMethodsHaveCorrectHeader. self assert: methodZone kosherYoungReferrers. backEnd stopsFrom: methodZone freeStart to: methodZone youngReferrers - 1. processor flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone youngReferrers asUnsignedInteger! Item was added: + ----- Method: Cogit>>compactPICsWithFreedTargets (in category 'compaction') ----- + compactPICsWithFreedTargets + | cogMethod count | + <var: #cogMethod type: #'CogMethod *'> + cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. + count := 0. + [cogMethod < methodZone limitZony] whileTrue: + [(cogMethod cmType = CMClosedPIC + and: [self cPICCompactAndIsNowEmpty: cogMethod]) ifTrue: + [cogMethod cmType: CMFree]. + cogMethod := methodZone methodAfter: cogMethod. + count := count + 1]. + self assert: count = methodZone numMethods! Item was changed: ----- Method: Cogit>>compileClosedPICPrototype (in category 'in-line cacheing') ----- compileClosedPICPrototype "Compile the abstract instructions for a full closed PIC, used to generate the chunk of code which is copied to form each closed PIC. A Closed Polymorphic Inline Cache is a small jump table used to optimize sends with a limited degree of polymorphism (currently up to 6 cases). We call it closed because it deals only with a finite number of cases, as opposed to an Open PIC. When a monomorphic linked send (a send with a single case, linking direct to the checked entry point of a CogMethod) fails a class check, the Cogit attempts to create a two-entry PIC that will handle jumping to the original target for the original class and the relevant target for the new class. This jump table will be extended on subsequent failures up to a limit (6). We avoid extending CPICs to Open PICs by linking the send site to an Open PIC if one already exists with the send's selector, a good policy since measurements show that sends of mega- morphic selectors usually become megamorphic at all send sites. Hence the Open PIC list. A CPIC also optimizes MNUs and interpret-only methods. Each case can load SendNumArgs with the oop of a method, or will load SendNumArgs with 0 if not. MNUs are optimized by jumping to the mnuAbort in the CPIC, which calls code that creates the Message, thereby avoiding looking up the original message which will not be found, and either looks up doesNotUnderstand: or directly activates the method loaded into SendNumArgs, hence avoiding looking up doesNotUnderstand:. Interpret-only methods are handled by jumping to the picInterpretAbort, which enters the interpreter activating the method loaded in SendNumArgs. CPICs look like the following, where rClass is set at the original send site for the 1st case, and #Foo is some constant, either an oop, a class tag or an instruction address. rTemp := (rRecever bitAnd: TagMask) = 0 ifTrue: [rReceiver class] ifFalse: [rRecever bitAnd: TagMask]. rTemp = rClass ifFalse: [self goto: #Label]. rSendNumArgs := #MethodForCase1Or0. self goto: #TargetForCase1. #Label rTemp = #ClassTagForCase6 ifTrue: [rSendNumArgs := #MethodForCase6Or0. self goto: #TargetForCase6]. ...cases 5, 4 & 3 rTemp = #ClassTagForCase2 ifTrue: [rSendNumArgs := #MethodForCase2Or0. self goto: #TargetForCase2]. self goto: #CPICMissTrampoline literals (if out-of-line literals) where we short-cut as many cases as needed by making the self goto: #Label skip as many cases as needed." <inline: true> | numArgs jumpNext | <var: #jumpNext type: #'AbstractInstruction *'> self compilePICAbort: (numArgs := 0). "Will get rewritten to appropriate arity when configuring." jumpNext := self compileCPICEntry. "At the end of the entry code we need to jump to the first case code, which is actually the last chunk. On each entension we must update this jump to move back one case." "16r5EAF00D is the method oop, or 0, for the 1st case." self MoveUniqueCw: 16r5EAF00D R: SendNumArgsReg. self JumpLong: self cPICPrototypeCaseOffset + 16rCA5E10. endCPICCase0 := self Label. + 1 to: MaxCPICCases - 1 do: - 1 to: maxCPICCases - 1 do: [:h| + h = (MaxCPICCases - 1) ifTrue: - h = (maxCPICCases - 1) ifTrue: [jumpNext jmpTarget: self Label]. "this is where we jump to for the first case" "16rBADA550+h is the method oop, or 0, for the Nth case." self MoveUniqueCw: 16rBADA550 + h R: SendNumArgsReg. "16rBABE1F15+h is the class tag for the Nth case" self CmpC32: 16rBABE1F15+h R: TempReg. self JumpLongZero: self cPICPrototypeCaseOffset + 16rCA5E10 + (h * 16). h = 1 ifTrue: [endCPICCase1 := self Label]]. self MoveCw: methodLabel address R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: numArgs). "Will get rewritten to appropriate arity when configuring." cPICEndOfCodeLabel := self Label. literalsManager dumpLiterals: false. ^0! Item was changed: ----- Method: Cogit>>disassembleMethod:on: (in category 'disassembly') ----- disassembleMethod: surrogateOrAddress on: aStream <doNotGenerate> | cogMethod mapEntries codeRanges | cogMethod := surrogateOrAddress isInteger ifTrue: [self cogMethodSurrogateAt: surrogateOrAddress] ifFalse: [surrogateOrAddress]. cogMethod cmType = CMBlock ifTrue: [^self disassembleMethod: cogMethod cmHomeMethod on: aStream]. (disassemblingMethod isNil and: [self class initializationOptions at: #relativeAddressDisassembly ifAbsent: [false]]) ifTrue: [^[disassemblingMethod := cogMethod. self disassembleMethod: surrogateOrAddress on: aStream] ensure: [disassemblingMethod := nil]]. self printMethodHeader: cogMethod on: aStream. mapEntries := Dictionary new. (cogMethod cmType = CMMethod and: [cogMethod cmIsFullBlock]) ifFalse: [mapEntries at: cogMethod asInteger + cmEntryOffset put: 'entry']. cogMethod cmType = CMMethod ifTrue: [cogMethod cmIsFullBlock ifTrue: [mapEntries at: cogMethod asInteger + cbNoSwitchEntryOffset put: 'noSwitchEntry'] ifFalse: [mapEntries at: cogMethod asInteger + cmNoCheckEntryOffset put: 'noCheckEntry']]. cogMethod cmType = CMClosedPIC ifTrue: [mapEntries at: cogMethod asInteger + firstCPICCaseOffset put: 'ClosedPICCase0'. + 1 to: MaxCPICCases - 1 do: - 1 to: maxCPICCases - 1 do: [:i| mapEntries at: cogMethod asInteger + firstCPICCaseOffset + (i * cPICCaseSize) put: 'ClosedPICCase', i printString]] ifFalse: [self mapFor: cogMethod performUntil: #collectMapEntry:address:into: arg: mapEntries]. NewspeakVM ifTrue: [objectRepresentation canPinObjects ifFalse: [mapEntries keys do: [:a| (mapEntries at: a) = #IsNSSendCall ifTrue: [mapEntries at: a + backEnd jumpShortByteSize put: {'Class'. #disassembleCachedOop:. (objectMemory wordSize)}; at: a + backEnd jumpShortByteSize + objectMemory bytesPerOop put: {'ImplicitReceiver'. #disassembleCachedOop:. (objectMemory wordSize)}]]]]. "This would all be far more elegant and simple if we used blocks. But there are no blocks in C and the basic enumerators here need to be used in the real VM. Apologies." (codeRanges := self codeRangesFor: cogMethod) do: [:range| (cogMethod cmType = CMMethod) ifTrue: [mapEntries keysAndValuesDo: [:mcpc :label| | bcpc selectorOrNone | ((range includes: mcpc) and: [(AnnotationsWithBytecodePCs includes: label) and: [range cogMethod stackCheckOffset > 0]]) ifTrue: [bcpc := self bytecodePCFor: mcpc startBcpc: range startpc in: range cogMethod. bcpc ~= 0 ifTrue: [label = #IsSendCall ifTrue: [selectorOrNone := (self selectorForSendAt: mcpc annotation: IsSendCall in: cogMethod methodObject). (selectorOrNone isInteger and: [objectMemory addressCouldBeOop: selectorOrNone]) ifTrue: [selectorOrNone := objectMemory stringOf: selectorOrNone]. selectorOrNone := ' ', selectorOrNone] ifFalse: [selectorOrNone := '']. mapEntries at: mcpc put: label, selectorOrNone, ' bc ', bcpc printString, '/', (bcpc + 1) printString]]]]. (cogMethod blockEntryOffset ~= 0 and: [range first = (cogMethod blockEntryOffset + cogMethod asInteger)]) ifTrue: [aStream nextPutAll: 'blockEntry:'; cr. self blockDispatchFor: cogMethod perform: #disassemble:from:to:arg: arg: aStream] ifFalse: [range first > (cogMethod address + cmNoCheckEntryOffset) ifTrue: [self printMethodHeader: range cogMethod on: aStream]. self disassembleFrom: range first to: range last labels: mapEntries on: aStream]]. aStream nextPutAll: 'startpc: '; print: codeRanges first startpc; cr. (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]) ifTrue: [[self mapFor: cogMethod performUntil: #printMapEntry:mcpc:args: arg: { aStream. codeRanges. cogMethod }] on: AssertionFailure do: [:ex| ex primitiveChangeClassTo: ResumableVMError basicNew. ":) :) :)" ex resume: nil]]. ^cogMethod! Item was changed: ----- Method: Cogit>>expectedClosedPICPrototype: (in category 'in-line cacheing') ----- expectedClosedPICPrototype: cPIC "Use asserts to check if the ClosedPICPrototype is as expected from compileClosedPICPrototype, and can be updated as required via rewriteCPICCaseAt:tag:objRef:target:. If all asserts pass, answer 0, otherwise answer a bit mask identifying all the errors." "self disassembleFrom: methodZoneBase + (self sizeof: CogMethod) to: methodZoneBase + closedPICSize" <var: #cPIC type: #'CogMethod *'> | pc errors object classTag entryPoint | errors := 0. pc := cPIC asUnsignedInteger + firstCPICCaseOffset. "First jump is unconditional; subsequent ones are conditional" object := backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongByteSize. (self asserta: object = 16r5EAF00D) ifFalse: [errors := 1]. entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. (self asserta: entryPoint = (self cPICPrototypeCaseOffset + 16rCA5E10)) ifFalse: [errors := errors + 2]. + 1 to: MaxCPICCases - 1 do: - 1 to: maxCPICCases - 1 do: [:i | | methodObjPC classTagPC | pc := pc + cPICCaseSize. "verify information in case is as expected." methodObjPC := pc - backEnd jumpLongConditionalByteSize - backEnd cmpC32RTempByteSize. object := backEnd literalBeforeFollowingAddress: methodObjPC. (self asserta: object = (16rBADA550 + i)) ifFalse: [errors := errors bitOr: 4]. classTagPC := pc - backEnd jumpLongConditionalByteSize. classTag := backEnd literal32BeforeFollowingAddress: classTagPC. (self asserta: classTag = (16rBABE1F15 + i)) ifFalse: [errors := errors bitOr: 8]. entryPoint := backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc. (self asserta: entryPoint = (self cPICPrototypeCaseOffset + 16rCA5E10 + (i * 16))) ifFalse: [errors := errors bitOr: 16]. "change case via rewriteCPICCaseAt:tag:objRef:target:" self rewriteCPICCaseAt: pc tag: (classTag bitXor: 16r5A5A5A5A) objRef: (object bitXor: 16rA5A5A5A5) target: (entryPoint bitXor: 16r55AA50). "don't xor least 4 bits to leave instruction alignment undisturbed" "verify information in case is as expected post update." object := backEnd literalBeforeFollowingAddress: methodObjPC. (self asserta: object = (16rBADA550 + i bitXor: 16rA5A5A5A5)) ifFalse: [errors := errors bitOr: 32]. classTag := backEnd literal32BeforeFollowingAddress: classTagPC. (self asserta: classTag = (16rBABE1F15 + i bitXor: 16r5A5A5A5A)) ifFalse: [errors := errors bitOr: 64]. entryPoint := backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc. (self asserta: entryPoint = ((self cPICPrototypeCaseOffset + 16rCA5E10 + (i * 16)) bitXor: 16r55AA50)) ifFalse: [errors := errors bitOr: 128]. "finally restore case to the original state" self rewriteCPICCaseAt: pc tag: (classTag bitXor: 16r5A5A5A5A) objRef: (object bitXor: 16rA5A5A5A5) target: (entryPoint bitXor: 16r55AA50)]. entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc + cPICEndSize - literalsManager endSizeOffset. (self asserta: entryPoint = (self cPICMissTrampolineFor: 0)) ifFalse: [errors := errors + 256]. ^errors! Item was changed: ----- Method: Cogit>>generateClosedPICPrototype (in category 'initialization') ----- generateClosedPICPrototype "Generate the prototype ClosedPIC to determine how much space as full PIC takes. When we first allocate a closed PIC it only has one or two cases and we want to grow it. So we have to determine how big a full one is before hand." | cPIC endAddress | <var: 'cPIC' type: #'CogMethod *'> - maxCPICCases := 6. "stack allocate the various collections so that they are effectively garbage collected on return." + self allocateOpcodes: MaxCPICCases * 9 bytecodes: 0. - self allocateOpcodes: maxCPICCases * 9 bytecodes: 0. methodLabel address: methodZoneBase; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self compileClosedPICPrototype. self computeMaximumSizes. cPIC := (self cCoerceSimple: methodZoneBase to: #'CogMethod *'). closedPICSize := (self sizeof: CogMethod) + (self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod)). endAddress := self outputInstructionsAt: methodZoneBase + (self sizeof: CogMethod). self assert: methodZoneBase + closedPICSize = endAddress. firstCPICCaseOffset := endCPICCase0 address - methodZoneBase. cPICEndOfCodeOffset := cPICEndOfCodeLabel address - methodZoneBase. cPICCaseSize := endCPICCase1 address - endCPICCase0 address. + cPICEndSize := closedPICSize - (MaxCPICCases - 1 * cPICCaseSize + firstCPICCaseOffset). - cPICEndSize := closedPICSize - (maxCPICCases - 1 * cPICCaseSize + firstCPICCaseOffset). closedPICSize := methodZone roundUpLength: closedPICSize. self assert: picInterpretAbort address = (methodLabel address + self picInterpretAbortOffset). self assert: (self expectedClosedPICPrototype: cPIC) = 0. "tpr this is a little tiresome but after any assert checking we need to 0 out the case0 objRef rather than leaving 16r5EAF00D lying around" backEnd storeLiteral: 0 beforeFollowingAddress: endCPICCase0 address - backEnd jumpLongByteSize. "update the methodZoneBase so we keep the prototype aruond for later use" methodZoneBase := self alignUptoRoutineBoundary: endAddress. cPICPrototype := cPIC. "self cCode: '' inSmalltalk: [self disassembleFrom: cPIC + (self sizeof: CogMethod) to: cPIC + closedPICSize - 1. self halt]"!

1 0

VM Maker: VMMaker.oscog-cb.1929.mcz
by commits＠source.squeak.org 01 Sep '16

01 Sep '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1929.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1929 Author: cb Time: 1 September 2016, 5:24:44.893576 pm UUID: 201ac61a-7b23-4bb6-a0bc-840ee3e8e89a Ancestors: VMMaker.oscog-cb.1928 When a loop is taken enough time to trigger jit compilation, it needs in the SistaV1 bytecode set to check if the activation is a full block and call the correct JIT compiler method if this is the case. =============== Diff against VMMaker.oscog-cb.1928 =============== Item was changed: ----- Method: CoInterpreter>>attemptToSwitchToMachineCode: (in category 'jump bytecodes') ----- attemptToSwitchToMachineCode: bcpc "Attempt to convert the current interpreted activation into a machine code activation, and if this is popssible, jump into machine code. bcpc is the 0-relative pc of the backward branch bytecode (not any preceding extension)." + | cogMethod pc cls | - | cogMethod pc | <inline: false> <var: #cogMethod type: #'CogMethod *'> + (self methodHasCogMethod: method) + ifFalse: + [SistaV1BytecodeSet + ifTrue: + [ ((self iframeIsBlockActivation: framePointer) + and: [(self isVanillaBlockClosure: (cls := self frameStackedReceiver: framePointer numArgs: (self frameNumArgs: framePointer))) not ]) + ifTrue: + ["Compiled block / full closure" + cogit cogFullBlockMethod: method numCopied: (objectMemory numPointerSlotsOf: cls) - FullClosureFirstCopiedValueIndex] + ifFalse: + ["Compiled method" + cogit cog: method selector: objectMemory nilObject] ] + ifFalse: + [cogit cog: method selector: objectMemory nilObject] ]. - (self methodHasCogMethod: method) ifFalse: - [cogit cog: method selector: objectMemory nilObject]. (self methodHasCogMethod: method) ifTrue: [cogMethod := self cogMethodOf: method. pc := self convertToMachineCodeFrame: cogMethod bcpc: bcpc. self assertValidMachineCodeFrame: pc. self push: pc. self push: objectMemory nilObject. cogit ceEnterCogCodePopReceiverReg]!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2016