Vm-dev July 2015

vm-dev@lists.squeakfoundation.org

19 participants
87 discussions

VM Maker: VMMaker.oscog-eem.1408.mcz
by commits＠source.squeak.org 08 Jul '15

08 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1408.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1408 Author: eem Time: 8 July 2015, 11:24:12.884 am UUID: 51bc4e0f-a338-4394-8c6a-22b4b3e07c61 Ancestors: VMMaker.oscog-eem.1407 ThreadedFFIPlugin: Allow ffiCreateIntegralResultOop:ofAtomicType:in: to be inlined. reduce the number of tests leading to the common case of an integral return in ffiCalloutTo:SpecOnStack:in: etc. Refactor the remapOop:in: idiom up into InterpreterPlugin and use it in the ThreadedFFIPlugin. =============== Diff against VMMaker.oscog-eem.1407 =============== Item was added: + ----- Method: InterpreterPlugin>>remapOop:in: (in category 'simulation') ----- + remapOop: oopOrList in: aBlock + "Call remapOop: for the variable oopOrList (or all of the variables in oopOrList) before evaluating + aBlock, and restore them after. If this is Spur, do nothing, since Spur does not GC on allocation + and the SmartSyntaxPluginCodeGenerator generates null code for this op in Spur." + <doNotGenerate> + | ctxt tempNames tempIndices | + interpreterProxy hasSpurMemoryManagerAPI ifTrue: + [^aBlock value]. + ctxt := thisContext sender. + tempNames := ctxt tempNames. + oopOrList isArray + ifTrue: + [tempIndices := oopOrList collect: [:tempName| tempNames indexOf: tempName]. + tempIndices do: + [:index| interpreterProxy pushRemappableOop: (ctxt namedTempAt: index)]] + ifFalse: [interpreterProxy pushRemappableOop: oopOrList]. + ^aBlock ensure: + [oopOrList isArray + ifTrue: + [tempIndices reverseDo: + [:index| ctxt namedTempAt: index put: interpreterProxy popRemappableOop]] + ifFalse: + [1 to: ctxt numTemps do: + [:index| + (ctxt tempAt: index) = oopOrList ifTrue: + [ctxt tempAt: index put: interpreterProxy topRemappableOop]]. + interpreterProxy popRemappableOop]]! Item was removed: - ----- Method: Object>>remapOop:in: (in category '*VMMaker-translation support') ----- - remapOop: oopOrList in: aBlock - "For translation only; noop when running in Smalltalk." - ^aBlock value! Item was removed: - ----- Method: SmartSyntaxInterpreterPlugin>>remapOop:in: (in category 'simulation') ----- - remapOop: oopOrList in: aBlock - "Call remapOop: for the variable oopOrList (or all of the variables in oopOrList) before evaluating - aBlock, and restore them after. If this is Spur, do nothing, since Spur does not GC on allocation - and the SmartSyntaxPluginCodeGenerator generates null code for this op in Spur." - <doNotGenerate> - | ctxt tempNames tempIndices | - interpreterProxy hasSpurMemoryManagerAPI ifTrue: - [^aBlock value]. - ctxt := thisContext sender. - tempNames := ctxt tempNames. - oopOrList isArray - ifTrue: - [tempIndices := oopOrList collect: [:tempName| tempNames indexOf: tempName]. - tempIndices do: - [:index| interpreterProxy pushRemappableOop: (ctxt namedTempAt: index)]] - ifFalse: [interpreterProxy pushRemappableOop: oopOrList]. - ^aBlock ensure: - [oopOrList isArray - ifTrue: - [tempIndices reverseDo: - [:index| ctxt namedTempAt: index put: interpreterProxy popRemappableOop]] - ifFalse: - [1 to: ctxt numTemps do: - [:index| - (ctxt tempAt: index) = oopOrList ifTrue: - [ctxt tempAt: index put: interpreterProxy topRemappableOop]]. - interpreterProxy popRemappableOop]]! Item was removed: - ----- Method: SmartSyntaxPluginCodeGenerator>>generateRemapOopIn:on:indent: (in category 'translating builtins') ----- - generateRemapOopIn: aNode on: aStream indent: level - "Generate the C code for this message onto the given stream." - - aStream cr; nextPutAll: '#if SPURVM'; cr. - self generateSpurRemapOopIn: aNode on: aStream indent: level. - aStream cr; nextPutAll: '#else /* SPURVM */'; cr. - self generateV3RemapOopIn: aNode on: aStream indent: level. - aStream cr; nextPutAll: '#endif /* SPURVM */'; cr! Item was removed: - ----- Method: SmartSyntaxPluginCodeGenerator>>generateSpurRemapOopIn:on:indent: (in category 'translating builtins') ----- - generateSpurRemapOopIn: aNode on: aStream indent: level - "Generate just the block argument for this message as Spur does not GC on allocation." - - aNode args second emitCCodeOn: aStream level: level generator: self! Item was removed: - ----- Method: SmartSyntaxPluginCodeGenerator>>generateV3RemapOopIn:on:indent: (in category 'translating builtins') ----- - generateV3RemapOopIn: aNode on: aStream indent: level - "Generate call on remapOop: for the variable oopOrList (or all of the - variables in oopOrList) before evaluating aBlock, and restore them after. - This keeps the oops valid if, as V3 will, there is a GC on allocation." - - | idList | - pluginFunctionsUsed add: #pushRemappableOop:; add: #popRemappableOop. - idList := aNode args first nameOrValue. - idList class == Array ifFalse: [idList := Array with: idList]. - idList do: - [:each | - aStream - nextPutAll: 'pushRemappableOop('; - nextPutAll: each asString; - nextPutAll: ');'] - separatedBy: [aStream crtab: level]. - aStream cr. - aNode args second emitCCodeOn: aStream level: level generator: self. - level timesRepeat: [aStream tab]. - idList reversed do: - [:each | - aStream - nextPutAll: each asString; - nextPutAll: ' = popRemappableOop()'] - separatedBy: [aStream nextPut: $;; crtab: level]! Item was changed: ----- Method: SmartSyntaxPluginCodeGenerator>>initializeCTranslationDictionary (in category 'translating builtins') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | super initializeCTranslationDictionary. pairs := #( #asCInt #generateAsCInt:on:indent: #asCUnsigned #generateAsCUnsigned:on:indent: #asCBoolean #generateAsCBoolean:on:indent: #asCDouble #generateAsCDouble:on:indent: #asSmallIntegerObj #generateAsSmallIntegerObj:on:indent: #asPositiveIntegerObj #generateAsPositiveIntegerObj:on:indent: #asBooleanObj #generateAsBooleanObj:on:indent: #asFloatObj #generateAsFloatObj:on:indent: #asIf:var: #generateAsIfVar:on:indent: #asIf:var:asValue: #generateAsIfVarAsValue:on:indent: #asIf:var:put: #generateAsIfVarPut:on:indent: #field: #generateField:on:indent: #field:put: #generateFieldPut:on:indent: #class #generateClass:on:indent: #stSize #generateStSize:on:indent: #stAt: #generateStAt:on:indent: #stAt:put: #generateStAtPut:on:indent: #asCharPtr #generateAsCharPtr:on:indent: #asIntPtr #generateAsIntPtr:on:indent: #cPtrAsOop #generateCPtrAsOop:on:indent: #next #generateNext:on:indent: #asOop: #generateAsOop:on:indent: #asValue: #generateAsValue:on:indent: #isFloat #generateIsFloat:on:indent: #isIndexable #generateIsIndexable:on:indent: #isIntegerOop #generateIsIntegerOop:on:indent: #isIntegerValue #generateIsIntegerValue:on:indent: "#FloatOop #generateIsFloatValue:on:indent:" "unused, never implemented" #isWords #generateIsWords:on:indent: #isWordsOrBytes #generateIsWordsOrBytes:on:indent: #isPointers #generateIsPointers:on:indent: #isNil #generateIsNil:on:indent: #isMemberOf: #generateIsMemberOf:on:indent: #isKindOf: #generateIsKindOf:on:indent: #fromStack: #generateFromStack:on:indent: "#clone #generateClone:on:indent:" "unused, never implemented" "#new #generateNew:on:indent:" "unused, never implemented" "#new: #generateNewSize:on:indent:" "unused, never implemented" "#superclass #generateSuperclass:on:indent:" "unused, never implemented" - #remapOop:in: #generateRemapOopIn:on:indent: #debugCode: #generateDebugCode:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! 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 | - | myThreadIndex atomicType floatRet intRet loadFloatRegs | <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)]. - 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 = FFITypeSingleFloat ifTrue: + [atomicType = FFITypeSingleFloat + ifTrue: + [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(int, int, int, int)') + 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 (*)(int, int, int, int)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3)]] - [floatRet := self - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(int, int, int, int)') - with: (calloutState integerRegisters at: 0) - with: (calloutState integerRegisters at: 1) - with: (calloutState integerRegisters at: 2) - with: (calloutState integerRegisters at: 3)]. - atomicType = FFITypeDoubleFloat - ifTrue: - [floatRet := self - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(int, int, int, int)') - 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 (*)(int, int, int, int)') 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: + [self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] + ifFalse: + [self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]]. - "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: - [^self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. - - (calloutState ffiRetHeader anyMask: FFIFlagStructure) ifTrue: - [^self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. + (atomicType >> 1) = (FFITypeSingleFloat > 1) + ifTrue: + [oop := interpreterProxy floatObjectOf: floatRet] + ifFalse: + [oop := self ffiCreateIntegralResultOop: intRet + ofAtomicType: atomicType + in: calloutState]. + ^interpreterProxy methodReturnValue: oop! - (atomicType = FFITypeSingleFloat - or: [atomicType = FFITypeDoubleFloat]) ifTrue: - [^interpreterProxy methodReturnValue: (interpreterProxy floatObjectOf: floatRet)]. - - ^interpreterProxy methodReturnValue: (self ffiCreateIntegralResultOop: intRet - ofAtomicType: atomicType - in: calloutState)! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- ffiReturnStruct: longLongRet ofType: ffiRetType in: calloutState <var: #longLongRet type: #usqLong> <var: #calloutState type: #'CalloutState *'> "Create a structure return value from an external function call. The value as been stored in alloca'ed space pointed to by the calloutState." | retOop retClass oop | <inline: true> retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. + self remapOop: retOop + in: [oop := interpreterProxy + instantiateClass: interpreterProxy classByteArray + indexableSize: calloutState structReturnSize]. - interpreterProxy pushRemappableOop: retOop. - oop := interpreterProxy - instantiateClass: interpreterProxy classByteArray - indexableSize: calloutState structReturnSize. (self returnStructInRegisters: calloutState structReturnSize) ifTrue: [self mem: (interpreterProxy firstIndexableField: oop) cp: (self addressOf: longLongRet) y: calloutState structReturnSize] ifFalse: [self mem: (interpreterProxy firstIndexableField: oop) cp: calloutState limit y: calloutState structReturnSize]. - retOop := interpreterProxy popRemappableOop. interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. ^interpreterProxy methodReturnValue: retOop! 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 | 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 <= FFITypeSignedShort ifTrue: + ["byte/short. first extract partial word, then sign extend" - atomicType = FFITypeBool ifTrue:[ - "Make sure bool honors the byte size requested" - byteSize := calloutState ffiRetHeader bitAnd: FFIStructSizeMask. - value := byteSize = 4 - 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 <= FFITypeSignedShort ifTrue:[ - "byte/short. first extract partial word, then sign extend" shift := (atomicType >> 1) * 8. "# of significant bits" value := retVal bitAnd: (1 << shift - 1). + (atomicType anyMask: 1) ifTrue: + ["make the guy signed" - (atomicType anyMask: 1) ifTrue:[ - "make the guy signed" mask := 1 << (shift-1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. ^interpreterProxy integerObjectOf: value]. "32bit integer return" ^(atomicType anyMask: 1) 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: (self cppIf: #SPURVM ifTrue: [16rFFFFFFFF] ifFalse: [255]))]! 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: 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 pushRemappableOop: retType. - oop := interpreterProxy - instantiateClass: interpreterProxy classExternalAddress - indexableSize: 4. - ptr := interpreterProxy firstIndexableField: oop. - ptr at: 0 put: (self cCoerceSimple: retVal to: #sqInt). - interpreterProxy pushRemappableOop: oop. "preserve for gc" - retOop := interpreterProxy - instantiateClass: interpreterProxy classExternalData - indexableSize: 0. - oop := interpreterProxy popRemappableOop. "external address" - interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. - oop := interpreterProxy popRemappableOop. "return type" - interpreterProxy storePointer: 1 ofObject: retOop withValue: oop. ^interpreterProxy methodReturnValue: retOop]. "non-atomic pointer return" - interpreterProxy pushRemappableOop: retClass. "preserve for gc" classOop := (calloutState ffiRetHeader anyMask: FFIFlagStructure) ifTrue:[interpreterProxy classByteArray] ifFalse:[interpreterProxy classExternalAddress]. + self remapOop: retClass in: + [oop := interpreterProxy + instantiateClass: classOop + indexableSize: 4]. - oop := interpreterProxy - instantiateClass: classOop - 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]. - retClass := interpreterProxy popRemappableOop. "return class" - interpreterProxy pushRemappableOop: oop. "preserve for gc" - retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. - oop := interpreterProxy popRemappableOop. "external address" interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. ^interpreterProxy methodReturnValue: retOop! Item was changed: ----- Method: ThreadedIA32FFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> "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 oop | - | myThreadIndex atomicType floatRet intRet | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. + (atomicType >> 1) = (FFITypeSingleFloat > 1) - (atomicType = FFITypeSingleFloat - or: [atomicType = FFITypeDoubleFloat]) ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)()')] ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)()')]. "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: + [self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] + ifFalse: + [self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]]. - "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: - [^self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. - - (calloutState ffiRetHeader anyMask: FFIFlagStructure) ifTrue: - [^self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. + (atomicType >> 1) = (FFITypeSingleFloat > 1) + ifTrue: + [oop := interpreterProxy floatObjectOf: floatRet] + ifFalse: + [oop := self ffiCreateIntegralResultOop: intRet + ofAtomicType: atomicType + in: calloutState]. + ^interpreterProxy methodReturnValue: oop! - (atomicType = FFITypeSingleFloat - or: [atomicType = FFITypeDoubleFloat]) ifTrue: - [^interpreterProxy methodReturnValue: (interpreterProxy floatObjectOf: floatRet)]. - - ^interpreterProxy methodReturnValue: (self ffiCreateIntegralResultOop: intRet - ofAtomicType: atomicType - in: calloutState)! Item was changed: ----- Method: ThreadedIA32FFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- ffiReturnStruct: longLongRet ofType: ffiRetType in: calloutState <var: #longLongRet type: #usqLong> <var: #calloutState type: #'CalloutState *'> "Create a structure return value from an external function call. The value as been stored in alloca'ed space pointed to by the calloutState." | retOop retClass oop | <inline: true> retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. + self remapOop: retOop + in: [oop := interpreterProxy + instantiateClass: interpreterProxy classByteArray + indexableSize: calloutState structReturnSize]. - interpreterProxy pushRemappableOop: retOop. - oop := interpreterProxy - instantiateClass: interpreterProxy classByteArray - indexableSize: calloutState structReturnSize. (self returnStructInRegisters: calloutState structReturnSize) ifTrue: [self mem: (interpreterProxy firstIndexableField: oop) cp: (self addressOf: longLongRet) y: calloutState structReturnSize] ifFalse: [self mem: (interpreterProxy firstIndexableField: oop) cp: calloutState limit y: calloutState structReturnSize]. - retOop := interpreterProxy popRemappableOop. interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. ^interpreterProxy methodReturnValue: retOop! Item was added: + ----- Method: VMPluginCodeGenerator>>generateRemapOopIn:on:indent: (in category 'C translation') ----- + generateRemapOopIn: aNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream cr; nextPutAll: '#if SPURVM'; cr. + self generateSpurRemapOopIn: aNode on: aStream indent: level. + aStream cr; nextPutAll: '#else /* SPURVM */'; cr. + self generateV3RemapOopIn: aNode on: aStream indent: level. + aStream cr; nextPutAll: '#endif /* SPURVM */'; cr! Item was added: + ----- Method: VMPluginCodeGenerator>>generateSpurRemapOopIn:on:indent: (in category 'C translation') ----- + generateSpurRemapOopIn: aNode on: aStream indent: level + "Generate just the block argument for this message as Spur does not GC on allocation." + + aNode args second emitCCodeOn: aStream level: level generator: self! Item was added: + ----- Method: VMPluginCodeGenerator>>generateV3RemapOopIn:on:indent: (in category 'C translation') ----- + generateV3RemapOopIn: aNode on: aStream indent: level + "Generate call on remapOop: for the variable oopOrList (or all of the + variables in oopOrList) before evaluating aBlock, and restore them after. + This keeps the oops valid if, as V3 will, there is a GC on allocation." + + | idList | + pluginFunctionsUsed add: #pushRemappableOop:; add: #popRemappableOop. + idList := aNode args first nameOrValue. + idList class == Array ifFalse: [idList := Array with: idList]. + idList do: + [:each | + aStream + tab: level; + nextPutAll: 'pushRemappableOop('; + nextPutAll: each asString; + nextPutAll: ');'] + separatedBy: [aStream cr]. + aStream cr. + aNode args second emitCCodeOn: aStream level: level generator: self. + level timesRepeat: [aStream tab]. + idList reversed do: + [:each | + aStream + nextPutAll: each asString; + nextPutAll: ' = popRemappableOop()'] + separatedBy: [aStream nextPut: $;; crtab: level]! Item was changed: ----- Method: VMPluginCodeGenerator>>initializeCTranslationDictionary (in category 'public') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." super initializeCTranslationDictionary. translationDict at: #expandDereferenceInterpreterProxyFunctionTable + put: #generateInterpreterProxyFunctionDeference:on:indent:; + at: #remapOop:in: + put: #generateRemapOopIn:on:indent:! - put: #generateInterpreterProxyFunctionDeference:on:indent:!

