Vm-dev March 2016

vm-dev@lists.squeakfoundation.org

33 participants
139 discussions

Re: [Vm-dev] VM Maker: VMMaker.oscog-EstebanLorenzano.1714.mcz
by Nicolas Cellier 09 Mar '16

09 Mar '16

2016-03-08 18:17 GMT+01:00 <commits(a)source.squeak.org>: > > Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1714.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-EstebanLorenzano.1714 > Author: EstebanLorenzano > Time: 8 March 2016, 6:16:11.06581 pm > UUID: e83d2c5f-76cd-47fc-ac29-6c4a25fa5deb > Ancestors: VMMaker.oscog-nice.1713 > > Remove wrong coertion. If coertion is present, this assertion fails: > > ref := ByteArray new: 4. > ref integerAt: 1 put: -10 size: 4 signed: true. > self assert: (ref integerAt: 1 size: 4 signed: true) = -10 > > > =============== Diff against VMMaker.oscog-nice.1713 =============== > > Item was changed: > ----- Method: ThreadedFFIPlugin>>primitiveFFIIntegerAt (in category > 'primitives') ----- > primitiveFFIIntegerAt > "Answer a (signed or unsigned) n byte integer from the given byte > offset > in the receiver, using the platform's endianness." > | isSigned byteSize byteOffset rcvr addr value mask valueOop | > <var: 'value' type: #usqLong> > <var: 'mask' type: #usqLong> > <export: true> > <inline: false> > isSigned := interpreterProxy booleanValueOf: (interpreterProxy > stackValue: 0). > byteSize := interpreterProxy stackIntegerValue: 1. > byteOffset := interpreterProxy stackIntegerValue: 2. > rcvr := interpreterProxy stackObjectValue: 3. > interpreterProxy failed ifTrue:[^0]. > (byteOffset > 0 > and: [(byteSize between: 1 and: 8) > and: [(byteSize bitAnd: byteSize - 1) = 0 "a.k.a. > isPowerOfTwo"]]) ifFalse: > [^interpreterProxy primitiveFail]. > addr := self ffiAddressOf: rcvr startingAt: byteOffset size: > byteSize. > interpreterProxy failed ifTrue:[^0]. > byteSize <= 2 > ifTrue: > [byteSize = 1 > ifTrue: [value := self cCoerceSimple: > (interpreterProxy byteAt: addr) to: #'unsigned char'] > ifFalse: [value := self cCoerceSimple: > (interpreterProxy shortAt: addr) to: #'unsigned short']] > ifFalse: > [byteSize = 4 > + ifTrue: [value := interpreterProxy > long32At: addr] > - ifTrue: [value := self cCoerceSimple: > (interpreterProxy long32At: addr) to: #'unsigned int'] > This will fix 32bits spur, but what will happen with 64bits? It will happen that you'll break 32bits unsigned access... 0xFFFFFFFF will be interpreted as -1 (long32At:) then promoted to 0xFFFFFFFFFFFFFFFFULL then I don't know what integerObjectOf: will do of it... Probably not the right thing :( > ifFalse: [value := interpreterProxy > long64At: addr]]. > byteSize < BytesPerWord > ifTrue: > [isSigned ifTrue: "sign extend value" > [mask := 1 << (byteSize * 8 - 1). > value := (value bitAnd: mask-1) - (value > bitAnd: mask)]. > "note: byte/short (&long if BytesPerWord=8) never > exceed SmallInteger range" > valueOop := interpreterProxy integerObjectOf: > value] > ifFalse: "general 64 bit integer; note these never fail" > [valueOop := isSigned > > ifTrue:[interpreterProxy signed64BitIntegerFor: value] > > ifFalse:[interpreterProxy positive64BitIntegerFor: value]]. > ^interpreterProxy pop: 4 thenPush: valueOop! > >

2 5

Re: [Vm-dev] VM Maker: VMMaker.oscog-nice.1712.mcz
by Eliot Miranda 09 Mar '16

09 Mar '16

