Vm-dev August 2015

vm-dev@lists.squeakfoundation.org

37 participants
78 discussions

[commit][3422] Make the SSL code' s delta variable const int to match the other platforms.
by commits＠squeakvm.org 12 Aug '15

12 Aug '15

Revision: 3422 Author: eliot Date: 2015-08-12 10:30:04 -0700 (Wed, 12 Aug 2015) Log Message: ----------- Make the SSL code's delta variable const int to match the other platforms. Modified Paths: -------------- trunk/platforms/win32/plugins/SqueakSSL/sqWin32SSL.c Modified: trunk/platforms/win32/plugins/SqueakSSL/sqWin32SSL.c =================================================================== --- trunk/platforms/win32/plugins/SqueakSSL/sqWin32SSL.c 2015-08-12 00:09:24 UTC (rev 3421) +++ trunk/platforms/win32/plugins/SqueakSSL/sqWin32SSL.c 2015-08-12 17:30:04 UTC (rev 3422) @@ -380,7 +380,8 @@ if(handleBuf[handle] == NULL) break; if(handle >= handleMax) { - int i, delta = 100; + const int delta = 100; + int i; /* Resize the handle buffer */ handleBuf = realloc(handleBuf, (handleMax+delta)*sizeof(void*)); for(i = handleMax; i < handleMax+delta; i++)

1 0

Re: [Pharo-dev] Binding a UDP Socket to a specific interface
by Levente Uzonyi 12 Aug '15

12 Aug '15

You might be interested in this one too: http://lists.squeakfoundation.org/pipermail/vm-dev/2014-December/017383.html Levente P.S.: This belongs to the vm-dev list, doesn't it? On Wed, 12 Aug 2015, Sven Van Caekenberghe wrote: > Today we spent some time figuring out how to bind a UDP Socket to a specific interface, as opposed to any or 0.0.0.0. This special case is needed when a server holds multiple IP addresses. If you do not bind to a specific one, you will of course still receive incoming datagrams on any interface, but when you answer you could use a different server source address than the one the client sent to in the first place. That might lead to trouble, as it did for us. > > We had to read through the (Linux) socket plugin code [1] to figure this out (and it might not work on other platforms). It turns out that Socket>>#primSocket: aHandle listenOn: portNumber backlogSize: backlog interface: ifAddr does not just work for TCP but also for UDP (we left backlog size to 1, it is not used). > > In code (on a private helper class): > > UDPListener>>#port: port bindingAddress: address > self socket: Socket newUDP. > self socket > primSocket: self socket socketHandle > listenOn: port > backlogSize: 1 > interface: address > > And yes, this is ugly. > > Sven > > [1] https://github.com/pharo-project/pharo-vm/blob/master/platforms/unix/plugin… > > >

1 0

VM Maker: VMMaker.oscog-tfel.1431.mcz
by commits＠source.squeak.org 12 Aug '15

