Vm-dev January 2020

vm-dev@lists.squeakfoundation.org

35 participants
236 discussions

[OpenSmalltalk/opensmalltalk-vm] 4e57f6: Update the ARMv8 builds to specify DUAL_MAPPED_COD...
by Eliot Miranda 30 Jan '20

30 Jan '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 4e57f60a09801c434fc3642a98e6d00e45e981bf https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4e57f60a09801c434f… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-01-29 (Wed, 29 Jan 2020) Changed paths: M build.linux64ARMv8/squeak.cog.spur/build.assert/mvm M build.linux64ARMv8/squeak.cog.spur/build.debug/mvm M build.linux64ARMv8/squeak.cog.spur/build/mvm M platforms/Cross/vm/sq.h M platforms/unix/plugins/SecurityPlugin/sqUnixSecurity.c M platforms/unix/vm/sqUnixMain.c M platforms/unix/vm/sqUnixSpurMemory.c Log Message: ----------- Update the ARMv8 builds to specify DUAL_MAPPED_CODE_ZONE. Fix a security warning in the SecurityPlugin; sqUnixSecurity.c should use getcwd instead of getwd. Fix compilation warnings regarding printfs for ARMv8 in sqUnixMain.c. Change ioAllocateDualMappedCodeZoneOfSize:MethodZone: to ioAllocateDualMappedCodeZone:OfSize:WritableZone: to get around pointer scrambling devices on modern linuxes.

1 0

VM Maker: VMMaker.oscog-eem.2688.mcz
by commits＠source.squeak.org 30 Jan '20