Hi Nicolas, also the horrible use of embedding #if TARGET)_API_MAC_CARBON in self cCode: has to go (in particular one gets semicolons at the end of #endif. Can you rewrte in this style? primitiveCreateStandardWindowMenu: inOptions | menuHandle result | self primitive: 'primitiveCreateStandardWindowMenu' parameters: #(SmallInteger). self var: 'menuHandle' type: 'MenuHandle'. self cppIf: #TARGET_API_MAC_CARBON ifTrue: [result := self cCode: 'CreateStandardWindowMenu(inOptions,&menuHandle)'] ifFalse: [^interpreterProxy primitiveFail]. ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: menuHandle to: #long) I'd do it myself but I know I'll break the code :-( On Fri, Mar 4, 2016 at 5:33 PM, <commits(a)source.squeak.org> wrote: > > Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1712.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-nice.1712 > Author: nice > Time: 5 March 2016, 2:32:35.84 am > UUID: 5c7fb203-b18c-4143-a2b9-cd59c2acc47c > Ancestors: VMMaker.oscog-nice.1711 > > Make the MacMenubarPlugin 64bits aware: the menuHandle does not > necessarily fit on a 32bits int. > > =============== Diff against VMMaker.oscog-nice.1711 =============== > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveAppendMenu:data: (in category > 'system primitives') ----- > primitiveAppendMenu: menuHandleOop data: str255 > | menuHandle constStr255 | > self primitive: 'primitiveAppendMenu' > parameters: #(Oop ByteArray). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'constStr255' type: 'ConstStr255Param'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > constStr255 := self cCoerce: str255 to: 'ConstStr255Param'. > self cCode: 'AppendMenu(menuHandle,constStr255)' > inSmalltalk:[menuHandle]. > ^nil! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveAppendMenuItemText:data: (in > category 'system primitives') ----- > primitiveAppendMenuItemText: menuHandleOop data: str255 > | menuHandle constStr255 | > self primitive: 'primitiveAppendMenuItemText' > parameters: #(Oop ByteArray). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'constStr255' type: 'ConstStr255Param'. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > constStr255 := self cCoerce: str255 to: 'ConstStr255Param'. > self cCode: 'AppendMenuItemText(menuHandle,constStr255)' > inSmalltalk:[menuHandle]. > ^nil! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveCheckMenuItem:item:checked: (in > category 'system primitives') ----- > primitiveCheckMenuItem: menuHandleOop item: anInteger checked: aBoolean > | menuHandle | > self primitive: 'primitiveCheckMenuItem' > parameters: #(Oop SmallInteger Boolean). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'CheckMenuItem(menuHandle,anInteger,aBoolean)' > inSmalltalk:[menuHandle]. > ^nil > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveCountMenuItems: (in category > 'system primitives') ----- > primitiveCountMenuItems: menuHandleOop > | menuHandle returnValue | > self primitive: 'primitiveCountMenuItems' > parameters: #(Oop). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > returnValue := self cCode: 'CountMenuItems(menuHandle)' > inSmalltalk:[0]. > ^returnValue asSmallIntegerObj > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveCreateStandardWindowMenu: (in > category 'system primitives') ----- > primitiveCreateStandardWindowMenu: inOptions > > | menuHandle result | > self primitive: 'primitiveCreateStandardWindowMenu' > parameters: #(SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > self cCode: '#if TARGET_API_MAC_CARBON > '. > result := self cCode: > 'CreateStandardWindowMenu(inOptions,&menuHandle); > #endif' inSmalltalk:[0]. > + ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: > menuHandle to: 'long')! > - ^interpreterProxy positive32BitIntegerFor: (self cCoerce: > menuHandle to: 'long')! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveDeleteMenuItem:item: (in > category 'system primitives') ----- > primitiveDeleteMenuItem: menuHandleOop item: anInteger > | menuHandle | > self primitive: 'primitiveDeleteMenuItem' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'DeleteMenuItem(menuHandle,anInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveDisableMenuCommand:item: (in > category 'system primitives') ----- > primitiveDisableMenuCommand: menuHandleOop item: anInteger > | menuHandle commandID | > self primitive: 'primitiveDisableMenuCommand' > parameters: #(Oop Oop). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'commandID' type: 'MenuCommand'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > commandID := self cCoerce: (interpreterProxy positive32BitValueOf: > anInteger) to: 'MenuCommand'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: '#if TARGET_API_MAC_CARBON > DisableMenuCommand(menuHandle,commandID); > #endif' inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveDisableMenuItem:item: (in > category 'system primitives') ----- > primitiveDisableMenuItem: menuHandleOop item: anInteger > | menuHandle | > self primitive: 'primitiveDisableMenuItem' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'DisableMenuItem(menuHandle,anInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveDisableMenuItemIcon:item: (in > category 'system primitives') ----- > primitiveDisableMenuItemIcon: menuHandleOop item: anInteger > | menuHandle | > self primitive: 'primitiveDisableMenuItemIcon' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'DisableMenuItemIcon(menuHandle,anInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveDisposeMenu: (in category > 'system primitives') ----- > primitiveDisposeMenu: menuHandleOop > | menuHandle | > self primitive: 'primitiveDisposeMenu' > parameters: #(Oop). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'DisposeMenu(menuHandle)' inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveEnableMenuCommand:item: (in > category 'system primitives') ----- > primitiveEnableMenuCommand: menuHandleOop item: anInteger > | menuHandle commandID | > self primitive: 'primitiveEnableMenuCommand' > parameters: #(Oop Oop). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'commandID' type: 'MenuCommand'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > commandID := self cCoerce: (interpreterProxy positive32BitValueOf: > anInteger) to: 'MenuCommand'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: '#if TARGET_API_MAC_CARBON > EnableMenuCommand(menuHandle,commandID); > #endif' inSmalltalk:[menuHandle]. > ^nil! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveEnableMenuItem:item: (in > category 'system primitives') ----- > primitiveEnableMenuItem: menuHandleOop item: anInteger > | menuHandle | > self primitive: 'primitiveEnableMenuItem' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'EnableMenuItem(menuHandle,anInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveEnableMenuItemIcon:item: (in > category 'system primitives') ----- > primitiveEnableMenuItemIcon: menuHandleOop item: anInteger > | menuHandle | > self primitive: 'primitiveEnableMenuItemIcon' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'EnableMenuItemIcon(menuHandle,anInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveGetIndMenuItemWithCommandID:commandID: (in > category 'system primitives') ----- > primitiveGetIndMenuItemWithCommandID: menuHandleOop commandID: aCommandID > | menuHandle MenuItemIndex commandID applicationMenu outIndex | > self primitive: 'primitiveGetIndMenuItemWithCommandID' > parameters: #(Oop Oop). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'commandID' type: 'MenuCommand'. > self var: 'applicationMenu' type: 'MenuHandle'. > self var: 'outIndex' type: 'MenuItemIndex'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > commandID := self cCoerce: (interpreterProxy positive32BitValueOf: > aCommandID) to: 'MenuCommand'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: '#if TARGET_API_MAC_CARBON > GetIndMenuItemWithCommandID(menuHandle, kHICommandHide, 1, > &applicationMenu, &outIndex); > #endif' inSmalltalk:[menuHandle]. > ^outIndex asSmallIntegerObj > ! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveGetIndMenuWithCommandID:commandID: (in category > 'system primitives') ----- > primitiveGetIndMenuWithCommandID: menuHandleOop commandID: aCommandID > + | menuHandle commandID applicationMenu outIndex | > - | menuHandle MenuItemIndex commandID applicationMenu outIndex | > self primitive: 'primitiveGetIndMenuWithCommandID' > parameters: #(Oop Oop). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'commandID' type: 'MenuCommand'. > self var: 'applicationMenu' type: 'MenuHandle'. > self var: 'outIndex' type: 'MenuItemIndex'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > commandID := self cCoerce: (interpreterProxy positive32BitValueOf: > aCommandID) to: 'MenuCommand'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: '#if TARGET_API_MAC_CARBON > GetIndMenuItemWithCommandID(menuHandle, kHICommandHide, 1, > &applicationMenu, &outIndex); > #endif ' inSmalltalk:[menuHandle]. > + outIndex asSmallIntegerObj. "to avoid elimination of the > variable..." > + ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: > applicationMenu to: 'long') > - ^interpreterProxy positive32BitIntegerFor: (self cCoerce: > applicationMenu to: 'long') > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetItemCmd:item: (in category > 'system primitives') ----- > primitiveGetItemCmd: menuHandleOop item: anInteger > | menuHandle aCharacter | > <var: 'menuHandle' type: 'MenuHandle'> > <var: #aCharacter type: 'CharParameter'> > self primitive: 'primitiveGetItemCmd' > parameters: #(Oop SmallInteger). > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > aCharacter := 0. > self cCode: 'GetItemCmd(menuHandle,anInteger,&aCharacter)' > inSmalltalk:[menuHandle]. > ^aCharacter asSmallIntegerObj > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetItemIcon:item: (in category > 'system primitives') ----- > primitiveGetItemIcon: menuHandleOop item: anInteger > | menuHandle iconIndex | > self primitive: 'primitiveGetItemIcon' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'iconIndex' type: 'short'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > iconIndex := 0. > self cCode: 'GetItemIcon(menuHandle,anInteger,&iconIndex)' > inSmalltalk:[menuHandle]. > ^iconIndex asSmallIntegerObj > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetItemMark:item: (in category > 'system primitives') ----- > primitiveGetItemMark: menuHandleOop item: anInteger > | menuHandle aCharacter | > <var: 'menuHandle' type: 'MenuHandle'> > <var: #aCharacter type: 'CharParameter'> > self primitive: 'primitiveGetItemMark' > parameters: #(Oop SmallInteger). > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > aCharacter := 0. > self cCode: 'GetItemMark(menuHandle,anInteger,&aCharacter)' > inSmalltalk:[menuHandle]. > ^aCharacter asSmallIntegerObj > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetItemStyle:item: (in category > 'system primitives') ----- > primitiveGetItemStyle: menuHandleOop item: anInteger > | menuHandle chStyle | > self primitive: 'primitiveGetItemStyle' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'chStyle' type: 'Style'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > chStyle := 0. > self cCode: 'GetItemStyle(menuHandle,anInteger,&chStyle)' > inSmalltalk:[menuHandle]. > ^chStyle asSmallIntegerObj > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuBar (in category 'system > primitives') ----- > primitiveGetMenuBar > | menuHandle | > self primitive: 'primitiveGetMenuBar' > parameters: #(). > self var: 'menuHandle' type: 'Handle'. > menuHandle := self cCode: 'GetMenuBar()' inSmalltalk:[0]. > + ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: > menuHandle to: 'long')! > - ^interpreterProxy positive32BitIntegerFor: (self cCoerce: > menuHandle to: 'long')! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuHandle: (in category > 'system primitives') ----- > primitiveGetMenuHandle: menuID > | menuHandle | > self primitive: 'primitiveGetMenuHandle' > parameters: #(SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'menuID' type: 'MenuID'. > menuHandle := self cCode: 'GetMenuHandle(menuID)' inSmalltalk:[0]. > + ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: > menuHandle to: 'long')! > - ^interpreterProxy positive32BitIntegerFor: (self cCoerce: > menuHandle to: 'long')! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuID: (in category 'system > primitives') ----- > primitiveGetMenuID: menuHandleOop > | menuHandle menuID | > > self primitive: 'primitiveGetMenuID' > parameters: #(Oop ). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'menuID' type: 'MenuID'. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'menuID = GetMenuID(menuHandle)' > inSmalltalk:[menuHandle]. > ^menuID asSmallIntegerObj > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuItemCommandID:item: (in > category 'system primitives') ----- > primitiveGetMenuItemCommandID: menuHandleOop item: anInteger > | menuHandle outCommandID | > self primitive: 'primitiveGetMenuItemCommandID' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'outCommandID' type: 'MenuCommand'. > outCommandID := 0. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: > 'GetMenuItemCommandID(menuHandle,anInteger,&outCommandID)' > inSmalltalk:[menuHandle]. > ^interpreterProxy positive32BitIntegerFor: outCommandID > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuItemFontID:item: (in > category 'system primitives') ----- > primitiveGetMenuItemFontID: menuHandleOop item: anInteger > | menuHandle outFontID | > self primitive: 'primitiveGetMenuItemFontID' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'outFontID' type: 'SInt16'. > outFontID := 0. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'GetMenuItemFontID(menuHandle,anInteger,&outFontID)' > inSmalltalk:[menuHandle]. > ^outFontID asSmallIntegerObj > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuItemHierarchicalID:item: > (in category 'system primitives') ----- > primitiveGetMenuItemHierarchicalID: menuHandleOop item: anInteger > | menuHandle outHierID | > self primitive: 'primitiveGetMenuItemHierarchicalID' > parameters: #(Oop SmallInteger ). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'outHierID' type: 'MenuID'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > outHierID := 0. > self cCode: > 'GetMenuItemHierarchicalID(menuHandle,anInteger,&outHierID)' > inSmalltalk:[menuHandle]. > ^outHierID asSmallIntegerObj > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuItemKeyGlyph:item: (in > category 'system primitives') ----- > primitiveGetMenuItemKeyGlyph: menuHandleOop item: anInteger > | menuHandle outGlyph | > self primitive: 'primitiveGetMenuItemKeyGlyph' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'outGlyph' type: 'SInt16'. > outGlyph := 0. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'GetMenuItemKeyGlyph(menuHandle,anInteger,&outGlyph)' > inSmalltalk:[menuHandle]. > ^interpreterProxy positive32BitIntegerFor: outGlyph > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuItemModifiers:item: (in > category 'system primitives') ----- > primitiveGetMenuItemModifiers: menuHandleOop item: anInteger > | menuHandle outModifers | > self primitive: 'primitiveGetMenuItemModifiers' > parameters: #(Oop SmallInteger ). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'outModifers' type: 'Style'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > outModifers := 0. > self cCode: > 'GetMenuItemModifiers(menuHandle,anInteger,&outModifers)' > inSmalltalk:[menuHandle]. > ^outModifers asSmallIntegerObj > > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuItemText:item: (in > category 'system primitives') ----- > primitiveGetMenuItemText: menuHandleOop item: anInteger > | menuHandle size oop ptr aString | > <var: 'menuHandle' type: 'MenuHandle'> > <var: #aString type: 'Str255 '> > <var: #ptr type: 'char *'> > self primitive: 'primitiveGetMenuItemText' > parameters: #(Oop SmallInteger). > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > aString at: 0 put: 0. > self cCode: 'GetMenuItemText(menuHandle,anInteger,aString)' > inSmalltalk:[menuHandle]. > size := self cCode: 'aString[0]' inSmalltalk: [0]. > oop := interpreterProxy instantiateClass: interpreterProxy > classString indexableSize: size. > ptr := interpreterProxy firstIndexableField: oop. > 0 to: size-1 do:[:i| > ptr at: i put: (aString at: (i+1))]. > ^oop > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuItemTextEncoding:item: > (in category 'system primitives') ----- > primitiveGetMenuItemTextEncoding: menuHandleOop item: anInteger > | menuHandle outScriptID | > self primitive: 'primitiveGetMenuItemTextEncoding' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'outScriptID' type: 'TextEncoding'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: > 'GetMenuItemTextEncoding(menuHandle,anInteger,&outScriptID)' > inSmalltalk:[menuHandle]. > ^interpreterProxy positive32BitIntegerFor: outScriptID! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveGetMenuTitle: (in category > 'system primitives') ----- > primitiveGetMenuTitle: menuHandleOop > | menuHandle size oop ptr aString | > <var: 'menuHandle' type: 'MenuHandle'> > <var: #aString type: 'Str255 '> > <var: #ptr type: 'char *'> > self primitive: 'primitiveGetMenuTitle' > parameters: #(Oop). > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > aString at: 0 put: 0. > self cCode: 'GetMenuTitle(menuHandle,aString)' > inSmalltalk:[menuHandle]. > size := self cCode: 'aString[0]' inSmalltalk: [0]. > oop := interpreterProxy instantiateClass: interpreterProxy > classString indexableSize: size. > ptr := interpreterProxy firstIndexableField: oop. > 0 to: size-1 do:[:i| > ptr at: i put: (aString at: (i+1))]. > ^oop > > ! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveInsertFontResMenu:afterItem:scriptFilter: (in > category 'system primitives') ----- > primitiveInsertFontResMenu: menuHandleOop afterItem: afterItemInteger > scriptFilter: scriptFilterInteger > | menuHandle | > self primitive: 'primitiveInsertFontResMenu' > parameters: #(Oop SmallInteger SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: > 'InsertFontResMenu(menuHandle,afterItemInteger,scriptFilterInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveInsertIntlResMenu:theType:afterItem:scriptFilter: > (in category 'system primitives') ----- > primitiveInsertIntlResMenu: menuHandleOop theType: aResType afterItem: > afterItemInteger scriptFilter: scriptFilterInteger > | menuHandle resType | > self primitive: 'primitiveInsertIntlResMenu' > parameters: #(Oop SmallInteger SmallInteger SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'resType' type: 'ResType'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > resType := self cCoerce: (interpreterProxy positive32BitValueOf: > aResType) to: 'ResType'. > self cCode: > 'InsertIntlResMenu(menuHandle,resType,afterItemInteger,scriptFilterInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveInsertMenu:beforeID: (in > category 'system primitives') ----- > primitiveInsertMenu: menuHandleOop beforeID: anInteger > | menuHandle | > self primitive: 'primitiveInsertMenu' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'anInteger' type: 'MenuID'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'InsertMenu(menuHandle,anInteger)' > inSmalltalk:[menuHandle]. > ^nil! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveInsertMenuItem:itemString:afterItem: (in > category 'system primitives') ----- > primitiveInsertMenuItem: menuHandleOop itemString: str255 afterItem: > anInteger > | menuHandle constStr255 | > self primitive: 'primitiveInsertMenuItem' > parameters: #(Oop ByteArray SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'constStr255' type: 'ConstStr255Param'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > constStr255 := self cCoerce: str255 to: 'ConstStr255Param'. > self cCode: 'InsertMenuItem(menuHandle,constStr255,anInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveIsMenuItemEnabled:item: (in > category 'system primitives') ----- > primitiveIsMenuItemEnabled: menuHandleOop item: anInteger > > | menuHandle result | > self primitive: 'primitiveIsMenuItemEnabled' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > result := self cCode: 'IsMenuItemEnabled(menuHandle,anInteger)' > inSmalltalk:[0]. > ^result asOop: Boolean! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveIsMenuItemIconEnabled:item: (in > category 'system primitives') ----- > primitiveIsMenuItemIconEnabled: menuHandleOop item: anInteger > > | menuHandle result | > self primitive: 'primitiveIsMenuItemIconEnabled' > parameters: #(Oop SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > result := self cCode: > 'IsMenuItemIconEnabled(menuHandle,anInteger)' inSmalltalk:[0]. > ^result asOop: Boolean! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveNewMenu:menuTitle: (in category > 'system primitives') ----- > primitiveNewMenu: menuID menuTitle: menuTitle > > | menuHandle constStr255 | > self primitive: 'primitiveNewMenu' > parameters: #(SmallInteger ByteArray). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'constStr255' type: 'ConstStr255Param'. > self var: 'menuID' type: 'MenuID'. > > constStr255 := self cCoerce: menuTitle to: 'ConstStr255Param'. > menuHandle := self cCode: 'NewMenu(menuID,constStr255)' > inSmalltalk:[0]. > + ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: > menuHandle to: 'long')! > - ^interpreterProxy positive32BitIntegerFor: (self cCoerce: > menuHandle to: 'long')! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveSetItemCmd:item:cmdChar: (in > category 'system primitives') ----- > primitiveSetItemCmd: menuHandleOop item: anInteger cmdChar: > anIntegerCmdChar > | menuHandle aCharacter | > <var: 'menuHandle' type: 'MenuHandle'> > <var: #aCharacter type: 'CharParameter '> > self primitive: 'primitiveSetItemCmd' > parameters: #(Oop SmallInteger SmallInteger). > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > aCharacter := anIntegerCmdChar. > self cCode: 'SetItemCmd(menuHandle,anInteger,aCharacter)' > inSmalltalk:[menuHandle]. > ^nil > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveSetItemIcon:item:iconIndex: (in > category 'system primitives') ----- > primitiveSetItemIcon: menuHandleOop item: anInteger iconIndex: > aIconIndexInteger > | menuHandle | > self primitive: 'primitiveSetItemIcon' > parameters: #(Oop SmallInteger SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'SetItemIcon(menuHandle,anInteger,aIconIndexInteger)' > inSmalltalk:[menuHandle]. > ^nil > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveSetItemMark:item:markChar: (in > category 'system primitives') ----- > primitiveSetItemMark: menuHandleOop item: anInteger markChar: aMarkChar > | menuHandle aCharacter | > <var: 'menuHandle' type: 'MenuHandle'> > <var: #aCharacter type: 'CharParameter '> > self primitive: 'primitiveSetItemMark' > parameters: #(Oop SmallInteger SmallInteger). > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > aCharacter := aMarkChar. > self cCode: 'SetItemMark(menuHandle,anInteger,aCharacter)' > inSmalltalk:[menuHandle]. > ^nil > > ! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveSetItemStyle:item:styleParameter: (in category > 'system primitives') ----- > primitiveSetItemStyle: menuHandleOop item: anInteger styleParameter: > chStyleInteger > | menuHandle | > self primitive: 'primitiveSetItemStyle' > parameters: #(Oop SmallInteger SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'SetItemStyle(menuHandle,anInteger,chStyleInteger)' > inSmalltalk:[menuHandle]. > ^nil > > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveSetMenuBar: (in category > 'system primitives') ----- > primitiveSetMenuBar: menuHandleOop > > | menuBarHandle | > self primitive: 'primitiveSetMenuBar' > parameters: #(Oop). > self var: 'menuBarHandle' type: 'MenuBarHandle'. > + menuBarHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuBarHandle'. > - menuBarHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuBarHandle'. > self cCode: 'SetMenuBar(menuBarHandle)' > inSmalltalk:[menuBarHandle]. > ^nil! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveSetMenuItemCommandID:item:menuCommand: (in > category 'system primitives') ----- > primitiveSetMenuItemCommandID: menuHandleOop item: anInteger > menuCommand: inCommandID > | menuHandle commandID | > self primitive: 'primitiveSetMenuItemCommandID' > parameters: #(Oop SmallInteger Oop). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'commandID' type: 'MenuCommand'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > commandID := self cCoerce: (interpreterProxy positive32BitValueOf: > inCommandID) to: 'MenuCommand'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'SetMenuItemCommandID(menuHandle,anInteger,commandID)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveSetMenuItemFontID:item:fontID: > (in category 'system primitives') ----- > primitiveSetMenuItemFontID: menuHandleOop item: anInteger fontID: > aFontIDInteger > | menuHandle | > self primitive: 'primitiveSetMenuItemFontID' > parameters: #(Oop SmallInteger SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: > 'SetMenuItemFontID(menuHandle,anInteger,aFontIDInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveSetMenuItemHierarchicalID:item:hierID: (in > category 'system primitives') ----- > primitiveSetMenuItemHierarchicalID: menuHandleOop item: anInteger > hierID: aMenuID > | menuHandle | > self primitive: 'primitiveSetMenuItemHierarchicalID' > parameters: #(Oop SmallInteger SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'menuID' type: 'MenuID'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: > 'SetMenuItemHierarchicalID(menuHandle,anInteger,aMenuID)' > inSmalltalk:[menuHandle]. > ^nil! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveSetMenuItemKeyGlyph:item:glyph: > (in category 'system primitives') ----- > primitiveSetMenuItemKeyGlyph: menuHandleOop item: anInteger glyph: > inGlyphInteger > | menuHandle | > self primitive: 'primitiveSetMenuItemKeyGlyph' > parameters: #(Oop SmallInteger SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: > 'SetMenuItemKeyGlyph(menuHandle,anInteger,inGlyphInteger)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveSetMenuItemModifiers:item:inModifiers: (in > category 'system primitives') ----- > primitiveSetMenuItemModifiers: menuHandleOop item: anInteger > inModifiers: aUInt8 > | menuHandle | > self primitive: 'primitiveSetMenuItemModifiers' > parameters: #(Oop SmallInteger SmallInteger). > self var: 'menuHandle' type: 'MenuHandle'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > self cCode: 'SetMenuItemModifiers(menuHandle,anInteger,aUInt8)' > inSmalltalk:[menuHandle]. > ^nil! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveSetMenuItemText:item:itemString: (in category > 'system primitives') ----- > primitiveSetMenuItemText: menuHandleOop item: anInteger itemString: > str255 > | menuHandle constStr255 | > self primitive: 'primitiveSetMenuItemText' > parameters: #(Oop SmallInteger ByteArray). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'constStr255' type: 'ConstStr255Param'. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > constStr255 := self cCoerce: str255 to: 'ConstStr255Param'. > self cCode: 'SetMenuItemText(menuHandle,anInteger,constStr255)' > inSmalltalk:[menuHandle]. > ^nil > ! > > Item was changed: > ----- Method: > MacMenubarPlugin>>primitiveSetMenuItemTextEncoding:item:inScriptID: (in > category 'system primitives') ----- > primitiveSetMenuItemTextEncoding: menuHandleOop item: anInteger > inScriptID: aTextEncodingOop > | menuHandle inScriptID | > self primitive: 'primitiveSetMenuItemTextEncoding' > parameters: #(Oop SmallInteger Oop). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'inScriptID' type: 'TextEncoding'. > > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > inScriptID := self cCoerce: (interpreterProxy > positive32BitValueOf: aTextEncodingOop) to: 'TextEncoding'. > self cCode: > 'SetMenuItemTextEncoding(menuHandle,anInteger,inScriptID)' > inSmalltalk:[menuHandle]. > ^nil! > > Item was changed: > ----- Method: MacMenubarPlugin>>primitiveSetMenuTitle:title: (in > category 'system primitives') ----- > primitiveSetMenuTitle: menuHandleOop title: str255 > | menuHandle constStr255 | > self primitive: 'primitiveSetMenuTitle' > parameters: #(Oop ByteArray). > self var: 'menuHandle' type: 'MenuHandle'. > self var: 'constStr255' type: 'ConstStr255Param'. > + menuHandle := self cCoerce: (interpreterProxy > positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. > - menuHandle := self cCoerce: (interpreterProxy > positive32BitValueOf: menuHandleOop) to: 'MenuHandle'. > (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy > success: false]. > constStr255 := self cCoerce: str255 to: 'ConstStr255Param'. > self cCode: 'SetMenuTitle(menuHandle,constStr255)' > inSmalltalk:[menuHandle]. > ^nil > ! > > -- _,,,^..^,,,_ best, Eliot

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-EstebanLorenzano.1717.mcz
by Eliot Miranda 09 Mar '16

