Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

VM Maker: VMMaker.oscog-eem.1697.mcz
by commits＠source.squeak.org 24 Feb '16

24 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1697.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1697 Author: eem Time: 23 February 2016, 4:52:59.370596 pm UUID: 03f07782-25a7-4178-8528-7f8638ca30ff Ancestors: VMMaker.oscog-eem.1696 And get the adjustment correct for the SimpleStackBasedCogit too. =============== Diff against VMMaker.oscog-eem.1696 =============== Item was changed: ----- Method: SimpleStackBasedCogit>>adjustArgumentsForPerform: (in category 'primitive generators') ----- adjustArgumentsForPerform: numArgs + "e.g. Receiver Receiver or Receiver Receiver (RISC) + Selector/Arg0 => Arg1 Selector/Arg0 => Arg1 + Arg1 Arg2 Arg1 Arg2 + Arg2 Arg3 Arg2 sp-> Arg3 + Arg3 sp-> retpc sp-> Arg3 - "e.g. Receiver Receiver - Selector/Arg0 => Arg1 - Arg1 Arg2 - Arg2 sp-> retpc sp-> retpc" + backEnd hasLinkRegister + ifTrue: + [numArgs - 2 to: 0 by: -1 do: + [:index| + self MoveMw: index * objectMemory wordSize r: SPReg R: TempReg. + self MoveR: TempReg Mw: index + 1 * objectMemory wordSize r: SPReg]. + self AddCq: objectMemory wordSize R: SPReg] + ifFalse: + [numArgs - 1 to: 1 by: -1 do: + [:index| + self MoveMw: index * objectMemory wordSize r: SPReg R: TempReg. + self MoveR: TempReg Mw: index + 1 * objectMemory wordSize r: SPReg]. + self PopR: TempReg. + self MoveR: TempReg Mw: 0 r: SPReg]! - (backEnd hasLinkRegister ifTrue: [numArgs - 2] ifFalse: [numArgs - 1]) to: 0 by: -1 do: - [:index| - self MoveMw: index * objectMemory wordSize r: SPReg R: TempReg. - self MoveR: TempReg Mw: index + 1 * objectMemory wordSize r: SPReg]. - self PopR: TempReg. - self MoveR: TempReg Mw: 0 r: SPReg!

1 0

VM Maker: VMMaker.oscog-eem.1696.mcz
by commits＠source.squeak.org 24 Feb '16

24 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1696.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1696 Author: eem Time: 23 February 2016, 4:35:02.71435 pm UUID: 4db47df6-c329-44ca-a255-7483a9cac28f Ancestors: VMMaker.oscog-tfel.1695 Fix serious bug in jitted perform: primitive. Thanks to Stéphane Ducasse for finding and to Levente Uzoni for diagnosing the bug. If the argument count is one greater than the max number of register aerguments (2 in Spur, hence perform:with:with:) then the code to remove the receiver and arguments from the stack forgot to remove the receiver and selector. =============== Diff against VMMaker.oscog-tfel.1695 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>adjustArgumentsForPerform: (in category 'primitive generators') ----- adjustArgumentsForPerform: numArgs "Generate code to adjust the possibly stacked arguments immediately before jumping to a method looked up by a perform primitive." self assert: self numRegArgs <= 2. self assert: numArgs >= 1. numArgs <= self numRegArgs ifTrue: [numArgs = 2 ifTrue: [self MoveR: Arg1Reg R: Arg0Reg]. ^self]. + "If the arity is one more than the max numRegArgs, the receiver and all arguments have to be removed from the stack." self numRegArgs + 1 = numArgs ifTrue: [backEnd hasLinkRegister ifTrue: + [self numRegArgs = 2 + ifTrue: + [self MoveMw: 0 r: SPReg R: Arg1Reg. + self MoveMw: objectMemory wordSize r: SPReg R: Arg0Reg] + ifFalse: + [self MoveMw: 0 r: SPReg R: Arg0Reg]. + self AddCq: numArgs + 1 * objectMemory wordSize R: SPReg] - [self numRegArgs = 2 ifTrue: - [self PopR: Arg1Reg]. - self PopR: Arg0Reg] ifFalse: + [self MoveMw: 0 r: SPReg R: TempReg. "save retpc" + self numRegArgs = 2 + ifTrue: + [self MoveMw: objectMemory wordSize r: SPReg R: Arg1Reg. + self MoveMw: objectMemory wordSize * 2 r: SPReg R: Arg0Reg] + ifFalse: + [self MoveMw: objectMemory wordSize r: SPReg R: Arg0Reg]. + self AddCq: numArgs + 1 * objectMemory wordSize R: SPReg. + self MoveR: TempReg Mw: 0 r: SPReg "Overwrite pushed receiver; ReceiverResultReg already contains receiver."]. - [self PopR: TempReg. "save retpc" - self numRegArgs = 2 ifTrue: - [self PopR: Arg1Reg]. - self MoveMw: 0 r: SPReg R: Arg0Reg. - self MoveR: TempReg Mw: 0 r: SPReg]. ^self]. "e.g. Receiver Receiver Selector/Arg0 => Arg1 Arg1 Arg2 Arg2 sp-> Arg3 sp-> Arg3" super adjustArgumentsForPerform: numArgs!

1 0

[commit][3629] Include the FFI plugin in the 64-bit linux builds.
by commits＠squeakvm.org 23 Feb '16

23 Feb '16

Revision: 3629 Author: eliot Date: 2016-02-23 11:46:31 -0800 (Tue, 23 Feb 2016) Log Message: ----------- Include the FFI plugin in the 64-bit linux builds. Modified Paths: -------------- branches/Cog/build.linux64x64/squeak.cog.spur/plugins.ext branches/Cog/build.linux64x64/squeak.stack.spur/plugins.ext Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux64x64/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.linux64x64/squeak.cog.spur/plugins.ext 2016-02-23 17:42:03 UTC (rev 3628) +++ branches/Cog/build.linux64x64/squeak.cog.spur/plugins.ext 2016-02-23 19:46:31 UTC (rev 3629) @@ -1,8 +1,7 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext -# SqueakFFIPrims needs implementing EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ -SqueakFFI \ +SqueakFFIPrims \ SqueakSSL \ LocalePlugin \ UnicodePlugin \ Modified: branches/Cog/build.linux64x64/squeak.stack.spur/plugins.ext =================================================================== --- branches/Cog/build.linux64x64/squeak.stack.spur/plugins.ext 2016-02-23 17:42:03 UTC (rev 3628) +++ branches/Cog/build.linux64x64/squeak.stack.spur/plugins.ext 2016-02-23 19:46:31 UTC (rev 3629) @@ -1,8 +1,7 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext -# SqueakFFIPrims needs implementing EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ -SqueakFFI \ +SqueakFFIPrims \ SqueakSSL \ LocalePlugin \ UnicodePlugin \ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Feb 23 09:37:05 PST 2016 + Tue Feb 23 11:46:01 PST 2016

1 0

Re: [squeak-dev] Shift+Tab doesn't outdent on linux
by Eliot Miranda 23 Feb '16

23 Feb '16

On Tue, Feb 23, 2016 at 10:04 AM, Levente Uzonyi <leves(a)caesar.elte.hu> wrote: > It might have been over RFB when it worked. This means that we either need > a new VM which supports it, or we have to move indentation to some other > combination. The issue must lie in the platforms/unix/vm-displayX11 code right? Volunteers? Levente > > > On Tue, 23 Feb 2016, Chris Muller wrote: > > I don't remember it ever working in Linux. The VM does not detect >> Shift+Tab in Linux, but does on other platforms. >> >> On Tue, Feb 23, 2016 at 8:08 AM, Levente Uzonyi <leves(a)caesar.elte.hu> >> wrote: >> >>> Hi All, >>> >>> As the subject says, outdenting is broken in the Trunk. It used to work >>> short after Chris changed the keys, but it doesn't anymore. >>> Does anyone know why? >>> Does it work on other platforms? >>> >>> Levente >>> >> _,,,^..^,,,_ best, Eliot

1 0

VM Maker: VMMaker.oscog-tfel.1695.mcz
by commits＠source.squeak.org 23 Feb '16

23 Feb '16

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tfel.1695.mcz ==================== Summary ==================== Name: VMMaker.oscog-tfel.1695 Author: tfel Time: 23 February 2016, 6:39:07.904562 pm UUID: 8941a433-6d64-41cf-b9dc-6cf005dd51cd Ancestors: VMMaker.oscog-eem.1694 add a long32At: method (parallel to longAt:) to InterpreterProxy =============== Diff against VMMaker.oscog-eem.1694 =============== Item was added: + ----- Method: InterpreterProxy>>long32At: (in category 'private') ----- + long32At: arrayOffset + + ^ arrayOffset long32At: 0 + !

1 0

VM Maker: VMMaker.oscog-eem.1694.mcz
by commits＠source.squeak.org 23 Feb '16