30 Jan '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2688.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2688 Author: eem Time: 29 January 2020, 5:35:28.094553 pm UUID: f874f102-0876-492c-a56e-5b3e6449b2e7 Ancestors: VMMaker.oscog-nice.2687 Cogit/ARMv8/Slang: fix several C compiler warnings re the Cogit (ARMv8 now has no warnings). Cogit: Refactor indexForSelector:in:at: to indexForSelector:in: in the back end so it can be inlined (via a macro). Dual mapped zone: Refactor initializeCodeZoneFrom:upTo:executableCodeZone: to initializeCodeZoneFrom:upTo:writableCodeZone:, i.e. writableCodeZone = 0 is the flag that we're in the old regime. Change the mapper to be ioAllocateDualMappedCodeZone:OfSize:WritableZone:, both to arrange that the zones are ordered as we want (executable below writable) but also to evade security-policy scrambling of pointers to mapped memory. Slang: emit constant for (M << N) and (M - N) - L for constant integers. =============== Diff against VMMaker.oscog-nice.2687 =============== Item was changed: ----- Method: CCodeGenerator>>generateAsConstantExpression:on: (in category 'C translation support') ----- generateAsConstantExpression: msgNode on: aStream "Attempt to generate the C code for this message onto the given stream. Answer if the attempt succeeded. This handles integer overflow of int expressions in a 64-bit compiler." msgNode constantNumbericValueOrNil ifNotNil: [:value| + ((vmClass notNil and: [vmClass objectMemoryClass wordSize = 8]) + ifTrue: [value between: -1 << 63 and: 1 << 64 - 1] + ifFalse: [value between: -1 << 31 and: 1 << 32 - 1]) ifTrue: + [aStream nextPutAll: (self cLiteralFor: value). + ^true]]. - (value between: -1 << 31 and: 1 << 31 - 1) ifFalse: - [aStream nextPutAll: (self cLiteralFor: value). - ^true]]. ^false! Item was added: + ----- Method: CCodeGenerator>>maybeBreakOnInlineIn: (in category 'inlining') ----- + maybeBreakOnInlineIn: aTMethod + "convenient for debugging..." + breakOnInline == true ifTrue: + [aTMethod halt: aTMethod selector]! Item was changed: ----- Method: CoInterpreter>>initializeCodeGenerator:executableZone: (in category 'initialization') ----- initializeCodeGenerator: writableCodeZone executableZone: executableZone "If the OS platform requires dual mapping to achieve a writable code zone then writableCodeZone will be the non-zero address of the read/write zone and executableZone will be the address of the read/execute zone. If the OS platform does not require dual mapping then writableCodeZone will be the first address past the guard page and executableZone will be zero (i.e. we use the first cogCodeSize bytes of memory to house the code zone)." cogit + initializeCodeZoneFrom: executableZone + upTo: executableZone + cogCodeSize + writableCodeZone: writableCodeZone. - initializeCodeZoneFrom: writableCodeZone - upTo: writableCodeZone + cogCodeSize - executableCodeZone: executableZone. self assert: heapBase >= (writableCodeZone + cogCodeSize max: executableZone + cogCodeSize)! Item was changed: ----- Method: CoInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating an amount of memory to its object heap. V3: desiredHeapSize is the total size of the heap. Fail if the image has an unknown format or requires more than the specified amount of memory. Spur: desiredHeapSize is ignored; this routine will attempt to provide at least extraVMMemory's ammount of free space after the image is loaded, taking any free space in teh image into account. extraVMMemory is stored in the image header and is accessible as vmParameterAt: 23. If extraVMMemory is 0, the value defaults to the default grow headroom. Fail if the image has an unknown format or if sufficient memory cannot be allocated. Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." | swapBytes headerStart headerSize dataSize oldBaseAddr minimumMemory heapSize bytesRead bytesToShift firstSegSize hdrNumStackPages hdrEdenBytes hdrCogCodeSize headerFlags hdrMaxExtSemTabSize allocationReserve executableZone writableCodeZone | <var: #f type: #sqImageFile> <var: #heapSize type: #usqInt> <var: #dataSize type: #'size_t'> <var: #minimumMemory type: #usqInt> <var: #desiredHeapSize type: #usqInt> <var: #allocationReserve type: #usqInt> <var: #headerStart type: #squeakFileOffsetType> <var: #imageOffset type: #squeakFileOffsetType> <var: #executableZone type: #'char *'> <var: #writableCodeZone type: #'char *'> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - 4. "record header start position" headerSize := self getWord32FromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getWord32FromFile: f swap: swapBytes. "N.B. ignored in V3." hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [cogit defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. cogCodeSize > cogit maxCogCodeSize ifTrue: [cogCodeSize := cogit maxCogCodeSize]. hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "To cope with modern OSs that disallow executing code in writable memory we dual-map the code zone, one mapping with read/write permissions and the other with read/execute permissions. In such a configuration the code zone has already been alloated and is not included in (what is no longer) the initial alloc." + self ioAllocateDualMappedCodeZone: (self addressOf: executableZone) OfSize: cogCodeSize WritableZone: (self addressOf: writableCodeZone). - executableZone := self ioAllocateDualMappedCodeZoneOfSize: cogCodeSize MethodZone: (self addressOf: writableCodeZone). effectiveCogCodeSize := executableZone > 0 ifTrue: [0] ifFalse: [cogCodeSize]. "compare memory requirements with availability" allocationReserve := self interpreterAllocationReserveBytes. minimumMemory := "no need to include the stackZone; this is alloca'ed" effectiveCogCodeSize + dataSize + objectMemory newSpaceBytes + allocationReserve. objectMemory hasSpurMemoryManagerAPI ifTrue: [| freeOldSpaceInImage headroom | freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes. headroom := objectMemory initialHeadroom: extraVMMemory givenFreeOldSpaceInImage: freeOldSpaceInImage. heapSize := objectMemory roundUpHeapSize: effectiveCogCodeSize "no need to include the stackZone; this is alloca'ed" + dataSize + headroom + objectMemory newSpaceBytes + (headroom > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])] ifFalse: [heapSize := effectiveCogCodeSize "no need to include the stackZone; this is alloca'ed" + desiredHeapSize + objectMemory newSpaceBytes + (desiredHeapSize - dataSize > allocationReserve ifTrue: [0] ifFalse: [allocationReserve]). heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]]. "allocate a contiguous block of memory for the Squeak heap and ancilliary data structures" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. objectMemory memory ifNil: [self insufficientMemoryAvailableError]. heapBase := objectMemory setHeapBase: objectMemory memory + effectiveCogCodeSize memoryLimit: objectMemory memory + heapSize endOfMemory: objectMemory memory + effectiveCogCodeSize + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" + self initializeCodeGenerator: writableCodeZone executableZone: objectMemory memory. - self initializeCodeGenerator: writableCodeZone - executableZone: (writableCodeZone > 0 ifTrue: [executableZone] ifFalse: [objectMemory memory]). ^dataSize! Item was added: + ----- Method: CogAbstractInstruction>>inlineCacheValueForSelector:in: (in category 'inline cacheing') ----- + inlineCacheValueForSelector: selector in: aCogMethod + "Answer the value to put in an inline-cache that is being loaded with the selector. + Usually this is simply the selector, but in 64-bits the cache is only 32-bits wide and so the + cache is loaded with the index of the selector. This is the defalt 32-bit implementation." + <cmacro: '(backEnd,selector,aCogMethod) (selector)'> + ^selector! Item was changed: ----- Method: CogIA32Compiler>>dispatchConcretizeProcessorSpecific (in category 'generate machine code') ----- dispatchConcretizeProcessorSpecific "Attempt to generate concrete machine code for the instruction at address. This is part of the inner dispatch of concretizeAt: actualAddress which exists only to get around the number of literals limits in the SqueakV3 (blue book derived) bytecode set." opcode caseOf: { "Specific Control/Data Movement" [CDQ] -> [^self concretizeCDQ]. [IDIVR] -> [^self concretizeIDIVR]. [IMULRR] -> [^self concretizeMulRR]. [CPUID] -> [^self concretizeCPUID]. [CMPXCHGAwR] -> [^self concretizeCMPXCHGAwR]. [CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]. [LFENCE] -> [^self concretizeFENCE: 5]. [MFENCE] -> [^self concretizeFENCE: 6]. [SFENCE] -> [^self concretizeFENCE: 7]. [LOCK] -> [^self concretizeLOCK]. [XCHGAwR] -> [^self concretizeXCHGAwR]. [XCHGMwrR] -> [^self concretizeXCHGMwrR]. [XCHGRR] -> [^self concretizeXCHGRR]. [FSTPS] -> [^self concretizeFSTPS]. [FSTPD] -> [^self concretizeFSTPD]. [REP] -> [^self concretizeREP]. [CLD] -> [^self concretizeCLD]. [MOVSB] -> [^self concretizeMOVSB]. [MOVSD] -> [^self concretizeMOVSD]. [BSR] -> [^self concretizeBSR]. + }. + ^0! - }! Item was changed: ----- Method: CogMethodZone>>clearSavedPICUsageCount: (in category 'compaction') ----- clearSavedPICUsageCount: cogMethod "For Sista, where we want PICs to last so they can be observed, we need to keep PICs unless they are definitely unused. So we need to identify unused PICs. So in planCompact, zero the usage counts of all PICs, saving the actual usage count in blockEntryOffset. Then in relocateMethodsPreCompaction (actually in relocateIfCallOrMethodReference:mcpc:delta:) restore the usage counts of used PICs. Finally in compactCompiledCode, clear the blockEntryOffset of the unused PICs; they will then have a zero count and be reclaimed in the next code compaction." + <inline: #always> (SistaVM and: [cogMethod cmType = CMClosedPIC]) ifTrue: [cogMethod blockEntryOffset: 0]! Item was changed: ----- Method: CogMethodZone>>kosherYoungReferrers (in category 'young referers') ----- kosherYoungReferrers "Answer that all entries in youngReferrers are in-use and have the cmRefersToYoung flag set. Used to check that the youngreferrers pruning routines work correctly." <api> | pointer cogMethod | <var: #pointer type: #usqInt> <var: #cogMethod type: #'CogMethod *'> (youngReferrers > limitAddress or: [youngReferrers < mzFreeStart]) ifTrue: [^false]. pointer := youngReferrers. [pointer < limitAddress] whileTrue: [cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'. cogMethod cmType ~= CMFree ifTrue: [cogMethod cmRefersToYoung ifFalse: [^false]. (self occurrencesInYoungReferrers: cogMethod) ~= 1 ifTrue: [^false]]. pointer := pointer + objectMemory wordSize]. cogMethod := cogit cCoerceSimple: baseAddress to: #'CogMethod *'. + [cogMethod < self limitZony] whileTrue: - [cogMethod < mzFreeStart] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [(self occurrencesInYoungReferrers: cogMethod) ~= (cogMethod cmRefersToYoung ifTrue: [1] ifFalse: [0]) ifTrue: [^false]]. cogMethod := self methodAfter: cogMethod]. ^true! Item was changed: ----- Method: CogMethodZone>>linkOnUnpairedMethodList: (in category 'compaction') ----- linkOnUnpairedMethodList: cogMethod + <inline: #always> NewspeakVM ifTrue: [cogMethod nextMethodOrIRCs: unpairedMethodList. unpairedMethodList := cogMethod asUnsignedInteger]! Item was changed: ----- Method: CogMethodZone>>maybeLinkOnUnpairedMethodList: (in category 'compaction') ----- maybeLinkOnUnpairedMethodList: cogMethod + <inline: #always> NewspeakVM ifTrue: [(cogMethod cmType = CMMethod and: [(coInterpreter rawHeaderOf: cogMethod methodObject) asInteger ~= cogMethod asInteger]) ifTrue: [(cogit writableMethodFor: cogMethod) nextMethodOrIRCs: unpairedMethodList. unpairedMethodList := cogMethod asUnsignedInteger]]! Item was changed: ----- Method: CogObjectRepresentation>>genSmallIntegerComparison:orDoubleComparison:invert: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator invert: invertComparison "Stack looks like return address" | jumpNonInt jumpFail jumpCond r | + <var: 'jumpFPOpcodeGenerator' declareC: 'AbstractInstruction * NoDbgRegParms (*jumpFPOpcodeGenerator)(void *)'> + <var: 'jumpCond' type: #'AbstractInstruction *'> - <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpFPOpcodeGenerator)(void *)'> r := self genSmallIntegerComparison: jumpOpcode. r < 0 ifTrue: [^r]. self cppIf: #DPFPReg0 defined ifTrue: "Fall through on non-SmallInteger argument. Argument may be a Float : let us check or fail" [self smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := self genJumpImmediate: Arg0Reg]. self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. self genCmpClassFloatCompactIndexR: SendNumArgsReg. jumpFail := cogit JumpNonZero: 0. "It was a Float, so convert the receiver to double and perform the operation" self genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. cogit ConvertR: ReceiverResultReg Rd: DPFPReg0. self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. invertComparison "May need to invert for NaNs" ifTrue: [cogit CmpRd: DPFPReg0 Rd: DPFPReg1] ifFalse: [cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" cogit genMoveFalseR: ReceiverResultReg. cogit genPrimReturn. jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). cogit genPrimReturn. self smallIntegerIsOnlyImmediateType ifTrue: [jumpFail jmpTarget: cogit Label] ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: cogit Label)]]. ^CompletePrimitive! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genSmallIntegerComparison:orDoubleComparison:invert: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator invert: invertComparison "Stack looks like return address" | jumpCond r compareIntFloat jumpAmbiguous jumpNotBoxedFloat jumpNotFloatAtAll jumpNotSmallFloat jumpTrue returnTrue | <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpFPOpcodeGenerator)(void *)'> + <var: 'jumpCond' type: #'AbstractInstruction *'> r := self genSmallIntegerComparison: jumpOpcode. r < 0 ifTrue: [^r]. self cppIf: #DPFPReg0 defined ifTrue: "Fall through on non-SmallInteger argument. Argument may be a Float : let us check or fail" [ "check for Small Float argument" jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. "Case of (int compare: float). Test for ambiguity, that is when (double) intRcvr == floatArg" compareIntFloat := cogit Label. self genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. cogit ConvertR: ReceiverResultReg Rd: DPFPReg0. cogit CmpRd: DPFPReg0 Rd: DPFPReg1. + jumpAmbiguous := cogit JumpFPEqual: 0. - jumpAmbiguous := cogit perform: #JumpFPEqual: with: 0. "Case of non ambiguity, use compareFloat((double) intRcvr,floatArg)" invertComparison "May need to invert for NaNs" ifTrue: [cogit CmpRd: DPFPReg0 Rd: DPFPReg1] ifFalse: [cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" cogit genMoveFalseR: ReceiverResultReg. cogit genPrimReturn. jumpCond jmpTarget: (returnTrue := cogit genMoveTrueR: ReceiverResultReg). cogit genPrimReturn. "Case of ambiguity, use compareInt(intRcvr , (int64) floatArg)" jumpAmbiguous jmpTarget: (cogit ConvertRd: DPFPReg1 R: Arg0Reg). cogit CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" jumpTrue := cogit genConditionalBranch: jumpOpcode operand: 0. cogit genMoveFalseR: ReceiverResultReg. cogit genPrimReturn. jumpTrue jmpTarget: returnTrue. "not a Small Float, check for Boxed Float argument" jumpNotSmallFloat jmpTarget:cogit Label. jumpNotFloatAtAll := self genJumpImmediate: Arg0Reg. self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. self genCmpClassFloatCompactIndexR: SendNumArgsReg. jumpNotBoxedFloat := cogit JumpNonZero: 0. "It was a Boxed Float, so convert the receiver to double and perform the (int compare: float) operation" self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. cogit Jump: compareIntFloat. "not a Float, just let the primitive fall thru failure" jumpNotBoxedFloat jmpTarget: (jumpNotFloatAtAll jmpTarget: cogit Label)]. ^CompletePrimitive! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genEnsureOopInRegNotForwarded:scratchReg:ifForwarder:ifNotForwarder: (in category 'compile abstract instructions') ----- genEnsureOopInRegNotForwarded: reg scratchReg: scratch ifForwarder: fwdJumpTarget ifNotForwarder: nonFwdJumpTargetOrZero "Make sure that the oop in reg is not forwarded. Use the fact that isForwardedObjectClassIndexPun is a power of two to save an instruction." + <var: 'fwdJumpTarget' type: #'void *'> "maybe a fixup or an instruction" + <var: 'nonFwdJumpTargetOrZero' type: #'void *'> "maybe a fixup or an instruction" | imm ok finished | self assert: reg ~= scratch. imm := self genJumpImmediate: reg. "notionally self genGetClassIndexOfNonImm: reg into: scratch. cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg. but the following is an instruction shorter:" cogit MoveMw: 0 r: reg R: scratch. cogit AndCq: objectMemory classIndexMask - objectMemory isForwardedObjectClassIndexPun R: scratch. ok := cogit JumpNonZero: 0. self genLoadSlot: 0 sourceReg: reg destReg: reg. cogit Jump: fwdJumpTarget. finished := nonFwdJumpTargetOrZero asUnsignedInteger = 0 ifTrue: [cogit Label] ifFalse: [nonFwdJumpTargetOrZero]. imm jmpTarget: (ok jmpTarget: finished). ^0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genStoreTrampolineCalled:instVarIndex: (in category 'initialization') ----- genStoreTrampolineCalled: trampolineName instVarIndex: instVarIndex "Convention: - RcvrResultReg holds the object mutated. If immutability failure: - TempReg holds the instance variable index mutated if instVarIndex > numDedicatedStoreTrampoline - ClassReg holds the value to store Registers are not lived across this trampoline as the immutability failure may need new stack frames." <option: #IMMUTABILITY> + <var: 'trampolineName' type: #'char *'> <inline: false> | startAddress | startAddress := cogit methodZoneBase. cogit zeroOpcodeIndex. CheckRememberedInTrampoline ifTrue: [self genStoreTrampolineCheckingRememberedCalled: trampolineName instVarIndex: instVarIndex] ifFalse: [self genStoreTrampolineNotCheckingRememberedCalled: trampolineName instVarIndex: instVarIndex]. cogit outputInstructionsForGeneratedRuntimeAt: startAddress. cogit recordGeneratedRunTime: trampolineName address: startAddress. cogit recordRunTimeObjectReferences. ^startAddress! Item was changed: ----- Method: CogSSBytecodeFixup>>reinitialize (in category 'accessing') ----- reinitialize <inline: true> + targetInstruction := 0. + simStackPtr := 0. - targetInstruction := simStackPtr := 0. LowcodeVM ifTrue: [simNativeStackPtr := simNativeStackSize := 0]! Item was added: + ----- Method: CogVMSimulator>>ioAllocateDualMappedCodeZone:OfSize:WritableZone: (in category 'initialization') ----- + ioAllocateDualMappedCodeZone: executableZonePluggableAccessor OfSize: codeSize WritableZone: writableZonePluggableAccessor + "Simulation of ioAllocateDualMappedCodeZoneOfSize:MethodZone:. + If the DUAL_MAPPED_CODE_ZONE preference is set obey it and simulate a dual mapped zone, + causing the system to use the first codeSize * 2 bytes of memory to simulate a dual mapped zone. + Otherwise answer zero, causing the system to work as it used to, using the first codeSize bytes of + memory for the code zone." + (InitializationOptions at: #'DUAL_MAPPED_CODE_ZONE' ifAbsent: [false]) + ifTrue: + [executableZonePluggableAccessor at: 0 put: Cogit guardPageSize. + writableZonePluggableAccessor at: 0 put: codeSize] + ifFalse: + [executableZonePluggableAccessor at: 0 put: 0. + writableZonePluggableAccessor at: 0 put: 0]! Item was removed: - ----- Method: CogVMSimulator>>ioAllocateDualMappedCodeZoneOfSize:MethodZone: (in category 'initialization') ----- - ioAllocateDualMappedCodeZoneOfSize: codeSize MethodZone: writableCodeZonePluggableAccessor - "Simulation of ioAllocateDualMappedCodeZoneOfSize:MethodZone:. - If the DUAL_MAPPED_CODE_ZONE preference is set obey it and simulate a dual mapped zone, - causing the system to use the first codeSize * 2 bytes of memory to simulate a dual mapped zone. - Otherwise answer zero, causing the system to work as it used to, using the first codeSize bytes of - memory for the code zone." - ^(InitializationOptions at: #'DUAL_MAPPED_CODE_ZONE' ifAbsent: [false]) - ifTrue: - [writableCodeZonePluggableAccessor at: 0 put: codeSize. - Cogit guardPageSize] - ifFalse: - [0]! Item was changed: ----- Method: CogVMSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "CogVMSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize hdrCogCodeSize stackZoneSize methodCacheSize primTraceLogSize allocationReserve executableZone writableCodeZone | "open image file and read the header" (f := self openImageFileNamed: fileName) ifNil: [^self]. "Set the image name and the first argument; there are no arguments during simulation unless set explicitly." systemAttributes at: 1 put: fileName. ["begin ensure block..." imageName := f fullName. f binary. version := self getWord32FromFile: f swap: false. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := version byteSwap32) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getWord32FromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getWord32FromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. stackZoneSize := self computeStackZoneSize. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [cogit defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. desiredCogCodeSize := hdrCogCodeSize. self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] ifFalse: [64]). hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] ifFalse: [72]). firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "For Open PICs to be able to probe the method cache during simulation the methodCache must be relocated to memory." methodCacheSize := methodCache size * objectMemory wordSize. primTraceLogSize := primTraceLog size * objectMemory wordSize. "To cope with modern OSs that disallow executing code in writable memory we dual-map the code zone, one mapping with read/write permissions and the other with read/execute permissions. In such a configuration the code zone has already been alloated and is not included in (what is no longer) the initial alloc." + self ioAllocateDualMappedCodeZone: (self addressOf: executableZone put: [:v| executableZone := v]) + OfSize: cogCodeSize + WritableZone: (self addressOf: writableCodeZone put: [:v| writableCodeZone := v]). - executableZone := self ioAllocateDualMappedCodeZoneOfSize: cogCodeSize - MethodZone: (self addressOf: writableCodeZone put: [:v| writableCodeZone := v]). "In simulation all we can do is use memory, so if we're simulating dual mapping we use double the memory and simulate the memory sharing in the Cogit's backEnd." + effectiveCogCodeSize := writableCodeZone > 0 ifTrue: [cogCodeSize * 2] ifFalse: [cogCodeSize]. - effectiveCogCodeSize := executableZone > 0 ifTrue: [cogCodeSize * 2] ifFalse: [cogCodeSize]. "allocate interpreter memory. This list is in address order, low to high. In the actual VM the stack zone exists on the C stack." heapBase := (Cogit guardPageSize + effectiveCogCodeSize + stackZoneSize + methodCacheSize + primTraceLogSize + self rumpCStackSize) roundUpTo: objectMemory allocationUnit. "compare memory requirements with availability" allocationReserve := self interpreterAllocationReserveBytes. objectMemory hasSpurMemoryManagerAPI ifTrue: [| freeOldSpaceInImage headroom | freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes. headroom := objectMemory initialHeadroom: extraVMMemory givenFreeOldSpaceInImage: freeOldSpaceInImage. heapSize := objectMemory roundUpHeapSize: dataSize + headroom + objectMemory newSpaceBytes + (headroom > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])] ifFalse: [heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + (extraBytes > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])]. heapBase := objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. self assert: cogCodeSize \\ 4 = 0. self assert: objectMemory memoryLimit \\ 4 = 0. self assert: self rumpCStackSize \\ 4 = 0. objectMemory allocateMemoryOfSize: objectMemory memoryLimit. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. count ~= dataSize ifTrue: [self halt]] ensure: [f close]. self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + effectiveCogCodeSize + stackZoneSize. self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + effectiveCogCodeSize + stackZoneSize + methodCacheSize. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" UIManager default informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. + writableCodeZone ~= 0 - executableZone ~= 0 ifTrue: [self initializeCodeGenerator: cogCodeSize + (Cogit guardPageSize * 2) executableZone: Cogit guardPageSize] ifFalse: + [self initializeCodeGenerator: 0 + executableZone: Cogit guardPageSize]! - [self initializeCodeGenerator: Cogit guardPageSize - executableZone: 0]! Item was changed: ----- Method: CogX64Compiler>>dispatchConcretizeProcessorSpecific (in category 'generate machine code') ----- dispatchConcretizeProcessorSpecific "Attempt to generate concrete machine code for the instruction at address. This is part of the inner dispatch of concretizeAt: actualAddress which exists only to get around the number of literals limits in the SqueakV3 (blue book derived) bytecode set." opcode caseOf: { "Specific Control/Data Movement" [CDQ] -> [^self concretizeCDQ]. [IDIVR] -> [^self concretizeIDIVR]. [IMULRR] -> [^self concretizeMulRR]. [CPUID] -> [^self concretizeCPUID]. "[CMPXCHGAwR] -> [^self concretizeCMPXCHGAwR]." "[CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]." "[LFENCE] -> [^self concretizeFENCE: 5]." "[MFENCE] -> [^self concretizeFENCE: 6]. [SFENCE] -> [^self concretizeFENCE: 7]." "[LOCK] -> [^self concretizeLOCK]." "[XCHGAwR] -> [^self concretizeXCHGAwR]." "[XCHGMwrR] -> [^self concretizeXCHGMwrR]." [XCHGRR] -> [^self concretizeXCHGRR]. [REP] -> [^self concretizeREP]. [CLD] -> [^self concretizeCLD]. [MOVSB] -> [^self concretizeMOVSB]. [MOVSQ] -> [^self concretizeMOVSQ]. [BSR] -> [^self concretizeBSR]. + }. + ^0! - }! Item was added: + ----- Method: CogX64Compiler>>inlineCacheValueForSelector:in: (in category 'inline cacheing') ----- + inlineCacheValueForSelector: selector in: aCogMethod + "Answer the value to put in an inline-cache that is being loaded with the selector. + Usually this is simply the selector, but in 64-bits the cache is only 32-bits wide and so the + cache is loaded with the index of the selector. Override to use the 64-bit implementation." + <cmacro: '(backEnd,selector,aCogMethod) indexForSelectorin(selector,aCogMethod)'> + ^cogit indexForSelector: selector in: aCogMethod! Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'nsSendCacheSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'processorFrameValid' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'selfSendTrampolines' 'dynamicSuperSendTrampolines' 'implicitReceiverSendTrampolines' 'outerSendTrampolines' 'ceEnclosingObjectTrampoline' 'numIRCs' 'indexOfIRC' 'theIRCs') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"dispdbg.h"'; "must precede cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up" addHeaderFile:'"cogmethod.h"'. NewspeakVM ifTrue: [aCCodeGenerator addHeaderFile:'"nssendcache.h"']. aCCodeGenerator addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'. aCCodeGenerator var: #ceGetFP declareC: 'usqIntptr_t (*ceGetFP)(void)'; var: #ceGetSP declareC: 'usqIntptr_t (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverReg declareC: 'void (*ceCallCogCodePopReceiverReg)(void)'; var: #realCECallCogCodePopReceiverReg declareC: 'void (*realCECallCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverAndClassRegs declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)'; var: #realCECallCogCodePopReceiverAndClassRegs declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)'; var: #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)(void)' withCRs; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)\#endif /* COGMTVM */' withCRs. CogCompilerClass basicNew numCheckLZCNTOpcodes > 0 ifTrue: [aCCodeGenerator var: #ceCheckLZCNTFunction declareC: 'static usqIntptr_t (*ceCheckLZCNTFunction)(void)']. CogCompilerClass basicNew numCheckFeaturesOpcodes > 0 ifTrue: [aCCodeGenerator var: #ceCheckFeaturesFunction declareC: 'static usqIntptr_t (*ceCheckFeaturesFunction)(void)']. CogCompilerClass basicNew numICacheFlushOpcodes > 0 ifTrue: [aCCodeGenerator var: #ceFlushICache declareC: 'static void (*ceFlushICache)(usqIntptr_t from, usqIntptr_t to)']. 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 *'. aCCodeGenerator declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. 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 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'; declareVar: #debugPrimCallStackOffset 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 Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was added: + ----- Method: Cogit class>>prepareToBeAddedToCodeGenerator: (in category 'translation') ----- + prepareToBeAddedToCodeGenerator: aCodeGen + "It is either this or scan cmacro methods for selectors." + BytesPerWord = 8 ifTrue: + [aCodeGen retainMethods: #(indexForSelector:in:)]! Item was changed: ----- Method: Cogit>>addressIsInInstructions: (in category 'testing') ----- addressIsInInstructions: address + <cmacro: '(address) (!!((usqInt)(address) & (BytesPerWord-1)) \ + && (address) >= &abstractOpcodes[0] \ + && (address) < &abstractOpcodes[opcodeIndex])'> + ^(abstractOpcodes object identityIndexOf: address) between: 1 and: opcodeIndex! - <var: #address type: #'AbstractInstruction *'> - ^self cCode: '!!((usqInt)(address) & BytesPerWord-1) \ - && (address) >= &abstractOpcodes[0] \ - && (address) < &abstractOpcodes[opcodeIndex]' - inSmalltalk: [(abstractOpcodes object identityIndexOf: address) between: 1 and: opcodeIndex]! Item was changed: ----- Method: Cogit>>cPICPrototype (in category 'accessing') ----- cPICPrototype "For Cogit clas>>#genAndDisPICoptions:" <doNotGenerate> + ^cPICPrototype address! - ^cPICPrototype! Item was changed: ----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') ----- ceSICMiss: receiver "An in-line cache check in a method has failed. The failing entry check has jumped to the ceMethodAbort abort call at the start of the method which has called this routine. If possible allocate a closed PIC for the current and existing classes. The stack looks like: receiver args sender return address sp=> ceMethodAbort call return address So we can find the method that did the failing entry check at ceMethodAbort call return address - missOffset and we can find the send site from the outer return address." <api> | pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result | <var: #pic type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> "Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method." innerReturn := coInterpreter popStack asUnsignedInteger. targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'. (objectMemory isOopForwarded: receiver) ifTrue: [^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. outerReturn := coInterpreter stackTop asUnsignedInteger. self assert: (outerReturn between: methodZoneBase and: methodZone freeStart). entryPoint := backEnd callTargetFromReturnAddress: outerReturn. self assert: targetMethod selector ~= objectMemory nilObject. self assert: targetMethod asInteger + cmEntryOffset = entryPoint. self lookup: targetMethod selector for: receiver methodAndErrorSelectorInto: [:method :errsel| newTargetMethodOrNil := method. errorSelectorOrNil := errsel]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. ((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [(backEnd inlineCacheTagAt: outerReturn) = self picAbortDiscriminatorValue or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue: [result := self patchToOpenPICFor: targetMethod selector numArgs: targetMethod cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. "See if an Open PIC is already available." pic := methodZone openPICWithSelector: targetMethod selector. (pic isNil or: [self allowEarlyOpenPICPromotion not]) ifTrue: ["otherwise attempt to create a closed PIC for the two cases." pic := self cogPICSelector: targetMethod selector numArgs: targetMethod cmNumArgs Case0Method: targetMethod Case1Method: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. (pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue: ["For some reason the PIC couldn't be generated, most likely a lack of code memory. Continue as if this is an unlinked send." pic asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. backEnd flushICacheFrom: pic asUnsignedInteger to: pic asUnsignedInteger + closedPICSize]. "Relink the send site to the pic. If to an open PIC then reset the cache tag to the selector, for the benefit of the cacheTag assert check in checkIfValidOopRef:pc:cogMethod: et al." extent := pic cmType = CMOpenPIC ifTrue: [backEnd rewriteInlineCacheAt: outerReturn + tag: (backEnd + inlineCacheValueForSelector: targetMethod selector + in: coInterpreter mframeHomeMethodExport) - tag: (self inlineCacheValueForSelector: targetMethod selector - in: coInterpreter mframeHomeMethodExport - at: outerReturn) target: pic asInteger + cmEntryOffset] ifFalse: [backEnd rewriteCallAt: outerReturn target: pic asInteger + cmEntryOffset]. backEnd flushICacheFrom: outerReturn asUnsignedInteger - extent to: outerReturn asUnsignedInteger. "Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)" coInterpreter executeCogPIC: pic fromLinkedSendWithReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil! Item was changed: ----- Method: Cogit>>codeByteAt:put: (in category 'generate machine code - dual mapped zone support') ----- codeByteAt: address put: aByte "production uses the macro..." + <cmacro: '(address,value) byteAtput((address) + codeToDataDelta, value)'> - <cmacro: '(adress,value) byteAtput((address) + codeToDataDelta, value)'> self codeWriteBreakpoint: address. "simulation writes twice if simulating dual mapping..." codeToDataDelta ~= 0 ifTrue: [objectMemory byteAt: address + codeToDataDelta put: aByte]. ^objectMemory byteAt: address put: aByte! Item was changed: ----- Method: Cogit>>codeLongAt:put: (in category 'generate machine code - dual mapped zone support') ----- codeLongAt: address put: aLong "production uses the macro..." + <cmacro: '(address,value) longAtput((address) + codeToDataDelta, value)'> - <cmacro: '(adress,value) longAtput((address) + codeToDataDelta, value)'> self codeWriteBreakpoint: address. "simulation writes twice if simulating dual mapping..." codeToDataDelta ~= 0 ifTrue: [objectMemory longAt: address + codeToDataDelta put: aLong]. ^objectMemory longAt: address put: aLong! Item was changed: ----- Method: Cogit>>codeWriteBreakpoint: (in category 'generate machine code - dual mapped zone support') ----- codeWriteBreakpoint: address + <doNotGenerate> "(address = 16r520) ifTrue: [self halt]" "(address between: 16r2398 and: 16r23B0) ifTrue: [self halt]"! Item was changed: ----- Method: Cogit>>cogMNUPICSelector:receiver:methodOperand:numArgs: (in category 'in-line cacheing') ----- cogMNUPICSelector: selector receiver: rcvr methodOperand: methodOperand numArgs: numArgs <api> "Attempt to create a one-case PIC for an MNU. The tag for the case is at the send site and so doesn't need to be generated." <returnTypeC: #'CogMethod *'> | startAddress writablePIC actualPIC | ((objectMemory isYoung: selector) or: [(objectRepresentation inlineCacheTagForInstance: rcvr) = self picAbortDiscriminatorValue]) ifTrue: [^0]. coInterpreter compilationBreak: selector point: (objectMemory numBytesOf: selector) isMNUCase: true. self assert: endCPICCase0 notNil. "get memory in the code zone for the CPIC; if that fails we return an error code for the sender to use to work out how to blow up" startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [coInterpreter callForCogCompiledCodeCompaction. ^0]. self maybeBreakGeneratingFrom: startAddress to: startAddress + closedPICSize - 1. writablePIC := self writableMethodFor: startAddress. "memcpy the prototype across to our allocated space; because anything else would be silly" + self codeMemcpy: writablePIC _: cPICPrototype _: closedPICSize. - self codeMemcpy: writablePIC - _: (self cCoerceSimple: cPICPrototype to: #'CogMethod *') - _: closedPICSize. self fillInCPICHeader: writablePIC numArgs: numArgs numCases: 1 hasMNUCase: true selector: selector. self configureMNUCPIC: (actualPIC := self cCoerceSimple: startAddress to: #'CogMethod *') methodOperand: methodOperand numArgs: numArgs + delta: startAddress - cPICPrototype asUnsignedInteger. - delta: startAddress - cPICPrototype. self assert: (backEnd callTargetFromReturnAddress: startAddress + missOffset) = (self picAbortTrampolineFor: numArgs). self assertValidDualZoneFrom: startAddress to: startAddress + closedPICSize. backEnd flushICacheFrom: startAddress to: startAddress + closedPICSize. ^actualPIC! 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]. (SistaVM and: [objectRepresentation canPinObjects and: [cogMethod counters ~= 0]]) ifTrue: [(objectRepresentation couldBeDerivedObject: cogMethod counters) ifFalse: [^14]]. (NewspeakVM and: [objectRepresentation canPinObjects and: [cogMethod nextMethodOrIRCs ~= 0]]) ifTrue: [(cogMethod nextMethodOrIRCs < methodZone zoneEnd) ifTrue: "check the nextMethod (unpairedMethodList) unless we're compacting." [(methodZone compactionInProgress + or: [cogMethod nextMethodOrIRCs = (methodZone methodFor: cogMethod nextMethodOrIRCs asVoidPointer) asUnsignedInteger]) ifFalse: - or: [cogMethod nextMethodOrIRCs = (methodZone methodFor: cogMethod nextMethodOrIRCs) asUnsignedInteger]) ifFalse: [^15]] ifFalse: [(objectRepresentation couldBeDerivedObject: cogMethod nextMethodOrIRCs) ifFalse: [^16]]]. ^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 or: [methodZone compactionInProgress + or: [cogMethod methodObject = (methodZone methodFor: cogMethod methodObject asVoidPointer) asUnsignedInteger]]) ifFalse: - or: [cogMethod methodObject = (methodZone methodFor: cogMethod methodObject) asUnsignedInteger]]) ifFalse: [^23]]. cogMethod stackCheckOffset ~= 0 ifTrue: [^24]. ^0]. cogMethod cmType = CMClosedPIC ifTrue: [cogMethod blockSize ~= closedPICSize ifTrue: [^31]. (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>>cogPICSelector:numArgs:Case0Method:Case1Method:tag:isMNUCase: (in category 'in-line cacheing') ----- cogPICSelector: selector numArgs: numArgs Case0Method: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase "Attempt to create a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; link to its unchecked entry-point - a CompiledMethod; link to ceInterpretMethodFromPIC: - a CompiledMethod; link to ceMNUFromPICMNUMethod:receiver:" <var: #case0CogMethod type: #'CogMethod *'> <returnTypeC: #'CogMethod *'> | startAddress writablePIC actualPIC | (objectMemory isYoung: selector) ifTrue: [^self cCoerceSimple: YoungSelectorInPIC to: #'CogMethod *']. coInterpreter compilationBreak: selector point: (objectMemory numBytesOf: selector) isMNUCase: isMNUCase. "get memory in the code zone for the CPIC; if that fails we return an error code for the sender to use to work out how to blow up" startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. self maybeBreakGeneratingFrom: startAddress to: startAddress + closedPICSize - 1. writablePIC := self writableMethodFor: startAddress. "memcpy the prototype across to our allocated space; because anything else would be silly" + self codeMemcpy: writablePIC _: cPICPrototype _: closedPICSize. - self codeMemcpy: writablePIC - _: (self cCoerceSimple: cPICPrototype to: #'CogMethod *') - _: closedPICSize. self fillInCPICHeader: writablePIC numArgs: numArgs numCases: 2 hasMNUCase: isMNUCase selector: selector. self configureCPIC: (actualPIC := self cCoerceSimple: startAddress to: #'CogMethod *') Case0: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs + delta: startAddress - cPICPrototype asUnsignedInteger. - delta: startAddress - cPICPrototype. self assert: (backEnd callTargetFromReturnAddress: startAddress + missOffset) = (self picAbortTrampolineFor: numArgs). self assertValidDualZoneFrom: startAddress to: startAddress + closedPICSize. backEnd flushICacheFrom: startAddress to: startAddress + closedPICSize. ^actualPIC! Item was changed: ----- Method: Cogit>>collectCogConstituentFor:Annotation:Mcpc:Bcpc:Method: (in category 'profiling primitives') ----- collectCogConstituentFor: descriptor Annotation: isBackwardBranchAndAnnotation Mcpc: mcpc Bcpc: bcpc Method: cogMethodArg <var: #descriptor type: #'BytecodeDescriptor *'> <var: #mcpc type: #'char *'> <var: #cogMethodArg type: #'void *'> <var: #targetMethod type: #'CogMethod *'> | address entryPoint | descriptor ifNil: [^0]. descriptor isMapped ifFalse: [^0]. + address := self positiveMachineIntegerFor: mcpc asUnsignedInteger. - address := self positiveMachineIntegerFor: mcpc. address ifNil: [^PrimErrNoMemory]. "This cannot trigger a GC but fails if not enough space in Eden," "Assumes we write the values into topRemappableOop" coInterpreter storePointerUnchecked: cogConstituentIndex ofObject: coInterpreter topRemappableOop withValue: address. coInterpreter storePointerUnchecked: cogConstituentIndex + 1 ofObject: coInterpreter topRemappableOop withValue: (objectMemory integerObjectOf: bcpc). cogConstituentIndex := cogConstituentIndex + 2. "Collect any first case classTags for closed PICs." ((isBackwardBranchAndAnnotation noMask: 1) and: [self isSendAnnotation: isBackwardBranchAndAnnotation >> 1]) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "send is linked" [self targetMethodAndSendTableFor: entryPoint annotation: isBackwardBranchAndAnnotation >> 1 into: [:targetMethod :sendTable| targetMethod cmType = CMClosedPIC ifTrue: [targetMethod methodObject: (objectRepresentation classForInlineCacheTag: (backEnd inlineCacheTagAt: mcpc))]]]]. ^0! Item was added: + ----- Method: Cogit>>indexForSelector:in: (in category 'in-line cacheing') ----- + indexForSelector: selector in: cogMethod + "Answer the value to put in an inline-cache that is being loaded with the selector. + Usually this is simply the selector, but in 64-bits the cache is only 32-bits wide + and so the cache is loaded with the index of the selector." + <var: #cogMethod type: #'CogMethod *'> + <inline: false> + | methodOop | + "First search the special selectors; there are only 32 of them so this shouldn't take too long. + We could short-circuit this by keeping a hint bit in the target method, or by maintaining the + maximum range of selector oops in specialSelectors since they're likely to cluster." + 0 to: NumSpecialSelectors - 1 do: + [:i| + selector = (coInterpreter specialSelector: i) ifTrue: + [^-1 - i]]. + methodOop := cogMethod methodObject. + "Then search the method's literal frame... open code fetchPointer:ofObject: for speed..." + LiteralStart to: (objectMemory literalCountOfMethodHeader: cogMethod methodHeader) do: + [:i| + (objectMemory longAt: i * objectMemory bytesPerOop + objectMemory baseHeaderSize + methodOop) = selector ifTrue: + [self assert: selector = (coInterpreter literal: i - 1 ofMethod: methodOop). + ^i - 1]]. + + self error: 'could not find selector in method when unlinking send site'. + ^0! Item was removed: - ----- Method: Cogit>>indexForSelector:in:at: (in category 'in-line cacheing') ----- - indexForSelector: selector in: cogMethod at: mcpc - "Answer the value to put in an inline-cache that is being loaded with the selector. - Usually this is simply the selector, but in 64-bits the cache is only 32-bits wide - and so the cache is loaded with the index of the selector." - <var: #cogMethod type: #'CogMethod *'> - <inline: false> - | methodOop | - self assert: (mcpc asUnsignedInteger > cogMethod asUnsignedInteger - and: [mcpc < (cogMethod asUnsignedInteger + cogMethod blockSize)]). - "First search the special selectors; there are only 32 of them so this shouldn't take too long. - We could short-circuit this by keeping a hint bit in the target method, or by maintaining the - maximum range of selector oops in specialSelectors since they're likely to cluster." - 0 to: NumSpecialSelectors - 1 do: - [:i| - selector = (coInterpreter specialSelector: i) ifTrue: - [^-1 - i]]. - methodOop := cogMethod methodObject. - "Then search the method's literal frame... open code fetchPointer:ofObject: for speed..." - LiteralStart to: (objectMemory literalCountOfMethodHeader: cogMethod methodHeader) do: - [:i| - (objectMemory longAt: i * objectMemory bytesPerOop + objectMemory baseHeaderSize + methodOop) = selector ifTrue: - [self assert: selector = (coInterpreter literal: i - 1 ofMethod: methodOop). - ^i - 1]]. - - self error: 'could not find selector in method when unlinking send site'. - ^0! Item was removed: - ----- Method: Cogit>>initializeCodeZoneFrom:upTo:executableCodeZone: (in category 'initialization') ----- - initializeCodeZoneFrom: startAddress upTo: endAddress executableCodeZone: executableCodeZone - <api> - "If the OS platform requires dual mapping to achieve a writable code zone - then startAddress will be the non-zero address of the read/write zone and - executableCodeZone will be the non-zero address of the read/execute zone. - If the OS platform does not require dual mapping then startAddress will be - the first address of the read/write/executable zone and executableCodeZone - will be zero." - self initializeBackend. - codeToDataDelta := executableCodeZone = 0 ifTrue: [0] ifFalse: [startAddress - executableCodeZone]. - backEnd stopsFrom: startAddress - codeToDataDelta to: endAddress - codeToDataDelta - 1. - self cCode: - [executableCodeZone = 0 ifTrue: - [self sqMakeMemoryExecutableFrom: startAddress To: endAddress]] - inSmalltalk: - [startAddress = self class guardPageSize ifTrue: - [backEnd stopsFrom: 0 to: endAddress - 1]. - self initializeProcessor]. - "Logically we want to deal with execution addresses; these are what we want to call, - modify, etc. All we have to do is arrange that whenever we write, we write to the - corresponding data address for each execution address, but *what* we write is only - sensible within *execution* addresses. Therefore... - dataAddress := executableAddress + codeToDataDelta, hence - codeToDataDelta := startAddress - executableCodeZone" - - codeBase := methodZoneBase := startAddress - codeToDataDelta. - minValidCallAddress := (codeBase min: coInterpreter interpretAddress) - min: coInterpreter primitiveFailAddress. - methodZone manageFrom: methodZoneBase to: endAddress - codeToDataDelta. - self assertValidDualZone. - self maybeGenerateCheckFeatures. - self maybeGenerateCheckLZCNT. - self maybeGenerateICacheFlush. - self generateVMOwnerLockFunctions. - self genGetLeafCallStackPointer. - self generateStackPointerCapture. - self generateTrampolines. - self computeEntryOffsets. - self computeFullBlockEntryOffsets. - self generateClosedPICPrototype. - self alignMethodZoneBase. - "repeat so that now the methodZone ignores the generated run-time" - methodZone manageFrom: methodZoneBase to: endAddress - codeToDataDelta. - "N.B. this is assumed to be the last thing done in initialization; see Cogit>>initialized" - self generateOpenPICPrototype! Item was added: + ----- Method: Cogit>>initializeCodeZoneFrom:upTo:writableCodeZone: (in category 'initialization') ----- + initializeCodeZoneFrom: startAddress upTo: endAddress writableCodeZone: writableCodeZone + <api> + "If the OS platform requires dual mapping to achieve a writable code zone + then startAddress will be the non-zero address of the read/write zone and + executableCodeZone will be the non-zero address of the read/execute zone. + If the OS platform does not require dual mapping then startAddress will be + the first address of the read/write/executable zone and executableCodeZone + will be zero." + self initializeBackend. + codeToDataDelta := writableCodeZone = 0 ifTrue: [0] ifFalse: [writableCodeZone - startAddress]. + backEnd stopsFrom: startAddress to: endAddress - 1. + self cCode: + [writableCodeZone = 0 ifTrue: + [self sqMakeMemoryExecutableFrom: startAddress To: endAddress]] + inSmalltalk: + [startAddress = self class guardPageSize ifTrue: + [backEnd stopsFrom: 0 to: endAddress - 1]. + self initializeProcessor]. + + codeBase := methodZoneBase := startAddress. + minValidCallAddress := (codeBase min: coInterpreter interpretAddress) min: coInterpreter primitiveFailAddress. + methodZone manageFrom: methodZoneBase to: endAddress. + self assertValidDualZone. + self maybeGenerateCheckFeatures. + self maybeGenerateCheckLZCNT. + self maybeGenerateICacheFlush. + self generateVMOwnerLockFunctions. + self genGetLeafCallStackPointer. + self generateStackPointerCapture. + self generateTrampolines. + self computeEntryOffsets. + self computeFullBlockEntryOffsets. + self generateClosedPICPrototype. + self alignMethodZoneBase. + "repeat so that now the methodZone ignores the generated run-time" + methodZone manageFrom: methodZoneBase to: endAddress. + "N.B. this is assumed to be the last thing done in initialization; see Cogit>>initialized" + self generateOpenPICPrototype! Item was removed: - ----- Method: Cogit>>inlineCacheValueForSelector:in:at: (in category 'in-line cacheing') ----- - inlineCacheValueForSelector: selector in: aCogMethod at: mcpc - "Answer the value to put in an inline-cache that is being loaded with the selector. - Usually this is simply the selector, but in 64-bits the cache is only 32-bits wide - and so the cache is loaded with the index of the selector." - <var: #aCogMethod type: #'CogMethod *'> - <inline: true> - ^self inlineCacheTagsAreIndexes - ifTrue: [self indexForSelector: selector in: aCogMethod at: mcpc] - ifFalse: [selector]! Item was changed: ----- Method: Cogit>>patchToOpenPICFor:numArgs:receiver: (in category 'in-line cacheing') ----- patchToOpenPICFor: selector numArgs: numArgs receiver: receiver "Code entry closed PIC full or miss to an instance of a young class or to a young target method. Attempt to patch the send site to an open PIC. Answer if the attempt succeeded; in fact it will only return if the attempt failed. The stack looks like: receiver args sp=> sender return address" <api> | oPIC outerReturn extent | <var: #oPIC type: #'CogMethod *'> outerReturn := coInterpreter stackTop. "See if an Open PIC is already available." oPIC := methodZone openPICWithSelector: selector. oPIC ifNil: ["otherwise attempt to create an Open PIC." oPIC := self cogOpenPICSelector: selector numArgs: numArgs. (oPIC asInteger between: MaxNegativeErrorCode and: -1) ifTrue: ["For some reason the PIC couldn't be generated, most likely a lack of code memory." oPIC asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. ^false]]. "Relink the send site to the pic. Reset the cache tag to the selector, for the benefit of the cacheTag assert check in checkIfValidOopRef:pc:cogMethod: et al." extent := backEnd rewriteInlineCacheAt: outerReturn + tag: (backEnd + inlineCacheValueForSelector: selector + in: coInterpreter mframeHomeMethodExport) - tag: (self inlineCacheValueForSelector: selector - in: coInterpreter mframeHomeMethodExport - at: outerReturn) target: oPIC asInteger + cmEntryOffset. backEnd flushICacheFrom: outerReturn asUnsignedInteger - extent to: outerReturn asUnsignedInteger; flushICacheFrom: oPIC asUnsignedInteger to: oPIC asUnsignedInteger + openPICSize. "Jump into the oPIC at its entry" coInterpreter executeCogMethod: oPIC fromLinkedSendWithReceiver: receiver. "NOTREACHED" ^true! Item was changed: ----- Method: Cogit>>relocateIfCallOrMethodReference:mcpc:delta: (in category 'compaction') ----- relocateIfCallOrMethodReference: annotation mcpc: mcpc delta: refDelta <var: #mcpc type: #'char *'> | callDelta entryPoint targetMethod unlinkedRoutine | <var: #targetMethod type: #'CogMethod *'> <var: #nsSendCache type: #'NSSendCache *'> callDelta := backEnd zoneCallsAreRelative ifTrue: [refDelta] ifFalse: [0]. NewspeakVM ifTrue: [| nsSendCache | annotation = IsNSSendCall ifTrue: ["Retrieve the send cache before relocating the stub call. Fetching the send cache asserts the stub call points below all the cogged methods, but until this method is actually moved, the adjusted stub call may appear to point to somewhere in the method zone." nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. "Fix call to trampoline. This method is moving [delta] bytes, and calls are relative, so adjust the call by -[delta] bytes" backEnd relocateCallBeforeReturnPC: mcpc asInteger by: callDelta negated. nsSendCache target ~= 0 ifTrue: "Send is linked" [entryPoint := nsSendCache target. targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. targetMethod cmType = CMMethod ifTrue: "send target not freed; just relocate. The cache has an absolute target, so only adjust by the target method's displacement." [nsSendCache target: entryPoint + targetMethod objectHeader] ifFalse: "send target was freed, unlink" [self voidNSSendCache: nsSendCache]]. ^0]]. (self isPureSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint <= methodZoneBase ifTrue: "send is not linked; just relocate" [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: callDelta negated. ^0]. "It's a linked send; find which kind." self offsetAndSendTableFor: entryPoint annotation: annotation into: [:offset :sendTable| targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. targetMethod cmType ~= CMFree ifTrue: "send target not freed; just relocate." [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: (callDelta - targetMethod objectHeader) negated. SistaVM ifTrue: "See comment in planCompaction" [methodZone restorePICUsageCount: targetMethod]. ^0]. "Target was freed; map back to an unlinked send; but include this method's reocation" unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). unlinkedRoutine := unlinkedRoutine - callDelta. backEnd rewriteInlineCacheAt: mcpc asInteger + tag: (backEnd inlineCacheValueForSelector: targetMethod selector in: enumeratingCogMethod) - tag: (self inlineCacheValueForSelector: targetMethod selector in: enumeratingCogMethod at: mcpc) target: unlinkedRoutine. ^0]]. annotation = IsRelativeCall ifTrue: [backEnd relocateCallBeforeReturnPC: mcpc asInteger by: callDelta negated. ^0]. annotation = IsAbsPCReference ifTrue: [backEnd relocateMethodReferenceBeforeAddress: mcpc asInteger by: refDelta]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkSendAt:targetMethod:sendTable: (in category 'in-line cacheing') ----- unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable <inline: true> | unlinkedRoutine | unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). backEnd rewriteInlineCacheAt: mcpc asInteger + tag: (backEnd inlineCacheValueForSelector: targetMethod selector in: enumeratingCogMethod) - tag: (self inlineCacheValueForSelector: targetMethod selector in: enumeratingCogMethod at: mcpc) target: unlinkedRoutine. codeModified := true! Item was removed: - ----- Method: RegisterAllocatingCogit>>initializeCodeZoneFrom:upTo:executableCodeZone: (in category 'initialization') ----- - initializeCodeZoneFrom: startAddress upTo: endAddress executableCodeZone: executableCodeZone - scratchSimStack := self cCode: [self malloc: self simStackSlots * (self sizeof: CogSimStackEntry)] - inSmalltalk: [CArrayAccessor on: ((1 to: self simStackSlots) collect: [:ign| CogRegisterAllocatingSimStackEntry new])]. - super initializeCodeZoneFrom: startAddress upTo: endAddress executableCodeZone: executableCodeZone! Item was added: + ----- Method: RegisterAllocatingCogit>>initializeCodeZoneFrom:upTo:writableCodeZone: (in category 'initialization') ----- + initializeCodeZoneFrom: startAddress upTo: endAddress writableCodeZone: writableCodeZone + scratchSimStack := self cCode: [self malloc: self simStackSlots * (self sizeof: CogSimStackEntry)] + inSmalltalk: [CArrayAccessor on: ((1 to: self simStackSlots) collect: [:ign| CogRegisterAllocatingSimStackEntry new])]. + super initializeCodeZoneFrom: startAddress upTo: endAddress writableCodeZone: writableCodeZone! Item was changed: ----- Method: SimpleStackBasedCogit>>compilePrimitive (in category 'primitive generators') ----- compilePrimitive "Compile a primitive. If possible, performance-critical primtiives 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> | code opcodeIndexAtPrimitive primitiveDescriptor primitiveRoutine flags | <var: #primitiveDescriptor type: #'PrimitiveDescriptor *'> <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> primitiveIndex = 0 ifTrue: [^0]. code := 0. "Note opcodeIndex so that compileFallbackToInterpreterPrimitive: can discard arg load instructions for unimplemented primitives." opcodeIndexAtPrimitive := opcodeIndex. "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 don't care" or: [primitiveDescriptor primNumArgs = (coInterpreter argumentCountOf: methodObj)])]]) ifTrue: [code := objectRepresentation perform: primitiveDescriptor primitiveGenerator]. (code < 0 and: [code ~= UnimplementedPrimitive]) ifTrue: "Generator failed, so no point continuing..." [^code]. code = UnfailingPrimitive ifTrue: [^0]. "If the machine code verison 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]. flags := coInterpreter primitivePropertyFlags: primitiveIndex. (flags anyMask: PrimCallDoNotJIT) ifTrue: [^ShouldNotJIT]. (flags anyMask: PrimCallOnSmalltalkStack) ifTrue: [self assert: flags = PrimCallOnSmalltalkStack. + ^self compileMachineCodeInterpreterPrimitive: (self cCoerceSimple: (coInterpreter mcprimFunctionForPrimitiveIndex: primitiveIndex) + to: 'void (*)(void)')]. - ^self compileMachineCodeInterpreterPrimitive: (coInterpreter mcprimFunctionForPrimitiveIndex: primitiveIndex)]. ((primitiveRoutine := coInterpreter functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex) = 0 "no primitive" + or: [primitiveRoutine = (self cCoerceSimple: #primitiveFail to: 'void (*)(void)')]) ifTrue: - or: [primitiveRoutine = #primitiveFail]) ifTrue: [^self genFastPrimFail]. minValidCallAddress := minValidCallAddress min: primitiveRoutine asUnsignedInteger. ^self compileInterpreterPrimitive: primitiveRoutine flags: flags! Item was removed: - ----- Method: SistaCogit>>initializeCodeZoneFrom:upTo:executableCodeZone: (in category 'initialization') ----- - initializeCodeZoneFrom: startAddress upTo: endAddress executableCodeZone: executableCodeZone - initialCounterValue := MaxCounterValue. - super initializeCodeZoneFrom: startAddress upTo: endAddress executableCodeZone: executableCodeZone! Item was added: + ----- Method: SistaCogit>>initializeCodeZoneFrom:upTo:writableCodeZone: (in category 'initialization') ----- + initializeCodeZoneFrom: startAddress upTo: endAddress writableCodeZone: writableCodeZone + initialCounterValue := MaxCounterValue. + super initializeCodeZoneFrom: startAddress upTo: endAddress writableCodeZone: writableCodeZone! Item was removed: - ----- Method: SistaCogitClone>>initializeCodeZoneFrom:upTo:executableCodeZone: (in category 'initialization') ----- - initializeCodeZoneFrom: startAddress upTo: endAddress executableCodeZone: executableCodeZone - initialCounterValue := MaxCounterValue. - super initializeCodeZoneFrom: startAddress upTo: endAddress executableCodeZone: executableCodeZone! Item was added: + ----- Method: SistaCogitClone>>initializeCodeZoneFrom:upTo:writableCodeZone: (in category 'initialization') ----- + initializeCodeZoneFrom: startAddress upTo: endAddress writableCodeZone: writableCodeZone + initialCounterValue := MaxCounterValue. + super initializeCodeZoneFrom: startAddress upTo: endAddress writableCodeZone: writableCodeZone! Item was changed: ----- Method: TMethod>>inferReturnTypeFromReturnsIn: (in category 'type inference') ----- inferReturnTypeFromReturnsIn: aCodeGen "Attempt to infer the return type of the receiver from returns in the parse tree." "this for determining which returns have which return types:" "aCodeGen pushScope: declarations while: [parseTree nodesSelect: [:n| n isReturn] thenCollect: [:n| | s | s := Set new. self addTypesFor: n expression to: s in: aCodeGen. {n. s}]]" aCodeGen maybeBreakForTestToInline: selector in: self. returnType ifNotNil: [^self]. aCodeGen pushScope: declarations while: [| hasReturn returnTypes | hasReturn := false. returnTypes := Set new. "Debug: (| rettypes | rettypes := Dictionary new. parseTree nodesDo: [:node| node isReturn ifTrue: [| types | self addTypesFor: node expression to: (types := Set new) in: aCodeGen. rettypes at: node expression put: types]]. rettypes)" parseTree nodesDo: [:node| node isReturn ifTrue: [hasReturn := true. "If we encounter a send of an as-yet-untyped method then abort, retrying and computing the type when that method is fully typed." (self addTypesFor: node expression to: returnTypes in: aCodeGen) ifTrue: [^self]]]. returnTypes remove: #implicit ifAbsent: []. returnTypes := aCodeGen harmonizeReturnTypesIn: returnTypes. hasReturn ifTrue: [returnTypes size > 1 ifTrue: [| message | message := String streamContents: [:s| s nextPutAll: 'conflicting return types '. returnTypes do: [:t| s nextPutAll: t] separatedBy: [s nextPutAll: ', ']. s nextPutAll: ' in '; nextPutAll: selector; cr]. Notification signal: message. + aCodeGen logger ensureCr; show: message. + aCodeGen maybeBreakOnInlineIn: self]. - aCodeGen logger ensureCr; show: message]. returnTypes size = 1 ifTrue: [self returnType: returnTypes anyOne]] ifFalse: [self returnType: (aCodeGen implicitReturnTypeFor: selector)]]! Item was changed: ----- Method: TSendNode>>constantNumbericValueOrNil (in category 'accessing') ----- constantNumbericValueOrNil + (#(* // + - << >>) includes: selector) ifTrue: - (#(* // + -) includes: selector) ifTrue: [receiver constantNumbericValueOrNil ifNotNil: [:rval| arguments first constantNumbericValueOrNil ifNotNil: [:aval| ^rval perform: selector with: aval]]]. ^nil!