09 Mar '16

Hi Esteban, On Tue, Mar 8, 2016 at 11:32 PM, <commits(a)source.squeak.org> wrote: > > Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1717.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-EstebanLorenzano.1717 > Author: EstebanLorenzano > Time: 9 March 2016, 8:31:33.743422 am > UUID: 271f0af9-e85c-4afc-bf17-c4aa735ddaaa > Ancestors: VMMaker.oscog-eem.1716 > > using *machine methods instead singned64... and positive64... > > =============== Diff against VMMaker.oscog-eem.1716 =============== > > Item was changed: > ----- Method: ThreadedFFIPlugin>>primitiveFFIIntegerAt (in category > 'primitives') ----- > primitiveFFIIntegerAt > "Answer a (signed or unsigned) n byte integer from the given byte > offset > in the receiver, using the platform's endianness." > | isSigned byteSize byteOffset rcvr addr value mask valueOop | > <var: 'value' type: #usqLong> > <var: 'mask' type: #usqLong> > <export: true> > <inline: false> > isSigned := interpreterProxy booleanValueOf: (interpreterProxy > stackValue: 0). > byteSize := interpreterProxy stackIntegerValue: 1. > byteOffset := interpreterProxy stackIntegerValue: 2. > rcvr := interpreterProxy stackObjectValue: 3. > interpreterProxy failed ifTrue:[^0]. > (byteOffset > 0 > and: [(byteSize between: 1 and: 8) > and: [(byteSize bitAnd: byteSize - 1) = 0 "a.k.a. > isPowerOfTwo"]]) ifFalse: > [^interpreterProxy primitiveFail]. > addr := self ffiAddressOf: rcvr startingAt: byteOffset size: > byteSize. > interpreterProxy failed ifTrue:[^0]. > byteSize <= 2 > ifTrue: > [byteSize = 1 > ifTrue: [value := self cCoerceSimple: > (interpreterProxy byteAt: addr) to: #'unsigned char'] > ifFalse: [value := self cCoerceSimple: > (interpreterProxy shortAt: addr) to: #'unsigned short']] > ifFalse: > [byteSize = 4 > + ifTrue: [value := self cCoerceSimple: > (interpreterProxy long32At: addr) to: #'unsigned int'] > - ifTrue: [value := interpreterProxy > long32At: addr] > ifFalse: [value := interpreterProxy > long64At: addr]]. > byteSize < BytesPerWord > ifTrue: > [isSigned ifTrue: "sign extend value" > [mask := 1 << (byteSize * 8 - 1). > value := (value bitAnd: mask-1) - (value > bitAnd: mask)]. > "note: byte/short (&long if BytesPerWord=8) never > exceed SmallInteger range" > valueOop := interpreterProxy integerObjectOf: > value] > ifFalse: "general 64 bit integer; note these never fail" > [valueOop := isSigned > + > ifTrue:[interpreterProxy signedMachineIntegerFor: value] > + > ifFalse:[interpreterProxy positiveMachineIntegerFor: value]]. > - > ifTrue:[interpreterProxy signed64BitIntegerFor: value] > - > ifFalse:[interpreterProxy positive64BitIntegerFor: value]]. > ^interpreterProxy pop: 4 thenPush: valueOop! > This doesn't make sense to me. The lines [valueOop := isSigned + ifTrue:[interpreterProxy signedMachineIntegerFor: value] + ifFalse:[interpreterProxy positiveMachineIntegerFor: value]]. - ifTrue:[interpreterProxy signed64BitIntegerFor: value] - ifFalse:[interpreterProxy positive64BitIntegerFor: value]]. seem wrong. If we're on a 232-bit machine then signedMachineIntegerFor: & positiveMachineIntegerFor: will fail for 64-bit results, right? Whereas on both 32- and 64-bit machines signed64BitIntegerFor: & positive64BitIntegerFor: will work. I think the bug above is that if BytesPerWord is 4 there is no sign-extension of 32-bits to 64-bits. So it probably needs to read ifFalse: "general 64 bit integer; note these never fail" [(isSigned and: [byteSize = 4]) ifTrue: "sign-extend 32-bit results to 64-bits..." [mask := 1 << (byteSize * 8 - 1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. valueOop := isSigned ifTrue:[interpreterProxy signed64BitIntegerFor: value] ifFalse:[interpreterProxy positive64BitIntegerFor: value]]. It would really help if you tested both 64-bit and 32-bit VMs if you're changing this code. I know that's inconvenient but asking me to fix 64-bits if you break it is also unfair :-(. I will test the above, and if it's right, commit. _,,,^..^,,,_ best, Eliot