12 Aug '15

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tfel.1431.mcz ==================== Summary ==================== Name: VMMaker.oscog-tfel.1431 Author: tfel Time: 12 August 2015, 9:03:42.197 am UUID: 5c3941c4-ec5d-5842-8d20-ff51dd53e5cd Ancestors: VMMaker.oscog-eem.1430 Merge from VMMaker-bak.364: simulate SNAPSHOT primitive (requires SystemTracer2 to be installed) =============== Diff against VMMaker.oscog-eem.1430 =============== Item was changed: ----- Method: SmalltalkImage>>simulatePrimitive:args: (in category '*VMMaker-Interpreter') ----- + simulatePrimitive: aPrimitive args: args + "simulate primitives in RSqueak" + "SNAPSHOT" + (aPrimitive = 97 or: [aPrimitive = 247]) + ifTrue: [ + Smalltalk at: #SystemTracer2 ifPresent: [:st | + |resuming| + Smalltalk processStartUpList: false. + [resuming := (st writeImage: Smalltalk imageName interactive: false) isStartingClone.] + on: FileExistsException + do: [ :e | e resume: (e fileClass forceNewFileNamed: e fileName)]. + Smalltalk processShutDownList: false. + ^resuming]]. + ^InterpreterProxy new primitiveFailFor: 255.! - simulatePrimitive: aPrimitive args: args - "simulate primitives in RSqueak" - "IMAGE_NAME" - aPrimitive = 121 - ifTrue: [^ self getSystemAttribute: 1]. - "SNAPSHOT" - aPrimitive = 97 - ifTrue: [Smalltalk - at: #SystemTracer2 - ifPresent: [:st | ^ st writeImage: Smalltalk imageName]]. - "SNAPSHOT_EMBEDDED" - aPrimitive = 247 - ifTrue: [Smalltalk - at: #SystemTracer2 - ifPresent: [:st | ^ st writeImage: Smalltalk imageName]]. - ^ InterpreterProxy new primitiveFailFor: 255 - !

1 0

VM Maker: VMMaker-bak.364.mcz
by commits＠source.squeak.org 12 Aug '15

12 Aug '15

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-bak.364.mcz ==================== Summary ==================== Name: VMMaker-bak.364 Author: bak Time: 5 August 2015, 3:47:17.348 pm UUID: 06b91ee8-1ea3-4d7e-a3a4-da0ef88d6e3c Ancestors: VMMaker-bak.363 simulate SNAPSHOT primitive in RSqueak (requires SystemTracer2 to be installed) =============== Diff against VMMaker-bak.363 =============== Item was changed: ----- Method: SmalltalkImage>>simulatePrimitive:args: (in category '*VMMaker-Interpreter') ----- + simulatePrimitive: aPrimitive args: args + "simulate primitives in RSqueak" + "SNAPSHOT" + (aPrimitive = 97 or: [aPrimitive = 247]) + ifTrue: [ + Smalltalk at: #SystemTracer2 ifPresent: [:st | + |resuming| + Smalltalk processStartUpList: false. + [resuming := (st writeImage: Smalltalk imageName interactive: false) isStartingClone.] + on: FileExistsException + do: [ :e | e resume: (e fileClass forceNewFileNamed: e fileName)]. + Smalltalk processShutDownList: false. + ^resuming]]. + ^InterpreterProxy new primitiveFailFor: 255.! - simulatePrimitive: aPrimitive args: args - "simulate primitives in RSqueak" - "IMAGE_NAME" - aPrimitive = 121 - ifTrue: [^ self getSystemAttribute: 1]. - "SNAPSHOT" - aPrimitive = 97 - ifTrue: [Smalltalk - at: #SystemTracer2 - ifPresent: [:st | ^ st writeImage: Smalltalk imageName]]. - "SNAPSHOT_EMBEDDED" - aPrimitive = 247 - ifTrue: [Smalltalk - at: #SystemTracer2 - ifPresent: [:st | ^ st writeImage: Smalltalk imageName]]. - ^ InterpreterProxy new primitiveFailFor: 255 - !

1 0

VM Maker: VMMaker-tfel.369.mcz
by commits＠source.squeak.org 12 Aug '15

12 Aug '15

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-tfel.369.mcz ==================== Summary ==================== Name: VMMaker-tfel.369 Author: tfel Time: 12 August 2015, 9:00:25.449 am UUID: 482d7a13-3747-1c4e-b384-021644885eb5 Ancestors: VMMaker-dtl.368, VMMaker-bak.364 simulate SNAPSHOT primitive in RSqueak (requires SystemTracer2 to be installed) =============== Diff against VMMaker-dtl.368 =============== Item was changed: ----- Method: SmalltalkImage>>simulatePrimitive:args: (in category '*VMMaker-Interpreter') ----- + simulatePrimitive: aPrimitive args: args + "simulate primitives in RSqueak" + "SNAPSHOT" + (aPrimitive = 97 or: [aPrimitive = 247]) + ifTrue: [ + Smalltalk at: #SystemTracer2 ifPresent: [:st | + |resuming| + Smalltalk processStartUpList: false. + [resuming := (st writeImage: Smalltalk imageName interactive: false) isStartingClone.] + on: FileExistsException + do: [ :e | e resume: (e fileClass forceNewFileNamed: e fileName)]. + Smalltalk processShutDownList: false. + ^resuming]]. + ^InterpreterProxy new primitiveFailFor: 255.! - simulatePrimitive: aPrimitive args: args - "simulate primitives in RSqueak" - "IMAGE_NAME" - aPrimitive = 121 - ifTrue: [^ self getSystemAttribute: 1]. - "SNAPSHOT" - aPrimitive = 97 - ifTrue: [Smalltalk - at: #SystemTracer2 - ifPresent: [:st | ^ st writeImage: Smalltalk imageName]]. - "SNAPSHOT_EMBEDDED" - aPrimitive = 247 - ifTrue: [Smalltalk - at: #SystemTracer2 - ifPresent: [:st | ^ st writeImage: Smalltalk imageName]]. - ^ InterpreterProxy new primitiveFailFor: 255 - !

1 0

[commit][3421] Add Squeak V5 sources
by commits＠squeakvm.org 12 Aug '15

12 Aug '15

Revision: 3421 Author: eliot Date: 2015-08-11 17:09:24 -0700 (Tue, 11 Aug 2015) Log Message: ----------- Add Squeak V5 sources Added Paths: ----------- branches/Cog/sources/SqueakV50.sources Added: branches/Cog/sources/SqueakV50.sources =================================================================== --- branches/Cog/sources/SqueakV50.sources (rev 0) +++ branches/Cog/sources/SqueakV50.sources 2015-08-12 00:09:24 UTC (rev 3421) @@ -0,0 +1,941973 @@ +'From Squeak5.0 of 20 July 2015 [latest update: #15110] on 20 July 2015 at 4:13:52 pm'! +Error subclass: #CRCError + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Compression-Streams'! + +!CRCError methodsFor: 'as yet unclassified' stamp: 'nk 3/7/2004 15:56'! +isResumable + ^true! ! +BorderedMorph subclass: #BorderedSubpaneDividerMorph + instanceVariableNames: 'resizingEdge' + classVariableNames: '' + poolDictionaries: '' + category: 'Morphic-Windows'! + +!BorderedSubpaneDividerMorph methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:24'! +firstEnter: evt + "The first time this divider is activated, find its window and redirect further interaction there." + | window | + + window := self firstOwnerSuchThat: [:m | m respondsTo: #secondaryPaneTransition:divider:]. + window ifNil: [ self suspendEventHandler. ^ self ]. "not working out" + window secondaryPaneTransition: evt divider: self. + self on: #mouseEnter send: #secondaryPaneTransition:divider: to: window. +! ! + +!BorderedSubpaneDividerMorph methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:24'! +horizontal + + self hResizing: #spaceFill.! ! + +!BorderedSubpaneDividerMorph methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:24'! +resizingEdge + + ^resizingEdge +! ! + +!BorderedSubpaneDividerMorph methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:24'! +resizingEdge: edgeSymbol + + (#(top bottom) includes: edgeSymbol) ifFalse: + [ self error: 'resizingEdge must be #top or #bottom' ]. + resizingEdge := edgeSymbol. + self on: #mouseEnter send: #firstEnter: to: self. +! ! + +!BorderedSubpaneDividerMorph methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:24'! +vertical + + self vResizing: #spaceFill.! ! + + +!BorderedSubpaneDividerMorph methodsFor: 'initialization' stamp: 'dgd 3/7/2003 14:09'! +defaultBorderWidth +"answer the default border width for the receiver" + ^ 0! ! + +!BorderedSubpaneDividerMorph methodsFor: 'initialization' stamp: 'dgd 3/7/2003 14:09'! +defaultColor +"answer the default color/fill style for the receiver" + ^ Color black! ! + +!BorderedSubpaneDividerMorph methodsFor: 'initialization' stamp: 'dgd 3/7/2003 14:09'! +initialize + "initialize the state of the receiver" + super initialize. +"" + self extent: 1 @ 1! ! + +"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "! + +BorderedSubpaneDividerMorph class + instanceVariableNames: ''! + +!BorderedSubpaneDividerMorph class methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:24'! +forBottomEdge + ^self new horizontal resizingEdge: #bottom! ! + +!BorderedSubpaneDividerMorph class methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:25'! +forTopEdge + ^self new horizontal resizingEdge: #top! ! + +!BorderedSubpaneDividerMorph class methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:25'! +horizontal + ^self new horizontal! ! + +!BorderedSubpaneDividerMorph class methodsFor: 'as yet unclassified' stamp: 'ar 8/15/2001 23:25'! +vertical + ^self new vertical! ! +Object subclass: #PostscriptDummyWarp + instanceVariableNames: 'canvas subCanvas transform' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicExtras-Postscript Canvases'! +!PostscriptDummyWarp commentStamp: '<historical>' prior: 0! +I simulate the effects of having a WarpBlit done in Postscript, by simply adjusting the coordinate system. +! + + +!PostscriptDummyWarp methodsFor: 'dummy'! +canvas + ^canvas +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'mpw 8/4/1930 09:19'! +canvas:newCanvas + canvas _ newCanvas. +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'mpw 8/4/1930 09:19' prior: 16780638! +canvas:newCanvas + canvas := newCanvas. +! ! + +!PostscriptDummyWarp methodsFor: 'dummy'! +cellSize:newCellSize + ^self.! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'mpw 8/4/1930 09:09'! +colorMap:aMap +! ! + +!PostscriptDummyWarp methodsFor: 'dummy'! +combinationRule:newRule + ^self.! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'mpw 8/4/1930 09:12'! +drawPostscriptContext:aCanvas + canvas drawPostscriptContext:aCanvas. + + +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'di 8/12/2000 10:01'! +preserveStateDuring: aBlock + + ^ canvas preserveStateDuring: + "Note block arg must be self so various things get overridden properly" + [:inner | aBlock value: self] + +! ! + +!PostscriptDummyWarp methodsFor: 'dummy'! +sourceForm:newForm + ^self.! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'mpw 8/4/1930 09:10'! +sourceQuad:aQuad destRect:aRect +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'mpw 8/10/1930 21:02'! +subCanvas:patchRect + subCanvas ifNil: + [ subCanvas _ PostscriptCanvas new reset setOrigin:patchRect topLeft clipRect:(-10000@-10000 extent:20000@20000)]. + ^subCanvas. + +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'mpw 8/10/1930 21:02' prior: 16781692! +subCanvas:patchRect + subCanvas ifNil: + [ subCanvas := PostscriptCanvas new reset setOrigin:patchRect topLeft clipRect:(-10000@-10000 extent:20000@20000)]. + ^subCanvas. + +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'nice 12/29/2010 14:58' prior: 16781953! +subCanvas:patchRect + subCanvas ifNil: + [ subCanvas := PostscriptCanvas new reset setOrigin:patchRect topLeft clipRect: (-10000 @ -10000 extent: 20000 @ 20000)]. + ^subCanvas. + +! ! + +!PostscriptDummyWarp methodsFor: 'dummy'! +transform + ^transform. +! ! + +!PostscriptDummyWarp methodsFor: 'dummy'! +transform:newTransform + transform _ newTransform. + ^self. +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' prior: 16782510! +transform:newTransform + transform := newTransform. + ^self. +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'mpw 8/4/1930 09:11'! +transformBy:aTransform + canvas transformBy:aTransform. + + +! ! + +!PostscriptDummyWarp methodsFor: 'dummy' stamp: 'di 8/12/2000 10:13'! +warpBits + canvas preserveStateDuring: + [:inner | + transform ifNotNil: [inner transformBy: transform]. + inner drawPostscriptContext:subCanvas]. +! ! + +"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "! + +PostscriptDummyWarp class + instanceVariableNames: ''! + +!PostscriptDummyWarp class methodsFor: 'as yet unclassified' stamp: 'mpw 8/4/1930 09:18'! +canvas:aCanvas + ^self new canvas:aCanvas.! ! +SimpleButtonMorph subclass: #SimpleSwitchMorph + instanceVariableNames: 'onColor offColor' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicExtras-Widgets'! +!SimpleSwitchMorph commentStamp: 'apb 5/3/2006 16:04' prior: 0! +I represent a switch that can be either on or off. I chnage my state in response to a mouse click. When clicked, I also send my actionSelector to my target, just like a SimpleButtonMorph.! + + +!SimpleSwitchMorph methodsFor: 'button' stamp: 'dgd 2/22/2003 18:40'! +doButtonAction + "Perform the action of this button. The last argument of the message sent to the target is the new state of this switch." + + | newState | + (target notNil and: [actionSelector notNil]) + ifTrue: + [newState := color = onColor. + target perform: actionSelector + withArguments: (arguments copyWith: newState)]! ! + + +!SimpleSwitchMorph methodsFor: 'copying' stamp: 'jm 1/29/98 16:15'! +updateReferencesUsing: aDictionary + "Copy and update references in the arguments array during copying." + + super updateReferencesUsing: aDictionary. + arguments _ arguments collect: + [:old | aDictionary at: old ifAbsent: [old]]. +! ! + +!SimpleSwitchMorph methodsFor: 'copying' stamp: 'jm 1/29/98 16:15' prior: 16784199! +updateReferencesUsing: aDictionary + "Copy and update references in the arguments array during copying." + + super updateReferencesUsing: aDictionary. + arguments := arguments collect: + [:old | aDictionary at: old ifAbsent: [old]]. +! ! + + +!SimpleSwitchMorph methodsFor: 'event handling' stamp: 'ar 6/4/2001 00:39'! +mouseDown: evt + + oldColor _ self fillStyle.! ! + +!SimpleSwitchMorph methodsFor: 'event handling' stamp: 'ar 6/4/2001 00:39' prior: 16784827! +mouseDown: evt + + oldColor := self fillStyle.! ! + +!SimpleSwitchMorph methodsFor: 'event handling' stamp: 'jm 1/30/98 13:55'! +mouseMove: evt + + (self containsPoint: evt cursorPoint) + ifTrue: [self setSwitchState: (oldColor = offColor)] + ifFalse: [self setSwitchState: (oldColor = onColor)]. +! ! + +!SimpleSwitchMorph methodsFor: 'event handling' stamp: 'jm 1/30/98 13:58'! +mouseUp: evt + + (self containsPoint: evt cursorPoint) + ifTrue: [ "toggle and do action" + self setSwitchState: (oldColor = offColor). + self doButtonAction] + ifFalse: [ "restore old appearance" + self setSwitchState: (oldColor = onColor)]. +! ! + + +!SimpleSwitchMorph methodsFor: 'initialization' stamp: 'di 6/5/2000 08:44'! +initialize + + ^ self initializeWithLabel: 'Toggle' +! ! + +!SimpleSwitchMorph methodsFor: 'initialization' stamp: 'apb 5/3/2006 15:51'! +initializeWithLabel: labelString + + super initializeWithLabel: labelString. + self borderWidth: 3. + self extent: self extent + 2. + onColor := Color r: 1.0 g: 0.6 b: 0.6. + offColor := Color lightGray. + color := offColor +! ! + + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'apb 5/3/2006 15:45'! +isOff + ^ color ~= onColor! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'apb 5/3/2006 15:45'! +isOn + ^ color = onColor! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'jm 1/29/98 20:18'! +offColor + + ^ offColor +! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'jm 1/29/98 20:18'! +offColor: aColor + + offColor _ aColor. +! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'jm 1/29/98 20:18' prior: 16786389! +offColor: aColor + + offColor := aColor. +! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'jm 1/29/98 20:18'! +onColor + + ^ onColor +! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'jm 1/29/98 20:18'! +onColor: aColor + + onColor _ aColor. +! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'jm 1/29/98 20:18' prior: 16786727! +onColor: aColor + + onColor := aColor. +! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'apb 5/3/2006 15:46'! +setSwitchState: aBoolean + + aBoolean + ifTrue: [self turnOn] + ifFalse: [self turnOff]. +! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'apb 5/3/2006 16:11'! +toggleState + self isOn + ifTrue: [self turnOff] + ifFalse: [self turnOn]! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'apb 5/3/2006 15:44'! +turnOff + self borderColor: #raised. + self color: offColor! ! + +!SimpleSwitchMorph methodsFor: 'switching' stamp: 'apb 5/3/2006 15:44'! +turnOn + self borderColor: #inset. + self color: onColor! ! +Object subclass: #UPolicyResponse + instanceVariableNames: 'allowed reason' + classVariableNames: '' + poolDictionaries: '' + category: 'Universes-Policy'! +!UPolicyResponse commentStamp: '<historical>' prior: 0! +A response to a policy query.! + + +!UPolicyResponse methodsFor: 'accessing' stamp: 'ls 7/29/2004 17:56'! +allowed + ^allowed! ! + +!UPolicyResponse methodsFor: 'accessing' stamp: 'ls 7/29/2004 17:56'! +allowed: anObject + allowed _ anObject! ! + +!UPolicyResponse methodsFor: 'accessing' stamp: 'ls 7/29/2004 17:56' prior: 16787876! +allowed: anObject + allowed := anObject! ! + +!UPolicyResponse methodsFor: 'accessing' stamp: 'ls 7/29/2004 17:58'! +reason + ^reason! ! + +!UPolicyResponse methodsFor: 'accessing' stamp: 'ls 7/29/2004 17:56'! +reason: anObject + reason _ anObject! ! + +!UPolicyResponse methodsFor: 'accessing' stamp: 'ls 7/29/2004 17:56' prior: 16788207! +reason: anObject + reason := anObject! ! + +"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "! + +UPolicyResponse class + instanceVariableNames: ''! + +!UPolicyResponse class methodsFor: 'instance creation' stamp: 'ls 7/29/2004 16:47'! +allowed + ^self allowed: nil! ! + +!UPolicyResponse class methodsFor: 'instance creation' stamp: 'ls 7/30/2004 10:34'! +allowed: reason + ^self allowed: true reason: reason! ! + +!UPolicyResponse class methodsFor: 'instance creation' stamp: 'ls 7/29/2004 16:46'! +allowed: aBoolean reason: aReason + ^self basicNew + allowed: aBoolean; + reason: (aReason ifNil: ['no reason given']); + yourself! ! + +!UPolicyResponse class methodsFor: 'instance creation' stamp: 'ls 7/29/2004 16:46'! +denied + ^self denied: nil! ! + +!UPolicyResponse class methodsFor: 'instance creation' stamp: 'ls 7/29/2004 17:58'! +denied: reason + ^self allowed: false reason: reason! ! + +!UPolicyResponse class methodsFor: 'instance creation' stamp: 'ls 7/29/2004 16:47'! +new + self shouldNotImplement ! ! +Object subclass: #HTTPClient + instanceVariableNames: '' + classVariableNames: 'BrowserSupportsAPI RunningInBrowser' + poolDictionaries: '' + category: 'System-Support'! + +"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "! + +HTTPClient class + instanceVariableNames: ''! + +!HTTPClient class methodsFor: 'class initialization' stamp: 'mir 4/2/2002 15:37'! +browserSupportsAPI + ^BrowserSupportsAPI == true! ! + +!HTTPClient class methodsFor: 'class initialization' stamp: 'mir 4/2/2002 15:37' prior: 16789686! +browserSupportsAPI + ^BrowserSupportsAPI == true! ! + +!HTTPClient class methodsFor: 'class initialization' stamp: 'mir 4/2/2002 15:36'! +browserSupportsAPI: aBoolean + BrowserSupportsAPI _ aBoolean! ! + +!HTTPClient class methodsFor: 'class initialization' stamp: 'mir 4/2/2002 15:36' prior: 16789970! +browserSupportsAPI: aBoolean + BrowserSupportsAPI := aBoolean! ! + +!HTTPClient class methodsFor: 'class initialization' stamp: 'mir 4/2/2002 15:36' prior: 16790132! +browserSupportsAPI: aBoolean + BrowserSupportsAPI := aBoolean! ! + +!HTTPClient class methodsFor: 'class initialization' stamp: 'mir 2/2/2001 17:27'! +determineIfRunningInBrowser + "HTTPClient determineIfRunningInBrowser" + + RunningInBrowser _ StandardFileStream isRunningAsBrowserPlugin +! ! + +!HTTPClient class methodsFor: 'class initialization' stamp: 'mir 2/2/2001 17:27' prior: 16790442! +determineIfRunningInBrowser + "HTTPClient determineIfRunningInBrowser" + + RunningInBrowser := StandardFileStream isRunningAsBrowserPlugin +! ! + +!HTTPClient class methodsFor: 'class initialization' stamp: 'mir 2/2/2001 17:27' prior: 16790680! +determineIfRunningInBrowser + "HTTPClient determineIfRunningInBrowser" + + RunningInBrowser := StandardFileStream isRunningAsBrowserPlugin +! ! + + +!HTTPClient class methodsFor: 'examples' stamp: 'mir 2/2/2001 17:43'! +exampleMailTo + "HTTPClient exampleMailTo" + + HTTPClient mailTo: 'm.rueger(a)acm.org' message: 'A test message from within Squeak' +! ! + +!HTTPClient class methodsFor: 'examples' stamp: 'mir 2/2/2001 17:43' prior: 16791131! +exampleMailTo + "HTTPClient exampleMailTo" + + HTTPClient mailTo: 'm.rueger(a)acm.org' message: 'A test message from within Squeak' +! ! + +!HTTPClient class methodsFor: 'examples' stamp: 'md 7/28/2005 10:33'! +examplePostArgs + "HTTPClient examplePostArgs" + + | args result | + args := Dictionary new. + args + at: 'arg1' put: #('val1'); + at: 'arg2' put: #('val2'); + yourself. + result := HTTPClient httpPostDocument: 'http://www.squeaklet.com/cgi-bin/thrd.pl [^]' args: args. + Transcript show: result content; cr; cr. + +! ! + +!HTTPClient class methodsFor: 'examples' stamp: 'ul 1/11/2010 07:17' prior: 16791551! +examplePostArgs + "HTTPClient examplePostArgs" + + | args result | + args := Dictionary new + at: 'arg1' put: #('val1'); + at: 'arg2' put: #('val2'); + yourself. + result := HTTPClient httpPostDocument: 'http://www.squeaklet.com/cgi-bin/thrd.pl [^]' args: args. + Transcript show: result content; cr; cr. + +! ! + +!HTTPClient class methodsFor: 'examples' stamp: 'ul 1/11/2010 07:17' prior: 16791949! +examplePostArgs + "HTTPClient examplePostArgs" + + | args result | + args := Dictionary new + at: 'arg1' put: #('val1'); + at: 'arg2' put: #('val2'); + yourself. + result := HTTPClient httpPostDocument: 'http://www.squeaklet.com/cgi-bin/thrd.pl [^]' args: args. + Transcript show: result content; cr; cr. + +! ! + +!HTTPClient class methodsFor: 'examples' stamp: 'mir 2/2/2001 17:44'! +examplePostMultipart + "HTTPClient examplePostMultipart" + + | args result | + args _ Dictionary new. + args + at: 'arg1' put: #('val1'); + at: 'arg2' put: #('val2'); + yourself. + result _ HTTPClient httpPostMultipart: 'http://www.squeaklet.com/cgi-bin/thrd.pl' args: args. + Transcript show: result content; cr; cr. + +! ! + +!HTTPClient class methodsFor: 'examples' stamp: 'ul 1/11/2010 07:17' prior: 16792715! +examplePostMultipart + "HTTPClient examplePostMultipart" + + | args result | + args := Dictionary new + at: 'arg1' put: #('val1'); + at: 'arg2' put: #('val2'); + yourself. + result := HTTPClient httpPostMultipart: 'http://www.squeaklet.com/cgi-bin/thrd.pl' args: args. + Transcript show: result content; cr; cr. + +! ! + +!HTTPClient class methodsFor: 'examples' stamp: 'ul 1/11/2010 07:17' prior: 16793119! +examplePostMultipart + "HTTPClient examplePostMultipart" + + | args result | + args := Dictionary new + at: 'arg1' put: #('val1'); + at: 'arg2' put: #('val2'); + yourself. + result := HTTPClient httpPostMultipart: 'http://www.squeaklet.com/cgi-bin/thrd.pl' args: args. + Transcript show: result content; cr; cr. + +! ! + + +!HTTPClient class methodsFor: 'post/get' stamp: 'nk 8/30/2004 07:50'! +httpGet: url + | document | + document _ self httpGetDocument: url. + ^(document isString) + ifTrue: [ + "strings indicate errors" + document] + ifFalse: [(RWBinaryOrTextStream with: document content) reset]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'nk 8/30/2004 07:50' prior: 16793902! +httpGet: url + | document | + document := self httpGetDocument: url. + ^(document isString) + ifTrue: [ + "strings indicate errors" + document] + ifFalse: [(RWBinaryOrTextStream with: document content) reset]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'nk 8/30/2004 07:50' prior: 16794199! +httpGet: url + | document | + document := self httpGetDocument: url. + ^(document isString) + ifTrue: [ + "strings indicate errors" + document] + ifFalse: [(RWBinaryOrTextStream with: document content) reset]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/11/2001 12:55'! +httpGetDocument: url + | stream content | + ^self shouldUsePluginAPI + ifTrue: [ + stream _ FileStream requestURLStream: url ifError: [self error: 'Error in get from ' , url printString]. + stream ifNil: [^'']. + stream position: 0. + content _ stream upToEnd. + stream close. + MIMEDocument content: content] + ifFalse: [HTTPSocket httpGetDocument: url]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/11/2001 12:55' prior: 16794780! +httpGetDocument: url + | stream content | + ^self shouldUsePluginAPI + ifTrue: [ + stream := FileStream requestURLStream: url ifError: [self error: 'Error in get from ' , url printString]. + stream ifNil: [^'']. + stream position: 0. + content := stream upToEnd. + stream close. + MIMEDocument content: content] + ifFalse: [HTTPSocket httpGetDocument: url]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/11/2001 12:55' prior: 16795231! +httpGetDocument: url + | stream content | + ^self shouldUsePluginAPI + ifTrue: [ + stream := FileStream requestURLStream: url ifError: [self error: 'Error in get from ' , url printString]. + stream ifNil: [^'']. + stream position: 0. + content := stream upToEnd. + stream close. + MIMEDocument content: content] + ifFalse: [HTTPSocket httpGetDocument: url]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/1/2001 15:04'! +httpPostDocument: url args: argsDict + ^self httpPostDocument: url target: nil args: argsDict! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/1/2001 15:04' prior: 16796120! +httpPostDocument: url args: argsDict + ^self httpPostDocument: url target: nil args: argsDict! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/1/2001 15:06'! +httpPostDocument: url target: target args: argsDict + | argString stream content | + ^self shouldUsePluginAPI + ifTrue: [ + argString _ argsDict + ifNotNil: [argString _ HTTPSocket argString: argsDict] + ifNil: ['']. + stream _ FileStream post: argString , ' ' target: target url: url , argString ifError: [self error: 'Error in post to ' , url printString]. + stream position: 0. + content _ stream upToEnd. + stream close. + MIMEDocument content: content] + ifFalse: [HTTPSocket httpPostDocument: url args: argsDict]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/1/2001 15:06' prior: 16796470! +httpPostDocument: url target: target args: argsDict + | argString stream content | + ^self shouldUsePluginAPI + ifTrue: [ + argString := argsDict + ifNotNil: [argString := HTTPSocket argString: argsDict] + ifNil: ['']. + stream := FileStream post: argString , ' ' target: target url: url , argString ifError: [self error: 'Error in post to ' , url printString]. + stream position: 0. + content := stream upToEnd. + stream close. + MIMEDocument content: content] + ifFalse: [HTTPSocket httpPostDocument: url args: argsDict]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/1/2001 15:06' prior: 16797088! +httpPostDocument: url target: target args: argsDict + | argString stream content | + ^self shouldUsePluginAPI + ifTrue: [ + argString := argsDict + ifNotNil: [argString := HTTPSocket argString: argsDict] + ifNil: ['']. + stream := FileStream post: argString , ' ' target: target url: url , argString ifError: [self error: 'Error in post to ' , url printString]. + stream position: 0. + content := stream upToEnd. + stream close. + MIMEDocument content: content] + ifFalse: [HTTPSocket httpPostDocument: url args: argsDict]! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/1/2001 12:51'! +httpPostMultipart: url args: argsDict + " do multipart/form-data encoding rather than x-www-urlencoded " + + ^self shouldUsePluginAPI + ifTrue: [self pluginHttpPostMultipart: url args: argsDict] + ifFalse: [HTTPSocket httpPostMultipart: url args: argsDict accept: nil request: '']! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 5/1/2001 12:51' prior: 16798316! +httpPostMultipart: url args: argsDict + " do multipart/form-data encoding rather than x-www-urlencoded " + + ^self shouldUsePluginAPI + ifTrue: [self pluginHttpPostMultipart: url args: argsDict] + ifFalse: [HTTPSocket httpPostMultipart: url args: argsDict accept: nil request: '']! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 4/2/2002 15:52'! +requestURL: url target: target + ^self shouldUsePluginAPI + ifTrue: [FileStream requestURL: url target: target] + ifFalse: [self error: 'Requesting a new URL target is not supported.']! ! + +!HTTPClient class methodsFor: 'post/get' stamp: 'mir 4/2/2002 15:52' prior: 16799036! +requestURL: url target: target + ^self shouldUsePluginAPI + ifTrue: [FileStream requestURL: url target: target] + ifFalse: [self error: 'Requesting a new URL target is not supported.']! ! + + +!HTTPClient class methodsFor: 'testing' stamp: 'ccn 3/14/2001 19:56'! +isRunningInBrowser + + RunningInBrowser isNil + ifTrue: [self determineIfRunningInBrowser]. + ^RunningInBrowser! ! + +!HTTPClient class methodsFor: 'testing' stamp: 'ccn 3/14/2001 19:56' prior: 16799569! +isRunningInBrowser + + RunningInBrowser isNil + ifTrue: [self determineIfRunningInBrowser]. + ^RunningInBrowser! ! + +!HTTPClient class methodsFor: 'testing' stamp: 'mir 8/4/2003 13:44'! +isRunningInBrowser: aBoolean + "Override the automatic process. + This should be used with caution. + One way to determine it without using the primitive is to check for parameters typically only encountered when running as a plugin." + @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3420] CogVM source as per VMMaker.oscog-eem.1430
by commits＠squeakvm.org 11 Aug '15

11 Aug '15

Revision: 3420 Author: eliot Date: 2015-08-11 12:42:12 -0700 (Tue, 11 Aug 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1430 Get the fix for Integer receiver, float arg comparison right. Fix some C compilation warnings. Fix C99 code in SqueakSSL plugin (restrict keyword and for statement local iteration variable declaration) to compile under C89 as well. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.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/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.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/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9893,7 +9893,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -10869,12 +10869,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -20973,7 +20973,7 @@ /* begin JumpFullRT: */ /* begin JumpFull: */ /* begin gen:literal: */ - checkLiteralforInstruction(((sqInt)primitiveRoutine), genoperand(JumpFull, ((sqInt)primitiveRoutine))); + checkLiteralforInstruction(((sqInt)(((sqInt)primitiveRoutine))), genoperand(JumpFull, ((sqInt)(((sqInt)primitiveRoutine))))); /* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -22126,14 +22126,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); } /* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); } /* SimpleStackBasedCogit>>#genPrimitiveNotEqual */ Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -20135,6 +20135,8 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; void *jumpTarget; + sqInt literal; + sqInt literal1; sqInt offset; sqInt offset1; sqInt offset2; @@ -20264,7 +20266,8 @@ jumpTarget = ((void *) (((sqInt)primitiveRoutine))); /* begin gen:literal: */ /* begin checkLiteral:forInstruction: */ - anInstruction11 = genoperand(JumpFull, jumpTarget); + literal = ((sqInt)jumpTarget); + anInstruction11 = genoperand(JumpFull, ((sqInt)jumpTarget)); abstractInstruction = anInstruction11; (abstractInstruction->annotation = IsRelativeCall); abstractInstruction; @@ -21557,14 +21560,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); } /* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); } /* SimpleStackBasedCogit>>#genPrimitiveNotEqual */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2411,7 +2411,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.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1430"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -60414,7 +60414,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -65201,7 +65201,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65305,7 +65305,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -75535,7 +75535,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2414,7 +2414,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.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1430"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -60423,7 +60423,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -65210,7 +65210,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65314,7 +65314,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -75544,7 +75544,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2173,7 +2173,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1430"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -66741,7 +66741,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspurstack64src/vm/interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2170,7 +2170,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1430"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -66732,7 +66732,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2144,7 +2144,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1430"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -62097,7 +62097,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2141,7 +2141,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1430"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -62088,7 +62088,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Aug 10 10:46:42 PDT 2015 + Tue Aug 11 12:41:02 PDT 2015 Modified: branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -288,13 +288,13 @@ } if (handle >= handleMax) { - int delta = 100; + const int delta = 100; + int i; /* Resize the handle buffer */ handleBuf = (sqSSL**)realloc(handleBuf, (handleMax + delta) * sizeof(sqSSL*)); - for (int i = handleMax; i < handleMax + delta; i++) { + for (i = handleMax; i < handleMax + delta; i++) handleBuf[i] = NULL; - } handleMax += delta; } handleBuf[handle] = ssl; Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -266,7 +266,7 @@ regs->__eax, regs->__ebx, regs->__ecx, regs->__edx, regs->__edi, regs->__edi, regs->__ebp, regs->__esp, regs->__eip); - return regs->__eip; + return (void *)(regs->__eip); #elif __APPLE__ && __MACH__ && __i386__ _STRUCT_X86_THREAD_STATE32 *regs = &uap->uc_mcontext->ss; printf( "\teax 0x%08x ebx 0x%08x ecx 0x%08x edx 0x%08x\n" @@ -275,7 +275,7 @@ regs->eax, regs->ebx, regs->ecx, regs->edx, regs->edi, regs->edi, regs->ebp, regs->esp, regs->eip); - return regs->eip; + return (void *)(regs->eip); #else printf("don't know how to derive register state from a ucontext_t on this platform\n"); return 0; Modified: branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -116,6 +116,17 @@ void CopyCStringToPascal(const char* src, Str255 dst); #endif + +/* C99 vs C89 restrict or not */ +#if __STDC_VERSION__ < 199901L +# if __GNUC__ +# define restrict __restrict +# else +# define restrict /*nada*/ +# endif +#endif + + /* Macro for inlined functions. As of 1.7, clang elides the original, even though global. gcc & icc don't elide the original Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10736,12 +10736,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -20063,7 +20063,7 @@ /* begin JumpFullRT: */ /* begin JumpFull: */ /* begin gen:literal: */ - checkLiteralforInstruction(((sqInt)primitiveRoutine), genoperand(JumpFull, ((sqInt)primitiveRoutine))); + checkLiteralforInstruction(((sqInt)(((sqInt)primitiveRoutine))), genoperand(JumpFull, ((sqInt)(((sqInt)primitiveRoutine))))); /* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -21108,14 +21108,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); } /* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); } /* SimpleStackBasedCogit>>#genPrimitiveNotEqual */ Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -19080,6 +19080,8 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; void *jumpTarget; + sqInt literal; + sqInt literal1; sqInt offset; sqInt offset1; sqInt offset2; @@ -19209,7 +19211,8 @@ jumpTarget = ((void *) (((sqInt)primitiveRoutine))); /* begin gen:literal: */ /* begin checkLiteral:forInstruction: */ - anInstruction11 = genoperand(JumpFull, jumpTarget); + literal = ((sqInt)jumpTarget); + anInstruction11 = genoperand(JumpFull, ((sqInt)jumpTarget)); abstractInstruction = anInstruction11; (abstractInstruction->annotation = IsRelativeCall); abstractInstruction; @@ -20390,14 +20393,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); } /* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); } /* SimpleStackBasedCogit>>#genPrimitiveNotEqual */ Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2385,7 +2385,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1430]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -63766,7 +63766,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -64086,7 +64086,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -73046,7 +73046,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cointerp.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2388,7 +2388,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1430]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -63775,7 +63775,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -64095,7 +64095,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -73055,7 +73055,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cogit.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ Modified: branches/Cog/spursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursrc/vm/cogitARMv5.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9438,7 +9438,7 @@ { sqInt classIndex; sqInt i; - usqInt pc; + sqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -19368,7 +19368,7 @@ /* begin JumpFullRT: */ /* begin JumpFull: */ /* begin gen:literal: */ - checkLiteralforInstruction(((sqInt)primitiveRoutine), genoperand(JumpFull, ((sqInt)primitiveRoutine))); + checkLiteralforInstruction(((sqInt)(((sqInt)primitiveRoutine))), genoperand(JumpFull, ((sqInt)(((sqInt)primitiveRoutine))))); /* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -20096,14 +20096,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); } /* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); } /* SimpleStackBasedCogit>>#genPrimitiveNotEqual */ Modified: branches/Cog/spursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursrc/vm/cogitIA32.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cogitIA32.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9495,12 +9495,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -18351,6 +18351,8 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; void *jumpTarget; + sqInt literal; + sqInt literal1; sqInt offset; sqInt offset1; sqInt offset2; @@ -18480,7 +18482,8 @@ jumpTarget = ((void *) (((sqInt)primitiveRoutine))); /* begin gen:literal: */ /* begin checkLiteral:forInstruction: */ - anInstruction11 = genoperand(JumpFull, jumpTarget); + literal = ((sqInt)jumpTarget); + anInstruction11 = genoperand(JumpFull, ((sqInt)jumpTarget)); abstractInstruction = anInstruction11; (abstractInstruction->annotation = IsRelativeCall); abstractInstruction; @@ -19348,14 +19351,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); } /* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); } /* SimpleStackBasedCogit>>#genPrimitiveNotEqual */ Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2372,7 +2372,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1430]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -53903,7 +53903,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -58775,7 +58775,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -58991,7 +58991,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -67924,7 +67924,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cointerp.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2375,7 +2375,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1430]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -53912,7 +53912,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -58784,7 +58784,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -59000,7 +59000,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -67933,7 +67933,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2137,7 +2137,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1430]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -60299,7 +60299,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/spurstack64src/vm/interp.c =================================================================== --- branches/Cog/spurstack64src/vm/interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spurstack64src/vm/interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2134,7 +2134,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1430]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -60290,7 +60290,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2108,7 +2108,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1430]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -55958,7 +55958,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spurstacksrc/vm/interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2105,7 +2105,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1430]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -55949,7 +55949,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */ Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/src/vm/cogit.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ Modified: branches/Cog/src/vm/cogitARMv5.c =================================================================== --- branches/Cog/src/vm/cogitARMv5.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/src/vm/cogitARMv5.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -17366,7 +17366,7 @@ /* begin JumpFullRT: */ /* begin JumpFull: */ /* begin gen:literal: */ - checkLiteralforInstruction(((sqInt)primitiveRoutine), genoperand(JumpFull, ((sqInt)primitiveRoutine))); + checkLiteralforInstruction(((sqInt)(((sqInt)primitiveRoutine))), genoperand(JumpFull, ((sqInt)(((sqInt)primitiveRoutine))))); /* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -18105,14 +18105,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); } /* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); } /* SimpleStackBasedCogit>>#genPrimitiveNotEqual */ Modified: branches/Cog/src/vm/cogitIA32.c =================================================================== --- branches/Cog/src/vm/cogitIA32.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/src/vm/cogitIA32.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9290,12 +9290,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -16020,6 +16020,8 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; void *jumpTarget; + sqInt literal; + sqInt literal1; sqInt offset; sqInt offset1; sqInt offset2; @@ -16149,7 +16151,8 @@ jumpTarget = ((void *) (((sqInt)primitiveRoutine))); /* begin gen:literal: */ /* begin checkLiteral:forInstruction: */ - anInstruction11 = genoperand(JumpFull, jumpTarget); + literal = ((sqInt)jumpTarget); + anInstruction11 = genoperand(JumpFull, ((sqInt)jumpTarget)); abstractInstruction = anInstruction11; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1430.mcz
by commits＠source.squeak.org 11 Aug '15