1 0

VM Maker: VMMaker-dtl.409.mcz
by commits＠source.squeak.org 30 Jan '20

30 Jan '20

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.409.mcz ==================== Summary ==================== Name: VMMaker-dtl.409 Author: dtl Time: 2 December 2019, 7:15:49.04 pm UUID: 2f30017c-5c17-49a2-b431-9fcdb82b7770 Ancestors: VMMaker-dtl.408 Let primitiveResumeFromSnapshot fail if the current interpreter cannot support the image format of the snapshot object. =============== Diff against VMMaker-dtl.408 =============== Item was changed: ----- Method: ContextInterpreter>>primitiveResumeFromSnapshot (in category 'snapshot utility primitives') ----- primitiveResumeFromSnapshot "Discard the current object memory and resume interpreter execution in the provided snapshot." <export: true> | expectedArraySize snapshotValues size newMemoryBytesOrBitmap bigEndian snapshotImageFormat snapshotStartOfMemory snapshotSpecialObjectsOop snapshotLastHash screenSizePoint headerSize imageBytes imageHeaderFlags snapshotExtraVMMemory swapBytes snapshotFullScreen defaultHeapSize desiredHeapSize | expectedArraySize := 11. "ImageSnapshot new asValues size => 11" argumentCount == 1 ifFalse: [ ^self primitiveFailFor: PrimErrBadNumArgs]. snapshotValues := self stackObjectValue: 0. self assertClassOf: snapshotValues is: (objectMemory splObj: ClassArray). self successful ifFalse: [ ^self primitiveFailFor: PrimErrBadArgument]. size := objectMemory numSlotsOf: snapshotValues. size < expectedArraySize ifTrue: [ ^self primitiveFailFor: PrimErrBadArgument]. newMemoryBytesOrBitmap := objectMemory fetchPointer: 0 ofObject: snapshotValues. bigEndian := (objectMemory fetchPointer: 1 ofObject: snapshotValues) = objectMemory trueObject. snapshotImageFormat := objectMemory integerValueOf: (objectMemory fetchPointer: 2 ofObject: snapshotValues).. + (self readableFormat: snapshotImageFormat) + ifFalse: [ ^self primitiveFailFor: PrimErrInappropriate ]. headerSize := objectMemory integerValueOf: (objectMemory fetchPointer: 3 ofObject: snapshotValues).. imageBytes := self positive32BitValueOf: (objectMemory fetchPointer: 4 ofObject: snapshotValues).. "good for up to 2GB image" snapshotStartOfMemory := objectMemory integerValueOf: (objectMemory fetchPointer: 5 ofObject: snapshotValues).. snapshotSpecialObjectsOop := objectMemory integerValueOf: (objectMemory fetchPointer: 6 ofObject: snapshotValues).. snapshotLastHash := objectMemory integerValueOf: (objectMemory fetchPointer: 7 ofObject: snapshotValues).. screenSizePoint := objectMemory fetchPointer: 8 ofObject: snapshotValues.. self assertClassOf: screenSizePoint is: (objectMemory splObj: ClassPoint). self successful ifFalse: [ ^self primitiveFailFor: PrimErrBadArgument]. imageHeaderFlags := objectMemory integerValueOf: (objectMemory fetchPointer: 9 ofObject: snapshotValues).. snapshotExtraVMMemory := objectMemory integerValueOf: (objectMemory fetchPointer: 10 ofObject: snapshotValues).. swapBytes := bigEndian ~= self isBigEnder. snapshotFullScreen := false. "FIXME" "From sqUnixMain.c #define DefaultHeapSize 20 megabytes BEYOND actual image size" defaultHeapSize := 20 * 1000 * 1000. desiredHeapSize := defaultHeapSize + imageBytes. self snapshotResume: newMemoryBytesOrBitmap heapSize: desiredHeapSize swapBytes: swapBytes oldBaseAddr: snapshotStartOfMemory specialObjectsOop: snapshotSpecialObjectsOop lastHash: snapshotLastHash savedWindowSize: screenSizePoint fullScreenFlag: snapshotFullScreen extraVMMemory: snapshotExtraVMMemory. self pop: 1 thenPush: newMemoryBytesOrBitmap. ! Item was changed: ----- Method: ContextInterpreter>>snapshotResume:heapSize:swapBytes:oldBaseAddr:specialObjectsOop:lastHash:savedWindowSize:fullScreenFlag:extraVMMemory: (in category 'snapshot utility primitives') ----- snapshotResume: byteArrayOrBitmap heapSize: desiredHeapSize swapBytes: swapBytes oldBaseAddr: oldBaseAddr specialObjectsOop: specialObjects lastHash: hashValue savedWindowSize: windowSize fullScreenFlag: fullScreen extraVMMemory: extraMemory "Arrange for the interpreter to resume execution from a snapshot of saved memory and interpreter state. The current object memory and interpreter state is discarded, and the interpreter resumes execution at the point of + the supplied image snapshot." - the supplied image snapshot.." | dataSize sourceBytes mem | <returnTypeC: 'usqInt'> <var: #desiredHeapSize type: 'usqInt'> <var: #dataSize type: 'size_t '> <var: #sourceBytes type: 'char *'> <var: #mem type: 'char *'> "Notes - The parameters windowSize, fullScreen and extraMemory are currently not used when resuming the VM in a new image. The display size and fullscreen mode are probably best set from the image by calling primitiveSetDisplayMode prior to primitiveResumeFromSnapshot. The extraMemory parameter is ignored here because we are simply copying the new object memory over a previously allocated heap space." dataSize := objectMemory byteSizeOf: byteArrayOrBitmap. sourceBytes := objectMemory firstIndexableField: byteArrayOrBitmap. objectMemory setSpecialObjectsOop: specialObjects. objectMemory setLastHash: hashValue. "Copy object memory into allocated space" objectMemory setMemoryLimits: dataSize heapSize: desiredHeapSize. mem := objectMemory pointerForOop: objectMemory getMemory. self mem: mem cp: sourceBytes y: dataSize. self swapBytesAndPrepareToInterpret: swapBytes oldBaseAddr: oldBaseAddr. self interpret. "Resume interpreter execution in the snapshot." ! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.17.2'! - ^'4.17.1'!