1 0

VM Maker: VMMaker.oscog-EstebanLorenzano.1717.mcz
by commits＠source.squeak.org 09 Mar '16

09 Mar '16

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1717.mcz ==================== Summary ==================== Name: VMMaker.oscog-EstebanLorenzano.1717 Author: EstebanLorenzano Time: 9 March 2016, 8:31:33.743422 am UUID: 271f0af9-e85c-4afc-bf17-c4aa735ddaaa Ancestors: VMMaker.oscog-eem.1716 using *machine methods instead singned64... and positive64... =============== Diff against VMMaker.oscog-eem.1716 =============== Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIIntegerAt (in category 'primitives') ----- primitiveFFIIntegerAt "Answer a (signed or unsigned) n byte integer from the given byte offset in the receiver, using the platform's endianness." | isSigned byteSize byteOffset rcvr addr value mask valueOop | <var: 'value' type: #usqLong> <var: 'mask' type: #usqLong> <export: true> <inline: false> isSigned := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). byteSize := interpreterProxy stackIntegerValue: 1. byteOffset := interpreterProxy stackIntegerValue: 2. rcvr := interpreterProxy stackObjectValue: 3. interpreterProxy failed ifTrue:[^0]. (byteOffset > 0 and: [(byteSize between: 1 and: 8) and: [(byteSize bitAnd: byteSize - 1) = 0 "a.k.a. isPowerOfTwo"]]) ifFalse: [^interpreterProxy primitiveFail]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: byteSize. interpreterProxy failed ifTrue:[^0]. byteSize <= 2 ifTrue: [byteSize = 1 ifTrue: [value := self cCoerceSimple: (interpreterProxy byteAt: addr) to: #'unsigned char'] ifFalse: [value := self cCoerceSimple: (interpreterProxy shortAt: addr) to: #'unsigned short']] ifFalse: [byteSize = 4 + ifTrue: [value := self cCoerceSimple: (interpreterProxy long32At: addr) to: #'unsigned int'] - ifTrue: [value := interpreterProxy long32At: addr] ifFalse: [value := interpreterProxy long64At: addr]]. byteSize < BytesPerWord ifTrue: [isSigned ifTrue: "sign extend value" [mask := 1 << (byteSize * 8 - 1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. "note: byte/short (&long if BytesPerWord=8) never exceed SmallInteger range" valueOop := interpreterProxy integerObjectOf: value] ifFalse: "general 64 bit integer; note these never fail" [valueOop := isSigned + ifTrue:[interpreterProxy signedMachineIntegerFor: value] + ifFalse:[interpreterProxy positiveMachineIntegerFor: value]]. - ifTrue:[interpreterProxy signed64BitIntegerFor: value] - ifFalse:[interpreterProxy positive64BitIntegerFor: value]]. ^interpreterProxy pop: 4 thenPush: valueOop!