23 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1694.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1694 Author: eem Time: 23 February 2016, 9:30:35.750871 am UUID: e1381bbc-a5af-4a35-ac60-a739611c7e0e Ancestors: VMMaker.oscog-eem.1693 Fix compilation of ThreadedFFIPlugin subclasses as internal plugins. =============== Diff against VMMaker.oscog-eem.1693 =============== Item was changed: ----- Method: ThreadedFFIPlugin class>>generateCodeStringForPrimitives (in category 'translation') ----- generateCodeStringForPrimitives "Output a skeletal SqueakFFIPrims.c that includes the relevant FooFFIPlugin.c for each subclass based on the identifyingPredefinedMacros the subclass defines." ^String streamContents: [:s| s nextPutAll: '/* Automatically generated by\ ' withCRs. s nextPutAll: (CCodeGenerator monticelloDescriptionFor: self). s cr; nextPutAll: ' */'. s cr; cr; nextPut: $#. (self allSubclasses sort: [:a :b| a name < b name]) do: [:class | class identifyingPredefinedMacros ifNotNil: [:predefinedMacros| s nextPutAll: 'if '. class includingPredefinedMacros ifNotNil: [:includingMacros| includingMacros do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPutAll: ') && ']. s nextPut: $(]. class excludingPredefinedMacros ifNotNil: [:excludingMacros| excludingMacros do: [:predefinedMacro| s nextPutAll: '!!defined('; nextPutAll: predefinedMacro; nextPutAll: ') && ']. s nextPut: $(]. predefinedMacros do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPut: $)] separatedBy: [s nextPutAll: ' || ']. class excludingPredefinedMacros ifNotNil: [s nextPut: $)]. class includingPredefinedMacros ifNotNil: [s nextPut: $)]. + s cr; cr; nextPutAll: '# define '; nextPutAll: class moduleName; nextPutAll: '_exports '; + nextPutAll: self moduleName; nextPutAll: '_exports'. + s cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'. - s cr; cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'. s cr; cr; nextPutAll: '#el']]. s nextPutAll: 'se'. #( 'As yet no FFI implementation appears to exist for your platform.' 'Consider implementing it, starting by adding a subclass of ThreadedFFIPlugin.') do: + [:msg| s cr; nextPutAll: '# error '; nextPutAll: msg]. - [:msg| s cr; nextPutAll: '# error '; nextPutAll: msg]. s cr; nextPutAll: '#endif'; cr]!

1 0

VM Maker: VMMaker.oscog-eem.1693.mcz
by commits＠source.squeak.org 23 Feb '16

23 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1693.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1693 Author: eem Time: 22 February 2016, 6:43:36.966841 pm UUID: 609488bc-c34d-49c6-8040-676e1a9d9d0e Ancestors: VMMaker.oscog-eem.1692 Fix a bug in printHex: for 64-bits (faulty arithmetic). Fix the remaining 64-bit issues in the ThreadedFFIPlugin. The X64SysVFFIPlugin now passes the test suite. The issues addressed are: Masks for restricting and signing integral return values must be declared as at least long (again the fact that a manifest integer constat's type defaults to int causes problems). Cast 1 << foo to 1 asUnsignedLong << foo in one place where it is required. Use isFloatObject: rather than floatClass to test for floats since this works for both SmallFloat64 and BoxedFloat64 on 64-bit Spur. Several pointer declarations needed to be e.g. <var: #ptr type: #'long *'>, not <var: #ptr type: #'int *'>. Several casts to int of of firstIndexableField: (which has tyype void *) were discarded. ExternalAddresses and the like need to be created with BytesPerWord or (self sizeof: #'void *'),, not 4. Modify Slang to cast a manifest constant that is the receiver of a shift to long (via postpending 'L' to the numeric string). Speed up ffiIntegerValueOf: by adding a tag test (harmless in our current crop of VMs) and cppIf: SPURVM as appropriate. (N.B. not merging with VMMaker.oscog-EstebanLorenzano.1692. The change there-in is incorrect. Esteban and I have discussed and resolved the issue off line). =============== Diff against VMMaker.oscog-eem.1692 =============== Item was changed: ----- Method: CCodeGenerator>>generateShiftLeft:on:indent: (in category 'C translation') ----- generateShiftLeft: msgNode on: aStream indent: level + "Generate a C bitShift. If we can determine the result would overflow the word size, + cast to a long long integer. If the receiver is an integer constant make sure its type + is long, since the default type of numeric constants is int, which plays havoc in 64-bits." - "Generate a C bitShift. If we can determine the result - would overflow the word size, cast to a long integer." | rcvr arg valueBeyondInt castToLong | rcvr := msgNode receiver. arg := msgNode args first. valueBeyondInt := 1 bitShift: 32. "The default type of const << N is int." castToLong := vmClass notNil and: [vmClass objectMemoryClass wordSize = 8]. castToLong ifFalse: [rcvr constantNumbericValueOrNil ifNotNil: [:rcvrVal| arg constantNumbericValueOrNil ifNotNil: [:argVal| castToLong := rcvrVal < valueBeyondInt and: [(rcvrVal bitShift: argVal) >= valueBeyondInt]]]]. castToLong ifTrue: [(rcvr isConstant and: [rcvr name isEmpty]) ifTrue: [self emitCExpression: rcvr on: aStream. aStream nextPutAll: 'LL'] ifFalse: [aStream nextPutAll: '((long)'. self emitCExpression: rcvr on: aStream. aStream nextPut: $)]] ifFalse: + [self emitCExpression: rcvr on: aStream. + (rcvr isConstant and: [rcvr name isEmpty]) ifTrue: + [aStream nextPut: $L]]. - [self emitCExpression: rcvr on: aStream]. aStream nextPutAll: ' << '. self emitCExpression: arg on: aStream! Item was changed: ----- Method: Interpreter>>printHex: (in category 'debug printing') ----- printHex: n "Print n in hex, in the form ' 0x1234', padded to a width of 10 characters in 32-bits ('0x' + 8 nibbles) or 18 characters in 64-bits ('0x' + 16 nibbles)" <api> | len buf | + <var: #buf declareC: 'char buf[37]'> "large enough for a 64-bit value in hex plus the null plus 16 spaces" + self cCode: 'memset(buf,'' '',36)' inSmalltalk: [buf := 'doh!!']. - <var: #buf declareC: 'char buf[35]'> "large enough for a 64-bit value in hex plus the null plus 16 spaces" - self cCode: 'memset(buf,'' '',34)' inSmalltalk: [buf := 'doh!!']. len := self cCode: 'sprintf(buf + 2 + 2 * BytesPerWord, "0x%lx", (unsigned long)(n))'. self cCode: 'printf("%s", buf + len)'. len touch: buf! Item was changed: ----- Method: StackInterpreter>>printHex: (in category 'debug printing') ----- printHex: n "Print n in hex, in the form ' 0x1234', padded to a width of 10 characters in 32-bits ('0x' + 8 nibbles) or 18 characters in 64-bits ('0x' + 16 nibbles)" <api> | len buf | + <var: #buf declareC: 'char buf[37]'> "large enough for a 64-bit value in hex plus the null plus 16 spaces" + self cCode: 'memset(buf,'' '',36)' inSmalltalk: [buf := 'doh!!']. - <var: #buf declareC: 'char buf[35]'> "large enough for a 64-bit value in hex plus the null plus 16 spaces" - self cCode: 'memset(buf,'' '',34)' inSmalltalk: [buf := 'doh!!']. len := self cCode: 'sprintf(buf + 2 + 2 * BytesPerWord, "0x%lx", (unsigned long)(n))'. self cCode: 'printf("%s", buf + len)'. len touch: buf! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiCreateIntegralResultOop:ofAtomicType:in: (in category 'callout support') ----- ffiCreateIntegralResultOop: retVal ofAtomicType: atomicType in: calloutState <inline: true> <var: #calloutState type: #'CalloutState *'> <var: #retVal type: #usqLong> "Callout support. Return the appropriate oop for the given atomic type" | shift value mask byteSize | + <var: 'value' type: #usqLong> + <var: 'mask' type: #usqLong> self assert: atomicType < FFITypeSingleFloat. atomicType = FFITypeBool ifTrue: ["Make sure bool honors the byte size requested" byteSize := calloutState ffiRetHeader bitAnd: FFIStructSizeMask. value := byteSize = (self sizeof: retVal) ifTrue:[retVal] ifFalse:[retVal bitAnd: 1 << (byteSize * 8) - 1]. ^value = 0 ifTrue:[interpreterProxy falseObject] ifFalse:[interpreterProxy trueObject]]. atomicType <= FFITypeSignedInt ifTrue: ["these are all generall integer returns" + atomicType <= (BytesPerWord = 8 ifTrue: [FFITypeSignedInt] ifFalse: [FFITypeSignedShort]) ifTrue: - atomicType <= FFITypeSignedShort ifTrue: ["byte/short. first extract partial word, then sign extend" + shift := (BytesPerWord = 8 and: [atomicType >= FFITypeUnsignedInt]) + ifTrue: [32] + ifFalse: [(atomicType >> 1) * 8]. "# of significant bits" + value := retVal bitAnd: (1 asUnsignedLong << shift - 1). - shift := (atomicType >> 1) * 8. "# of significant bits" - value := retVal bitAnd: (1 << shift - 1). (atomicType anyMask: 1) ifTrue: ["make the guy signed" + mask := 1 asUnsignedLong << (shift-1). - mask := 1 << (shift-1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. ^interpreterProxy integerObjectOf: value]. + "Word sized integer return" - "32bit integer return" ^(atomicType anyMask: 1) + ifTrue:[interpreterProxy signedMachineIntegerFor: retVal] "signed return" + ifFalse:[interpreterProxy positiveMachineIntegerFor: retVal]]. "unsigned return" - ifTrue:[interpreterProxy signed32BitIntegerFor: retVal] "signed return" - ifFalse:[interpreterProxy positive32BitIntegerFor: retVal]]. "unsigned return" "longlong, char" ^(atomicType >> 1) = (FFITypeSignedLongLong >> 1) ifTrue: [(atomicType anyMask: 1) ifTrue:[interpreterProxy signed64BitIntegerFor: retVal] "signed return" ifFalse:[interpreterProxy positive64BitIntegerFor: retVal]] ifFalse: [interpreterProxy characterObjectOf: (retVal bitAnd: Byte0Mask)]! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiFloatValueOf: (in category 'callout support') ----- ffiFloatValueOf: oop "Support for generic callout. Return a float value that is coerced as C would do." + <returnTypeC: #double> + (interpreterProxy isFloatObject: oop) ifTrue: + [^interpreterProxy floatValueOf: oop]. - | oopClass | - <returnTypeC:'double'> - oopClass := interpreterProxy fetchClassOf: oop. - oopClass = interpreterProxy classFloat - ifTrue:[^interpreterProxy floatValueOf: oop]. "otherwise try the integer coercions and return its float value" ^(self ffiIntegerValueOf: oop) asFloat! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiIntegerValueOf: (in category 'callout support') ----- ffiIntegerValueOf: oop + "Support for generic callout. Answer an integer value that is coerced as C would do." - "Support for generic callout. Return an integer value that is coerced as C would do." - | oopClass | <inline: true> + "Cheat with a tag test" + (oop anyMask: BytesPerWord - 1) + ifTrue: + [(interpreterProxy isIntegerObject: oop) ifTrue: + [^interpreterProxy integerValueOf: oop]. + self cppIf: SPURVM + ifTrue: + [(interpreterProxy isCharacterObject: oop) ifTrue: "Immediate in Spur" + [^interpreterProxy characterValueOf: oop]. + (interpreterProxy isFloatObject: oop) ifTrue: "Immediate in 64-bit Spur" + [^interpreterProxy floatValueOf: oop]]] + ifFalse: + [self cppIf: SPURVM + ifTrue: "No non-immediate characters in Spur" + [] + ifFalse: + [(interpreterProxy isCharacterObject: oop) ifTrue: + [^interpreterProxy characterValueOf: oop]]. + (interpreterProxy isFloatObject: oop) ifTrue: + [^interpreterProxy floatValueOf: oop]. + oop = interpreterProxy nilObject ifTrue: [^0]. "@@: should we really allow this????" + oop = interpreterProxy falseObject ifTrue: [^0]. + oop = interpreterProxy trueObject ifTrue: [^1]. + (interpreterProxy fetchClassOf: oop) = interpreterProxy classLargePositiveInteger ifTrue: + [self cppIf: BytesPerWord = 8 "Use cppIf: to get the return type of the function right. Should be sqInt on 32-bits." + ifTrue: [^interpreterProxy positive64BitValueOf: oop] + ifFalse: [^interpreterProxy positive32BitValueOf: oop]]]. - (interpreterProxy isIntegerObject: oop) ifTrue: - [^interpreterProxy integerValueOf: oop]. - oop = interpreterProxy nilObject ifTrue: [^0]. "@@: should we really allow this????" - oop = interpreterProxy falseObject ifTrue: [^0]. - oop = interpreterProxy trueObject ifTrue: [^1]. - oopClass := interpreterProxy fetchClassOf: oop. - oopClass = interpreterProxy classFloat ifTrue: - [^(interpreterProxy floatValueOf: oop) asInteger]. - oopClass = interpreterProxy classCharacter ifTrue: - [^interpreterProxy characterValueOf: oop]. - oopClass = interpreterProxy classLargePositiveInteger ifTrue: - [^interpreterProxy positive32BitValueOf: oop]. ^interpreterProxy signedMachineIntegerValueOf: oop "<- will fail if not integer"! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiLoadCalloutAddress: (in category 'symbol loading') ----- ffiLoadCalloutAddress: lit "Load the address of the foreign function from the given object" | addressPtr address ptr | + <var: #ptr type: #'long *'> - <var: #ptr type: #'int *'> "Lookup the address" addressPtr := interpreterProxy fetchPointer: 0 ofObject: lit. "Make sure it's an external handle" address := self ffiContentsOfHandle: addressPtr errCode: FFIErrorBadAddress. interpreterProxy failed ifTrue: [^0]. address = 0 ifTrue:"Go look it up in the module" [self externalFunctionHasStackSizeSlot ifTrue: [interpreterProxy storePointer: ExternalFunctionStackSizeIndex ofObject: lit withValue: (interpreterProxy integerObjectOf: -1)]. (interpreterProxy slotSizeOf: lit) < 5 ifTrue: [^self ffiFail: FFIErrorNoModule]. address := self ffiLoadCalloutAddressFrom: lit. interpreterProxy failed ifTrue: [^0]. "Store back the address" ptr := interpreterProxy firstIndexableField: addressPtr. ptr at: 0 put: address]. ^address! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiPushPointerContentsOf:in: (in category 'marshalling') ----- ffiPushPointerContentsOf: oop in: calloutState <var: #calloutState type: #'CalloutState *'> "Push the contents of the given external structure" | ptrClass ptrAddress | <inline: false> ptrClass := interpreterProxy fetchClassOf: oop. + ptrClass = interpreterProxy classExternalAddress ifTrue: + [ptrAddress := (interpreterProxy fetchPointer: 0 ofObject: oop) asVoidPointer. - ptrClass = interpreterProxy classExternalAddress ifTrue:[ - ptrAddress := interpreterProxy fetchPointer: 0 ofObject: oop. "Don't you dare to pass pointers into object memory" (interpreterProxy isInMemory: ptrAddress) ifTrue: [^FFIErrorInvalidPointer]. ^self ffiPushPointer: ptrAddress in: calloutState]. ptrClass = interpreterProxy classByteArray ifTrue: ["Since this involves passing the address of the first indexable field we need to fail the call if it is threaded and the object is young, since it may move during the call." self cppIf: COGMTVM ifTrue: [((calloutState callFlags anyMask: FFICallFlagThreaded) and: [interpreterProxy isYoung: oop]) ifTrue: [^PrimErrObjectMayMove negated]]. + ptrAddress := interpreterProxy firstIndexableField: oop. - ptrAddress := self cCoerce: (interpreterProxy firstIndexableField: oop) to: #int. ^self ffiPushPointer: ptrAddress in: calloutState]. (interpreterProxy includesBehavior: ptrClass ThatOf: interpreterProxy classAlien) ifTrue: [self cppIf: COGMTVM ifTrue: [((calloutState callFlags anyMask: FFICallFlagThreaded) and: [(self isDirectAlien: oop) and: [interpreterProxy isYoung: oop]]) ifTrue: [^PrimErrObjectMayMove negated]]. ptrAddress := self startOfData: oop. ^self ffiPushPointer: ptrAddress in: calloutState]. ^FFIErrorBadArg! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiPushStructureContentsOf:in: (in category 'callout support') ----- ffiPushStructureContentsOf: oop in: calloutState <var: #calloutState type: #'CalloutState *'> "Push the contents of the given external structure" | ptrClass ptrAddress | <inline: true> ptrClass := interpreterProxy fetchClassOf: oop. ptrClass = interpreterProxy classExternalAddress ifTrue: "ExternalAddress is bytes" + [ptrAddress := (interpreterProxy fetchPointer: 0 ofObject: oop) asVoidPointer. - [ptrAddress :=interpreterProxy fetchPointer: 0 ofObject: oop. "There is no way we can make sure the structure is valid. But we can at least check for attempts to pass pointers to ST memory." (interpreterProxy isInMemory: ptrAddress) ifTrue: [^FFIErrorInvalidPointer]. + ^self ffiPushStructure: ptrAddress - ^self ffiPushStructure: (self cCoerceSimple: ptrAddress to: #'void *') ofSize: (calloutState ffiArgHeader bitAnd: FFIStructSizeMask) typeSpec: calloutState ffiArgSpec ofLength: calloutState ffiArgSpecSize in: calloutState]. ptrClass = interpreterProxy classByteArray ifTrue: ["The following is a somewhat pessimistic test but I like being sure..." (interpreterProxy byteSizeOf: oop) = (calloutState ffiArgHeader bitAnd: FFIStructSizeMask) ifFalse:[^FFIErrorStructSize]. + ptrAddress := interpreterProxy firstIndexableField: oop. + (calloutState ffiArgHeader anyMask: FFIFlagPointer) ifFalse: - ptrAddress := self cCoerceSimple: (interpreterProxy firstIndexableField: oop) to: #int. - (calloutState ffiArgHeader anyMask: FFIFlagPointer) ifFalse:[ "Since this involves passing the address of the first indexable field we need to fail the call if it is threaded and the object is young, since it may move during the call." + [self cppIf: COGMTVM ifTrue: - self cppIf: COGMTVM ifTrue: [((calloutState callFlags anyMask: FFICallFlagThreaded) and: [interpreterProxy isYoung: oop]) ifTrue: [^PrimErrObjectMayMove negated]]. + ^self ffiPushStructure: ptrAddress - ^self ffiPushStructure: (self cCoerceSimple: ptrAddress to: #'void *') ofSize: (calloutState ffiArgHeader bitAnd: FFIStructSizeMask) typeSpec: calloutState ffiArgSpec ofLength: calloutState ffiArgSpecSize in: calloutState]. "If FFIFlagPointer + FFIFlagStructure is set use ffiPushPointer on the contents" (calloutState ffiArgHeader bitAnd: FFIStructSizeMask) = 4 ifFalse: [^FFIErrorStructSize]. + ptrAddress := (interpreterProxy fetchPointer: 0 ofObject: oop) asVoidPointer. - ptrAddress := interpreterProxy fetchPointer: 0 ofObject: oop. (interpreterProxy isInMemory: ptrAddress) ifTrue: [^FFIErrorInvalidPointer]. ^self ffiPushPointer: ptrAddress in: calloutState]. ^FFIErrorBadArg! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiReturnPointer:ofType:in: (in category 'callout support') ----- ffiReturnPointer: retVal ofType: retType in: calloutState <var: #calloutState type: #'CalloutState *'> <var: #retVal type: #usqLong> "Generic callout support. Create a pointer return value from an external function call" | retClass atomicType retOop oop ptr classOop | <var: #ptr type: #'sqInt *'> retClass := interpreterProxy fetchPointer: 1 ofObject: retType. retClass = interpreterProxy nilObject ifTrue: ["Create ExternalData upon return" atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSignedChar >> 1) ifTrue: "String return" [^self ffiReturnCStringFrom: (self cCoerceSimple: retVal to: #usqInt)]. "generate external data" self remapOop: retType in: [oop := interpreterProxy instantiateClass: interpreterProxy classExternalAddress + indexableSize: BytesPerWord. - indexableSize: 4. ptr := interpreterProxy firstIndexableField: oop. ptr at: 0 put: (self cCoerceSimple: retVal to: #sqInt). self remapOop: oop in: [retOop := interpreterProxy instantiateClass: interpreterProxy classExternalData indexableSize: 0]. interpreterProxy storePointer: 0 ofObject: retOop withValue: oop]. interpreterProxy storePointer: 1 ofObject: retOop withValue: retType. ^interpreterProxy methodReturnValue: retOop]. "non-atomic pointer return" classOop := (calloutState ffiRetHeader anyMask: FFIFlagStructure) ifTrue:[interpreterProxy classByteArray] ifFalse:[interpreterProxy classExternalAddress]. self remapOop: retClass in: [oop := interpreterProxy instantiateClass: classOop + indexableSize: BytesPerWord]. - indexableSize: 4]. ptr := interpreterProxy firstIndexableField: oop. ptr at: 0 put: (self cCoerceSimple: retVal to: #sqInt). self remapOop: oop in: [retOop := interpreterProxy instantiateClass: retClass indexableSize: 0]. interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. ^interpreterProxy methodReturnValue: retOop! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveLoadSymbolFromModule (in category 'primitives') ----- primitiveLoadSymbolFromModule "Attempt to find the address of a symbol in a loaded library. loadSymbol: aSymbol fromModule: moduleName <primitive: 'primitiveLoadSymbolFromModule' error: errorCode module: 'SqueakFFIPrims'> " <export: true> | symbol module moduleHandle address oop ptr | <var: #address type: #'void *'> + <var: #ptr type: #'void **'> - <var: #ptr type:'unsigned int *'> interpreterProxy methodArgumentCount = 2 ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadNumArgs]. module := interpreterProxy stackValue: 0. symbol := interpreterProxy stackValue: 1. moduleHandle := self ffiLoadCalloutModule: module. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNotFound]. address := interpreterProxy + ioLoadSymbol: (self cCoerce: (interpreterProxy firstIndexableField: symbol) to: #sqInt) + OfLength: (interpreterProxy byteSizeOf: symbol) + FromModule: moduleHandle. - ioLoadSymbol: (self cCoerce: (interpreterProxy firstIndexableField: symbol) to: #sqInt) - OfLength: (interpreterProxy byteSizeOf: symbol) - FromModule: moduleHandle. (interpreterProxy failed or: [address = 0]) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNotFound]. oop := interpreterProxy + instantiateClass: interpreterProxy classExternalAddress + indexableSize: (self sizeof: #'void *'). - instantiateClass: interpreterProxy classExternalAddress - indexableSize: 4. ptr := interpreterProxy firstIndexableField: oop. ptr at: 0 put: address. ^interpreterProxy methodReturnValue: oop! Item was changed: ----- Method: ThreadedX64FFIPlugin>>ffiPushSingleFloat:in: (in category 'marshalling') ----- ffiPushSingleFloat: value in: calloutState <var: #value type: #float> <var: #calloutState type: #'CalloutState *'> <inline: true> calloutState floatRegisterIndex < NumFloatRegArgs ifTrue: + [(self cCoerce: calloutState floatRegisters + calloutState floatRegisterIndex to: #'float *') at: 0 put: value. - [calloutState floatRegisters at: calloutState floatRegisterIndex put: value. calloutState floatRegisterIndex: calloutState floatRegisterIndex + 1] ifFalse: [calloutState currentArg + WordSize > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. interpreterProxy storeFloatAtPointer: calloutState currentArg from: value. calloutState currentArg: calloutState currentArg + WordSize]. ^0!

1 0

[commit][3627] CogVM source as per VMMaker.oscog-eem.1692
by commits＠squeakvm.org 22 Feb '16

22 Feb '16

Revision: 3627 Author: eliot Date: 2016-02-22 11:11:27 -0800 (Mon, 22 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1692 ThreadedFFIPlugin fixes for 64 bits. Make ffiAddressOf:startingAt:size: & primitiveFFIIntegerAt[Put] 64-bit capable. Use signedMachineIntegerFor: to answer result of primitiveCreateManualSurface. Fix slips in testing for float and/or double in the ARM & X64 ffiCalloutTo:SpecOnStack:in: methods. Mac OS makefiles. Include dependencies to try and get plugins to be rebuilt when things change. Modified Paths: -------------- branches/Cog/README branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/README =================================================================== --- branches/Cog/README 2016-02-22 18:51:24 UTC (rev 3626) +++ branches/Cog/README 2016-02-22 19:11:27 UTC (rev 3627) @@ -45,7 +45,8 @@ Spur, as described on the www.mirandabanda.org blog, is a faster object representation which uses generation scavenging, lazy forwarding for fast become, a single object header format common to 32 and 64 bit versions, and a -segmented heap that can grow and shrink, releasign memory back to the host OS. +segmented heap that can grow and shrink, releasing memory back to the host OS. +Newspeak, Squeak 5.0 and Pharo 5 use Spur. Another distinction is between normal single-threaded VMs that schedule "green" Smalltalk light-weight processes above a single-threaded VM, and multi-threaded @@ -88,7 +89,9 @@ can be found in Cog, or in various Monticello packages in various repositories. Each vm source directory contains several files, a subset of the following: - cogit.c - the JIT; a Cogit cooperates with a CoInterpreter + cogit.c - the JIT; a Cogit cooperates with a CoInterpreter. + This simply includes a proessor-specific JIT file + cogitIA32.c et al - relevant processor-specific JIT, selected by cogit.c cogit.h - the Cogit's API, as used by the CoInterpreter cogmethod.h - the structure of a CogMethod, the output of the Cogit cointerp.c - the CoInterpreter's source file @@ -105,20 +108,15 @@ Platform build directories -------------------------- -Build directories are in flux. Currently there exist some old build directories -such as unixbuild, cygwinbuild et al. These are deprecated and will be removed -before the end of 2014. The current "official" buikd directories are of the -form build.OS_WordSize_Processor, and include +The current "official" build directories are of the form +build.OS_WordSize_Processor, and include build.linux32x86 - uses autoconf, gcc and make build.macos32x86 - 32-bit Mac OS X using XCode and clang build.macos64x64 - 64-bit Mac OS X using XCode and clang build.win32x86 - uses cygwin, gcc and make More can be added as required. In each there is a HowToBuild that describes -the necessary steps to produce a VM. +the necessary steps to compile a VM. -In addition, there is a set of build directories that use the CMake build -configuration system. These are not yet ready to describe as of this writing. - The scripts directory contains various scripts for validating and checking-in generated sources, packaging builds into installable artifacts (tar, msi, zip), and so on. The linux builds and the packaging scripts produce outputs in the @@ -148,8 +146,6 @@ platforms/Cross/plugins - http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins - platforms/iOS - - http://squeakvm.org/svn/squeak/trunk/platforms/iOS platforms/win32/plugins - http://squeakvm.org/svn/squeak/trunk/platforms/win32/plugins Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-22 18:51:24 UTC (rev 3626) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-22 19:11:27 UTC (rev 3627) @@ -210,7 +210,10 @@ # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile # N.B. PLATDIR *must* be a relative path for this to work -$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) +$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \ + $(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \ + $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ + $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) test $@ -ot $(call plugin-makefile,$(*F)) && rm $(BUILD)/vm/$(*F).lib || true rm -f $(BUILD)/vm/$(*F).ignore @@ -228,7 +231,10 @@ # External plugin. Build as bundle and copy to vm dir ($(OBJDIR)). # Check for Makefile in iOS plugins directory otherwise use default Makefile -$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) +$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \ + $(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \ + $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ + $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).bundle || true rm -f $(BUILD)/vm/$(*F).ignore Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-22 18:51:24 UTC (rev 3626) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-22 19:11:27 UTC (rev 3627) @@ -210,7 +210,10 @@ # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile # N.B. PLATDIR *must* be a relative path for this to work -$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) +$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \ + $(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \ + $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ + $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) test $@ -ot $(call plugin-makefile,$(*F)) && rm $(BUILD)/vm/$(*F).lib || true rm -f $(BUILD)/vm/$(*F).ignore @@ -228,7 +231,10 @@ # External plugin. Build as bundle and copy to vm dir ($(OBJDIR)). # Check for Makefile in iOS plugins directory otherwise use default Makefile -$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) +$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \ + $(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \ + $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ + $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).bundle || true rm -f $(BUILD)/vm/$(*F).ignore Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 20 20:55:51 PST 2016 + Mon Feb 22 11:10:17 PST 2016 Modified: branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2016-02-22 18:51:24 UTC (rev 3626) +++ branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2016-02-22 19:11:27 UTC (rev 3627) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + VMPluginCodeGenerator VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 from - ThreadedARMFFIPlugin VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + ThreadedARMFFIPlugin VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 */ -static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 " __DATE__ ; @@ -286,6 +286,7 @@ static sqInt registerArgsSlop(void); static sqInt returnStructInRegisters(sqInt returnStructSize); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); +static sqInt signedMachineIntegerFor(unsigned long value); static sqInt sizeField(sqInt oop); static sqInt startOfData(sqInt oop); @@ -359,7 +360,6 @@ static sqInt (*pushInteger)(sqInt integerValue); static sqInt (*pushRemappableOop)(sqInt oop); static sqInt (*signed32BitIntegerFor)(sqInt integerValue); -static int (*signed32BitValueOf)(sqInt oop); static sqInt (*signed64BitIntegerFor)(sqLong integerValue); static sqLong (*signed64BitValueOf)(sqInt oop); static long (*signedMachineIntegerValueOf)(sqInt oop); @@ -447,7 +447,6 @@ extern sqInt pushInteger(sqInt integerValue); extern sqInt pushRemappableOop(sqInt oop); extern sqInt signed32BitIntegerFor(sqInt integerValue); -extern int signed32BitValueOf(sqInt oop); extern sqInt signed64BitIntegerFor(sqLong integerValue); extern sqLong signed64BitValueOf(sqInt oop); extern long signedMachineIntegerValueOf(sqInt oop); @@ -464,9 +463,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ARM32FFIPlugin VMMaker.oscog-eem.1689 (i)" + "ARM32FFIPlugin VMMaker.oscog-eem.1692 (i)" #else - "ARM32FFIPlugin VMMaker.oscog-eem.1689 (e)" + "ARM32FFIPlugin VMMaker.oscog-eem.1692 (e)" #endif ; @@ -509,11 +508,11 @@ } -/* return an int of the address of the byteSize slot (byte, short, int, - whatever) at byteOffset in rcvr. Nominally intended for use with - ExternalAddress objects, this code will work (for obscure historical - reasons) with plain Byte or Word Arrays as well. - */ +/* Answer a long of the address of the byteSize slot (byte, short, int, + whatever) at byteOffset in rcvr. + Nominally intended for use with ExternalAddress objects, this code will + work (for obscure historical + reasons) with plain Byte or Word Arrays as well. */ /* ThreadedFFIPlugin>>#ffiAddressOf:startingAt:size: */ static sqInt @@ -523,7 +522,6 @@ sqInt rcvrClass; sqInt rcvrSize; - flag("This needs more thought. It is 32-bit specific. What about 64-bit platforms?"); if (!(isBytes(rcvr))) { return primitiveFail(); } @@ -533,10 +531,11 @@ rcvrClass = fetchClassOf(rcvr); rcvrSize = byteSizeOf(rcvr); if (rcvrClass == (classExternalAddress())) { - if (!(rcvrSize == 4)) { + if (!(rcvrSize == BytesPerWord)) { return primitiveFail(); } + /* Hack!! */ /* don't you dare to read from object memory (unless is pinned)! */ addr = fetchPointerofObject(0, rcvr); if (addr == 0) { @@ -549,7 +548,7 @@ if (!(((byteOffset + byteSize) - 1) <= rcvrSize)) { return primitiveFail(); } - addr = ((int) (firstIndexableField(rcvr))); + addr = ((long) (firstIndexableField(rcvr))); } addr = (addr + byteOffset) - 1; return addr; @@ -1694,7 +1693,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwith(((float (*)(long, long, long, long)) procAddr), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3]); } @@ -1854,7 +1853,7 @@ } return oop; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop = floatObjectOf(floatRet); } else { @@ -2163,7 +2162,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwith(((float (*)(long, long, long, long)) (((void *) address))), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3]); } @@ -2324,7 +2323,7 @@ result = oop3; goto l7; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop3 = floatObjectOf(floatRet); } else { @@ -4077,7 +4076,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwith(((float (*)(long, long, long, long)) (((void *) address))), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3]); } @@ -4238,7 +4237,7 @@ result1 = oop3; goto l13; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop3 = floatObjectOf(floatRet); } else { @@ -4503,7 +4502,7 @@ /* begin atomicTypeOf: */ typeSpec2 = (calloutState1->ffiRetHeader); atomicType2 = ((usqInt) (typeSpec2 & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType2) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType2) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType2 == FFITypeSingleFloat) { floatRet1 = dispatchFunctionPointerwithwithwithwith(((float (*)(long, long, long, long)) (((void *) address1))), ((calloutState1->integerRegisters))[0], ((calloutState1->integerRegisters))[1], ((calloutState1->integerRegisters))[2], ((calloutState1->integerRegisters))[3]); } @@ -4664,7 +4663,7 @@ result2 = oop4; goto l16; } - if ((((usqInt) atomicType2) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType2) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop4 = floatObjectOf(floatRet1); } else { @@ -5069,7 +5068,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwith(((float (*)(long, long, long, long)) (((void *) address))), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3]); } @@ -5230,7 +5229,7 @@ result1 = oop3; goto l13; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop3 = floatObjectOf(floatRet); } else { @@ -5501,7 +5500,7 @@ /* begin atomicTypeOf: */ typeSpec2 = (calloutState1->ffiRetHeader); atomicType2 = ((usqInt) (typeSpec2 & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType2) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType2) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType2 == FFITypeSingleFloat) { floatRet1 = dispatchFunctionPointerwithwithwithwith(((float (*)(long, long, long, long)) (((void *) address1))), ((calloutState1->integerRegisters))[0], ((calloutState1->integerRegisters))[1], ((calloutState1->integerRegisters))[2], ((calloutState1->integerRegisters))[3]); } @@ -5662,7 +5661,7 @@ result2 = oop4; goto l16; } - if ((((usqInt) atomicType2) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType2) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop4 = floatObjectOf(floatRet1); } else { @@ -5744,7 +5743,7 @@ sqInt width; if (!((methodArgumentCount()) == 5)) { - return primitiveFail(); + return primitiveFailFor(PrimErrBadNumArgs); } width = stackIntegerValue(4); height = stackIntegerValue(3); @@ -5759,7 +5758,9 @@ if (result < 0) { return primitiveFail(); } - result = signed32BitIntegerFor(result); + result = (BytesPerWord == 8 + ? signed64BitIntegerFor(result) + : signed32BitIntegerFor(result)); return popthenPush(6, result); } @@ -5979,7 +5980,8 @@ } -/* Return a (signed or unsigned) n byte integer from the given byte offset. */ +/* Answer a (signed or unsigned) n byte integer from the given byte offset + in the receiver, using the platform's endianness. */ /* ThreadedFFIPlugin>>#primitiveFFIIntegerAt */ EXPORT(sqInt) @@ -5989,9 +5991,10 @@ sqInt byteOffset; sqInt byteSize; sqInt isSigned; - sqInt mask; + usqLong mask; sqInt rcvr; - sqInt value; + usqLong value; + sqInt valueOop; isSigned = booleanValueOf(stackValue(0)); byteSize = stackIntegerValue(1); @@ -6001,45 +6004,52 @@ return 0; } if (!((byteOffset > 0) - && ((byteSize == 1) - || ((byteSize == 2) - || (byteSize == 4))))) { + && ((((byteSize >= 1) && (byteSize <= 8))) + && ((byteSize & (byteSize - 1)) == 0)))) { return primitiveFail(); } addr = ffiAddressOfstartingAtsize(rcvr, byteOffset, byteSize); if (failed()) { return 0; } - if (byteSize < 4) { - - /* short/byte */ + if (byteSize <= 2) { if (byteSize == 1) { - value = byteAt(addr); + value = ((unsigned char) (byteAt(addr))); } else { - value = *((unsigned short int *) addr); + value = ((unsigned short) (shortAt(addr))); } + } + else { + if (byteSize == 4) { + value = ((unsigned int) (long32At(addr))); + } + else { + value = long64At(addr); + } + } + if (byteSize < BytesPerWord) { if (isSigned) { /* sign extend value */ mask = 1 << ((byteSize * 8) - 1); value = (value & (mask - 1)) - (value & mask); } - value = integerObjectOf(value); + valueOop = integerObjectOf(value); } else { - /* general 32 bit integer */ - value = longAt(addr); - value = (isSigned - ? signed32BitIntegerFor(value) - : positive32BitIntegerFor(value)); + /* general 64 bit integer; note these never fail */ + valueOop = (isSigned + ? signed64BitIntegerFor(value) + : positive64BitIntegerFor(value)); } - return popthenPush(4, value); + return popthenPush(4, valueOop); } -/* Store a (signed or unsigned) n byte integer at the given byte offset. */ +/* Store a (signed or unsigned) n byte integer at the given byte offset + in the receiver, using the platform's endianness. */ /* ThreadedFFIPlugin>>#primitiveFFIIntegerAtPut */ EXPORT(sqInt) @@ -6049,9 +6059,9 @@ sqInt byteOffset; sqInt byteSize; sqInt isSigned; - sqInt max; + sqLong max; sqInt rcvr; - sqInt value; + sqLong value; sqInt valueOop; isSigned = booleanValueOf(stackValue(0)); @@ -6063,9 +6073,8 @@ return 0; } if (!((byteOffset > 0) - && ((byteSize == 1) - || ((byteSize == 2) - || (byteSize == 4))))) { + && ((((byteSize >= 1) && (byteSize <= 8))) + && ((byteSize & (byteSize - 1)) == 0)))) { return primitiveFail(); } addr = ffiAddressOfstartingAtsize(rcvr, byteOffset, byteSize); @@ -6073,38 +6082,43 @@ return 0; } if (isSigned) { - value = signed32BitValueOf(valueOop); + value = signedMachineIntegerValueOf(valueOop); } else { - value = positive32BitValueOf(valueOop); + value = positiveMachineIntegerValueOf(valueOop); } if (failed()) { return 0; } - if (byteSize < 4) { + if (byteSize < BytesPerWord) { if (isSigned) { max = 1 << ((8 * byteSize) - 1); - if (value >= max) { + if (!((value >= (0 - max)) + && (value < max))) { return primitiveFail(); } - if (value < (0 - max)) { - return primitiveFail(); - } } else { - if (value >= (1 << (8 * byteSize))) { + if (!((((unsigned long long)value)) < (1 << (8 * byteSize)))) { return primitiveFail(); } } + } + if (byteSize <= 2) { if (byteSize == 1) { byteAtput(addr, value); } else { - *((short int *) addr) = value; + shortAtput(addr, value); } } else { - longAtput(addr, value); + if (byteSize == 4) { + long32Atput(addr, value); + } + else { + long64Atput(addr, value); + } } return popthenPush(5, valueOop); } @@ -6379,7 +6393,6 @@ pushInteger = interpreterProxy->pushInteger; pushRemappableOop = interpreterProxy->pushRemappableOop; signed32BitIntegerFor = interpreterProxy->signed32BitIntegerFor; - signed32BitValueOf = interpreterProxy->signed32BitValueOf; signed64BitIntegerFor = interpreterProxy->signed64BitIntegerFor; signed64BitValueOf = interpreterProxy->signed64BitValueOf; signedMachineIntegerValueOf = interpreterProxy->signedMachineIntegerValueOf; @@ -6396,7 +6409,16 @@ return ok; } + /* InterpreterPlugin>>#signedMachineIntegerFor: */ +static sqInt +signedMachineIntegerFor(unsigned long value) +{ + return (BytesPerWord == 8 + ? signed64BitIntegerFor(value) + : signed32BitIntegerFor(value)); +} + /* Answer the first field of oop which is assumed to be an Alien of at least 8 bytes */ Modified: branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c 2016-02-22 18:51:24 UTC (rev 3626) +++ branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c 2016-02-22 19:11:27 UTC (rev 3627) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + VMPluginCodeGenerator VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 from - ThreadedIA32FFIPlugin VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + ThreadedIA32FFIPlugin VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 */ -static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 " __DATE__ ; @@ -277,6 +277,7 @@ EXPORT(sqInt) primitiveSetManualSurfacePointer(void); static sqInt registerArgsSlop(void); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); +static sqInt signedMachineIntegerFor(unsigned long value); static sqInt sizeField(sqInt oop); static sqInt startOfData(sqInt oop); @@ -350,7 +351,6 @@ static sqInt (*pushInteger)(sqInt integerValue); static sqInt (*pushRemappableOop)(sqInt oop); static sqInt (*signed32BitIntegerFor)(sqInt integerValue); -static int (*signed32BitValueOf)(sqInt oop); static sqInt (*signed64BitIntegerFor)(sqLong integerValue); static sqLong (*signed64BitValueOf)(sqInt oop); static long (*signedMachineIntegerValueOf)(sqInt oop); @@ -438,7 +438,6 @@ extern sqInt pushInteger(sqInt integerValue); extern sqInt pushRemappableOop(sqInt oop); extern sqInt signed32BitIntegerFor(sqInt integerValue); -extern int signed32BitValueOf(sqInt oop); extern sqInt signed64BitIntegerFor(sqLong integerValue); extern sqLong signed64BitValueOf(sqInt oop); extern long signedMachineIntegerValueOf(sqInt oop); @@ -455,9 +454,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32FFIPlugin VMMaker.oscog-eem.1689 (i)" + "IA32FFIPlugin VMMaker.oscog-eem.1692 (i)" #else - "IA32FFIPlugin VMMaker.oscog-eem.1689 (e)" + "IA32FFIPlugin VMMaker.oscog-eem.1692 (e)" #endif ; @@ -501,11 +500,11 @@ } -/* return an int of the address of the byteSize slot (byte, short, int, - whatever) at byteOffset in rcvr. Nominally intended for use with - ExternalAddress objects, this code will work (for obscure historical - reasons) with plain Byte or Word Arrays as well. - */ +/* Answer a long of the address of the byteSize slot (byte, short, int, + whatever) at byteOffset in rcvr. + Nominally intended for use with ExternalAddress objects, this code will + work (for obscure historical + reasons) with plain Byte or Word Arrays as well. */ /* ThreadedFFIPlugin>>#ffiAddressOf:startingAt:size: */ static sqInt @@ -515,7 +514,6 @@ sqInt rcvrClass; sqInt rcvrSize; - flag("This needs more thought. It is 32-bit specific. What about 64-bit platforms?"); if (!(isBytes(rcvr))) { return primitiveFail(); } @@ -525,10 +523,11 @@ rcvrClass = fetchClassOf(rcvr); rcvrSize = byteSizeOf(rcvr); if (rcvrClass == (classExternalAddress())) { - if (!(rcvrSize == 4)) { + if (!(rcvrSize == BytesPerWord)) { return primitiveFail(); } + /* Hack!! */ /* don't you dare to read from object memory (unless is pinned)! */ addr = fetchPointerofObject(0, rcvr); if (addr == 0) { @@ -541,7 +540,7 @@ if (!(((byteOffset + byteSize) - 1) <= rcvrSize)) { return primitiveFail(); } - addr = ((int) (firstIndexableField(rcvr))); + addr = ((long) (firstIndexableField(rcvr))); } addr = (addr + byteOffset) - 1; return addr; @@ -5236,7 +5235,7 @@ sqInt width; if (!((methodArgumentCount()) == 5)) { - return primitiveFail(); + return primitiveFailFor(PrimErrBadNumArgs); } width = stackIntegerValue(4); height = stackIntegerValue(3); @@ -5251,7 +5250,9 @@ if (result < 0) { return primitiveFail(); } - result = signed32BitIntegerFor(result); + result = (BytesPerWord == 8 + ? signed64BitIntegerFor(result) + : signed32BitIntegerFor(result)); return popthenPush(6, result); } @@ -5471,7 +5472,8 @@ } -/* Return a (signed or unsigned) n byte integer from the given byte offset. */ +/* Answer a (signed or unsigned) n byte integer from the given byte offset + in the receiver, using the platform's endianness. */ /* ThreadedFFIPlugin>>#primitiveFFIIntegerAt */ EXPORT(sqInt) @@ -5481,9 +5483,10 @@ sqInt byteOffset; sqInt byteSize; sqInt isSigned; - sqInt mask; + usqLong mask; sqInt rcvr; - sqInt value; + usqLong value; + sqInt valueOop; isSigned = booleanValueOf(stackValue(0)); byteSize = stackIntegerValue(1); @@ -5493,45 +5496,52 @@ return 0; } if (!((byteOffset > 0) - && ((byteSize == 1) - || ((byteSize == 2) - || (byteSize == 4))))) { + && ((((byteSize >= 1) && (byteSize <= 8))) + && ((byteSize & (byteSize - 1)) == 0)))) { return primitiveFail(); } addr = ffiAddressOfstartingAtsize(rcvr, byteOffset, byteSize); if (failed()) { return 0; } - if (byteSize < 4) { - - /* short/byte */ + if (byteSize <= 2) { if (byteSize == 1) { - value = byteAt(addr); + value = ((unsigned char) (byteAt(addr))); } else { - value = *((unsigned short int *) addr); + value = ((unsigned short) (shortAt(addr))); } + } + else { + if (byteSize == 4) { + value = ((unsigned int) (long32At(addr))); + } + else { + value = long64At(addr); + } + } + if (byteSize < BytesPerWord) { if (isSigned) { /* sign extend value */ mask = 1 << ((byteSize * 8) - 1); value = (value & (mask - 1)) - (value & mask); } - value = integerObjectOf(value); + valueOop = integerObjectOf(value); } else { - /* general 32 bit integer */ - value = longAt(addr); - value = (isSigned - ? signed32BitIntegerFor(value) - : positive32BitIntegerFor(value)); + /* general 64 bit integer; note these never fail */ + valueOop = (isSigned + ? signed64BitIntegerFor(value) + : positive64BitIntegerFor(value)); } - return popthenPush(4, value); + return popthenPush(4, valueOop); } -/* Store a (signed or unsigned) n byte integer at the given byte offset. */ +/* Store a (signed or unsigned) n byte integer at the given byte offset + in the receiver, using the platform's endianness. */ /* ThreadedFFIPlugin>>#primitiveFFIIntegerAtPut */ EXPORT(sqInt) @@ -5541,9 +5551,9 @@ sqInt byteOffset; sqInt byteSize; sqInt isSigned; - sqInt max; + sqLong max; sqInt rcvr; - sqInt value; + sqLong value; sqInt valueOop; isSigned = booleanValueOf(stackValue(0)); @@ -5555,9 +5565,8 @@ return 0; } if (!((byteOffset > 0) - && ((byteSize == 1) - || ((byteSize == 2) - || (byteSize == 4))))) { + && ((((byteSize >= 1) && (byteSize <= 8))) + && ((byteSize & (byteSize - 1)) == 0)))) { return primitiveFail(); } addr = ffiAddressOfstartingAtsize(rcvr, byteOffset, byteSize); @@ -5565,38 +5574,43 @@ return 0; } if (isSigned) { - value = signed32BitValueOf(valueOop); + value = signedMachineIntegerValueOf(valueOop); } else { - value = positive32BitValueOf(valueOop); + value = positiveMachineIntegerValueOf(valueOop); } if (failed()) { return 0; } - if (byteSize < 4) { + if (byteSize < BytesPerWord) { if (isSigned) { max = 1 << ((8 * byteSize) - 1); - if (value >= max) { + if (!((value >= (0 - max)) + && (value < max))) { return primitiveFail(); } - if (value < (0 - max)) { - return primitiveFail(); - } } else { - if (value >= (1 << (8 * byteSize))) { + if (!((((unsigned long long)value)) < (1 << (8 * byteSize)))) { return primitiveFail(); } } + } + if (byteSize <= 2) { if (byteSize == 1) { byteAtput(addr, value); } else { - *((short int *) addr) = value; + shortAtput(addr, value); } } else { - longAtput(addr, value); + if (byteSize == 4) { + long32Atput(addr, value); + } + else { + long64Atput(addr, value); + } } return popthenPush(5, valueOop); } @@ -5860,7 +5874,6 @@ pushInteger = interpreterProxy->pushInteger; pushRemappableOop = interpreterProxy->pushRemappableOop; signed32BitIntegerFor = interpreterProxy->signed32BitIntegerFor; - signed32BitValueOf = interpreterProxy->signed32BitValueOf; signed64BitIntegerFor = interpreterProxy->signed64BitIntegerFor; signed64BitValueOf = interpreterProxy->signed64BitValueOf; signedMachineIntegerValueOf = interpreterProxy->signedMachineIntegerValueOf; @@ -5877,7 +5890,16 @@ return ok; } + /* InterpreterPlugin>>#signedMachineIntegerFor: */ +static sqInt +signedMachineIntegerFor(unsigned long value) +{ + return (BytesPerWord == 8 + ? signed64BitIntegerFor(value) + : signed32BitIntegerFor(value)); +} + /* Answer the first field of oop which is assumed to be an Alien of at least 8 bytes */ Modified: branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c 2016-02-22 18:51:24 UTC (rev 3626) +++ branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c 2016-02-22 19:11:27 UTC (rev 3627) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + VMPluginCodeGenerator VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 from - ThreadedX64SysVFFIPlugin VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + ThreadedX64SysVFFIPlugin VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 */ -static char __buildInfo[] = "ThreadedX64SysVFFIPlugin VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "ThreadedX64SysVFFIPlugin VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 " __DATE__ ; @@ -294,6 +294,7 @@ static sqInt registerArgsSlop(void); static sqInt returnStructInRegisters(sqInt returnStructSize); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); +static sqInt signedMachineIntegerFor(unsigned long value); static sqInt sizeField(sqInt oop); static sqInt startOfData(sqInt oop); @@ -367,7 +368,6 @@ static sqInt (*pushInteger)(sqInt integerValue); static sqInt (*pushRemappableOop)(sqInt oop); static sqInt (*signed32BitIntegerFor)(sqInt integerValue); -static int (*signed32BitValueOf)(sqInt oop); static sqInt (*signed64BitIntegerFor)(sqLong integerValue); static sqLong (*signed64BitValueOf)(sqInt oop); static long (*signedMachineIntegerValueOf)(sqInt oop); @@ -455,7 +455,6 @@ extern sqInt pushInteger(sqInt integerValue); extern sqInt pushRemappableOop(sqInt oop); extern sqInt signed32BitIntegerFor(sqInt integerValue); -extern int signed32BitValueOf(sqInt oop); extern sqInt signed64BitIntegerFor(sqLong integerValue); extern sqLong signed64BitValueOf(sqInt oop); extern long signedMachineIntegerValueOf(sqInt oop); @@ -472,9 +471,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "X64SysVFFIPlugin VMMaker.oscog-eem.1689 (i)" + "X64SysVFFIPlugin VMMaker.oscog-eem.1692 (i)" #else - "X64SysVFFIPlugin VMMaker.oscog-eem.1689 (e)" + "X64SysVFFIPlugin VMMaker.oscog-eem.1692 (e)" #endif ; @@ -517,11 +516,11 @@ } -/* return an int of the address of the byteSize slot (byte, short, int, - whatever) at byteOffset in rcvr. Nominally intended for use with - ExternalAddress objects, this code will work (for obscure historical - reasons) with plain Byte or Word Arrays as well. - */ +/* Answer a long of the address of the byteSize slot (byte, short, int, + whatever) at byteOffset in rcvr. + Nominally intended for use with ExternalAddress objects, this code will + work (for obscure historical + reasons) with plain Byte or Word Arrays as well. */ /* ThreadedFFIPlugin>>#ffiAddressOf:startingAt:size: */ static sqInt @@ -531,7 +530,6 @@ sqInt rcvrClass; sqInt rcvrSize; - flag("This needs more thought. It is 32-bit specific. What about 64-bit platforms?"); if (!(isBytes(rcvr))) { return primitiveFail(); } @@ -541,10 +539,11 @@ rcvrClass = fetchClassOf(rcvr); rcvrSize = byteSizeOf(rcvr); if (rcvrClass == (classExternalAddress())) { - if (!(rcvrSize == 4)) { + if (!(rcvrSize == BytesPerWord)) { return primitiveFail(); } + /* Hack!! */ /* don't you dare to read from object memory (unless is pinned)! */ addr = fetchPointerofObject(0, rcvr); if (addr == 0) { @@ -557,7 +556,7 @@ if (!(((byteOffset + byteSize) - 1) <= rcvrSize)) { return primitiveFail(); } - addr = ((int) (firstIndexableField(rcvr))); + addr = ((long) (firstIndexableField(rcvr))); } addr = (addr + byteOffset) - 1; return addr; @@ -1851,7 +1850,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwithwithwith(((float (*)(long, long, long, long, long, long)) procAddr), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3], ((calloutState->integerRegisters))[4], ((calloutState->integerRegisters))[5]); } @@ -2013,7 +2012,7 @@ } return oop; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop = floatObjectOf(floatRet); } else { @@ -2324,7 +2323,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwithwithwith(((float (*)(long, long, long, long, long, long)) (((void *) address))), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3], ((calloutState->integerRegisters))[4], ((calloutState->integerRegisters))[5]); } @@ -2487,7 +2486,7 @@ result = oop3; goto l7; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop3 = floatObjectOf(floatRet); } else { @@ -4471,7 +4470,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwithwithwith(((float (*)(long, long, long, long, long, long)) (((void *) address))), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3], ((calloutState->integerRegisters))[4], ((calloutState->integerRegisters))[5]); } @@ -4634,7 +4633,7 @@ result1 = oop3; goto l13; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop3 = floatObjectOf(floatRet); } else { @@ -4900,7 +4899,7 @@ /* begin atomicTypeOf: */ typeSpec2 = (calloutState1->ffiRetHeader); atomicType2 = ((usqInt) (typeSpec2 & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType2) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType2) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType2 == FFITypeSingleFloat) { floatRet1 = dispatchFunctionPointerwithwithwithwithwithwith(((float (*)(long, long, long, long, long, long)) (((void *) address1))), ((calloutState1->integerRegisters))[0], ((calloutState1->integerRegisters))[1], ((calloutState1->integerRegisters))[2], ((calloutState1->integerRegisters))[3], ((calloutState1->integerRegisters))[4], ((calloutState1->integerRegisters))[5]); } @@ -5063,7 +5062,7 @@ result2 = oop4; goto l16; } - if ((((usqInt) atomicType2) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType2) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop4 = floatObjectOf(floatRet1); } else { @@ -5471,7 +5470,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwithwithwith(((float (*)(long, long, long, long, long, long)) (((void *) address))), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3], ((calloutState->integerRegisters))[4], ((calloutState->integerRegisters))[5]); } @@ -5634,7 +5633,7 @@ result1 = oop3; goto l13; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop3 = floatObjectOf(floatRet); } else { @@ -5906,7 +5905,7 @@ /* begin atomicTypeOf: */ typeSpec2 = (calloutState1->ffiRetHeader); atomicType2 = ((usqInt) (typeSpec2 & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType2) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType2) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType2 == FFITypeSingleFloat) { floatRet1 = dispatchFunctionPointerwithwithwithwithwithwith(((float (*)(long, long, long, long, long, long)) (((void *) address1))), ((calloutState1->integerRegisters))[0], ((calloutState1->integerRegisters))[1], ((calloutState1->integerRegisters))[2], ((calloutState1->integerRegisters))[3], ((calloutState1->integerRegisters))[4], ((calloutState1->integerRegisters))[5]); } @@ -6069,7 +6068,7 @@ result2 = oop4; goto l16; } - if ((((usqInt) atomicType2) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType2) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop4 = floatObjectOf(floatRet1); } else { @@ -6152,7 +6151,7 @@ sqInt width; if (!((methodArgumentCount()) == 5)) { - return primitiveFail(); + return primitiveFailFor(PrimErrBadNumArgs); } width = stackIntegerValue(4); height = stackIntegerValue(3); @@ -6167,7 +6166,9 @@ if (result < 0) { return primitiveFail(); } - result = signed32BitIntegerFor(result); + result = (BytesPerWord == 8 + ? signed64BitIntegerFor(result) + : signed32BitIntegerFor(result)); return popthenPush(6, result); } @@ -6387,7 +6388,8 @@ } -/* Return a (signed or unsigned) n byte integer from the given byte offset. */ +/* Answer a (signed or unsigned) n byte integer from the given byte offset + in the receiver, using the platform's endianness. */ /* ThreadedFFIPlugin>>#primitiveFFIIntegerAt */ EXPORT(sqInt) @@ -6397,9 +6399,10 @@ sqInt byteOffset; sqInt byteSize; sqInt isSigned; - sqInt mask; + usqLong mask; sqInt rcvr; - sqInt value; + usqLong value; + sqInt valueOop; isSigned = booleanValueOf(stackValue(0)); byteSize = stackIntegerValue(1); @@ -6409,45 +6412,52 @@ return 0; } if (!((byteOffset > 0) - && ((byteSize == 1) - || ((byteSize == 2) - || (byteSize == 4))))) { + && ((((byteSize >= 1) && (byteSize <= 8))) + && ((byteSize & (byteSize - 1)) == 0)))) { return primitiveFail(); } addr = ffiAddressOfstartingAtsize(rcvr, byteOffset, byteSize); if (failed()) { return 0; } - if (byteSize < 4) { - - /* short/byte */ + if (byteSize <= 2) { if (byteSize == 1) { - value = byteAt(addr); + value = ((unsigned char) (byteAt(addr))); } else { - value = *((unsigned short int *) addr); + value = ((unsigned short) (shortAt(addr))); } + } + else { + if (byteSize == 4) { + value = ((unsigned int) (long32At(addr))); + } + else { + value = long64At(addr); + } + } + if (byteSize < BytesPerWord) { if (isSigned) { /* sign extend value */ mask = 1 << ((byteSize * 8) - 1); value = (value & (mask - 1)) - (value & mask); } - value = integerObjectOf(value); + valueOop = integerObjectOf(value); } else { - /* general 32 bit integer */ - value = longAt(addr); - value = (isSigned - ? signed32BitIntegerFor(value) - : positive32BitIntegerFor(value)); + /* general 64 bit integer; note these never fail */ + valueOop = (isSigned + ? signed64BitIntegerFor(value) + : positive64BitIntegerFor(value)); } - return popthenPush(4, value); + return popthenPush(4, valueOop); } -/* Store a (signed or unsigned) n byte integer at the given byte offset. */ +/* Store a (signed or unsigned) n byte integer at the given byte offset + in the receiver, using the platform's endianness. */ /* ThreadedFFIPlugin>>#primitiveFFIIntegerAtPut */ EXPORT(sqInt) @@ -6457,9 +6467,9 @@ sqInt byteOffset; sqInt byteSize; sqInt isSigned; - sqInt max; + sqLong max; sqInt rcvr; - sqInt value; + sqLong value; sqInt valueOop; isSigned = booleanValueOf(stackValue(0)); @@ -6471,9 +6481,8 @@ return 0; } if (!((byteOffset > 0) - && ((byteSize == 1) - || ((byteSize == 2) - || (byteSize == 4))))) { + && ((((byteSize >= 1) && (byteSize <= 8))) + && ((byteSize & (byteSize - 1)) == 0)))) { return primitiveFail(); } addr = ffiAddressOfstartingAtsize(rcvr, byteOffset, byteSize); @@ -6481,38 +6490,43 @@ return 0; } if (isSigned) { - value = signed32BitValueOf(valueOop); + value = signedMachineIntegerValueOf(valueOop); } else { - value = positive32BitValueOf(valueOop); + value = positiveMachineIntegerValueOf(valueOop); } if (failed()) { return 0; } - if (byteSize < 4) { + if (byteSize < BytesPerWord) { if (isSigned) { max = 1 << ((8 * byteSize) - 1); - if (value >= max) { + if (!((value >= (0 - max)) + && (value < max))) { return primitiveFail(); } - if (value < (0 - max)) { - return primitiveFail(); - } } else { - if (value >= (1 << (8 * byteSize))) { + if (!((((unsigned long long)value)) < (1 << (8 * byteSize)))) { return primitiveFail(); } } + } + if (byteSize <= 2) { if (byteSize == 1) { byteAtput(addr, value); } else { - *((short int *) addr) = value; + shortAtput(addr, value); } } else { - longAtput(addr, value); + if (byteSize == 4) { + long32Atput(addr, value); + } + else { + long64Atput(addr, value); + } } return popthenPush(5, valueOop); } @@ -6787,7 +6801,6 @@ pushInteger = interpreterProxy->pushInteger; pushRemappableOop = interpreterProxy->pushRemappableOop; signed32BitIntegerFor = interpreterProxy->signed32BitIntegerFor; - signed32BitValueOf = interpreterProxy->signed32BitValueOf; signed64BitIntegerFor = interpreterProxy->signed64BitIntegerFor; signed64BitValueOf = interpreterProxy->signed64BitValueOf; signedMachineIntegerValueOf = interpreterProxy->signedMachineIntegerValueOf; @@ -6804,7 +6817,16 @@ return ok; } + /* InterpreterPlugin>>#signedMachineIntegerFor: */ +static sqInt +signedMachineIntegerFor(unsigned long value) +{ + return (BytesPerWord == 8 + ? signed64BitIntegerFor(value) + : signed32BitIntegerFor(value)); +} + /* Answer the first field of oop which is assumed to be an Alien of at least 8 bytes */ Modified: branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c 2016-02-22 18:51:24 UTC (rev 3626) +++ branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c 2016-02-22 19:11:27 UTC (rev 3627) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + VMPluginCodeGenerator VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 from - ThreadedX64Win64FFIPlugin VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + ThreadedX64Win64FFIPlugin VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 */ -static char __buildInfo[] = "ThreadedX64Win64FFIPlugin VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "ThreadedX64Win64FFIPlugin VMMaker.oscog-eem.1692 uuid: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 " __DATE__ ; @@ -286,6 +286,7 @@ static sqInt registerArgsSlop(void); static sqInt returnStructInRegisters(sqInt returnStructSize); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); +static sqInt signedMachineIntegerFor(unsigned long value); static sqInt sizeField(sqInt oop); static sqInt startOfData(sqInt oop); @@ -359,7 +360,6 @@ static sqInt (*pushInteger)(sqInt integerValue); static sqInt (*pushRemappableOop)(sqInt oop); static sqInt (*signed32BitIntegerFor)(sqInt integerValue); -static int (*signed32BitValueOf)(sqInt oop); static sqInt (*signed64BitIntegerFor)(sqLong integerValue); static sqLong (*signed64BitValueOf)(sqInt oop); static long (*signedMachineIntegerValueOf)(sqInt oop); @@ -447,7 +447,6 @@ extern sqInt pushInteger(sqInt integerValue); extern sqInt pushRemappableOop(sqInt oop); extern sqInt signed32BitIntegerFor(sqInt integerValue); -extern int signed32BitValueOf(sqInt oop); extern sqInt signed64BitIntegerFor(sqLong integerValue); extern sqLong signed64BitValueOf(sqInt oop); extern long signedMachineIntegerValueOf(sqInt oop); @@ -464,9 +463,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "X64Win64FFIPlugin VMMaker.oscog-eem.1689 (i)" + "X64Win64FFIPlugin VMMaker.oscog-eem.1692 (i)" #else - "X64Win64FFIPlugin VMMaker.oscog-eem.1689 (e)" + "X64Win64FFIPlugin VMMaker.oscog-eem.1692 (e)" #endif ; @@ -509,11 +508,11 @@ } -/* return an int of the address of the byteSize slot (byte, short, int, - whatever) at byteOffset in rcvr. Nominally intended for use with - ExternalAddress objects, this code will work (for obscure historical - reasons) with plain Byte or Word Arrays as well. - */ +/* Answer a long of the address of the byteSize slot (byte, short, int, + whatever) at byteOffset in rcvr. + Nominally intended for use with ExternalAddress objects, this code will + work (for obscure historical + reasons) with plain Byte or Word Arrays as well. */ /* ThreadedFFIPlugin>>#ffiAddressOf:startingAt:size: */ static sqInt @@ -523,7 +522,6 @@ sqInt rcvrClass; sqInt rcvrSize; - flag("This needs more thought. It is 32-bit specific. What about 64-bit platforms?"); if (!(isBytes(rcvr))) { return primitiveFail(); } @@ -533,10 +531,11 @@ rcvrClass = fetchClassOf(rcvr); rcvrSize = byteSizeOf(rcvr); if (rcvrClass == (classExternalAddress())) { - if (!(rcvrSize == 4)) { + if (!(rcvrSize == BytesPerWord)) { return primitiveFail(); } + /* Hack!! */ /* don't you dare to read from object memory (unless is pinned)! */ addr = fetchPointerofObject(0, rcvr); if (addr == 0) { @@ -549,7 +548,7 @@ if (!(((byteOffset + byteSize) - 1) <= rcvrSize)) { return primitiveFail(); } - addr = ((int) (firstIndexableField(rcvr))); + addr = ((long) (firstIndexableField(rcvr))); } addr = (addr + byteOffset) - 1; return addr; @@ -1666,7 +1665,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwith(((float (*)(long, long, long, long)) procAddr), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3]); } @@ -1826,7 +1825,7 @@ } return oop; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop = floatObjectOf(floatRet); } else { @@ -2135,7 +2134,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { floatRet = dispatchFunctionPointerwithwithwithwith(((float (*)(long, long, long, long)) (((void *) address))), ((calloutState->integerRegisters))[0], ((calloutState->integerRegisters))[1], ((calloutState->integerRegisters))[2], ((calloutState->integerRegisters))[3]); } @@ -2296,7 +2295,7 @@ result = oop3; goto l7; } - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { oop3 = floatObjectOf(floatRet); } else { @@ -4012,7 +4011,7 @@ /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); atomicType = ((usqInt) (typeSpec & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; - if ((((usqInt) atomicType) >> 1) == (FFITypeSingleFloat > 1)) { + if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSingleFloat) >> 1)) { if (atomicType == FFITypeSingleFloat) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1692.mcz
by commits＠source.squeak.org 22 Feb '16

22 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1692.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1692 Author: eem Time: 22 February 2016, 10:57:10.137377 am UUID: 57b2f552-72d3-4db7-99d8-ef9872eb93f5 Ancestors: VMMaker.oscog-tfel.1691 ThreadedFFIPlugin fixes for 64 bits. Make ffiAddressOf:startingAt:size: & primitiveFFIIntegerAt[Put] 64-bit capable. Use signedMachineIntegerFor: to answer the result in primitiveCreateManualSurface. Fix slips in testing for float and/or double in the ARM & X64 ffiCalloutTo:SpecOnStack:in: methods. Add asUnsignedLongLong to Integer along with Slang support. =============== Diff against VMMaker.oscog-tfel.1691 =============== Item was added: + ----- Method: CCodeGenerator>>generateAsUnsignedLongLong:on:indent: (in category 'C translation') ----- + generateAsUnsignedLongLong: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll:'((unsigned long long)'. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation support') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #>>> #generateSignedShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #timesRepeat: #generateTimesRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong64 #generateSignedIntFromLong64:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToLong64 #generateSignedIntToLong64:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: + #asUnsignedLongLong #generateAsUnsignedLongLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #allMask: #generateAllMask:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #value:value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was added: + ----- Method: Integer>>asUnsignedLongLong (in category '*VMMaker-interpreter simulator') ----- + asUnsignedLongLong + self assert: self >= 0. + ^self! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self load: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 0)) to: 'double *') at: 0) Flo: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 2)) to: 'double *') at: 0) a: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 4)) to: 'double *') at: 0) t: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 6)) to: 'double *') at: 0) R: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 8)) to: 'double *') at: 0) e: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 10)) to: 'double *') at: 0) g: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 12)) to: 'double *') at: 0) s: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 14)) to: 'double *') at: 0)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. + (atomicType >> 1) = (FFITypeSingleFloat >> 1) - (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]] ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. + (atomicType >> 1) = (FFITypeSingleFloat >> 1) - (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiAddressOf:startingAt:size: (in category 'primitive support') ----- ffiAddressOf: rcvr startingAt: byteOffset size: byteSize + "Answer a long of the address of the byteSize slot (byte, short, int, whatever) at byteOffset in rcvr. + Nominally intended for use with ExternalAddress objects, this code will work (for obscure historical + reasons) with plain Byte or Word Arrays as well. " - "return an int of the address of the byteSize slot (byte, short, int, whatever) at byteOffset in rcvr. Nominally intended for use with ExternalAddress objects, this code will work (for obscure historical reasons) with plain Byte or Word Arrays as well. " | rcvrClass rcvrSize addr | - self flag: 'This needs more thought. It is 32-bit specific. What about 64-bit platforms?'. (interpreterProxy isBytes: rcvr) ifFalse:[^interpreterProxy primitiveFail]. + byteOffset > 0 ifFalse:[^interpreterProxy primitiveFail]. - (byteOffset > 0) ifFalse:[^interpreterProxy primitiveFail]. rcvrClass := interpreterProxy fetchClassOf: rcvr. rcvrSize := interpreterProxy byteSizeOf: rcvr. + rcvrClass = interpreterProxy classExternalAddress + ifTrue: + [rcvrSize = BytesPerWord ifFalse:[^interpreterProxy primitiveFail]. + addr := interpreterProxy fetchPointer: 0 ofObject: rcvr. "Hack!!!!" + "don't you dare to read from object memory (unless is pinned)!!" + (addr = 0 "or: [(interpreterProxy isInMemory: addr) or: [(interpreterProxy isPinned: rcvr) not]]") ifTrue: + [^interpreterProxy primitiveFail]] + ifFalse: + [byteOffset+byteSize-1 <= rcvrSize ifFalse: + [^interpreterProxy primitiveFail]. + addr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: #long]. - rcvrClass = interpreterProxy classExternalAddress ifTrue:[ - (rcvrSize = 4) ifFalse:[^interpreterProxy primitiveFail]. - addr := interpreterProxy fetchPointer: 0 ofObject: rcvr. - "don't you dare to read from object memory (unless is pinned)!!" - (addr = 0" or: [(interpreterProxy isInMemory: addr) or: [(interpreterProxy isPinned: rcvr) not]]") - ifTrue:[^interpreterProxy primitiveFail]. - ] ifFalse:[ - (byteOffset+byteSize-1 <= rcvrSize) - ifFalse:[^interpreterProxy primitiveFail]. - addr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: 'int'. - ]. addr := addr + byteOffset - 1. ^addr! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveCreateManualSurface (in category 'primitives - surfaces') ----- primitiveCreateManualSurface "arguments: name(type, stack offset) width(Integer, 4) height(Integer, 3) rowPitch(Integer, 2) depth(Integer, 1) isMSB(Boolean, 0)" | width height rowPitch depth isMSB result | <export: true> + interpreterProxy methodArgumentCount = 5 ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadNumArgs]. - interpreterProxy methodArgumentCount == 5 ifFalse: [^interpreterProxy primitiveFail]. width := interpreterProxy stackIntegerValue: 4. height := interpreterProxy stackIntegerValue: 3. rowPitch := interpreterProxy stackIntegerValue: 2. depth := interpreterProxy stackIntegerValue: 1. isMSB := interpreterProxy stackObjectValue: 0. isMSB := interpreterProxy booleanValueOf: isMSB. interpreterProxy failed ifTrue: [^nil]. + result := self cCode: 'createManualSurface(width, height, rowPitch, depth, isMSB)' + inSmalltalk: [self create: width Man: height ual: rowPitch Surf: depth ace: isMSB]. + result < 0 ifTrue: + [^interpreterProxy primitiveFail]. + result := interpreterProxy signedMachineIntegerFor: result. - self touch: width; touch: height; touch: rowPitch; touch: depth; touch: isMSB. - - result := self cCode: 'createManualSurface(width, height, rowPitch, depth, isMSB)'. - result < 0 ifTrue: [^interpreterProxy primitiveFail]. - result := interpreterProxy signed32BitIntegerFor: result. ^interpreterProxy pop: 6 thenPush: result ! 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> - "Return a (signed or unsigned) n byte integer from the given byte offset." - | isSigned byteSize byteOffset rcvr addr value mask | <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]. - (byteOffset > 0 and:[byteSize = 1 or:[byteSize = 2 or:[byteSize = 4]]]) - 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'] + 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! - byteSize < 4 ifTrue:[ - "short/byte" - byteSize = 1 - ifTrue:[value := interpreterProxy byteAt: addr] - ifFalse:[ value := self cCode: '*((unsigned short int *) addr)' - inSmalltalk: [interpreterProxy shortAt: addr]]. - isSigned ifTrue:["sign extend value" - mask := 1 << (byteSize * 8 - 1). - value := (value bitAnd: mask-1) - (value bitAnd: mask)]. - "note: byte/short never exceed SmallInteger range" - value := interpreterProxy integerObjectOf: value. - ] ifFalse:[ - "general 32 bit integer" - value := interpreterProxy longAt: addr. - value := isSigned - ifTrue:[interpreterProxy signed32BitIntegerFor: value] - ifFalse:[interpreterProxy positive32BitIntegerFor: value]. - ]. - ^interpreterProxy pop: 4 thenPush: value! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIIntegerAtPut (in category 'primitives') ----- primitiveFFIIntegerAtPut + "Store a (signed or unsigned) n byte integer at the given byte offset + in the receiver, using the platform's endianness." - "Store a (signed or unsigned) n byte integer at the given byte offset." | isSigned byteSize byteOffset rcvr addr value max valueOop | + <var: 'value' type: #sqLong> + <var: 'max' type: #sqLong> <export: true> <inline: false> isSigned := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). byteSize := interpreterProxy stackIntegerValue: 1. valueOop := interpreterProxy stackValue: 2. byteOffset := interpreterProxy stackIntegerValue: 3. rcvr := interpreterProxy stackObjectValue: 4. 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]. - (byteOffset > 0 and:[byteSize = 1 or:[byteSize = 2 or:[byteSize = 4]]]) - ifFalse:[^interpreterProxy primitiveFail]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: byteSize. interpreterProxy failed ifTrue:[^0]. isSigned + ifTrue:[value := interpreterProxy signedMachineIntegerValueOf: valueOop] + ifFalse:[value := interpreterProxy positiveMachineIntegerValueOf: valueOop]. - ifTrue:[value := interpreterProxy signed32BitValueOf: valueOop] - ifFalse:[value := interpreterProxy positive32BitValueOf: valueOop]. interpreterProxy failed ifTrue:[^0]. + byteSize < BytesPerWord ifTrue: + [isSigned + ifTrue: + [max := 1 << (8 * byteSize - 1). + (value >= (0 - max) and: [value < max]) ifFalse: [^interpreterProxy primitiveFail]] + ifFalse: + [value asUnsignedLongLong < (1 << (8*byteSize)) ifFalse: [^interpreterProxy primitiveFail]]]. + byteSize <= 2 + ifTrue: + [byteSize = 1 + ifTrue: [interpreterProxy byteAt: addr put: value] + ifFalse: [interpreterProxy shortAt: addr put: value]] + ifFalse: + [byteSize = 4 + ifTrue: [interpreterProxy long32At: addr put: value] + ifFalse: [interpreterProxy long64At: addr put: value]]. - byteSize < 4 ifTrue:[ - isSigned ifTrue:[ - max := 1 << (8 * byteSize - 1). - value >= max ifTrue:[^interpreterProxy primitiveFail]. - value < (0 - max) ifTrue:[^interpreterProxy primitiveFail]. - ] ifFalse:[ - value >= (1 << (8*byteSize)) ifTrue:[^interpreterProxy primitiveFail]. - ]. - "short/byte" - byteSize = 1 - ifTrue:[interpreterProxy byteAt: addr put: value] - ifFalse:[ self cCode: '*((short int *) addr) = value' - inSmalltalk: [interpreterProxy shortAt: addr put: value]]. - ] ifFalse:[interpreterProxy longAt: addr put: value]. ^interpreterProxy pop: 5 thenPush: valueOop! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> <var: #intRet type: 'SixteenByteReturn'> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self load: (calloutState floatRegisters at: 0) Flo: (calloutState floatRegisters at: 1) a: (calloutState floatRegisters at: 2) t: (calloutState floatRegisters at: 3) R: (calloutState floatRegisters at: 4) e: (calloutState floatRegisters at: 5) g: (calloutState floatRegisters at: 6) s: (calloutState floatRegisters at: 7)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. + (atomicType >> 1) = (FFITypeSingleFloat >> 1) - (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]] ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturn (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [oop := self ffiReturnPointer: intRet a ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. + (atomicType >> 1) = (FFITypeSingleFloat >> 1) - (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet a ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop! Item was changed: ----- Method: ThreadedX64Win64FFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self load: (calloutState floatRegisters at: 0) Flo: (calloutState floatRegisters at: 1) at: (calloutState floatRegisters at: 2) Re: (calloutState floatRegisters at: 3) gs: (calloutState floatRegisters at: 4)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. + (atomicType >> 1) = (FFITypeSingleFloat >> 1) - (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]] ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. + (atomicType >> 1) = (FFITypeSingleFloat >> 1) - (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop!

1 0

[commit][3626] Eliminate the casts on assigning the dispatch struct in sqManualSurface.c
by commits＠squeakvm.org 22 Feb '16

22 Feb '16

Revision: 3626 Author: eliot Date: 2016-02-22 10:51:24 -0800 (Mon, 22 Feb 2016) Log Message: ----------- Eliminate the casts on assigning the dispatch struct in sqManualSurface.c Modified Paths: -------------- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c =================================================================== --- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c 2016-02-21 04:56:31 UTC (rev 3625) +++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c 2016-02-22 18:51:24 UTC (rev 3626) @@ -53,22 +53,23 @@ /* Create the dispatch-table that SurfacePlugin will use to interact with instances of "struct ManualSurface" */ -static long manualSurfaceGetFormat(ManualSurface* surface, long* width, long* height, long* depth, long* isMSB); -static void* manualSurfaceLock(ManualSurface* surface, long *pitch, long x, long y, long w, long h); -static long manualSurfaceUnlock(ManualSurface* surface, long x, long y, long w, long h); -static long manualSurfaceShow(ManualSurface* surface, long x, long y, long w, long h); +static long manualSurfaceGetFormat(void *, long*, long*, long*, long*); +static long manualSurfaceLock(void *, long *, long, long, long, long); +static long manualSurfaceUnlock(void *, long, long, long, long); +static long manualSurfaceShow(void *, long, long, long, long); static sqSurfaceDispatch manualSurfaceDispatch = { 1, 0, - (fn_getSurfaceFormat) manualSurfaceGetFormat, - (fn_lockSurface) manualSurfaceLock, - (fn_unlockSurface) manualSurfaceUnlock, - (fn_showSurface) manualSurfaceShow + manualSurfaceGetFormat, + manualSurfaceLock, + manualSurfaceUnlock, + manualSurfaceShow }; /* sqSurfaceDispatch functions *****************************************************************************/ -long manualSurfaceGetFormat(ManualSurface* surface, long* width, long* height, long* depth, long* isMSB) { +long manualSurfaceGetFormat(void *surfaceArg, long* width, long* height, long* depth, long* isMSB) { + ManualSurface* surface = surfaceArg; *width = surface->width; *height = surface->height; *depth = surface->depth; @@ -77,34 +78,36 @@ return 1; } -void* manualSurfaceLock(ManualSurface* surface, long *pitch, long x, long y, long w, long h) { +long manualSurfaceLock(void *surfaceArg, long *pitch, long x, long y, long w, long h) { + ManualSurface* surface = surfaceArg; /* Ideally, would be atomic. But it doens't matter for the forseeable future, since it is only called via BitBlt primitives. */ int wasLocked = surface->isLocked; surface->isLocked = 1; /* Can't lock if it was already locked. */ - if (wasLocked) return NULL; + if (wasLocked) return 0; /* If there is no pointer, the lock-attempt fails. */ if (!surface->ptr) { surface->isLocked = 0; - return NULL; + return 0; } /* Success! Return the pointer. */ *pitch = surface->rowPitch; DPRINTF(("Locked Surface: %lx Input Rect: %ld %ld %ld %ld Row Pitch: %ld\n", (long) surface, x, y, w, h, *pitch)); - return surface->ptr; + return (long)(surface->ptr); } -long manualSurfaceUnlock(ManualSurface* surface, long x, long y, long w, long h) { +long manualSurfaceUnlock(void *surfaceArg, long x, long y, long w, long h) { + ManualSurface* surface = surfaceArg; surface->isLocked = 0; DPRINTF(("Unlocked Surface: %lx Rect: %ld %ld %ld %ld\n", (long) surface, x, y, w, h)); return 1; } -long manualSurfaceShow(ManualSurface* surface, long x, long y, long w, long h) { +long manualSurfaceShow(void *surfaceArg, long x, long y, long w, long h) { /* Unsupported */ return 0; } @@ -143,7 +146,7 @@ long destroyManualSurface(long surfaceID) { if (!unregisterSurface) return 0; /* failure... couldn't init function-pointer */ - else return unregisterSurface(surfaceID); + return unregisterSurface(surfaceID); } long setManualSurfacePointer(long surfaceID, void* ptr) { @@ -156,6 +159,6 @@ surface = (ManualSurface*)surfaceHandle; if (surface->isLocked) return FALSE; /* can't set pointer while surface is locked */ surface->ptr = ptr; - DPRINTF(("Set Surface: %lx Polonger: %lx\n", surfaceID, (long)ptr)); + DPRINTF(("Set Surface: %lx Pointer: %lx\n", surfaceID, (long)ptr)); return TRUE; } Modified: trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h =================================================================== --- trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h 2016-02-21 04:56:31 UTC (rev 3625) +++ trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h 2016-02-22 18:51:24 UTC (rev 3626) @@ -6,10 +6,10 @@ /* Plugins creating their own surfaces must register these using the following set of functions. The typedefs are for easier casts. */ -typedef long (*fn_getSurfaceFormat)(long surfaceHandle, long* width, long* height, long* depth, long* isMSB); -typedef long (*fn_lockSurface)(long surfaceHandle, long *pitch, long x, long y, long w, long h); -typedef long (*fn_unlockSurface)(long surfaceHandle, long x, long y, long w, long h); -typedef long (*fn_showSurface)(long surfaceHandle, long x, long y, long w, long h); +typedef long (*fn_getSurfaceFormat)(void * surfaceHandle, long* width, long* height, long* depth, long* isMSB); +typedef long (*fn_lockSurface)(void * surfaceHandle, long *pitch, long x, long y, long w, long h); +typedef long (*fn_unlockSurface)(void * surfaceHandle, long x, long y, long w, long h); +typedef long (*fn_showSurface)(void * surfaceHandle, long x, long y, long w, long h); typedef struct sqSurfaceDispatch { /* Version information. Must be provided by the client Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 20 20:22:47 PST 2016 + Mon Feb 22 10:32:52 PST 2016

1 0

← Newer
1
2
3
4
5
6
7
...
15
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 February 2016