1 0

more FFI on spur
by Esteban Lorenzano 08 Jul '15

08 Jul '15

Hi, When doing my tests for Pharo on spur, I’m having some FFI problems: 23 run, 19 passes, 0 skipped, 0 expected failures, 3 failures, 1 errors, 0 unexpected passes Failures: FFIPluginTests>>#testGenericCharCall FFIPluginTests>>#testLibraryCharCall FFIPluginTests>>#testConstructedCharCall Errors: FFIPluginTests>>#testLongLongs Basically, first 3 failures is because FFI is answering an integer instead a char, and the last one is a coercion error. I suppose the “char” ones is because FFI is not taking into account that Character is now immediate (I might be wrong, I didn’t check). I do not understand why the second one can fail… Anyway… can anyone confirm if you have same errors? (I’m using latest FFI package versions from http://source.squeakfoundation.org/FFI <http://source.squeakfoundation.org/FFI>) thanks, Esteban

2 1

Re: [Vm-dev] Why does CompiledMethod>>#objectAt:put: work no longer on spur?
by Jakob Reschke 08 Jul '15

08 Jul '15

Note that the CompiledMethod header format has changed. That code now erases part of the literal counter in the header, if I am not mistaken. The primitive implementation prevents modification of the literal count explicitly. Best regards Jakob 2015-06-25 11:59 GMT+02:00 Tobias Pape <Das.Linux(a)gmx.de>: > > > In V3, this works: > | cm | > cm := (CompiledMethod newFrom: (ByteString >> #findSubstring:in:startingAt:matchTable:)). > cm objectAt: 1 put: (cm header bitAnd: 16r1FF bitInvert). > > In SPUR, objectAt:put: raises a primitive Failed. > > Best regards > -Tobias

2 1

Re: [squeak-dev] Squeak 4.6 -- 2nd release candidate
by Eliot Miranda 07 Jul '15

07 Jul '15

Hi Tobias, On Tue, Jul 7, 2015 at 8:31 AM, Tobias Pape <Das.Linux(a)gmx.de> wrote: > > On 07.07.2015, at 17:26, Chris Muller <asqueaker(a)gmail.com> wrote: > > >>> Interpreter VM will not be able to run Spur images going forward. > >> > >> Pardon? > > > > Download latest Spur image and changes: > > > > > http://www.mirandabanda.org/files/Cog/VM/SpurImages/trunk46-spur.image > > > > > http://www.mirandabanda.org/files/Cog/VM/SpurImages/trunk46-spur.changes > > > > and latest interpreter VM. Then try: > > > > squeak trunk46-spur.image > > > > Results: > > > > This interpreter (vers. 0) cannot read image file (vers. 6521). > > Press CR to quit... > > > Well, your sentence sounded as if there's no intention of making the > interpreter > VM SPUR-aware whatsoever. Surely I got that wrong, didn't I? > I certainly hope so! I ant the Interpreter VM to be able to use the Spur memory manager. But that will realy force a merge of VMMaker and VMMaker.oscog and right now I don't see we have a lot of resource. Volunteers are /very/ welcome! > > Best regards > -Tobias > > > -- best, Eliot

1 0

[commit][3399] CogVM source as per VMMaker.oscog-eem.1407
by commits＠squeakvm.org 07 Jul '15

07 Jul '15

Revision: 3399 Author: eliot Date: 2015-07-07 13:53:26 -0700 (Tue, 07 Jul 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1407 Implement the relevant implicitReceiveCacheAt: for the ARM Cogits. Eliminate compile-time warnings from Newspeak ARM Cogit. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogitARMv5.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-07-07 19:03:10 UTC (rev 3398) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-07-07 20:53:26 UTC (rev 3399) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a + CCodeGenerator VMMaker.oscog-eem.1407 uuid: cc7c9003-2145-44b0-a3bd-937c285968bb from - StackToRegisterMappingCogit VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a + StackToRegisterMappingCogit VMMaker.oscog-eem.1407 uuid: cc7c9003-2145-44b0-a3bd-937c285968bb */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1407 uuid: cc7c9003-2145-44b0-a3bd-937c285968bb " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -912,7 +912,8 @@ static sqInt slotOffsetOfInstVarIndex(sqInt index) NoDbgRegParms; static sqInt smallIntegerIsOnlyImmediateType(void); static AbstractInstruction * concretizeLiteral(AbstractInstruction * self_in_concretizeLiteral) NoDbgRegParms; -static sqInt inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt followingAddress) NoDbgRegParms; +static sqInt implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, sqInt callSiteReturnAddress) NoDbgRegParms; +static sqInt inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress) NoDbgRegParms; static sqInt isPCDependent(AbstractInstruction * self_in_isPCDependent) NoDbgRegParms; static usqInt isSharable(AbstractInstruction * self_in_isSharable) NoDbgRegParms; static sqInt literalLoadInstructionBytes(AbstractInstruction * self_in_literalLoadInstructionBytes) NoDbgRegParms; @@ -8044,7 +8045,7 @@ return ceSendFromInLineCacheMiss(cPIC); } cogExtendPICCaseNMethodtagisMNUCase(cPIC, newTargetMethodOrNil, cacheTag, errorSelectorOrNil == SelectorDoesNotUnderstand); - executeCogPICfromLinkedSendWithReceiverandCacheTag(cPIC, receiver, inlineCacheTagAt(backEnd, outerReturn)); + executeCogPICfromLinkedSendWithReceiverandCacheTag(cPIC, receiver, longAt(pcRelativeAddressAt(backEnd, ((usqInt)(outerReturn - 8))))); return null; } @@ -8163,7 +8164,7 @@ cacheTag = inlineCacheTagForInstance(receiver); if (((errorSelectorOrNil != null) && (errorSelectorOrNil != SelectorDoesNotUnderstand)) - || (((inlineCacheTagAt(backEnd, outerReturn)) == 0) + || (((longAt(pcRelativeAddressAt(backEnd, ((usqInt)(outerReturn - 8))))) == 0) || ((newTargetMethodOrNil == null) || (isYoung(newTargetMethodOrNil))))) { result = patchToOpenPICFornumArgsreceiver((targetMethod->selector), (targetMethod->cmNumArgs), receiver); @@ -8192,7 +8193,7 @@ ? rewriteInlineCacheAttagtarget(backEnd, outerReturn, (targetMethod->selector), (((sqInt)pic)) + cmEntryOffset) : rewriteCallAttarget(backEnd, outerReturn, (((sqInt)pic)) + cmEntryOffset)); flushICacheFromto(processor, (((usqInt)outerReturn)) - extent, ((usqInt)outerReturn)); - executeCogPICfromLinkedSendWithReceiverandCacheTag(pic, receiver, inlineCacheTagAt(backEnd, outerReturn)); + executeCogPICfromLinkedSendWithReceiverandCacheTag(pic, receiver, longAt(pcRelativeAddressAt(backEnd, ((usqInt)(outerReturn - 8))))); return null; } @@ -8251,7 +8252,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); if (!(asserta(checkValidOopReference((nsSendCache->selector))))) { @@ -8281,7 +8282,7 @@ return 3; } /* begin offsetCacheTagAndCouldBeObjectAt:annotation:into: */ - cacheTag1 = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); + cacheTag1 = longAt(pcRelativeAddressAt(backEnd, ((usqInt)((((sqInt)mcpc)) - 8)))); /* in-line cache tags are the selectors of sends if sends are unlinked, the selectors of super sends (entry offset = cmNoCheckEntryOffset), @@ -8396,7 +8397,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); if (!(checkValidOopReference((nsSendCache->selector)))) { @@ -8451,7 +8452,7 @@ offset = offset1; } - selectorOrCacheTag = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); + selectorOrCacheTag = longAt(pcRelativeAddressAt(backEnd, ((usqInt)((((sqInt)mcpc)) - 8)))); if ((entryPoint > methodZoneBase) && ((offset != cmNoCheckEntryOffset) && ((((((CogMethod *) (entryPoint - offset)))->cmType)) != CMOpenPIC))) { @@ -9848,7 +9849,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -10824,12 +10825,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -11507,7 +11508,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); if (((nsSendCache->classTag)) != 2) { @@ -12704,7 +12705,7 @@ sqInt *sendTable1; sqInt tagCouldBeObj; sqInt tagCouldBeObj1; - sqInt targetMethod; + CogMethod * targetMethod; CogMethod *targetMethod1; sqInt unlinkedRoutine; sqInt val; @@ -12722,7 +12723,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); entryPoint = (nsSendCache->target); @@ -12730,7 +12731,7 @@ /* Send is linked */ - targetMethod = entryPoint - cmNoCheckEntryOffset; + targetMethod = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset)); if (markAndTraceOrFreeCogMethodfirstVisit(targetMethod, (((usqInt)targetMethod)) > (((usqInt)mcpc)))) { /* begin voidNSSendCache: */ (nsSendCache->classTag = 2); @@ -12762,7 +12763,7 @@ if (annotation >= IsSendCall) { /* begin offsetCacheTagAndCouldBeObjectAt:annotation:into: */ - cacheTag1 = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); + cacheTag1 = longAt(pcRelativeAddressAt(backEnd, ((usqInt)((((sqInt)mcpc)) - 8)))); /* in-line cache tags are the selectors of sends if sends are unlinked, the selectors of super sends (entry offset = cmNoCheckEntryOffset), @@ -12866,7 +12867,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); sel = (nsSendCache->selector); @@ -12893,7 +12894,7 @@ if (annotation >= IsSendCall) { /* begin offsetCacheTagAndCouldBeObjectAt:annotation:into: */ - cacheTag1 = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); + cacheTag1 = longAt(pcRelativeAddressAt(backEnd, ((usqInt)((((sqInt)mcpc)) - 8)))); /* in-line cache tags are the selectors of sends if sends are unlinked, the selectors of super sends (entry offset = cmNoCheckEntryOffset), @@ -14046,7 +14047,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); relocateCallBeforeReturnPCby(backEnd, ((sqInt)mcpc), -delta); @@ -14176,7 +14177,7 @@ /* begin nsSendCacheFromReturnAddress: */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); oop = (nsSendCache->selector); @@ -14204,7 +14205,7 @@ if (annotation >= IsSendCall) { /* begin offsetCacheTagAndCouldBeObjectAt:annotation:into: */ - cacheTag1 = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); + cacheTag1 = longAt(pcRelativeAddressAt(backEnd, ((usqInt)((((sqInt)mcpc)) - 8)))); /* in-line cache tags are the selectors of sends if sends are unlinked, the selectors of super sends (entry offset = cmNoCheckEntryOffset), @@ -14494,7 +14495,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); if (((entryPoint = (nsSendCache->target))) != 0) { @@ -14572,7 +14573,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); if ((((nsSendCache->classTag)) != 2) @@ -14617,7 +14618,7 @@ if (!(((annotation == IsSuperSend) || (0)) || (((targetMethod1->cmType)) == CMOpenPIC))) { - if (!(isValidClassTag(inlineCacheTagAt(backEnd, ((sqInt)mcpc))))) { + if (!(isValidClassTag(longAt(pcRelativeAddressAt(backEnd, ((usqInt)((((sqInt)mcpc)) - 8))))))) { /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); @@ -14651,7 +14652,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); if (((entryPoint = (nsSendCache->target))) != 0) { @@ -14730,7 +14731,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); if (((nsSendCache->classTag)) != 2) { @@ -14804,7 +14805,7 @@ mcpc1 = ((char *) (((sqInt)mcpc))); entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc1)); assert(entryPoint1 < methodZoneBase); - cacheAddress = ((usqInt)(implicitReceiveCacheAt(backEnd, mcpc1))); + cacheAddress = ((usqInt)(longAt(pcRelativeAddressAt(backEnd, ((usqInt)(mcpc1 - 8)))))); assert(isInOldSpace(cacheAddress)); nsSendCache = ((NSSendCache *) cacheAddress); if (((entryPoint = (nsSendCache->target))) != 0) { @@ -19775,11 +19776,22 @@ return self_in_concretizeLiteral; } + +/* Answer the implicit receiver cache for the return address + of a call to one of the ceImplicitReceiver... trampolines. */ + + /* CogOutOfLineLiteralsARMCompiler>>#implicitReceiveCacheAt: */ +static sqInt +implicitReceiveCacheAt(AbstractInstruction * self_in_implicitReceiveCacheAt, sqInt callSiteReturnAddress) +{ + return longAt(pcRelativeAddressAt(self_in_implicitReceiveCacheAt, ((usqInt)(callSiteReturnAddress - 8)))); +} + /* CogOutOfLineLiteralsARMCompiler>>#inlineCacheTagAt: */ static sqInt -inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt followingAddress) +inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress) { - return longAt(pcRelativeAddressAt(self_in_inlineCacheTagAt, followingAddress - 8)); + return longAt(pcRelativeAddressAt(self_in_inlineCacheTagAt, ((usqInt)(callSiteReturnAddress - 8)))); } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jul 6 11:56:22 PDT 2015 + Tue Jul 7 13:52:43 PDT 2015

1 0

VM Maker: VMMaker.oscog-eem.1407.mcz
by commits＠source.squeak.org 07 Jul '15

07 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1407.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1407 Author: eem Time: 7 July 2015, 1:49:34.367 pm UUID: cc7c9003-2145-44b0-a3bd-937c285968bb Ancestors: VMMaker.oscog-eem.1406 Eliminate compile-time warnings from Newspeak ARM Cogit. =============== Diff against VMMaker.oscog-eem.1406 =============== Item was changed: ----- Method: CogOutOfLineLiteralsARMCompiler>>implicitReceiveCacheAt: (in category 'inline cacheing') ----- implicitReceiveCacheAt: callSiteReturnAddress "Answer the implicit receiver cache for the return address of a call to one of the ceImplicitReceiver... trampolines." <inline: true> + ^objectMemory longAt: (self pcRelativeAddressAt: (callSiteReturnAddress - 8) asUnsignedInteger)! - ^objectMemory longAt: (self pcRelativeAddressAt: callSiteReturnAddress - 8)! Item was changed: ----- Method: CogOutOfLineLiteralsARMCompiler>>inlineCacheTagAt: (in category 'inline cacheing') ----- + inlineCacheTagAt: callSiteReturnAddress + <inline: true> + ^objectMemory longAt: (self pcRelativeAddressAt: (callSiteReturnAddress - 8) asUnsignedInteger)! - inlineCacheTagAt: followingAddress - ^objectMemory longAt: (self pcRelativeAddressAt: followingAddress - 8)! Item was changed: ----- Method: Cogit>>markLiteralsAndUnlinkIfUnmarkedSend:pc:method: (in category 'garbage collection') ----- markLiteralsAndUnlinkIfUnmarkedSend: annotation pc: mcpc method: cogMethod "Mark and trace literals. Unlink sends that have unmarked cache tags or targets." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> | literal | annotation = IsObjectReference ifTrue: [literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation markAndTraceLiteral: literal in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]]. self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache entryPoint targetMethod sel eo | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. entryPoint := nsSendCache target. entryPoint ~= 0 ifTrue: "Send is linked" + [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. - [targetMethod := entryPoint - cmNoCheckEntryOffset. (self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger) ifTrue: [self voidNSSendCache: nsSendCache]]. sel := nsSendCache selector. (objectMemory isForwarded: sel) ifFalse: [objectMemory markAndTrace: sel] ifTrue: [sel := objectMemory followForwarded: literal. nsSendCache selector: sel. self markAndTraceUpdatedLiteral: sel in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]. eo := nsSendCache enclosingObject. eo ~= 0 ifTrue: [(objectMemory isForwarded: eo) ifFalse: [objectMemory markAndTrace: eo] ifTrue: [eo := objectMemory followForwarded: literal. nsSendCache enclosingObject: eo. self markAndTraceUpdatedLiteral: eo in: (self cCoerceSimple: cogMethod to: #'CogMethod *')]]]]. (self isPureSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | | cacheTagMarked | cacheTagMarked := tagCouldBeObj and: [objectRepresentation cacheTagIsMarked: cacheTag]. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| (cacheTagMarked not or: [self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: ["Either the cacheTag is unmarked (e.g. new class) or the target has been freed (because it is unmarked), so unlink the send." self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable. objectRepresentation markAndTraceLiteral: targetMethod selector in: targetMethod at: (self addressOf: targetMethod selector put: [:val| targetMethod selector: val])]]] ifFalse: "cacheTag is selector" [(objectRepresentation markAndTraceCacheTagLiteral: cacheTag in: (self cCoerceSimple: cogMethod to: #'CogMethod *') atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]]]]. ^0 "keep scanning"!

1 0

VM Maker: VMMaker.oscog-eem.1406.mcz
by commits＠source.squeak.org 07 Jul '15

07 Jul '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1406.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1406 Author: eem Time: 7 July 2015, 12:53:22.553 pm UUID: 8623e529-d65d-4cc1-b62a-477bffeb453d Ancestors: VMMaker.oscog-eem.1405 Implement the relevant implicitReceiveCacheAt: for the ARM Cogits. Make this work for in-image compilation too. =============== Diff against VMMaker.oscog-eem.1405 =============== Item was added: + ----- Method: CogInLineLiteralsARMCompiler>>implicitReceiveCacheAt: (in category 'inline cacheing') ----- + implicitReceiveCacheAt: callSiteReturnAddress + "Answer the implicit receiver cache for the return address + of a call to one of the ceImplicitReceiver... trampolines." + self assert: (self instructionIsBL: (self instructionBeforeAddress: callSiteReturnAddress)). + ^self extract32BitOperandFrom4InstructionsPreceeding: callSiteReturnAddress - 4! Item was added: + ----- Method: CogOutOfLineLiteralsARMCompiler>>implicitReceiveCacheAt: (in category 'inline cacheing') ----- + implicitReceiveCacheAt: callSiteReturnAddress + "Answer the implicit receiver cache for the return address + of a call to one of the ceImplicitReceiver... trampolines." + <inline: true> + ^objectMemory longAt: (self pcRelativeAddressAt: callSiteReturnAddress - 8)! Item was changed: ----- Method: Cogit>>selectorForSendAt:annotation: (in category 'simulation only') ----- selectorForSendAt: mcpc annotation: annotation <doNotGenerate> | entryPoint offset targetMethod selector | entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. selector := entryPoint > methodZoneBase ifTrue: "It's a linked send." [self offsetAndSendTableFor: entryPoint annotation: annotation into: [:off :table| offset := off]. targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. targetMethod selector] ifFalse: [backEnd inlineCacheTagAt: mcpc]. + ^(annotation ~= IsNSSendCall and: [coInterpreter isCurrentImageFacade]) - ^coInterpreter isCurrentImageFacade ifTrue: [coInterpreter objectForOop: selector] ifFalse: [selector]! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>isInOldSpace: (in category 'testing') ----- + isInOldSpace: address + ^objectMemory isInOldSpace: address!

1 0

[commit][3398] Add skeleton files for ARM implementation of the misnamed IA32ABI plugin.
by commits＠squeakvm.org 07 Jul '15

07 Jul '15

Revision: 3398 Author: eliot Date: 2015-07-07 12:03:10 -0700 (Tue, 07 Jul 2015) Log Message: ----------- Add skeleton files for ARM implementation of the misnamed IA32ABI plugin. Modified Paths: -------------- trunk/platforms/Cross/plugins/IA32ABI/ia32abi.h trunk/platforms/Cross/plugins/IA32ABI/xabicc.c Added Paths: ----------- trunk/platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c trunk/platforms/Cross/plugins/IA32ABI/dabusinessARM.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Added: trunk/platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c (rev 0) +++ trunk/platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c 2015-07-07 19:03:10 UTC (rev 3398) @@ -0,0 +1,272 @@ +/* + * armia32abicc.c + * + * Support for Call-outs and Call-backs from the Plugin on ARM. + * Written by Eliot Miranda 07/15. + */ + +#include <stdlib.h> /* for valloc */ +#include <sys/mman.h> /* for mprotect */ + +#include <string.h> /* for memcpy et al */ +#include <setjmp.h> +#include <stdio.h> /* for fprintf(stderr,...) */ + +#include "vmCallback.h" +#include "sqAssert.h" +#include "sqMemoryAccess.h" +#include "sqVirtualMachine.h" +#include "ia32abi.h" + +#if !defined(min) +# define min(a,b) ((a) < (b) ? (a) : (b)) +#endif + +#ifdef SQUEAK_BUILTIN_PLUGIN +extern +#endif +struct VirtualMachine* interpreterProxy; + +#ifdef _MSC_VER +# define alloca _alloca +#endif +#if __GNUC__ +# define setsp(sp) asm volatile ("ldr %%sp, %0" : : "m"(sp)) +# define getsp() ({ void *sp; asm volatile ("movl %%sp,%0" : "=r"(sp) : ); sp;}) +#endif +#if __linux__ +# define STACK_ALIGN_BYTES 16 +#endif + +#if !defined(setsp) +# define setsp(ignored) 0 +#endif + +#define moduloPOT(m,v) (((v)+(m)-1) & ~((m)-1)) +#define alignModuloPOT(m,v) ((void *)moduloPOT(m,(unsigned long)(v))) + +#define objIsAlien(anOop) (interpreterProxy->includesBehaviorThatOf(interpreterProxy->fetchClassOf(anOop), interpreterProxy->classAlien())) +#define objIsUnsafeAlien(anOop) (interpreterProxy->includesBehaviorThatOf(interpreterProxy->fetchClassOf(anOop), interpreterProxy->classUnsafeAlien())) + +#define sizeField(alien) (*(long *)pointerForOop((sqInt)(alien) + BaseHeaderSize)) +#define dataPtr(alien) pointerForOop((sqInt)(alien) + BaseHeaderSize + BytesPerOop) +#if 0 /* obsolete after adding pointer Aliens with size field == 0 */ +# define isIndirectOrPointer(alien) (sizeField(alien) <= 0) +# define startOfData(alien) (isIndirectOrPointer(alien) \ + ? *(void **)dataPtr(alien) \ + : (void *)dataPtr(alien)) +#endif +#define isIndirect(alien) (sizeField(alien) < 0) +#define startOfParameterData(alien) (isIndirect(alien) \ + ? *(void **)dataPtr(alien) \ + : (void *)dataPtr(alien)) +#define isIndirectSize(size) ((size) < 0) +#define startOfDataWithSize(alien,size) (isIndirectSize(size) \ + ? *(void **)dataPtr(alien) \ + : (void *)dataPtr(alien)) + +#define isSmallInt(oop) ((oop)&1) +#define intVal(oop) (((long)(oop))>>1) + +/* + * Call a foreign function that answers an integral result in %eax (and + * possibly %edx) according to IA32-ish ABI rules. + */ +sqInt +callIA32IntegralReturn(SIGNATURE) { +long long (*f)(long a,long b,long c,long d), r; +#include "dabusinessARM.h" +} + +/* + * Call a foreign function that answers a single-precision floating-point + * result in %f0 according to IA32-ish ABI rules. + */ +sqInt +callIA32FloatReturn(SIGNATURE) { +float (*f)(long a,long b,long c,long d), r; +#include "dabusinessARM.h" +} + +/* + * Call a foreign function that answers a double-precision floating-point + * result in %f0 according to IA32-ish ABI rules. + */ +sqInt +callIA32DoubleReturn(SIGNATURE) { +double (*f)(long a,long b,long c,long d), r; +#include "dabusinessARM.h" +} + +/* Queueing order for callback returns. To ensure that callback returns occur + * in LIFO order we provide mostRecentCallbackContext which is tested by the + * return primitive primReturnFromContextThrough. Note that in the threaded VM + * this does not have to be thread-specific or locked since it is within the + * bounds of the ownVM/disownVM pair. + */ +static VMCallbackContext *mostRecentCallbackContext = 0; + +VMCallbackContext * +getMostRecentCallbackContext() { return mostRecentCallbackContext; } + +#define getRMCC(t) mostRecentCallbackContext +#define setRMCC(t) (mostRecentCallbackContext = (void *)(t)) + +/* + * Entry-point for call-back thunks. Args are thunk address and stack pointer, + * where the stack pointer is pointing one word below the return address of the + * thunk's callee, 4 bytes below the thunk's first argument. The stack is: + * callback + * arguments + * retpc (thunk) <--\ + * address of retpc-/ <--\ + * address of address of ret pc-/ + * thunkp + * esp->retpc (thunkEntry) + * + * The stack pointer is pushed twice to keep the stack alignment to 16 bytes, a + * requirement on platforms using SSE2 such as Mac OS X, and harmless elsewhere. + * + * This function's roles are to use setjmp/longjmp to save the call point + * and return to it, to correct C stack pointer alignment if necessary (see + * STACK_ALIGN_HACK), and to return any of the various values from the callback. + * + * Looking forward to support for x86-64, which typically has 6 register + * arguments, the function would take 8 arguments, the 6 register args as + * longs, followed by the thunkp and stackp passed on the stack. The register + * args would get copied into a struct on the stack. A pointer to the struct + * is then passed as an element of the VMCallbackContext. + */ +long +thunkEntry(long r0, long r1, long r2, long r3, void *thunkp, long *stackp) +{ + VMCallbackContext vmcc; + VMCallbackContext *previousCallbackContext; + int flags, returnType; + long regArgs[4]; + +#if STACK_ALIGN_HACK + { void *sp = getsp(); + int offset = (unsigned long)sp & (STACK_ALIGN_BYTES - 1); + if (offset) { +# if __GNUC__ + asm("sub %0,%%sp" : : "m"(offset)); +# else +# error need to subtract offset from esp +# endif + sp = getsp(); + assert(!((unsigned long)sp & (STACK_ALIGN_BYTES - 1))); + } + } +#endif /* STACK_ALIGN_HACK */ + + regArgs[0] = r0; regArgs[1] = r1; regArgs[2] = r2; regArgs[3] = r3; + + if ((flags = interpreterProxy->ownVM(0)) < 0) { + fprintf(stderr,"Warning; callback failed to own the VM\n"); + return -1; + } + + if (!(returnType = setjmp(vmcc.trampoline))) { + previousCallbackContext = getRMCC(); + setRMCC(&vmcc); + vmcc.thunkp = thunkp; + vmcc.stackp = stackp + 2; /* skip address of retpc & retpc (thunk) */ + vmcc.intregargsp = regArgs; + vmcc.floatregargsp = 0; + interpreterProxy->sendInvokeCallbackContext(&vmcc); + fprintf(stderr,"Warning; callback failed to invoke\n"); + setRMCC(previousCallbackContext); + interpreterProxy->disownVM(flags); + return -1; + } + setRMCC(previousCallbackContext); + interpreterProxy->disownVM(flags); + + switch (returnType) { + + case retword: return vmcc.rvs.valword; + + case retword64: { + long vhigh = vmcc.rvs.valleint64.high; +#if __GNUC__ + asm("ldr %%r1,%0" : : "m"(vhigh)); +#else +# error need to load r1 with vmcc.rvs.valleint64.high on this compiler +#endif + return vmcc.rvs.valleint64.low; + } + + case retdouble: { + double valflt64 = vmcc.rvs.valflt64; +#if 0 +# error need to load float return register with vmcc.rvs.valflt64 on this compiler +#else + extern void error(char *s); + error("need to load float return register with vmcc.rvs.valflt64 on this compiler"); +#endif + return 0; + } + + case retstruct: memcpy( (void *)(stackp[1]), + vmcc.rvs.valstruct.addr, + vmcc.rvs.valstruct.size); + return stackp[1]; + } + fprintf(stderr,"Warning; invalid callback return type\n"); + return 0; +} + +/* + * Thunk allocation support. Since thunks must be exectuable and some OSs + * may not provide default execute permission on memory returned by malloc + * we must provide memory that is guaranteed to be executable. The abstraction + * is to answer an Alien that references an executable piece of memory that + * is some (possiby unitary) multiple of the pagesize. + * + * We assume the Smalltalk image code will manage subdividing the executable + * page amongst thunks so there is no need to free these pages, since the image + * will recycle parts of the page for reclaimed thunks. + */ +#if defined(_MSC_VER) || defined(__MINGW32__) +static unsigned long pagesize = 0; +#endif + +void * +allocateExecutablePage(long *size) +{ + void *mem; + +#if defined(_MSC_VER) || defined(__MINGW32__) +#if !defined(MEM_TOP_DOWN) +# define MEM_TOP_DOWN 0x100000 +#endif + if (!pagesize) { + SYSTEM_INFO sysinf; + + GetSystemInfo(&sysinf); + + pagesize = sysinf.dwPageSize; + } + /* N.B. VirtualAlloc MEM_COMMIT initializes the memory returned to zero. */ + mem = VirtualAlloc( 0, + pagesize, + MEM_COMMIT | MEM_TOP_DOWN, + PAGE_EXECUTE_READWRITE); + if (mem) + *size = pagesize; +#else + long pagesize = getpagesize(); + + if (!(mem = valloc(pagesize))) + return 0; + + memset(mem, 0, pagesize); + if (mprotect(mem, pagesize, PROT_READ | PROT_WRITE | PROT_EXEC) < 0) { + free(mem); + return 0; + } + *size = pagesize; +#endif + return mem; +} Added: trunk/platforms/Cross/plugins/IA32ABI/dabusinessARM.h =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/dabusinessARM.h (rev 0) +++ trunk/platforms/Cross/plugins/IA32ABI/dabusinessARM.h 2015-07-07 19:03:10 UTC (rev 3398) @@ -0,0 +1,159 @@ +/* + * dabusinessARM.h + * + * Body of the various callIA32XXXReturn functions. + * Call a foreign function according to ARM-ish ABI rules. + * N.B. In Cog Stack and Cogit VMs numArgs is negative to access args from + * the downward-growing stack. + */ + long i, size, regs[4]; + sqInt funcAlien, resultMaybeAlien; + char *argvec; +#if STACK_ALIGN_BYTES + char *argstart; +#endif + +#if STACKVM /* Need to access args downwards from first arg */ + if (numArgs < 0) + for (i = size = 0; --i >= numArgs;) { + sqInt arg = argVector[i+1]; + if (objIsAlien(arg) && sizeField(arg)) + size += moduloPOT(sizeof(long),abs(sizeField(arg))); + else if (interpreterProxy->isFloatObject(arg)) + size += sizeof(double); + else /* assume an integer or pointer. check below. */ + size += sizeof(long); + } + else +#endif /* STACKVM */ + for (i = numArgs, size = 0; --i >= 0;) { + sqInt arg = argVector[i]; + if (objIsAlien(arg) && sizeField(arg)) + size += moduloPOT(sizeof(long),abs(sizeField(arg))); + else if (interpreterProxy->isFloatObject(arg)) + size += sizeof(double); + else /* assume an integer or pointer. check below. */ + size += sizeof(long); + } + +#if STACK_ALIGN_BYTES + /* At point of call stack must be aligned to STACK_ALIGN_BYTES. So alloca + * at least enough for this plus the argvector, and start writing argvector + * at aligned point. Then just prior to call cut-back stack to aligned. + */ + argvec = alloca(STACK_ALIGN_BYTES + moduloPOT(STACK_ALIGN_BYTES,size)); + argvec = alignModuloPOT(STACK_ALIGN_BYTES, argvec); + argstart = argvec; +#else + argvec = alloca(moduloPOT(sizeof(long),size)); +# if defined(__MINGW32__) && (__GNUC__ >= 3) + /* + * cygwin & MinGW's gcc 3.4.x's alloca is a library routine that answers + * %esp + 4, so the outgoing stack is offset by one word if uncorrected. + * Grab the actual stack pointer to correct. + */ + argvec = getsp(); +# endif +#endif + +#if STACKVM /* Need to access args downwards from first arg */ + if (numArgs < 0) + for (i = size = 0; --i >= numArgs;) { + sqInt arg = argVector[i+1]; + if (isSmallInt(arg)) { + *(long *)argvec = intVal(arg); + argvec += sizeof(long); + } + else if (objIsAlien(arg)) { + long argByteSize; + + if (!(size = sizeField(arg))) + size = argByteSize = sizeof(void *); + else + argByteSize = abs(size); + memcpy(argvec, startOfDataWithSize(arg,size), argByteSize); + argvec += moduloPOT(sizeof(long), argByteSize); + } + else if (objIsUnsafeAlien(arg)) { + sqInt bitsObj = interpreterProxy->fetchPointerofObject(0,arg); + void *v = interpreterProxy->firstIndexableField(bitsObj); + *(void **)argvec = v; + argvec += sizeof(long); + } + else if (interpreterProxy->isFloatObject(arg)) { + double d = interpreterProxy->floatValueOf(arg); + *(double *)argvec = d; + argvec += sizeof(double); + } + else { + long v = interpreterProxy->signed32BitValueOf(arg); + if (interpreterProxy->failed()) { + interpreterProxy->primitiveFailFor(0); + v = interpreterProxy->positive32BitValueOf(arg); + if (interpreterProxy->failed()) + return PrimErrBadArgument; + } + *(long *)argvec = v; + argvec += sizeof(long); + } + } + else +#endif /* STACKVM */ + for (i = 0; i < numArgs; i++) { + sqInt arg = argVector[i]; + if (isSmallInt(arg)) { + *(long *)argvec = intVal(arg); + argvec += sizeof(long); + } + else if (objIsAlien(arg)) { + long argByteSize; + + if (!(size = sizeField(arg))) + size = argByteSize = sizeof(void *); + else + argByteSize = abs(size); + memcpy(argvec, startOfDataWithSize(arg,size), argByteSize); + argvec += moduloPOT(sizeof(long), argByteSize); + } + else if (objIsUnsafeAlien(arg)) { + sqInt bitsObj = interpreterProxy->fetchPointerofObject(0,arg); + void *v = interpreterProxy->firstIndexableField(bitsObj); + *(void **)argvec = v; + argvec += sizeof(long); + } + else if (interpreterProxy->isFloatObject(arg)) { + double d = interpreterProxy->floatValueOf(arg); + *(double *)argvec = d; + argvec += sizeof(double); + } + else { + long v = interpreterProxy->signed32BitValueOf(arg); + if (interpreterProxy->failed()) { + interpreterProxy->primitiveFailFor(0); + v = interpreterProxy->positive32BitValueOf(arg); + if (interpreterProxy->failed()) + return PrimErrBadArgument; + } + *(long *)argvec = v; + argvec += sizeof(long); + } + } + + funcAlien = interpreterProxy->stackValue(funcOffset); + f = *(void **)startOfParameterData(funcAlien); +#if STACK_ALIGN_BYTES + /* cut stack back to start of aligned args */ + setsp(argstart); +#endif + r = f(regs[0],regs[1],regs[2],regs[3]); + /* post call need to refresh stack pointer in case of call-back and GC. */ + resultMaybeAlien = interpreterProxy->stackValue(resultOffset); + if (objIsAlien(resultMaybeAlien)) { + if (!(size = sizeField(resultMaybeAlien))) + size = sizeof(void *); + memcpy(startOfDataWithSize(resultMaybeAlien,size), + &r, + min((unsigned)abs(size), sizeof(r))); + } + + return PrimNoErr; Modified: trunk/platforms/Cross/plugins/IA32ABI/ia32abi.h =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/ia32abi.h 2015-07-06 18:56:39 UTC (rev 3397) +++ trunk/platforms/Cross/plugins/IA32ABI/ia32abi.h 2015-07-07 19:03:10 UTC (rev 3398) @@ -40,6 +40,8 @@ # define INT_REG_ARGS long,long,long,long,long,long, #elif defined(__powerpc__) || defined(PPC) || defined(_POWER) || defined(_IBMR2) || defined(__ppc__) # define INT_REG_ARGS long,long,long,long,long,long,long,long, +#elif defined(__ARM_ARCH__) || defined(__arm__) || defined(__arm32__) || defined(ARM32) +# define INT_REG_ARGS long,long,long,long, #endif extern long thunkEntry (INT_REG_ARGS void *,long *); extern void *allocateExecutablePage(long *pagesize); Modified: trunk/platforms/Cross/plugins/IA32ABI/xabicc.c =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/xabicc.c 2015-07-06 18:56:39 UTC (rev 3397) +++ trunk/platforms/Cross/plugins/IA32ABI/xabicc.c 2015-07-07 19:03:10 UTC (rev 3398) @@ -2,7 +2,7 @@ * xabicc.c - platform-agnostic root for ALien call-outs and callbacks. * * Support for Call-outs and Call-backs from the IA32ABI Plugin. - * The plgin is misnamed. It should be the AlienPlugin, but its history + * The plugin is misnamed. It should be the AlienPlugin, but its history * dictates otherwise. */ #if i386|i486|i586|i686 @@ -11,4 +11,6 @@ # include "ppcia32abicc.c" #elif x86_64|x64|__x86_64|__x86_64__ # include "x64ia32abicc.c" +#elif defined(__ARM_ARCH__) || defined(__arm__) || defined(__arm32__) || defined(ARM32) +# include "arm32ia32abicc.c" #endif Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun May 17 13:13:27 PDT 2015 + Tue Jul 7 12:02:30 PDT 2015

1 0

New Cog VMs available
by Eliot Miranda 07 Jul '15

07 Jul '15

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3397 These are new release candidates. The Travis CI Newspeak bootstrap job caught a serious bug with become and process switch in the Spur VMs. CogVM binaries as per VMMaker.oscog-eem.1405/r3397 Spur: Make sure the post become action unforwards the Process in the activeProcess inst var. Add some more asserts to check. Also follow the specialObjectsArray after a pin become. Generically use storePointerUnchecked: when storing nils into the process lists. -- best, Eliot

1 0

[commit][3397] CogVM source as per VMMaker.oscog-eem.1405
by commits＠squeakvm.org 06 Jul '15

06 Jul '15

Revision: 3397 Author: eliot Date: 2015-07-06 11:56:39 -0700 (Mon, 06 Jul 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1405 Spur: Make sure the post become action unforwards the Process in the activeProcess inst var up to date. Add some more asserts to check.Also follow the specialObjectsArray after a pin become. Generically use storePointerUnchecked: when storing nils into the process lists. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-07-04 16:09:13 UTC (rev 3396) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-07-06 18:56:39 UTC (rev 3397) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1405 uuid: 7aff388a-73ba-4202-bb5a-72b0759ff46b from - CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 + CoInterpreter VMMaker.oscog-eem.1405 uuid: 7aff388a-73ba-4202-bb5a-72b0759ff46b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1405 uuid: 7aff388a-73ba-4202-bb5a-72b0759ff46b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1207,7 +1207,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -extern sqInt stringForCString(const char *aCString); +extern usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; extern void tenuringIncrementalGC(void); @@ -2410,7 +2410,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1403"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1405"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -28740,11 +28740,15 @@ longAtput((process + BaseHeaderSize) + (MyListIndex << (shiftForWord())), myList); } /* begin removeProcess:fromList: */ - assert(!(isForwarded(myList))); + assert(!((isForwarded(process)))); + assert(!((isForwarded(myList)))); firstLink = longAt((myList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); lastLink = longAt((myList + BaseHeaderSize) + (LastLinkIndex << (shiftForWord()))); + assert(!((isForwarded(firstLink)))); + assert(!((isForwarded(lastLink)))); if (process == firstLink) { nextLink = longAt((process + BaseHeaderSize) + (NextLinkIndex << (shiftForWord()))); + assert(!((isForwarded(nextLink)))); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(myList))); if (isOldObject(myList)) { @@ -28761,36 +28765,20 @@ } longAtput((myList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord())), nextLink); if (process == lastLink) { - /* begin storePointer:ofObject:withValue: */ + /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(myList))); - if (isOldObject(myList)) { - - /* most stores into young objects */ - - if (((GIV(nilObj) & 3) == 0) - && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(myList))) >> 29) & 1) != 0)) { - remember(myList); - } - } - } longAtput((myList + BaseHeaderSize) + (LastLinkIndex << (shiftForWord())), GIV(nilObj)); } } else { tempLink = firstLink; while (1) { + assert(!((isForwarded(tempLink)))); if (tempLink == GIV(nilObj)) { - /* begin success: */ - - /* Don't overwrite an error code that has already been set. */ - + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } - - null; goto l1; } nextLink = longAt((tempLink + BaseHeaderSize) + (NextLinkIndex << (shiftForWord()))); @@ -32444,7 +32432,7 @@ usqInt newObj; usqInt numBytes; sqInt numSlots; - sqInt s; + usqInt s; char *sp; sqInt sz; @@ -38121,7 +38109,7 @@ sqInt err; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38246,7 +38234,7 @@ sqInt i; usqInt instSpec; sqInt literalCount; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -44162,7 +44150,7 @@ sqInt fillValue; sqInt hash; usqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -46294,7 +46282,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - sqInt freeChunk; + usqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -46333,8 +46321,8 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - sqInt smallObj; - sqInt start; + usqInt smallObj; + usqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -49275,7 +49263,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -60603,7 +60591,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -61712,6 +61700,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt oldClone; + sqInt referent; SpurSegmentInfo *seg; assert(isNonImmediate(objOop)); @@ -61771,6 +61760,18 @@ if ((byteAt(objOop + 7)) == 0) { byteAtput(objOop + 7, 1); } + /* begin followSpecialObjectsOop */ + if (((longAt(GIV(specialObjectsOop))) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(GIV(specialObjectsOop))); + referent = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + GIV(specialObjectsOop) = referent; + } + followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ spurPostBecomeAction(GIV(becomeEffectsFlags)); @@ -63949,8 +63950,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - sqInt savedInHashes; - sqInt savedOutHashes; + usqInt savedInHashes; + usqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -64420,13 +64421,13 @@ or nil if out of memory. */ /* SpurMemoryManager>>#stringForCString: */ -sqInt +usqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; sqInt len; usqInt newObj; - sqInt newString; + usqInt newString; usqInt numBytes; sqInt numSlots; @@ -65697,7 +65698,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -65782,7 +65783,8 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt lastLink; - assert(!(isForwarded(aList))); + assert(!((isForwarded(proc)))); + assert(!((isForwarded(aList)))); assert((fetchPointerofObject(NextLinkIndex, proc)) == (nilObject())); if (isEmptyList(aList)) { /* begin storePointer:ofObject:withValue: */ @@ -76390,39 +76392,17 @@ sqInt last; sqInt next; - assert(!(isForwarded(aList))); + assert(!((isForwarded(aList)))); first = longAt((aList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); last = longAt((aList + BaseHeaderSize) + (LastLinkIndex << (shiftForWord()))); + assert(!((isForwarded(first)))); + assert(!((isForwarded(last)))); if (first == last) { - /* begin storePointer:ofObject:withValue: */ + /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(aList))); - if (isOldObject(aList)) { - - /* most stores into young objects */ - - if (((GIV(nilObj) & 3) == 0) - && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(aList))) >> 29) & 1) != 0)) { - remember(aList); - } - } - } longAtput((aList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord())), GIV(nilObj)); - /* begin storePointer:ofObject:withValue: */ + /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(aList))); - if (isOldObject(aList)) { - - /* most stores into young objects */ - - if (((GIV(nilObj) & 3) == 0) - && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(aList))) >> 29) & 1) != 0)) { - remember(aList); - } - } - } longAtput((aList + BaseHeaderSize) + (LastLinkIndex << (shiftForWord())), GIV(nilObj)); } else { @@ -76443,20 +76423,8 @@ } longAtput((aList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord())), next); } - /* begin storePointer:ofObject:withValue: */ + /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(first))); - if (isOldObject(first)) { - - /* most stores into young objects */ - - if (((GIV(nilObj) & 3) == 0) - && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(first))) >> 29) & 1) != 0)) { - remember(first); - } - } - } longAtput((first + BaseHeaderSize) + (NextLinkIndex << (shiftForWord())), GIV(nilObj)); return first; } @@ -77595,7 +77563,6 @@ sqInt objOop2; sqInt objOop3; sqInt objOop4; - sqInt objOop5; sqInt procLists; sqInt referent; sqInt referent1; @@ -77662,254 +77629,253 @@ /* begin flushBecommedClassesInMethodZone */ unlinkSendsLinkedForInvalidClasses(); } - /* begin followForwardingPointersInScheduler */ + if (theBecomeEffectsFlags & BecamePointerObjectFlag) { + /* begin followForwardingPointersInScheduler */ - /* the GC follows pointers in the special objects array for us. */ + /* the GC follows pointers in the special objects array for us. */ - schedAssoc = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << (shiftForWord()))); - assert(!(isForwarded(schedAssoc))); - /* begin followObjField:ofObject: */ - objOop4 = longAt((schedAssoc + BaseHeaderSize) + (ValueIndex << (shiftForWord()))); - assert(isNonImmediate(objOop4)); - if (((longAt(objOop4)) & (0x3FFFFF - 8)) == 0) { - objOop4 = fixFollowedFieldofObjectwithInitialValue(ValueIndex, schedAssoc, objOop4); - } - sched = objOop4; - /* begin followObjField:ofObject: */ - objOop5 = longAt((sched + BaseHeaderSize) + (ProcessListsIndex << (shiftForWord()))); - assert(isNonImmediate(objOop5)); - if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { - objOop5 = fixFollowedFieldofObjectwithInitialValue(ProcessListsIndex, sched, objOop5); - } - procLists = objOop5; - for (i3 = 0, iLimiT = ((numSlotsOf(procLists)) - 1); i3 <= iLimiT; i3 += 1) { + schedAssoc = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << (shiftForWord()))); + assert(!(isForwarded(schedAssoc))); + followForwardedObjectFieldstoDepth(schedAssoc, 1); + sched = longAt((schedAssoc + BaseHeaderSize) + (ValueIndex << (shiftForWord()))); /* begin followObjField:ofObject: */ - objOop1 = longAt((procLists + BaseHeaderSize) + (i3 << (shiftForWord()))); - assert(isNonImmediate(objOop1)); - if (((longAt(objOop1)) & (0x3FFFFF - 8)) == 0) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(i3, procLists, objOop1); + objOop4 = longAt((sched + BaseHeaderSize) + (ProcessListsIndex << (shiftForWord()))); + assert(isNonImmediate(objOop4)); + if (((longAt(objOop4)) & (0x3FFFFF - 8)) == 0) { + objOop4 = fixFollowedFieldofObjectwithInitialValue(ProcessListsIndex, sched, objOop4); } - list = objOop1; - /* begin followObjField:ofObject: */ - objOop2 = longAt((list + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); - assert(isNonImmediate(objOop2)); - if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { - objOop2 = fixFollowedFieldofObjectwithInitialValue(FirstLinkIndex, list, objOop2); - } - first = objOop2; - /* begin followObjField:ofObject: */ - objOop3 = longAt((list + BaseHeaderSize) + (LastLinkIndex << (shiftForWord()))); - assert(isNonImmediate(objOop3)); - if (((longAt(objOop3)) & (0x3FFFFF - 8)) == 0) { - objOop3 = fixFollowedFieldofObjectwithInitialValue(LastLinkIndex, list, objOop3); - } - last = objOop3; - while (first != last) { + procLists = objOop4; + for (i3 = 0, iLimiT = ((numSlotsOf(procLists)) - 1); i3 <= iLimiT; i3 += 1) { /* begin followObjField:ofObject: */ - objOop = longAt((first + BaseHeaderSize) + (NextLinkIndex << (shiftForWord()))); - assert(isNonImmediate(objOop)); - if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(NextLinkIndex, first, objOop); + objOop1 = longAt((procLists + BaseHeaderSize) + (i3 << (shiftForWord()))); + assert(isNonImmediate(objOop1)); + if (((longAt(objOop1)) & (0x3FFFFF - 8)) == 0) { + objOop1 = fixFollowedFieldofObjectwithInitialValue(i3, procLists, objOop1); } - next = objOop; - first = next; - } - } - /* begin followForwardingPointersInSpecialObjectsArray */ - /* begin followSemaphoreIn:at: */ - obj1 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << (shiftForWord()))); - if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent11 = longAt((obj1 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent11 & 3) == 0) - && (((longAt(referent11)) & 0x3FFFFF) == 8)) { - referent11 = longAt((referent11 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - obj1 = referent11; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(GIV(specialObjectsOop)))); - if (isOldObject(GIV(specialObjectsOop))) { - - /* most stores into young objects */ - - if (((obj1 & 3) == 0) - && (oopisLessThan(obj1, GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { - remember(GIV(specialObjectsOop)); + list = objOop1; + /* begin followObjField:ofObject: */ + objOop2 = longAt((list + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); + assert(isNonImmediate(objOop2)); + if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(FirstLinkIndex, list, objOop2); + } + first = objOop2; + /* begin followObjField:ofObject: */ + objOop3 = longAt((list + BaseHeaderSize) + (LastLinkIndex << (shiftForWord()))); + assert(isNonImmediate(objOop3)); + if (((longAt(objOop3)) & (0x3FFFFF - 8)) == 0) { + objOop3 = fixFollowedFieldofObjectwithInitialValue(LastLinkIndex, list, objOop3); + } + last = objOop3; + while (first != last) { + /* begin followObjField:ofObject: */ + objOop = longAt((first + BaseHeaderSize) + (NextLinkIndex << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(NextLinkIndex, first, objOop); } + next = objOop; + first = next; } } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << (shiftForWord())), obj1); - } - /* begin followSemaphoreIn:at: */ - obj2 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << (shiftForWord()))); - if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent21 = longAt((obj2 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent21 & 3) == 0) - && (((longAt(referent21)) & 0x3FFFFF) == 8)) { - referent21 = longAt((referent21 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - obj2 = referent21; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(GIV(specialObjectsOop)))); - if (isOldObject(GIV(specialObjectsOop))) { + /* begin followForwardingPointersInSpecialObjectsArray */ + /* begin followSemaphoreIn:at: */ + obj1 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << (shiftForWord()))); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent11 = longAt((obj1 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent11 & 3) == 0) + && (((longAt(referent11)) & 0x3FFFFF) == 8)) { + referent11 = longAt((referent11 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + obj1 = referent11; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(GIV(specialObjectsOop)))); + if (isOldObject(GIV(specialObjectsOop))) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((obj2 & 3) == 0) - && (oopisLessThan(obj2, GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { - remember(GIV(specialObjectsOop)); + if (((obj1 & 3) == 0) + && (oopisLessThan(obj1, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { + remember(GIV(specialObjectsOop)); + } } } + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << (shiftForWord())), obj1); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << (shiftForWord())), obj2); - } - /* begin followSemaphoreIn:at: */ - obj3 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << (shiftForWord()))); - if (((longAt(obj3)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj3)); - referent31 = longAt((obj3 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent31 & 3) == 0) - && (((longAt(referent31)) & 0x3FFFFF) == 8)) { - referent31 = longAt((referent31 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - obj3 = referent31; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(GIV(specialObjectsOop)))); - if (isOldObject(GIV(specialObjectsOop))) { + /* begin followSemaphoreIn:at: */ + obj2 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << (shiftForWord()))); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent21 = longAt((obj2 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent21 & 3) == 0) + && (((longAt(referent21)) & 0x3FFFFF) == 8)) { + referent21 = longAt((referent21 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + obj2 = referent21; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(GIV(specialObjectsOop)))); + if (isOldObject(GIV(specialObjectsOop))) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((obj3 & 3) == 0) - && (oopisLessThan(obj3, GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { - remember(GIV(specialObjectsOop)); + if (((obj2 & 3) == 0) + && (oopisLessThan(obj2, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { + remember(GIV(specialObjectsOop)); + } } } + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << (shiftForWord())), obj2); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << (shiftForWord())), obj3); - } - /* begin followSemaphoreIn:at: */ - obj4 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheFinalizationSemaphore << (shiftForWord()))); - if (((longAt(obj4)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj4)); - referent4 = longAt((obj4 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent4 & 3) == 0) - && (((longAt(referent4)) & 0x3FFFFF) == 8)) { - referent4 = longAt((referent4 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - obj4 = referent4; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(GIV(specialObjectsOop)))); - if (isOldObject(GIV(specialObjectsOop))) { + /* begin followSemaphoreIn:at: */ + obj3 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << (shiftForWord()))); + if (((longAt(obj3)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj3)); + referent31 = longAt((obj3 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent31 & 3) == 0) + && (((longAt(referent31)) & 0x3FFFFF) == 8)) { + referent31 = longAt((referent31 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + obj3 = referent31; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(GIV(specialObjectsOop)))); + if (isOldObject(GIV(specialObjectsOop))) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((obj4 & 3) == 0) - && (oopisLessThan(obj4, GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { - remember(GIV(specialObjectsOop)); + if (((obj3 & 3) == 0) + && (oopisLessThan(obj3, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { + remember(GIV(specialObjectsOop)); + } } } + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << (shiftForWord())), obj3); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheFinalizationSemaphore << (shiftForWord())), obj4); - } - xArray = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ExternalObjectsArray << (shiftForWord()))); - if (((longAt(xArray)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(xArray)); - referent6 = longAt((xArray + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent6 & 3) == 0) - && (((longAt(referent6)) & 0x3FFFFF) == 8)) { - referent6 = longAt((referent6 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - xArray = referent6; - /* begin splObj:put: */ - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(GIV(specialObjectsOop)))); - if (isOldObject(GIV(specialObjectsOop))) { + /* begin followSemaphoreIn:at: */ + obj4 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheFinalizationSemaphore << (shiftForWord()))); + if (((longAt(obj4)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj4)); + referent4 = longAt((obj4 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent4 & 3) == 0) + && (((longAt(referent4)) & 0x3FFFFF) == 8)) { + referent4 = longAt((referent4 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + obj4 = referent4; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(GIV(specialObjectsOop)))); + if (isOldObject(GIV(specialObjectsOop))) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((xArray & 3) == 0) - && (oopisLessThan(xArray, GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { - remember(GIV(specialObjectsOop)); + if (((obj4 & 3) == 0) + && (oopisLessThan(obj4, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { + remember(GIV(specialObjectsOop)); + } } } + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheFinalizationSemaphore << (shiftForWord())), obj4); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (ExternalObjectsArray << (shiftForWord())), xArray); - } - for (i4 = 0, iLimiT1 = ((numSlotsOf(xArray)) - 1); i4 <= iLimiT1; i4 += 1) { - /* begin followSemaphoreIn:at: */ - obj = longAt((xArray + BaseHeaderSize) + (i4 << (shiftForWord()))); - if (((longAt(obj)) & (0x3FFFFF - 8)) == 0) { + xArray = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ExternalObjectsArray << (shiftForWord()))); + if (((longAt(xArray)) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj)); - referent5 = longAt((obj + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent5 & 3) == 0) - && (((longAt(referent5)) & 0x3FFFFF) == 8)) { - referent5 = longAt((referent5 + BaseHeaderSize) + (0 << (shiftForWord()))); + assert(isUnambiguouslyForwarder(xArray)); + referent6 = longAt((xArray + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent6 & 3) == 0) + && (((longAt(referent6)) & 0x3FFFFF) == 8)) { + referent6 = longAt((referent6 + BaseHeaderSize) + (0 << (shiftForWord()))); } - obj = referent5; + xArray = referent6; + /* begin splObj:put: */ /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(xArray))); - if (isOldObject(xArray)) { + assert(!(isForwarded(GIV(specialObjectsOop)))); + if (isOldObject(GIV(specialObjectsOop))) { /* most stores into young objects */ - if (((obj & 3) == 0) - && (oopisLessThan(obj, GIV(newSpaceLimit)))) { + if (((xArray & 3) == 0) + && (oopisLessThan(xArray, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(xArray))) >> 29) & 1) != 0)) { - remember(xArray); + if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { + remember(GIV(specialObjectsOop)); } } } - longAtput((xArray + BaseHeaderSize) + (i4 << (shiftForWord())), obj); + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (ExternalObjectsArray << (shiftForWord())), xArray); } - } - /* begin followForwardingPointersInProfileState */ - if (((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(GIV(profileProcess))); - referent1 = longAt((GIV(profileProcess) + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent1 & 3) == 0) - && (((longAt(referent1)) & 0x3FFFFF) == 8)) { - referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); + for (i4 = 0, iLimiT1 = ((numSlotsOf(xArray)) - 1); i4 <= iLimiT1; i4 += 1) { + /* begin followSemaphoreIn:at: */ + obj = longAt((xArray + BaseHeaderSize) + (i4 << (shiftForWord()))); + if (((longAt(obj)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj)); + referent5 = longAt((obj + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent5 & 3) == 0) + && (((longAt(referent5)) & 0x3FFFFF) == 8)) { + referent5 = longAt((referent5 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + obj = referent5; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(xArray))); + if (isOldObject(xArray)) { + + /* most stores into young objects */ + + if (((obj & 3) == 0) + && (oopisLessThan(obj, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(xArray))) >> 29) & 1) != 0)) { + remember(xArray); + } + } + } + longAtput((xArray + BaseHeaderSize) + (i4 << (shiftForWord())), obj); + } } - GIV(profileProcess) = referent1; } - if (((longAt(GIV(profileMethod))) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(GIV(profileMethod))); - referent2 = longAt((GIV(profileMethod) + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent2 & 3) == 0) - && (((longAt(referent2)) & 0x3FFFFF) == 8)) { - referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); + if (theBecomeEffectsFlags & (BecamePointerObjectFlag + BecameCompiledMethodFlag)) { + /* begin followForwardingPointersInProfileState */ + if (((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(GIV(profileProcess))); + referent1 = longAt((GIV(profileProcess) + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + GIV(profileProcess) = referent1; } - GIV(profileMethod) = referent2; - } - if (((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(GIV(profileSemaphore))); - referent3 = longAt((GIV(profileSemaphore) + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent3 & 3) == 0) - && (((longAt(referent3)) & 0x3FFFFF) == 8)) { - referent3 = longAt((referent3 + BaseHeaderSize) + (0 << (shiftForWord()))); + if (((longAt(GIV(profileMethod))) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(GIV(profileMethod))); + referent2 = longAt((GIV(profileMethod) + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent2 & 3) == 0) + && (((longAt(referent2)) & 0x3FFFFF) == 8)) { + referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + GIV(profileMethod) = referent2; } - GIV(profileSemaphore) = referent3; + if (((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(GIV(profileSemaphore))); + referent3 = longAt((GIV(profileSemaphore) + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent3 & 3) == 0) + && (((longAt(referent3)) & 0x3FFFFF) == 8)) { + referent3 = longAt((referent3 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + GIV(profileSemaphore) = referent3; + } } } followForwardingPointersInStackZone(theBecomeEffectsFlags); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-07-04 16:09:13 UTC (rev 3396) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-07-06 18:56:39 UTC (rev 3397) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1405 uuid: 7aff388a-73ba-4202-bb5a-72b0759ff46b */ @@ -258,7 +258,7 @@ extern sqInt splObj(sqInt index); extern usqInt storeCheckBoundary(void); extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -extern sqInt stringForCString(const char *aCString); +extern usqInt stringForCString(const char *aCString); extern void tenuringIncrementalGC(void); extern sqInt topRemappableOop(void); extern sqInt validFreeTree(void); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-07-04 16:09:13 UTC (rev 3396) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-07-06 18:56:39 UTC (rev 3397) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1405 uuid: 7aff388a-73ba-4202-bb5a-72b0759ff46b from - CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 + CoInterpreter VMMaker.oscog-eem.1405 uuid: 7aff388a-73ba-4202-bb5a-72b0759ff46b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1405 uuid: 7aff388a-73ba-4202-bb5a-72b0759ff46b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1210,7 +1210,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -extern sqInt stringForCString(const char *aCString); +extern usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; extern void tenuringIncrementalGC(void); @@ -2413,7 +2413,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1403"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1405"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -28749,11 +28749,15 @@ longAtput((process + BaseHeaderSize) + (MyListIndex << (shiftForWord())), myList); } /* begin removeProcess:fromList: */ - assert(!(isForwarded(myList))); + assert(!((isForwarded(process)))); + assert(!((isForwarded(myList)))); firstLink = longAt((myList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); lastLink = longAt((myList + BaseHeaderSize) + (LastLinkIndex << (shiftForWord()))); + assert(!((isForwarded(firstLink)))); + assert(!((isForwarded(lastLink)))); if (process == firstLink) { nextLink = longAt((process + BaseHeaderSize) + (NextLinkIndex << (shiftForWord()))); + assert(!((isForwarded(nextLink)))); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(myList))); if (isOldObject(myList)) { @@ -28770,36 +28774,20 @@ } longAtput((myList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord())), nextLink); if (process == lastLink) { - /* begin storePointer:ofObject:withValue: */ + /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(myList))); - if (isOldObject(myList)) { - - /* most stores into young objects */ - - if (((GIV(nilObj) & 3) == 0) - && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(myList))) >> 29) & 1) != 0)) { - remember(myList); - } - } - } longAtput((myList + BaseHeaderSize) + (LastLinkIndex << (shiftForWord())), GIV(nilObj)); } } else { tempLink = firstLink; while (1) { + assert(!((isForwarded(tempLink)))); if (tempLink == GIV(nilObj)) { - /* begin success: */ - - /* Don't overwrite an error code that has already been set. */ - + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } - - null; goto l1; } nextLink = longAt((tempLink + BaseHeaderSize) + (NextLinkIndex << (shiftForWord()))); @@ -32453,7 +32441,7 @@ usqInt newObj; usqInt numBytes; sqInt numSlots; - sqInt s; + usqInt s; char *sp; sqInt sz; @@ -38130,7 +38118,7 @@ sqInt err; sqInt hash; sqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -38255,7 +38243,7 @@ sqInt i; usqInt instSpec; sqInt literalCount; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; sqInt numSlots; @@ -44171,7 +44159,7 @@ sqInt fillValue; sqInt hash; usqInt instSpec; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -46303,7 +46291,7 @@ sqInt entry; sqInt expectedIndex; sqInt expectedIndex1; - sqInt freeChunk; + usqInt freeChunk; sqInt i; sqInt i1; sqInt index; @@ -46342,8 +46330,8 @@ sqInt ptr1; sqInt ptr2; sqInt slotBytes; - sqInt smallObj; - sqInt start; + usqInt smallObj; + usqInt start; classIndex = (long32At(aClass + 4)) & 0x3FFFFF; if (classIndex == 0) { @@ -49284,7 +49272,7 @@ sqInt fmt; sqInt hasYoung; sqInt i; - sqInt newObj; + usqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -60612,7 +60600,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -61721,6 +61709,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt oldClone; + sqInt referent; SpurSegmentInfo *seg; assert(isNonImmediate(objOop)); @@ -61780,6 +61769,18 @@ if ((byteAt(objOop + 7)) == 0) { byteAtput(objOop + 7, 1); } + /* begin followSpecialObjectsOop */ + if (((longAt(GIV(specialObjectsOop))) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(GIV(specialObjectsOop))); + referent = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + GIV(specialObjectsOop) = referent; + } + followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ spurPostBecomeAction(GIV(becomeEffectsFlags)); @@ -63958,8 +63959,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt ptr; - sqInt savedInHashes; - sqInt savedOutHashes; + usqInt savedInHashes; + usqInt savedOutHashes; sqInt segAddr; sqInt segStart; sqInt slotBytes; @@ -64429,13 +64430,13 @@ or nil if out of memory. */ /* SpurMemoryManager>>#stringForCString: */ -sqInt +usqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; sqInt len; usqInt newObj; - sqInt newString; + usqInt newString; usqInt numBytes; sqInt numSlots; @@ -65706,7 +65707,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -65791,7 +65792,8 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt lastLink; - assert(!(isForwarded(aList))); + assert(!((isForwarded(proc)))); + assert(!((isForwarded(aList)))); assert((fetchPointerofObject(NextLinkIndex, proc)) == (nilObject())); if (isEmptyList(aList)) { /* begin storePointer:ofObject:withValue: */ @@ -76399,39 +76401,17 @@ sqInt last; sqInt next; - assert(!(isForwarded(aList))); + assert(!((isForwarded(aList)))); first = longAt((aList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); last = longAt((aList + BaseHeaderSize) + (LastLinkIndex << (shiftForWord()))); + assert(!((isForwarded(first)))); + assert(!((isForwarded(last)))); if (first == last) { - /* begin storePointer:ofObject:withValue: */ + /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(aList))); - if (isOldObject(aList)) { - - /* most stores into young objects */ - - if (((GIV(nilObj) & 3) == 0) - && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(aList))) >> 29) & 1) != 0)) { - remember(aList); - } - } - } longAtput((aList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord())), GIV(nilObj)); - /* begin storePointer:ofObject:withValue: */ + /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(aList))); - if (isOldObject(aList)) { - - /* most stores into young objects */ - - if (((GIV(nilObj) & 3) == 0) - && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(aList))) >> 29) & 1) != 0)) { - remember(aList); - } - } - } longAtput((aList + BaseHeaderSize) + (LastLinkIndex << (shiftForWord())), GIV(nilObj)); } else { @@ -76452,20 +76432,8 @@ } longAtput((aList + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord())), next); } - /* begin storePointer:ofObject:withValue: */ + /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(first))); - if (isOldObject(first)) { - - /* most stores into young objects */ - - if (((GIV(nilObj) & 3) == 0) - && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(first))) >> 29) & 1) != 0)) { - remember(first); - } - } - } longAtput((first + BaseHeaderSize) + (NextLinkIndex << (shiftForWord())), GIV(nilObj)); return first; } @@ -77604,7 +77572,6 @@ sqInt objOop2; sqInt objOop3; sqInt objOop4; - sqInt objOop5; sqInt procLists; sqInt referent; sqInt referent1; @@ -77671,254 +77638,253 @@ /* begin flushBecommedClassesInMethodZone */ unlinkSendsLinkedForInvalidClasses(); } - /* begin followForwardingPointersInScheduler */ + if (theBecomeEffectsFlags & BecamePointerObjectFlag) { + /* begin followForwardingPointersInScheduler */ - /* the GC follows pointers in the special objects array for us. */ + /* the GC follows pointers in the special objects array for us. */ - schedAssoc = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << (shiftForWord()))); - assert(!(isForwarded(schedAssoc))); - /* begin followObjField:ofObject: */ - objOop4 = longAt((schedAssoc + BaseHeaderSize) + (ValueIndex << (shiftForWord()))); - assert(isNonImmediate(objOop4)); - if (((longAt(objOop4)) & (0x3FFFFF - 8)) == 0) { - objOop4 = fixFollowedFieldofObjectwithInitialValue(ValueIndex, schedAssoc, objOop4); - } - sched = objOop4; - /* begin followObjField:ofObject: */ - objOop5 = longAt((sched + BaseHeaderSize) + (ProcessListsIndex << (shiftForWord()))); - assert(isNonImmediate(objOop5)); - if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { - objOop5 = fixFollowedFieldofObjectwithInitialValue(ProcessListsIndex, sched, objOop5); - } - procLists = objOop5; - for (i3 = 0, iLimiT = ((numSlotsOf(procLists)) - 1); i3 <= iLimiT; i3 += 1) { + schedAssoc = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << (shiftForWord()))); + assert(!(isForwarded(schedAssoc))); + followForwardedObjectFieldstoDepth(schedAssoc, 1); + sched = longAt((schedAssoc + BaseHeaderSize) + (ValueIndex << (shiftForWord()))); /* begin followObjField:ofObject: */ - objOop1 = longAt((procLists + BaseHeaderSize) + (i3 << (shiftForWord()))); - assert(isNonImmediate(objOop1)); - if (((longAt(objOop1)) & (0x3FFFFF - 8)) == 0) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(i3, procLists, objOop1); + objOop4 = longAt((sched + BaseHeaderSize) + (ProcessListsIndex << (shiftForWord()))); + assert(isNonImmediate(objOop4)); + if (((longAt(objOop4)) & (0x3FFFFF - 8)) == 0) { + objOop4 = fixFollowedFieldofObjectwithInitialValue(ProcessListsIndex, sched, objOop4); } - list = objOop1; - /* begin followObjField:ofObject: */ - objOop2 = longAt((list + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); - assert(isNonImmediate(objOop2)); - if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { - objOop2 = fixFollowedFieldofObjectwithInitialValue(FirstLinkIndex, list, objOop2); - } - first = objOop2; - /* begin followObjField:ofObject: */ - objOop3 = longAt((list + BaseHeaderSize) + (LastLinkIndex << (shiftForWord()))); - assert(isNonImmediate(objOop3)); - if (((longAt(objOop3)) & (0x3FFFFF - 8)) == 0) { - objOop3 = fixFollowedFieldofObjectwithInitialValue(LastLinkIndex, list, objOop3); - } - last = objOop3; - while (first != last) { + procLists = objOop4; + for (i3 = 0, iLimiT = ((numSlotsOf(procLists)) - 1); i3 <= iLimiT; i3 += 1) { /* begin followObjField:ofObject: */ - objOop = longAt((first + BaseHeaderSize) + (NextLinkIndex << (shiftForWord()))); - assert(isNonImmediate(objOop)); - if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(NextLinkIndex, first, objOop); + objOop1 = longAt((procLists + BaseHeaderSize) + (i3 << (shiftForWord()))); + assert(isNonImmediate(objOop1)); + if (((longAt(objOop1)) & (0x3FFFFF - 8)) == 0) { + objOop1 = fixFollowedFieldofObjectwithInitialValue(i3, procLists, objOop1); } - next = objOop; - first = next; - } - } - /* begin followForwardingPointersInSpecialObjectsArray */ - /* begin followSemaphoreIn:at: */ - obj1 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << (shiftForWord()))); - if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent11 = longAt((obj1 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent11 & 3) == 0) - && (((longAt(referent11)) & 0x3FFFFF) == 8)) { - referent11 = longAt((referent11 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - obj1 = referent11; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(GIV(specialObjectsOop)))); - if (isOldObject(GIV(specialObjectsOop))) { - - /* most stores into young objects */ - - if (((obj1 & 3) == 0) - && (oopisLessThan(obj1, GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { - remember(GIV(specialObjectsOop)); + list = objOop1; + /* begin followObjField:ofObject: */ + objOop2 = longAt((list + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); + assert(isNonImmediate(objOop2)); + if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(FirstLinkIndex, list, objOop2); + } + first = objOop2; + /* begin followObjField:ofObject: */ + objOop3 = longAt((list + BaseHeaderSize) + (LastLinkIndex << (shiftForWord()))); + assert(isNonImmediate(objOop3)); + if (((longAt(objOop3)) & (0x3FFFFF - 8)) == 0) { + objOop3 = fixFollowedFieldofObjectwithInitialValue(LastLinkIndex, list, objOop3); + } + last = objOop3; + while (first != last) { + /* begin followObjField:ofObject: */ + objOop = longAt((first + BaseHeaderSize) + (NextLinkIndex << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(NextLinkIndex, first, objOop); } + next = objOop; + first = next; } } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << (shiftForWord())), obj1); - } - /* begin followSemaphoreIn:at: */ - obj2 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << (shiftForWord()))); - if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent21 = longAt((obj2 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent21 & 3) == 0) - && (((longAt(referent21)) & 0x3FFFFF) == 8)) { - referent21 = longAt((referent21 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - obj2 = referent21; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(GIV(specialObjectsOop)))); - if (isOldObject(GIV(specialObjectsOop))) { + /* begin followForwardingPointersInSpecialObjectsArray */ + /* begin followSemaphoreIn:at: */ + obj1 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << (shiftForWord()))); + if (((longAt(obj1)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj1)); + referent11 = longAt((obj1 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent11 & 3) == 0) + && (((longAt(referent11)) & 0x3FFFFF) == 8)) { + referent11 = longAt((referent11 + BaseHeaderSize) + (0 << (shiftForWord()))); + } + obj1 = referent11; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(GIV(specialObjectsOop)))); + if (isOldObject(GIV(specialObjectsOop))) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((obj2 & 3) == 0) - && (oopisLessThan(obj2, GIV(newSpaceLimit)))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { - remember(GIV(specialObjectsOop)); + if (((obj1 & 3) == 0) + && (oopisLessThan(obj1, GIV(newSpaceLimit)))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { + remember(GIV(specialObjectsOop)); + } } } + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheLowSpaceSemaphore << (shiftForWord())), obj1); } - longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << (shiftForWord())), obj2); - } - /* begin followSemaphoreIn:at: */ - obj3 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheTimerSemaphore << (shiftForWord()))); - if (((longAt(obj3)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj3)); - referent31 = longAt((obj3 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent31 & 3) == 0) - && (((longAt(referent31)) & 0x3FFFFF) == 8)) { - referent31 = longAt((referent31 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - obj3 = referent31; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(GIV(specialObjectsOop)))); - if (isOldObject(GIV(specialObjectsOop))) { + /* begin followSemaphoreIn:at: */ + obj2 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (TheInterruptSemaphore << (shiftForWord()))); + if (((longAt(obj2)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(obj2)); + referent21 = longAt((obj2 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent21 & 3) == 0) + && (((longAt(referent21)) & 0x3FFFFF) == 8)) { + referent21 = longAt((referent21 + BaseHeaderSize) + (0 << (shiftForWord()))); @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2015