1 0

VM Maker: VMMaker.oscog-eem.1716.mcz
by commits＠source.squeak.org 09 Mar '16

09 Mar '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1716.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1716 Author: eem Time: 8 March 2016, 4:26:55.123457 pm UUID: 9115c93b-f425-4118-96e7-7130adeff1f2 Ancestors: VMMaker.oscog-eem.1715 Fix the bug in markAndTraceClassOf: that causes the first class table page to become a visible array. Add a hack fix on initialization. SInce we /can/ fix the image manually this hack isn't necessary, but the manual fix won't work until the markAndTraceClassOf: bug is fixed. Sigh... =============== Diff against VMMaker.oscog-eem.1715 =============== Item was changed: ----- Method: SpurMemoryManager>>markAndTraceClassOf: (in category 'gc - global') ----- markAndTraceClassOf: objOop "Ensure the class of the argument is marked, pushing it on the markStack if not already marked. And for one-way become, which can create duplicate entries in the class table, make sure objOop's classIndex refers to the classObj's actual classIndex. Note that this is recursive, but the metaclass chain should terminate quickly." <inline: false> | classIndex classObj realClassIndex | classIndex := self classIndexOf: objOop. classObj := self classOrNilAtIndex: classIndex. self assert: (coInterpreter objCouldBeClassObj: classObj). realClassIndex := self rawHashBitsOf: classObj. + (classIndex ~= realClassIndex + and: [realClassIndex > self lastClassIndexPun]) ifTrue: - classIndex ~= realClassIndex ifTrue: [self setClassIndexOf: objOop to: realClassIndex]. (self isMarked: classObj) ifFalse: [self setIsMarkedOf: classObj to: true. self markAndTraceClassOf: classObj. self push: classObj onObjStack: markStack]! Item was changed: ----- Method: SpurMemoryManager>>setHiddenRootsObj: (in category 'class table') ----- setHiddenRootsObj: anOop hiddenRootsObj := anOop. self cCode: [self assert: self validClassTableRootPages] inSmalltalk: [numClassTablePages ifNotNil: [self assert: self validClassTableRootPages]]. classTableFirstPage := self fetchPointer: 0 ofObject: hiddenRootsObj. self assert: (self numSlotsOf: classTableFirstPage) - 1 = self classTableMinorIndexMask. + "Hack fix. A bug in markAndTraceClassOf: caused the class of the first class table page + to be changed from its pun. This can be restored manually, but we do it here too." + self flag: 'remove at some stage'. + (self classIndexOf: classTableFirstPage) ~= self arrayClassIndexPun ifTrue: + [self setClassIndexOf: classTableFirstPage to: self arrayClassIndexPun]. "Set classTableIndex to the start of the last used page (excepting first page). Set numClassTablePages to the number of used pages." numClassTablePages := self classTableRootSlots. 2 to: numClassTablePages - 1 do: [:i| (self fetchPointer: i ofObject: hiddenRootsObj) = nilObj ifTrue: [numClassTablePages := i. classTableIndex := (numClassTablePages - 1 max: 1) << self classTableMajorIndexShift. ^self]]. "no unused pages; set it to the start of the second page." classTableIndex := 1 << self classTableMajorIndexShift!

