[Vm-dev] VM Maker: VMMaker.oscog-eem.1156.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Apr 2 21:49:44 UTC 2015


Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1156.mcz

==================== Summary ====================

Name: VMMaker.oscog-eem.1156
Author: eem
Time: 2 April 2015, 2:47:35.24 pm
UUID: 697f9d2d-3d70-4c35-b4b6-421c1f3d77de
Ancestors: VMMaker.oscog-eem.1155

Integrate Nicolas' fixes that use
positiveMachineIntegerFor: for pointers.

=============== Diff against VMMaker.oscog-eem.1155 ===============

Item was changed:
  ----- Method: ClipboardExtendedPlugin>>ioAddClipboardData:data:dataFormat: (in category 'io') -----
  ioAddClipboardData: clipboard data: data dataFormat: aFormat
+ 	| clipboardAddress formatLength dataLength |
+ 	<var: #clipboardAddress type: #'unsigned long'>
+ 	self primitive: 'ioAddClipboardData' parameters: #(Oop ByteArray String).
- | clipboardAddress formatLength dataLength |
- self primitive: 'ioAddClipboardData' parameters: #(Oop ByteArray String).
  
+ 	clipboardAddress := interpreterProxy positiveMachineIntegerValueOf: clipboard.
+ 	dataLength := interpreterProxy slotSizeOf: data cPtrAsOop.
+ 	formatLength := interpreterProxy slotSizeOf: aFormat cPtrAsOop.
- clipboardAddress := interpreterProxy positive32BitValueOf: clipboard.
  
+ 	self sqPasteboardPutItemFlavor: clipboardAddress data: data length: dataLength formatType: aFormat formatLength: formatLength.
- dataLength := interpreterProxy slotSizeOf: data cPtrAsOop.
- formatLength := interpreterProxy slotSizeOf: aFormat cPtrAsOop.
- 
- self sqPasteboardPutItemFlavor: clipboardAddress data: data length: dataLength formatType: aFormat formatLength: formatLength.
  !

Item was changed:
  ----- Method: ClipboardExtendedPlugin>>ioClearClipboard: (in category 'io') -----
  ioClearClipboard: clipboard
+ 	| clipboardAddress |
+ 	<var: #clipboardAddress type: #'unsigned long'>
+ 	self primitive: 'ioClearClipboard' parameters: #(Oop).
+ 	clipboardAddress :=  interpreterProxy positiveMachineIntegerValueOf: clipboard.
+ 	self sqPasteboardClear: clipboardAddress.!
- | clipboardAddress |
- self primitive: 'ioClearClipboard' parameters: #(Oop).
- clipboardAddress :=  interpreterProxy positive32BitValueOf: clipboard.
- self sqPasteboardClear: clipboardAddress.!

Item was changed:
  ----- Method: ClipboardExtendedPlugin>>ioCreateClipboard (in category 'io') -----
  ioCreateClipboard
+ 	| clipboardAddress |
+ 	self primitive: 'ioCreateClipboard' parameters: #().
- | clipboardAddress |
- self primitive: 'ioCreateClipboard' parameters: #().
  
+ 	clipboardAddress := interpreterProxy positiveMachineIntegerFor: self sqCreateClipboard.
- clipboardAddress := interpreterProxy positive32BitIntegerFor: self sqCreateClipboard.
  
+ 	^ clipboardAddress.!
- ^ clipboardAddress.!

Item was changed:
  ----- Method: ClipboardExtendedPlugin>>ioGetClipboardFormat:formatNumber: (in category 'io') -----
  ioGetClipboardFormat: clipboard formatNumber: formatNumber 
  	| clipboardAddress itemCount |
+ 	<var: #clipboardAddress type: #'unsigned long'>
  	self primitive: 'ioGetClipboardFormat' parameters: #(#Oop #SmallInteger ).