1 0

VM Maker: VMMaker-dtl.408.mcz
by commits＠source.squeak.org 30 Jan '20

30 Jan '20

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.408.mcz ==================== Summary ==================== Name: VMMaker-dtl.408 Author: dtl Time: 1 December 2019, 1:20:10.692 pm UUID: ed17eaa5-2fba-4257-8a41-d7912ec2d41c Ancestors: VMMaker-dtl.407 Fix method comment =============== Diff against VMMaker-dtl.407 =============== Item was changed: ----- Method: ContextInterpreter>>snapshotResume:heapSize:swapBytes:oldBaseAddr:specialObjectsOop:lastHash:savedWindowSize:fullScreenFlag:extraVMMemory: (in category 'snapshot utility primitives') ----- snapshotResume: byteArrayOrBitmap heapSize: desiredHeapSize swapBytes: swapBytes oldBaseAddr: oldBaseAddr specialObjectsOop: specialObjects lastHash: hashValue savedWindowSize: windowSize fullScreenFlag: fullScreen extraVMMemory: extraMemory "Arrange for the interpreter to resume execution from a snapshot of saved + memory and interpreter state. The current object memory and interpreter + state is discarded, and the interpreter resumes execution at the point of + the supplied image snapshot.." - memory and interpreter state. The current object memory and interpreter state - will be discarded, and the interpreter will resume execution at the point of the - supplied image snapshot. Answer the address of the previous object memory - or nil if this is the first evaluation." | dataSize sourceBytes mem | <returnTypeC: 'usqInt'> <var: #desiredHeapSize type: 'usqInt'> <var: #dataSize type: 'size_t '> <var: #sourceBytes type: 'char *'> <var: #mem type: 'char *'> "Notes - The parameters windowSize, fullScreen and extraMemory are currently not used when resuming the VM in a new image. The display size and fullscreen mode are probably best set from the image by calling primitiveSetDisplayMode prior to primitiveResumeFromSnapshot. The extraMemory parameter is ignored here because we are simply copying the new object memory over a previously allocated heap space." dataSize := objectMemory byteSizeOf: byteArrayOrBitmap. sourceBytes := objectMemory firstIndexableField: byteArrayOrBitmap. objectMemory setSpecialObjectsOop: specialObjects. objectMemory setLastHash: hashValue. "Copy object memory into allocated space" objectMemory setMemoryLimits: dataSize heapSize: desiredHeapSize. mem := objectMemory pointerForOop: objectMemory getMemory. self mem: mem cp: sourceBytes y: dataSize. self swapBytesAndPrepareToInterpret: swapBytes oldBaseAddr: oldBaseAddr. self interpret. "Resume interpreter execution in the snapshot." !

