Vm-dev April 2015

vm-dev@lists.squeakfoundation.org

45 participants
264 discussions

VM Maker: VMMaker.oscog-eem.1153.mcz
by commits＠source.squeak.org 02 Apr '15

02 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1153.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1153 Author: eem Time: 2 April 2015, 11:01:15.816 am UUID: 078f2fbd-0bb3-4773-a8b7-73a06a398a24 Ancestors: VMMaker.oscog-eem.1152 Rename the inconsistently-named and hence confusing frameReceiverOffset: to frameReceiverLocation:. Fix the slip in followForwardingPointersInStackZone: that was due to this confusion. =============== Diff against VMMaker.oscog-eem.1152 =============== Item was changed: ----- Method: CoInterpreter>>checkStackIntegrity (in category 'object memory support') ----- checkStackIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccesibleObjects has set a bit at each object's header. Scan all objects accessible from the stack checking that every pointer points to a header. Answer if no dangling pointers were detected." | ok | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #cogMethod type: #'CogMethod *'> ok := true. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP frameRcvrOffset callerFP oop | thePage := stackPages stackPageAt: i. (stackPages isFree: thePage) ifFalse: [thePage = stackPage ifTrue: [theSP := stackPointer. theFP := framePointer] ifFalse: [theSP := thePage headSP. theFP := thePage headFP]. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. + [frameRcvrOffset := self frameReceiverLocation: theFP. - [frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) and: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame temp' andFrame: theFP at: theSP. ok := false]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [oop := self frameContext: theFP. ((objectMemory isImmediate: oop) or: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame ctxt' andFrame: theFP at: theFP + FoxThisContext. ok := false]. (objectMemory isContext: oop) ifFalse: [self printFrameThing: 'frame ctxt should be context' andFrame: theFP at: theFP + FoxThisContext. ok := false]. ((objectMemory isContext: oop) and: [self isMarriedOrWidowedContext: oop]) ifFalse: [self printFrameThing: 'frame ctxt should be married' andFrame: theFP at: theFP + FoxThisContext. ok := false]. ((objectMemory isContext: oop) and: [(self frameOfMarriedContext: oop) = theFP]) ifFalse: [self printFrameThing: 'frame ctxt should be married to this frame ' andFrame: theFP at: theFP + FoxThisContext. ok := false]]. (self isMachineCodeFrame: theFP) ifTrue: [| cogMethod | cogMethod := self mframeHomeMethod: theFP. (objectMemory heapMapAtWord: (self pointerForOop: cogMethod)) = 0 ifTrue: [self printFrameThing: 'object leak in mframe mthd' andFrame: theFP at: theFP + FoxMethod. ok := false]] ifFalse: [oop := self iframeMethod: theFP. ((objectMemory isImmediate: oop) or: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in iframe mthd' andFrame: theFP at: theFP + FoxMethod. ok := false]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) and: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame arg' andFrame: theFP at: theSP. ok := false]. theSP := theSP + objectMemory wordSize]]]. ^ok! Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on inst var fetch we scan the receivers in the stack zone and follow any forwarded ones. This is way cheaper than scanning all of memory as in the old become. Override to handle machine code frames, and to handle the lack of an explicit read barrier on super sends. With most super send implementations (not Newspeak's absent super bytecodes) self, the receiver of the super send, is pushed before any arguments. So if self is becommed during argument marshalling, e.g. super doSomethingWith: (self become: self somethingElse) then a stale forwarded reference to self could be left on the stack. In the StackInterpreter we deal with this with an explicit read barrier on supersend. In the CoInterpreter we deal with it by following all non-argument stack contents." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #offset type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). + offset := self frameReceiverLocation: theFP. - offset := theFP + (self frameStackedReceiverOffset: theFP). [theSP <= offset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. (self isMachineCodeFrame: theFP) ifTrue: [oop := stackPages longAt: theFP + FoxMFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxMFReceiver put: (objectMemory followForwarded: oop)]. oop := (self mframeHomeMethod: theFP) methodObject. self assert: (objectMemory isForwarded: oop) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. oop := self iframeMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. delta := newOop - oop. (theIPPtr ~= 0 and: [(stackPages longAt: theIPPtr) > oop]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + delta. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theSP := theIPPtr + objectMemory wordSize. theFP := callerFP]. "And finally follow the saved context and the caller context." theSP := thePage baseAddress - objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was added: + ----- Method: CoInterpreter>>frameReceiverLocation: (in category 'frame access') ----- + frameReceiverLocation: theFP + <inline: true> + <var: #theFP type: #'char *'> + ^(self isMachineCodeFrame: theFP) + ifTrue: [theFP + FoxMFReceiver] + ifFalse: [theFP + FoxIFReceiver]! Item was removed: - ----- Method: CoInterpreter>>frameReceiverOffset: (in category 'frame access') ----- - frameReceiverOffset: theFP - <inline: true> - <var: #theFP type: #'char *'> - ^(self isMachineCodeFrame: theFP) - ifTrue: [theFP + FoxMFReceiver] - ifFalse: [theFP + FoxIFReceiver]! Item was changed: ----- Method: CoInterpreter>>mapStackPages (in category 'object memory support') ----- mapStackPages <inline: #never> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #'char *'> 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP frameRcvrOffset callerFP theIPPtr theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := ((self isMachineCodeFrame: theFP) or: [(self iframeSavedIP: theFP) = 0]) ifTrue: [0] ifFalse: [theFP + FoxIFSavedIP]] ifFalse: [theIPPtr := theSP. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (thePage addressIsInPage: theSP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). + frameRcvrOffset := self frameReceiverLocation: theFP. - frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [(objectMemory shouldRemapObj: (self frameContext: theFP)) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory remapObj: (self frameContext: theFP))]. "forwarding scheme in SqueakV3 obj rep makes this hard to check." objectMemory hasSpurMemoryManagerAPI ifTrue: [self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]]. (self isMachineCodeFrame: theFP) ifFalse: [(objectMemory shouldRemapObj: (self iframeMethod: theFP)) ifTrue: [theIPPtr ~= 0 ifTrue: [theIP := stackPages longAt: theIPPtr. theIP = cogit ceReturnToInterpreterPC ifTrue: [self assert: (self iframeSavedIP: theFP) > (self iframeMethod: theFP). theIPPtr := theFP + FoxIFSavedIP. theIP := stackPages longAt: theIPPtr] ifFalse: [self assert: theIP > (self iframeMethod: theFP)]. theIP := theIP - (self iframeMethod: theFP)]. stackPages longAt: theFP + FoxMethod put: (objectMemory remapObj: (self iframeMethod: theFP)). theIPPtr ~= 0 ifTrue: [stackPages longAt: theIPPtr put: theIP + (self iframeMethod: theFP)]]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: CoInterpreter>>markAndTraceStackPage: (in category 'object memory support') ----- markAndTraceStackPage: thePage | theSP theFP frameRcvrOffset callerFP oop | <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> self assert: (stackPages isFree: thePage) not. self assert: thePage trace ~= StackPageTraced. thePage trace: StackPageTraced. theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. + [frameRcvrOffset := self frameReceiverLocation: theFP. - [frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isContext: (self frameContext: theFP)). objectMemory markAndTrace: (self frameContext: theFP)]. (self isMachineCodeFrame: theFP) ifTrue: [self markAndTraceMachineCodeMethod: (self mframeCogMethod: theFP)] ifFalse: [objectMemory markAndTrace: (self iframeMethod: theFP)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. "caller ip is ceBaseReturnPC" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]! Item was changed: ----- Method: StackInterpreter>>checkOkayStackPage: (in category 'debug support') ----- checkOkayStackPage: thePage | theSP theFP ok frameRcvrOffset callerFP oop | <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> theSP := thePage headSP. theFP := thePage headFP. ok := true. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. + [frameRcvrOffset := self frameReceiverLocation: theFP. - [frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isIntegerObject: oop) ifFalse: [ok := ok & (self checkOkayFields: oop)]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isContext: (self frameContext: theFP)). ok := ok & (self checkOkayFields: (self frameContext: theFP))]. ok := ok & (self checkOkayFields: (self frameMethodObject: theFP)). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. theFP := callerFP]. theSP := self isCog ifTrue: [theFP + FoxCallerSavedIP + objectMemory wordSize] "caller ip is ceBaseReturnPC" ifFalse: [theFP + FoxCallerSavedIP]. "caller ip is frameCallerContext in a base frame" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isIntegerObject: oop) ifFalse: [ok := ok & (self checkOkayFields: oop)]. theSP := theSP + objectMemory wordSize]. ^ok! Item was changed: ----- Method: StackInterpreter>>findSPOrNilOf:on:startingFrom: (in category 'frame access') ----- findSPOrNilOf: theFP on: thePage startingFrom: startFrame "Search for the stack pointer for theFP. This points to the hottest item on the frame's stack. DO NOT CALL THIS WITH theFP == localFP OR theFP == framePointer!!" <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #startFrame type: #'char *'> <returnTypeC: #'char *'> | aFrame prevFrame | <inline: true> <var: #aFrame type: #'char *'> <var: #prevFrame type: #'char *'> self assert: (stackPages isFree: thePage) not. startFrame = theFP ifTrue: [thePage headSP >= startFrame ifTrue: ["If the SP is invalid return the pointer to the receiver field." + ^self frameReceiverLocation: theFP]. - ^self frameReceiverOffset: aFrame]. "Skip the instruction pointer on top of stack of inactive pages." ^thePage = stackPage ifTrue: [thePage headSP] ifFalse: [thePage headSP + objectMemory wordSize]]. aFrame := startFrame. [prevFrame := aFrame. aFrame := self frameCallerFP: aFrame. aFrame ~= 0] whileTrue: [theFP = aFrame ifTrue: [^self frameCallerSP: prevFrame]]. ^nil! Item was changed: ----- Method: StackInterpreter>>followForwardedFrameContents:stackPointer: (in category 'lazy become') ----- followForwardedFrameContents: theFP stackPointer: theSP "follow pointers in the current stack frame up to theSP." <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <inline: false> <var: #ptr type: #'char *'> theFP + (self frameStackedReceiverOffset: theFP) to: theFP + FoxCallerSavedIP + objectMemory wordSize by: objectMemory wordSize do: [:ptr| | oop | oop := stackPages longAt: ptr. ((objectMemory isNonImmediate: oop) and: [objectMemory isForwarded: oop]) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. theSP + to: (self frameReceiverLocation: theFP) - to: (self frameReceiverOffset: theFP) by: objectMemory wordSize do: [:ptr| | oop | oop := stackPages longAt: ptr. ((objectMemory isNonImmediate: oop) and: [objectMemory isForwarded: oop]) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. self assert: (objectMemory isForwarded: (self frameMethodObject: theFP)) not. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isForwarded: (self frameContext: theFP)) not]! Item was added: + ----- Method: StackInterpreter>>frameReceiverLocation: (in category 'frame access') ----- + frameReceiverLocation: theFP + <inline: true> + <var: #theFP type: #'char *'> + ^theFP + FoxReceiver! Item was removed: - ----- Method: StackInterpreter>>frameReceiverOffset: (in category 'frame access') ----- - frameReceiverOffset: theFP - <inline: true> - <var: #theFP type: #'char *'> - ^theFP + FoxReceiver! Item was changed: ----- Method: StackInterpreter>>markAndTraceStackPage: (in category 'object memory support') ----- markAndTraceStackPage: thePage | theSP theFP frameRcvrOffset callerFP oop | <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> self assert: (stackPages isFree: thePage) not. self assert: thePage trace ~= StackPageTraced. thePage trace: StackPageTraced. theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. + [frameRcvrOffset := self frameReceiverLocation: theFP. - [frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isContext: (self frameContext: theFP)). objectMemory markAndTrace: (self frameContext: theFP)]. objectMemory markAndTrace: (self iframeMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP. "caller ip is frameCallerContext in a base frame" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]! Item was changed: ----- Method: StackInterpreter>>marriedContext:pointsTo:stackDeltaForCurrentFrame: (in category 'frame access') ----- marriedContext: spouseContext pointsTo: anOop stackDeltaForCurrentFrame: stackDeltaForCurrentFrame "This is a helper for primitiveObjectPointsTo so it *does not* check the frameContext field because that is an implicit self-reference not present in the state ." | theFP thePage theSP rcvrOffset | <inline: false> <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #rcvrOffset type: #'char *'> theFP := self frameOfMarriedContext: spouseContext. theFP = framePointer ifTrue: [theSP := stackPointer + (stackDeltaForCurrentFrame * objectMemory wordSize)] ifFalse: [thePage := stackPages stackPageFor: theFP. theSP := self findSPOf: theFP on: thePage]. (objectMemory isIntegerObject: anOop) ifTrue: "Check stack and instruction pointer fields." [(anOop = (objectMemory integerObjectOf: (self stackPointerIndexForFrame: theFP WithSP: theSP)) or: [anOop = (self externalInstVar: InstructionPointerIndex ofContext: spouseContext)]) ifTrue: [^true]] ifFalse: "Check method and sender fields, avoiding unnecessarily reifying sender context." [anOop = (self frameMethodObject: theFP) ifTrue: [^true]. (self isBaseFrame: theFP) ifTrue: [anOop = (self frameCallerContext: theFP) ifTrue: [^true]] ifFalse: [((self frameHasContext: (self frameCallerFP: theFP)) and: [anOop = (self frameContext: (self frameCallerFP: theFP))]) ifTrue: [^true]]]. "Now check receiver, temps and stack contents" + rcvrOffset := self frameReceiverLocation: theFP. - rcvrOffset := self frameReceiverOffset: theFP. [theSP <= rcvrOffset] whileTrue: [anOop = (stackPages longAt: theSP) ifTrue: [^true]. theSP := theSP + objectMemory wordSize]. "Finally check stacked receiver (closure field or duplicate of receiver) and arguments" theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. rcvrOffset := theFP + (self frameStackedReceiverOffset: theFP). [theSP <= rcvrOffset] whileTrue: [anOop = (stackPages longAt: theSP) ifTrue: [^true]. theSP := theSP + objectMemory wordSize]. ^false! Item was changed: ----- Method: StackInterpreter>>printFrame: (in category 'debug printing') ----- printFrame: theFP | thePage frameAbove theSP | <inline: false> <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #frameAbove type: #'char *'> <var: #thePage type: #'StackPage *'> (stackPages couldBeFramePointer: theFP) ifFalse: [self printHexPtr: theFP; print: ' is not in the stack zone?!!'; cr. ^nil]. frameAbove := nil. theFP = framePointer ifTrue: [theSP := stackPointer] ifFalse: [thePage := stackPages stackPageFor: theFP. (stackPages isFree: thePage) ifTrue: [self printHexPtr: theFP; print: ' is on a free page?!!'; cr. ^nil]. (thePage ~= stackPage and: [theFP = thePage headFP]) ifTrue: [theSP := thePage headSP] ifFalse: [frameAbove := self safeFindFrameAbove: theFP on: thePage startingFrom: ((thePage = stackPage and: [framePointer between: thePage realStackLimit and: thePage baseAddress]) ifTrue: [framePointer] ifFalse: [thePage headFP]). theSP := frameAbove ifNotNil: [self frameCallerSP: frameAbove]]]. theSP ifNil: [self print: 'could not find sp; using bogus value'; cr. + theSP := self frameReceiverLocation: theFP]. - theSP := self frameReceiverOffset: theFP]. self printFrame: theFP WithSP: theSP. frameAbove ifNotNil: [self printFrameThing: 'frame pc' at: frameAbove + FoxCallerSavedIP]! Item was changed: ----- Method: StackInterpreter>>printStackReferencesTo: (in category 'object memory support') ----- printStackReferencesTo: oop <api> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. + [[theSP <= (self frameReceiverLocation: theFP)] whileTrue: - [[theSP <= (self frameReceiverOffset: theFP)] whileTrue: [oop = (stackPages longAt: theSP) ifTrue: [self print: 'FP: '; printHexnp: theFP; print: ' @ '; printHexnp: theSP; cr]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [oop = (self frameContext: theFP) ifTrue: [self print: 'FP: '; printHexnp: theFP; print: ' CTXT'; cr]]. oop = (self frameMethod: theFP) ifTrue: [self print: 'FP: '; printHexnp: theFP; print: ' MTHD'; cr]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := (theFP + FoxCallerSavedIP) + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP. "a.k.a. FoxCallerContext" [theSP <= thePage baseAddress] whileTrue: [oop = (stackPages longAt: theSP) ifTrue: [self print: 'FP: '; printHexnp: theFP; print: ' @ '; printHexnp: theSP; cr]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveVoidReceiver (in category 'system control primitives') ----- primitiveVoidReceiver "Potentially crash the VM by voiding the receiver. A subsequent inst var access in the caller's frame should indirect through a null pointer." <export: true> + stackPages longAtPointer: (self frameReceiverLocation: framePointer) put: 0! - stackPages longAtPointer: (self frameReceiverOffset: framePointer) put: 0!