1 0

VM Maker: Cog-eem.316.mcz
by commits＠source.squeak.org 09 Mar '16

09 Mar '16

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.316.mcz ==================== Summary ==================== Name: Cog-eem.316 Author: eem Time: 8 March 2016, 3:13:29.910455 pm UUID: 9eb6d25c-959b-4852-bd48-adaf01ecc4c3 Ancestors: Cog-eem.315 Fix the Spur 32- to 64-bit bootstrap given that updated Spur images now have SmallFloat64 at the right place in the class table. =============== Diff against Cog-eem.315 =============== Item was changed: ----- Method: Spur32to64BitBootstrap>>alterSystem (in category 'bootstrap image') ----- alterSystem + self ensureSmallFloatInClassTable. - self installSmallFloatInClassTable. self nilWordSize! Item was added: + ----- Method: Spur32to64BitBootstrap>>ensureSmallFloatInClassTable (in category 'bootstrap image') ----- + ensureSmallFloatInClassTable + | firstClassTablePage smallFloatClass | + firstClassTablePage := heap64 fetchPointer: 0 ofObject: heap64 classTableRootObj. + smallFloatClass := self smallFloatClass. + (heap64 hashBitsOf: smallFloatClass) = heap64 smallFloatTag + ifTrue: + [self assert: (heap64 fetchPointer: heap64 smallFloatTag ofObject: firstClassTablePage) + = smallFloatClass] + ifFalse: + [self assert: (heap64 hashBitsOf: smallFloatClass) = 0. + heap64 + storePointer: heap64 smallFloatTag ofObject: firstClassTablePage withValue: smallFloatClass; + setHashBitsOf: smallFloatClass to: heap64 smallFloatTag]! Item was removed: - ----- Method: Spur32to64BitBootstrap>>installSmallFloatInClassTable (in category 'bootstrap image') ----- - installSmallFloatInClassTable - | firstPage smallFloatClass | - firstPage := heap64 fetchPointer: 0 ofObject: heap64 classTableRootObj. - smallFloatClass := self smallFloatClass. - self assert: (heap64 hashBitsOf: smallFloatClass) = 0. - heap64 - storePointer: heap64 smallFloatTag - ofObject: firstPage - withValue: smallFloatClass. - heap64 - setHashBitsOf: smallFloatClass to: heap64 smallFloatTag!