1 0

VM Maker: VMMaker-dtl.407.mcz
by commits＠source.squeak.org 30 Jan '20

30 Jan '20

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.407.mcz ==================== Summary ==================== Name: VMMaker-dtl.407 Author: dtl Time: 30 November 2019, 3:09:22.384 pm UUID: 190f79b2-f9f4-4585-9010-4db1afe51481 Ancestors: VMMaker-dtl.406 VMMaker 4.17.1 Implement ContextInterpreter>>primitiveResumeFromSnapshot. This primitive discards the current object memory and resumes interpreter execution in the provided snapshot. Use primitiveMemorySnapshotBytesWithHeader or primitiveMemorySnapshotWithHeader to obtain a snapshot object within a running image, and primitveResumeFromSnapshot to resume into a snapshot object from a sacrificial donor image. For supporting code see www.squeaksource.com/ImageSnapshot and package ImageFormat in the source.squeak.org/VMMaker repository. =============== Diff against VMMaker-dtl.406 =============== Item was added: + ----- Method: ContextInterpreter>>primitiveResumeFromSnapshot (in category 'snapshot utility primitives') ----- + primitiveResumeFromSnapshot + "Discard the current object memory and resume interpreter execution + in the provided snapshot." + + <export: true> + | expectedArraySize snapshotValues size newMemoryBytesOrBitmap bigEndian snapshotImageFormat snapshotStartOfMemory snapshotSpecialObjectsOop snapshotLastHash screenSizePoint headerSize imageBytes imageHeaderFlags snapshotExtraVMMemory swapBytes snapshotFullScreen defaultHeapSize desiredHeapSize | + expectedArraySize := 11. "ImageSnapshot new asValues size => 11" + argumentCount == 1 + ifFalse: [ ^self primitiveFailFor: PrimErrBadNumArgs]. + snapshotValues := self stackObjectValue: 0. + self assertClassOf: snapshotValues is: (objectMemory splObj: ClassArray). + self successful + ifFalse: [ ^self primitiveFailFor: PrimErrBadArgument]. + size := objectMemory numSlotsOf: snapshotValues. + size < expectedArraySize ifTrue: [ ^self primitiveFailFor: PrimErrBadArgument]. + newMemoryBytesOrBitmap := objectMemory fetchPointer: 0 ofObject: snapshotValues. + bigEndian := (objectMemory fetchPointer: 1 ofObject: snapshotValues) = objectMemory trueObject. + snapshotImageFormat := objectMemory integerValueOf: (objectMemory fetchPointer: 2 ofObject: snapshotValues).. + headerSize := objectMemory integerValueOf: (objectMemory fetchPointer: 3 ofObject: snapshotValues).. + imageBytes := self positive32BitValueOf: (objectMemory fetchPointer: 4 ofObject: snapshotValues).. "good for up to 2GB image" + snapshotStartOfMemory := objectMemory integerValueOf: (objectMemory fetchPointer: 5 ofObject: snapshotValues).. + snapshotSpecialObjectsOop := objectMemory integerValueOf: (objectMemory fetchPointer: 6 ofObject: snapshotValues).. + snapshotLastHash := objectMemory integerValueOf: (objectMemory fetchPointer: 7 ofObject: snapshotValues).. + screenSizePoint := objectMemory fetchPointer: 8 ofObject: snapshotValues.. + self assertClassOf: screenSizePoint is: (objectMemory splObj: ClassPoint). + self successful + ifFalse: [ ^self primitiveFailFor: PrimErrBadArgument]. + imageHeaderFlags := objectMemory integerValueOf: (objectMemory fetchPointer: 9 ofObject: snapshotValues).. + snapshotExtraVMMemory := objectMemory integerValueOf: (objectMemory fetchPointer: 10 ofObject: snapshotValues).. + + swapBytes := bigEndian ~= self isBigEnder. + snapshotFullScreen := false. "FIXME" + + "From sqUnixMain.c + #define DefaultHeapSize 20 + megabytes BEYOND actual image size" + defaultHeapSize := 20 * 1000 * 1000. + desiredHeapSize := defaultHeapSize + imageBytes. + + self + snapshotResume: newMemoryBytesOrBitmap + heapSize: desiredHeapSize + swapBytes: swapBytes + oldBaseAddr: snapshotStartOfMemory + specialObjectsOop: snapshotSpecialObjectsOop + lastHash: snapshotLastHash + savedWindowSize: screenSizePoint + fullScreenFlag: snapshotFullScreen + extraVMMemory: snapshotExtraVMMemory. + + self pop: 1 thenPush: newMemoryBytesOrBitmap. + + ! Item was added: + ----- Method: ContextInterpreter>>snapshotResume:heapSize:swapBytes:oldBaseAddr:specialObjectsOop:lastHash:savedWindowSize:fullScreenFlag:extraVMMemory: (in category 'snapshot utility primitives') ----- + snapshotResume: byteArrayOrBitmap heapSize: desiredHeapSize swapBytes: swapBytes oldBaseAddr: oldBaseAddr specialObjectsOop: specialObjects lastHash: hashValue savedWindowSize: windowSize fullScreenFlag: fullScreen extraVMMemory: extraMemory + "Arrange for the interpreter to resume execution from a snapshot of saved + memory and interpreter state. The current object memory and interpreter state + will be discarded, and the interpreter will resume execution at the point of the + supplied image snapshot. Answer the address of the previous object memory + or nil if this is the first evaluation." + + | dataSize sourceBytes mem | + <returnTypeC: 'usqInt'> + <var: #desiredHeapSize type: 'usqInt'> + <var: #dataSize type: 'size_t '> + <var: #sourceBytes type: 'char *'> + <var: #mem type: 'char *'> + + "Notes - The parameters windowSize, fullScreen and extraMemory are currently + not used when resuming the VM in a new image. The display size and fullscreen + mode are probably best set from the image by calling primitiveSetDisplayMode + prior to primitiveResumeFromSnapshot. The extraMemory parameter is ignored + here because we are simply copying the new object memory over a previously + allocated heap space." + + dataSize := objectMemory byteSizeOf: byteArrayOrBitmap. + sourceBytes := objectMemory firstIndexableField: byteArrayOrBitmap. + objectMemory setSpecialObjectsOop: specialObjects. + objectMemory setLastHash: hashValue. + + "Copy object memory into allocated space" + objectMemory setMemoryLimits: dataSize heapSize: desiredHeapSize. + mem := objectMemory pointerForOop: objectMemory getMemory. + self mem: mem + cp: sourceBytes + y: dataSize. + + self swapBytesAndPrepareToInterpret: swapBytes oldBaseAddr: oldBaseAddr. + self interpret. "Resume interpreter execution in the snapshot." + ! Item was added: + ----- Method: ObjectMemory>>setMemoryLimits:heapSize: (in category 'image save/restore') ----- + setMemoryLimits: dataSize heapSize: heapSize + "Set memory limits, assuming that previously allocated heap space is sufficient. + Use this instead of allocateMemory: dataSize heapSize: desiredHeapSize when + resuming the interpreter in a new inage snapshot using previously allocated + heap memory." + + | minimumMemory | + <var: #heapSize type: 'usqInt'> + <var: #dataSize type: 'size_t '> + + minimumMemory := dataSize + 100000. "need at least 100K of breathing room" + "compare memory requirements with availability". + heapSize < minimumMemory ifTrue: [ "try to make more space" + self growObjectMemory: minimumMemory - heapSize. + heapSize < minimumMemory ifTrue: [ + interpreter insufficientMemorySpecifiedError]]. + self setEndOfMemory: memory + dataSize. + ! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.17.1'! - ^'4.16.9'!