1 0

[commit][3303] Emergency patch for stupid slip in followForwardingPointersInStackZone.
by commits＠squeakvm.org 02 Apr '15

02 Apr '15

Revision: 3303 Author: eliot Date: 2015-04-02 10:48:13 -0700 (Thu, 02 Apr 2015) Log Message: ----------- Emergency patch for stupid slip in followForwardingPointersInStackZone. Modified Paths: -------------- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/gcc3x-cointerp.c Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-04-02 17:48:13 UTC (rev 3303) @@ -17438,9 +17438,7 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)))); + offset = frameReceiverOffset(theFP); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0) Modified: branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2015-04-02 17:02:47 UTC (rev 3302) +++ branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2015-04-02 17:48:13 UTC (rev 3303) @@ -148,11 +148,21 @@ void ioUpdateVMTimezone() { + updateMicrosecondClock(); +#ifdef HAVE_TM_GMTOFF time_t utctt; - updateMicrosecondClock(); utctt = (get64(utcMicrosecondClock) - MicrosecondsFrom1901To1970) / MicrosecondsPerSecond; vmGMTOffset = localtime(&utctt)->tm_gmtoff * MicrosecondsPerSecond; +#else +# ifdef HAVE_TIMEZONE + extern time_t timezone, altzone; + extern int daylight; + vmGMTOffset = -1 * (daylight ? altzone : timezone) * MicrosecondsPerSecond; +# else +# error: cannot determine timezone correction +# endif +#endif } sqLong Modified: branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c 2015-04-02 17:02:47 UTC (rev 3302) +++ branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c 2015-04-02 17:48:13 UTC (rev 3303) @@ -138,9 +138,9 @@ void ioUpdateVMTimezone() { + updateMicrosecondClock(); #ifdef HAVE_TM_GMTOFF time_t utctt; - updateMicrosecondClock(); utctt = (get64(utcMicrosecondClock) - MicrosecondsFrom1901To1970) / MicrosecondsPerSecond; vmGMTOffset = localtime(&utctt)->tm_gmtoff * MicrosecondsPerSecond; Modified: branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c 2015-04-02 17:02:47 UTC (rev 3302) +++ branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c 2015-04-02 17:48:13 UTC (rev 3303) @@ -141,11 +141,21 @@ void ioUpdateVMTimezone() { + updateMicrosecondClock(); +#ifdef HAVE_TM_GMTOFF time_t utctt; - updateMicrosecondClock(); utctt = (get64(utcMicrosecondClock) - MicrosecondsFrom1901To1970) / MicrosecondsPerSecond; vmGMTOffset = localtime(&utctt)->tm_gmtoff * MicrosecondsPerSecond; +#else +# ifdef HAVE_TIMEZONE + extern time_t timezone, altzone; + extern int daylight; + vmGMTOffset = -1 * (daylight ? altzone : timezone) * MicrosecondsPerSecond; +# else +# error: cannot determine timezone correction +# endif +#endif } sqLong Modified: branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c 2015-04-02 17:02:47 UTC (rev 3302) +++ branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c 2015-04-02 17:48:13 UTC (rev 3303) @@ -215,6 +215,7 @@ { __int64 utcNow, localNow; + updateMicrosecondClock(); GetSystemTimeAsFileTime((FILETIME *)&utcNow); FileTimeToLocalFileTime((FILETIME *)&utcNow,(FILETIME *)&localNow); vmGMTOffset = (localNow - utcNow) / (__int64)TocksPerMicrosecond; Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-04-02 17:48:13 UTC (rev 3303) @@ -17884,9 +17884,7 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)))); + offset = frameReceiverOffset(theFP); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0) Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-04-02 17:48:13 UTC (rev 3303) @@ -13062,9 +13062,7 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)))); + offset = frameReceiverOffset(theFP); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0)

1 0

[commit][3302] CogVM source as per VMMaker.oscog-eem.1152
by commits＠squeakvm.org 02 Apr '15

02 Apr '15

Revision: 3302 Author: eliot Date: 2015-04-02 10:02:47 -0700 (Thu, 02 Apr 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1152 Better living through compile-time type checking. Fix offset calculation in followForwardingPointersInStackZone: as indicated by a C compiler warning. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c 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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2371,7 +2371,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1147"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1152"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17361,7 +17361,6 @@ sqInt delta; sqInt i; sqInt newOop; - sqInt numArgs; char *offset; sqInt oop; sqInt referent; @@ -17430,11 +17429,9 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - /* begin frameStackedReceiverOffsetNumArgs: */ - numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)); - offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord())); + offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFP))->cmNumArgs) + : byteAt((theFP + FoxIFrameFlags) + 1)))); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0) @@ -28658,8 +28655,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -31277,7 +31274,7 @@ sqInt arg; sqInt fmt; sqInt i; - sqInt length; + usqInt length; usqInt numBytes; usqInt numSlots; usqInt numSlots1; @@ -31318,18 +31315,18 @@ /* bytes (the common case), including CompiledMethod */ - length = numBytes - (fmt & 7); + length = ((sqInt) (numBytes - (fmt & 7))); goto l1; } if (fmt <= 9) { - length = numBytes; + length = ((sqInt) numBytes); goto l1; } if (fmt >= 12) { - length = numBytes - ((fmt & 3) << 1); + length = ((sqInt) (numBytes - ((fmt & 3) << 1))); goto l1; } - length = numBytes - ((fmt & 1) << 2); + length = ((sqInt) (numBytes - ((fmt & 1) << 2))); l1: /* end numBytesOf: */; if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F)) && (length == (numBytesOf(arg))))) { @@ -31347,9 +31344,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - length = ((usqInt) ((numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1))); + length = (numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1); if (!((isAppropriateForCopyObject(arg)) && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) { (GIV(primFailCode) = PrimErrBadArgument); @@ -38682,8 +38679,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -41256,7 +41253,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -41357,7 +41354,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); + newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -43189,7 +43186,7 @@ sqInt ptr2; sqInt slotBytes; usqInt smallObj; - sqInt start; + usqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -46066,7 +46063,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -46108,7 +46105,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF); + newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF))); goto l1; } if (numSlots >= 0xFF) { @@ -73375,7 +73372,7 @@ sqInt sp1; sqInt stSize; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; hdr = long64At(array); fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; @@ -74638,8 +74635,8 @@ sqInt totalLength; sqInt totalLength1; sqInt value; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; value = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -76411,7 +76408,7 @@ sqInt rcvr; char *sp; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; newValue = longAt(GIV(stackPointer)); /* begin stackIntegerValue: */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2374,7 +2374,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1147"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1152"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17370,7 +17370,6 @@ sqInt delta; sqInt i; sqInt newOop; - sqInt numArgs; char *offset; sqInt oop; sqInt referent; @@ -17439,11 +17438,9 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - /* begin frameStackedReceiverOffsetNumArgs: */ - numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)); - offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord())); + offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFP))->cmNumArgs) + : byteAt((theFP + FoxIFrameFlags) + 1)))); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0) @@ -28667,8 +28664,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -31286,7 +31283,7 @@ sqInt arg; sqInt fmt; sqInt i; - sqInt length; + usqInt length; usqInt numBytes; usqInt numSlots; usqInt numSlots1; @@ -31327,18 +31324,18 @@ /* bytes (the common case), including CompiledMethod */ - length = numBytes - (fmt & 7); + length = ((sqInt) (numBytes - (fmt & 7))); goto l1; } if (fmt <= 9) { - length = numBytes; + length = ((sqInt) numBytes); goto l1; } if (fmt >= 12) { - length = numBytes - ((fmt & 3) << 1); + length = ((sqInt) (numBytes - ((fmt & 3) << 1))); goto l1; } - length = numBytes - ((fmt & 1) << 2); + length = ((sqInt) (numBytes - ((fmt & 1) << 2))); l1: /* end numBytesOf: */; if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F)) && (length == (numBytesOf(arg))))) { @@ -31356,9 +31353,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - length = ((usqInt) ((numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1))); + length = (numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1); if (!((isAppropriateForCopyObject(arg)) && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) { (GIV(primFailCode) = PrimErrBadArgument); @@ -38691,8 +38688,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -41265,7 +41262,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -41366,7 +41363,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); + newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -43198,7 +43195,7 @@ sqInt ptr2; sqInt slotBytes; usqInt smallObj; - sqInt start; + usqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -46075,7 +46072,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -46117,7 +46114,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF); + newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF))); goto l1; } if (numSlots >= 0xFF) { @@ -73384,7 +73381,7 @@ sqInt sp1; sqInt stSize; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; hdr = long64At(array); fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; @@ -74647,8 +74644,8 @@ sqInt totalLength; sqInt totalLength1; sqInt value; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; value = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -76420,7 +76417,7 @@ sqInt rcvr; char *sp; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; newValue = longAt(GIV(stackPointer)); /* begin stackIntegerValue: */ Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2117,7 +2117,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1147"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1152"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2114,7 +2114,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1147"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1152"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Apr 2 09:42:33 PDT 2015 + Thu Apr 2 10:02:32 PDT 2015 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spursistasrc/vm/cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 + CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1176,7 +1176,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -usqInt stringForCString(const char *aCString); +sqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -2368,7 +2368,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1151]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5623,6 +5623,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l228; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5641,7 +5642,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l228: /* end baseFrameReturn */; goto l227; } @@ -17806,7 +17807,6 @@ sqInt delta; sqInt i; sqInt newOop; - sqInt numArgs; char *offset; sqInt oop; sqInt referent; @@ -17875,11 +17875,9 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - /* begin frameStackedReceiverOffsetNumArgs: */ - numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)); - offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord())); + offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFP))->cmNumArgs) + : byteAt((theFP + FoxIFrameFlags) + 1)))); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0) @@ -28929,8 +28927,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - sqInt valueToStore; - sqInt valueToStore1; + usqInt valueToStore; + usqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -30232,7 +30230,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex))); + s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); goto l1; } if (numSlots >= 0xFF) { @@ -35621,7 +35619,7 @@ sqInt err; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -35736,7 +35734,7 @@ sqInt i; sqInt instSpec; sqInt literalCount; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38943,8 +38941,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - sqInt valueToStore; - sqInt valueToStore1; + usqInt valueToStore; + usqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -41517,7 +41515,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -43410,7 +43408,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - usqInt freeChunk; + sqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -43449,8 +43447,8 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - usqInt smallObj; - usqInt start; + sqInt smallObj; + sqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -46327,7 +46325,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -57427,13 +57425,13 @@ sqInt obj21; sqInt pigBytes; usqInt prevFree; - sqInt prevFreeChunk; + usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; - sqInt thisFreeChunk; + usqInt thisFreeChunk; sqInt usedChunk; here = startAddress; @@ -60658,8 +60656,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - usqInt savedInHashes; - usqInt savedOutHashes; + sqInt savedInHashes; + sqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -61126,13 +61124,13 @@ /* Answer a new String copied from a null-terminated C string, or nil if out of memory. */ -usqInt +sqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; sqInt len; usqInt newObj; - usqInt newString; + sqInt newString; usqInt numBytes; sqInt numSlots; @@ -62048,7 +62046,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -73580,7 +73578,7 @@ sqInt sp1; sqInt stSize; sqInt totalLength; - sqInt valueToStore; + usqInt valueToStore; hdr = long64At(array); fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; @@ -74843,8 +74841,8 @@ sqInt totalLength; sqInt totalLength1; sqInt value; - sqInt valueToStore; - sqInt valueToStore1; + usqInt valueToStore; + usqInt valueToStore1; value = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -76616,7 +76614,7 @@ sqInt rcvr; char *sp; sqInt totalLength; - sqInt valueToStore; + usqInt valueToStore; newValue = longAt(GIV(stackPointer)); /* begin stackIntegerValue: */ @@ -76851,7 +76849,7 @@ sqInt header1; sqInt i; sqInt methodHeader; - usqInt numSlots; + sqInt numSlots; usqInt numSlots1; sqInt rcvr; char *sp; @@ -76907,9 +76905,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - numSlots = (numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1); + numSlots = ((usqInt) ((numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1))); } } else { Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spursistasrc/vm/cointerp.h 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ @@ -252,7 +252,7 @@ sqInt splObj(sqInt index); usqInt storeCheckBoundary(void); sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -usqInt stringForCString(const char *aCString); +sqInt stringForCString(const char *aCString); void tenuringIncrementalGC(void); sqInt topRemappableOop(void); sqInt validFreeTree(void); Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 + CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1179,7 +1179,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -usqInt stringForCString(const char *aCString); +sqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -2371,7 +2371,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1151]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5632,6 +5632,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l228; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5650,7 +5651,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l228: /* end baseFrameReturn */; goto l227; } @@ -17815,7 +17816,6 @@ sqInt delta; sqInt i; sqInt newOop; - sqInt numArgs; char *offset; sqInt oop; sqInt referent; @@ -17884,11 +17884,9 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - /* begin frameStackedReceiverOffsetNumArgs: */ - numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)); - offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord())); + offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFP))->cmNumArgs) + : byteAt((theFP + FoxIFrameFlags) + 1)))); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0) @@ -28938,8 +28936,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - sqInt valueToStore; - sqInt valueToStore1; + usqInt valueToStore; + usqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -30241,7 +30239,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex))); + s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); goto l1; } if (numSlots >= 0xFF) { @@ -35630,7 +35628,7 @@ sqInt err; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -35745,7 +35743,7 @@ sqInt i; sqInt instSpec; sqInt literalCount; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38952,8 +38950,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - sqInt valueToStore; - sqInt valueToStore1; + usqInt valueToStore; + usqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -41526,7 +41524,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -43419,7 +43417,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - usqInt freeChunk; + sqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -43458,8 +43456,8 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - usqInt smallObj; - usqInt start; + sqInt smallObj; + sqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -46336,7 +46334,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -57436,13 +57434,13 @@ sqInt obj21; sqInt pigBytes; usqInt prevFree; - sqInt prevFreeChunk; + usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; - sqInt thisFreeChunk; + usqInt thisFreeChunk; sqInt usedChunk; here = startAddress; @@ -60667,8 +60665,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - usqInt savedInHashes; - usqInt savedOutHashes; + sqInt savedInHashes; + sqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -61135,13 +61133,13 @@ /* Answer a new String copied from a null-terminated C string, or nil if out of memory. */ -usqInt +sqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; sqInt len; usqInt newObj; - usqInt newString; + sqInt newString; usqInt numBytes; sqInt numSlots; @@ -62057,7 +62055,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -73589,7 +73587,7 @@ sqInt sp1; sqInt stSize; sqInt totalLength; - sqInt valueToStore; + usqInt valueToStore; hdr = long64At(array); fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; @@ -74852,8 +74850,8 @@ sqInt totalLength; sqInt totalLength1; sqInt value; - sqInt valueToStore; - sqInt valueToStore1; + usqInt valueToStore; + usqInt valueToStore1; value = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -76625,7 +76623,7 @@ sqInt rcvr; char *sp; sqInt totalLength; - sqInt valueToStore; + usqInt valueToStore; newValue = longAt(GIV(stackPointer)); /* begin stackIntegerValue: */ @@ -76860,7 +76858,7 @@ sqInt header1; sqInt i; sqInt methodHeader; - usqInt numSlots; + sqInt numSlots; usqInt numSlots1; sqInt rcvr; char *sp; @@ -76916,9 +76914,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - numSlots = (numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1); + numSlots = ((usqInt) ((numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1))); } } else { Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spursrc/vm/cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1167,7 +1167,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -sqInt stringForCString(const char *aCString); +usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -2357,7 +2357,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1147]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -12985,7 +12985,6 @@ sqInt delta; sqInt i; sqInt newOop; - sqInt numArgs; char *offset; sqInt oop; sqInt referent; @@ -13054,11 +13053,9 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - /* begin frameStackedReceiverOffsetNumArgs: */ - numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)); - offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord())); + offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFP))->cmNumArgs) + : byteAt((theFP + FoxIFrameFlags) + 1)))); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0) @@ -24035,8 +24032,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -25289,7 +25286,7 @@ usqInt newObj; usqInt numBytes; sqInt numSlots; - sqInt s; + usqInt s; char *sp; sqInt sz; @@ -25338,7 +25335,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex))); + s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); goto l1; } if (numSlots >= 0xFF) { @@ -34040,8 +34037,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -36614,7 +36611,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -36715,7 +36712,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); + newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -38547,7 +38544,7 @@ sqInt ptr2; sqInt slotBytes; usqInt smallObj; - usqInt start; + sqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -56207,7 +56204,7 @@ /* Answer a new String copied from a null-terminated C string, or nil if out of memory. */ -sqInt +usqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; @@ -56898,7 +56895,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { sqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -68627,7 +68624,7 @@ sqInt sp1; sqInt stSize; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; hdr = long64At(array); fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; @@ -69890,8 +69887,8 @@ sqInt totalLength; sqInt totalLength1; sqInt value; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; value = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -71663,7 +71660,7 @@ sqInt rcvr; char *sp; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; newValue = longAt(GIV(stackPointer)); /* begin stackIntegerValue: */ Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spursrc/vm/cointerp.h 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ @@ -250,7 +250,7 @@ sqInt splObj(sqInt index); usqInt storeCheckBoundary(void); sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -sqInt stringForCString(const char *aCString); +usqInt stringForCString(const char *aCString); void tenuringIncrementalGC(void); sqInt topRemappableOop(void); sqInt validFreeTree(void); Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1170,7 +1170,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -sqInt stringForCString(const char *aCString); +usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -2360,7 +2360,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1147]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -12994,7 +12994,6 @@ sqInt delta; sqInt i; sqInt newOop; - sqInt numArgs; char *offset; sqInt oop; sqInt referent; @@ -13063,11 +13062,9 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - /* begin frameStackedReceiverOffsetNumArgs: */ - numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)); - offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord())); + offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFP))->cmNumArgs) + : byteAt((theFP + FoxIFrameFlags) + 1)))); while (theSP <= offset) { oop = longAt(theSP); if (((oop & 3) == 0) @@ -24044,8 +24041,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -25298,7 +25295,7 @@ usqInt newObj; usqInt numBytes; sqInt numSlots; - sqInt s; + usqInt s; char *sp; sqInt sz; @@ -25347,7 +25344,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex))); + s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); goto l1; } if (numSlots >= 0xFF) { @@ -34049,8 +34046,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -36623,7 +36620,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -36724,7 +36721,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); + newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -38556,7 +38553,7 @@ sqInt ptr2; sqInt slotBytes; usqInt smallObj; - usqInt start; + sqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -56216,7 +56213,7 @@ /* Answer a new String copied from a null-terminated C string, or nil if out of memory. */ -sqInt +usqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; @@ -56907,7 +56904,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { sqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -68636,7 +68633,7 @@ sqInt sp1; sqInt stSize; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; hdr = long64At(array); fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; @@ -69899,8 +69896,8 @@ sqInt totalLength; sqInt totalLength1; sqInt value; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; value = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -71672,7 +71669,7 @@ sqInt rcvr; char *sp; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; newValue = longAt(GIV(stackPointer)); /* begin stackIntegerValue: */ Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2136,7 +2136,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1147]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1152]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/spurstack64src/vm/interp.c =================================================================== --- branches/Cog/spurstack64src/vm/interp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spurstack64src/vm/interp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2133,7 +2133,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1147]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1152]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2107,7 +2107,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1147]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1152]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/spurstacksrc/vm/interp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2104,7 +2104,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1147]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1152]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) +++ branches/Cog/src/vm/cointerp.c 2015-04-02 17:02:47 UTC (rev 3302) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 from - CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1152.mcz
by commits＠source.squeak.org 02 Apr '15