1 0

VM Maker: VMMaker.oscog-eem.1715.mcz
by commits＠source.squeak.org 09 Mar '16

09 Mar '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1715.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1715 Author: eem Time: 8 March 2016, 3:10:49.368185 pm UUID: 3e6d062f-668d-43fa-b068-402d2b862a2a Ancestors: VMMaker.oscog-EstebanLorenzano.1714 Ensure purgeDuplicateClassTableEntriesFor: will not destroy class pun entries. =============== Diff against VMMaker.oscog-EstebanLorenzano.1714 =============== Item was changed: ----- Method: SpurMemoryManager>>purgeDuplicateClassTableEntriesFor: (in category 'class table') ----- purgeDuplicateClassTableEntriesFor: aClass + "Given that either marking or allInstances has ensured that + all instances of aClass have the class's hash as their class + index, ensure aClass is in the table only at its hash (or a pun)." - "Given that either marking or allnstances has ensured that - all instances of aClass have the class's hash as their class - index, ensure aClass is in the table only at its hash." | expectedIndex | expectedIndex := self rawHashBitsOf: aClass. self classTableEntriesDo: [:entry :index| + (entry = aClass + and: [index ~= expectedIndex + and: [index > self lastClassIndexPun]]) ifTrue: - (entry = aClass and: [index ~= expectedIndex]) ifTrue: [self classAtIndex: index put: nilObj. index < classTableIndex ifTrue: [classTableIndex := index]]]. "classTableIndex must never index the first page, which is reserved for classes known to the VM." self assert: classTableIndex >= (1 << self classTableMajorIndexShift)!

1 0

[commit][3641] Provide a handler for the " About to serialize empty diffy version" warning
by commits＠squeakvm.org 08 Mar '16

08 Mar '16

Revision: 3641 Author: eliot Date: 2016-03-08 14:21:51 -0800 (Tue, 08 Mar 2016) Log Message: ----------- Provide a handler for the "About to serialize empty diffy version" warning during update. Modified Paths: -------------- branches/Cog/image/UpdateSqueakTrunkImage.st Modified: branches/Cog/image/UpdateSqueakTrunkImage.st =================================================================== --- branches/Cog/image/UpdateSqueakTrunkImage.st 2016-03-08 21:48:37 UTC (rev 3640) +++ branches/Cog/image/UpdateSqueakTrunkImage.st 2016-03-08 22:21:51 UTC (rev 3641) @@ -1,7 +1,14 @@ -[[MCMcmUpdater - defaultUpdateURL: 'http://source.squeak.org/trunk'; - updateFromServer] valueSupplyingAnswer: true] - on: Deprecation - do: [:ex| ex resume: nil]. +[[[MCMcmUpdater + defaultUpdateURL: 'http://source.squeak.org/trunk'; + updateFromServer] valueSupplyingAnswer: true] + on: Deprecation + do: [:ex| ex resume: nil]] + on: Warning + do: [:ex| | text | + text := ex messageText. + ((text beginsWith: 'This package depends on the following classes') + or: [text beginsWith: 'About to serialize an empty diffy version.']) ifFalse: + [ex pass]. + ex resume]. Smalltalk snapshot: true andQuit: true

1 0

[commit][3640] Update the image VM fetch scripts to fetch 16.08.3632.
by commits＠squeakvm.org 08 Mar '16

08 Mar '16