1 0

VM Maker: VMMaker.oscog-nice.2687.mcz
by commits＠source.squeak.org 30 Jan '20

30 Jan '20

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2687.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2687 Author: nice Time: 30 January 2020, 12:48:42.987807 am UUID: c5a0bd9f-2dd5-4f17-a014-28827e5008c2 Ancestors: VMMaker.oscog-eem.2686 FFI X64 SysV: check for unaligned struct and pass them in MEMORY (alloca'd memory passed thru a pointer). Note: assume that an unaligned struct can be recognized as having a different size (declared size) than the size of properly aligned struct with same fields. Note: this is WIP, and should work for packed struct passed by value, but does not yet work for returned struct, because #ffiCall:ArgArrayOrNil:NumArgs: is using #returnStructInRegisters: which only check for size, not for alignment. Use a new (branchless) formulation for aligning the byteSize to next multiple of fieldAlignment. Encode registryType of invalid unaligned candidate as 2r110, and pass the struct address returned by the foreign function in $RAX register in place of callout limit when stuct is returned by MEMORY. NEXT IDEA: currently, we recompute the registerType at each call with recursive functions which does not sound as the right thing for an efficient FFI. I plan to use some unused bits of the compiledSpec as a cache to store this registerType information (using bitXor: 2r1111, so as un-initialized cache still be 0 - that's why I have encoded INVALID as 2r110, leaving 2r111 for UNINITIALIZED). Such cache would be ABI-defined. I propose highest 4 bytes 16rF0000000. =============== Diff against VMMaker.oscog-eem.2686 =============== Item was changed: ----- Method: ThreadedFFIPlugin>>alignmentOfStructSpec:OfLength:StartingAt: (in category 'marshalling-struct') ----- alignmentOfStructSpec: specs OfLength: specSize StartingAt: indexPtr "Answer with the alignment requirement for a structure/union. Note that indexPtr is a pointer so as to be changed on return. On input, the index points to the structure header (the one with FFIFlagStructure + structSize). On output, the index points the the structure trailer (the FFIFlagStructure)." | spec byteAlignment thisAlignment | <var: #specs type: #'unsigned int*'> <var: #indexPtr type: #'unsigned int*'> <inline: false> spec := specs at: (indexPtr at: 0). self assert: (spec bitAnd: FFIFlagPointer + FFIFlagAtomic + FFIFlagStructure) = FFIFlagStructure. byteAlignment := 1. [indexPtr at: 0 put: (indexPtr at: 0) + 1. (indexPtr at: 0) < specSize] whileTrue: [spec := specs at: (indexPtr at: 0). spec = FFIFlagStructure ifTrue: [^byteAlignment]. thisAlignment := (spec anyMask: FFIFlagPointer) ifTrue: [BytesPerWord] ifFalse: [(spec anyMask: FFIFlagStructure) ifTrue: [self alignmentOfStructSpec: specs OfLength: specSize StartingAt: indexPtr] ifFalse: [spec bitAnd: FFIStructSizeMask]]. byteAlignment := byteAlignment max: thisAlignment]. + self assert: false. "should not reach here - because only ever called for sub-struct" + ^byteAlignment! - self assert: false. "should not reach here" - ^-1! Item was added: + ----- Method: ThreadedFFIPlugin>>checkAlignmentOfStructSpec:OfLength:StartingAt: (in category 'marshalling-struct') ----- + checkAlignmentOfStructSpec: specs OfLength: specSize StartingAt: startIndex + "Check the alignment of a structure and return true if correctly aligned. + If computed size = declared size, then the struct is assumed correctly aligned." + | index spec computedSize fieldAlignment fieldSize declaredSize maxAlignment | + <var: #specs type: #'unsigned int*'> + <var: #indexPtr type: #'unsigned int*'> + <inline: false> + index := startIndex. + spec := specs at: index. + self assert: (spec bitAnd: FFIFlagPointer + FFIFlagAtomic + FFIFlagStructure) = FFIFlagStructure. + (self isUnionSpec: specs OfLength: specSize StartingAt: index) ifTrue: [^true]. + declaredSize := spec bitAnd: FFIStructSizeMask. + computedSize := 0. + maxAlignment := 1. + [index := index + 1. + index < specSize] + whileTrue: + [spec := specs at: index. + spec = FFIFlagStructure + ifTrue: [^(computedSize - 1 bitOr: maxAlignment - 1) + 1 = declaredSize]. + (spec anyMask: FFIFlagPointer) + ifTrue: + [fieldSize := BytesPerWord. + fieldAlignment := fieldSize] + ifFalse: + [fieldSize := spec bitAnd: FFIStructSizeMask. + (spec anyMask: FFIFlagStructure) + ifTrue: + [(self checkAlignmentOfStructSpec: specs OfLength: specSize StartingAt: index) + ifFalse: [^false]. + fieldAlignment := self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: index)] + ifFalse: [fieldAlignment := fieldSize]]. + "round to fieldAlignment" + maxAlignment := maxAlignment max: fieldAlignment. + computedSize := (computedSize - 1 bitOr: fieldAlignment - 1) + 1. + computedSize := computedSize + fieldSize]. + ^(computedSize - 1 bitOr: maxAlignment - 1) + 1 = declaredSize! Item was changed: ----- Method: ThreadedFFIPlugin>>isUnionSpec:OfLength:StartingAt: (in category 'marshalling-struct') ----- isUnionSpec: specs OfLength: specSize StartingAt: startIndex "We can't easily distinguish union from structures with available flags. But we have a trick: a union should have one field size equal to its own size." | index spec unionSize thisSize | <var: #specs type: #'unsigned int*'> + <inline: false> index := startIndex. spec := specs at: index. self assert: (spec bitAnd: FFIFlagPointer + FFIFlagAtomic + FFIFlagStructure) = FFIFlagStructure. unionSize := spec bitAnd: FFIStructSizeMask. [index := index + 1. index < specSize] whileTrue: [spec := specs at: index. spec = FFIFlagStructure ifTrue: [^false]. thisSize := spec bitAnd: FFIStructSizeMask. thisSize = unionSize ifTrue: [^true]. ((spec bitAnd: FFIFlagPointer + FFIFlagStructure) = FFIFlagStructure) ifTrue: ["Asking for alignment is a trick for skipping this sub structure/union" self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: index)]]. - self assert: false. "should not reach here" ^false! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet sddRet sdiRet sidRet siiRet returnStructByValue registerType sRetPtr | <var: #floatRet type: #double> <var: #intRet type: #sqInt> <var: #siiRet type: #SixteenByteReturnII> <var: #sidRet type: #SixteenByteReturnID> <var: #sdiRet type: #SixteenByteReturnDI> <var: #sddRet type: #SixteenByteReturnDD> <var: #sRetPtr type: #'void *'> <inline: true> returnStructByValue := (calloutState ffiRetHeader bitAnd: FFIFlagStructure + FFIFlagPointer + FFIFlagAtomic) = FFIFlagStructure. returnStructByValue ifTrue: [(self returnStructInRegisters: calloutState structReturnSize) ifTrue: [registerType := self registerTypeForStructSpecs: (interpreterProxy firstIndexableField: calloutState ffiRetSpec) OfLength: (interpreterProxy slotSizeOf: calloutState ffiRetSpec)] + ifFalse: [registerType := 2r110 "cannot pass by register"]]. - ifFalse: [registerType := 2r101 "encodes a single sqInt"]]. myThreadIndex := interpreterProxy disownVM: (self disownFlagsFor: calloutState). calloutState floatRegisterIndex > 0 ifTrue: [self load: (calloutState floatRegisters at: 0) Flo: (calloutState floatRegisters at: 1) a: (calloutState floatRegisters at: 2) t: (calloutState floatRegisters at: 3) R: (calloutState floatRegisters at: 4) e: (calloutState floatRegisters at: 5) g: (calloutState floatRegisters at: 6) s: (calloutState floatRegisters at: 7)]. (self allocaLiesSoSetSpBeforeCall or: [self mustAlignStack]) ifTrue: [self setsp: calloutState argVector]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]. interpreterProxy ownVM: myThreadIndex. ^interpreterProxy floatObjectOf: floatRet]. returnStructByValue ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'sqInt (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). interpreterProxy ownVM: myThreadIndex. (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [^self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. registerType caseOf: {[2r00] -> [sddRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturnDD (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: sddRet) asVoidPointer]. [2r01] -> [sidRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturnID (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: sidRet) asVoidPointer]. [2r10] -> [sdiRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturnDI (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: sdiRet) asVoidPointer]. [2r11] -> [siiRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturnII (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: siiRet) asVoidPointer]. [2r100] -> [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: floatRet) asVoidPointer]. [2r101] -> [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'sqInt (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). + sRetPtr := (self addressOf: intRet) asVoidPointer]. + [2r110] -> + ["return a pointer to alloca'd memory" + intRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'sqInt (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3) + with: (calloutState integerRegisters at: 4) + with: (calloutState integerRegisters at: 5). + sRetPtr := intRet asVoidPointer "address of struct is returned in RAX, which also is calloutState limit"]} - sRetPtr := (self addressOf: intRet) asVoidPointer]} otherwise: [interpreterProxy ownVM: myThreadIndex. self ffiFail: FFIErrorWrongType. ^nil]. interpreterProxy ownVM: myThreadIndex. ^self ffiReturnStruct: sRetPtr ofType: (self ffiReturnType: specOnStack) in: calloutState! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>ffiPushStructure:ofSize:typeSpec:ofLength:in: (in category 'marshalling') ----- ffiPushStructure: pointer ofSize: structSize typeSpec: argSpec ofLength: argSpecSize in: calloutState <var: #pointer type: #'void *'> <var: #argSpec type: #'sqInt *'> <var: #calloutState type: #'CalloutState *'> <inline: true> | roundedSize registerType numDoubleRegisters numIntegerRegisters passField0InXmmReg passField1InXmmReg | structSize <= 16 ifTrue: ["See sec 3.2.3 of http://people.freebsd.org/~obrien/amd64-elf-abi.pdf. (dravft version 0.90). All of the folowing are passed in registers: typedef struct { long a; } s0; typedef struct { double a; } s1; typedef struct { long a; double b; } s2; typedef struct { int a; int b; double c; } s2a; typedef struct { short a; short b; short c; short d; double e; } s2b; typedef struct { long a; float b; } s2f; typedef struct { long a; float b; float c; } s2g; typedef struct { int a; float b; int c; float d; } s2h;" registerType := self registerTypeForStructSpecs: (self cCoerce: argSpec to: #'unsigned int *') OfLength: argSpecSize. + registerType = 2r110 "check case of invalid alignment => pass by memory" + ifFalse: + [passField0InXmmReg := (registerType bitAnd: 1) = 0. + structSize <= 8 + ifTrue: + [numIntegerRegisters := registerType bitAnd: 1. + numDoubleRegisters := 1 - numIntegerRegisters] + ifFalse: + [passField1InXmmReg := (registerType bitAnd: 2) = 0. + numIntegerRegisters := (registerType bitAnd: 2) >> 1 + (registerType bitAnd: 1). + numDoubleRegisters := 2 - numIntegerRegisters]. + (calloutState floatRegisterIndex + numDoubleRegisters <= NumFloatRegArgs + and: [calloutState integerRegisterIndex + numIntegerRegisters <= NumIntRegArgs]) ifTrue: + [passField0InXmmReg + ifTrue: [self ffiPushDoubleFloat: ((self cCoerceSimple: pointer to: #'double *') at: 0) in: calloutState] + ifFalse: [self ffiPushSignedLongLong: ((self cCoerceSimple: pointer to: #'long long *') at: 0) in: calloutState]. + structSize > 8 ifTrue: + [passField1InXmmReg + ifTrue: [self ffiPushDoubleFloat: ((self cCoerceSimple: pointer to: #'double *') at: 1) in: calloutState] + ifFalse: [self ffiPushSignedLongLong: ((self cCoerceSimple: pointer to: #'long long *') at: 1) in: calloutState]]. + ^0]]]. - passField0InXmmReg := (registerType bitAnd: 1) = 0. - structSize <= 8 - ifTrue: - [numIntegerRegisters := registerType bitAnd: 1. - numDoubleRegisters := 1 - numIntegerRegisters] - ifFalse: - [passField1InXmmReg := (registerType bitAnd: 2) = 0. - numIntegerRegisters := (registerType bitAnd: 2) >> 1 + (registerType bitAnd: 1). - numDoubleRegisters := 2 - numIntegerRegisters]. - (calloutState floatRegisterIndex + numDoubleRegisters <= NumFloatRegArgs - and: [calloutState integerRegisterIndex + numIntegerRegisters <= NumIntRegArgs]) ifTrue: - [passField0InXmmReg - ifTrue: [self ffiPushDoubleFloat: ((self cCoerceSimple: pointer to: #'double *') at: 0) in: calloutState] - ifFalse: [self ffiPushSignedLongLong: ((self cCoerceSimple: pointer to: #'long long *') at: 0) in: calloutState]. - structSize > 8 ifTrue: - [passField1InXmmReg - ifTrue: [self ffiPushDoubleFloat: ((self cCoerceSimple: pointer to: #'double *') at: 1) in: calloutState] - ifFalse: [self ffiPushSignedLongLong: ((self cCoerceSimple: pointer to: #'long long *') at: 1) in: calloutState]]. - ^0]]. roundedSize := structSize + 7 bitClear: 7. calloutState currentArg + roundedSize > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. self memcpy: calloutState currentArg _: (self cCoerceSimple: pointer to: 'char *') _: structSize. calloutState currentArg: calloutState currentArg + roundedSize. ^0! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- + ffiReturnStruct: structRetPtr ofType: ffiRetType in: calloutState + <var: #structRetPtr type: #'void *'> - ffiReturnStruct: sixteenByteRetPtr ofType: ffiRetType in: calloutState - <var: #sixteenByteRetPtr type: #'void *'> <var: #calloutState type: #'CalloutState *'> "Create a structure return value from an external function call. The value has been stored in alloca'ed space pointed to by the calloutState or in the return value passed by pointer." | retOop retClass oop | <inline: true> retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. self remapOop: retOop in: [oop := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: calloutState structReturnSize]. self memcpy: (interpreterProxy firstIndexableField: oop) + _: structRetPtr - _: ((self returnStructInRegisters: calloutState structReturnSize) - ifTrue: [sixteenByteRetPtr] - ifFalse: [calloutState limit]) _: calloutState structReturnSize. interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. ^retOop! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>registerTypeForStructSpecs:OfLength: (in category 'marshalling') ----- registerTypeForStructSpecs: specs OfLength: specSize "Answer with a number characterizing the register type for passing a struct of size <= 16 bytes. The bit at offset i of registerType is set to 1 if eightbyte at offset i is a int register (RAX ...) The bit at offset 2 indicates if there is a single eightbyte (struct size <= 8) * 2r00 for float float (XMM0 XMM1) * 2r01 for int float (RAX XMM0) * 2r10 for float int (XMM0 RAX) * 2r11 for int int (RAX RDX) * 2r100 for float (XMM0) * 2r101 for int (RAX) + * 2r110 INVALID (not aligned) Beware, the bits must be read from right to left for decoding register type. Note: this method reconstructs the struct layout according to X64 alignment rules. Therefore, it will not work for packed struct or other exotic alignment." <var: #specs type: #'unsigned int*'> <var: #subIndex type: #'unsigned int'> | eightByteOffset byteOffset index registerType spec fieldSize alignment atomic subIndex isInt | + index := 0. + (self checkAlignmentOfStructSpec: specs OfLength: specSize StartingAt: index) + ifFalse: [^2r110]. eightByteOffset := 0. byteOffset := 0. - index := 0. registerType := ((specs at: index) bitAnd: FFIStructSizeMask) <= 8 ifTrue: [2r100] ifFalse: [0]. [(index := index + 1) < specSize] whileTrue: [spec := specs at: index. isInt := false. spec = FFIFlagStructure "this marks end of structure and should be ignored" ifFalse: [(spec anyMask: FFIFlagPointer) ifTrue: [fieldSize := BytesPerWord. alignment := fieldSize. isInt := true] ifFalse: [(spec bitAnd: FFIFlagStructure + FFIFlagAtomic) caseOf: {[FFIFlagStructure] -> [fieldSize := 0. subIndex := index. alignment := self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: subIndex)]. [FFIFlagAtomic] -> [fieldSize := spec bitAnd: FFIStructSizeMask. alignment := fieldSize. atomic := self atomicTypeOf: spec. isInt := (atomic >> 1) ~= (FFITypeSingleFloat >> 1)]} otherwise: ["invalid spec" ^-1]]. (byteOffset bitAnd: alignment - 1) = 0 ifFalse: ["this field requires alignment" byteOffset := (byteOffset bitClear: alignment - 1) + alignment]. byteOffset + fieldSize > 8 ifTrue: ["Not enough room on current eightbyte for this field, skip to next one" eightByteOffset := eightByteOffset + 1. byteOffset := 0]. isInt ifTrue: ["If this eightbyte contains an int field, then we must use an int register" registerType := registerType bitOr: 1 << eightByteOffset]. "where to put the next field?" byteOffset := byteOffset + fieldSize. byteOffset >= 8 ifTrue: ["This eightbyte is full, skip to next one" eightByteOffset := eightByteOffset + 1. byteOffset := 0]]]. ^registerType!