11 Aug '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1430.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1430 Author: eem Time: 11 August 2015, 12:17:13.928 pm UUID: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 Ancestors: VMMaker.oscog-eem.1429 Get the fix for Integer receiver, float arg comparison right. Fix some C compilation warnings. Size a dictinary in Slang appropriately. =============== Diff against VMMaker.oscog-eem.1429 =============== Item was changed: ----- Method: Cogit>>JumpFull: (in category 'abstract instructions') ----- JumpFull: jumpTarget <inline: true> <returnTypeC: #'AbstractInstruction *'> + ^self gen: JumpFull literal: jumpTarget asInteger! - ^self gen: JumpFull literal: jumpTarget! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveLessOrEqual (in category 'primitive generators') ----- genPrimitiveLessOrEqual ^self genSmallIntegerComparison: JumpLessOrEqual + orDoubleComparison: #JumpFPGreaterOrEqual: - orDoubleComparison: #JumpFPGreater: invert: true! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveLessThan (in category 'primitive generators') ----- genPrimitiveLessThan ^self genSmallIntegerComparison: JumpLess + orDoubleComparison: #JumpFPGreater: - orDoubleComparison: #JumpFPGreaterOrEqual: invert: true! Item was changed: ----- Method: StackInterpreter>>printStackPage: (in category 'debug printing') ----- printStackPage: page <inline: true> + <var: #page type: #'StackPage *'> self printStackPage: page useCount: -1! Item was changed: ----- Method: TMethod>>argAssignmentsFor:send:in: (in category 'inlining') ----- argAssignmentsFor: meth send: aSendNode in: aCodeGen "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." | stmtList substitutionDict argList | meth args size > (argList := aSendNode args) size ifTrue: [self assert: (meth args first beginsWith: 'self_in_'). argList := {aSendNode receiver}, aSendNode args]. stmtList := OrderedCollection new: argList size. + substitutionDict := Dictionary new: argList size. - substitutionDict := Dictionary new: 100. meth args with: argList do: [ :argName :exprNode | (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) ifTrue: [substitutionDict at: argName put: (aCodeGen node: exprNode typeCompatibleWith: argName inliningInto: meth selector in: self). locals remove: argName] ifFalse: [stmtList addLast: (TAssignmentNode new setVariable: (TVariableNode new setName: argName) expression: (aCodeGen node: exprNode copy typeCompatibleWith: argName inliningInto: meth selector in: self))]]. meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). ^stmtList!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.1429.mcz
by Nicolas Cellier 11 Aug '15

