Vm-dev August 2013

vm-dev@lists.squeakfoundation.org

26 participants
167 discussions

ffi-test-main.c fails on FreeBSD
by Gary Dunn 12 Aug '16

12 Aug '16

In conjunction with getting Open Cobalt running on FreeBSD I have been looking into the problems with SqueakFFIPrims on FreeBSD and have reached a point that is beyond my understanding. I am not sure if the fix should come from the VM side or the FreeBSD port maintainer. I needed to get source code back into the ports tree so I did a make in /usr/ports/lang/squeak. I already had the 3.9 tarball, so that just repopulated the source and did the initial build. In the "files" folder I found patch files typical for a FreeBSD port. These patch source files from a generic tarball to work with FreeBSD. The one of interest was patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config which contains ----x-----x----- --- platforms/unix/plugins/SqueakFFIPrims/ffi-config.org Wed Apr 26 20:27:53 2006 +++ platforms/unix/plugins/SqueakFFIPrims/ffi-config Wed Apr 26 20:29:00 2006 @@ -39,6 +39,7 @@ case ${abi} in linux) abi=sysv;; + freebsd*) abi=sysv;; darwin*) abi=darwin;; *) abi=libffi; lib="-lffi";; esac -----x-----x----- I then had the folder work/Squeak-3.9-7/platforms/unix/plugins/SqueakFFIPrims In it is a file 00README which explains how to test FFI. It says to run ffi-test-config but I have no such file. It says to type "make" to build a test suite but the build failed. It says to try with make CPU=any ABI=libffi LIB=-lffi which also failed. I traced the problem to the gcc search paths for includes and libraries -- turns out FreeBSD only searches /usr/include and /usr/lib when the required files are in /usr/local/include and /usr/local/lib. After some fiddling I finally had a "main" to test. It failed: ffi-test-main.c failed at line 361. Here is a bit from that file, ending with line 361: ffiInitialize(); for (ul= 0; ul < 15; ++ul) ffiPushSingleFloat(fa[ul]); GO(FFITypeSingleFloat, many); f= ffiReturnFloatValue(); ffiCleanup(); CHECK(f - ff < FLT_EPSILON); I worked out the CHECK macro but could not find what FLT_EPSILON is. At that point I decided to stop and come to you for help. Where do I go from here? -- Gary Dunn, Honolulu osp(a)aloha.com http://openslate.net/ http://e9erust.blogspot.com/ Sent from Slate001

5 8

Do we have the new primitive?? [WAS] Re: [Pharo-project] IdentitySet but using #hash rather than #identityHash ?
by Mariano Martinez Peck 16 Dec '15

16 Dec '15

> All I can say is that I am impressed by the numbers it is really much >> faster. >> I still don't understand why I send this email with a subject say >> IdentitySet because what I really need is a fast/large IdentityDictionary >> :( Anyway, there's a place where we can use this LargeIdentitySet in Fuel >> I think). >> >> So Levente, you say this is not possible to adapt this for dictionary? >> can >> we contact Eliot to provide such a primitive? >> > > As promised, I uploaded my LargeIdentityDictionary implementation to > http://leves.web.elte.hu/**squeak/**LargeIdentityDictionary.st<http://leves.web.elte.hu/squeak/LargeIdentityDictionary.st>. > The numbers will be a bit worse compared to LargeIdentitySet, because of > the lack of the primitive, but it's still 2-3x faster than other solutions > (IdentityDictionary, PluggableIdentityDictionary, subclassing, etc). I'm > about to propose this primitive with other improvements on the vm-dev list. > > Hi Eliot/Levente. What is the status of this? Do we have already the new primitive? If true, how can we adapt LargeIdentitySet to use such new primitive? Thanks! > > Levente > > >> thanks >> >> On Fri, Dec 16, 2011 at 3:28 PM, Levente Uzonyi <leves(a)elte.hu> wrote: >> >> On Fri, 16 Dec 2011, Henrik Sperre Johansen wrote: >>> >>> On 16.12.2011 03:26, Levente Uzonyi wrote: >>> >>>> >>>> >>>>> How about my numbers? :) >>>>> >>>>> "Preallocate objects, so we won't count gc time." >>>>> n := 1000000. >>>>> objects := Array new: n streamContents: [ :stream | >>>>> n timesRepeat: [ stream nextPut: Object new ] ]. >>>>> >>>>> set := IdentitySet new: n. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "4949" >>>>> >>>>> set := LargeIdentitySet new. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "331" >>>>> >>>>> set := (PluggableSet new: n) >>>>> hashBlock: [ :object | object identityHash * 4096 + object class >>>>> identityHash * 64 ]; "Change this to #basicIdentityHash in Pharo" >>>>> equalBlock: [ :a :b | a == b ]; >>>>> yourself. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "5511" >>>>> >>>>> >>>>> I also have a LargeIdentityDictionary, which is relatively fast, but >>>>> not >>>>> as fast as LargeIdentitySet, because (for some unknown reason) we don't >>>>> have a primitive that could support it. If we had a primitive like >>>>> primitive 132 which would return the index of the element if found or >>>>> 0 if >>>>> not, then we could have a really fast LargeIdentityDictionary. >>>>> >>>>> >>>>> Levente >>>>> >>>>> Hehe yes, if writing a version fully exploiting the limited range, >>>> that's >>>> probably the approach I would go for as well. >>>> (IAssuming it's the version at http://leves.web.elte.hu/** >>>> squeak/LargeIdentitySet.st<htt**p://leves.web.elte.hu/squeak/** >>>> LargeIdentitySet.st<http://leves.web.elte.hu/squeak/LargeIdentitySet.st> >>>> > >>>> ) >>>> >>>> Mariano commented in the version at http://www.squeaksource.com/** >>>> FuelExperiments <http://www.squeaksource.com/**FuelExperiments<http://www.squeaksource.com/FuelExperiments>> >>>> that it's >>>> >>>> slow for them, which I guess is due to not adopting #identityHash calls >>>> to >>>> #basicIdentityHash calls for Pharo: >>>> ((0 to: 4095) collect: [:each | each << 22 \\ 4096 ]) asSet size -> 1 >>>> So it basically uses 1 bucket instead of 4096... Whoops. :) >>>> >>>> Uploaded a new version to the MC repository which is adapted for Pharo, >>>> on the same machine my numbers were taken from, it does the same test >>>> as I >>>> used above in 871 ms. (181 with preallocation). >>>> >>>> >>> Cool. One more thing: in Squeak the method using primitive 132 directly >>> was renamed to #instVarsInclude:, so now #pointsTo: works as expected. If >>> this was also added to Pharo, then the #pointsTo: sends should be changed >>> to #instVarsInclude:, otherwise Array can be reported as included even if >>> it wasn't added. >>> I'll upload my LargeIdentityDictionary implementation to the same place >>> this evening, since it's still 2-3 factor faster than other solutionts >>> and >>> there seem to be demand for it. >>> >>> >>> Levente >>> >>> >>> Cheers, >>>> Henry >>>> >>>> >>>> >>>> >>> >> >> -- >> Mariano >> http://marianopeck.wordpress.**com <http://marianopeck.wordpress.com> >> >> > -- Mariano http://marianopeck.wordpress.com

4 12

Issue 131 in cog: Bug in Freetype plugin primitive
by cog＠googlecode.com 03 Nov '13

03 Nov '13

Status: Accepted Owner: siguc...(a)gmail.com Labels: Type-Defect Priority-Medium New issue 131 by siguc...(a)gmail.com: Bug in Freetype plugin primitive http://code.google.com/p/cog/issues/detail?id=131 primitiveLoadOutlineSizesFrom: aFace uses non-existing ivar for reading flags: interpreterProxy storeInteger: FT2OutlineFlagsIndex ofObject: rcvr withValue: (self cCode: 'gs->outline.flags' inSmalltalk: [gs]). (FT2OutlineFlagsIndex is nil) , causing overriding number of contours (null=0=FT2OutlineContoursSizeIndex).. which later causing VM crash when invoking primitiveLoadOutlineArraysFrom: because of attempt to read outside of array range. The fix is to remove the above code. (i wanted to attach file here, but quota exceeded) -- You received this message because this project is configured to send all issue notifications to this address. You may adjust your notification preferences at: https://code.google.com/hosting/settings

4 6

StackVM with latest sources tinyBenchmarks
by Esteban Lorenzano 02 Oct '13

02 Oct '13

Hi, I just compiled a cog vm and a stack vm with latest sources. While the cog works well, the stack vm is having a serious performance drawback, tinyBenchmarks is giving me 5m bytecodes/s, while it should be around 500m... also I see the cpu charge increases to double. Do you tried to compile a stack vm lately? any idea where to start look for bugs? thanks, Esteban

8 20

VM Maker: Cog-eem.62.mcz
by commits＠source.squeak.org 31 Aug '13