02 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1152.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1152 Author: eem Time: 2 April 2015, 9:50:29.616 am UUID: 9ca91213-b542-43ee-8410-354257eaa7b1 Ancestors: VMMaker.oscog-eem.1151 Better living through compile-time type checking. Fix offset calculation in followForwardingPointersInStackZone: as indicated by a C compiler warning. =============== Diff against VMMaker.oscog-eem.1151 =============== Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on inst var fetch we scan the receivers in the stack zone and follow any forwarded ones. This is way cheaper than scanning all of memory as in the old become. Override to handle machine code frames, and to handle the lack of an explicit read barrier on super sends. With most super send implementations (not Newspeak's absent super bytecodes) self, the receiver of the super send, is pushed before any arguments. So if self is becommed during argument marshalling, e.g. super doSomethingWith: (self become: self somethingElse) then a stale forwarded reference to self could be left on the stack. In the StackInterpreter we deal with this with an explicit read barrier on supersend. In the CoInterpreter we deal with it by following all non-argument stack contents." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #offset type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). + offset := theFP + (self frameStackedReceiverOffset: theFP). - offset := self frameStackedReceiverOffset: theFP. [theSP <= offset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. (self isMachineCodeFrame: theFP) ifTrue: [oop := stackPages longAt: theFP + FoxMFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxMFReceiver put: (objectMemory followForwarded: oop)]. oop := (self mframeHomeMethod: theFP) methodObject. self assert: (objectMemory isForwarded: oop) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. oop := self iframeMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. delta := newOop - oop. (theIPPtr ~= 0 and: [(stackPages longAt: theIPPtr) > oop]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + delta. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theSP := theIPPtr + objectMemory wordSize. theFP := callerFP]. "And finally follow the saved context and the caller context." theSP := thePage baseAddress - objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]]]!

1 0

[commit][3301] CogVM source as per VMMaker.oscog-eem.1151
by commits＠squeakvm.org 02 Apr '15

02 Apr '15

Revision: 3301 Author: eliot Date: 2015-04-02 09:42:51 -0700 (Thu, 02 Apr 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1151 Include the directedSuperclassSend shared case in the right bytecode. Fix sqWin32Backtrace.c compilation; on Newspeak it must now include nsmethodcache.h. Modified Paths: -------------- branches/Cog/platforms/win32/vm/sqWin32Backtrace.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Apr 1 16:04:13 PDT 2015 + Thu Apr 2 09:42:33 PDT 2015 Modified: branches/Cog/platforms/win32/vm/sqWin32Backtrace.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Backtrace.c 2015-04-01 23:03:46 UTC (rev 3300) +++ branches/Cog/platforms/win32/vm/sqWin32Backtrace.c 2015-04-02 16:42:51 UTC (rev 3301) @@ -27,6 +27,9 @@ #include "sqWin32.h" #if COGVM # include "cogmethod.h" +# if NewspeakVM +# include "nssendcache.h" +# endif # include "cogit.h" #endif Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2015-04-01 23:03:46 UTC (rev 3300) +++ branches/Cog/spursistasrc/vm/cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 from - CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1176,7 +1176,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -sqInt stringForCString(const char *aCString); +usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -2368,7 +2368,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1147]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1151]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6984,7 +6984,7 @@ sqInt objOop2; sqInt prim; sqInt rcvr; - sqInt result; + usqInt result; sqInt result1; sqInt result2; sqLong result64; @@ -7039,9 +7039,9 @@ flag("endianness"); assert((classIndexOf(objOop)) > (isForwardedObjectClassIndexPun())); numSlots = byteAt(objOop + 7); - result = ((usqInt) ((numSlots == 0xFF - ? longAt(objOop - BaseHeaderSize) - : numSlots))); + result = (numSlots == 0xFF + ? longAt(objOop - BaseHeaderSize) + : numSlots); longAtPointerput(localSP, ((result << 1) | 1)); break; case 2: @@ -7064,18 +7064,18 @@ /* bytes (the common case), including CompiledMethod */ - result = numBytes - (fmt & 7); + result = ((sqInt) (numBytes - (fmt & 7))); goto l11; } if (fmt <= 9) { - result = numBytes; + result = ((sqInt) numBytes); goto l11; } if (fmt >= 12) { - result = numBytes - ((fmt & 3) << 1); + result = ((sqInt) (numBytes - ((fmt & 3) << 1))); goto l11; } - result = numBytes - ((fmt & 1) << 2); + result = ((sqInt) (numBytes - ((fmt & 1) << 2))); l11: /* end numBytesOf: */; longAtPointerput(localSP, ((result << 1) | 1)); break; @@ -13304,7 +13304,7 @@ if (extB >= 64) { GIV(argumentCount) = (byte & 7) + (extB << 3); extB = 0; - goto directedSuperclassSend; + /* goto directedSuperclassSend */ goto l210; } @@ -13313,6 +13313,92 @@ goto superclassSend; } l210: /* end case */; + + directedSuperclassSend: + /* directedSuperclassSend */ + { + sqInt aValue; + sqInt class; + sqInt err; + sqInt err1; + sqInt hash; + sqInt hash1; + sqInt objOop; + sqInt objOop1; + sqInt referent; + sqInt referent1; + sqInt superclass; + sqInt top; + + VM_LABEL(directedSuperclassSend); + /* begin internalPopStack */ + top = longAt(localSP); + localSP += BytesPerOop; + class = top; + if (((longAt(class)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(class)); + referent = longAt((class + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + class = referent; + } + /* begin followField:ofObject: */ + objOop = longAt((class + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); + if (((objOop & 3) == 0) + && (((longAt(objOop)) & 0x3FFFFF) == 8)) { + objOop = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, class, objOop); + } + superclass = objOop; + /* begin ensureBehaviorHash: */ + assert(addressCouldBeClassObj(superclass)); + if (((hash = (long32At(superclass + 4)) & 0x3FFFFF)) != 0) { + hash; + } + else { + if (objCouldBeClassObj(superclass)) { + if (((err = enterIntoClassTable(superclass))) != 0) { + -err; + } + else { + (long32At(superclass + 4)) & 0x3FFFFF; + } + } + else { + -PrimErrBadReceiver; + } + } + /* begin classTagForClass: */ + assert(addressCouldBeClassObj(superclass)); + /* begin ensureBehaviorHash: */ + assert(addressCouldBeClassObj(superclass)); + lkupClassTag = (((hash1 = (long32At(superclass + 4)) & 0x3FFFFF)) != 0 + ? hash1 + : (objCouldBeClassObj(superclass) + ? (((err1 = enterIntoClassTable(superclass))) != 0 + ? -err1 + : (long32At(superclass + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); + /* begin ensureReceiverUnforwarded */ + if ((((longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))) & 3) == 0) + && (((longAt(longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop)))) & 0x3FFFFF) == 8)) { + /* begin internalStackValue:put: */ + /* begin followForwarded: */ + objOop1 = longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop)); + assert(isUnambiguouslyForwarder(objOop1)); + referent1 = longAt((objOop1 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + aValue = referent1; + longAtPointerput(localSP + (GIV(argumentCount) * BytesPerOop), aValue); + } + assert(lkupClassTag != (nilObject())); + goto commonSend; + } break; case 492: /*236*/ /* extTrapIfNotInstanceOfBehaviorsBytecode */ @@ -13962,7 +14048,7 @@ sqInt objOop2; sqInt prim; sqInt rcvr; - sqInt result; + usqInt result; sqInt result1; sqInt result2; sqLong result64; @@ -14017,9 +14103,9 @@ flag("endianness"); assert((classIndexOf(objOop)) > (isForwardedObjectClassIndexPun())); numSlots = byteAt(objOop + 7); - result = ((usqInt) ((numSlots == 0xFF - ? longAt(objOop - BaseHeaderSize) - : numSlots))); + result = (numSlots == 0xFF + ? longAt(objOop - BaseHeaderSize) + : numSlots); longAtPointerput(localSP, ((result << 1) | 1)); break; case 2: @@ -14042,18 +14128,18 @@ /* bytes (the common case), including CompiledMethod */ - result = numBytes - (fmt & 7); + result = ((sqInt) (numBytes - (fmt & 7))); goto l218; } if (fmt <= 9) { - result = numBytes; + result = ((sqInt) numBytes); goto l218; } if (fmt >= 12) { - result = numBytes - ((fmt & 3) << 1); + result = ((sqInt) (numBytes - ((fmt & 3) << 1))); goto l218; } - result = numBytes - ((fmt & 1) << 2); + result = ((sqInt) (numBytes - ((fmt & 1) << 2))); l218: /* end numBytesOf: */; longAtPointerput(localSP, ((result << 1) | 1)); break; @@ -22478,7 +22564,7 @@ int index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -28843,8 +28929,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -30146,7 +30232,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); + s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -31462,7 +31548,7 @@ sqInt arg; sqInt fmt; sqInt i; - usqInt length; + sqInt length; usqInt numBytes; usqInt numSlots; usqInt numSlots1; @@ -31503,18 +31589,18 @@ /* bytes (the common case), including CompiledMethod */ - length = ((sqInt) (numBytes - (fmt & 7))); + length = numBytes - (fmt & 7); goto l1; } if (fmt <= 9) { - length = ((sqInt) numBytes); + length = numBytes; goto l1; } if (fmt >= 12) { - length = ((sqInt) (numBytes - ((fmt & 3) << 1))); + length = numBytes - ((fmt & 3) << 1); goto l1; } - length = ((sqInt) (numBytes - ((fmt & 1) << 2))); + length = numBytes - ((fmt & 1) << 2); l1: /* end numBytesOf: */; if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F)) && (length == (numBytesOf(arg))))) { @@ -31532,9 +31618,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - length = (numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1); + length = ((usqInt) ((numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1))); if (!((isAppropriateForCopyObject(arg)) && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) { (GIV(primFailCode) = PrimErrBadArgument); @@ -35535,7 +35621,7 @@ sqInt err; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -35650,7 +35736,7 @@ sqInt i; sqInt instSpec; sqInt literalCount; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38857,8 +38943,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -41431,7 +41517,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -43324,7 +43410,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - sqInt freeChunk; + usqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -43363,8 +43449,8 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - sqInt smallObj; - sqInt start; + usqInt smallObj; + usqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -46241,7 +46327,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -57341,13 +57427,13 @@ sqInt obj21; sqInt pigBytes; usqInt prevFree; - usqInt prevFreeChunk; + sqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; - usqInt thisFreeChunk; + sqInt thisFreeChunk; sqInt usedChunk; here = startAddress; @@ -60572,8 +60658,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - sqInt savedInHashes; - sqInt savedOutHashes; + usqInt savedInHashes; + usqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -61040,13 +61126,13 @@ /* Answer a new String copied from a null-terminated C string, or nil if out of memory. */ -sqInt +usqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; sqInt len; usqInt newObj; - sqInt newString; + usqInt newString; usqInt numBytes; sqInt numSlots; @@ -73494,7 +73580,7 @@ sqInt sp1; sqInt stSize; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; hdr = long64At(array); fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; @@ -74757,8 +74843,8 @@ sqInt totalLength; sqInt totalLength1; sqInt value; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; value = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -76530,7 +76616,7 @@ sqInt rcvr; char *sp; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; newValue = longAt(GIV(stackPointer)); /* begin stackIntegerValue: */ @@ -76765,7 +76851,7 @@ sqInt header1; sqInt i; sqInt methodHeader; - sqInt numSlots; + usqInt numSlots; usqInt numSlots1; sqInt rcvr; char *sp; @@ -76821,9 +76907,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - numSlots = ((usqInt) ((numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1))); + numSlots = (numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1); } } else { Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2015-04-01 23:03:46 UTC (rev 3300) +++ branches/Cog/spursistasrc/vm/cointerp.h 2015-04-02 16:42:51 UTC (rev 3301) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 */ @@ -252,7 +252,7 @@ sqInt splObj(sqInt index); usqInt storeCheckBoundary(void); sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -sqInt stringForCString(const char *aCString); +usqInt stringForCString(const char *aCString); void tenuringIncrementalGC(void); sqInt topRemappableOop(void); sqInt validFreeTree(void); Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-04-01 23:03:46 UTC (rev 3300) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-04-02 16:42:51 UTC (rev 3301) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 from - CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1179,7 +1179,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -sqInt stringForCString(const char *aCString); +usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -2371,7 +2371,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1147]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1151]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6993,7 +6993,7 @@ sqInt objOop2; sqInt prim; sqInt rcvr; - sqInt result; + usqInt result; sqInt result1; sqInt result2; sqLong result64; @@ -7048,9 +7048,9 @@ flag("endianness"); assert((classIndexOf(objOop)) > (isForwardedObjectClassIndexPun())); numSlots = byteAt(objOop + 7); - result = ((usqInt) ((numSlots == 0xFF - ? longAt(objOop - BaseHeaderSize) - : numSlots))); + result = (numSlots == 0xFF + ? longAt(objOop - BaseHeaderSize) + : numSlots); longAtPointerput(localSP, ((result << 1) | 1)); break; case 2: @@ -7073,18 +7073,18 @@ /* bytes (the common case), including CompiledMethod */ - result = numBytes - (fmt & 7); + result = ((sqInt) (numBytes - (fmt & 7))); goto l11; } if (fmt <= 9) { - result = numBytes; + result = ((sqInt) numBytes); goto l11; } if (fmt >= 12) { - result = numBytes - ((fmt & 3) << 1); + result = ((sqInt) (numBytes - ((fmt & 3) << 1))); goto l11; } - result = numBytes - ((fmt & 1) << 2); + result = ((sqInt) (numBytes - ((fmt & 1) << 2))); l11: /* end numBytesOf: */; longAtPointerput(localSP, ((result << 1) | 1)); break; @@ -13313,7 +13313,7 @@ if (extB >= 64) { GIV(argumentCount) = (byte & 7) + (extB << 3); extB = 0; - goto directedSuperclassSend; + /* goto directedSuperclassSend */ goto l210; } @@ -13322,6 +13322,92 @@ goto superclassSend; } l210: /* end case */; + + directedSuperclassSend: + /* directedSuperclassSend */ + { + sqInt aValue; + sqInt class; + sqInt err; + sqInt err1; + sqInt hash; + sqInt hash1; + sqInt objOop; + sqInt objOop1; + sqInt referent; + sqInt referent1; + sqInt superclass; + sqInt top; + + VM_LABEL(directedSuperclassSend); + /* begin internalPopStack */ + top = longAt(localSP); + localSP += BytesPerOop; + class = top; + if (((longAt(class)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(class)); + referent = longAt((class + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + class = referent; + } + /* begin followField:ofObject: */ + objOop = longAt((class + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); + if (((objOop & 3) == 0) + && (((longAt(objOop)) & 0x3FFFFF) == 8)) { + objOop = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, class, objOop); + } + superclass = objOop; + /* begin ensureBehaviorHash: */ + assert(addressCouldBeClassObj(superclass)); + if (((hash = (long32At(superclass + 4)) & 0x3FFFFF)) != 0) { + hash; + } + else { + if (objCouldBeClassObj(superclass)) { + if (((err = enterIntoClassTable(superclass))) != 0) { + -err; + } + else { + (long32At(superclass + 4)) & 0x3FFFFF; + } + } + else { + -PrimErrBadReceiver; + } + } + /* begin classTagForClass: */ + assert(addressCouldBeClassObj(superclass)); + /* begin ensureBehaviorHash: */ + assert(addressCouldBeClassObj(superclass)); + lkupClassTag = (((hash1 = (long32At(superclass + 4)) & 0x3FFFFF)) != 0 + ? hash1 + : (objCouldBeClassObj(superclass) + ? (((err1 = enterIntoClassTable(superclass))) != 0 + ? -err1 + : (long32At(superclass + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); + /* begin ensureReceiverUnforwarded */ + if ((((longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))) & 3) == 0) + && (((longAt(longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop)))) & 0x3FFFFF) == 8)) { + /* begin internalStackValue:put: */ + /* begin followForwarded: */ + objOop1 = longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop)); + assert(isUnambiguouslyForwarder(objOop1)); + referent1 = longAt((objOop1 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + aValue = referent1; + longAtPointerput(localSP + (GIV(argumentCount) * BytesPerOop), aValue); + } + assert(lkupClassTag != (nilObject())); + goto commonSend; + } BREAK; CASE(492) /*236*/ /* extTrapIfNotInstanceOfBehaviorsBytecode */ @@ -13971,7 +14057,7 @@ sqInt objOop2; sqInt prim; sqInt rcvr; - sqInt result; + usqInt result; sqInt result1; sqInt result2; sqLong result64; @@ -14026,9 +14112,9 @@ flag("endianness"); assert((classIndexOf(objOop)) > (isForwardedObjectClassIndexPun())); numSlots = byteAt(objOop + 7); - result = ((usqInt) ((numSlots == 0xFF - ? longAt(objOop - BaseHeaderSize) - : numSlots))); + result = (numSlots == 0xFF + ? longAt(objOop - BaseHeaderSize) + : numSlots); longAtPointerput(localSP, ((result << 1) | 1)); break; case 2: @@ -14051,18 +14137,18 @@ /* bytes (the common case), including CompiledMethod */ - result = numBytes - (fmt & 7); + result = ((sqInt) (numBytes - (fmt & 7))); goto l218; } if (fmt <= 9) { - result = numBytes; + result = ((sqInt) numBytes); goto l218; } if (fmt >= 12) { - result = numBytes - ((fmt & 3) << 1); + result = ((sqInt) (numBytes - ((fmt & 3) << 1))); goto l218; } - result = numBytes - ((fmt & 1) << 2); + result = ((sqInt) (numBytes - ((fmt & 1) << 2))); l218: /* end numBytesOf: */; longAtPointerput(localSP, ((result << 1) | 1)); break; @@ -22487,7 +22573,7 @@ int index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -28852,8 +28938,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -30155,7 +30241,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); + s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -31471,7 +31557,7 @@ sqInt arg; sqInt fmt; sqInt i; - usqInt length; + sqInt length; usqInt numBytes; usqInt numSlots; usqInt numSlots1; @@ -31512,18 +31598,18 @@ /* bytes (the common case), including CompiledMethod */ - length = ((sqInt) (numBytes - (fmt & 7))); + length = numBytes - (fmt & 7); goto l1; } if (fmt <= 9) { - length = ((sqInt) numBytes); + length = numBytes; goto l1; } if (fmt >= 12) { - length = ((sqInt) (numBytes - ((fmt & 3) << 1))); + length = numBytes - ((fmt & 3) << 1); goto l1; } - length = ((sqInt) (numBytes - ((fmt & 1) << 2))); + length = numBytes - ((fmt & 1) << 2); l1: /* end numBytesOf: */; if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F)) && (length == (numBytesOf(arg))))) { @@ -31541,9 +31627,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - length = (numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1); + length = ((usqInt) ((numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1))); if (!((isAppropriateForCopyObject(arg)) && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) { (GIV(primFailCode) = PrimErrBadArgument); @@ -35544,7 +35630,7 @@ sqInt err; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -35659,7 +35745,7 @@ sqInt i; sqInt instSpec; sqInt literalCount; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38866,8 +38952,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -41440,7 +41526,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -43333,7 +43419,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - sqInt freeChunk; + usqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -43372,8 +43458,8 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - sqInt smallObj; - sqInt start; + usqInt smallObj; + usqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -46250,7 +46336,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -57350,13 +57436,13 @@ sqInt obj21; sqInt pigBytes; usqInt prevFree; - usqInt prevFreeChunk; + sqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; - usqInt thisFreeChunk; + sqInt thisFreeChunk; sqInt usedChunk; here = startAddress; @@ -60581,8 +60667,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - sqInt savedInHashes; - sqInt savedOutHashes; + usqInt savedInHashes; + usqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -61049,13 +61135,13 @@ /* Answer a new String copied from a null-terminated C string, or nil if out of memory. */ -sqInt +usqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; sqInt len; usqInt newObj; - sqInt newString; + usqInt newString; usqInt numBytes; sqInt numSlots; @@ -73503,7 +73589,7 @@ sqInt sp1; sqInt stSize; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; hdr = long64At(array); fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; @@ -74766,8 +74852,8 @@ sqInt totalLength; sqInt totalLength1; sqInt value; - usqInt valueToStore; - usqInt valueToStore1; + sqInt valueToStore; + sqInt valueToStore1; value = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -76539,7 +76625,7 @@ sqInt rcvr; char *sp; sqInt totalLength; - usqInt valueToStore; + sqInt valueToStore; newValue = longAt(GIV(stackPointer)); /* begin stackIntegerValue: */ @@ -76774,7 +76860,7 @@ sqInt header1; sqInt i; sqInt methodHeader; - sqInt numSlots; + usqInt numSlots; usqInt numSlots1; sqInt rcvr; char *sp; @@ -76830,9 +76916,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - numSlots = ((usqInt) ((numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1))); + numSlots = (numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1); } } else {

1 0

VM Maker: VMMaker.oscog-eem.1151.mcz
by commits＠source.squeak.org 02 Apr '15

02 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1151.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1151 Author: eem Time: 2 April 2015, 9:31:47.639 am UUID: 4356fa11-234c-40ba-b3cc-fc9797b15238 Ancestors: VMMaker.oscog-tpr.1150 Include the directedSuperclassSend shared case in the right bytecode. =============== Diff against VMMaker.oscog-tpr.1150 =============== Item was changed: ----- Method: StackInterpreter>>directedSuperclassSend (in category 'send bytecodes') ----- directedSuperclassSend "Send a message to self, starting lookup with the superclass of the class on top of stack." "Assume: messageSelector and argumentCount have been set, and that the receiver and arguments have been pushed onto the stack," "Note: This method is inlined into the interpreter dispatch loop." + <sharedCodeInCase: #extSendSuperBytecode> - <sharedCodeInCase: #singleExtendedSuperBytecode> <option: #SistaVM> | class superclass | class := self internalPopStack. (objectMemory isForwarded: class) ifTrue: [class := objectMemory followForwarded: class]. superclass := self superclassOf: class. objectMemory ensureBehaviorHash: superclass. lkupClassTag := objectMemory classTagForClass: superclass. "To maintain the invariant that all receivers are unforwarded we need an explicit read barrier in the super send cases. Even though we always follow receivers on become e.g. super doSomethingWith: (self become: other) forwards the receiver self pushed on the stack." self ensureReceiverUnforwarded. self assert: lkupClassTag ~= objectMemory nilObject. self commonSend!

1 0

NoDbgRegParms test case results
by gettimothy 02 Apr '15

02 Apr '15

Hi all. I implemented a simple test case to test my theory that my platform does not support the regparms(0) function attribute and my theory is bunk. bleah. I modified this autotools tutorial's source files at http://www.gnu.org/software/automake/manual/html_node/Creating-amhello.html to mimic the __attribute__((regparms(0))) behavior in cog. I could not recreate the error under any compination of PRODUCTION and #if #else conditions. I am at a loss at the moment (and sick with a cold) so I will have to revisit this later. CMakeVMMakerSqueak dev is blocked by this issue. I added a test.h file to the src directory that looks like this: bash-4.2$ cat test.h #undef NoDbgRegParms #define PRODUCTION 1 #if !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms) # define NoDbgRegParms __attribute__ ((regparm(0))) #else # define NoDbgRegParms __attribute__ ((deprecated)) #endif int plus (int a, int b) NoDbgRegParms; and modified the main.c . bash-4.2$ cat src/main.c #include <config.h> #include <stdio.h> #include "test.h" int main(void){ int p; puts("Hello World!"); puts ("This is " PACKAGE_STRING "."); p=plus(3,3); printf("%d\n",p); return 0; } int plus (int a, int b) { return a + b; }

2 2

gcc -E on the NoDbgRegParms issue
by gettimothy 02 Apr '15

02 Apr '15

In the Cog/src/vm running the -E option on gcc shows the NoDbgRegParms NOT being replaced in gcc3x-cointerp.c (along with some warnings that may be relevant, I don't know) gcc -E gcc3x-cointerp.c -I /home/wm/usr/src/smalltalk/CMake.oscog/Cog/platforms/unix/vm -I /home/wm/usr/src/smalltalk/CMake.oscog/Cog/platforms/Cross/vm/ -I /home/wm/usr/src/smalltalk/CMake.oscog/Cog/build.linux32x86/squeak.cog.v3/build.assert/ -I ./ | cat > ~/gcc3x In file included from /home/wm/usr/src/smalltalk/CMake.oscog/Cog/platforms/Cross/vm/sq.h:18:0, from /home/wm/usr/src/smalltalk/CMake.oscog/Cog/platforms/unix/vm/sqGnu.h:37, from gcc3x-cointerp.c:28: /home/wm/usr/src/smalltalk/CMake.oscog/Cog/platforms/unix/vm/sqConfig.h:12:2: error: #error "LSB_FIRST is undefined. Used for setting platform endianesness!" #error "LSB_FIRST is undefined. Used for setting platform endianesness!" ^ gcc3x-cointerp.c:77:0: warning: "sigsetjmp" redefined [enabled by default] # define sigsetjmp(jb,ssmf) _setjmp(jb) ^ In file included from gcc3x-cointerp.c:26:0: /usr/include/setjmp.h:103:0: note: this is the location of the previous definition # define sigsetjmp(env, savemask) __sigsetjmp (env, savemask) ^ The same command on cogit.c DOES show the replacement. The question then becomes why is variable replacement happening on the one and not the other. I have been focusing on the preprocessor logic that sets NoDbgRegParms, but is there something else I may be overlooking? thx. tty

1 0

Upgrading jenkins; any counterpoints?
by Tobias Pape 02 Apr '15

02 Apr '15

Hi all I thought about upgrading jenkins, especially for [security reasons](https://jenkins-ci.org/changelog) (more than 20 fixes). Also, I'd like to install the nice [doony theme](https://github.com/kevinburke/doony). Does anybody has a reason I should not attempt this? Best -Tobias

3 2

VM Maker: Cog-tpr.256.mcz
by commits＠source.squeak.org 02 Apr '15

02 Apr '15

tim Rowledge uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-tpr.256.mcz ==================== Summary ==================== Name: Cog-tpr.256 Author: tpr Time: 1 April 2015, 7:14:56.966 pm UUID: 9426834f-7cf6-406a-9048-6159ddc0e37f Ancestors: Cog-eem.255 Improve instruction decorating for BX/BLX. MC seems to insist on including some stuff changed and saved in an older version; hunh? =============== Diff against Cog-eem.255 =============== Item was changed: ----- Method: GdbARMAlien>>decorateDisassembly:for:fromAddress: (in category 'disassembly') ----- decorateDisassembly: anInstructionString for: aSymbolManager fromAddress: address + "Decode what we can of the instruction and decorate it with useful stuff" | word opcode rotate mode operand | word := aSymbolManager objectMemory longAt: address. (self instructionIsAnyB: word) ifTrue: + [((self instructionIsB: word) or: [self instructionIsBL: word]) + ifTrue:["We can extract the offset from a plain B/BL instruction" + operand := self extractOffsetFromBL: word.. + operand := operand + address + 8 bitAnd: aSymbolManager addressSpaceMask]. + ((self instructionIsBX: word) or: [self instructionIsBLX: word]) + ifTrue:["We can extract the offset from a BX/BLX instructions register" + operand := (self perform: (self registerStateGetters at: (word bitAnd: 15) + 1))]] - [operand := word bitAnd: 16rFFFFFF. - (operand anyMask: 16r800000) ifTrue: - [operand := operand - 16r1000000]. - operand := operand * 4 + address + 8 bitAnd: aSymbolManager addressSpaceMask] ifFalse: [((self instructionIsAnyLoadStore: word) and: [(word >> 16 bitAnd: 15) = CogARMCompiler VarBaseReg]) ifTrue: [operand := aSymbolManager varBaseAddress + (word bitAnd: 1 << 12 - 1)] ifFalse: [opcode := word >> 21 bitAnd: 16rF. opcode ~= CogARMCompiler orOpcode ifTrue: [^anInstructionString]. rotate := word >> 8 bitAnd: 16rF. mode := word >> 25 bitAnd: 7. "CogARMCompiler always uses a 0 rotate in the last operand of the final ORR when building long constants." (mode = 1 and: [rotate ~= 0]) ifTrue: [^anInstructionString]. operand := aSymbolManager backEnd literalBeforeFollowingAddress: address + 4]]. "is there an intersting address with this?" ^(aSymbolManager lookupAddress: operand) ifNotNil: [:string| anInstructionString, ' = ', (operand printStringRadix: 16), ' = ', string] ifNil: [anInstructionString, ' = ', (operand printStringRadix: 16)]! Item was added: + ----- Method: GdbARMAlien>>extractOffsetFromLoadStore: (in category 'accessing-abstract') ----- + extractOffsetFromLoadStore: instr + "work out the address offset implied by instr. + We assume it has been determined it is actually a load store before attaching any meaning to the result. + If it is post-indexed, then the offset must be 0, no matter what else is encoded. + If the instr is immediate-offset, pull the relevent bits out of instr. + If it is register-offset, pull the value from the indicated register." + |offset shiftAmt shiftType | + + "post-indexed means no offset to the read address" + (instr bitAnd: 1 << 24) = 0 ifTrue:[^0]. + + (self instructionIsImmediateOffsetLoadStore: instr) + ifTrue:["two cases apply - a 12bit immediate for 010 group instructions and an 8bit for 000 group ldrh stuff" + (instr >> 25 bitAnd: 7) = 2 + ifTrue:[ "immed word or byte op, with 12bit offset" + offset := instr bitAnd: 16rFFF] + ifFalse:["halfword 8bit offset" + offset := (instr bitAnd: 16rF00)>>4 bitOr: (instr bitAnd: 16rF)]]. + + (self instructionIsRegisterOffsetLoadStore: instr) + ifTrue:["both forms use same offset-reg encoding" + offset := self perform:(self registerStateGetters at:(instr bitAnd: 16rF) + 1). + (instr >> 25 bitAnd: 7) = 3 + ifTrue:[ "register offset with assorted modifiers" + "sort out modifiers" + shiftType := instr >> 5 bitAnd: 3. + shiftAmt := instr >>7 bitAnd: 16r1F. + shiftType = 0"lsl" ifTrue:[offset := offset << shiftAmt.]. + shiftType = 1"lsr" ifTrue:[offset := offset >> shiftAmt]. + shiftType = 2"asr" ifTrue:[offset := offset >>> shiftAmt]. + "I refuse to countenance using ROR or RRX here. Just Say No" ] + "halfword stuff register offset uses no modifiers in the form we suport. See ARM DDI0406A p. A8-156"]. + + "all forms have the bit 23 up/down flag to account for" + (instr bitAnd: 1<<23) = 0 + ifTrue:["-ve offset" ^offset negated] + ifFalse:["+ve offset" ^offset] ! Item was changed: ----- Method: GdbARMAlien>>handleFailingLoadStore:at: (in category 'error handling') ----- handleFailingLoadStore: instr at: pc + "See e.g. ARM DDI0406A pp. A8-120, 124, 128, 132, 152, 156, etc. etc" | baseReg destReg srcReg offset | + + "find the register used as the base of the address and the register to load into or store from" baseReg := self registerStateGetters at: (instr >> 16 bitAnd: 15)+ 1. + srcReg := self registerStateGetters at: (instr >> 12 bitAnd: 15)+ 1. destReg := self registerStateSetters at: (instr >> 12 bitAnd: 15) + 1. + + "work out the relevant offset, whether an immediate or register value" + offset := self extractOffsetFromLoadStore: instr. + - srcReg := self registerStateGetters at: (instr >> 12 bitAnd: 15) + 1. - "See e.g. A5.2.2/A5-20 ARM ARM v6" - offset := (instr >> 21 bitAnd: 2r1111001) = 2r0101000 - ifTrue: - [(instr >> 23 anyMask: 1) "U bit" - ifTrue: [instr bitAnd: 16rFFF] - ifFalse: [(instr bitAnd: 16rFFF) negated]] - ifFalse: - [0]. (self instructionIsLDR: instr) ifTrue: [^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: baseReg) + offset type: #read accessor: destReg) signal]. + (self instructionIsLDRB: instr) ifTrue: + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: baseReg) + offset + type: #read + accessor: destReg) + signal]. + (self instructionIsLDRH: instr) ifTrue: + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: baseReg) + offset + type: #read + accessor: destReg) + signal]. (self instructionIsSTR: instr) ifTrue: [^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: baseReg) + offset type: #write accessor: srcReg) signal]. - "Lars handled byte read/write failures. i don't think we need to" - "(self instructionIsLDRB: instr) ifTrue: - [??]. (self instructionIsSTRB: instr) ifTrue: + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: baseReg) + offset + type: #write + accessor: srcReg) + signal]. + (self instructionIsSTRH: instr) ifTrue: + [^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: baseReg) + offset + type: #write + accessor: srcReg) + signal]. + - [??]." self error: 'handleFailingLoadStore:at: invoked for non-load/store?'! Item was changed: ----- Method: GdbARMAlien>>instructionIsAddSP: (in category 'testing') ----- instructionIsAddSP: instr + "is this an add sp, sp, #? - instruction?" - "is this aadd sp, sp, #? - instruction?" ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [(instr bitAnd: (16rFFFFF00)) = (16r28DD000)]! Item was changed: ----- Method: GdbARMAlien>>instructionIsAlignSP: (in category 'testing') ----- instructionIsAlignSP: instr + "is this a subs sp, sp, #4 - instruction?" + ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [(instr bitAnd: (16rFFFFFFF)) = (16r2DDD004)]! - "is this a bics sp, sp, #7 - instruction?" - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [(instr bitAnd: (16rFFFFFFF)) = (16r3DDD007)]! Item was changed: ----- Method: GdbARMAlien>>instructionIsAnyB: (in category 'testing') ----- + instructionIsAnyB: instr - instructionIsAnyB: instr "is this any of the B BX BL or BLX <offset> instructions?" + ^ (self instructionIsB: instr) + or: [self instructionIsBL: instr] + or: [self instructionIsBLX: instr] + or: [self instructionIsBX: instr]! - ^(instr >> 25 bitAnd: 7) = 5! Item was changed: ----- Method: GdbARMAlien>>instructionIsAnyLoadStore: (in category 'testing') ----- instructionIsAnyLoadStore: instr + "is this any of the LDR,STR instructions? + We handle byte, word, and halfword versions but NOT NOT signed extend, double or privileged versions" + + ^(self instructionIsImmediateOffsetLoadStore: instr) or:[self instructionIsRegisterOffsetLoadStore: instr]! - "is this any of the LDR,STR instructions?" - ^(instr >> 24 bitAnd: 15) = 5! Item was changed: ----- Method: GdbARMAlien>>instructionIsB: (in category 'testing') ----- instructionIsB: instr "is this a B <offset> instruction?" + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p. A8-44" + ^ (instr bitAnd: (16rF<<24)) = (16rA<<24)! - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [(instr bitAnd: (16rF<<24)) = (16rA<<24)]! Item was changed: ----- Method: GdbARMAlien>>instructionIsBL: (in category 'testing') ----- instructionIsBL: instr "is this a BL <offset> instruction?" + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "see ARM DDI0406A p. A8-58" + ^(instr bitAnd: (16rF<<24)) = (16rB<<24)! - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [(instr bitAnd: (16rF<<24)) = (16rB<<24)]! Item was changed: ----- Method: GdbARMAlien>>instructionIsBLX: (in category 'testing') ----- instructionIsBLX: instr + "is this a BLX <targetReg> instruction? We DO NOT support the BLX immed version" + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p A8-60" + ^(instr bitAnd: 16r0FFFFFF0) = 16r12FFF30! - "is this a BLX <targetReg> instruction?" - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [(instr bitAnd: 16r0FFFFFF0) = 16r12FFF30]! Item was changed: ----- Method: GdbARMAlien>>instructionIsBX: (in category 'testing') ----- instructionIsBX: instr "is this a BX <targetReg> instruction?" + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p. A8-62" + ^(instr bitAnd: 16r0FFFFFF0) = 16r12FFF10! - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [(instr bitAnd: 16r0FFFFFF0) = 16r12FFF10]! Item was added: + ----- Method: GdbARMAlien>>instructionIsImmediateOffsetLoadStore: (in category 'testing') ----- + instructionIsImmediateOffsetLoadStore: instr + "is this any of the immediate offset LDR,STR instructions?" + | op1 | + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "test for 010 group of load/stores" + op1 := instr >>25 bitAnd: 7. + op1 = 2 ifTrue:[^true]. + + "test for the ridiculously muddled 000 group" + op1 > 0 ifTrue:[^false]. + "bit 21 must not be 1 and bit 22 must be 1" + (instr bitAnd: 3 <<21) = (2<<21) ifFalse:[^false]. + "bits 4:7need to be 16rB for our purpose" + ^(instr bitAnd: 16rF0) = 16rB0 + + ! Item was changed: ----- Method: GdbARMAlien>>instructionIsLDR: (in category 'testing') ----- instructionIsLDR: instr "is this a LDR instruction?" | foo | + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p. A8-120" + foo := (instr >> 20 bitAnd: 16rE5). + ^foo = 16r41 "ldr r1, [r2, #+/-imm]" + or:[foo = 16r61 "ldr r1, [r2, r3]"]! - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" - and: [foo := (instr >> 20 bitAnd: 16rFF). - foo = 16r51 "ldr r1, [r2, #imm]" - or:[foo = 16r59 "ldr r1, [r2, #-imm]" - or:[foo = 16r79 "ldr r1, [r2, r3]"]]]! Item was changed: ----- Method: GdbARMAlien>>instructionIsLDRB: (in category 'testing') ----- instructionIsLDRB: instr "is this a LDRB instruction?" | foo | + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p. A8-128" + foo := (instr >> 20 bitAnd: 16rE5). + ^foo = 16r45 "ldrb r1, [r2, #+/-imm]" + or:[foo = 16r65 "ldrb r1, [r2, r3]"]! - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" - and: [foo := (instr >> 20 bitAnd: 16rFF). - foo = 16r55 "ldrb r1, [r2, #imm]" - or:[foo = 16r5D "ldrb r1, [r2, #-imm]" - or:[foo = 16r7D "ldrb r1, [r2, r3]"]]]! Item was added: + ----- Method: GdbARMAlien>>instructionIsLDRH: (in category 'testing') ----- + instructionIsLDRH: instr + "is this a LDRH instruction?" + | foo | + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p. A8-154" + (instr bitAnd: 16rF0) = 16rB0 ifFalse:[^false]. + foo := (instr >> 20 bitAnd: 16rE3). + ^foo = 16r3 "ldrh r1, [r2, #+/-imm]" + or:[foo = 16r1 "ldrh r1, [r2, r3]"]! Item was added: + ----- Method: GdbARMAlien>>instructionIsRegisterOffsetLoadStore: (in category 'testing') ----- + instructionIsRegisterOffsetLoadStore: instr + "is this any of the register offset LDR,STR instructions?" + | op1 | + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + + op1 := instr >>25 bitAnd: 7. + "test for the 011 group - check bit 4 as well" + (op1 = 3 and:[(instr bitAnd: 16r10) = 0]) ifTrue:[^true]. + "test for the ridiculously muddled 000 group" + op1 > 0 ifTrue:[^false]. + "bit 21 & 22 must not be 1" + (instr bitAnd: 3 <<21) = 0 ifFalse:[^false]. + "bits 4:7need to be 16rB for our purpose" + ^(instr bitAnd: 16rF0) = 16rB0 + + ! Item was changed: ----- Method: GdbARMAlien>>instructionIsSTR: (in category 'testing') ----- instructionIsSTR: instr "is this a STR instruction?" | foo | + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p. A8-382" + foo := (instr >> 20 bitAnd: 16rE5). + ^foo = 16r40 "str r1, [r2, #+/-imm]" + or:[foo = 16r60] "str r1, [r2, #-imm]"! - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [foo := (instr >> 20 bitAnd: 16rFF). foo = 16r58 "str r1, [r2, #imm]" or:[foo = 16r50 "str r1, [r2, #-imm]" or:[foo = 16r78 "str r1, [r2, r3]"]]]! Item was changed: ----- Method: GdbARMAlien>>instructionIsSTRB: (in category 'testing') ----- instructionIsSTRB: instr "is this a STRB instruction?" | foo | + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p. A8-388" + foo := (instr >> 20 bitAnd: 16rE5). + ^foo = 16r44 "strb r1, [r2, #+/-imm]" + or:[foo = 16r64] "strb r1, [r2, #-imm]"! - ^instr >> 28 < 16rF "test for allowed condcode - 0xF is extension" and: [foo := (instr >> 20 bitAnd: 16rFF). foo = 16r54 "strb r1, [r2, #imm]" or:[foo = 16r5c "strb r1, [r2, #-imm]" or:[foo = 16r7c "strb r1, [r2, r3]"]]]! Item was added: + ----- Method: GdbARMAlien>>instructionIsSTRH: (in category 'testing') ----- + instructionIsSTRH: instr + "is this a STRH instruction?" + | foo | + "first test for non-NV condition code; some important instructions use it" + instr >> 28 = 16rF ifTrue:[^false]. + "See ARM DDI0406A p. A8-154" + (instr bitAnd: 16rF0) = 16rB0 ifFalse:[^false]. + foo := (instr >> 20 bitAnd: 16rE3). + ^foo = 16r4 "strh r1, [r2, #+/-imm]" + or:[foo = 16r0 "strh r1, [r2, r3]"]!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2015