11 Aug '15

2015-08-07 20:47 GMT+02:00 <commits(a)source.squeak.org>: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1429.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.1429 > Author: eem > Time: 7 August 2015, 11:46:05.819 am > UUID: 446c2481-93c9-43bc-86ac-0743223bfa0c > Ancestors: VMMaker.oscog-rmacnak.1428 > > Fix Integer receiver, float arg comparison with NaNs in the machine-code > primitive. This has started failing in the FloatTest>>testNaNCompare since > the new machine-code perform primitive invoked the machine-code version of > the primitive. The Interpretewr code has always been correct and the old > perform primitive would always run the Interpreter primitive if it exsted, > since this would probably be faster. > > Luckily the ARM requires no changes. It can continue to use FCMP instead > of FCMPE. Include a generator for the FCMPE instruction; it got written to > experiment and does no harm remaining there unused. > > Refactor stack page list printing to include use counts. > > Simulator: > Simplify and clean-up directory entry call. > > =============== Diff against VMMaker.oscog-rmacnak.1428 =============== > > Item was added: > + ----- Method: CogARMCompiler>>fcmpeFrom:to: (in category 'ARM > convenience instructions') ----- > + fcmpeFrom: regA to: regB > + "FCMPE or VCMPE instruction to compare two fpu double registers. > + ARM_ARM v5 DDI 01001.pdf pp. C4-12" > + <inline: true> > + ^(2r11101110101101000000101111000000 bitOr: (regA <<12)) bitOr: > regB! > > Item was changed: > ----- Method: CogVMSimulator>>primitiveDirectoryEntry (in category 'file > primitives') ----- > primitiveDirectoryEntry > | name pathName array result | > name := self stringOf: self stackTop. > pathName := self stringOf: (self stackValue: 1). > > self successful ifFalse: > [^self primitiveFail]. > > array := FileDirectory default primLookupEntryIn: pathName name: > name. > array == nil ifTrue: > [self pop: 3 thenPush: objectMemory nilObject. > ^array]. > array == #badDirectoryPath ifTrue: > [self halt. > ^self primitiveFail]. > > PharoVM > ifTrue: [ > result := self makeDirEntryName: (array at: 1) > size: (array at: 1) size > createDate: (array at: 2) modDate: (array > at: 3) > isDir: (array at: 4) fileSize: (array at: > 5) > posixPermissions: (array at: 6) isSymlink: > (array at: 7) ] > ifFalse: [ > result := self makeDirEntryName: (array at: 1) > size: (array at: 1) size > createDate: (array at: 2) modDate: (array > at: 3) > isDir: (array at: 4) fileSize: (array at: > 5) ]. > + self pop: 3 thenPush: result! > - self pop: 3. > - self push: result! > > Item was removed: > - ----- Method: > InterpreterSimulator>>makeDirEntryName:size:createDate:modDate:isDir:fileSize:posixPermissions: > (in category 'file primitives') ----- > - makeDirEntryName: entryName size: entryNameSize createDate: createDate > modDate: modifiedDate isDir: dirFlag fileSize: posixPermissions > posixPermissions: fileSize > - <option: #PharoVM> > - <var: 'entryName' type: 'char *'> > - > - | modDateOop createDateOop nameString results | > - > - "allocate storage for results, remapping newly allocated > - oops in case GC happens during allocation" > - self pushRemappableOop: > - (self instantiateClass: (self splObj: ClassArray) > indexableSize: 5). > - self pushRemappableOop: > - (self instantiateClass: (self splObj: ClassString) > indexableSize: entryNameSize).. > - self pushRemappableOop: (self positive32BitIntegerFor: createDate). > - self pushRemappableOop: (self positive32BitIntegerFor: > modifiedDate). > - > - modDateOop := self popRemappableOop. > - createDateOop := self popRemappableOop. > - nameString := self popRemappableOop. > - results := self popRemappableOop. > - > - 1 to: entryNameSize do: [ :i | > - self storeByte: i-1 ofObject: nameString withValue: > (entryName at: i) asciiValue. > - ]. > - > - self storePointer: 0 ofObject: results withValue: nameString. > - self storePointer: 1 ofObject: results withValue: createDateOop. > - self storePointer: 2 ofObject: results withValue: modDateOop. > - dirFlag > - ifTrue: [ self storePointer: 3 ofObject: results > withValue: trueObj ] > - ifFalse: [ self storePointer: 3 ofObject: results > withValue: falseObj ]. > - self storePointer: 4 > - ofObject: results > - withValue: (self integerObjectOf: fileSize). > - self storePointer: 5 > - ofObject: results > - withValue: (self integerObjectOf: posixPermissions). > - > - ^ results > - ! > > Item was changed: > ----- Method: SimpleStackBasedCogit>>genPrimitiveEqual (in category > 'primitive generators') ----- > genPrimitiveEqual > + ^self genSmallIntegerComparison: JumpZero > + orDoubleComparison: #JumpFPEqual: > + invert: false! > - ^self genSmallIntegerComparison: JumpZero orDoubleComparison: > #JumpFPEqual: asSymbol! > > Item was changed: > ----- Method: SimpleStackBasedCogit>>genPrimitiveGreaterOrEqual (in > category 'primitive generators') ----- > genPrimitiveGreaterOrEqual > + ^self genSmallIntegerComparison: JumpGreaterOrEqual > + orDoubleComparison: #JumpFPGreaterOrEqual: > + invert: false! > - ^self genSmallIntegerComparison: JumpGreaterOrEqual > orDoubleComparison: #JumpFPGreaterOrEqual: asSymbol! > > Item was changed: > ----- Method: SimpleStackBasedCogit>>genPrimitiveGreaterThan (in > category 'primitive generators') ----- > genPrimitiveGreaterThan > + ^self genSmallIntegerComparison: JumpGreater > + orDoubleComparison: #JumpFPGreater: > + invert: false! > - ^self genSmallIntegerComparison: JumpGreater orDoubleComparison: > #JumpFPGreater: asSymbol! > > Item was changed: > ----- Method: SimpleStackBasedCogit>>genPrimitiveLessOrEqual (in > category 'primitive generators') ----- > genPrimitiveLessOrEqual > + ^self > + genSmallIntegerComparison: JumpLessOrEqual > + orDoubleComparison: #JumpFPGreater: > + invert: true! > - ^self genSmallIntegerComparison: JumpLessOrEqual > orDoubleComparison: #JumpFPLessOrEqual: asSymbol! > ??? Isn't this going to be a regression when comparing with NaN? (2 <= Float nan) = false. (2 > Float nan) not = true. They are not equivalent and using inversion is not correct. Or is nan handled elsewhere? > > Item was changed: > ----- Method: SimpleStackBasedCogit>>genPrimitiveLessThan (in category > 'primitive generators') ----- > genPrimitiveLessThan > + ^self > + genSmallIntegerComparison: JumpLess > + orDoubleComparison: #JumpFPGreaterOrEqual: > + invert: true! > - ^self genSmallIntegerComparison: JumpLess orDoubleComparison: > #JumpFPLess: asSymbol! > > Item was changed: > ----- Method: SimpleStackBasedCogit>>genPrimitiveNotEqual (in category > 'primitive generators') ----- > genPrimitiveNotEqual > + ^self genSmallIntegerComparison: JumpNonZero > + orDoubleComparison: #JumpFPNotEqual: > + invert: false! > - ^self genSmallIntegerComparison: JumpNonZero orDoubleComparison: > #JumpFPNotEqual: asSymbol! > > Item was removed: > - ----- Method: > SimpleStackBasedCogit>>genSmallIntegerComparison:orDoubleComparison: (in > category 'primitive generators') ----- > - genSmallIntegerComparison: jumpOpcode orDoubleComparison: > jumpFPOpcodeGenerator > - "Stack looks like > - receiver (also in ResultReceiverReg) > - arg > - return address" > - | jumpDouble jumpNonInt jumpFail jumpTrue jumpCond | > - <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction > *(*jumpFPOpcodeGenerator)(void *)'> > - <var: #jumpDouble type: #'AbstractInstruction *'> > - <var: #jumpNonInt type: #'AbstractInstruction *'> > - <var: #jumpCond type: #'AbstractInstruction *'> > - <var: #jumpTrue type: #'AbstractInstruction *'> > - <var: #jumpFail type: #'AbstractInstruction *'> > - backEnd hasDoublePrecisionFloatingPointSupport ifFalse: > - [^self genSmallIntegerComparison: jumpOpcode]. > - self genLoadArgAtDepth: 0 into: ClassReg. > - jumpDouble := objectRepresentation genJumpNotSmallInteger: > ClassReg scratchReg: TempReg. > - self CmpR: ClassReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - > ClassReg" > - jumpTrue := self gen: jumpOpcode. > - self genMoveFalseR: ReceiverResultReg. > - self RetN: (self primRetNOffsetFor: 1). > - jumpTrue jmpTarget: (self genMoveTrueR: ReceiverResultReg). > - self RetN: (self primRetNOffsetFor: 1). > - > - "Argument may be a Float : let us check or fail" > - jumpDouble jmpTarget: self Label. > - objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: > - [jumpNonInt := objectRepresentation genJumpImmediate: > ClassReg]. > - objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg > into: SendNumArgsReg. > - objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. > - jumpFail := self JumpNonZero: 0. > - > - "It was a Float, so convert the receiver to double and perform the > operation" > - self MoveR: ReceiverResultReg R: TempReg. > - objectRepresentation genConvertSmallIntegerToIntegerInReg: TempReg. > - self ConvertR: TempReg Rd: DPFPReg0. > - objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. > - self CmpRd: DPFPReg1 Rd: DPFPReg0. > - jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps > are a little weird" > - self genMoveFalseR: ReceiverResultReg. > - self RetN: (self primRetNOffsetFor: 1). > - jumpCond jmpTarget: (self genMoveTrueR: ReceiverResultReg). > - self RetN: (self primRetNOffsetFor: 1). > - > - objectRepresentation smallIntegerIsOnlyImmediateType > - ifTrue: [jumpFail jmpTarget: self Label] > - ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self > Label)]. > - ^0! > > Item was added: > + ----- Method: > SimpleStackBasedCogit>>genSmallIntegerComparison:orDoubleComparison:invert: > (in category 'primitive generators') ----- > + genSmallIntegerComparison: jumpOpcode orDoubleComparison: > jumpFPOpcodeGenerator invert: invertComparison > + "Stack looks like > + receiver (also in ResultReceiverReg) > + arg > + return address" > + | jumpDouble jumpNonInt jumpFail jumpTrue jumpCond | > + <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction > *(*jumpFPOpcodeGenerator)(void *)'> > + <var: #jumpDouble type: #'AbstractInstruction *'> > + <var: #jumpNonInt type: #'AbstractInstruction *'> > + <var: #jumpCond type: #'AbstractInstruction *'> > + <var: #jumpTrue type: #'AbstractInstruction *'> > + <var: #jumpFail type: #'AbstractInstruction *'> > + backEnd hasDoublePrecisionFloatingPointSupport ifFalse: > + [^self genSmallIntegerComparison: jumpOpcode]. > + self genLoadArgAtDepth: 0 into: ClassReg. > + jumpDouble := objectRepresentation genJumpNotSmallInteger: > ClassReg scratchReg: TempReg. > + self CmpR: ClassReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - > ClassReg" > + jumpTrue := self gen: jumpOpcode. > + self genMoveFalseR: ReceiverResultReg. > + self RetN: (self primRetNOffsetFor: 1). > + jumpTrue jmpTarget: (self genMoveTrueR: ReceiverResultReg). > + self RetN: (self primRetNOffsetFor: 1). > + > + "Argument may be a Float : let us check or fail" > + jumpDouble jmpTarget: self Label. > + objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: > + [jumpNonInt := objectRepresentation genJumpImmediate: > ClassReg]. > + objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg > into: SendNumArgsReg. > + objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. > + jumpFail := self JumpNonZero: 0. > + > + "It was a Float, so convert the receiver to double and perform the > operation" > + self MoveR: ReceiverResultReg R: TempReg. > + objectRepresentation genConvertSmallIntegerToIntegerInReg: TempReg. > + self ConvertR: TempReg Rd: DPFPReg0. > + objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. > + invertComparison "May need to invert for NaNs" > + ifTrue: [self CmpRd: DPFPReg0 Rd: DPFPReg1] > + ifFalse: [self CmpRd: DPFPReg1 Rd: DPFPReg0]. > + jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps > are a little weird" > + self genMoveFalseR: ReceiverResultReg. > + self RetN: (self primRetNOffsetFor: 1). > + jumpCond jmpTarget: (self genMoveTrueR: ReceiverResultReg). > + self RetN: (self primRetNOffsetFor: 1). > + > + objectRepresentation smallIntegerIsOnlyImmediateType > + ifTrue: [jumpFail jmpTarget: self Label] > + ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self > Label)]. > + ^0! > > Item was changed: > ----- Method: StackInterpreter>>printStackPage: (in category 'debug > printing') ----- > printStackPage: page > + <inline: true> > + self printStackPage: page useCount: -1! > - <inline: false> > - <var: #page type: #'StackPage *'> > - self print: 'page '; printHexPtr: (self cCode: [page] inSmalltalk: > [page baseAddress]); > - print: ' ('; printNum: (stackPages pageIndexFor: page > realStackLimit); > - print: ') (trace: '; printNum: page trace; printChar: $). > - (stackPages isFree: page) ifTrue: > - [self print: ' (free)']. > - page = stackPages mostRecentlyUsedPage ifTrue: > - [self print: ' (MRU)']. > - self cr; tab; print: 'ba: '; > - printHexPtr: page baseAddress; print: ' - sl: '; > - printHexPtr: page realStackLimit; print: ' - sl-so: '; > - printHexPtr: page realStackLimit - self stackLimitOffset; > print: ' - la:'; > - printHexPtr: page lastAddress. > - (stackPages isFree: page) ifFalse: > - [self cr; tab; print: 'baseFP '; printHexPtr: page baseFP. > - self "cr;" tab; print: 'headFP '; printHexPtr: page > headFP. > - self "cr;" tab; print: 'headSP '; printHexPtr: page > headSP]. > - self cr; tab; print: 'prev '; printHexPtr: (self cCode: > 'page->prevPage' inSmalltalk: [page prevPage baseAddress]); > - print: ' ('; printNum: (stackPages pageIndexFor: page > prevPage realStackLimit); printChar: $). > - self tab; print: 'next '; printHexPtr: (self cCode: > 'page->nextPage' inSmalltalk: [page nextPage baseAddress]); > - print: ' ('; printNum: (stackPages pageIndexFor: page > nextPage realStackLimit); printChar: $). > - self cr! > > Item was added: > + ----- Method: StackInterpreter>>printStackPage:useCount: (in category > 'debug printing') ----- > + printStackPage: page useCount: n > + <inline: false> > + <var: #page type: #'StackPage *'> > + self print: 'page '; printHexPtr: (self cCode: [page] inSmalltalk: > [page baseAddress]); > + print: ' ('; printNum: (stackPages pageIndexFor: page > realStackLimit). > + n >= 0 ifTrue: > + [self print: ','; printNum: n]. > + self print: ') (trace: '; printNum: page trace; printChar: $). > + (stackPages isFree: page) ifTrue: > + [self print: ' (free)']. > + page = stackPages mostRecentlyUsedPage ifTrue: > + [self print: ' (MRU)']. > + page prevPage = stackPages mostRecentlyUsedPage ifTrue: > + [self print: ' (LRU)']. > + self cr; tab; print: 'ba: '; > + printHexPtr: page baseAddress; print: ' - sl: '; > + printHexPtr: page realStackLimit; print: ' - sl-so: '; > + printHexPtr: page realStackLimit - self stackLimitOffset; > print: ' - la:'; > + printHexPtr: page lastAddress. > + (stackPages isFree: page) ifFalse: > + [self cr; tab; print: 'baseFP '; printHexPtr: page baseFP. > + self "cr;" tab; print: 'headFP '; printHexPtr: page > headFP. > + self "cr;" tab; print: 'headSP '; printHexPtr: page > headSP]. > + self cr; tab; print: 'prev '; printHexPtr: (self cCode: > 'page->prevPage' inSmalltalk: [page prevPage baseAddress]); > + print: ' ('; printNum: (stackPages pageIndexFor: page > prevPage realStackLimit); printChar: $). > + self tab; print: 'next '; printHexPtr: (self cCode: > 'page->nextPage' inSmalltalk: [page nextPage baseAddress]); > + print: ' ('; printNum: (stackPages pageIndexFor: page > nextPage realStackLimit); printChar: $). > + self cr! > > Item was changed: > ----- Method: StackInterpreter>>printStackPageListInUse (in category > 'debug printing') ----- > printStackPageListInUse > + | page n | > - | page | > <inline: false> > <var: #page type: #'StackPage *'> > page := stackPages mostRecentlyUsedPage. > + n := 0. > [(stackPages isFree: page) ifFalse: > + [self printStackPage: page useCount: n; cr. > + n := n + 1]. > - [self printStackPage: page. > - self cr]. > (page := page prevPage) ~= stackPages mostRecentlyUsedPage] > whileTrue! > > Item was changed: > ----- Method: StackInterpreter>>printStackPagesInUse (in category 'debug > printing') ----- > printStackPagesInUse > + | n | > + n := 0. > 0 to: numStackPages - 1 do: > [:i| > (stackPages isFree: (stackPages stackPageAt: i)) ifFalse: > + [self printStackPage: (stackPages stackPageAt: i) > useCount: n; cr. > + n := n + 1]]! > - [self printStackPage: (stackPages stackPageAt: i). > - self cr]]! > > Item was removed: > - ----- Method: > StackInterpreterSimulator>>makeDirEntryName:size:createDate:modDate:isDir:fileSize:posixPermissions: > (in category 'file primitives') ----- > - makeDirEntryName: entryName size: entryNameSize createDate: createDate > modDate: modifiedDate isDir: dirFlag fileSize: fileSize posixPermissions: > posixPermissions > - <option: #PharoVM> > - <var: 'entryName' type: 'char *'> > - > - | modDateOop createDateOop nameString results | > - > - results := objectMemory instantiateClass: > (objectMemory splObj: ClassArray) indexableSize: 5. > - nameString := objectMemory instantiateClass: > (objectMemory splObj: ClassString) indexableSize: entryNameSize. > - createDateOop := self positive32BitIntegerFor: createDate. > - modDateOop := self positive32BitIntegerFor: modifiedDate. > - > - 1 to: entryNameSize do: > - [ :i | > - objectMemory storeByte: i-1 ofObject: nameString > withValue: (entryName at: i) asciiValue]. > - > - objectMemory storePointerUnchecked: 0 ofObject: results withValue: > nameString. > - objectMemory storePointerUnchecked: 1 ofObject: results withValue: > createDateOop. > - objectMemory storePointerUnchecked: 2 ofObject: results withValue: > modDateOop. > - dirFlag > - ifTrue: [ objectMemory storePointerUnchecked: 3 ofObject: > results withValue: objectMemory trueObject ] > - ifFalse: [ objectMemory storePointerUnchecked: 3 ofObject: > results withValue: objectMemory falseObject ]. > - objectMemory storePointerUnchecked: 4 ofObject: results withValue: > (objectMemory integerObjectOf: fileSize). > - objectMemory storePointerUnchecked: 5 ofObject: results withValue: > (objectMemory integerObjectOf: posixPermissions). > - ^ results! > > Item was changed: > ----- Method: StackInterpreterSimulator>>primitiveDirectoryEntry (in > category 'file primitives') ----- > primitiveDirectoryEntry > | name pathName array result | > name := self stringOf: self stackTop. > pathName := self stringOf: (self stackValue: 1). > > self successful ifFalse: > [^self primitiveFail]. > > array := FileDirectory default primLookupEntryIn: pathName name: > name. > array == nil ifTrue: > [self pop: 3 thenPush: objectMemory nilObject. > ^array]. > array == #badDirectoryPath ifTrue: > [self halt. > ^self primitiveFail]. > > PharoVM > ifTrue: [ > result := self makeDirEntryName: (array at: 1) > size: (array at: 1) size > createDate: (array at: 2) modDate: (array > at: 3) > isDir: (array at: 4) fileSize: (array at: > 5) > posixPermissions: (array at: 6) isSymlink: > (array at: 7) ] > ifFalse: [ > result := self makeDirEntryName: (array at: 1) > size: (array at: 1) size > createDate: (array at: 2) modDate: (array > at: 3) > isDir: (array at: 4) fileSize: (array at: > 5) ]. > + self pop: 3 thenPush: result! > - self pop: 3. > - self push: result! > > Item was removed: > - ----- Method: > StackToRegisterMappingCogit>>genSmallIntegerComparison:orDoubleComparison: > (in category 'primitive generators') ----- > - genSmallIntegerComparison: jumpOpcode orDoubleComparison: > jumpFPOpcodeGenerator > - "Stack looks like > - return address" > - | jumpDouble jumpNonInt jumpFail jumpTrue jumpCond | > - <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction > *(*jumpFPOpcodeGenerator)(void *)'> > - <var: #jumpDouble type: #'AbstractInstruction *'> > - <var: #jumpNonInt type: #'AbstractInstruction *'> > - <var: #jumpCond type: #'AbstractInstruction *'> > - <var: #jumpTrue type: #'AbstractInstruction *'> > - <var: #jumpFail type: #'AbstractInstruction *'> > - backEnd hasDoublePrecisionFloatingPointSupport ifFalse: > - [^self genSmallIntegerComparison: jumpOpcode]. > - jumpDouble := objectRepresentation genJumpNotSmallInteger: Arg0Reg > scratchReg: TempReg. > - self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - > Arg0Reg" > - jumpTrue := self gen: jumpOpcode. > - self genMoveFalseR: ReceiverResultReg. > - self RetN: 0. > - jumpTrue jmpTarget: (self genMoveTrueR: ReceiverResultReg). > - self RetN: 0. > - > - "Argument may be a Float : let us check or fail" > - jumpDouble jmpTarget: self Label. > - objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: > - [jumpNonInt := objectRepresentation genJumpImmediate: > Arg0Reg]. > - objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg > into: SendNumArgsReg. > - objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. > - jumpFail := self JumpNonZero: 0. > - > - "It was a Float, so convert the receiver to double and perform the > operation" > - objectRepresentation genConvertSmallIntegerToIntegerInReg: > ReceiverResultReg. > - self ConvertR: ReceiverResultReg Rd: DPFPReg0. > - objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. > - self CmpRd: DPFPReg1 Rd: DPFPReg0. > - jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps > are a little weird" > - self genMoveFalseR: ReceiverResultReg. > - self RetN: 0. > - jumpCond jmpTarget: (self genMoveTrueR: ReceiverResultReg). > - self RetN: 0. > - > - objectRepresentation smallIntegerIsOnlyImmediateType > - ifTrue: [jumpFail jmpTarget: self Label] > - ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self > Label)]. > - ^0! > > Item was added: > + ----- Method: > StackToRegisterMappingCogit>>genSmallIntegerComparison:orDoubleComparison:invert: > (in category 'primitive generators') ----- > + genSmallIntegerComparison: jumpOpcode orDoubleComparison: > jumpFPOpcodeGenerator invert: invertComparison > + "Stack looks like > + return address" > + | jumpDouble jumpNonInt jumpFail jumpTrue jumpCond | > + <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction > *(*jumpFPOpcodeGenerator)(void *)'> > + <var: #jumpDouble type: #'AbstractInstruction *'> > + <var: #jumpNonInt type: #'AbstractInstruction *'> > + <var: #jumpCond type: #'AbstractInstruction *'> > + <var: #jumpTrue type: #'AbstractInstruction *'> > + <var: #jumpFail type: #'AbstractInstruction *'> > + backEnd hasDoublePrecisionFloatingPointSupport ifFalse: > + [^self genSmallIntegerComparison: jumpOpcode]. > + jumpDouble := objectRepresentation genJumpNotSmallInteger: Arg0Reg > scratchReg: TempReg. > + self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - > Arg0Reg" > + jumpTrue := self gen: jumpOpcode. > + self genMoveFalseR: ReceiverResultReg. > + self RetN: 0. > + jumpTrue jmpTarget: (self genMoveTrueR: ReceiverResultReg). > + self RetN: 0. > + > + "Argument may be a Float : let us check or fail" > + jumpDouble jmpTarget: self Label. > + objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: > + [jumpNonInt := objectRepresentation genJumpImmediate: > Arg0Reg]. > + objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg > into: SendNumArgsReg. > + objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. > + jumpFail := self JumpNonZero: 0. > + > + "It was a Float, so convert the receiver to double and perform the > operation" > + objectRepresentation genConvertSmallIntegerToIntegerInReg: > ReceiverResultReg. > + self ConvertR: ReceiverResultReg Rd: DPFPReg0. > + objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. > + invertComparison "May need to invert for NaNs" > + ifTrue: [self CmpRd: DPFPReg0 Rd: DPFPReg1] > + ifFalse: [self CmpRd: DPFPReg1 Rd: DPFPReg0]. > + jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps > are a little weird" > + self genMoveFalseR: ReceiverResultReg. > + self RetN: 0. > + jumpCond jmpTarget: (self genMoveTrueR: ReceiverResultReg). > + self RetN: 0. > + > + objectRepresentation smallIntegerIsOnlyImmediateType > + ifTrue: [jumpFail jmpTarget: self Label] > + ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self > Label)]. > + ^0! > >