2 1

Errored: OpenSmalltalk/opensmalltalk-vm#1930 (Cog - 5aede68)
by Travis CI 29 Jan '20

29 Jan '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1930 Status: Errored Duration: 2 hrs, 10 mins, and 10 secs Commit: 5aede68 (Cog) Author: Eliot Miranda Message: CogVM source as per VMMaker.oscog-nice.2680/VMMaker.oscog-eem.2685. ThreradedFFIPlugin: solve passing/returning struct by value on X64 See https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/443 On X64/SysV struct up to 16 byte long can be passed by value (& returned) into a pair of 8-byte registers. The problem is to know whether these are integer (RAX RDX) or float (XMM0 XMM1) registers or eventually a mix of... For each 8-byte, we must know if it contains at least an int (in which case we have to use an int register), or exclusively floating points (a pair of float or a double). Previous algorithm did check first two fields, or last two fields which does not correctly cover all cases... For example int-int-float has last two fields int-float, though it will use RAX XMM0. So we have to know about struct layout... Unfortunately, this information is not included into the compiledSpec. The idea here is to reconstruct the information. See #registerTypeForStructSpecs:OfLength: & It's also impossible to cover the exotic alignments like packed structure cases... if we really want to pass that, this will mean passing the alignment information, a more involved change of #compiledSpec (we need up to 16 bits by field to handle that information since our FFI struct are limited to 65535 bytes anyway). For returning a struct, that's the same problem. We have four possible combinations of int-float registers. Consequently, the idea is to analyze #registerType: and switch to appropriate case. I found convenient to pass the ffiRetSpec compiledSpec object thru CalloutState (it's the Smalltalk WordArray object, not a pointer to its firstIndexableField) for performing this analysis... Not sure if this is the best choice. Since we have 4 different SixteenByte types, I have changed value, since it's what will be used to memcpy to allocated ByteArray handle. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/300c492314f7...5a… View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/643487143?utm_m… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

VM Maker: VMMaker.oscog-eem.2686.mcz
by commits＠source.squeak.org 29 Jan '20