+ 	clipboardAddress := interpreterProxy positiveMachineIntegerValueOf: clipboard.
- 	clipboardAddress := interpreterProxy positive32BitValueOf: clipboard.
  	itemCount := self sqPasteboardGetItemCount: clipboardAddress.
  	itemCount > 0
  		ifTrue: [^ self sqPasteboardCopyItemFlavors: clipboardAddress itemNumber: formatNumber].
  	^ interpreterProxy nilObject!

Item was changed:
  ----- Method: ClipboardExtendedPlugin>>ioReadClipboardData:format: (in category 'io') -----
  ioReadClipboardData: clipboard format: format
+ 	| clipboardAddress formatLength |
+ 	<var: #clipboardAddress type: #'unsigned long'>
+ 	self primitive: 'ioReadClipboardData' parameters: #(Oop String).
+ 	clipboardAddress := interpreterProxy positiveMachineIntegerValueOf: clipboard.
+ 	formatLength := interpreterProxy slotSizeOf: format cPtrAsOop.
+ 	^ self sqPasteboardCopyItemFlavorData: clipboardAddress format: format formatLength: formatLength.
- | clipboardAddress formatLength |
- self primitive: 'ioReadClipboardData' parameters: #(Oop String).
- clipboardAddress := interpreterProxy positive32BitValueOf: clipboard.
- formatLength := interpreterProxy slotSizeOf: format cPtrAsOop.
- ^ self sqPasteboardCopyItemFlavorData: clipboardAddress format: format formatLength: formatLength.
  !

Item was changed:
  ----- Method: QuicktimePlugin>>primitiveSetGWorldPtrOntoExistingSurface:gWorld:width:height:rowBytes:depth:movie: (in category 'system primitives') -----
  primitiveSetGWorldPtrOntoExistingSurface: surfaceID gWorld: bitMapPtr width: width height: height rowBytes: rowBytes depth: depth movie: moviePtr
  	| buffer movie |
  
+ 	<var: #buffer type: #'char *'>
+ 	<var: #movie type: #'long'>
  	self primitive: 'primitiveSetGWorldPtrOntoExistingSurface'  parameters:#(SmallInteger Oop SmallInteger SmallInteger SmallInteger SmallInteger Oop).
+ 	buffer := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: bitMapPtr) to: 'char *'.
+ 	movie := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: moviePtr) to: 'long'.
- 	buffer := self cCoerce: (interpreterProxy positive32BitValueOf: bitMapPtr) to: 'char *'.
- 	movie := self cCoerce: (interpreterProxy positive32BitValueOf: moviePtr) to: 'long'.
  	self stQuicktimeSetToExistingSurface: surfaceID gworld: buffer width: width height: height rowBytes: rowBytes depth: depth movie: movie.
  	!

Item was changed:
  ----- Method: QuicktimePlugin>>primitiveSetGWorldPtrOntoSurface:width:height:rowBytes:depth:movie: (in category 'system primitives') -----
  primitiveSetGWorldPtrOntoSurface: bitMapPtr width: width height: height rowBytes: rowBytes depth: depth movie: moviePtr
  	| buffer movie results |
  
+ 	<var: #buffer type: #'char *'>
+ 	<var: #movie type: #'long'>
  	self primitive: 'primitiveSetGWorldPtrOntoSurface'  parameters:#(Oop SmallInteger SmallInteger SmallInteger SmallInteger Oop).
+ 	buffer := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: bitMapPtr) to: 'char *'.
+ 	movie := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: moviePtr) to: 'long'.
- 	buffer := self cCoerce: (interpreterProxy positive32BitValueOf: bitMapPtr) to: 'char *'.
- 	movie := self cCoerce: (interpreterProxy positive32BitValueOf: moviePtr) to: 'long'.
  	results := self stQuicktimeSetSurface: buffer width: width height: height rowBytes: rowBytes depth: depth movie: movie.
  	^results asOop: SmallInteger !



More information about the Vm-dev mailing list