2 6

[commit][3419] add sqSqueakOSXCGView to enable testing outside of openGL
by commits＠squeakvm.org 11 Aug '15

11 Aug '15

Revision: 3419 Author: johnmci Date: 2015-08-11 10:44:21 -0700 (Tue, 11 Aug 2015) Log Message: ----------- add sqSqueakOSXCGView to enable testing outside of openGL Modified Paths: -------------- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcshareddata/SqueakPureObjcCog.xccheckout branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakPureObjc64x64.xcscheme branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj 2015-08-10 17:49:36 UTC (rev 3418) +++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj 2015-08-11 17:44:21 UTC (rev 3419) @@ -197,6 +197,7 @@ 94D921581AC6321E00A5970F /* ZipPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94E6591F0DDD03FE00358328 /* ZipPlugin.c */; }; 94D9215A1AC6334600A5970F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94329ECA12275FFA0090298B /* OpenGL.framework */; }; 94D9215B1AC6337D00A5970F /* sqManualSurface.c in Sources */ = {isa = PBXBuildFile; fileRef = 94BD816F11C8A58D00556751 /* sqManualSurface.c */; }; + 94FE5EC31B7A6232000D6014 /* sqSqueakOSXCGView.m in Sources */ = {isa = PBXBuildFile; fileRef = 94FE5EC21B7A6232000D6014 /* sqSqueakOSXCGView.m */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -247,7 +248,7 @@ 9422C3B11AFFF94100448DC0 /* GreenCogSqueak.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = GreenCogSqueak.icns; path = "../../Mac OS/Resources/GreenCogSqueak.icns"; sourceTree = "<group>"; }; 9422C3B41AFFFAC500448DC0 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = Common/English.lproj/Localizable.strings; sourceTree = "<group>"; }; 9422C3B61AFFFB3400448DC0 /* CoreVM.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = CoreVM.plist; path = ../../../build.macos64x64/squeak.stack.spur/CoreVM.plist; sourceTree = "<group>"; }; - 9422C3B81AFFFB6000448DC0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "SqueakPureObjc64x64/Images.xcassets"; sourceTree = SOURCE_ROOT; }; + 9422C3B81AFFFB6000448DC0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SqueakPureObjc64x64/Images.xcassets; sourceTree = SOURCE_ROOT; }; 9422C3C81AFFFFD600448DC0 /* gcc3x-interp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "gcc3x-interp.c"; sourceTree = "<group>"; }; 9422C3C91AFFFFD600448DC0 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interp.h; sourceTree = "<group>"; }; 9424FF5B0DDCB1C7009912BF /* sqGnu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqGnu.h; path = ../../platforms/iOS/vm/Common/sqGnu.h; sourceTree = SOURCE_ROOT; }; @@ -573,6 +574,8 @@ 94E65A340DDD053900358328 /* study.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = study.c; sourceTree = "<group>"; }; 94F8798F0E6C0C7E00662DEA /* sqSqueakIPhoneInfoPlistInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSqueakIPhoneInfoPlistInterface.h; sourceTree = "<group>"; }; 94F879900E6C0C7E00662DEA /* sqSqueakIPhoneInfoPlistInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sqSqueakIPhoneInfoPlistInterface.m; sourceTree = "<group>"; }; + 94FE5EC11B7A6232000D6014 /* sqSqueakOSXCGView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqSqueakOSXCGView.h; path = vm/OSX/sqSqueakOSXCGView.h; sourceTree = "<group>"; }; + 94FE5EC21B7A6232000D6014 /* sqSqueakOSXCGView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = sqSqueakOSXCGView.m; path = vm/OSX/sqSqueakOSXCGView.m; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1001,6 +1004,8 @@ 94C88BDE10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.m */, 94C2068810AF4F53002F4160 /* sqSqueakOSXOpenGLView.h */, 94C2068910AF4F53002F4160 /* sqSqueakOSXOpenGLView.m */, + 94FE5EC11B7A6232000D6014 /* sqSqueakOSXCGView.h */, + 94FE5EC21B7A6232000D6014 /* sqSqueakOSXCGView.m */, 9402DD6F10CE0E91005C2102 /* SqViewClut.m */, 94B8F54E10CF677800F0DD6B /* SqViewClut.h */, 94D3654D10CEC86C00805023 /* BitMapConversionLogicFromX11.h */, @@ -1790,7 +1795,7 @@ ); dependencies = ( ); - name = "SqueakPureObjc64x64"; + name = SqueakPureObjc64x64; productName = SqueakNoOGLIPhone; productReference = 948774A810C64DD800E4AEC5 /* Squeak.app */; productType = "com.apple.product-type.application"; @@ -2016,6 +2021,7 @@ 9487748910C64DD800E4AEC5 /* sqSqueakOSXFileDirectoryInterface.m in Sources */, 9463C1C71AEE155A009C5CE5 /* FloatArrayPlugin.c in Sources */, 9487748A10C64DD800E4AEC5 /* sqSqueakOSXApplication+attributes.m in Sources */, + 94FE5EC31B7A6232000D6014 /* sqSqueakOSXCGView.m in Sources */, 9463C1C41AEE14DF009C5CE5 /* DropPlugin.c in Sources */, 94C3176A1AD49B020096E59D /* sqUnixJoystickTablet.c in Sources */, 9487748C10C64DD800E4AEC5 /* sqSqueakOSXApplication+imageReadWrite.m in Sources */, Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcshareddata/SqueakPureObjcCog.xccheckout =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcshareddata/SqueakPureObjcCog.xccheckout 2015-08-10 17:49:36 UTC (rev 3418) +++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcshareddata/SqueakPureObjcCog.xccheckout 2015-08-11 17:44:21 UTC (rev 3419) @@ -7,7 +7,7 @@ <key>IDESourceControlProjectIdentifier</key> <string>3D2D6A47-5629-4BC5-9C59-4C1A9F137CF6</string> <key>IDESourceControlProjectName</key> - <string>project</string> + <string>SqueakPureObjcCog</string> <key>IDESourceControlProjectOriginsDictionary</key> <dict> <key>fa1542d4-bde8-0310-ad64-8ed1123d492a++2954</key> @@ -16,13 +16,13 @@ <string>http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins</string> </dict> <key>IDESourceControlProjectPath</key> - <string>build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace</string> + <string>build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj</string> <key>IDESourceControlProjectRelativeInstallPathDictionary</key> <dict> <key>fa1542d4-bde8-0310-ad64-8ed1123d492a++2954</key> <string>../../../..</string> <key>fa1542d4-bde8-0310-ad64-8ed1123d492a++5922</key> - <string>../../../..platforms/Cross/plugins</string> + <string>../../../..platforms/Cross/plugins/</string> </dict> <key>IDESourceControlProjectRepositoryRootDictionary</key> <dict> @@ -32,7 +32,7 @@ <string>http://squeakvm.org/svn/squeak</string> </dict> <key>IDESourceControlProjectURL</key> - <string>http://squeakvm.org/svn/squeak/branches/Cog/build.macos64x64/squeak.stack.s…</string> + <string>http://squeakvm.org/svn/squeak/branches/Cog/build.macos64x64/squeak.stack.s…</string> <key>IDESourceControlProjectVersion</key> <integer>111</integer> <key>IDESourceControlProjectWCCIdentifier</key> Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate =================================================================== (Binary files differ) Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 2015-08-10 17:49:36 UTC (rev 3418) +++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 2015-08-11 17:44:21 UTC (rev 3419) @@ -9,22 +9,6 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m" - timestampString = "452994389.12955" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "61" - endingLineNumber = "61" - landmarkName = "-initWithFrame:" - landmarkType = "5"> - </BreakpointContent> - </BreakpointProxy> - <BreakpointProxy - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> - <BreakpointContent - shouldBeEnabled = "Yes" - ignoreCount = "0" - continueAfterRunningActions = "No" filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m" timestampString = "452997671.589229" startingColumnNumber = "9223372036854775807" @@ -38,32 +22,16 @@ <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent - shouldBeEnabled = "No" - ignoreCount = "0" - continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m" - timestampString = "452998545.508416" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "771" - endingLineNumber = "771" - landmarkName = "-preDrawThelayers" - landmarkType = "5"> - </BreakpointContent> - </BreakpointProxy> - <BreakpointProxy - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> - <BreakpointContent shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m" - timestampString = "452998560.740228" + filePath = "../../platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m" + timestampString = "461002846.844502" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "103" - endingLineNumber = "103" - landmarkName = "-preDrawThelayers" + startingLineNumber = "157" + endingLineNumber = "157" + landmarkName = "-runSqueak" landmarkType = "5"> </BreakpointContent> </BreakpointProxy> @@ -73,13 +41,13 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m" - timestampString = "452998561.662078" + filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m" + timestampString = "461003235.308319" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "111" - endingLineNumber = "111" - landmarkName = "-drawThelayers" + startingLineNumber = "179" + endingLineNumber = "179" + landmarkName = "-setupOpenGL" landmarkType = "5"> </BreakpointContent> </BreakpointProxy> @@ -89,95 +57,15 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m" - timestampString = "452998565.700942" + filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXCGView.m" + timestampString = "461006124.963329" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "147" - endingLineNumber = "147" - landmarkName = "-drawThelayers" + startingLineNumber = "114" + endingLineNumber = "114" + landmarkName = "-dealloc" landmarkType = "5"> </BreakpointContent> </BreakpointProxy> - <BreakpointProxy - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> - <BreakpointContent - shouldBeEnabled = "Yes" - ignoreCount = "0" - continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m" - timestampString = "452999005.074078" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "137" - endingLineNumber = "137" - landmarkName = "-drawImageUsingClip:" - landmarkType = "5"> - </BreakpointContent> - </BreakpointProxy> - <BreakpointProxy - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> - <BreakpointContent - shouldBeEnabled = "Yes" - ignoreCount = "0" - continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m" - timestampString = "452999020.475384" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "150" - endingLineNumber = "150" - landmarkName = "-drawThelayers" - landmarkType = "5"> - </BreakpointContent> - </BreakpointProxy> - <BreakpointProxy - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> - <BreakpointContent - shouldBeEnabled = "Yes" - ignoreCount = "0" - continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m" - timestampString = "452999105.187551" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "94" - endingLineNumber = "94" - landmarkName = "-drawImageUsingClip:" - landmarkType = "5"> - </BreakpointContent> - </BreakpointProxy> - <BreakpointProxy - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> - <BreakpointContent - shouldBeEnabled = "Yes" - ignoreCount = "0" - continueAfterRunningActions = "No" - filePath = "../../platforms/iOS/vm/Common/Classes/sqMacV2Time.c" - timestampString = "452999920.194741" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "107" - endingLineNumber = "107" - landmarkName = "ioMicroMSecs()" - landmarkType = "7"> - </BreakpointContent> - </BreakpointProxy> - <BreakpointProxy - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> - <BreakpointContent - shouldBeEnabled = "Yes" - ignoreCount = "0" - continueAfterRunningActions = "No" - filePath = "../../platforms/unix/vm/sqUnixHeartbeat.c" - timestampString = "452999978.904348" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "272" - endingLineNumber = "272" - landmarkName = "ioMicroMSecs()" - landmarkType = "7"> - </BreakpointContent> - </BreakpointProxy> </Breakpoints> </Bucket> Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakPureObjc64x64.xcscheme =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakPureObjc64x64.xcscheme 2015-08-10 17:49:36 UTC (rev 3418) +++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakPureObjc64x64.xcscheme 2015-08-11 17:44:21 UTC (rev 3419) @@ -61,21 +61,6 @@ </BuildableReference> </BuildableProductRunnable> <AdditionalOptions> - <AdditionalOption - key = "DYLD_INSERT_LIBRARIES" - value = "/usr/lib/libgmalloc.dylib" - isEnabled = "YES"> - </AdditionalOption> - <AdditionalOption - key = "NSZombieEnabled" - value = "YES" - isEnabled = "YES"> - </AdditionalOption> - <AdditionalOption - key = "MallocGuardEdges" - value = "" - isEnabled = "YES"> - </AdditionalOption> </AdditionalOptions> </LaunchAction> <ProfileAction Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h 2015-08-10 17:49:36 UTC (rev 3418) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h 2015-08-11 17:44:21 UTC (rev 3419) @@ -45,7 +45,7 @@ #import "sq.h" @interface sqSqueakOSXCGView : NSView <sqSqueakOSXView, NSTextInputClient> { - sqSqueakOSXScreenAndWindow *windowLogic; + sqSqueakOSXScreenAndWindow *__weak windowLogic; NSTrackingRectTag squeakTrackingRectForCursor; NSRange inputMark; NSRange inputSelection; @@ -69,7 +69,7 @@ @property (nonatomic,assign) BOOL dragInProgress; @property (nonatomic,assign) int dragCount; @property (nonatomic,retain) NSMutableArray* dragItems; -@property (nonatomic,assign) sqSqueakOSXScreenAndWindow *windowLogic; +@property (nonatomic,weak) sqSqueakOSXScreenAndWindow *windowLogic; @property (nonatomic,assign) NSRect savedScreenBoundsAtTimeOfFullScreen; //Initialization Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2015-08-10 17:49:36 UTC (rev 3418) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2015-08-11 17:44:21 UTC (rev 3419) @@ -89,7 +89,7 @@ - (void)awakeFromNib { //self = [self initWithFrame: self.frame pixelFormat: [[self class] defaultPixelFormat] ]; - self = [self initWithFrame: self.frame]; +// self = [self initWithFrame: self.frame]; [self initialize]; } @@ -107,8 +107,10 @@ - (void) initializeVariables { } +- (void) preDrawThelayers{ +} + - (void) dealloc { - [super dealloc]; free(colorMap32); CGColorSpaceRelease(colorspace); } @@ -349,7 +351,6 @@ self.lastSeenKeyBoardStrokeDetails = NULL; [self keyUp: theEvent]; } - [down release]; } -(void)keyDown:(NSEvent*)theEvent { @@ -364,7 +365,6 @@ [self interpretKeyEvents: down]; self.lastSeenKeyBoardStrokeDetails = NULL; } - [down release]; } -(void)keyUp:(NSEvent*)theEvent { @@ -393,7 +393,6 @@ aKeyBoardStrokeDetails.modifierFlags = [theEvent modifierFlags]; self.lastSeenKeyBoardModifierDetails = aKeyBoardStrokeDetails; [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordKeyDownEvent: theEvent fromView: self]; - [aKeyBoardStrokeDetails release]; } - (void)doCommandBySelector:(SEL)aSelector { @@ -561,7 +560,7 @@ self.dragCount = (int) [self countNumberOfNoneSqueakImageFilesInDraggedFiles: info]; if (self.dragCount) - [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragEnter numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self]; + [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragEnter numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex]; return NSDragOperationGeneric; } @@ -569,14 +568,14 @@ - (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)info { if (self.dragCount) - [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragMove numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view:self]; + [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragMove numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex]; return NSDragOperationGeneric; } - (void) draggingExited: (id<NSDraggingInfo>)info { if (self.dragCount) - [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragLeave numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view:self]; + [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragLeave numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex]; self.dragCount = 0; self.dragInProgress = NO; self.dragItems = NULL; @@ -585,7 +584,7 @@ - (BOOL) performDragOperation: (id<NSDraggingInfo>)info { if (self.dragCount) { self.dragItems = [self filterOutSqueakImageFilesFromDraggedFiles: info]; - [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragDrop numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view:self]; + [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragDrop numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex]; } NSArray *images = [self filterSqueakImageFilesFromDraggedFiles: info]; @@ -593,9 +592,9 @@ for (NSString *item in images ){ NSURL *url = [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]]; LSLaunchURLSpec launchSpec; - launchSpec.appURL = (CFURLRef)url; + launchSpec.appURL = (__bridge CFURLRef)url; launchSpec.passThruParams = NULL; - launchSpec.itemURLs = (CFArrayRef) [NSArray arrayWithObject:[NSURL fileURLWithPath: item]]; + launchSpec.itemURLs = (__bridge CFArrayRef) [NSArray arrayWithObject:[NSURL fileURLWithPath: item]]; launchSpec.launchFlags = kLSLaunchDefaults | kLSLaunchNewInstance; launchSpec.asyncRefCon = NULL;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2015