Vm-dev August 2014

vm-dev@lists.squeakfoundation.org

12 participants
89 discussions

VM Maker: Cog-eem.193.mcz
by commits＠source.squeak.org 19 Aug '14

19 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.193.mcz ==================== Summary ==================== Name: Cog-eem.193 Author: eem Time: 19 August 2014, 3:28:39.072 pm UUID: 9b02df07-9cdd-4756-9e3f-f46c9ceca261 Ancestors: Cog-eem.192 Fix a slip in the bootstrap. =============== Diff against Cog-eem.192 =============== Item was changed: ----- Method: SpurBootstrap>>initializeClasses (in category 'bootstrap image') ----- initializeClasses + toBeInitialized ifNil: [^self]. self withExecutableInterpreter: oldInterpreter do: [toBeInitialized do: [:class| self interpreter: oldInterpreter object: (self oldClassOopFor: class) perform: (self findSymbol: #initialize) withArguments: #()]]!

1 0

VM Maker: Cog-eem.192.mcz
by commits＠source.squeak.org 19 Aug '14

19 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.192.mcz ==================== Summary ==================== Name: Cog-eem.192 Author: eem Time: 19 August 2014, 2:58:28.826 pm UUID: 2ee6c024-c179-48ee-ac77-9f1a3eb5c458 Ancestors: Cog-eem.191 Fix SpurBootstrap>>cloneMethodProxy: when running on V3. =============== Diff against Cog-eem.191 =============== Item was changed: ----- Method: SpurBootstrap>>cloneMethodProxy: (in category 'bootstrap methods') ----- cloneMethodProxy: proxy "<VMCompiledMethodProxy>" | bytes newMethod delta | bytes := proxy size - proxy initialPC + 1. delta := proxy primitive > 0 ifTrue: [3] ifFalse: [0]. newMethod := CompiledMethod newMethod: bytes + delta + header: (self headerForOldMethodHeader: (oldHeap integerObjectOf: proxy header)). - header: (self convertOldMethodHeader: (oldHeap integerObjectOf: proxy header)). 1 to: proxy numLiterals - 1 do: [:i| newMethod literalAt: i put: (proxy literalAt: i)]. newMethod literalAt: proxy numLiterals put: (Smalltalk bindingOf: #Character). delta > 0 ifTrue: [newMethod at: newMethod initialPC + 0 put: 139; at: newMethod initialPC + 1 put: (proxy primitive bitAnd: 16rFF); at: newMethod initialPC + 2 put: (proxy primitive bitShift: -8)]. proxy initialPC to: proxy size do: [:i| newMethod at: i + delta put: (proxy at: i)]. ^newMethod! Item was added: + ----- Method: SpurBootstrap>>headerForOldMethodHeader: (in category 'bootstrap image') ----- + headerForOldMethodHeader: methodHeaderOop + ^self isOnSpur + ifTrue: [self convertOldMethodHeader: methodHeaderOop] + ifFalse: [oldHeap integerValueOf: methodHeaderOop]! Item was added: + ----- Method: SpurBootstrap>>isOnSpur (in category 'testing') ----- + isOnSpur + ^$c class instSize = 0!

1 0

VM Maker: VMMaker.oscog-eem.861.mcz
by commits＠source.squeak.org 19 Aug '14

19 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.861.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.861 Author: eem Time: 19 August 2014, 2:22:02.411 pm UUID: fab1298a-2969-4281-816e-0733d5d11443 Ancestors: VMMaker.oscog-eem.860 Spur: Fix the bootstrap by initializing the become effects flags constants in SpurMemMgr class>>initialize Put the stack accessors in their own category to simplify inferring isStackAccessor: when computing primitive accessor depths. Simulator: Add support for counting full lookups. Fix the short-cut trampolines for the tracing routines; they weren't brought forward when trampolines were changed. =============== Diff against VMMaker.oscog-eem.860 =============== Item was changed: CoInterpreterMT subclass: #CogVMSimulator + instanceVariableNames: 'enableCog byteCount lastPollCount lastExtPC sendCount lookupCount printSends traceOn myBitBlt displayForm imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes uniqueIndices uniqueIndex breakCount atEachStepBlock startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize debugStackDepthDictionary performFilters' - instanceVariableNames: 'enableCog byteCount lastPollCount lastExtPC sendCount printSends traceOn myBitBlt displayForm imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes uniqueIndices uniqueIndex breakCount atEachStepBlock startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize debugStackDepthDictionary performFilters' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-JITSimulation'! !CogVMSimulator commentStamp: 'eem 9/3/2013 11:16' prior: 0! This class defines basic memory access and primitive simulation so that the CoInterpreter can run simulated in the Squeak environment. It also defines a number of handy object viewing methods to facilitate pawing around in the object memory. Remember that you can test the Cogit using its class-side in-image compilation facilities. To see the thing actually run, you could (after backing up this image and changes), execute (CogVMSimulator new openOn: Smalltalk imageName) test and be patient both to wait for things to happen, and to accept various things that may go wrong depending on how large or unusual your image may be. We usually do this with a small and simple benchmark image. Here's an example to launch the simulator in a window. The bottom-right window has a menu packed with useful stuff: (CogVMSimulator newWithOptions: #(Cogit StackToRegisterMappingCogit)) desiredNumStackPages: 8; openOn: '/Users/eliot/Cog/startreader.image'; openAsMorph; run Here's a hairier example that I (Eliot) actually use in daily development with some of the breakpoint facilities commented out. | cos proc opts | CoInterpreter initializeWithOptions: (opts := Dictionary newFromPairs: #(Cogit StackToRegisterMappingCogit)). CogVMSimulator chooseAndInitCogitClassWithOpts: opts. cos := CogVMSimulator new. "cos initializeThreadSupport." "to test the multi-threaded VM" cos desiredNumStackPages: 8. "to set the size of the stack zone" "cos desiredCogCodeSize: 8 * 1024 * 1024." "to set the size of the Cogit's code zone" cos openOn: '/Users/eliot/Squeak/Squeak4.4/trunk44.image'. "choose your favourite image" "cos setBreakSelector: 'r:degrees:'." "set a breakpoint at a specific selector" proc := cos cogit processor. "cos cogit sendTrace: 7." "turn on tracing" "set a complex breakpoint at a specific point in machine code" "cos cogit singleStep: true; breakPC: 16r56af; breakBlock: [:cg| cos framePointer > 16r101F3C and: [(cos longAt: cos framePointer - 4) = 16r2479A and: [(cos longAt: 16r101F30) = (cos longAt: 16r101F3C) or: [(cos longAt: 16r101F2C) = (cos longAt: 16r101F3C)]]]]; sendTrace: 1". "[cos cogit compilationTrace: -1] on: MessageNotUnderstood do: [:ex|]." "turn on compilation tracing in the StackToRegisterMappingCogit" "cos cogit setBreakMethod: 16rB38880." cos openAsMorph; "toggleTranscript;" "toggleTranscript will send output to the Transcript instead of the morph's rather small window" halt; run! Item was changed: ----- Method: CogVMSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the CogVMSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." super initialize. transcript := Transcript. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. cogit ifNil: [cogit := self class cogitClass new setInterpreter: self]. objectMemory coInterpreter: self cogit: cogit. cogit numRegArgs > 0 ifTrue: [debugStackDepthDictionary := Dictionary new]. cogThreadManager ifNotNil: [super initialize]. "Note: we must initialize ConstMinusOne & HasBeenReturnedFromMCPC differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := objectMemory integerObjectOf: -1. HasBeenReturnedFromMCPC := objectMemory integerObjectOf: -1. cogMethodZone := cogit methodZone. "Because Slang can't remove intermediate implicit receivers (cogit methodZone foo doesn't reduce to foo())" enableCog := true. methodCache := Array new: MethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. self flushAtCache. cogCompiledCodeCompactionCalledFor := false. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. mappedPluginEntries := OrderedCollection new. objectMemory hasSpurMemoryManagerAPI ifTrue: [primitiveAccessorDepthTable := Array new: primitiveTable size. pluginList := {}. self loadNewPlugin: ''] ifFalse: [pluginList := {'' -> self }]. desiredNumStackPages := desiredEdenBytes := desiredCogCodeSize := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. maxLiteralCountForCompile := MaxLiteralCountForCompile. minBackwardJumpCountForCompile := MinBackwardJumpCountForCompile. flagInterpretedMethods := false. "initialize InterpreterSimulator variables used for debugging" + byteCount := lastPollCount := sendCount := lookupCount := 0. - byteCount := lastPollCount := sendCount := 0. quitBlock := [^ self]. traceOn := true. printSends := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. displayForm := 'Display has not yet been installed' asDisplayText form. suppressHeartbeatFlag := deferSmash := deferredSmash := false. systemAttributes := Dictionary new. primTraceLog := CArrayAccessor on: (Array new: 256 withAll: 0). primTraceLogIndex := 0. traceLog := CArrayAccessor on: (Array new: TraceBufferSize withAll: 0). traceLogIndex := 0. traceSources := TraceSources. statCodeCompactionCount := 0. statCodeCompactionUsecs := 0. extSemTabSize := 256! Item was added: + ----- Method: CogVMSimulator>>lookupMethodInClass: (in category 'message sending') ----- + lookupMethodInClass: class + lookupCount := lookupCount + 1. + ^super lookupMethodInClass: class! Item was added: + ----- Method: CogVMSimulator>>lookupMethodNoMNUEtcInClass: (in category 'callback support') ----- + lookupMethodNoMNUEtcInClass: class + lookupCount := lookupCount + 1. + ^super lookupMethodNoMNUEtcInClass: class! Item was changed: ----- Method: Cogit>>compileEntry (in category 'compile abstract instructions') ----- compileEntry "The entry code to a method checks that the class of the current receiver matches that in the inline cache. Other non-obvious elements are that its alignment must be different from the alignment of the noCheckEntry so that the method map machinery can distinguish normal and super sends (super sends bind to the noCheckEntry). In Newspeak we also need to distinguish dynSuperSends from normal and super and so on Nespeak, bind the dynSuperEntry to the preceeding nop (on x86 there happens to be one anyway)." self cppIf: NewspeakVM ifTrue: [self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod" dynSuperEntry := self Nop]. entry := objectRepresentation genGetInlineCacheClassTagFrom: ReceiverResultReg into: TempReg forEntry: true. self CmpR: ClassReg R: TempReg. self JumpNonZero: sendMiss. noCheckEntry := self Label. + self compileSendTrace ifTrue: - self recordSendTrace ifTrue: [self CallRT: ceTraceLinkedSendTrampoline]! Item was added: + ----- Method: Cogit>>compileSendTrace (in category 'debugging') ----- + compileSendTrace + <api> + <cmacro: '() (traceFlags & 2)'> + "256 = count sends, which is simulation only" + ^(traceFlags bitAnd: 256 + 2) ~= 0! Item was changed: ----- Method: Cogit>>sendTrace: (in category 'debugging') ----- sendTrace: aBooleanOrInteger <doNotGenerate> "traceFlags is a set of flags. 1 => print trace (if something below is selected) 2 => trace sends 4 => trace block activations 8 => trace interpreter primitives 16 => trace events (context switches, GCs, etc) 32 => trace stack overflow 64 => send breakpoint on implicit receiver (Newspeak VM only) + 128 => check stack depth on send (simulation only) + 256 => count sends (simulation only)" - 128 => check stack depth on send (simulation only)" traceFlags := aBooleanOrInteger isInteger ifTrue: [aBooleanOrInteger] ifFalse: [aBooleanOrInteger ifTrue: [6] ifFalse: [0]]! Item was changed: ----- Method: SpurMemoryManager class>>initialize (in category 'class initialization') ----- initialize "SpurMemoryManager initialize" BitsPerByte := 8. + "Initialize at least the become constants for the Spur bootstrap where the + old ObjectMemory simulator is used before a Spur simulator is created.." + self initializeSpurObjectRepresentationConstants. + "Pig compact can be repeated to compact better. Experience shows that 3 times compacts very well, desirable for snapshots. But this is overkill for normal GCs." CompactionPassesForGC := 2. CompactionPassesForSnapshot := 3. "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty. The list goes through ObjStackNextx. We don't want to shrink objStacks, since they're used in GC and its good to keep their memory around. So unused pages created by popping emptying pages are kept on the ObjStackFreex list. ObjStackNextx must be the last field for swizzleObjStackAt:." ObjStackPageSlots := 4092. "+ double header = 16k bytes per page in 32-bits" ObjStackTopx := 0. ObjStackMyx := 1. ObjStackFreex := 2. ObjStackNextx := 3. ObjStackFixedSlots := 4. ObjStackLimit := ObjStackPageSlots - ObjStackFixedSlots. "The hiddenHootsObject contains the classTable pages and up to 8 additional objects. Currently we use four; the three objStacks, the mark stack, the weaklings and the ephemeron queue, and the rememberedSet." MarkStackRootIndex := self basicNew classTableRootSlots. WeaklingStackRootIndex := MarkStackRootIndex + 1. EphemeronQueueRootIndex := MarkStackRootIndex + 2. RememberedSetRootIndex := MarkStackRootIndex + 3. MarkObjectsForEnumerationPrimitives := false. "The remap buffer support is for compatibility; Spur doesn't GC during allocation. Eventually this should die." RemapBufferSize := 25. "Extra roots are for plugin support." ExtraRootsSize := 2048 "max. # of external roots"! Item was changed: ----- Method: StackInterpreter class>>isStackAccessor: (in category 'spur compilation support') ----- isStackAccessor: selector + ^(StackInterpreter whichCategoryIncludesSelector: selector) = #'stack access'! - ^#( stackTop stackValue: stackTopPut: stackValue:put: - stackFloatValue: stackIntegerValue: stackObjectValue:) includes: selector! Item was changed: ----- Method: StackInterpreter>>postBecomeAction: (in category 'object memory support') ----- postBecomeAction: theBecomeEffectsFlags "Insulate the stack zone from the effects of a become. All receivers must be unfollowed for two reasons: 1. inst var access is direct with no read barrier 2. super sends (always to the receiver) have no class check and so don't trap for forwarded receivers. Methods must be unfollowed since bytecode access is direct with no read barrier. But this only needs to be done if the becomeEffectsFlags indicate that a CompiledMethod was becommed. + The scheduler state must be followed, but only if the becomeEffectsFlags indicate - The sceduler state must be followed, but only if the becomeEffectsFlags indicate that a pointer object was becommed." self followForwardingPointersInStackZone: theBecomeEffectsFlags. theBecomeEffectsFlags ~= 0 ifTrue: [(theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [self followForwardedMethodsInMethodCache. self followForwardedMethodsInMethodZone]. "for CoInterpreter" self followForwardingPointersInScheduler. self followForwardingPointersInSpecialObjectsArray. self followForwardingPointersInProfileState]! Item was changed: + ----- Method: StackInterpreter>>stackFloatValue: (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackFloatValue: (in category 'internal interpreter access') ----- stackFloatValue: offset "In the StackInterpreter stacks grow down." <returnTypeC: #double> ^self floatValueOf: (stackPages longAt: stackPointer + (offset*BytesPerWord))! Item was changed: + ----- Method: StackInterpreter>>stackIntegerValue: (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackIntegerValue: (in category 'internal interpreter access') ----- stackIntegerValue: offset "In the StackInterpreter stacks grow down." | integerPointer | integerPointer := stackPages longAt: stackPointer + (offset*BytesPerWord). ^self checkedIntegerValueOf: integerPointer! Item was changed: + ----- Method: StackInterpreter>>stackObjectValue: (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackObjectValue: (in category 'internal interpreter access') ----- stackObjectValue: offset "Ensures that the given object is a real object, not a SmallInteger." "In the StackInterpreter stacks grow down." | oop | oop := stackPages longAt: stackPointer + (offset * BytesPerWord). (objectMemory isImmediate: oop) ifTrue: [self primitiveFail. ^ nil]. ^oop! Item was changed: + ----- Method: StackInterpreter>>stackPositiveMachineIntegerValue: (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackPositiveMachineIntegerValue: (in category 'internal interpreter access') ----- stackPositiveMachineIntegerValue: offset <api> "In the StackInterpreter stacks grow down." | integerPointer | integerPointer := stackPages longAt: stackPointer + (offset*BytesPerWord). ^self positiveMachineIntegerValueOf: integerPointer! Item was changed: + ----- Method: StackInterpreter>>stackSignedMachineIntegerValue: (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackSignedMachineIntegerValue: (in category 'internal interpreter access') ----- stackSignedMachineIntegerValue: offset <api> "In the StackInterpreter stacks grow down." | integerPointer | integerPointer := stackPages longAt: stackPointer + (offset*BytesPerWord). ^self signedMachineIntegerValueOf: integerPointer! Item was changed: + ----- Method: StackInterpreter>>stackTop (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackTop (in category 'internal interpreter access') ----- stackTop <api> ^stackPages longAt: stackPointer! Item was changed: + ----- Method: StackInterpreter>>stackTopPut: (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackTopPut: (in category 'internal interpreter access') ----- stackTopPut: aValue ^stackPages longAtPointer: stackPointer put: aValue! Item was changed: + ----- Method: StackInterpreter>>stackValue: (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackValue: (in category 'internal interpreter access') ----- stackValue: offset <api> "In the StackInterpreter stacks grow down." ^stackPages longAt: stackPointer + (offset*BytesPerWord)! Item was changed: + ----- Method: StackInterpreter>>stackValue:put: (in category 'stack access') ----- - ----- Method: StackInterpreter>>stackValue:put: (in category 'internal interpreter access') ----- stackValue: offset put: oop "In the StackInterpreter stacks grow down." ^stackPages longAt: stackPointer + (offset*BytesPerWord) put: oop! Item was changed: StackInterpreterPrimitives subclass: #StackInterpreterSimulator + instanceVariableNames: 'parent bootstrapping byteCount breakCount sendCount lookupCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat performFilters eventQueue assertVEPAES' - instanceVariableNames: 'parent bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat performFilters eventQueue assertVEPAES' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-InterpreterSimulation'! !StackInterpreterSimulator commentStamp: 'eem 9/3/2013 11:05' prior: 0! This class defines basic memory access and primitive simulation so that the StackInterpreter can run simulated in the Squeak environment. It also defines a number of handy object viewing methods to facilitate pawing around in the object memory. To see the thing actually run, you could (after backing up this image and changes), execute (StackInterpreterSimulator new openOn: Smalltalk imageName) test ((StackInterpreterSimulator newWithOptions: #(NewspeakVM true MULTIPLEBYTECODESETS true)) openOn: 'ns101.image') test and be patient both to wait for things to happen, and to accept various things that may go wrong depending on how large or unusual your image may be. We usually do this with a small and simple benchmark image. Here's an example of what Eliot uses to launch the simulator in a window. The bottom-right window has a menu packed with useful stuff: | vm | vm := StackInterpreterSimulator newWithOptions: #(). vm openOn: '/Users/eliot/Squeak/Squeak4.4/trunk44.image'. vm setBreakSelector: #&. vm openAsMorph; run! Item was changed: ----- Method: StackInterpreterSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the StackInterpreterSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." super initialize. bootstrapping := false. transcript := Transcript. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. objectMemory coInterpreter: self. "Note: we must initialize ConstMinusOne differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := objectMemory integerObjectOf: -1. methodCache := Array new: MethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. mappedPluginEntries := OrderedCollection new. objectMemory hasSpurMemoryManagerAPI ifTrue: [primitiveAccessorDepthTable := Array new: primitiveTable size. pluginList := {}. self loadNewPlugin: ''] ifFalse: [pluginList := {'' -> self }]. desiredNumStackPages := desiredEdenBytes := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. "initialize InterpreterSimulator variables used for debugging" + byteCount := sendCount := lookupCount := 0. - byteCount := 0. - sendCount := 0. quitBlock := [^self]. traceOn := true. printSends := printReturns := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. displayForm := 'Display has not yet been installed' asDisplayText form. eventQueue := SharedQueue new. suppressHeartbeatFlag := false. systemAttributes := Dictionary new. extSemTabSize := 256. disableBooleanCheat := false. assertVEPAES := true. "a flag so the assertValidExecutionPointers can be disabled for simulation speed"! Item was added: + ----- Method: StackInterpreterSimulator>>lookupMethodInClass: (in category 'message sending') ----- + lookupMethodInClass: class + lookupCount := lookupCount + 1. + ^super lookupMethodInClass: class! Item was added: + ----- Method: StackInterpreterSimulator>>lookupMethodNoMNUEtcInClass: (in category 'callback support') ----- + lookupMethodNoMNUEtcInClass: class + lookupCount := lookupCount + 1. + ^super lookupMethodNoMNUEtcInClass: class! Item was added: + ----- Method: StackInterpreterSimulator>>nextImplicitReceiverFor:withMixin: (in category 'newspeak bytecode support') ----- + nextImplicitReceiverFor: anObject withMixin: mixin + lookupCount := lookupCount + 1. + ^super nextImplicitReceiverFor: anObject withMixin: mixin! Item was changed: ----- Method: StackToRegisterMappingCogit>>generateTracingTrampolines (in category 'initialization') ----- generateTracingTrampolines "Generate trampolines for tracing. In the simulator we can save a lot of time and avoid noise instructions in the lastNInstructions log by short-cutting these trampolines, but we need them in the real vm." ceTraceLinkedSendTrampoline := self cCode: [self genSafeTrampolineFor: #ceTraceLinkedSend: called: 'ceTraceLinkedSendTrampoline' arg: ReceiverResultReg] inSmalltalk: + [self simulatedTrampolineFor: #ceShortCutTraceLinkedSend:]. - [| a | - simulatedTrampolines - at: (a := self simulatedAddressFor: #ceShortCutTraceLinkedSend:) - put: #ceShortCutTraceLinkedSend:. - a]. ceTraceBlockActivationTrampoline := self cCode: [self genTrampolineFor: #ceTraceBlockActivation called: 'ceTraceBlockActivationTrampoline'] inSmalltalk: + [self simulatedTrampolineFor: #ceShortCutTraceBlockActivation:]. - [| a | - simulatedTrampolines - at: (a := self simulatedAddressFor: #ceShortCutTraceBlockActivation:) - put: #ceShortCutTraceBlockActivation:. - a]. ceTraceStoreTrampoline := self cCode: [self genSafeTrampolineFor: #ceTraceStoreOf:into: called: 'ceTraceStoreTrampoline' arg: TempReg arg: ReceiverResultReg] inSmalltalk: + [self simulatedTrampolineFor: #ceShortCutTraceStore:]! - [| a | - simulatedTrampolines - at: (a := self simulatedAddressFor: #ceShortCutTraceStore:) - put: #ceShortCutTraceStore:. - a]!

1 0

[commit][3063] CogVM source as per VMMaker.oscog-eem.860 ( except for Newspeak VMs *).
by commits＠squeakvm.org 14 Aug '14

14 Aug '14

Revision: 3063 Author: eliot Date: 2014-08-14 12:43:38 -0700 (Thu, 14 Aug 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.860 (except for Newspeak VMs *). Spur: Convert Spur to use only the alternate CompiledMethod header format (65536 literals, primitive in a bytecode). 3+4 evaluated in the simulator. Update build scripts to set VM version number to 5.0 (V3 remain at 4.0). Fix system crash on using basicNew: on CompiledMethod. Have instantiateClass:indexableSize: refuse to instantiate a CompiledMethod, and add instantiateCompiledMethodClass:indexableSize:. Get the error code right for primitiveNew et al.` Alter the SqueakV3 Cogit bytecode table initializers to add the callPrimitiveBytecode: at 139 if in a Spur VM. Update the prim numbers for inlined prims in genCallPrimitiveBytecode to match the latest EncoderForSistaV1 class comment. Moved literal count methods from StackInterpreter hierarchy to ObjectMemories. Rename headerOf: to methodHeaderOf: & literalCountOfHeader: to literalCountOfMethodHeader: Abstract out lastPointerOfMethodHeader: Cogits: Fix offset of first special selector to not presume SqueakV3 and/or NewspeakV4. Sista: Update build scripts to set VM version number to 6.0 (Sista V3 i set ot 4.5). Partially implement genCallPrimitiveBytecode. Slang: Eliminate double negatives translating ifFalse: (for primErrorCode). Scripts: Update getGoodVM scripts, and add a maker for getting Newspeak VMs. Update envvars to use provided curl on Mac OS X instead of non-native wget. Add rev and tag args to the mkarchive and uploadvm scripts. Fix uploadvms script to upload Newspeak Spur Windows VM. *Newspeak Spur VMs appear funcitonal but not checking in because the bootstrap is not finished and taking too long to fix. Modified Paths: -------------- branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.plist branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist branches/Cog/build.win32x86/newspeak.cog.spur/Makefile branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc branches/Cog/build.win32x86/newspeak.cog.v3/Makefile branches/Cog/build.win32x86/newspeak.stack.spur/Makefile branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc branches/Cog/build.win32x86/newspeak.stack.v3/Makefile branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc branches/Cog/build.win32x86/squeak.cog.spur/Makefile branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc branches/Cog/build.win32x86/squeak.cog.v3/Makefile branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc branches/Cog/build.win32x86/squeak.stack.spur/Makefile branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc branches/Cog/build.win32x86/squeak.stack.v3/Makefile branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc branches/Cog/image/buildspurtrunkimage.sh branches/Cog/image/envvars.sh branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/image/getsqueak45.sh branches/Cog/image/makegetvmscripts.sh branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/configure.ac branches/Cog/scripts/mkcogvmarchives branches/Cog/scripts/mksistaarchives branches/Cog/scripts/mkspurvmarchives branches/Cog/scripts/uploadvms branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/image/makegetnsvmscripts.sh Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -21,6 +21,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -17,6 +17,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -17,6 +17,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -17,6 +17,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -17,6 +17,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -21,6 +21,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -21,6 +21,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -17,6 +17,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -17,6 +17,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -18,6 +18,7 @@ *) test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \ + --with-vmversion=5.0 \ --with-src=spursrc --with-plugins=src/plugins \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -14,6 +14,7 @@ *) test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \ + --with-vmversion=5.0 \ --with-src=spursrc --with-plugins=src/plugins \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -14,6 +14,7 @@ *) test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \ + --with-vmversion=5.0 \ --with-src=spursrc --with-plugins=src/plugins \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -14,6 +14,7 @@ *) test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \ + --with-vmversion=5.0 \ --with-src=spursrc --with-plugins=src/plugins \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -14,6 +14,7 @@ *) test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \ + --with-vmversion=5.0 \ --with-src=spursrc --with-plugins=src/plugins \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -18,6 +18,7 @@ *) test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \ + --with-vmversion=5.0 \ --with-src=spursrc --with-plugins=src/plugins \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -17,6 +17,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -14,6 +14,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm 2014-08-14 19:43:38 UTC (rev 3063) @@ -14,6 +14,7 @@ *) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063) @@ -122,11 +122,11 @@ <key>CFBundleExecutable</key> <string>Newspeak Virtual Machine</string> <key>CFBundleGetInfoString</key> - <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> + <string>Newspeak Cog Spur Virtual Machine 5.0.0 http://newspeaklanguage.org</string> <key>CFBundleShortVersionString</key> - <string>Newspeak Virtual Machine 4.0.0</string> + <string>Newspeak Cog Spur Virtual Machine 5.0.0</string> <key>CFBundleVersion</key> - <string>4.0.0</string> + <string>5.0.0</string> <key>CFBundleIconFile</key> <string>Newspeak Virtual Machine.icns</string> <key>CFBundleIdentifier</key> Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063) @@ -76,11 +76,11 @@ <key>CFBundleExecutable</key> <string>Newspeak Virtual Machine</string> <key>CFBundleGetInfoString</key> - <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> + <string>Newspeak Stack Spur Virtual Machine 5.0.0 http://newspeaklanguage.org</string> <key>CFBundleShortVersionString</key> - <string>Newspeak Virtual Machine 4.0.0</string> + <string>Newspeak Stack Spur Virtual Machine 5.0.0</string> <key>CFBundleVersion</key> - <string>4.0.0</string> + <string>5.0.0</string> <key>CFBundleIconFile</key> <string>Newspeak Virtual Machine.icns</string> <key>CFBundleIdentifier</key> Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063) @@ -368,11 +368,11 @@ <key>CFBundleExecutable</key> <string>Squeak</string> <key>CFBundleGetInfoString</key> - <string>Squeak Cog 4.0.0 http://www.mirandabanda.org</string> + <string>Squeak Cog Spur 5.0.0 http://www.mirandabanda.org</string> <key>CFBundleShortVersionString</key> - <string>Squeak Cog 4.0.0</string> + <string>Squeak Cog Spur 5.0.0</string> <key>CFBundleVersion</key> - <string>4.0.0</string> + <string>5.0.0</string> <key>CFBundleIconFile</key> <string>GreenCogSqueak.icns</string> <key>CFBundleIdentifier</key> Modified: branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063) @@ -368,11 +368,11 @@ <key>CFBundleExecutable</key> <string>Squeak</string> <key>CFBundleGetInfoString</key> - <string>Squeak Cog 4.0.0 http://www.mirandabanda.org</string> + <string>Squeak Spur Sista 6.0.0 http://www.mirandabanda.org</string> <key>CFBundleShortVersionString</key> - <string>Squeak Cog 4.0.0</string> + <string>Squeak Spur Sista 6.0.0</string> <key>CFBundleVersion</key> - <string>4.0.0</string> + <string>6.0.0</string> <key>CFBundleIconFile</key> <string>GreenCogSqueak.icns</string> <key>CFBundleIdentifier</key> Modified: branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.plist =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063) @@ -368,11 +368,11 @@ <key>CFBundleExecutable</key> <string>Squeak</string> <key>CFBundleGetInfoString</key> - <string>Squeak Cog 4.0.0 http://www.mirandabanda.org</string> + <string>Squeak Sista 4.6.0 http://www.mirandabanda.org</string> <key>CFBundleShortVersionString</key> - <string>Squeak Cog 4.0.0</string> + <string>Squeak Sista 4.6.0</string> <key>CFBundleVersion</key> - <string>4.0.0</string> + <string>4.6.0</string> <key>CFBundleIconFile</key> <string>GreenCogSqueak.icns</string> <key>CFBundleIdentifier</key> Modified: branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063) @@ -368,11 +368,11 @@ <key>CFBundleExecutable</key> <string>Squeak</string> <key>CFBundleGetInfoString</key> - <string>Squeak Cog Stack 4.0.0 http://www.mirandabanda.org</string> + <string>Squeak Stack 5.0.0 http://www.mirandabanda.org</string> <key>CFBundleShortVersionString</key> - <string>Squeak Cog Stack 4.0.0</string> + <string>Squeak Stack 5.0.0</string> <key>CFBundleVersion</key> - <string>4.0.0</string> + <string>5.0.0</string> <key>CFBundleIconFile</key> <string>GreenCogSqueak.icns</string> <key>CFBundleIdentifier</key> Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-08-14 19:43:38 UTC (rev 3063) @@ -127,7 +127,7 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) @@ -169,7 +169,7 @@ # RC:= windres SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) -RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"' +RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"' .SUFFIXES: .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp Modified: branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -14,7 +14,7 @@ 1 VERSIONINFO FILEVERSION FILEVERSIONVALUES - PRODUCTVERSION 4,0,0,0 + PRODUCTVERSION 5,0,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0xaL FILEOS 0x10001L @@ -29,7 +29,7 @@ VALUE "FileDescription", "Newsqueak Cog Spur Virtual Machine\0" VALUE "FileVersion", FILEVERSIONSTRING VALUE "ProductName", "Newsqueak Cog Spur\0" - VALUE "ProductVersion", "4.0\0" + VALUE "ProductVersion", "5.0\0" END END BLOCK "VarFileInfo" Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-08-14 19:43:38 UTC (rev 3063) @@ -127,7 +127,7 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-08-14 19:43:38 UTC (rev 3063) @@ -128,7 +128,7 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) @@ -170,7 +170,7 @@ # RC:= windres SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) -RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"' +RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"' .SUFFIXES: .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp Modified: branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -14,7 +14,7 @@ 1 VERSIONINFO FILEVERSION FILEVERSIONVALUES - PRODUCTVERSION 4,0,0,0 + PRODUCTVERSION 5,0,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0xaL FILEOS 0x10001L @@ -29,7 +29,7 @@ VALUE "FileDescription", "Newsqueak Stack Spur Virtual Machine\0" VALUE "FileVersion", FILEVERSIONSTRING VALUE "ProductName", "Newsqueak Stack Spur\0" - VALUE "ProductVersion", "4.0\0" + VALUE "ProductVersion", "5.0\0" END END BLOCK "VarFileInfo" Modified: branches/Cog/build.win32x86/newspeak.stack.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-08-14 19:43:38 UTC (rev 3063) @@ -128,7 +128,7 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) Modified: branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -2,4 +2,31 @@ 1 ICON DISCARDABLE "Croquet.ico" 2 ICON DISCARDABLE "Croquet.ico" 3 ICON DISCARDABLE "Croquet.ico" -#endif \ No newline at end of file + +1 VERSIONINFO + FILEVERSION FILEVERSIONVALUES + PRODUCTVERSION 5,0,0,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0xaL + FILEOS 0x10001L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin + BEGIN + VALUE "CompanyName", "Squeak.org\0" + VALUE "FileDescription", "Croquet Cog Spur Virtual Machine\0" + VALUE "FileVersion", FILEVERSIONSTRING + VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0" + VALUE "ProductName", "Croquet Cog Spur\0" + VALUE "ProductVersion", "5.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END +#endif Modified: branches/Cog/build.win32x86/squeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-08-14 19:43:38 UTC (rev 3063) @@ -131,7 +131,7 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) @@ -173,7 +173,7 @@ # RC:= windres SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) -RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"' +RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"' .SUFFIXES: .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp Modified: branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -5,7 +5,7 @@ 1 VERSIONINFO FILEVERSION FILEVERSIONVALUES - PRODUCTVERSION 4,0,0,0 + PRODUCTVERSION 5,0,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0xaL FILEOS 0x10001L @@ -20,8 +20,8 @@ VALUE "FileDescription", "Squeak Cog Spur Virtual Machine\0" VALUE "FileVersion", FILEVERSIONSTRING VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0" - VALUE "ProductName", "Squeak Cog\0" - VALUE "ProductVersion", "4.0\0" + VALUE "ProductName", "Squeak Cog Spur\0" + VALUE "ProductVersion", "5.0\0" END END BLOCK "VarFileInfo" Modified: branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc =================================================================== --- branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -2,4 +2,31 @@ 1 ICON DISCARDABLE "Croquet.ico" 2 ICON DISCARDABLE "Croquet.ico" 3 ICON DISCARDABLE "Croquet.ico" -#endif \ No newline at end of file + +1 VERSIONINFO + FILEVERSION FILEVERSIONVALUES + PRODUCTVERSION 4,0,0,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0xaL + FILEOS 0x10001L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin + BEGIN + VALUE "CompanyName", "Squeak.org\0" + VALUE "FileDescription", "Croquet Cog Virtual Machine\0" + VALUE "FileVersion", FILEVERSIONSTRING + VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0" + VALUE "ProductName", "Croquet Cog\0" + VALUE "ProductVersion", "4.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END +#endif Modified: branches/Cog/build.win32x86/squeak.cog.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-08-14 19:43:38 UTC (rev 3063) @@ -151,7 +151,7 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) Modified: branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -2,4 +2,31 @@ 1 ICON DISCARDABLE "Croquet.ico" 2 ICON DISCARDABLE "Croquet.ico" 3 ICON DISCARDABLE "Croquet.ico" -#endif \ No newline at end of file + +1 VERSIONINFO + FILEVERSION FILEVERSIONVALUES + PRODUCTVERSION 5,0,0,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0xaL + FILEOS 0x10001L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin + BEGIN + VALUE "CompanyName", "Squeak.org\0" + VALUE "FileDescription", "Croquet Stack Spur Virtual Machine\0" + VALUE "FileVersion", FILEVERSIONSTRING + VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0" + VALUE "ProductName", "Croquet Stack Spur\0" + VALUE "ProductVersion", "5.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END +#endif Modified: branches/Cog/build.win32x86/squeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-08-14 19:43:38 UTC (rev 3063) @@ -132,7 +132,7 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) @@ -174,7 +174,7 @@ # RC:= windres SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) -RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"' +RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"' .SUFFIXES: .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp Modified: branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -5,7 +5,7 @@ 1 VERSIONINFO FILEVERSION FILEVERSIONVALUES - PRODUCTVERSION 4,0,0,0 + PRODUCTVERSION 5,0,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0xaL FILEOS 0x10001L @@ -20,8 +20,8 @@ VALUE "FileDescription", "Squeak Stack Spur Virtual Machine\0" VALUE "FileVersion", FILEVERSIONSTRING VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0" - VALUE "ProductName", "Squeak Cog\0" - VALUE "ProductVersion", "4.0\0" + VALUE "ProductName", "Squeak Stack Spur\0" + VALUE "ProductVersion", "5.0\0" END END BLOCK "VarFileInfo" Modified: branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -2,4 +2,31 @@ 1 ICON DISCARDABLE "Croquet.ico" 2 ICON DISCARDABLE "Croquet.ico" 3 ICON DISCARDABLE "Croquet.ico" -#endif \ No newline at end of file + +1 VERSIONINFO + FILEVERSION FILEVERSIONVALUES + PRODUCTVERSION 4,0,0,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0xaL + FILEOS 0x10001L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin + BEGIN + VALUE "CompanyName", "Squeak.org\0" + VALUE "FileDescription", "Croquet Stack Virtual Machine\0" + VALUE "FileVersion", FILEVERSIONSTRING + VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0" + VALUE "ProductName", "Croquet Stack\0" + VALUE "ProductVersion", "4.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END +#endif Modified: branches/Cog/build.win32x86/squeak.stack.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-08-14 19:43:38 UTC (rev 3063) @@ -132,7 +132,7 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) Modified: branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc 2014-08-14 19:43:38 UTC (rev 3063) @@ -20,7 +20,7 @@ VALUE "FileDescription", "Squeak Stack Virtual Machine\0" VALUE "FileVersion", FILEVERSIONSTRING VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0" - VALUE "ProductName", "Squeak Cog\0" + VALUE "ProductName", "Squeak Stack\0" VALUE "ProductVersion", "4.0\0" END END Modified: branches/Cog/image/buildspurtrunkimage.sh =================================================================== --- branches/Cog/image/buildspurtrunkimage.sh 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/image/buildspurtrunkimage.sh 2014-08-14 19:43:38 UTC (rev 3063) @@ -3,12 +3,15 @@ ./getsqueak45.sh . ./getGoodCogVM.sh -cp -p $SQUEAK45.image trunk46forspur.image -cp -p $SQUEAK45.changes trunk46forspur.changes +if [ "$1" -ne -skiptrunkbuild ]; then + cp -p $SQUEAK45.image trunk46forspur.image + cp -p $SQUEAK45.changes trunk46forspur.changes + echo $VM trunk46forspur.image BuildSqueakTrunkImage.st + $VM trunk46forspur.image BuildSqueakTrunkImage.st +fi + rm -f temp-spur-repository/* temp-v3-repository/* -echo $VM trunk46forspur.image BuildSqueakTrunkImage.st -$VM trunk46forspur.image BuildSqueakTrunkImage.st echo $VM trunk46forspur.image WriteSpurPackagesToTempDir.st $VM trunk46forspur.image WriteSpurPackagesToTempDir.st Modified: branches/Cog/image/envvars.sh =================================================================== --- branches/Cog/image/envvars.sh 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/image/envvars.sh 2014-08-14 19:43:38 UTC (rev 3063) @@ -22,23 +22,33 @@ test "$OS" = Darwin && function quietmd5 () { /sbin/md5 -q "$1" 2>/dev/null; } test "$OS" = Darwin || function quietmd5 () { /usr/bin/md5sum "$1" | sed 's/ .*$//' 2>/dev/null; } +test "$OS" = Darwin && function geturl () { FILE=`basename "$1"`; curl -C - "`echo $1 | sed 's/ /%20/g'`" -o "$FILE"; } +test "$OS" = Darwin || function geturl () { wget -c "$1"; } + +if unzip --help >/dev/null; then + true +else + echo 'could not find unzip. you can find instructions on how to install it on google.' 1>&2; + exit 1 +fi + function get_vm_from_tar() # VM VMHASH VMARC VMARCHASH { VM="$1" VMDIR=`echo $VM | sed 's/\/.*//'` VMHASH="$2" - if [ ! -d $VMDIR -o "`quietmd5 "$VM"`" != $VMHASH ]; then + if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then VMARC="$3" ARCHASH="$4" if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then - wget -c "$URL/$VMARC" + geturl "$URL/$VMARC" if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then echo failed to get $VMARC \; file corrupted\? 1>&2 exit 2 fi fi - rm -rf $VMDIR + rm -rf "$VMDIR" tar xzf "$VMARC" - if [ ! -d $VMDIR -o "`quietmd5 "$VM"`" != $VMHASH ]; then + if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then echo failed to correctly extract $VMDIR from $VMARC 1>&2 exit 3 fi @@ -53,13 +63,13 @@ ARCHASH="$4" if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then - wget -c "$URL/$VMARC" + geturl "$URL/$VMARC" if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then echo failed to get $VMARC \; file corrupted\? 1>&2 exit 2 fi fi - rm -rf $VMDIR + rm -rf "$VMDIR" unzip -q "$VMARC" if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then echo failed to correctly extract "`dirname $VM`" from $VMARC 1>&2 Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/image/getGoodCogVM.sh 2014-08-14 19:43:38 UTC (rev 3063) @@ -8,13 +8,6 @@ . ./envvars.sh -if wget --help >/dev/null ; then - true -else - echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 - exit 1 -fi - case "$OS" in Darwin) get_vm_from_tar \ Cog.app/Contents/MacOS/Squeak b9d79576423fe79f9f77383f676d37d6 \ Modified: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/image/getGoodSpurVM.sh 2014-08-14 19:43:38 UTC (rev 3063) @@ -8,13 +8,6 @@ . ./envvars.sh -if wget --help >/dev/null ; then - true -else - echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 - exit 1 -fi - case "$OS" in Darwin) get_vm_from_tar \ CogSpur.app/Contents/MacOS/Squeak d71657f3596108f1ee26ddde98d2a6e1 \ Modified: branches/Cog/image/getsqueak45.sh =================================================================== --- branches/Cog/image/getsqueak45.sh 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/image/getsqueak45.sh 2014-08-14 19:43:38 UTC (rev 3063) @@ -8,13 +8,7 @@ ZIP=Squeak-4.5-All-in-One.zip if [ "`quietmd5 $ZIP`" != $ZIPHASH ] then - if wget --help >/dev/null; then - true - else - echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 - exit 1 - fi - wget -c http://ftp.squeak.org/4.5/$ZIP + geturl http://ftp.squeak.org/4.5/$ZIP fi if unzip --help >/dev/null; then true Added: branches/Cog/image/makegetnsvmscripts.sh =================================================================== --- branches/Cog/image/makegetnsvmscripts.sh (rev 0) +++ branches/Cog/image/makegetnsvmscripts.sh 2014-08-14 19:43:38 UTC (rev 3063) @@ -0,0 +1,149 @@ +#!/bin/sh +# Create the getGoodCogNsvm.sh & getGoodSpurNsvm.sh scripts. +GetCogScript=getGoodCogNsvm.sh +GetSpurScript=getGoodSpurNsvm.sh + +cd `dirname $0` + +REV= +TAG= +while getopts 'r:t:?' opt "$@"; do + case "$opt" in + r) REV="$OPTARG";; + t) TAG="$OPTARG";; + h|\?|*) echo usage: $0 [-r SVNREV] [-t YR.WK.SVNREV] + exit 0;; + esac +done +shift `expr $OPTIND - 1` + +test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` +test -n "$TAG" || TAG=`date +%g.%U.`$REV + +echo REV=$REV TAG=$TAG + +. ./envvars.sh + +ABORT= +for a in "Newspeak Virtual Machine.app-$TAG.tgz" "Newspeak Virtual Machine-$TAG..dmg" nsvmlinuxht-$TAG.tgz nsvmlinux-$TAG.tgz nsvmwin-$TAG.zip\ + "Newspeak Spur Virtual Machine.app-$TAG.tgz" "Newspeak Spur Virtual Machine-$TAG.dmg"nsvmspurlinuxht-$TAG.tgz nsvmspurwin-$TAG.zip +do + test -f "../products/$a" || echo $a does not exist + ABORT=true +done +test -n "$ABORT" || exit 1 + +cat >$GetCogScript <<END +#!/bin/sh +# Sets the VM env var to the r$REV Newspeak VM for the current platform. +# will download and install the VM in this directory if necessary. + +TAG=$TAG +REV=$REV +URL=http://www.mirandabanda.org/files/Cog/VM/VM.r\$REV/ + +. ./envvars.sh + +case "\$OS" in +Darwin) get_vm_from_tar \\ +END + +echo -n ' "Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" ' >>$GetCogScript +echo -n `quietmd5 "../products/Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"` >>$GetCogScript +echo ' \' >> $GetCogScript +echo -n ' "Newspeak Virtual Machine.app-$TAG.tgz" ' >>$GetCogScript +quietmd5 "../products/Newspeak Virtual Machine.app-$TAG.tgz" >>$GetCogScript + +cat >>$GetCogScript <<END + VM="Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";; +Linux) + if expr \$OSREL \\> 2.6.12; then + get_vm_from_tar \\ +END + +echo -n ' nsvmlinuxht/lib/nsvm/4.0-$REV/nsvm ' >>$GetCogScript +echo -n `quietmd5 ../products/nsvmlinuxht/lib/nsvm/4.0-$REV/nsvm` >>$GetCogScript +echo ' \' >>$GetCogScript +echo -n ' nsvmlinuxht-$TAG.tgz ' >>$GetCogScript +quietmd5 ../products/nsvmlinuxht-$TAG.tgz >>$GetCogScript + +cat >>$GetCogScript <<END + else + get_vm_from_tar \\ +END + +echo -n ' nsvmlinux/lib/nsvm/4.0-$REV/nsvm ' >>$GetCogScript +echo -n `quietmd5 ../products/nsvmlinux/lib/nsvm/4.0-$REV/nsvm` >>$GetCogScript +echo ' \' >>$GetCogScript +echo -n ' nsvmlinux-$TAG.tgz ' >>$GetCogScript +quietmd5 ../products/nsvmlinux-$TAG.tgz >>$GetCogScript +cat >>$GetCogScript <<END + fi;; +CYGWIN*) get_vm_from_zip \\ +END + +echo -n ' nsvmwin/nsvmConsole.exe ' >>$GetCogScript +echo -n `quietmd5 ../products/nsvmwin/nsvmConsole.exe` >>$GetCogScript +echo ' \' >>$GetCogScript +echo -n ' nsvmwin-$TAG.zip ' >>$GetCogScript +quietmd5 ../products/nsvmwin-$TAG.zip >>$GetCogScript + +cat >>$GetCogScript <<END + VM=nsvmwin/nsvmConsole.exe;; +*) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2 +esac +END + +chmod a+x $GetCogScript + +cat >$GetSpurScript <<END +#!/bin/sh +# Sets the VM env var to the r$REV Newspeak Spur VM for the current platform. +# will download and install the VM in this directory if necessary. + +TAG=$TAG +REV=$REV +URL=http://www.mirandabanda.org/files/Cog/VM/VM.r\$REV/ + +. ./envvars.sh + +case "\$OS" in +Darwin) get_vm_from_tar \\ +END + +echo -n ' "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" ' >>$GetSpurScript +echo -n `quietmd5 ../products/"Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"` >>$GetSpurScript +echo ' \' >>$GetSpurScript +echo -n ' "Newspeak Spur Virtual Machine.app-$TAG.tgz" ' >>$GetSpurScript +quietmd5 "../products/Newspeak Spur Virtual Machine.app-$TAG.tgz" >>$GetSpurScript + +cat >>$GetSpurScript <<END + VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";; +Linux) get_vm_from_tar \\ +END + +echo -n ' nsvmspurlinuxht/lib/nsvm/4.0-$REV/nsvm ' >>$GetSpurScript +echo -n `quietmd5 ../products/nsvmspurlinuxht/lib/nsvm/4.0-$REV/nsvm` >>$GetSpurScript +echo ' \' >>$GetSpurScript +echo -n ' nsvmspurlinuxht-$TAG.tgz ' >>$GetSpurScript +quietmd5 ../products/nsvmspurlinuxht-$TAG.tgz >>$GetSpurScript + +cat >>$GetSpurScript <<END + VM=nsvmspurlinuxht/nsvm;; +CYGWIN*) get_vm_from_zip \\ +END + +echo -n ' nsvmspurwin/nsvmConsole.exe ' >>$GetSpurScript +echo -n `quietmd5 ../products/nsvmspurwin/nsvmConsole.exe` >>$GetSpurScript +echo ' \' >>$GetSpurScript +echo -n ' nsvmspurwin-$TAG.zip ' >>$GetSpurScript +quietmd5 ../products/nsvmspurwin-$TAG.zip >>$GetSpurScript + +cat >>$GetSpurScript <<END + VM=nsvmspurwin/nsvmConsole.exe;; +*) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2 +esac +END + +chmod a+x $GetSpurScript Property changes on: branches/Cog/image/makegetnsvmscripts.sh ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/image/makegetvmscripts.sh =================================================================== --- branches/Cog/image/makegetvmscripts.sh 2014-08-07 17:23:08 UTC (rev 3062) +++ branches/Cog/image/makegetvmscripts.sh 2014-08-14 19:43:38 UTC (rev 3063) @@ -1,16 +1,26 @@ #!/bin/sh # Create the getGoodCogVM.sh & getGoodSpurVM.sh scripts. +GetCogScript=getGoodCogVM.sh +GetSpurScript=getGoodSpurVM.sh cd `dirname $0` -REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ - | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` -if [ "$1" = "-r" -a -n "$2" ]; then - REV="$2" - shift;shift -fi +REV= +TAG= +while getopts 'r:t:?' opt "$@"; do + case "$opt" in + r) REV="$OPTARG";; + t) TAG="$OPTARG";; + h|\?|*) echo usage: $0 [-r SVNREV] [-t YR.WK.SVNREV] + exit 0;; + esac +done +shift `expr $OPTIND - 1` -TAG=`date +%g.%U.`$REV +test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` +test -n "$TAG" || TAG=`date +%g.%U.`$REV + echo REV=$REV TAG=$TAG . ./envvars.sh @@ -24,7 +34,7 @@ done test -n "$ABORT" || exit 1 -cat >getGoodCogVM.sh <<END +cat >$GetCogScript <<END #!/bin/sh # Sets the VM env var to the r$REV Cog VM for the current platform. # will download and install the VM in this directory if necessary. @@ -35,66 +45,59 @@ . ./envvars.sh -if wget --help >/dev/null ; then - true -else - echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2 - exit 1 -fi - case "\$OS" in Darwin) get_vm_from_tar \\ END -echo -n ' Cog.app/Contents/MacOS/Squeak ' >>getGoodCogVM.sh -echo -n `quietmd5 ../products/Cog.app/Contents/MacOS/Squeak` >>getGoodCogVM.sh -echo ' \' >>getGoodCogVM.sh -echo -n ' Cog.app-$TAG.tgz ' >>getGoodCogVM.sh -quietmd5 ../products/Cog.app-$TAG.tgz >>getGoodCogVM.sh +echo -n ' Cog.app/Contents/MacOS/Squeak ' >>$GetCogScript +echo -n `quietmd5 ../products/Cog.app/Contents/MacOS/Squeak` >>$GetCogScript +echo ' \' >>$GetCogScript +echo -n ' Cog.app-$TAG.tgz ' >>$GetCogScript +quietmd5 ../products/Cog.app-$TAG.tgz >>$GetCogScript -cat >>getGoodCogVM.sh <<END +cat >>$GetCogScript <<END VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr \$OSREL \\> 2.6.12; then get_vm_from_tar \\ END -echo -n ' coglinuxht/lib/squeak/4.0-$REV/squeak ' >>getGoodCogVM.sh -echo -n `quietmd5 ../products/coglinuxht/lib/squeak/4.0-$REV/squeak` >>getGoodCogVM.sh -echo ' \' >>getGoodCogVM.sh -echo -n ' coglinuxht-$TAG.tgz ' >>getGoodCogVM.sh -quietmd5 ../products/coglinuxht-$TAG.tgz >>getGoodCogVM.sh +echo -n ' coglinuxht/lib/squeak/4.0-$REV/squeak ' >>$GetCogScript +echo -n `quietmd5 ../products/coglinuxht/lib/squeak/4.0-$REV/squeak` >>$GetCogScript +echo ' \' >>$GetCogScript +echo -n ' coglinuxht-$TAG.tgz ' >>$GetCogScript +quietmd5 ../products/coglinuxht-$TAG.tgz >>$GetCogScript -cat >>getGoodCogVM.sh <<END +cat >>$GetCogScript <<END else get_vm_from_tar \\ END -echo -n ' coglinux/lib/squeak/4.0-$REV/squeak ' >>getGoodCogVM.sh -echo -n `quietmd5 ../products/coglinux/lib/squeak/4.0-$REV/squeak` >>getGoodCogVM.sh -echo ' \' >>getGoodCogVM.sh -echo -n ' coglinux-$TAG.tgz ' >>getGoodCogVM.sh -quietmd5 ../products/coglinux-$TAG.tgz >>getGoodCogVM.sh -cat >>getGoodCogVM.sh <<END +echo -n ' coglinux/lib/squeak/4.0-$REV/squeak ' >>$GetCogScript +echo -n `quietmd5 ../products/coglinux/lib/squeak/4.0-$REV/squeak` >>$GetCogScript +echo ' \' >>$GetCogScript +echo -n ' coglinux-$TAG.tgz ' >>$GetCogScript +quietmd5 ../products/coglinux-$TAG.tgz >>$GetCogScript +cat >>$GetCogScript <<END fi;; CYGWIN*) get_vm_from_zip \\ END -echo -n ' cogwin/SqueakConsole.exe ' >>getGoodCogVM.sh -echo -n `quietmd5 ../products/cogwin/SqueakConsole.exe` >>getGoodCogVM.sh -echo ' \' >>getGoodCogVM.sh -echo -n ' cogwin-$TAG.zip ' >>getGoodCogVM.sh -quietmd5 ../products/cogwin-$TAG.zip >>getGoodCogVM.sh +echo -n ' cogwin/SqueakConsole.exe ' >>$GetCogScript +echo -n `quietmd5 ../products/cogwin/SqueakConsole.exe` >>$GetCogScript +echo ' \' >>$GetCogScript +echo -n ' cogwin-$TAG.zip ' >>$GetCogScript +quietmd5 ../products/cogwin-$TAG.zip >>$GetCogScript -cat >>getGoodCogVM.sh <<END +cat >>$GetCogScript <<END VM=cogwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac END -chmod a+x getGoodCogVM.sh +chmod a+x $GetCogScript -cat >getGoodSpurVM.sh <<END +cat >$GetSpurScript <<END #!/bin/sh # Sets the VM env var to the r$REV Cog Spur VM for the current platform. # will download and install the VM in this directory if necessary. @@ -105,49 +108,42 @@ . ./envvars.sh -if wget --help >/dev/null ; then - true -else @@ Diff output truncated at 50000 characters. @@

1 0

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

13 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.191.mcz ==================== Summary ==================== Name: Cog-eem.191 Author: eem Time: 13 August 2014, 1:32:28.68 pm UUID: a5207d9b-be52-494a-8b47-924610a1355e Ancestors: Cog-eem.190 Add the API for installing bytecode sets to the Spur bootstrap. =============== Diff against Cog-eem.190 =============== Item was added: + ----- Method: CompiledMethod class>>CompiledMethodclassPROTOTYPEinstallPrimaryBytecodeSet: (in category '*Cog-method prototypes') ----- + CompiledMethodclassPROTOTYPEinstallPrimaryBytecodeSet: aBytecodeEncoderSubclass + PrimaryBytecodeSetEncoderClass == aBytecodeEncoderSubclass ifTrue: + [^self]. + (aBytecodeEncoderSubclass inheritsFrom: BytecodeEncoder) ifFalse: + [self error: 'A bytecode set encoder is expected to be a subclass of BytecodeEncoder']. + (self allSubInstances + detect: [:m| m header >= 0 and: [m encoderClass ~~ aBytecodeEncoderSubclass]] + ifNone: []) ifNotNil: + [Warning signal: 'There are existing CompiledMethods with a different encoderClass.']. + PrimaryBytecodeSetEncoderClass := aBytecodeEncoderSubclass! Item was added: + ----- Method: CompiledMethod class>>CompiledMethodclassPROTOTYPEinstallSecondaryBytecodeSet: (in category '*Cog-method prototypes') ----- + CompiledMethodclassPROTOTYPEinstallSecondaryBytecodeSet: aBytecodeEncoderSubclass + PrimaryBytecodeSetEncoderClass == aBytecodeEncoderSubclass ifTrue: + [^self]. + (aBytecodeEncoderSubclass inheritsFrom: BytecodeEncoder) ifFalse: + [self error: 'A bytecode set encoder is expected to be a subclass of BytecodeEncoder']. + (self allSubInstances + detect: [:m| m header < 0 and: [m encoderClass ~~ aBytecodeEncoderSubclass]] + ifNone: []) ifNotNil: + [Warning signal: 'There are existing CompiledMethods with a different encoderClass.']. + SecondaryBytecodeSetEncoderClass := aBytecodeEncoderSubclass! Item was added: + ----- Method: SpurBootstrap class>>CompiledMethodclassPROTOTYPEinstallPrimaryBytecodeSet: (in category 'method prototypes') ----- + CompiledMethodclassPROTOTYPEinstallPrimaryBytecodeSet: aBytecodeEncoderSubclass + <indirect>! Item was added: + ----- Method: SpurBootstrap class>>CompiledMethodclassPROTOTYPEinstallSecondaryBytecodeSet: (in category 'method prototypes') ----- + CompiledMethodclassPROTOTYPEinstallSecondaryBytecodeSet: aBytecodeEncoderSubclass + <indirect>!

1 0

VM Maker: BytecodeSets.spur-eem.11.mcz
by commits＠source.squeak.org 13 Aug '14

13 Aug '14

Eliot Miranda uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-eem.11.mcz ==================== Summary ==================== Name: BytecodeSets.spur-eem.11 Author: eem Time: 13 August 2014, 10:11:57.09 am UUID: 59e46149-58c6-47f6-9a2f-81787a393b7d Ancestors: BytecodeSets-eem.10 Save BytecodeSets for latest version of Spur bootstrap (Cog.190) with changes to compiler, etc. =============== Diff against BytecodeSets-eem.10 =============== Item was removed: - ----- Method: EncoderForNewsqueakV4>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method encoding') ----- - computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex - numTemps > 63 ifTrue: - [^self error: 'Cannot compile -- too many temporary variables']. - numLits > 65535 ifTrue: - [^self error: 'Cannot compile -- too many literals']. - ^SmallInteger minVal "sign bit is the flag for the alternative bytecode set" - + (numArgs bitShift: 24) - + (numTemps bitShift: 18) - "+ (largeBit bitShift: 17)" "largeBit gets filled in later" - + numLits - + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0])! Item was changed: ----- Method: EncoderForNewsqueakV4>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive:accessModifier: (in category 'method encoding') ----- computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex accessModifier: accessModifier numArgs > 15 ifTrue: [^self error: 'Cannot compile -- too many arguments']. numTemps > 63 ifTrue: [^self error: 'Cannot compile -- too many temporary variables']. numLits > 65535 ifTrue: [^self error: 'Cannot compile -- too many literals']. + ^(CompiledMethod headerFlagForEncoder: self) + + (accessModifier = #protected ifTrue: [1 bitShift: 29] ifFalse: [0]) + + (accessModifier = #private ifTrue: [1 bitShift: 28] ifFalse: [0]) - ^SmallInteger minVal "sign bit is the flag for the alternative bytecode set" - + (accessModifier = #protected ifTrue: [ 1 bitShift: 29 ] ifFalse: [ 0 ]) - + (accessModifier = #private ifTrue: [ 1 bitShift: 28 ] ifFalse: [ 0 ]) + (numArgs bitShift: 24) + (numTemps bitShift: 18) "+ (largeBit bitShift: 17)" "largeBit gets filled in later" + + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0]) + + numLits! - + ((Smalltalk vmParameterAt: 65) == true - ifTrue: [numLits + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0])] - ifFalse: [numLits > 255 ifTrue: [self error: 'vm does not support large methods']. - primitiveIndex > 511 ifTrue: [self error: 'hack does not support primitive > 511']. - (numLits bitShift: 9) - + (primitiveIndex bitAnd: 511)])! Item was removed: - ----- Method: EncoderForNewsqueakV4>>generateMethodOfClass:trailer:from: (in category 'method encoding') ----- - generateMethodOfClass: aCompiledMethodClass trailer: trailer from: methodNode - "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. - The argument, trailer, is arbitrary but is typically either the reference to the source code - that is stored with every CompiledMethod, or an encoding of the method's temporary names." - - | primErrNode blkSize nLits locals literals header method stack | - primErrNode := methodNode primitiveErrorVariableName ifNotNil: - [self fixTemp: methodNode primitiveErrorVariableName]. - methodNode ensureClosureAnalysisDone. - self rootNode: methodNode. "this is for BlockNode>>sizeCodeForClosureValue:" - blkSize := (methodNode block sizeCodeForEvaluatedValue: self) - + (methodNode primitive > 0 - ifTrue: [self sizeCallPrimitive: methodNode primitive] - ifFalse: [0]) - + (primErrNode - ifNil: [0] - ifNotNil: - [primErrNode - index: methodNode arguments size + methodNode temporaries size; - sizeCodeForStore: self "The VM relies on storeIntoTemp: (129)"]). - locals := methodNode arguments, methodNode temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). - self noteBlockExtent: methodNode block blockExtent hasLocals: locals. - header := self computeMethodHeaderForNumArgs: methodNode arguments size - numTemps: locals size - numLits: (nLits := (literals := self allLiterals) size) - primitive: methodNode primitive. - method := trailer - createMethod: blkSize - class: aCompiledMethodClass - header: header. - 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. - self streamToMethod: method. - stack := ParseStack new init. - methodNode primitive > 0 ifTrue: - [self genCallPrimitive: methodNode primitive]. - primErrNode ifNotNil: - [primErrNode emitCodeForStore: stack encoder: self]. - stack position: method numTemps. - [methodNode block emitCodeForEvaluatedValue: stack encoder: self] - on: Error "If an attempt is made to write too much code the method will be asked" - do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" - ex signalerContext sender method = (CompiledMethod class>>#new:) - ifTrue: [^self error: 'Compiler code size discrepancy'] - ifFalse: [ex pass]]. - stack position ~= (method numTemps + 1) ifTrue: - [^self error: 'Compiler stack discrepancy']. - self methodStreamPosition ~= (method size - trailer size) ifTrue: - [^self error: 'Compiler code size discrepancy']. - method needsFrameSize: stack size - method numTemps. - ^method! Item was removed: - ----- Method: EncoderForSistaV1>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method encoding') ----- - computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex - numTemps > 63 ifTrue: - [^self error: 'Cannot compile -- too many temporary variables']. - numLits > 65535 ifTrue: - [^self error: 'Cannot compile -- too many literals']. - ^SmallInteger minVal "sign bit is the flag for the alternative bytecode set" - + (numArgs bitShift: 24) - + (numTemps bitShift: 18) - "+ (largeBit bitShift: 17)" "largeBit gets filled in later" - + numLits - + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0])! Item was removed: - ----- Method: EncoderForSistaV1>>generateMethodOfClass:trailer:from: (in category 'method encoding') ----- - generateMethodOfClass: aCompiledMethodClass trailer: trailer from: methodNode - "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. - The argument, trailer, is arbitrary but is typically either the reference to the source code - that is stored with every CompiledMethod, or an encoding of the method's temporary names." - - | primErrNode blkSize nLits locals literals header method stack | - primErrNode := methodNode primitiveErrorVariableName ifNotNil: - [self fixTemp: methodNode primitiveErrorVariableName]. - methodNode ensureClosureAnalysisDone. - self rootNode: methodNode. "this is for BlockNode>>sizeCodeForClosureValue:" - blkSize := (methodNode block sizeCodeForEvaluatedValue: self) - + (methodNode primitive > 0 - ifTrue: [self sizeCallPrimitive: methodNode primitive] - ifFalse: [0]) - + (primErrNode - ifNil: [0] - ifNotNil: - [primErrNode - index: methodNode arguments size + methodNode temporaries size; - sizeCodeForStore: self "The VM relies on storeIntoTemp: (129)"]). - locals := methodNode arguments, methodNode temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). - self noteBlockExtent: methodNode block blockExtent hasLocals: locals. - header := self computeMethodHeaderForNumArgs: methodNode arguments size - numTemps: locals size - numLits: (nLits := (literals := self allLiterals) size) - primitive: methodNode primitive. - method := trailer - createMethod: blkSize - class: aCompiledMethodClass - header: header. - 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. - self streamToMethod: method. - stack := ParseStack new init. - methodNode primitive > 0 ifTrue: - [self genCallPrimitive: methodNode primitive]. - primErrNode ifNotNil: - [primErrNode emitCodeForStore: stack encoder: self]. - stack position: method numTemps. - [methodNode block emitCodeForEvaluatedValue: stack encoder: self] - on: Error "If an attempt is made to write too much code the method will be asked" - do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" - ex signalerContext sender method = (CompiledMethod class>>#new:) - ifTrue: [^self error: 'Compiler code size discrepancy'] - ifFalse: [ex pass]]. - stack position ~= (method numTemps + 1) ifTrue: - [^self error: 'Compiler stack discrepancy']. - self methodStreamPosition ~= (method size - trailer size) ifTrue: - [^self error: 'Compiler code size discrepancy']. - method needsFrameSize: stack size - method numTemps. - ^method! Item was removed: - ----- Method: InstructionClient>>callPrimitive: (in category '*BytecodeSets-instruction decoding') ----- - callPrimitive: pimIndex - "SqueakV3PlusClosures: 239 11101111 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) - NewsqueakV4: 249 11111001 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) - SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) - m=1 means inlined primitive, no hard return after execution."! Item was removed: - ----- Method: MethodNode>>generate:using: (in category '*BytecodeSets-code generation') ----- - generate: trailer using: aCompiledMethodClass - "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. - The argument, trailer, is arbitrary but is typically either the reference to the source code - that is stored with every CompiledMethod, or an encoding of the method's temporary names." - - | method | - self generate: trailer - using: aCompiledMethodClass - ifQuick: - [:m | - m literalAt: 2 put: encoder associationForClass; - properties: properties. - ^m]. - method := encoder generateMethodOfClass: aCompiledMethodClass trailer: trailer from: self. - method properties: properties. - ^method!

1 0

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

13 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.190.mcz ==================== Summary ==================== Name: Cog-eem.190 Author: eem Time: 13 August 2014, 6:44:02.327 am UUID: f2adad4d-3bc8-4fa2-b450-3f1f9a267eec Ancestors: Cog-eem.189 Doh! The newMethod:header: prototypes should be class-side. =============== Diff against Cog-eem.189 =============== Item was removed: - ----- Method: SpurBootstrap class>>CompiledMethodPROTOTYPEhandleFailingFailingNewMethod:header: (in category 'method prototypes') ----- - CompiledMethodPROTOTYPEhandleFailingFailingNewMethod: numberOfBytes header: headerWord - "This newMethod:header: gets sent after handleFailingBasicNew: has done a full - garbage collection and possibly grown memory. If this basicNew: fails then the - system really is low on space, so raise the OutOfMemory signal. - - Primitive. Answer an instance of this class with the number of indexable variables - specified by the argument, headerWord, and the number of bytecodes specified - by numberOfBytes. Fail if this if the arguments are not Integers, or if numberOfBytes - is negative, or if the receiver is not a CompiledMethod class, or if there is not enough - memory available. Essential. See Object documentation whatIsAPrimitive." - - <primitive: 79> - "space must be low." - OutOfMemory signal. - "retry if user proceeds" - ^self newMethod: numberOfBytes header: headerWord! Item was removed: - ----- Method: SpurBootstrap class>>CompiledMethodPROTOTYPEhandleFailingNewMethod:header: (in category 'method prototypes') ----- - CompiledMethodPROTOTYPEhandleFailingNewMethod: numberOfBytes header: headerWord - "This newMethod:header: gets sent after newMethod:header: has failed - and allowed a scavenging garbage collection to occur. The scavenging - collection will have happened as the VM is activating the (failing) basicNew:. - If handleFailingBasicNew: fails then the scavenge failed to reclaim sufficient - space and a global garbage collection is required. Retry after garbage - collecting and growing memory if necessary. - - Primitive. Answer an instance of this class with the number of indexable variables - specified by the argument, headerWord, and the number of bytecodes specified - by numberOfBytes. Fail if this if the arguments are not Integers, or if numberOfBytes - is negative, or if the receiver is not a CompiledMethod class, or if there is not enough - memory available. Essential. See Object documentation whatIsAPrimitive." - - <primitive: 79> - | bytesRequested | - bytesRequested := (headerWord bitAnd: 16rFFFF) + 1 * Smalltalk wordSize + numberOfBytes + 16. - Smalltalk garbageCollect < bytesRequested ifTrue: - [Smalltalk growMemoryByAtLeast: bytesRequested]. - "retry after global garbage collect and possible grow" - ^self handleFailingFailingNewMethod: numberOfBytes header: headerWord! Item was removed: - ----- Method: SpurBootstrap class>>CompiledMethodPROTOTYPEnewMethod:header: (in category 'method prototypes') ----- - CompiledMethodPROTOTYPEnewMethod: numberOfBytes header: headerWord - "Primitive. Answer an instance of me. The number of literals (and other - information) is specified by the headerWord (see my class comment). - The first argument specifies the number of fields for bytecodes in the - method. Fail if either argument is not a SmallInteger, or if numberOfBytes - is negative, or if memory is low. Once the header of a method is set by - this primitive, it cannot be changed to change the number of literals. - Essential. See Object documentation whatIsAPrimitive." - - <primitive: 79 error: ec> - ec == #'insufficient object memory' ifTrue: - [^self handleFailingNewMethod: numberOfBytes header: headerWord]. - ^self primitiveFailed! Item was added: + ----- Method: SpurBootstrap class>>CompiledMethodclassPROTOTYPEhandleFailingFailingNewMethod:header: (in category 'method prototypes') ----- + CompiledMethodclassPROTOTYPEhandleFailingFailingNewMethod: numberOfBytes header: headerWord + "This newMethod:header: gets sent after handleFailingBasicNew: has done a full + garbage collection and possibly grown memory. If this basicNew: fails then the + system really is low on space, so raise the OutOfMemory signal. + + Primitive. Answer an instance of this class with the number of indexable variables + specified by the argument, headerWord, and the number of bytecodes specified + by numberOfBytes. Fail if this if the arguments are not Integers, or if numberOfBytes + is negative, or if the receiver is not a CompiledMethod class, or if there is not enough + memory available. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 79> + "space must be low." + OutOfMemory signal. + "retry if user proceeds" + ^self newMethod: numberOfBytes header: headerWord! Item was added: + ----- Method: SpurBootstrap class>>CompiledMethodclassPROTOTYPEhandleFailingNewMethod:header: (in category 'method prototypes') ----- + CompiledMethodclassPROTOTYPEhandleFailingNewMethod: numberOfBytes header: headerWord + "This newMethod:header: gets sent after newMethod:header: has failed + and allowed a scavenging garbage collection to occur. The scavenging + collection will have happened as the VM is activating the (failing) basicNew:. + If handleFailingBasicNew: fails then the scavenge failed to reclaim sufficient + space and a global garbage collection is required. Retry after garbage + collecting and growing memory if necessary. + + Primitive. Answer an instance of this class with the number of indexable variables + specified by the argument, headerWord, and the number of bytecodes specified + by numberOfBytes. Fail if this if the arguments are not Integers, or if numberOfBytes + is negative, or if the receiver is not a CompiledMethod class, or if there is not enough + memory available. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 79> + | bytesRequested | + bytesRequested := (headerWord bitAnd: 16rFFFF) + 1 * Smalltalk wordSize + numberOfBytes + 16. + Smalltalk garbageCollect < bytesRequested ifTrue: + [Smalltalk growMemoryByAtLeast: bytesRequested]. + "retry after global garbage collect and possible grow" + ^self handleFailingFailingNewMethod: numberOfBytes header: headerWord! Item was added: + ----- Method: SpurBootstrap class>>CompiledMethodclassPROTOTYPEnewMethod:header: (in category 'method prototypes') ----- + CompiledMethodclassPROTOTYPEnewMethod: numberOfBytes header: headerWord + "Primitive. Answer an instance of me. The number of literals (and other + information) is specified by the headerWord (see my class comment). + The first argument specifies the number of fields for bytecodes in the + method. Fail if either argument is not a SmallInteger, or if numberOfBytes + is negative, or if memory is low. Once the header of a method is set by + this primitive, it cannot be changed to change the number of literals. + Essential. See Object documentation whatIsAPrimitive." + + <primitive: 79 error: ec> + ec == #'insufficient object memory' ifTrue: + [^self handleFailingNewMethod: numberOfBytes header: headerWord]. + ^self primitiveFailed!

1 0

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

13 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.189.mcz ==================== Summary ==================== Name: Cog-eem.189 Author: eem Time: 13 August 2014, 6:32:31.262 am UUID: 97a3ff50-653d-4397-a1be-4e8faf1395a8 Ancestors: Cog-eem.188 tweak =============== Diff against Cog-eem.188 =============== Item was changed: ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbasicNew (in category 'method prototypes') ----- BehaviorPROTOTYPEbasicNew "Primitive. Answer an instance of the receiver (which is a class) with no indexable variables. Fail if the class is indexable. Essential. See Object documentation whatIsAPrimitive. + If the primitive fails because space is low then the scavenger will run + before the method is activated. Check that space was low and retry + via handleFailingBasicNew if so." - If the primitive fails because space is low then the scavenger - will run before the method is activated. Check that space was low and - retry via handleFailingBasicNew if so." <primitive: 70 error: ec> ec == #'insufficient object memory' ifTrue: [^self handleFailingBasicNew]. self isVariable ifTrue: [^self basicNew: 0]. self primitiveFailed!

1 0

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

13 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.188.mcz ==================== Summary ==================== Name: Cog-eem.188 Author: eem Time: 13 August 2014, 6:29:34.276 am UUID: 78c7c9fd-b406-4d1d-b025-3d091643cf38 Ancestors: Cog-eem.187 Use the error code in the basicNew[:] prototypes to simplify error checking vs retry. Add prototypes for CompiledMethod class>> newMethod:header: and failing support. =============== Diff against Cog-eem.187 =============== Item was changed: ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbasicNew (in category 'method prototypes') ----- BehaviorPROTOTYPEbasicNew "Primitive. Answer an instance of the receiver (which is a class) with no indexable variables. Fail if the class is indexable. Essential. See Object documentation whatIsAPrimitive. If the primitive fails because space is low then the scavenger + will run before the method is activated. Check that space was low and + retry via handleFailingBasicNew if so." - will run before the method is activated. Check arguments and - retry via handleFailingBasicNew if they're OK." + <primitive: 70 error: ec> + ec == #'insufficient object memory' ifTrue: + [^self handleFailingBasicNew]. - <primitive: 70> self isVariable ifTrue: [^self basicNew: 0]. + self primitiveFailed! - "space must have been low, and the scavenger must have run. - retry after the scavenge." - ^self handleFailingBasicNew! Item was changed: ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbasicNew: (in category 'method prototypes') ----- + BehaviorPROTOTYPEbasicNew: sizeRequested - BehaviorPROTOTYPEbasicNew: sizeRequested "Primitive. Answer an instance of this class with the number of indexable variables specified by the argument, sizeRequested. Fail if this class is not indexable or if the argument is not a positive Integer, or if there is not enough memory available. Essential. See Object documentation whatIsAPrimitive. If the primitive fails because space is low then the scavenger will run before the method is activated. Check args and retry via handleFailingBasicNew: if they're OK." + <primitive: 71 error: ec> + ec == #'insufficient object memory' ifTrue: + [^self handleFailingBasicNew: sizeRequested]. - <primitive: 71> self isVariable ifFalse: [self error: self printString, ' cannot have variable sized instances']. - (sizeRequested isInteger and: [sizeRequested >= 0]) ifTrue: - ["arg okay; space must have been low, and the scavenger must have run. - retry after the scavenge" - ^self handleFailingBasicNew: sizeRequested]. self primitiveFailed! Item was added: + ----- Method: SpurBootstrap class>>CompiledMethodPROTOTYPEhandleFailingFailingNewMethod:header: (in category 'method prototypes') ----- + CompiledMethodPROTOTYPEhandleFailingFailingNewMethod: numberOfBytes header: headerWord + "This newMethod:header: gets sent after handleFailingBasicNew: has done a full + garbage collection and possibly grown memory. If this basicNew: fails then the + system really is low on space, so raise the OutOfMemory signal. + + Primitive. Answer an instance of this class with the number of indexable variables + specified by the argument, headerWord, and the number of bytecodes specified + by numberOfBytes. Fail if this if the arguments are not Integers, or if numberOfBytes + is negative, or if the receiver is not a CompiledMethod class, or if there is not enough + memory available. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 79> + "space must be low." + OutOfMemory signal. + "retry if user proceeds" + ^self newMethod: numberOfBytes header: headerWord! Item was added: + ----- Method: SpurBootstrap class>>CompiledMethodPROTOTYPEhandleFailingNewMethod:header: (in category 'method prototypes') ----- + CompiledMethodPROTOTYPEhandleFailingNewMethod: numberOfBytes header: headerWord + "This newMethod:header: gets sent after newMethod:header: has failed + and allowed a scavenging garbage collection to occur. The scavenging + collection will have happened as the VM is activating the (failing) basicNew:. + If handleFailingBasicNew: fails then the scavenge failed to reclaim sufficient + space and a global garbage collection is required. Retry after garbage + collecting and growing memory if necessary. + + Primitive. Answer an instance of this class with the number of indexable variables + specified by the argument, headerWord, and the number of bytecodes specified + by numberOfBytes. Fail if this if the arguments are not Integers, or if numberOfBytes + is negative, or if the receiver is not a CompiledMethod class, or if there is not enough + memory available. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 79> + | bytesRequested | + bytesRequested := (headerWord bitAnd: 16rFFFF) + 1 * Smalltalk wordSize + numberOfBytes + 16. + Smalltalk garbageCollect < bytesRequested ifTrue: + [Smalltalk growMemoryByAtLeast: bytesRequested]. + "retry after global garbage collect and possible grow" + ^self handleFailingFailingNewMethod: numberOfBytes header: headerWord! Item was added: + ----- Method: SpurBootstrap class>>CompiledMethodPROTOTYPEnewMethod:header: (in category 'method prototypes') ----- + CompiledMethodPROTOTYPEnewMethod: numberOfBytes header: headerWord + "Primitive. Answer an instance of me. The number of literals (and other + information) is specified by the headerWord (see my class comment). + The first argument specifies the number of fields for bytecodes in the + method. Fail if either argument is not a SmallInteger, or if numberOfBytes + is negative, or if memory is low. Once the header of a method is set by + this primitive, it cannot be changed to change the number of literals. + Essential. See Object documentation whatIsAPrimitive." + + <primitive: 79 error: ec> + ec == #'insufficient object memory' ifTrue: + [^self handleFailingNewMethod: numberOfBytes header: headerWord]. + ^self primitiveFailed!

1 0

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

13 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.860.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.860 Author: eem Time: 13 August 2014, 6:22:53.422 am UUID: 8d8013d8-d7e1-4dd8-b1fa-a83723e2d31a Ancestors: VMMaker.oscog-eem.859 Use objectMemory bytesPerOop instead of BytesPerOop in primitiveNewMethod. Eliminate double negatives translating ifFalse: (for primErrorCode). =============== Diff against VMMaker.oscog-eem.859 =============== Item was changed: ----- Method: CCodeGenerator>>generateIfFalse:on:indent: (in category 'C translation') ----- generateIfFalse: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." (self nilOrBooleanConstantReceiverOf: msgNode receiver) ifNil: + ["Eliminate double-negatives" + (msgNode receiver isSend and: [msgNode receiver selector == #not]) ifTrue: + [^self generateIfTrue: (TSendNode new + setSelector: msgNode selector + receiver: msgNode receiver receiver + arguments: msgNode args + isBuiltInOp: msgNode isBuiltinOperator) + on: aStream + indent: level]. + aStream nextPutAll: 'if (!!'. - [aStream nextPutAll: 'if (!!'. msgNode receiver isLeaf ifFalse: [aStream nextPut: $(]. "grrrrr" msgNode receiver emitCCodeAsExpressionOn: aStream level: level + 1 generator: self. msgNode receiver isLeaf ifFalse: [aStream nextPut: $)]. "grrrrr" aStream nextPutAll: ') {'; cr. msgNode args last emitCCodeOn: aStream level: level + 1 generator: self. aStream tab: level. aStream nextPut: $}] ifNotNil: [:const | const ifFalse: [msgNode args first emitCCodeOn: aStream level: level generator: self]]! Item was changed: ----- Method: CCodeGenerator>>generateIfFalseAsArgument:on:indent: (in category 'C translation') ----- generateIfFalseAsArgument: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." (self nilOrBooleanConstantReceiverOf: msgNode receiver) ifNil: + ["Eliminate double-negatives" + (msgNode receiver isSend and: [msgNode receiver selector == #not]) ifTrue: + [^self generateIfTrueAsArgument: (TSendNode new + setSelector: msgNode selector + receiver: msgNode receiver receiver + arguments: msgNode args + isBuiltInOp: msgNode isBuiltinOperator) + on: aStream + indent: level]. + aStream nextPutAll: '(!!('. + msgNode receiver emitCCodeAsArgumentOn: aStream level: 0 generator: self. - [aStream nextPutAll: '(!!('. - msgNode receiver emitCCodeAsArgumentOn: aStream level: 0 generator: self. aStream nextPut: $); crtab: level + 1; nextPut: $?; space. msgNode args last emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. aStream crtab: level + 1; nextPutAll: ': 0)'] ifNotNil: [:const| const ifFalse: [msgNode args first emitCCodeAsArgumentOn: aStream level: level generator: self]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNewMethod (in category 'compiled methods') ----- primitiveNewMethod | header bytecodeCount class size theMethod literalCount | header := self stackTop. bytecodeCount := self stackValue: 1. ((objectMemory isIntegerObject: header) and: [(objectMemory isIntegerObject: bytecodeCount) and: [(bytecodeCount := objectMemory integerValueOf: bytecodeCount) >= 0]]) ifFalse: [self primitiveFailFor: PrimErrBadArgument. ^self]. class := self stackValue: 2. literalCount := objectMemory literalCountOfMethodHeader: header. + size := literalCount + LiteralStart * objectMemory bytesPerOop + bytecodeCount. - size := literalCount + LiteralStart * BytesPerOop + bytecodeCount. objectMemory hasSpurMemoryManagerAPI ifTrue: [theMethod := objectMemory instantiateCompiledMethodClass: class indexableSize: size. theMethod ifNil: [self primitiveFailFor: ((objectMemory isCompiledMethodFormat: (objectMemory instSpecOfClass: class)) ifTrue: [PrimErrNoMemory] ifFalse: [PrimErrBadReceiver]). ^self]] ifFalse: [theMethod := objectMemory instantiateClass: class indexableSize: size]. objectMemory storePointerUnchecked: HeaderIndex ofObject: theMethod withValue: header. 1 to: literalCount do: [:i | objectMemory storePointer: i ofObject: theMethod withValue: objectMemory nilObject]. self pop: 3 thenPush: theMethod!

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2014