Revision: 3640 Author: eliot Date: 2016-03-08 13:48:37 -0800 (Tue, 08 Mar 2016) Log Message: ----------- Update the image VM fetch scripts to fetch 16.08.3632. Nuke pre-spur code in makegetnsvmscripts.sh Modified Paths: -------------- branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurNsvm.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/image/makegetnsvmscripts.sh Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2016-03-08 21:40:08 UTC (rev 3639) +++ branches/Cog/image/getGoodCogVM.sh 2016-03-08 21:48:37 UTC (rev 3640) @@ -1,32 +1,32 @@ #!/bin/sh -# Sets the VM env var to the r3602 Cog VM for the current platform. +# Sets the VM env var to the r3632 Cog VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=16.07.3602 -REV=3602 -LCBINDIR=4.0-3602 +TAG=16.08.3632 +REV=3632 +LCBINDIR=4.0-3632 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak 881a82bdab55694933114608c2e083f1 \ - Cog.app-$TAG.tgz e80c18e45b33f23dc17bedc5108385f9 + Cog.app/Contents/MacOS/Squeak cc870c04f3445c1a5e5de849db58d8d8 \ + Cog.app-$TAG.tgz cee17b54ab41396f9fd82e4eb10b17c6 VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr $OSREL \> 2.6.12; then get_vm_from_tar \ coglinuxht/lib/squeak/$LCBINDIR/squeak \ - coglinuxht-$TAG.tgz 0122db0348fbf6ee27e0189d8c6101ab + coglinuxht-$TAG.tgz b9096e5c8e377891ed1238a757f21ee9 else get_vm_from_tar \ coglinux/lib/squeak/$LCBINDIR/squeak \ - coglinux-$TAG.tgz 3dd2fc07aee66be652b7636bf2337090 + coglinux-$TAG.tgz f9a9e2bd413cc69df871d9d7f7d2dbc8 fi;; CYGWIN*) get_vm_from_zip \ - cogwin/SqueakConsole.exe 5a11b5d0fd2aa32e966cc76d85fd6876 \ - cogwin-$TAG.zip 71546e5fde965441ca6da248a2fd003f + cogwin/SqueakConsole.exe 04c056a037e8492e64d7e21133fc7788 \ + cogwin-$TAG.zip 6af572be45074f11f99d8a090bc5fe1d VM=cogwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurNsvm.sh =================================================================== --- branches/Cog/image/getGoodSpurNsvm.sh 2016-03-08 21:40:08 UTC (rev 3639) +++ branches/Cog/image/getGoodSpurNsvm.sh 2016-03-08 21:48:37 UTC (rev 3640) @@ -1,26 +1,26 @@ #!/bin/sh -# Sets the VM env var to the r3427 Newspeak Spur VM for the current platform. +# Sets the VM env var to the r3632 Newspeak Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=15.33.3427 -REV=3427 -LSBINDIR=5.0-3427 +TAG=16.08.3632 +REV=3632 +LSBINDIR=5.0-3632 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" 912f3274c7fd81fc681239939a549001 \ - "Newspeak Spur Virtual Machine.app-$TAG.tgz" d2c8cb923a62c054aa45f776b977dd24 + "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" aaf0792cc1494e43e01349565c52772e \ + "Newspeak Spur Virtual Machine.app-$TAG.tgz" 7405599f94a2c4eb9000e5bbcbb11713 VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";; Linux) get_vm_from_tar \ nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm \ - nsvmspurlinuxht-$TAG.tgz 46769daa78a05070f175bfd980749a83 + nsvmspurlinuxht-$TAG.tgz 2ad8a1d108801697e4d35ea48be0a459 VM=nsvmspurlinuxht/nsvm;; CYGWIN*) get_vm_from_zip \ - nsvmspurwin/nsvmConsole.exe 76e5468ad604396f35f93fd7a435a117 \ - nsvmspurwin-$TAG.zip ef126eca43771c61db2819832b853062 + nsvmspurwin/nsvmConsole.exe c1fa61e4a5fb1991d33d630e46d5fa69 \ + nsvmspurwin-$TAG.zip b3c03d6c310ec32226352b4a56cac940 VM=nsvmspurwin/nsvmConsole.exe;; *) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh 2016-03-08 21:40:08 UTC (rev 3639) +++ branches/Cog/image/getGoodSpurVM.sh 2016-03-08 21:48:37 UTC (rev 3640) @@ -1,26 +1,26 @@ #!/bin/sh -# Sets the VM env var to the r3602 Cog Spur VM for the current platform. +# Sets the VM env var to the r3632 Cog Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=16.07.3602 -REV=3602 -LSBINDIR=5.0-3602 +TAG=16.08.3632 +REV=3632 +LSBINDIR=5.0-3632 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - CogSpur.app/Contents/MacOS/Squeak 3c4491f496e2d8cc4d46b65c6c26808a \ - CogSpur.app-$TAG.tgz 5a29a80a4492ac2a2cc7106e2a3157e1 + CogSpur.app/Contents/MacOS/Squeak a74172e86eaab82870d5705e853d0a05 \ + CogSpur.app-$TAG.tgz 7d24f3b04df720c44aec7c17ae6e1fc2 VM=CogSpur.app/Contents/MacOS/Squeak;; Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 072645c861b7cf692373c6e0a7170e06 \ - cogspurlinuxht-$TAG.tgz c79a7e43dfa19a04ebb3a1d197f998dc + cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 109b49166f318e099302dd9b7af66bd1 \ + cogspurlinuxht-$TAG.tgz a04d9883f1477ac4715c953f066c426e VM=cogspurlinuxht/squeak;; CYGWIN*) get_vm_from_zip \ - cogspurwin/SqueakConsole.exe e802302bab1d7264eef1d5f7e99d938b \ - cogspurwin-$TAG.zip bc9a7078ef93bb357c5265d69ef66dae + cogspurwin/SqueakConsole.exe ebe86e40295e9e437c5e4883a02e0998 \ + cogspurwin-$TAG.zip 01fa8395a2ab6f52191979de7e79f48a VM=cogspurwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/makegetnsvmscripts.sh =================================================================== --- branches/Cog/image/makegetnsvmscripts.sh 2016-03-08 21:40:08 UTC (rev 3639) +++ branches/Cog/image/makegetnsvmscripts.sh 2016-03-08 21:48:37 UTC (rev 3640) @@ -30,8 +30,7 @@ . ./envvars.sh ABORT= -for a in "Newspeak Virtual Machine.app-$TAG.tgz" nsvmlinuxht-$TAG.tgz nsvmlinux-$TAG.tgz nsvmwin-$TAG.zip\ - "Newspeak Spur Virtual Machine.app-$TAG.tgz" nsvmspurlinuxht-$TAG.tgz nsvmspurwin-$TAG.zip +for a in "Newspeak Spur Virtual Machine.app-$TAG.tgz" nsvmspurlinuxht-$TAG.tgz nsvmspurwin-$TAG.zip do test -f "../products/$a" || echo $a does not exist test -f "../products/$a" && (cd "$SD" >/dev/null;

1 0

[commit][3639] Nuke the obsolete session id determination code in sqFilePluginBasicPrims. c,
by commits＠squeakvm.org 08 Mar '16

08 Mar '16

Revision: 3639 Author: eliot Date: 2016-03-08 13:40:08 -0800 (Tue, 08 Mar 2016) Log Message: ----------- Nuke the obsolete session id determination code in sqFilePluginBasicPrims.c, leaving the proper interpreterProxy-based code in place. Modified Paths: -------------- trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c =================================================================== --- trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2016-03-08 21:38:11 UTC (rev 3638) +++ trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2016-03-08 21:40:08 UTC (rev 3639) @@ -211,12 +211,7 @@ Zero is never used for a valid session number. Should be called once at startup time. */ -#if VM_PROXY_MINOR > 6 thisSession = interpreterProxy->getThisSessionID(); -#else - thisSession = ioLowResMSecs() + time(NULL); - if (thisSession == 0) thisSession = 1; /* don't use 0 */ -#endif return 1; } Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Feb 22 10:32:52 PST 2016 + Tue Mar 8 13:38:04 PST 2016

1 0

← Newer
1
...
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2016