hg/stx-libtool2: comparison SnapShotImageMemory.st

equal deleted inserted replaced

-:51711e3c7046
+:2bc8227a8b18
 indexTypeFlags := flags bitAnd:Behavior maskIndexType.
 (indexTypeFlags = Behavior flagBytes) ifTrue:[
 nBytes := (size - (intSize * 3)).
 o := ImageByteObject new:nBytes.
 o classRef:classRef.
-size > 8000 ifTrue:[self halt].
+"/ size > 8000 ifTrue:[self halt].
 o byteSize:size.
 o bits:bits.
 imgAddr := self imageAddressOf:addr.
 stream position:imgAddr.
 |nameSlot|
 (aClassRef isImageBehavior) ifFalse:[self halt].
 ((aClassRef byteSize // intSize) - 3) < Class instSize ifTrue:[self halt.].
-nameSlot := aClassRef at:7.
+nameSlot := aClassRef nameSlot.
 nameSlot isInteger ifTrue:[
 nameSlot := self fetchObjectAt:nameSlot
 ].
 nameSlot isImageSymbol ifFalse:[self halt].
 ^ 'Class: ' , (self printStringOfSymbol:nameSlot)
 !
 byteSize:something
 "set the value of the instance variable 'size' (automatically generated)"
-something > 8000 ifTrue:[self halt].
+"/ something > 8000 ifTrue:[self halt].
 byteSize := something.
 !
 classRef
 "return the value of the instance variable 'classRef' (automatically generated)"
 ! !
 !SnapShotImageMemory::ImageHeader methodsFor:'queries'!
 category
-|categoryPtr categoryRef category|
+|categoryPtr categoryRef category categorySlotOffset|
 self isMethodOrLazyMethod ifTrue:[
-categoryPtr := self at:6.
+categorySlotOffset := Method instVarOffsetOf:'category'.
+"/ categorySlotOffset := 6.
+categoryPtr := self at:categorySlotOffset.
 categoryRef := memory fetchObjectAt:categoryPtr.
 category := memory fetchStringFor:categoryRef.
 ^ category
 ].
 self halt.
 ].
 ^ self classVarNames asStringWith:(Character space)
 !
 classVarsSlot
-^ self at:9
+^ self at:(Class instVarOffsetOf:'classvars')
 !
 comment
 |commentRef comment|
 ].
 ^ instVarNames ? #()
 !
 instVarsSlot
-^ self at:6
+^ self at:(Class instVarOffsetOf:'instvars')
 !
 methodDictionary
 |methodDictionaryRef methodDictionary|
 ].
 ^ primitiveSpec
 !
 primitiveSpecSlot
+(Class instVarOffsetOf:'primitiveSpec') isNil ifTrue:[
+^ self at:(Class instVarOffsetOf:'attributes')
+].
 ^ self at:(Class instVarOffsetOf:'primitiveSpec')
 !
 revision
 |revisionRef revision|
 ].
 ^ revision
 !
 revisionSlot
-^ self at:14
+^ self at:(Class instVarOffsetOf:'revision')
 !
 superclass
 |superClassRef superClass|
 ].
 ^ superClass
 !
 superclassSlot
-^ self at:1
+^ self at:(Class instVarOffsetOf:'superclass')
 ! !
 !SnapShotImageMemory::ImageClassObject methodsFor:'class protocol'!
 addAllClassVarNamesTo:aCollection
 "Created: 15.10.1996 / 11:15:19 / cg"
 "Modified: 22.3.1997 / 16:11:56 / cg"
 !
+fileOutAllMethodsOn:aStream methodFilter:methodFilter
+|collectionOfCategories|
+collectionOfCategories := self class categories asSortedCollection.
+collectionOfCategories notNil ifTrue:[
+collectionOfCategories do:[:aCategory |
+self class fileOutCategory:aCategory methodFilter:methodFilter on:aStream.
+aStream cr
+]
+].
+collectionOfCategories := self categories asSortedCollection.
+collectionOfCategories notNil ifTrue:[
+collectionOfCategories do:[:aCategory |
+self fileOutCategory:aCategory methodFilter:methodFilter on:aStream.
+aStream cr
+]
+].
+self privateClassesSorted do:[:aClass |
+aClass fileOutAllMethodsOn:aStream methodFilter:methodFilter
+].
+!
 fileOutAs:fileNameString
 "create a file consisting of all methods in myself in
 sourceForm, from which the class can be reconstructed (by filing in).
 The given fileName should be a full path, including suffix.
 Care is taken, to not clobber any existing file in
 myName := self name.
 myNamePrefix := myName , '::'.
 myNamePrefixLen := myNamePrefix size.
-Smalltalk keysDo:[:nm |
+memory image keysDo:[:nm |
 |cls|
 (nm startsWith:myNamePrefix) ifTrue:[
 (allOfThem
 or:[(nm indexOf:$: startingAt:myNamePrefixLen + 1) == 0]) ifTrue:[
-cls := Smalltalk at:nm.
+cls := memory image at:nm.
 (cls isBehavior and:[cls isMeta not]) ifTrue:[
 classes isNil ifTrue:[
 classes := IdentitySet new:10.
 ].
 ]
 ! !
 !SnapShotImageMemory::ImageClassObject methodsFor:'namespace protocol'!
+allClasses
+|classes|
+classes := IdentitySet new.
+self allClassesDo:[:aClass | classes add:aClass].
+^ classes
+!
 allClassesDo:aBlock
 |prefix|
 self isNameSpace ifFalse:[ self error ].
 prefix := self name , '::'.
 isSignedWords
 ^ (self flags bitAnd:Behavior maskIndexType) == Behavior flagSignedWords.
 !
+isTopLevelNameSpace
+"return true, if this is a nameSpace."
+<resource:#obsolete>
+^ self isNameSpace
+!
 isTopLevelNamespace
 "return true, if this is a nameSpace."
+<resource:#obsolete>
 ^ self isNameSpace
 !
 isVariable
 owningClass
 |ownerPtr owner|
 classRef isPrivateMeta ifFalse:[^ nil].
-ownerPtr := classRef at:8.
+ownerPtr := classRef at:(PrivateMetaclass instVarOffsetOf:'owningClass').
 owner := memory fetchClassObjectAt:ownerPtr.
 ^ owner
 !
 owningClassOrYourself

changeset 1791	2bc8227a8b18
parent 1724	b5bec24eeaaf
child 1792	9848e561e597