31 Aug '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.62.mcz ==================== Summary ==================== Name: Cog-eem.62 Author: eem Time: 31 August 2013, 12:20:27.103 pm UUID: 193a9728-afb3-4abc-9018-ccd7fb74dbcb Ancestors: Cog-eem.61 Fist cut of the new VM bootstrap (Spur :-) ). Needs VMMaker.oscog-eem.339. SpurBootstrap reads in an image in the simulator's NewObjectMemory and writes transformed objects to a CogMemoryManager, mapping old 4-bit format to new 5-bit format, building the classTable, and mapping Character objects to immediate characters. =============== Diff against Cog-eem.61 =============== Item was changed: + SystemOrganization addCategory: #'Cog-Bootstrapping'! SystemOrganization addCategory: #'Cog-Morphing Bytecode Set'! SystemOrganization addCategory: #'Cog-Scripts'! SystemOrganization addCategory: #'Cog-Scripting'! SystemOrganization addCategory: #'Cog-Benchmarks'! SystemOrganization addCategory: #'Cog-Processors'! SystemOrganization addCategory: #'Cog-ProcessorPlugins'! SystemOrganization addCategory: #'Cog-Processors-Tests'! SystemOrganization addCategory: #'Cog-Tests'! Item was added: + Object subclass: #SpurBootstrap + instanceVariableNames: 'oldHeap newHeap map classToIndex oldInterpreter' + classVariableNames: '' + poolDictionaries: 'VMObjectIndices' + category: 'Cog-Bootstrapping'! + + !SpurBootstrap commentStamp: 'eem 8/31/2013 12:20' prior: 0! + SpurBootstrap bootstraps an image in CogMemoryManager format from a Squeak V3 + closures format. + + e.g. + (SpurBootstrap32 new on: '/Users/eliot/Cog/startreader.image') transform + Instance Variables + classToIndex: <Dictionary> + map: <Dictionary> + newHeap: <CogMemoryManager> + oldHeap: <NewObjectMemory> + oldInterpreter: <StackInterpreterSimulator> + + classToIndex + - oldClass to new classIndex map + + map + - oldObject to newObject map + + newHeap + - the output, bootstrapped image + + oldHeap + - the input, image + + oldInterpreter + - the interpreter associated with oldHeap, needed for a hack to grab WeakArray + ! Item was added: + ----- Method: SpurBootstrap>>allocateClassTable (in category 'bootstrap') ----- + allocateClassTable + "Allocate the root of the classTable plus enough pages to accomodate all classes in + the classToIndex map. Don;t fill in the entries yet; the classes have yet to be cloned." + | tableRootSize tableRoot page maxSize numPages | + tableRootSize := self classTableSize / newHeap classTablePageSize. + tableRoot := newHeap + allocateSlots: tableRootSize + format: newHeap arrayFormat + classIndex: newHeap arrayClassIndexPun. + newHeap classTableRootObj: tableRoot. + newHeap nilFieldsOf: tableRoot. + "first page is strong" + page := newHeap + allocateSlots: tableRootSize + format: newHeap arrayFormat + classIndex: newHeap arrayClassIndexPun. + newHeap nilFieldsOf: page. + newHeap storePointer: 0 ofObject: tableRoot withValue: page. + maxSize := classToIndex inject: 0 into: [:a :b| a max: b]. + numPages := (maxSize + newHeap classTableMinorIndexMask / newHeap classTablePageSize) truncated. + 2 to: numPages do: + [:i| + page := newHeap + allocateSlots: tableRootSize + format: newHeap weakArrayFormat + classIndex: newHeap weakArrayClassIndexPun. + newHeap nilFieldsOf: page. + newHeap storePointer: i - 1 ofObject: tableRoot withValue: page]! Item was added: + ----- Method: SpurBootstrap>>buildClassMap (in category 'bootstrap') ----- + buildClassMap + "enumerate all objects asking isBehavior:? (class == Metaclass or class class == Metaclass) doesn't work for Newspeak" + "Build a map from all classes in oldHeap to a class index. + ONLY DEALS WITH CLASSES THAT HAVE INSTANCES!!!! (can walk superclass chain? Can walk subclasses set? Can ask class == Metaclass or class class == Metaclass class?)" + | classes classTableIndex | + self defineKnownClassIndices. + classes := classToIndex keys asSet. + classTableIndex := newHeap classTablePageSize. + oldHeap allObjectsDo: + [:oldObj| | oldClass | + oldClass := oldHeap fetchClassOfNonInt: oldObj. + (classes includes: oldClass) ifFalse: + [classes add: oldClass. + classToIndex at: oldClass put: (classTableIndex := classTableIndex + 1)]]! Item was added: + ----- Method: SpurBootstrap>>classTableSize (in category 'class indices') ----- + classTableSize + ^newHeap classIndexMask + 1! Item was added: + ----- Method: SpurBootstrap>>clone:classIndex: (in category 'bootstrap') ----- + clone: oldObj classIndex: classIndex + map + at: oldObj + put: (newHeap + allocateSlots: (oldHeap fetchWordLengthOf: oldObj) + format: (self newFormatFor: oldObj) + classIndex: classIndex)! Item was added: + ----- Method: SpurBootstrap>>cloneNilTrueAndFalse (in category 'bootstrap') ----- + cloneNilTrueAndFalse + { oldHeap nilObject. + oldHeap falseObject. + oldHeap trueObject. } + with: (self firstOrdinaryClassIndex to: self firstOrdinaryClassIndex + 2) + do: [:obj :classIndex| + classToIndex at: (oldHeap fetchClassOfNonInt: obj) put: classIndex. + self clone: obj classIndex: classIndex]. + newHeap nilObject: (map at: oldHeap nilObject). "needed for nilling objects etc"! Item was added: + ----- Method: SpurBootstrap>>cloneObjects (in category 'bootstrap') ----- + cloneObjects + | characterClass characterTable oldObj oldClass | + characterClass := oldHeap classCharacter. + characterTable := oldHeap characterTable. + oldObj := oldHeap objectAfter: oldHeap trueObject. + [oldObj < oldHeap freeStart] whileTrue: + [oldClass := oldHeap fetchClassOfNonInt: oldObj. + (oldObj ~= characterTable + and: [oldClass ~= characterClass]) ifTrue: + [self clone: oldObj classIndex: (classToIndex at: oldClass)]. + oldObj := oldHeap objectAfter: oldObj]! Item was added: + ----- Method: SpurBootstrap>>defineKnownClassIndices (in category 'class indices') ----- + defineKnownClassIndices + "The classTable is laid out + - to make it easy to map immediates to classes; the tag pattern of an immediate is its class index. + hence there are two entries for SmallInteger + - to assign small indices to well-known classes such as Array, Message et al + - to leave plenty of room for new known classes; hence the first page contains only well-known classes + - to enable overlaps and avoid conflicts with indices in the specialObjectsArray (?really? eem) + - to provide a WeakArray pun for the pages of the table itself so that these do not show up as instances of WeakArray" + | classMethodContext classBlockClosure classMessage "no api method for these" | + classMessage := oldHeap splObj: (VMObjectIndices bindingOf: #ClassMessage) value. + classMethodContext := oldHeap splObj: (VMObjectIndices bindingOf: #ClassMethodContext) value. + classBlockClosure := oldHeap splObj: (VMObjectIndices bindingOf: #ClassBlockClosure) value. + classToIndex + at: oldHeap classSmallInteger put: 1; "N.B. must fill-in index 3 manually" + at: oldHeap classCharacter put: 2; + "at: oldHeap classSmallInteger put: 3" "N.B. must fill-in index 3 manually" + "leave room for up to 15 tagged classes" + "leave room for up to 16 puns" + at: oldHeap classLargePositiveInteger put: 32; + at: oldHeap classLargeNegativeInteger put: 33; + at: oldHeap classFloat put: 34; + + at: "oldHeap" classMessage put: 35; + at: "oldHeap" classMethodContext put: 36; + at: "oldHeap" classBlockClosure put: 37; + + at: oldHeap classSemaphore put: 48; + at: oldHeap classMutex put: 49; + + at: oldHeap classByteArray put: 50; + at: oldHeap classArray put: 51; + at: oldHeap classString put: 52; + at: oldHeap classBitmap put: 53; + at: oldHeap classPoint put: 54; + + at: oldHeap classExternalAddress put: 128; + at: oldHeap classExternalData put: 129; + at: oldHeap classExternalFunction put: 130; + at: oldHeap classExternalLibrary put: 131; + at: oldHeap classExternalStructure put: 132; + at: oldHeap classAlien put: 133; + at: oldHeap classUnsafeAlien put: 133! Item was added: + ----- Method: SpurBootstrap>>fillInClassTable (in category 'bootstrap') ----- + fillInClassTable + | firstPage classWeakArray | + classToIndex keysAndValuesDo: + [:oldClass :index| | newClass page | + newClass := map at: oldClass. + newHeap setHashBitsOf: newClass to: index. + page := newHeap + fetchPointer: index >> newHeap classTableMajorIndexShift + ofObject: newHeap classTableRootObj. + newHeap + storePointer: (index bitAnd: newHeap classTableMinorIndexMask) + ofObject: page + withValue: newClass]. + firstPage := newHeap + fetchPointer: 0 + ofObject: newHeap classTableRootObj. + classWeakArray := classToIndex keys detect: + [:oldClass| + (oldHeap instSpecOfClass: oldClass) = 4 + and: [oldInterpreter classNameOf: oldClass Is: 'WeakArray']]. + newHeap + storePointer: 1 + ofObject: firstPage + withValue: (map at: oldHeap classSmallInteger); + storePointer: 2 + ofObject: firstPage + withValue: (map at: oldHeap classCharacter); + storePointer: 3 + ofObject: firstPage + withValue: (map at: oldHeap classSmallInteger); + storePointer: newHeap arrayClassIndexPun + ofObject: firstPage + withValue: (map at: oldHeap classArray); + storePointer: newHeap weakArrayClassIndexPun + ofObject: firstPage + withValue: (map at: classWeakArray)! Item was added: + ----- Method: SpurBootstrap>>fillInCompiledMethod:from: (in category 'bootstrap') ----- + fillInCompiledMethod: newObj from: oldObj + self fillInBitsObject: newObj from: oldObj. + self fillInPointerObject: newObj from: oldObj! Item was added: + ----- Method: SpurBootstrap>>fillInObjects (in category 'bootstrap') ----- + fillInObjects + oldHeap allObjectsDo: + [:oldObj| + (map at: oldObj ifAbsent: nil) ifNotNil: + [:newObj| + (newHeap isCompiledMethod: newObj) + ifTrue: [self fillInCompiledMethod: newObj from: oldObj] + ifFalse: + [(newHeap isPointersNonImm: newObj) + ifTrue: [self fillInPointerObject: newObj from: oldObj] + ifFalse: [self fillInBitsObject: newObj from: oldObj]]]]! Item was added: + ----- Method: SpurBootstrap>>fillInPointerObject:from: (in category 'bootstrap') ----- + fillInPointerObject: newObj from: oldObj + 0 to: (oldHeap lastPointerOf: oldObj) >> 4 - 1 do: + [:i| | oldValue newValue | + oldValue := oldHeap fetchPointer: i ofObject: oldObj. + newValue := (oldHeap isIntegerObject: oldValue) + ifTrue: [oldValue] + ifFalse: + [map at: oldValue ifAbsent: + [self assert: (oldHeap fetchClassOfNonInt: oldValue) = oldHeap classCharacter. + newHeap characterObjectOf: + (oldHeap integerValueOf: + (oldHeap fetchPointer: CharacterValueIndex ofObject: oldValue))]]. + newHeap + storePointerUnchecked: i + ofObject: newObj + withValue: newValue]! Item was added: + ----- Method: SpurBootstrap>>firstOrdinaryClassIndex (in category 'class indices') ----- + firstOrdinaryClassIndex + ^newHeap classTablePageSize! Item was added: + ----- Method: SpurBootstrap>>newFormatFor: (in category 'bootstrap') ----- + newFormatFor: oldObj + "OLD: + 0 no fields + 1 fixed fields only (all containing pointers) + 2 indexable fields only (all containing pointers) + 3 both fixed and indexable fields (all containing pointers) + 4 both fixed and indexable weak fields (all containing pointers). + + 5 unused + 6 indexable word fields only (no pointers) + 7 indexable long (64-bit) fields (only in 64-bit images) + + 8-11 indexable byte fields only (no pointers) (low 2 bits are low 2 bits of size) + 12-15 compiled methods: + # of literal oops specified in method header, + followed by indexable bytes (same interpretation of low 2 bits as above)" + + "NEW: + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + + and here it gets messy, we need 8 CompiledMethod values, 8 byte values, 4 16-bit values, 2 32-bit values and a 64-bit value, = 23 values, 23 + 5 = 30, so there may be room. + + 9 (?) 64-bit indexable + 10 - 11 32-bit indexable + 12 - 15 16-bit indexable + 16 - 23 byte indexable + 24 - 31 compiled method" + | oldFormat | + oldFormat := oldHeap formatOf: oldObj. + oldFormat <= 4 ifTrue: + [^oldFormat]. + oldFormat >= 12 ifTrue: "CompiledMethod" + [^24 + (self wordSize - (oldHeap byteLengthOf: oldObj) bitAnd: self wordSizeMask)]. + oldFormat >= 8 ifTrue: "ByteArray et al" + [^16 + (self wordSize - (oldHeap byteLengthOf: oldObj) bitAnd: self wordSizeMask)]. + oldFormat = 6 ifTrue: "32-bit indexable" + [^10 + ((oldHeap byteLengthOf: oldObj) bitAnd: self wordSizeMask) sign]. + oldFormat = 7 ifTrue: "64-bit indexable" + [^9]. + self error: 'illegal old format'! Item was added: + ----- Method: SpurBootstrap>>on: (in category 'initialize-release') ----- + on: imageName + StackInterpreter initializeWithOptions: Dictionary new. + oldInterpreter := StackInterpreterSimulator new. + oldInterpreter openOn: imageName extraMemory: 0. + oldHeap := oldInterpreter objectMemory. + newHeap := CMM32LSBSimulator new. + newHeap allocateMemoryOfSize: oldHeap memory size * 5 / 4. + map := IdentityDictionary new: oldHeap memory size. + classToIndex := IdentityDictionary new: 1024! Item was added: + ----- Method: SpurBootstrap>>transform (in category 'bootstrap') ----- + transform + self cloneNilTrueAndFalse. + self buildClassMap. + self allocateClassTable. + self cloneObjects. + self fillInObjects. + self fillInClassTable! Item was added: + ----- Method: SpurBootstrap>>wordSize (in category 'word size') ----- + wordSize + ^self subclassResponsibility! Item was added: + ----- Method: SpurBootstrap>>wordSizeMask (in category 'word size') ----- + wordSizeMask + ^self subclassResponsibility! Item was added: + SpurBootstrap subclass: #SpurBootstrap32 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Cog-Bootstrapping'! Item was added: + ----- Method: SpurBootstrap32>>fillInBitsObject:from: (in category 'bootstrap') ----- + fillInBitsObject: newObj from: oldObj + 0 to: (oldHeap fetchLong32LengthOf: oldObj) - 1 do: + [:i| + newHeap + storeLong32: i + ofObject: newObj + withValue: (oldHeap fetchLong32: i ofObject: oldObj)]! Item was added: + ----- Method: SpurBootstrap32>>wordSize (in category 'word size') ----- + wordSize + ^4! Item was added: + ----- Method: SpurBootstrap32>>wordSizeMask (in category 'word size') ----- + wordSizeMask + ^3! Item was added: + SpurBootstrap subclass: #SpurBootstrap64 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Cog-Bootstrapping'! Item was added: + ----- Method: SpurBootstrap64>>wordSizeMask (in category 'word size') ----- + wordSizeMask + ^7!

