--- a/SnapShotImageMemory.st	Wed Oct 25 17:56:38 2000 +0200
+++ b/SnapShotImageMemory.st	Thu Oct 26 19:47:05 2000 +0200
@@ -1,4 +1,4 @@
-"{ Package: 'stx:libtool' }"
+"{ Package: 'stx:libtool2' }"
 
 Object subclass:#SnapShotImageMemory
 	instanceVariableNames:'image stream msb ptrSize intSize intTag spaceInfos symbolEntries
@@ -15,8 +15,8 @@
 	privateIn:SnapShotImageMemory
 !
 
-SnapShotImageMemory::ImageHeader variableByteSubclass:#ImageByteObject
-	instanceVariableNames:''
+Object subclass:#SpaceInfo
+	instanceVariableNames:'start end size flags imageBase'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:SnapShotImageMemory
@@ -36,8 +36,8 @@
 	privateIn:SnapShotImageMemory
 !
 
-Object subclass:#SpaceInfo
-	instanceVariableNames:'start end size flags imageBase'
+SnapShotImageMemory::ImageHeader variableByteSubclass:#ImageByteObject
+	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:SnapShotImageMemory
@@ -401,7 +401,7 @@
         order := stream nextUnsignedLongMSB:msb.        
         order = 16r076543210 ifTrue:[
         ] ifFalse:[
-            order = 16r01234567 ifTrue:[
+            order = 16r10325476 ifTrue:[
                 msb := true.
             ] ifFalse:[
                 self error:'unhandled byteorder'
@@ -807,11 +807,57 @@
     ^ classRef name = 'String'
 ! !
 
-!SnapShotImageMemory::ImageByteObject methodsFor:'queries'!
+!SnapShotImageMemory::SpaceInfo methodsFor:'accessing'!
+
+end
+    "return the value of the instance variable 'end' (automatically generated)"
+
+    ^ end!
+
+end:something
+    "set the value of the instance variable 'end' (automatically generated)"
+
+    end := something.!
+
+flags
+    "return the value of the instance variable 'flags' (automatically generated)"
+
+    ^ flags!
+
+flags:something
+    "set the value of the instance variable 'flags' (automatically generated)"
+
+    flags := something.!
+
+imageBase
+    "return the value of the instance variable 'imageBase' (automatically generated)"
+
+    ^ imageBase!
+
+imageBase:something
+    "set the value of the instance variable 'imageBase' (automatically generated)"
+
+    imageBase := something.!
 
 size
-    ^ byteSize
-! !
+    "return the value of the instance variable 'size' (automatically generated)"
+
+    ^ size!
+
+size:something
+    "set the value of the instance variable 'size' (automatically generated)"
+
+    size := something.!
+
+start
+    "return the value of the instance variable 'start' (automatically generated)"
+
+    ^ start!
+
+start:something
+    "set the value of the instance variable 'start' (automatically generated)"
+
+    start := something.! !
 
 !SnapShotImageMemory::ImageObject methodsFor:'method protocol'!
 
@@ -1374,14 +1420,15 @@
     ^ self at:(Class instVarOffsetOf:'comment')!
 
 flags
-    |flags|
+    |flags amount|
 
     flags := self flagsSlot.
 
     (SnapShotImageMemory isSmallIntegerOOP:flags) ifFalse:[
         self halt
     ].
-    ^ flags bitShift:-1.
+    amount := -1.
+    ^ flags bitShift:amount.
 !
 
 flagsSlot
@@ -3578,57 +3625,11 @@
     ^ false 
 ! !
 
-!SnapShotImageMemory::SpaceInfo methodsFor:'accessing'!
-
-end
-    "return the value of the instance variable 'end' (automatically generated)"
-
-    ^ end!
-
-end:something
-    "set the value of the instance variable 'end' (automatically generated)"
-
-    end := something.!
-
-flags
-    "return the value of the instance variable 'flags' (automatically generated)"
-
-    ^ flags!
-
-flags:something
-    "set the value of the instance variable 'flags' (automatically generated)"
-
-    flags := something.!
-
-imageBase
-    "return the value of the instance variable 'imageBase' (automatically generated)"
-
-    ^ imageBase!
-
-imageBase:something
-    "set the value of the instance variable 'imageBase' (automatically generated)"
-
-    imageBase := something.!
+!SnapShotImageMemory::ImageByteObject methodsFor:'queries'!
 
 size
-    "return the value of the instance variable 'size' (automatically generated)"
-
-    ^ size!
-
-size:something
-    "set the value of the instance variable 'size' (automatically generated)"
-
-    size := something.!
-
-start
-    "return the value of the instance variable 'start' (automatically generated)"
-
-    ^ start!
-
-start:something
-    "set the value of the instance variable 'start' (automatically generated)"
-
-    start := something.! !
+    ^ byteSize
+! !
 
 !SnapShotImageMemory class methodsFor:'documentation'!