29 Jan '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2686.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2686 Author: eem Time: 29 January 2020, 10:33:01.901821 am UUID: d013b384-4d10-4b6e-bded-6dafcf0b455e Ancestors: VMMaker.oscog-eem.2685 Cogit: We're back in business. Get the dual mapped zone scheme to a point where it is again worth trying the production VM on ARMv8 in a linux that disallows any form of code execution in writable memory. Use writableMethodFor: when updating various lists during code compaction, or when adding methods to the youngReferrers list. Was able to evaluate 3+4! TestRunner open! (Delay forMilliseconds: 5) wait! correctly with DUAL_MAPPED_CODE_ZONE true desiredCogCodeSize 262144, which causes constant code compactions. =============== Diff against VMMaker.oscog-eem.2685 =============== Item was changed: ----- Method: CogMethodZone>>addToYoungReferrers: (in category 'young referers') ----- addToYoungReferrers: cogMethod <var: #cogMethod type: #'CogMethod *'> + cogit assertValidDualZoneWriteAddress: cogMethod. - self cCode: '' inSmalltalk: [cogit assertValidDualZoneWriteAddress: cogMethod asInteger]. - self assert: youngReferrers <= limitAddress. self assert: (self occurrencesInYoungReferrers: cogMethod) = 0. self assert: cogMethod cmRefersToYoung. self assert: (youngReferrers <= limitAddress and: [youngReferrers >= (limitAddress - (methodCount * objectMemory wordSize))]). (self asserta: limitAddress - (methodCount * objectMemory wordSize) >= mzFreeStart) ifFalse: [self error: 'no room on youngReferrers list']. - cogit assertValidDualZoneWriteAddress: cogMethod. youngReferrers := youngReferrers - objectMemory wordSize. cogit + codeLongAt: youngReferrers - codeLongAt: youngReferrers + cogit codeToDataDelta put: cogMethod asUnsignedInteger - cogit codeToDataDelta! Item was changed: ----- Method: CogMethodZone>>compactCompiledCode (in category 'compaction') ----- compactCompiledCode + | objectHeaderValue source dest writableVersion bytes | - | objectHeaderValue source dest bytes | <var: #source type: #'CogMethod *'> <var: #dest type: #'CogMethod *'> compactionInProgress := true. methodCount := 0. objectHeaderValue := objectMemory nullHeaderForMachineCodeMethod. source := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. self voidOpenPICList. "The(se) list(s) will be rebuilt with the current live set" self voidUnpairedMethodList. [source < self limitZony and: [source cmType ~= CMFree]] whileTrue: [self assert: (cogit cogMethodDoesntLookKosher: source) = 0. + writableVersion := cogit writableMethodFor: source. + writableVersion objectHeader: objectHeaderValue. - source objectHeader: objectHeaderValue. source cmUsageCount > 0 ifTrue: + [writableVersion cmUsageCount: source cmUsageCount // 2]. - [source cmUsageCount: source cmUsageCount // 2]. self maybeLinkOnUnpairedMethodList: source. + self clearSavedPICUsageCount: writableVersion. - self clearSavedPICUsageCount: source. source cmType = CMOpenPIC ifTrue: + [self addToOpenPICList: writableVersion]. - [self addToOpenPICList: source]. methodCount := methodCount + 1. source := self methodAfter: source]. source >= self limitZony ifTrue: [^self halt: 'no free methods; cannot compact.']. dest := source. [source < self limitZony] whileTrue: [self assert: (cogit maybeFreeCogMethodDoesntLookKosher: source) = 0. bytes := source blockSize. source cmType ~= CMFree ifTrue: [methodCount := methodCount + 1. + cogit codeMemmove: dest _: source _: bytes. + (writableVersion := cogit writableMethodFor: dest) objectHeader: objectHeaderValue. - objectMemory memmove: dest _: source _: bytes. - dest objectHeader: objectHeaderValue. dest cmType = CMMethod ifTrue: ["For non-Newspeak there should be a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only update the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger ifTrue: [coInterpreter rawHeaderOf: dest methodObject put: dest asInteger] ifFalse: [self assert: (cogit noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject. self linkOnUnpairedMethodList: dest]] ifFalse: + [self clearSavedPICUsageCount: writableVersion. - [self clearSavedPICUsageCount: dest. dest cmType = CMOpenPIC ifTrue: + [self addToOpenPICList: writableVersion]]. - [self addToOpenPICList: dest]]. dest cmUsageCount > 0 ifTrue: + [writableVersion cmUsageCount: dest cmUsageCount // 2]. - [dest cmUsageCount: dest cmUsageCount // 2]. dest := coInterpreter cCoerceSimple: dest asUnsignedInteger + bytes to: #'CogMethod *']. source := coInterpreter cCoerceSimple: source asUnsignedInteger + bytes to: #'CogMethod *']. mzFreeStart := dest asUnsignedInteger. methodBytesFreedSinceLastCompaction := 0. compactionInProgress := false! Item was changed: ----- Method: CogMethodZone>>ensureInYoungReferrers: (in category 'young referers') ----- ensureInYoungReferrers: cogMethod <var: #cogMethod type: #'CogMethod *'> cogit assertValidDualZoneReadAddress: cogMethod. cogMethod cmRefersToYoung ifFalse: + [| writableMethod | + self assert: (self occurrencesInYoungReferrers: cogMethod) = 0. + (writableMethod := cogit writableMethodFor: cogMethod) cmRefersToYoung: true. + self addToYoungReferrers: writableMethod]! - [self assert: (self occurrencesInYoungReferrers: cogMethod) = 0. - (cogit writableMethodFor: cogMethod) cmRefersToYoung: true. - self addToYoungReferrers: cogMethod]! Item was changed: ----- Method: CogMethodZone>>freeMethod: (in category 'compaction') ----- freeMethod: cogMethod <api> <var: #cogMethod type: #'CogMethod *'> <inline: false> | writableMethod | self assert: cogMethod cmType ~= CMFree. self assert: (cogit cogMethodDoesntLookKosher: cogMethod) = 0. cogMethod cmType = CMMethod ifTrue: ["For non-Newspeak there should be a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only reset the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: cogMethod methodObject) asInteger = cogMethod asInteger ifTrue: [coInterpreter rawHeaderOf: cogMethod methodObject put: cogMethod methodHeader. NewspeakVM ifTrue: [(objectRepresentation canPinObjects and: [cogMethod nextMethodOrIRCs > self zoneEnd]) ifTrue: [objectRepresentation freeIRCs: cogMethod nextMethodOrIRCs]]] ifFalse: [self cCode: [self assert: (cogit noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject] inSmalltalk: [self assert: ((cogit noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject or: [coInterpreter isKindOf: CurrentImageCoInterpreterFacade])]. NewspeakVM ifTrue: [self removeFromUnpairedMethodList: cogMethod]]. cogit maybeFreeCountersOf: cogMethod]. cogMethod cmType = CMOpenPIC ifTrue: [self removeFromOpenPICList: cogMethod]. + writableMethod := cogit writableMethodFor: cogMethod. - writableMethod := self writableMethodFor: cogMethod. writableMethod cmRefersToYoung: false. writableMethod cmType: CMFree. methodBytesFreedSinceLastCompaction := methodBytesFreedSinceLastCompaction + cogMethod blockSize! Item was changed: ----- Method: CogMethodZone>>maybeLinkOnUnpairedMethodList: (in category 'compaction') ----- maybeLinkOnUnpairedMethodList: cogMethod NewspeakVM ifTrue: [(cogMethod cmType = CMMethod and: [(coInterpreter rawHeaderOf: cogMethod methodObject) asInteger ~= cogMethod asInteger]) ifTrue: + [(cogit writableMethodFor: cogMethod) nextMethodOrIRCs: unpairedMethodList. - [cogMethod nextMethodOrIRCs: unpairedMethodList. unpairedMethodList := cogMethod asUnsignedInteger]]! Item was changed: ----- Method: CogMethodZone>>planCompaction (in category 'compaction') ----- planCompaction "Some methods have been freed. Compute how much each survivor needs to move during the ensuing compaction and record it in the objectHeader field. For Sista, where we want PICs to last so they can be observed, we need to keep PICs unless they are definitely unused. So we need to identify unused PICs. So in planCompact, zero the usage counts of all PICs, saving the actual usage count in blockEntryOffset. Then in relocateMethodsPreCompaction (actually in relocateIfCallOrMethodReference:mcpc:delta:) restore the usage counts of used PICs. Finally in compactCompiledCode, clear the blockEntryOffset of the unused PICs; they will then have a zero count and be reclaimed in the next code compaction." | delta cogMethod | <var: #cogMethod type: #'CogMethod *'> delta := 0. cogMethod := cogit cCoerceSimple: baseAddress to: #'CogMethod *'. [cogMethod asUnsignedInteger < mzFreeStart] whileTrue: [cogMethod cmType = CMFree ifTrue: [delta := delta - cogMethod blockSize] ifFalse: [self assert: (cogit cogMethodDoesntLookKosher: cogMethod) = 0. + (cogit writableMethodFor: cogMethod) objectHeader: delta. - cogMethod objectHeader: delta. SistaVM ifTrue: [self savePICUsageCount: cogMethod]]. cogMethod := self methodAfter: cogMethod]! Item was changed: ----- Method: CogMethodZone>>pruneYoungReferrers (in category 'young referers') ----- pruneYoungReferrers | source dest next | <api> <var: #source type: #usqInt> <var: #dest type: #usqInt> <var: #next type: #usqInt> <inline: false> self assert: youngReferrers <= limitAddress. youngReferrers = limitAddress ifTrue: [^nil]. dest := limitAddress. [next := dest - objectMemory wordSize. next >= youngReferrers and: [(coInterpreter cCoerceSimple: (objectMemory longAt: next) to: #'CogMethod *') cmRefersToYoung]] whileTrue: [dest := next]. self assert: dest >= youngReferrers. source := dest - objectMemory wordSize. [source >= youngReferrers] whileTrue: [(coInterpreter cCoerceSimple: (objectMemory longAt: source) to: #'CogMethod *') cmRefersToYoung ifTrue: [self assert: source < (dest - objectMemory wordSize). + cogit codeLongAt: (dest := dest - objectMemory wordSize) put: (objectMemory longAt: source)]. - objectMemory longAt: (dest := dest - objectMemory wordSize) put: (objectMemory longAt: source)]. source := source - objectMemory wordSize]. youngReferrers := dest. self assert: self kosherYoungReferrers! Item was changed: ----- Method: CogMethodZone>>relocateAndPruneYoungReferrers (in category 'young referers') ----- relocateAndPruneYoungReferrers | source dest next cogMethod | <var: #source type: #usqInt> <var: #dest type: #usqInt> <var: #next type: #usqInt> <var: #cogMethod type: #'CogMethod *'> <inline: false> self assert: youngReferrers <= limitAddress. youngReferrers = limitAddress ifTrue: [^nil]. dest := limitAddress. [next := dest - objectMemory wordSize. next >= youngReferrers and: [(cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: next) to: #'CogMethod *') cmType ~= CMFree and: [cogMethod cmRefersToYoung]]] whileTrue: [cogMethod objectHeader ~= 0 ifTrue: + [cogit codeLongAt: next put: cogMethod asInteger + cogMethod objectHeader]. - [coInterpreter longAt: next put: cogMethod asInteger + cogMethod objectHeader]. dest := next]. self assert: dest >= youngReferrers. source := dest - objectMemory wordSize. [source >= youngReferrers] whileTrue: [cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: source) to: #'CogMethod *'. (cogMethod cmType ~= CMFree and: [cogMethod cmRefersToYoung]) ifTrue: [self assert: source < (dest - objectMemory wordSize). cogMethod objectHeader ~= 0 ifTrue: [cogMethod := coInterpreter cCoerceSimple: cogMethod asInteger + cogMethod objectHeader asInteger to: #'CogMethod *']. + cogit codeLongAt: (dest := dest - objectMemory wordSize) put: cogMethod asInteger]. - objectMemory longAt: (dest := dest - objectMemory wordSize) put: cogMethod asInteger]. source := source - objectMemory wordSize]. youngReferrers := dest. "this assert must be deferred until after compaction. See the end of compactCogCompiledCode" "self assert: self kosherYoungReferrers"! Item was changed: ----- Method: CogMethodZone>>removeFromOpenPICList: (in category 'accessing') ----- removeFromOpenPICList: anOpenPIC <var: #anOpenPIC type: #'CogMethod *'> | prevPIC | <var: #prevPIC type: #'CogMethod *'> self assert: anOpenPIC cmType = CMOpenPIC. openPICList ifNil: [^nil]. "As it is when compacting or unlinking all sends" self assert: (openPICList cmType = CMOpenPIC and: [openPICList nextOpenPIC isNil or: [(self cCoerceSimple: openPICList nextOpenPIC to: #'CogMethod *') cmType = CMOpenPIC]]). anOpenPIC = openPICList ifTrue: ["N.B. Use self rather than coInterpreter to avoid attempting to cast nil. Conversion to CogMethod done in the nextOpenPIC accessor." openPICList := self cCoerceSimple: anOpenPIC nextOpenPIC to: #'CogMethod *'. ^nil]. prevPIC := openPICList. [self assert: (prevPIC ~~ nil and: [prevPIC cmType = CMOpenPIC]). prevPIC nextOpenPIC = anOpenPIC asUnsignedInteger ifTrue: + [(cogit writableMethodFor: prevPIC) nextOpenPIC: anOpenPIC nextOpenPIC. - [prevPIC nextOpenPIC: anOpenPIC nextOpenPIC. ^nil]. prevPIC := self cCoerceSimple: prevPIC nextOpenPIC to: #'CogMethod *'. true] whileTrue! Item was changed: ----- Method: Cogit>>assertValidDualZoneReadAddress: (in category 'simulation only') ----- assertValidDualZoneReadAddress: address "Make sure that a surrogate is trying to read from the read/executable part of the code zone(s)" + <cmacro: '(address) 0'> self assert: (address asInteger between: methodZoneBase and: methodZone zoneEnd)! Item was changed: ----- Method: Cogit>>assertValidDualZoneWriteAddress: (in category 'simulation only') ----- assertValidDualZoneWriteAddress: address "Make sure that a surrogate is trying to write to the writable part of the code zone(s)" + <cmacro: '(address) 0'> self assert: (address asInteger - codeToDataDelta between: methodZoneBase and: methodZone zoneEnd)! Item was changed: + ----- Method: Cogit>>codeByteAt:put: (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>codeByteAt:put: (in category 'generate machine code') ----- codeByteAt: address put: aByte "production uses the macro..." <cmacro: '(adress,value) byteAtput((address) + codeToDataDelta, value)'> self codeWriteBreakpoint: address. "simulation writes twice if simulating dual mapping..." codeToDataDelta ~= 0 ifTrue: [objectMemory byteAt: address + codeToDataDelta put: aByte]. ^objectMemory byteAt: address put: aByte! Item was changed: + ----- Method: Cogit>>codeLong32At:put: (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>codeLong32At:put: (in category 'generate machine code') ----- codeLong32At: address put: anInt "production uses the macro..." <cmacro: '(address,value) long32Atput((address) + codeToDataDelta, value)'> self codeWriteBreakpoint: address. "simulation writes twice if simulating dual mapping..." codeToDataDelta ~= 0 ifTrue: [objectMemory long32At: address + codeToDataDelta put: anInt]. ^objectMemory long32At: address put: anInt! Item was changed: + ----- Method: Cogit>>codeLong64At:put: (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>codeLong64At:put: (in category 'generate machine code') ----- codeLong64At: address put: anInt "production uses the macro..." <cmacro: '(address,value) long64Atput((address) + codeToDataDelta, value)'> self codeWriteBreakpoint: address. "simulation writes twice if simulating dual mapping..." codeToDataDelta ~= 0 ifTrue: [objectMemory long64At: address + codeToDataDelta put: anInt]. ^objectMemory long64At: address put: anInt! Item was changed: + ----- Method: Cogit>>codeLongAt:put: (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>codeLongAt:put: (in category 'generate machine code') ----- codeLongAt: address put: aLong "production uses the macro..." <cmacro: '(adress,value) longAtput((address) + codeToDataDelta, value)'> self codeWriteBreakpoint: address. "simulation writes twice if simulating dual mapping..." codeToDataDelta ~= 0 ifTrue: [objectMemory longAt: address + codeToDataDelta put: aLong]. ^objectMemory longAt: address put: aLong! Item was changed: + ----- Method: Cogit>>codeMemcpy:_:_: (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>codeMemcpy:_:_: (in category 'generate machine code') ----- codeMemcpy: dest _: src _: bytes + "Copy memory applying the codeToDataDelta. This is used for creating PICs and so + works on writable addresses (no delta required)." "production uses the macro..." <cmacro: '(dest,src,bytes) memcpy(dest,src,bytes)'> self codeWriteBreakpoint: dest. "simulation writes twice if simulating dual mapping..." codeToDataDelta ~= 0 ifTrue: [objectMemory memcpy: dest asInteger - codeToDataDelta _: src _: bytes]. objectMemory memcpy: dest _: src _: bytes! Item was added: + ----- Method: Cogit>>codeMemmove:_:_: (in category 'generate machine code - dual mapped zone support') ----- + codeMemmove: dest _: src _: bytes + "Move memory (copy allowing for overlap), applying the codeToDataDelta. + This is used for code compaction and so works on readable addresses (delta is required)." + "production uses the macro..." + <cmacro: '(dest,src,bytes) memmove((dest)+codeToDataDelta,src,bytes)'> + self codeWriteBreakpoint: dest. + "simulation writes twice if simulating dual mapping..." + codeToDataDelta ~= 0 ifTrue: + [objectMemory memmove: dest asUnsignedInteger + codeToDataDelta _: src _: bytes]. + objectMemory memmove: dest _: src _: bytes! Item was changed: + ----- Method: Cogit>>codeToDataDelta (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>codeToDataDelta (in category 'accessing') ----- codeToDataDelta "If non-zero this is the delta between the read/execute method zone and the read/write mapping of the method zone. On operating systems where it is entirely disallowed to execute code in a writable region this split is necessary to be able to modify code. In this regime all writes must be made to the read/write mapped zone." ^codeToDataDelta! Item was changed: + ----- Method: Cogit>>codeWriteBreakpoint: (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>codeWriteBreakpoint: (in category 'generate machine code') ----- codeWriteBreakpoint: address "(address = 16r520) ifTrue: [self halt]" "(address between: 16r2398 and: 16r23B0) ifTrue: [self halt]"! Item was changed: ----- Method: Cogit>>compactCogCompiledCode (in category 'jit - api') ----- compactCogCompiledCode <api> self assertValidDualZone. self assert: self noCogMethodsMaximallyMarked. coInterpreter markActiveMethodsAndReferents. methodZone freeOlderMethodsForCompaction. self compactPICsWithFreedTargets. methodZone planCompaction. coInterpreter updateStackZoneReferencesToCompiledCodePreCompaction. methodZone relocateMethodsPreCompaction. + self assertValidDualZone. methodZone compactCompiledCode. backEnd stopsFrom: methodZone freeStart to: methodZone youngReferrers - 1; flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone youngReferrers asUnsignedInteger. self assert: self allMethodsHaveCorrectHeader. self assert: methodZone kosherYoungReferrers. self assertValidDualZone! Item was changed: ----- 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: + [(self writableMethodFor: cogMethod) cmType: CMFree]. - [cogMethod cmType: CMFree]. cogMethod := methodZone methodAfter: cogMethod. count := count + 1]. self assert: count = methodZone numMethods! Item was changed: ----- Method: Cogit>>mapObjectReferencesInMachineCodeForYoungGC (in category 'garbage collection') ----- mapObjectReferencesInMachineCodeForYoungGC "Update all references to objects in machine code for either a Spur scavenging gc or a Squeak V3 incremental GC. Avoid scanning all code by using the youngReferrers list. In a young gc a method referring to young may no longer refer to young, but a method not referring to young cannot and will not refer to young afterwards." | pointer cogMethod hasYoungObj hasYoungObjPtr | <var: #cogMethod type: #'CogMethod *'> hasYoungObj := false. hasYoungObjPtr := (self addressOf: hasYoungObj put: [:val| hasYoungObj := val]) asInteger. codeModified := false. pointer := methodZone youngReferrers. [pointer < methodZone zoneEnd] whileTrue: [self assert: hasYoungObj not. cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'. cogMethod cmType = CMFree ifTrue: [self assert: cogMethod cmRefersToYoung not] ifFalse: [self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0. cogMethod cmRefersToYoung ifTrue: + [| writableVersion | + self assert: (cogMethod cmType = CMMethod - [self assert: (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]). + writableVersion := self writableMethodFor: cogMethod. + writableVersion selector: (objectRepresentation remapOop: cogMethod selector). - cogMethod selector: (objectRepresentation remapOop: cogMethod selector). (objectMemory isYoung: cogMethod selector) ifTrue: [hasYoungObj := true]. cogMethod cmType = CMMethod ifTrue: [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. + writableVersion methodObject: (objectRepresentation remapOop: cogMethod methodObject). - cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject). (objectMemory isYoung: cogMethod methodObject) ifTrue: [hasYoungObj := true]]. self mapFor: cogMethod performUntil: #remapIfObjectRef:pc:hasYoung: arg: hasYoungObjPtr. hasYoungObj ifTrue: [hasYoungObj := false] + ifFalse: [writableVersion cmRefersToYoung: false]]]. - ifFalse: [cogMethod cmRefersToYoung: false]]]. pointer := pointer + objectMemory wordSize]. methodZone pruneYoungReferrers. codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." [backEnd flushICacheFrom: methodZoneBase asUnsignedInteger to: methodZone limitZony asUnsignedInteger]! Item was changed: + ----- Method: Cogit>>writableBlockMethodFor: (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>writableBlockMethodFor: (in category 'generate machine code') ----- writableBlockMethodFor: aCogMethodOrInteger <inline: #always> ^self cCoerceSimple: aCogMethodOrInteger asUnsignedInteger + codeToDataDelta to: #'CogBlockMethod *'! Item was changed: + ----- Method: Cogit>>writableMethodFor: (in category 'generate machine code - dual mapped zone support') ----- - ----- Method: Cogit>>writableMethodFor: (in category 'generate machine code') ----- writableMethodFor: aCogMethodOrInteger <inline: #always> ^self cCoerceSimple: aCogMethodOrInteger asUnsignedInteger + codeToDataDelta to: #'CogMethod *'!

1 0

Build failed: opensmalltalk-vm 1.0.40
by AppVeyor 29 Jan '20

29 Jan '20

1 0

[OpenSmalltalk/opensmalltalk-vm] 5aede6: CogVM source as per VMMaker.oscog-nice.2680/VMMake...
by Eliot Miranda 29 Jan '20

29 Jan '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 5aede6849b39b4e55bc57467713f92c723910fbe https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5aede6849b39b4e55b… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-01-29 (Wed, 29 Jan 2020) Changed paths: 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 Log Message: ----------- CogVM source as per VMMaker.oscog-nice.2680/VMMaker.oscog-eem.2685. ThreradedFFIPlugin: solve passing/returning struct by value on X64 See https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/443 On X64/SysV struct up to 16 byte long can be passed by value (& returned) into a pair of 8-byte registers. The problem is to know whether these are integer (RAX RDX) or float (XMM0 XMM1) registers or eventually a mix of... For each 8-byte, we must know if it contains at least an int (in which case we have to use an int register), or exclusively floating points (a pair of float or a double). Previous algorithm did check first two fields, or last two fields which does not correctly cover all cases... For example int-int-float has last two fields int-float, though it will use RAX XMM0. So we have to know about struct layout... Unfortunately, this information is not included into the compiledSpec. The idea here is to reconstruct the information. See #registerTypeForStructSpecs:OfLength: & It's also impossible to cover the exotic alignments like packed structure cases... if we really want to pass that, this will mean passing the alignment information, a more involved change of #compiledSpec (we need up to 16 bits by field to handle that information since our FFI struct are limited to 65535 bytes anyway). For returning a struct, that's the same problem. We have four possible combinations of int-float registers. Consequently, the idea is to analyze #registerType: and switch to appropriate case. I found convenient to pass the ffiRetSpec compiledSpec object thru CalloutState (it's the Smalltalk WordArray object, not a pointer to its firstIndexableField) for performing this analysis... Not sure if this is the best choice. Since we have 4 different SixteenByte types, I have changed value, since it's what will be used to memcpy to allocated ByteArray handle.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2020