1 0

VM Maker: VMMaker.oscog-eem.339.mcz
by commits＠source.squeak.org 31 Aug '13

31 Aug '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.339.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.339 Author: eem Time: 31 August 2013, 12:13:21.379 pm UUID: 043d571b-d2cc-4e0b-b297-4358a4cf6801 Ancestors: VMMaker.oscog-eem.338 Fleshing-out of CogMemoryManager so that a first bootstrap of an image's objects (*) to the new format can be completed. The bootstrap is in the Cog package. (*) this does not include compiling different versions of methods for the new format, behavior hash management for the class table, or immediate characters. Add 32-bit & 64-bit subclasses of CogMemoryManager. Abstract out unalignedAccessError. Remove the unused ClassCompiledMethod and ClassProcess. Fix comment typo. =============== Diff against VMMaker.oscog-eem.335 =============== Item was added: + CogMemoryManager32Bits subclass: #CMM32LSBSimulator + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-MemoryManagerSimulation'! Item was added: + ----- Method: CMM32LSBSimulator>>endianness (in category 'memory access') ----- + endianness + ^#little! Item was added: + ----- Method: CMM32LSBSimulator>>headerForSlots:format:classIndex: (in category 'header format') ----- + headerForSlots: numSlots format: formatField classIndex: classIndex + "The header format in LSB is + MSB: | 2 bits | + | 22: identityHash | + | 8: slotSize | + | 3 bits | + | 5: format | + | 2 bits | + | 22: classIndex | : LSB" + self assert: (numSlots between: 0 and: self slotSizeMask). + self assert: (formatField between: 0 and: 31). + self assert: (classIndex between: 0 and: 16r3fffff). + ^super headerForSlots: numSlots format: formatField classIndex: classIndex! Item was added: + ----- Method: CMM32LSBSimulator>>long32At:put: (in category 'memory access') ----- + long32At: byteAddress put: a32BitValue + "Store the 32-bit value at byteAddress which must be 0 mod 4." + + ^self longAt: byteAddress put: a32BitValue! Item was added: + ----- Method: CMM32LSBSimulator>>longAt: (in category 'memory access') ----- + longAt: byteAddress + "Note: Adjusted for Smalltalk's 1-based array indexing." + byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4 + 1! Item was added: + ----- Method: CMM32LSBSimulator>>longAt:put: (in category 'memory access') ----- + longAt: byteAddress put: a32BitValue + "Note: Adjusted for Smalltalk's 1-based array indexing." + byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4 + 1 put: a32BitValue! Item was added: + ----- Method: CMM32LSBSimulator>>longLongAt: (in category 'memory access') ----- + longLongAt: byteAddress + | hiWord loWord | + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + hiWord := memory at: byteAddress // 8 + 1. + loWord := memory at: byteAddress // 8 + 2. + ^hiWord = 0 + ifTrue: [loWord] + ifFalse: [(hiWord bitShift: 32) + loWord]! Item was added: + ----- Method: CMM32LSBSimulator>>longLongAt:put: (in category 'memory access') ----- + longLongAt: byteAddress put: a64BitValue + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + memory + at: byteAddress // 8 + 1 put: a64BitValue >> 32; + at: byteAddress // 8 + 2 put: (a64BitValue bitAnd: 16rffffffff). + ^a64BitValue! Item was added: + ----- Method: CMM32LSBSimulator>>unalignedAccessError (in category 'memory access') ----- + unalignedAccessError + ^self error: 'unaligned access'! Item was changed: ----- Method: CoInterpreterStackPages>>longAt: (in category 'memory access') ----- longAt: byteAddress "Note: Adjusted for Smalltalk's 1-based array indexing." - self assert: (byteAddress bitAnd: BytesPerWord - 1) == 0. self assert: (byteAddress >= minStackAddress and: [byteAddress < maxStackAddress]). ^objectMemory longAt: byteAddress! Item was changed: ----- Method: CoInterpreterStackPages>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a32BitValue - self assert: (byteAddress bitAnd: BytesPerWord - 1) == 0. self assert: (byteAddress >= minStackAddress and: [byteAddress < maxStackAddress]). ^objectMemory longAt: byteAddress put: a32BitValue! Item was changed: VMClass subclass: #CogMemoryManager (excessive size, no diff calculated) Item was added: + ----- Method: CogMemoryManager>>allocateMemoryOfSize: (in category 'simulation') ----- + allocateMemoryOfSize: limit + <doNotGenerate> + memory := (self endianness == #little + ifTrue: [LittleEndianBitmap] + ifFalse: [Bitmap]) new: (limit roundUpTo: 8). + freeStart := 0. + scavengeThreshold := newSpaceLimit := memory size * 4 "Bitmap is a 4-byte per word array"! Item was added: + ----- Method: CogMemoryManager>>allocateSlots:format:classIndex: (in category 'allocation') ----- + allocateSlots: numSlots format: formatField classIndex: classIndex + self subclassResponsibility! Item was added: + ----- Method: CogMemoryManager>>allocationUnit (in category 'allocation') ----- + allocationUnit + "All objects are a multiple of 8 bytes in length" + ^8! Item was added: + ----- Method: CogMemoryManager>>arrayClassIndexPun (in category 'class table') ----- + arrayClassIndexPun + "Class puns are class indices not used by any class. There is an entry + for the pun that refers to the notional class of objects with this class + index. But because the index doesn't match the class it won't show up + in allInstances, hence hiding the object with a pun as its class index. + The puns occupy indices 16 through 31." + ^16! Item was added: + ----- Method: CogMemoryManager>>arrayFormat (in category 'header format') ----- + arrayFormat + ^2! Item was added: + ----- Method: CogMemoryManager>>baseHeaderSize (in category 'header format') ----- + baseHeaderSize + "Object headers are 8 bytes in length if the slot size fits in the slot size field (max implies overflow), + 16 bytes otherwise (slot size in preceeding word)." + ^8! Item was added: + ----- Method: CogMemoryManager>>bytesPerSlot (in category 'header format') ----- + bytesPerSlot + ^self subclassResponsibility! Item was added: + ----- Method: CogMemoryManager>>characterObjectOf: (in category 'object access') ----- + characterObjectOf: characterCode + ^characterCode << self numTagBits + self characterTag! Item was added: + ----- Method: CogMemoryManager>>characterTag (in category 'object access') ----- + characterTag + ^2! Item was added: + ----- Method: CogMemoryManager>>classIndexMask (in category 'header format') ----- + classIndexMask + "22-bit class mask => ~ 4M classes" + ^16r3fffff! Item was added: + ----- Method: CogMemoryManager>>classTableMajorIndexShift (in category 'class table') ----- + classTableMajorIndexShift + "1024 entries per page (2^10); 22 bit classIndex implies 2^12 pages" + ^10! Item was added: + ----- Method: CogMemoryManager>>classTableMinorIndexMask (in category 'class table') ----- + classTableMinorIndexMask + "1024 entries per page (2^10); 22 bit classIndex implies 2^12 pages" + "self basicNew classTableMinorIndexMask" + ^1 << self classTableMajorIndexShift - 1! Item was added: + ----- Method: CogMemoryManager>>classTablePageSize (in category 'class table') ----- + classTablePageSize + "1024 entries per page (2^10); 22 bit classIndex implies 2^12 pages" + "self basicNew classTablePageSize" + ^1 << self classTableMajorIndexShift! Item was added: + ----- Method: CogMemoryManager>>classTableRootObj (in category 'accessing') ----- + classTableRootObj + "For mapInterpreterOops & bootstrap" + ^classTableRootObj! Item was added: + ----- Method: CogMemoryManager>>classTableRootObj: (in category 'accessing') ----- + classTableRootObj: anOop + "For mapInterpreterOops" + classTableRootObj := anOop! Item was added: + ----- Method: CogMemoryManager>>fetchLong32:ofObject: (in category 'object access') ----- + fetchLong32: fieldIndex ofObject: oop + "index by 32-bit units, and return a 32-bit value. Intended to replace fetchWord:ofObject:" + + ^self long32At: oop + self baseHeaderSize + (fieldIndex << 2)! Item was added: + ----- Method: CogMemoryManager>>formatMask (in category 'header format') ----- + formatMask + ^16r1f! Item was added: + ----- Method: CogMemoryManager>>formatOf: (in category 'object access') ----- + formatOf: objOop + ^self subclassResponsibility! Item was added: + ----- Method: CogMemoryManager>>formatShift (in category 'header format') ----- + formatShift + ^24! Item was added: + ----- Method: CogMemoryManager>>headerForSlots:format:classIndex: (in category 'header format') ----- + headerForSlots: numSlots format: formatField classIndex: classIndex + "The header format in LSB is + MSB: | 8: slotSize | (on a byte boundary) + | 2 bits | + | 22: identityHash | (on a word boundary) + | 3 bits | + | 5: format | (on a byte boundary) + | 2 bits | + | 22: classIndex | (on a word boundary) : LSB + The remaining bits (7) need to be used for + isGrey + isMarked + isRemembered + isPinned + isImmutable + leaving 2 unused bits." + ^ (numSlots << 56) + + (formatField << 24) + + classIndex! Item was added: + ----- Method: CogMemoryManager>>identityHashHalfWordMask (in category 'header format') ----- + identityHashHalfWordMask + ^16r3fffff! Item was added: + ----- Method: CogMemoryManager>>isCompiledMethod: (in category 'object testing') ----- + isCompiledMethod: objOop + "Answer whether the argument object is of compiled method format" + <api> + ^(self formatOf: objOop) >= 24! Item was added: + ----- Method: CogMemoryManager>>isPointersNonImm: (in category 'object testing') ----- + isPointersNonImm: objOop + ^(self formatOf: objOop) <= 5! Item was added: + ----- Method: CogMemoryManager>>nilFieldsOf: (in category 'primitive support') ----- + nilFieldsOf: obj + 0 to: (self rawSlotSizeOf: obj) - 1 do: + [:i| + self storePointerUnchecked: i ofObject: obj withValue: nilObj]! Item was added: + ----- Method: CogMemoryManager>>nilObject (in category 'accessing') ----- + nilObject + ^nilObj! Item was added: + ----- Method: CogMemoryManager>>nilObject: (in category 'accessing') ----- + nilObject: anOop + "For mapInterpreterOops" + nilObj := anOop! Item was added: + ----- Method: CogMemoryManager>>numTagBits (in category 'object access') ----- + numTagBits + ^self subclassResponsibility! Item was added: + ----- Method: CogMemoryManager>>rawSlotSizeOf: (in category 'object access') ----- + rawSlotSizeOf: oop + <returnTypeC: #usqInt> + | header slotSize | + header := self longAt: oop. + slotSize := header >> self slotSizeHalfWordShift bitAnd: self slotSizeMask. + ^slotSize = self slotSizeMask + ifTrue: [self cCoerceSimple: (self longLongAt: oop - self baseHeaderSize) to: #usqInt] + ifFalse: [slotSize]! Item was added: + ----- Method: CogMemoryManager>>setHashBitsOf:to: (in category 'header access') ----- + setHashBitsOf: objOop to: hash + self assert: (hash between: 0 and: self identityHashHalfWordMask). + self longAt: objOop + put: ((self longAt: objOop) bitClear: self identityHashHalfWordMask) + hash! Item was added: + ----- Method: CogMemoryManager>>slotSizeHalfWordShift (in category 'header format') ----- + slotSizeHalfWordShift + ^24! Item was added: + ----- Method: CogMemoryManager>>slotSizeMask (in category 'header format') ----- + slotSizeMask + "8-bit slot size: + max 64-bit small obj size 254 * 8 = 2032 bytes + max 32-bit small obj size 254 * 4 = 1016 bytes" + ^255! Item was added: + ----- Method: CogMemoryManager>>storeLong32:ofObject:withValue: (in category 'object access') ----- + storeLong32: fieldIndex ofObject: obj withValue: valueWord + ^self long32At: obj + self baseHeaderSize + (fieldIndex << 2) put: valueWord! Item was added: + ----- Method: CogMemoryManager>>storePointer:ofObject:withValue: (in category 'object access') ----- + storePointer: fieldIndex ofObject: oop withValue: valuePointer + "Note must check here for stores of young objects into old ones." + ^self subclassResponsibility! Item was added: + ----- Method: CogMemoryManager>>storePointerUnchecked:ofObject:withValue: (in category 'object access') ----- + storePointerUnchecked: fieldIndex ofObject: oop withValue: valuePointer + ^self subclassResponsibility! Item was added: + ----- Method: CogMemoryManager>>weakArrayClassIndexPun (in category 'class table') ----- + weakArrayClassIndexPun + "Class puns are class indices not used by any class. There is an entry + for the pun that refers to the notional class of objects with this class + index. But because the index doesn't match the class it won't show up + in allInstances, hence hiding the object with a pun as its class index. + The puns occupy indices 16 through 31." + ^17! Item was added: + ----- Method: CogMemoryManager>>weakArrayFormat (in category 'header format') ----- + weakArrayFormat + ^4! Item was added: + CogMemoryManager subclass: #CogMemoryManager32Bits + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-MemoryManager'! Item was added: + ----- Method: CogMemoryManager32Bits>>allocateSlots:format:classIndex: (in category 'allocation') ----- + allocateSlots: numSlots format: formatField classIndex: classIndex + | numBytes newObj | + "Object headers are 8 bytes in length if the slot size fits in the slot size field (max implies overflow), + 16 bytes otherwise (slot size in preceeding word). + Objects always have at least one slot, for the forwarding pointer, + and are multiples of 8 bytes in length." + numSlots >= self slotSizeMask + ifTrue: + [newObj := freeStart + self baseHeaderSize. + numBytes := self baseHeaderSize + self baseHeaderSize "double header" + + numSlots + (numSlots bitAnd: 1) * self bytesPerSlot] "roundTo allocationUnit" + ifFalse: + [newObj := freeStart. + numBytes := self baseHeaderSize "single header" + + (numSlots <= 1 + ifTrue: [self allocationUnit] "at least one slot for the forwarding pointer" + ifFalse: [numSlots + (numSlots bitAnd: 1) * self bytesPerSlot])]. "roundTo allocationUnit" + self assert: numBytes \\ self allocationUnit = 0. + freeStart + numBytes > scavengeThreshold ifTrue: + [freeStart + numBytes > newSpaceLimit ifTrue: + [^self allocateSlotsInOldSpace: numSlots format: formatField classIndex: classIndex]. + self scheduleScavenge]. + numSlots >= self slotSizeMask + ifTrue: + [self longLongAt: freeStart put: numSlots. + self longLongAt: newObj put: (self headerForSlots: self slotSizeMask format: formatField classIndex: classIndex)] + ifFalse: + [self longLongAt: newObj put: (self headerForSlots: numSlots format: formatField classIndex: classIndex)]. + freeStart := freeStart + numBytes. + ^newObj! Item was added: + ----- Method: CogMemoryManager32Bits>>bytesPerSlot (in category 'header format') ----- + bytesPerSlot + ^4! Item was added: + ----- Method: CogMemoryManager32Bits>>fetchPointer:ofObject: (in category 'object access') ----- + fetchPointer: fieldIndex ofObject: objOop + ^self longAt: objOop + self baseHeaderSize + (fieldIndex << self shiftForWord)! Item was added: + ----- Method: CogMemoryManager32Bits>>formatOf: (in category 'object access') ----- + formatOf: objOop + ^(self longAt: objOop + self wordSize) >> self formatShift bitAnd: self formatMask! Item was added: + ----- Method: CogMemoryManager32Bits>>numTagBits (in category 'object access') ----- + numTagBits + ^2! Item was added: + ----- Method: CogMemoryManager32Bits>>shiftForWord (in category 'word size') ----- + shiftForWord + ^2! Item was added: + ----- Method: CogMemoryManager32Bits>>storePointer:ofObject:withValue: (in category 'object access') ----- + storePointer: fieldIndex ofObject: oop withValue: valuePointer + "Note must check here for stores of young objects into old ones." + + (self oop: oop isLessThan: newSpaceLimit) ifFalse: "most stores into young objects" + [(self isImmediate: valuePointer) ifFalse: + [(self oop: valuePointer isLessThan: newSpaceLimit) ifTrue: + [self possibleRootStoreInto: oop value: valuePointer]]]. + + ^self + longAt: oop + self baseHeaderSize + (fieldIndex << self shiftForWord) + put: valuePointer! Item was added: + ----- Method: CogMemoryManager32Bits>>storePointerUnchecked:ofObject:withValue: (in category 'object access') ----- + storePointerUnchecked: fieldIndex ofObject: oop withValue: valuePointer + ^self + longAt: oop + self baseHeaderSize + (fieldIndex << self shiftForWord) + put: valuePointer! Item was added: + ----- Method: CogMemoryManager32Bits>>wordSize (in category 'word size') ----- + wordSize + ^4! Item was added: + CogMemoryManager subclass: #CogMemoryManager64Bits + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-MemoryManager'! Item was added: + ----- Method: CogMemoryManager64Bits>>allocateSlots:format:classIndex: (in category 'allocation') ----- + allocateSlots: numSlots format: formatField classIndex: classIndex + | numBytes newObj | + "Object headers are 8 bytes in length if the slot size fits in the slot size field (max implies overflow), + 16 bytes otherwise (slot size in preceeding word). + Objects always have at least one slot, for the forwarding pointer, + and are multiples of 8 bytes in length." + numSlots >= self slotSizeMask + ifTrue: + [newObj := freeStart + self baseHeaderSize. + numBytes := (self baseHeaderSize + self baseHeaderSize) "double header" + + (numSlots * self bytesPerSlot)] + ifFalse: + [newObj := freeStart. + numBytes := self baseHeaderSize "single header" + + (numSlots < 1 + ifTrue: [self allocationUnit] "at least one slot for the forwarding pointer" + ifFalse: [numSlots * self bytesPerSlot])]. + + freeStart + numBytes > scavengeThreshold ifTrue: + [freeStart + numBytes > newSpaceLimit ifTrue: + [^self allocateSlotsInOldSpace: numSlots format: formatField classIndex: classIndex]. + self scheduleScavenge]. + numSlots >= self slotSizeMask + ifTrue: + [self longLongAt: freeStart put: numSlots. + self longLongAt: newObj put: (self headerForSlots: self slotSizeMask format: formatField classIndex: classIndex)] + ifFalse: + [self longLongAt: newObj put: (self headerForSlots: numSlots format: formatField classIndex: classIndex)]. + freeStart := freeStart + numBytes. + ^newObj! Item was added: + ----- Method: CogMemoryManager64Bits>>bytesPerSlot (in category 'header format') ----- + bytesPerSlot + ^8! Item was added: + ----- Method: CogMemoryManager64Bits>>fetchPointer:ofObject: (in category 'object access') ----- + fetchPointer: fieldIndex ofObject: objOop + ^self longLongAt: objOop + self baseHeaderSize + (fieldIndex << self shiftForWord)! Item was added: + ----- Method: CogMemoryManager64Bits>>formatOf: (in category 'object access') ----- + formatOf: objOop + ^(self longLongAt: objOop) >> self formatShift bitAnd: self formatMask! Item was added: + ----- Method: CogMemoryManager64Bits>>numTagBits (in category 'object access') ----- + numTagBits + "4th bit reserved for object alignment, which could imply e.g. what space the object is in." + ^3! Item was added: + ----- Method: CogMemoryManager64Bits>>shiftForWord (in category 'word size') ----- + shiftForWord + ^3! Item was added: + ----- Method: CogMemoryManager64Bits>>storePointer:ofObject:withValue: (in category 'object access') ----- + storePointer: fieldIndex ofObject: oop withValue: valuePointer + "Note must check here for stores of young objects into old ones." + + (self oop: oop isLessThan: newSpaceLimit) ifFalse: "most stores into young objects" + [(self isImmediate: valuePointer) ifFalse: + [(self oop: valuePointer isLessThan: newSpaceLimit) ifTrue: + [self possibleRootStoreInto: oop value: valuePointer]]]. + + ^self + longLongAt: oop + self baseHeaderSize + (fieldIndex << self shiftForWord) + put: valuePointer! Item was added: + ----- Method: CogMemoryManager64Bits>>storePointerUnchecked:ofObject:withValue: (in category 'object access') ----- + storePointerUnchecked: fieldIndex ofObject: oop withValue: valuePointer + ^self + longLongAt: oop + self baseHeaderSize + (fieldIndex << self shiftForWord) + put: valuePointer! Item was added: + ----- Method: CogMemoryManager64Bits>>wordSize (in category 'word size') ----- + wordSize + ^8! Item was changed: ----- Method: InterpreterSimulator>>longPrint: (in category 'debug support') ----- longPrint: oop | lastPtr val lastLong hdrType prevVal | (self isIntegerObject: oop) ifTrue: [^ self shortPrint: oop]. ^ String streamContents: [:strm | lastPtr := 64*BytesPerWord min: (self lastPointerOf: oop). hdrType := self headerType: oop. hdrType = 2 ifTrue: [lastPtr := 0]. prevVal := 0. (self headerStart: oop) to: lastPtr by: BytesPerWord do: [:a | val := self longAt: oop+a. (a > 0 and: [(val = prevVal) & (a ~= lastPtr)]) ifTrue: [prevVal = (self longAt: oop+a-(BytesPerWord*2)) ifFalse: [strm cr; nextPutAll: ' ...etc...']] ifFalse: [strm cr; nextPutAll: (a<16 ifTrue: [' ', a hex] ifFalse: [a hex]); space; space; space; nextPutAll: val hex8; space; space. a = (BytesPerWord*2) negated ifTrue: [strm nextPutAll: 'size = ' , (val - hdrType) hex]. a = BytesPerWord negated ifTrue: [strm nextPutAll: '<' , (self nameOfClass: (val - hdrType)) , '>']. a = 0 ifTrue: [strm cr; tab; nextPutAll: (self dumpHeader: val)]. a > 0 ifTrue: [strm nextPutAll: (self shortPrint: val)]. a = BytesPerWord ifTrue: + [(self isCompiledMethod: oop) ifTrue: + [strm cr; tab; nextPutAll: (self dumpMethodHeader: val)]]]. - [(self fetchClassOf: oop) = (self splObj: ClassCompiledMethod) ifTrue: - [strm cr; tab; nextPutAll: (self dumpMethodHeader: val)]]]. prevVal := val]. lastLong := 256 min: (self sizeBitsOf: oop) - BaseHeaderSize. hdrType = 2 ifTrue: ["free" strm cr; nextPutAll: (oop+(self longAt: oop)-2) hex; space; space; nextPutAll: (oop+(self longAt: oop)-2) printString] ifFalse: [(self formatOf: oop) = 3 ifTrue: [strm cr; tab; nextPutAll: '/ next 3 fields are above SP... /'. lastPtr+BytesPerWord to: lastPtr+(3*BytesPerWord) by: BytesPerWord do: [:a | val := self longAt: oop+a. strm cr; nextPutAll: a hex; space; space; space; nextPutAll: val hex8; space; space. (self validOop: val) ifTrue: [strm nextPutAll: (self shortPrint: val)]]] ifFalse: [lastPtr+BytesPerWord to: lastLong by: BytesPerWord do: [:a | val := self longAt: oop+a. strm cr; nextPutAll: (a<16 ifTrue: [' ', a hex] ifFalse: [a hex]); space; space; space. strm nextPutAll: val hex8; space; space; nextPutAll: (self charsOfLong: val)]]]. ]! Item was changed: ----- Method: NewCoObjectMemorySimulator>>longAt: (in category 'memory access') ----- longAt: byteAddress "Note: Adjusted for Smalltalk's 1-based array indexing." + byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4 + 1! - byteAddress \\ 4 ~= 0 ifTrue: [self error: 'unaligned access']. - ^memory at: (byteAddress // 4) + 1! Item was changed: ----- Method: NewCoObjectMemorySimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a32BitValue - "(byteAddress = 16r1896A50 - and: [a32BitValue = 7]) ifTrue: - [self halt]." "Note: Adjusted for Smalltalk's 1-based array indexing." + byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4 + 1 put: a32BitValue! - byteAddress \\ 4 ~= 0 ifTrue: [self error: 'unaligned access']. - ^memory at: (byteAddress // 4) + 1 put: a32BitValue! Item was changed: ----- Method: NewObjectMemorySimulator>>longAt: (in category 'memory access') ----- longAt: byteAddress "Note: Adjusted for Smalltalk's 1-based array indexing." + byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4 + 1! - byteAddress \\ 4 ~= 0 ifTrue: [self error: 'unaligned access']. - ^memory at: (byteAddress // 4) + 1! Item was changed: ----- Method: NewObjectMemorySimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a32BitValue - "(byteAddress = 16r1896A50 - and: [a32BitValue = 7]) ifTrue: - [self halt]." "Note: Adjusted for Smalltalk's 1-based array indexing." + byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 4 + 1 put: a32BitValue! - byteAddress \\ 4 ~= 0 ifTrue: [self error: 'unaligned access']. - ^memory at: (byteAddress // 4) + 1 put: a32BitValue! Item was changed: ----- Method: NewspeakInterpreterSimulator>>longPrint: (in category 'debug support') ----- longPrint: oop | lastPtr val lastLong hdrType prevVal | (self isIntegerObject: oop) ifTrue: [^ self shortPrint: oop]. ^ String streamContents: [:strm | lastPtr := 64*BytesPerWord min: (self lastPointerOf: oop). hdrType := self headerType: oop. hdrType = 2 ifTrue: [lastPtr := 0]. prevVal := 0. (self headerStart: oop) to: lastPtr by: BytesPerWord do: [:a | val := self longAt: oop+a. (a > 0 and: [(val = prevVal) & (a ~= lastPtr)]) ifTrue: [prevVal = (self longAt: oop+a-(BytesPerWord*2)) ifFalse: [strm cr; nextPutAll: ' ...etc...']] ifFalse: [strm cr; nextPutAll: (a<16 ifTrue: [' ', a hex] ifFalse: [a hex]); space; space; space; nextPutAll: val hex8; space; space. a = (BytesPerWord*2) negated ifTrue: [strm nextPutAll: 'size = ' , (val - hdrType) hex]. a = BytesPerWord negated ifTrue: [strm nextPutAll: '<' , (self nameOfClass: (val - hdrType)) , '>']. a = 0 ifTrue: [strm cr; tab; nextPutAll: (self dumpHeader: val)]. a > 0 ifTrue: [strm nextPutAll: (self shortPrint: val)]. a = BytesPerWord ifTrue: + [(self isCompiledMethod: oop) ifTrue: + [strm cr; tab; nextPutAll: (self dumpMethodHeader: val)]]]. - [(self fetchClassOf: oop) = (self splObj: ClassCompiledMethod) ifTrue: - [strm cr; tab; nextPutAll: (self dumpMethodHeader: val)]]]. prevVal := val]. lastLong := 256 min: (self sizeBitsOf: oop) - BaseHeaderSize. hdrType = 2 ifTrue: ["free" strm cr; nextPutAll: (oop+(self longAt: oop)-2) hex; space; space; nextPutAll: (oop+(self longAt: oop)-2) printString] ifFalse: [(self formatOf: oop) = 3 ifTrue: [strm cr; tab; nextPutAll: '/ next 3 fields are above SP... /'. lastPtr+BytesPerWord to: lastPtr+(3*BytesPerWord) by: BytesPerWord do: [:a | val := self longAt: oop+a. strm cr; nextPutAll: a hex; space; space; space; nextPutAll: val hex8; space; space. (self validOop: val) ifTrue: [strm nextPutAll: (self shortPrint: val)]]] ifFalse: [lastPtr+BytesPerWord to: lastLong by: BytesPerWord do: [:a | val := self longAt: oop+a. strm cr; nextPutAll: (a<16 ifTrue: [' ', a hex] ifFalse: [a hex]); space; space; space. strm nextPutAll: val hex8; space; space; nextPutAll: (self charsOfLong: val)]]]. ]! Item was changed: ----- Method: ObjectMemory class>>initializeSpecialObjectIndices (in category 'initialization') ----- initializeSpecialObjectIndices "Initialize indices into specialObjects array." NilObject := 0. FalseObject := 1. TrueObject := 2. SchedulerAssociation := 3. ClassBitmap := 4. ClassInteger := 5. ClassByteString := ClassString := 6. "N.B. Actually class ByteString" ClassArray := 7. "SmalltalkDictionary := 8." "Do not delete!!" ClassFloat := 9. ClassMethodContext := 10. ClassBlockContext := 11. ClassPoint := 12. ClassLargePositiveInteger := 13. TheDisplay := 14. ClassMessage := 15. + "ClassCompiledMethod := 16. unused by the VM" - ClassCompiledMethod := 16. TheLowSpaceSemaphore := 17. ClassSemaphore := 18. ClassCharacter := 19. SelectorDoesNotUnderstand := 20. SelectorCannotReturn := 21. ProcessSignalingLowSpace := 22. "was TheInputSemaphore" SpecialSelectors := 23. CharacterTable := 24. SelectorMustBeBoolean := 25. ClassByteArray := 26. + "ClassProcess := 27. unused" - ClassProcess := 27. CompactClasses := 28. TheTimerSemaphore := 29. TheInterruptSemaphore := 30. SelectorCannotInterpret := 34. "Was MethodContextProto := 35." ClassBlockClosure := 36. "Was BlockContextProto := 37." ExternalObjectsArray := 38. ClassMutex := 39. "Was: ClassTranslatedMethod := 40." ProcessInExternalCodeTag := 40. TheFinalizationSemaphore := 41. ClassLargeNegativeInteger := 42. ClassExternalAddress := 43. ClassExternalStructure := 44. ClassExternalData := 45. ClassExternalFunction := 46. ClassExternalLibrary := 47. SelectorAboutToReturn := 48. SelectorRunWithIn := 49. SelectorAttemptToAssign := 50. "PrimErrTableIndex := 51. in Interpreter class>>initializePrimitiveErrorCodes" ClassAlien := 52. SelectorInvokeCallback := 53. ClassUnsafeAlien := 54. ClassWeakFinalizer := 55. ForeignCallbackProcess := 56. SelectorUnknownBytecode := 57. SelectorCounterTripped := 58 ! Item was changed: ----- Method: RePlugin>>primPCREExecfromto (in category 're primitives') ----- primPCREExecfromto + "<rcvr primPCREExec: searchObject from: fromInteger to: toInteger>, where rcvr is an object with instance variables: - "<rcvr primPCREExec: searchObject> from: fromInteger to: toInteger>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Apply the regular expression (stored in <pcrePtr> and <extratr>, generated from calls to primPCRECompile), to smalltalk String searchObject using <matchOptions>, beginning at offset <fromInteger> and continuing until offset <toInteger>. If there is no match, answer nil. Otherwise answer a ByteArray of offsets representing the results of the match." | searchObject searchBuffer length result matchSpacePtr matchSpaceSize fromInteger toInteger | <export: true> <var:#searchBuffer type: 'char *'> <var:#matchSpacePtr type: 'int *'> "Load Parameters" toInteger := interpreterProxy stackIntegerValue: 0. fromInteger := interpreterProxy stackIntegerValue: 1. searchObject := interpreterProxy stackObjectValue: 2. searchBuffer := interpreterProxy arrayValueOf: searchObject. length := interpreterProxy byteSizeOf: searchObject. self loadRcvrFromStackAt: 3. "Validate parameters" interpreterProxy success: (1 <= fromInteger). interpreterProxy success: (toInteger<=length). fromInteger := fromInteger - 1. "Smalltalk offsets are 1-based" interpreterProxy success: (fromInteger<=toInteger). "adjust length, searchBuffer" length := toInteger - fromInteger. searchBuffer := searchBuffer + fromInteger. "Load Instance Variables" pcrePtr := self rcvrPCREBufferPtr. extraPtr := self rcvrExtraPtr. matchFlags := self rcvrMatchFlags. matchSpacePtr := self rcvrMatchSpacePtr. matchSpaceSize := self rcvrMatchSpaceSize. interpreterProxy failed ifTrue:[^ nil]. result := self cCode: 'pcre_exec((pcre *)pcrePtr, (pcre_extra *)extraPtr, searchBuffer, length, 0, matchFlags, matchSpacePtr, matchSpaceSize)'. + interpreterProxy pop: 4; pushInteger: result. - interpreterProxy pop: 2; pushInteger: result. "empty call so compiler doesn't bug me about variables not used" self touch: searchBuffer; touch: matchSpacePtr; touch: matchSpaceSize; touch: length ! Item was changed: ----- Method: RePlugin>>primPCRENumSubPatterns (in category 're primitives') ----- primPCRENumSubPatterns "<rcvr primPCRENumSubPatterns>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Return the number of subpatterns captured by the compiled pattern." <export: true> + | ncap | - "Load Parameters" self loadRcvrFromStackAt: 0. "Load Instance Variables" pcrePtr := self rcvrPCREBufferPtr. + self cCode: 'pcre_fullinfo((const pcre *)pcrePtr, NULL, PCRE_INFO_CAPTURECOUNT, &ncap)' + inSmalltalk: [ncap := -1]. + interpreterProxy pop: 1; pushInteger: ncap. - interpreterProxy pop: 1; pushInteger: (self cCode: 'pcre_info((pcre *)pcrePtr, NULL, NULL)'). ! Item was changed: ----- Method: StackInterpreterSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes + "StackInterpreterSimulator new openOn: 'clone.im' extraMemory: 100000" - "InterpreterSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize count oldBaseAddr bytesToShift swapBytes hdrNumStackPages hdrEdenBytes headerFlags | "open image file and read the header" ["begin ensure block..." f := FileStream readOnlyFileNamed: fileName. imageName := f fullName. f binary. version := self nextLongFrom: f. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self nextLongFrom: f swap: swapBytes. objectMemory setEndOfMemory: (self nextLongFrom: f swap: swapBytes). "first unused location in heap" oldBaseAddr := self nextLongFrom: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self nextLongFrom: f swap: swapBytes). objectMemory lastHash: (self nextLongFrom: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self nextLongFrom: f swap: swapBytes. headerFlags := self nextLongFrom: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self nextLongFrom: f swap: swapBytes. hdrNumStackPages := self nextShortFrom: 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. stackPages := self stackPagesClass new. "Temporary for computeStackZoneSize" "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to images run on Cog." theUnknownShort := self getShortFromFile: f swap: swapBytes. hdrEdenBytes := self nextLongFrom: f swap: swapBytes. objectMemory edenBytes: (hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]). desiredEdenBytes := hdrEdenBytes. "allocate interpreter memory" objectMemory setMemoryLimit: objectMemory endOfMemory + extraBytes + objectMemory edenBytes + self interpreterAllocationReserveBytes. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. objectMemory memory: (Bitmap new: objectMemory memoryLimit // 4). count := f readInto: objectMemory memory startingAt: 1 count: objectMemory endOfMemory // 4. count ~= (objectMemory endOfMemory // 4) ifTrue: [self halt]. ] ensure: [f close]. self ensureImageFormatIsUpToDate: swapBytes. objectMemory initialize. bytesToShift := objectMemory startOfMemory - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. ! Item was added: + ----- Method: VMClass>>unalignedAccessError (in category 'simulation') ----- + unalignedAccessError + ^self error: 'unaligned access'! Item was changed: SharedPool subclass: #VMObjectIndices instanceVariableNames: '' + classVariableNames: 'ActiveProcessIndex CharacterTable CharacterValueIndex ClassAlien ClassArray ClassBitmap ClassBlockClosure ClassBlockContext ClassByteArray ClassByteString ClassCharacter ClassExternalAddress ClassExternalData ClassExternalFunction ClassExternalLibrary ClassExternalStructure ClassFloat ClassInteger ClassLargeNegativeInteger ClassLargePositiveInteger ClassMessage ClassMethodContext ClassMutex ClassPoint ClassSemaphore ClassString ClassUnsafeAlien ClassWeakFinalizer ClosureCopiedValuesIndex ClosureFirstCopiedValueIndex ClosureIndex ClosureNumArgsIndex ClosureOuterContextIndex ClosureStartPCIndex CompactClasses ConstMinusOne ConstOne ConstTwo ConstZero ExcessSignalsIndex ExternalObjectsArray FalseObject FirstLinkIndex ForeignCallbackProcess HeaderIndex InstanceSpecificationIndex InstructionPointerIndex KeyIndex LastLinkIndex LiteralStart MessageArgumentsIndex MessageLookupClassIndex MessageSelectorIndex MethodArrayIndex MethodDictionaryIndex MethodIndex MyListIndex NextLinkIndex NilObject PrimErrTableIndex PriorityIndex ProcessInExternalCodeTag ProcessListsIndex ProcessSignalingLowSpace ReceiverIndex SchedulerAssociation SelectorAboutToReturn SelectorAttemptToAssign SelectorCannotInterpret SelectorCannotReturn SelectorCounterTripped SelectorDoesNotUnderstand SelectorInvokeCallback SelectorMustBeBoolean SelectorRunWithIn SelectorStart SelectorUnknownBytecode SenderIndex SpecialSelectors StackPointerIndex StreamArrayIndex StreamIndexIndex StreamReadLimitIndex StreamWriteLimitIndex SuperclassIndex SuspendedContextIndex TheDisplay TheFinalizationSemaphore TheInputSemaphore TheInterruptSemaphore TheLowSpaceSemaphore TheTimerSemaphore TrueObject ValueIndex XIndex YIndex' - classVariableNames: 'ActiveProcessIndex CharacterTable CharacterValueIndex ClassAlien ClassArray ClassBitmap ClassBlockClosure ClassBlockContext ClassByteArray ClassByteString ClassCharacter ClassCompiledMethod ClassExternalAddress ClassExternalData ClassExternalFunction ClassExternalLibrary ClassExternalStructure ClassFloat ClassInteger ClassLargeNegativeInteger ClassLargePositiveInteger ClassMessage ClassMethodContext ClassMutex ClassPoint ClassProcess ClassSemaphore ClassString ClassUnsafeAlien ClassWeakFinalizer ClosureCopiedValuesIndex ClosureFirstCopiedValueIndex ClosureIndex ClosureNumArgsIndex ClosureOuterContextIndex ClosureStartPCIndex CompactClasses ConstMinusOne ConstOne ConstTwo ConstZero ExcessSignalsIndex ExternalObjectsArray FalseObject FirstLinkIndex ForeignCallbackProcess HeaderIndex InstanceSpecificationIndex InstructionPointerIndex KeyIndex LastLinkIndex LiteralStart MessageArgumentsIndex MessageLookupClassIndex MessageSelectorIndex MethodArrayIndex MethodDictionaryIndex MethodIndex MyListIndex NextLinkIndex NilObject PrimErrTableIndex PriorityIndex ProcessInExternalCodeTag ProcessListsIndex ProcessSignalingLowSpace ReceiverIndex SchedulerAssociation SelectorAboutToReturn SelectorAttemptToAssign SelectorCannotInterpret SelectorCannotReturn SelectorCounterTripped SelectorDoesNotUnderstand SelectorInvokeCallback SelectorMustBeBoolean SelectorRunWithIn SelectorStart SelectorUnknownBytecode SenderIndex SpecialSelectors StackPointerIndex StreamArrayIndex StreamIndexIndex StreamReadLimitIndex StreamWriteLimitIndex SuperclassIndex SuspendedContextIndex TheDisplay TheFinalizationSemaphore TheInputSemaphore TheInterruptSemaphore TheLowSpaceSemaphore TheTimerSemaphore TrueObject ValueIndex XIndex YIndex' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMObjectIndices commentStamp: '<historical>' prior: 0! I am a shared pool for the constants that define object layout and well-known objects shared between the object memories (e.g. ObjectMemory, NewObjectMemory), the interpreters (e.g. StackInterpreter, CoInterpreter) and the object representations (e.g. ObjectRepresentationForSqueakV3). self classPool declare: #Foo from: StackInterpreter classPool (ObjectMemory classPool keys select: [:k| (k beginsWith: 'Class') and: [(k endsWith: 'Index') not]]) do: [:k| self classPool declare: k from: ObjectMemory classPool]!

1 0

VM Maker: VMMaker-dtl.324.mcz
by commits＠source.squeak.org 30 Aug '13

30 Aug '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.324.mcz ==================== Summary ==================== Name: VMMaker-dtl.324 Author: dtl Time: 29 August 2013, 11:35:31.522 pm UUID: 07cc6263-b990-444c-91a9-f0cc4dec9a1b Ancestors: VMMaker-eem.323 VMMaker 4.12.6 RePlugin fixes from VMMaker-eem.323. Declare rePluginMalloc: and rePluginFree: as required method names otherwise they are excluded from code generation. Previously they were declared extern for this reason (oscog code generator does not have the update to trim unreferenced methods in plugins, so not an issue for Cog). =============== Diff against VMMaker-eem.323 =============== Item was added: + ----- Method: RePlugin class>>requiredMethodNames (in category 'translation') ----- + requiredMethodNames + "return the list of method names that should be retained for export or other support reasons" + + ^{ #rePluginMalloc: . #rePluginFree: }! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.12.6'! - ^'4.12.5'!

1 0

Finding pointers via heap walking and contexts
by Igor Stasenko 29 Aug '13

29 Aug '13

Hello, i tried to implement a simple algorithm to find nearest common roots for some object(s).. see the attached code. The problem i discovered that the last assertion of my test fails: ===== testArrayShouldBeRootOfItsElements | obj1 obj2 array arrayToTest roots | obj1 := 'ObjectA' copy. obj2 := 'ObjectB' copy. array := { obj1. obj2 }. arrayToTest := { obj1. obj2 }. roots := CommonRootsFinder new findCommonRootsOf: arrayToTest. self assert: (roots identityIncludes: array). self assert: (roots identityIncludes: arrayToTest) not. self assert: (roots identityIncludes: thisContext). "- sometimes works , sometimes not " ======== but, when i restart the method in debugger and step down through it, assertion DOES NOT fails. This means that memory scan does not reveals this context as it should be. (maybe because it stops at the object which located before location of thisContext)? any suggestions/comments/ideas , how to make sure that assert will never fail? -- Best regards, Igor Stasenko.

2 3

VM Maker: VMMaker-eem.323.mcz
by commits＠source.squeak.org 28 Aug '13

28 Aug '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-eem.323.mcz ==================== Summary ==================== Name: VMMaker-eem.323 Author: eem Time: 28 August 2013, 10:57:48.144 am UUID: 05aa46ce-aac1-485a-924b-92c61239d600 Ancestors: VMMaker-dtl.322 Merge RePlugin with Cog VMMaker.oscog-eem.337. . Merge RePlugin fix for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=710375 http://bugs.squeak.org/view.php?id=7785 (pcre_info => pcre_fullinfo). Fix prim arg count for primPCREExecfromto. Merge Cog compilation warning fixes for rePluginFree: & rePluginMalloc:. =============== Diff against VMMaker-dtl.322 =============== Item was changed: ----- Method: RePlugin>>primPCREExecfromto (in category 're primitives') ----- primPCREExecfromto + "<rcvr primPCREExec: searchObject from: fromInteger to: toInteger>, where rcvr is an object with instance variables: - "<rcvr primPCREExec: searchObject> from: fromInteger to: toInteger>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Apply the regular expression (stored in <pcrePtr> and <extratr>, generated from calls to primPCRECompile), to smalltalk String searchObject using <matchOptions>, beginning at offset <fromInteger> and continuing until offset <toInteger>. If there is no match, answer nil. Otherwise answer a ByteArray of offsets representing the results of the match." | searchObject searchBuffer length result matchSpacePtr matchSpaceSize fromInteger toInteger | <export: true> <var:#searchBuffer type: 'char *'> <var:#matchSpacePtr type: 'int *'> "Load Parameters" toInteger := interpreterProxy stackIntegerValue: 0. fromInteger := interpreterProxy stackIntegerValue: 1. searchObject := interpreterProxy stackObjectValue: 2. searchBuffer := interpreterProxy arrayValueOf: searchObject. length := interpreterProxy byteSizeOf: searchObject. self loadRcvrFromStackAt: 3. "Validate parameters" interpreterProxy success: (1 <= fromInteger). interpreterProxy success: (toInteger<=length). fromInteger := fromInteger - 1. "Smalltalk offsets are 1-based" interpreterProxy success: (fromInteger<=toInteger). "adjust length, searchBuffer" length := toInteger - fromInteger. searchBuffer := searchBuffer + fromInteger. "Load Instance Variables" pcrePtr := self rcvrPCREBufferPtr. extraPtr := self rcvrExtraPtr. matchFlags := self rcvrMatchFlags. matchSpacePtr := self rcvrMatchSpacePtr. matchSpaceSize := self rcvrMatchSpaceSize. interpreterProxy failed ifTrue:[^ nil]. result := self cCode: 'pcre_exec((pcre *)pcrePtr, (pcre_extra *)extraPtr, searchBuffer, length, 0, matchFlags, matchSpacePtr, matchSpaceSize)'. + interpreterProxy pop: 4; pushInteger: result. - interpreterProxy pop: 2; pushInteger: result. "empty call so compiler doesn't bug me about variables not used" self touch: searchBuffer; touch: matchSpacePtr; touch: matchSpaceSize; touch: length ! Item was changed: ----- Method: RePlugin>>primPCRENumSubPatterns (in category 're primitives') ----- primPCRENumSubPatterns "<rcvr primPCRENumSubPatterns>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Return the number of subpatterns captured by the compiled pattern." <export: true> + | ncap | - "Load Parameters" self loadRcvrFromStackAt: 0. "Load Instance Variables" pcrePtr := self rcvrPCREBufferPtr. + self cCode: 'pcre_fullinfo((const pcre *)pcrePtr, NULL, PCRE_INFO_CAPTURECOUNT, &ncap)' + inSmalltalk: [ncap := -1]. + interpreterProxy pop: 1; pushInteger: ncap. - interpreterProxy pop: 1; pushInteger: (self cCode: 'pcre_info((pcre *)pcrePtr, NULL, NULL)'). ! Item was changed: ----- Method: RePlugin>>rePluginFree: (in category 'memory management') ----- rePluginFree: aPointer "Free a block of fixed memory allocated with rePluginMalloc. Instrumented version of C free() to facilitate leak analysis from Smalltalk. OS-specific variations on malloc/free, such as with MacOS, are handled by adding a C macro to the header file redefining malloc/free -- see the class comment" + <inline: true> - <inline: false> <var: #aPointer type: 'void * '> <returnTypeC: 'void'> numFrees := numFrees + 1. + aPointer notNil ifTrue: [self free: aPointer] ! - (aPointer) - ifTrue: [self cCode: 'free(aPointer)'] ! Item was changed: ----- Method: RePlugin>>rePluginMalloc: (in category 'memory management') ----- rePluginMalloc: anInteger "Allocate a block of fixed memory using C calls to malloc(). Instrumented to facilitate leak analysis from Smalltalk. Set global lastAlloc to anInteger. OS-specific variations on malloc/free, such as with MacOS, are handled by adding a C macro to the header file redefining malloc/free -- see the class comment" | aPointer | + <inline: true> - <export: true> - <inline: false> <var: #anInteger type: 'size_t '> <var: #aPointer type: 'void *'> <returnTypeC: 'void *'> numAllocs := numAllocs + 1. + (aPointer := self malloc: anInteger) notNil ifTrue: + [lastAlloc := anInteger]. - (aPointer := self cCode: 'malloc(anInteger)') - ifTrue: [lastAlloc := anInteger]. ^aPointer !

1 0

[unix] RePlugin patch for pcre
by Bert Freudenberg 28 Aug '13

28 Aug '13

Begin forwarded message: > Resent-From: Julian Taylor <jtaylor.debian(a)googlemail.com> > From: Julian Taylor <jtaylor.debian(a)googlemail.com> > Subject: Bug#710375: patch > Date: 11. August 2013 22:16:44 MESZ > Resent-To: debian-bugs-dist(a)lists.debian.org > To: 710375(a)bugs.debian.org, control(a)bugs.debian.org > Resent-Cc: Debian Squeak Team <pkg-squeak-devel(a)lists.alioth.debian.org> > Reply-To: Julian Taylor <jtaylor.debian(a)googlemail.com>, 710375(a)bugs.debian.org > > tags 710375 + patch > thanks > > attached patch should fix it > there is another mention in RePlugin.cs but I have no idea what that is (smalltalk I guess?) so its still there >

5 8

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 August 2013