Vm-dev September 2014

vm-dev@lists.squeakfoundation.org

25 participants
90 discussions

VM Maker: VMMaker.oscog-eem.880.mcz
by commits＠source.squeak.org 14 Sep '14

14 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.880.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.880 Author: eem Time: 13 September 2014, 4:07:45.226 pm UUID: 4aeaa3e0-8c6b-44b4-a124-128870605261 Ancestors: VMMaker.oscog-eem.879 Move evaluation of Cogit primitive desacriptor enabled function from initialization to just-in-time, and add enablers on SmallInteger primitives to ensure they are applied only to SmallInteger receivers (falling back to interpreter prims if not). Hence fix Cog for 4.1 (e.g. MuO) images. Declare primitiveTable as static since the change localizes it. Add more of the potential Spur image segment implementation. Fix a cast in the simulator. =============== Diff against VMMaker.oscog-eem.879 =============== Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines' 'ceImplicitReceiverTrampoline' 'ceExplicitReceiverTrampoline' 'cmDynSuperEntryOffset' 'numIRCs' 'indexOfIRC' 'theIRCs') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'; addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'; addHeaderFile:'"dispdbg.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverReg declareC: 'void (*ceCallCogCodePopReceiverReg)(void)'; var: #realCECallCogCodePopReceiverReg declareC: 'void (*realCECallCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverAndClassRegs declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)'; var: #realCECallCogCodePopReceiverAndClassRegs declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *, void *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'; var: #primInvokeLabel type: #'AbstractInstruction *'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMiss sendMissCall entry noCheckEntry dynSuperEntry mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #annotations type: #'InstructionAnnotation *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #sendTrampolines declareC: 'sqInt sendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #labelCounter type: #int; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator vmClass generatorTable ifNotNil: [:bytecodeGenTable| aCCodeGenerator var: #generatorTable + declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']', - declareC: 'BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']', (self tableInitializerFor: bytecodeGenTable in: aCCodeGenerator); var: #primitiveGeneratorTable + declareC: 'static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]', - declareC: 'PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]', (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable in: aCCodeGenerator)]. "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was removed: - ----- Method: Cogit>>checkPrimitiveTableEnablers (in category 'initialization') ----- - checkPrimitiveTableEnablers - "Disable primitive generators with enablers that answer false." - | primitiveDescriptor | - <var: #primitiveDescriptor type: #'PrimitiveDescriptor *'> - 1 to: MaxCompiledPrimitiveIndex do: - [:i| - primitiveDescriptor := self addressOf: (primitiveGeneratorTable at: i). - primitiveDescriptor enabled notNil ifTrue: - [(self perform: primitiveDescriptor enabled with: i) ifFalse: - [primitiveDescriptor primitiveGenerator: nil]]]! Item was changed: ----- Method: Cogit>>compilePrimitive (in category 'compile abstract instructions') ----- compilePrimitive "Compile a primitive. If possible, performance-critical primtiives will be generated by their own routines (primitiveGenerator). Otherwise, if there is a primitive at all, we call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <inline: false> | primitiveDescriptor primitiveRoutine | <var: #primitiveDescriptor type: #'PrimitiveDescriptor *'> <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> primitiveIndex = 0 ifTrue: [^0]. + "If a descriptor specifies an argument count (by numArgs >= 0) then it must match + for the generated code to be correct. For example for speed many primitives use + ResultReceiverReg instead of accessing the stack, so the receiver better be at + numArgs down the stack. Use the interpreter version if not. Likewise if it has an + enabled function that must answer true for the generated code to be correct." ((primitiveDescriptor := self primitiveGeneratorOrNil) notNil + and: [primitiveDescriptor primitiveGenerator notNil + and: [(primitiveDescriptor primNumArgs < 0 "means don't care" + or: [primitiveDescriptor primNumArgs = (coInterpreter argumentCountOf: methodObj)]) + and: [primitiveDescriptor enabled isNil + or: [self perform: primitiveDescriptor enabled with: primitiveIndex]]]]) ifTrue: + [^self perform: primitiveDescriptor primitiveGenerator]. - and: [primitiveDescriptor primitiveGenerator notNil]) ifTrue: - ["If a descriptor specifies an argument count (by numArgs >= 0) - then it must match for the generated code to be correct. For - example for speed many primitives use ResultReceiverReg - instead of accessing the stack, so the receiver better be at - numArgs down the stack. Use the interpreter version if not." - (primitiveDescriptor primNumArgs < 0 "means don't care" - or: [primitiveDescriptor primNumArgs = (coInterpreter argumentCountOf: methodObj)]) ifTrue: - [^self perform: primitiveDescriptor primitiveGenerator]]. ((primitiveRoutine := coInterpreter functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex) isNil "no primitive" or: [primitiveRoutine = (coInterpreter functionPointerFor: 0 inClass: nil) "routine = primitiveFail"]) ifTrue: [^self genFastPrimFail]. minValidCallAddress := minValidCallAddress min: primitiveRoutine asUnsignedInteger. ^self compileInterpreterPrimitive: primitiveRoutine! Item was changed: ----- Method: Cogit>>initializeCodeZoneFrom:upTo: (in category 'initialization') ----- initializeCodeZoneFrom: startAddress upTo: endAddress <api> self cCode: [self sqMakeMemoryExecutableFrom: startAddress To: endAddress] inSmalltalk: [self initializeProcessor]. codeBase := methodZoneBase := startAddress. minValidCallAddress := (codeBase min: coInterpreter interpretAddress) min: coInterpreter primitiveFailAddress. self initializeBackend. self maybeGenerateCheckFeatures. self maybeGenerateICacheFlush. self generateVMOwnerLockFunctions. ceGetSP := self cCoerceSimple: self genGetLeafCallStackPointer to: #'unsigned long (*)(void)'. self generateStackPointerCapture. self generateTrampolines. self cCode: '' inSmalltalk: [methodZone zoneEnd: endAddress]. "so that simulator works" - self checkPrimitiveTableEnablers. methodZone manageFrom: methodZoneBase to: endAddress. self computeEntryOffsets. self generateClosedPICPrototype. "N.B. this is assumed to be the last thing done in initialization; see Cogit>>initialized" self generateOpenPICPrototype! Item was added: + ----- Method: Cogit>>mclassIsSmallInteger: (in category 'initialization') ----- + mclassIsSmallInteger: ignoredPrimIndex + ^(coInterpreter methodClassOf: methodObj) = objectMemory classSmallInteger! Item was added: + ----- Method: Cogit>>processorHasDivQuoRemAndMClassIsSmallInteger: (in category 'initialization') ----- + processorHasDivQuoRemAndMClassIsSmallInteger: ignoredPrimIndex + ^(self processorHasDivQuoRem: ignoredPrimIndex) + and: [self mclassIsSmallInteger: ignoredPrimIndex]! Item was added: + ----- Method: Cogit>>processorHasMultiplyAndMClassIsSmallInteger: (in category 'initialization') ----- + processorHasMultiplyAndMClassIsSmallInteger: ignoredPrimIndex + ^(self processorHasMultiply: ignoredPrimIndex) + and: [self mclassIsSmallInteger: ignoredPrimIndex]! Item was changed: ----- Method: Interpreter>>primitiveStoreImageSegment (in category 'image segment in/out') ----- primitiveStoreImageSegment "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray." + "This primitive will store a binary image segment (in the same format as the Squeak image file) of the receiver and every object in its proper tree of subParts (ie, that is not refered to from anywhere else outside the tree). All pointers from within the tree to objects outside the tree will be copied into the array of outPointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set." - "This primitive will store a binary image segment (in the same format as the Squeak image file) of the receiver and every object in its proper tree of subParts (ie, that is not refered to from anywhere else outside the tree). All pointers from within the tree to objects outside the tree will be copied into the array of outpointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set." + "The primitive expects the array and wordArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify truncation, both incoming arrays are required to be whatever the objectMemory considers long objects. If either array is too small, the primitive will fail, but in no other case." - "The primitive expects the array and wordArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify truncation, both incoming arrays are required to be 256 bytes or more long (ie with 3-word headers). If either array is too small, the primitive will fail, but in no other case. - During operation of the primitive, it is necessary to convert from both internal and external oops to their mapped values. To make this fast, the headers of the original objects in question are replaced by the mapped values (and this is noted by adding the forbidden XX header type). Tables are kept of both kinds of oops, as well as of the original headers for restoration. - - To be specific, there are two similar two-part tables, the outpointer array, and one in the upper fifth of the segmentWordArray. Each grows oops from the bottom up, and preserved headers from halfway up. - - In case of either success or failure, the headers must be restored. In the event of primitive failure, the table of outpointers must also be nilled out (since the garbage in the high half will not have been discarded." - | outPointerArray segmentWordArray arrayOfRoots ecode | outPointerArray := self stackTop. segmentWordArray := self stackValue: 1. arrayOfRoots := self stackValue: 2. "Essential type checks" + ((self isArray: arrayOfRoots) "Must be indexable pointers" + and: [(self isArray: outPointerArray) "Must be indexable pointers" + and: [self isWords: segmentWordArray]]) ifFalse: "Must be indexable words" + [^self primitiveFail]. - ((self isArray: arrayOfRoots) "Must be indexable pointers" - and: [(self isArray: outPointerArray) "Must be indexable pointers" - and: [self isWords: segmentWordArray]]) "Must be indexable words" - ifFalse: [^self primitiveFail]. ecode := self storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots. ecode = PrimNoErr ifTrue: [self pop: 3] "...leaving the receiver on the stack as return value" ifFalse: [self primitiveFail]! Item was changed: ----- Method: NewCoObjectMemory>>noCheckMethodHeaderOf: (in category 'memory access') ----- noCheckMethodHeaderOf: methodObj "Answer the method header of a CompiledMethod object. If the method has been cogged then the header is a pointer to the CogMethod and the real header will be stored in the CogMethod." <inline: true> | header | header := self fetchPointer: HeaderIndex ofObject: methodObj. ^(self isIntegerObject: header) ifTrue: [header] ifFalse: [self assert: header asUnsignedInteger < coInterpreter heapBase. + self assert: (coInterpreter cCoerceSimple: header to: #'CogMethod *') objectHeader - self assert: (self cCoerceSimple: header to: #'CogMethod *') objectHeader = self nullHeaderForMachineCodeMethod.. + (coInterpreter cCoerceSimple: header to: #'CogMethod *') methodHeader]! - (self cCoerceSimple: header to: #'CogMethod *') methodHeader]! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForNewsqueak (in category 'class initialization') ----- initializePrimitiveTableForNewsqueak "Initialize the table of primitive generators. This does not include normal primitives implemented in the coInterpreter." "SimpleStackBasedCogit initializePrimitiveTableForSqueakV3" MaxCompiledPrimitiveIndex := 222. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" + (1 genPrimitiveAdd 1 mclassIsSmallInteger:) + (2 genPrimitiveSubtract 1 mclassIsSmallInteger:) + (3 genPrimitiveLessThan 1 mclassIsSmallInteger:) + (4 genPrimitiveGreaterThan 1 mclassIsSmallInteger:) + (5 genPrimitiveLessOrEqual 1 mclassIsSmallInteger:) + (6 genPrimitiveGreaterOrEqual 1 mclassIsSmallInteger:) + (7 genPrimitiveEqual 1 mclassIsSmallInteger:) + (8 genPrimitiveNotEqual 1 mclassIsSmallInteger:) + (9 genPrimitiveMultiply 1 processorHasMultiplyAndMClassIsSmallInteger:) + (10 genPrimitiveDivide 1 processorHasDivQuoRemAndMClassIsSmallInteger:) + (11 genPrimitiveMod 1 processorHasDivQuoRemAndMClassIsSmallInteger:) + (12 genPrimitiveDiv 1 processorHasDivQuoRemAndMClassIsSmallInteger:) + (13 genPrimitiveQuo 1 processorHasDivQuoRemAndMClassIsSmallInteger:) + (14 genPrimitiveBitAnd 1 mclassIsSmallInteger:) + (15 genPrimitiveBitOr 1 mclassIsSmallInteger:) + (16 genPrimitiveBitXor 1 mclassIsSmallInteger:) + (17 genPrimitiveBitShift 1 mclassIsSmallInteger:) - (1 genPrimitiveAdd 1) - (2 genPrimitiveSubtract 1) - (3 genPrimitiveLessThan 1) - (4 genPrimitiveGreaterThan 1) - (5 genPrimitiveLessOrEqual 1) - (6 genPrimitiveGreaterOrEqual 1) - (7 genPrimitiveEqual 1) - (8 genPrimitiveNotEqual 1) - (9 genPrimitiveMultiply 1 processorHasMultiply:) - (10 genPrimitiveDivide 1 processorHasDivQuoRem:) - (11 genPrimitiveMod 1 processorHasDivQuoRem:) - (12 genPrimitiveDiv 1 processorHasDivQuoRem:) - (13 genPrimitiveQuo 1 processorHasDivQuoRem:) - (14 genPrimitiveBitAnd 1) - (15 genPrimitiveBitOr 1) - (16 genPrimitiveBitXor 1) - (17 genPrimitiveBitShift 1) "(18 primitiveMakePoint)" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 primitiveFloatAt)" "(39 primitiveFloatAtPut)" (40 genPrimitiveAsFloat 0 processorHasDoublePrecisionFloatingPointSupport:) (41 genPrimitiveFloatAdd 1 processorHasDoublePrecisionFloatingPointSupport:) (42 genPrimitiveFloatSubtract 1 processorHasDoublePrecisionFloatingPointSupport:) (43 genPrimitiveFloatLessThan 1 processorHasDoublePrecisionFloatingPointSupport:) (44 genPrimitiveFloatGreaterThan 1 processorHasDoublePrecisionFloatingPointSupport:) (45 genPrimitiveFloatLessOrEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (46 genPrimitiveFloatGreaterOrEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (47 genPrimitiveFloatEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (48 genPrimitiveFloatNotEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (49 genPrimitiveFloatMultiply 1 processorHasDoublePrecisionFloatingPointSupport:) (50 genPrimitiveFloatDivide 1 processorHasDoublePrecisionFloatingPointSupport:) "(51 primitiveTruncated)" "(52 primitiveFractionalPart)" "(53 primitiveExponent)" "(54 primitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0 processorHasDoublePrecisionFloatingPointSupport:) "(56 primitiveSine)" "(57 primitiveArctan)" "(58 primitiveLogN)" "(59 primitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) (61 genPrimitiveAtPut 2) (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) (64 genPrimitiveStringAtPut 2) "The stream primitives no longer pay their way; normal Smalltalk code is faster." "(65 primitiveFail)""was primitiveNext" "(66 primitiveFail)" "was primitiveNextPut" "(67 primitiveFail)" "was primitiveAtEnd" "StorageManagement Primitives (68-79)" "(68 primitiveObjectAt)" "(69 primitiveObjectAtPut)" (70 genPrimitiveNew -1) "For VMMirror support 1 argument instantiateFixedClass: as well as baiscNew" (71 genPrimitiveNewWithArg -1) "For VMMirror support 2 argument instantiateVariableClass:withSize: as well as baiscNew:" "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" (79 genPrimitiveNewMethod 2) "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" "(83 primitivePerform)" "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "Input/Output Primitives (90-109); We won't compile any of these" "System Primitives (110-119)" (110 genPrimitiveIdentical 1) (111 genPrimitiveClass) "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" "Squeak 2.2 and earlier use 119. Squeak 2.3 and later use 116. Both are supported for backward compatibility." "Miscellaneous Primitives (120-127); We won't compile any of these" "Squeak Primitives Start Here" "Squeak Miscellaneous Primitives (128-149); We won't compile any of these" "File Primitives (150-169) - NO LONGER INDEXED; We won't compile any of these" (169 genPrimitiveNotIdentical 1) (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" (171 genPrimitiveCharacterValue 0) "Character>>value" "Sound Primitives (170-199) - NO LONGER INDEXED; We won't compile any of these" (175 genPrimitiveIdentityHash 0) "Behavior>>identityHash" "Sound Primitives (170-199) - NO LONGER INDEXED; We won't compile any of these" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Sound Primitives (continued) - NO LONGER INDEXED; We won't compile any of these" "(190 194 primitiveFail)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives (were Networking primitives)" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue 0) "value" (202 genPrimitiveClosureValue 1) "value:" (203 genPrimitiveClosureValue 2) "value:value:" (204 genPrimitiveClosureValue 3) "value:value:value:" (205 genPrimitiveClosureValue 4) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" "(207 209 primitiveFail)" "reserved for Cog primitives" "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(213 217 primitiveFail)" "reserved for Cog primitives" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue 0) "valueNoContextSwitch" (222 genPrimitiveClosureValue 1) "valueNoContextSwitch:" "(223 229 primitiveFail)" "reserved for Cog primitives" )! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForSqueak (in category 'class initialization') ----- initializePrimitiveTableForSqueak "Initialize the table of primitive generators. This does not include normal primitives implemented in the coInterpreter." "SimpleStackBasedCogit initializePrimitiveTableForSqueak" MaxCompiledPrimitiveIndex := 222. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" + (1 genPrimitiveAdd 1 mclassIsSmallInteger:) + (2 genPrimitiveSubtract 1 mclassIsSmallInteger:) + (3 genPrimitiveLessThan 1 mclassIsSmallInteger:) + (4 genPrimitiveGreaterThan 1 mclassIsSmallInteger:) + (5 genPrimitiveLessOrEqual 1 mclassIsSmallInteger:) + (6 genPrimitiveGreaterOrEqual 1 mclassIsSmallInteger:) + (7 genPrimitiveEqual 1 mclassIsSmallInteger:) + (8 genPrimitiveNotEqual 1 mclassIsSmallInteger:) + (9 genPrimitiveMultiply 1 processorHasMultiplyAndMClassIsSmallInteger:) + (10 genPrimitiveDivide 1 processorHasDivQuoRemAndMClassIsSmallInteger:) + (11 genPrimitiveMod 1 processorHasDivQuoRemAndMClassIsSmallInteger:) + (12 genPrimitiveDiv 1 processorHasDivQuoRemAndMClassIsSmallInteger:) + (13 genPrimitiveQuo 1 processorHasDivQuoRemAndMClassIsSmallInteger:) + (14 genPrimitiveBitAnd 1 mclassIsSmallInteger:) + (15 genPrimitiveBitOr 1 mclassIsSmallInteger:) + (16 genPrimitiveBitXor 1 mclassIsSmallInteger:) + (17 genPrimitiveBitShift 1 mclassIsSmallInteger:) - (1 genPrimitiveAdd 1) - (2 genPrimitiveSubtract 1) - (3 genPrimitiveLessThan 1) - (4 genPrimitiveGreaterThan 1) - (5 genPrimitiveLessOrEqual 1) - (6 genPrimitiveGreaterOrEqual 1) - (7 genPrimitiveEqual 1) - (8 genPrimitiveNotEqual 1) - (9 genPrimitiveMultiply 1 processorHasMultiply:) - (10 genPrimitiveDivide 1 processorHasDivQuoRem:) - (11 genPrimitiveMod 1 processorHasDivQuoRem:) - (12 genPrimitiveDiv 1 processorHasDivQuoRem:) - (13 genPrimitiveQuo 1 processorHasDivQuoRem:) - (14 genPrimitiveBitAnd 1) - (15 genPrimitiveBitOr 1) - (16 genPrimitiveBitXor 1) - (17 genPrimitiveBitShift 1) "(18 primitiveMakePoint)" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 primitiveFloatAt)" "(39 primitiveFloatAtPut)" (40 genPrimitiveAsFloat 0 processorHasDoublePrecisionFloatingPointSupport:) (41 genPrimitiveFloatAdd 1 processorHasDoublePrecisionFloatingPointSupport:) (42 genPrimitiveFloatSubtract 1 processorHasDoublePrecisionFloatingPointSupport:) (43 genPrimitiveFloatLessThan 1 processorHasDoublePrecisionFloatingPointSupport:) (44 genPrimitiveFloatGreaterThan 1 processorHasDoublePrecisionFloatingPointSupport:) (45 genPrimitiveFloatLessOrEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (46 genPrimitiveFloatGreaterOrEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (47 genPrimitiveFloatEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (48 genPrimitiveFloatNotEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (49 genPrimitiveFloatMultiply 1 processorHasDoublePrecisionFloatingPointSupport:) (50 genPrimitiveFloatDivide 1 processorHasDoublePrecisionFloatingPointSupport:) "(51 primitiveTruncated)" "(52 primitiveFractionalPart)" "(53 primitiveExponent)" "(54 primitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0 processorHasDoublePrecisionFloatingPointSupport:) "(56 primitiveSine)" "(57 primitiveArctan)" "(58 primitiveLogN)" "(59 primitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) (61 genPrimitiveAtPut 2) (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) (64 genPrimitiveStringAtPut 2) "The stream primitives no longer pay their way; normal Smalltalk code is faster." "(65 primitiveFail)""was primitiveNext" "(66 primitiveFail)" "was primitiveNextPut" "(67 primitiveFail)" "was primitiveAtEnd" "StorageManagement Primitives (68-79)" "(68 primitiveObjectAt)" "(69 primitiveObjectAtPut)" (70 genPrimitiveNew 0) (71 genPrimitiveNewWithArg 1) "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" (79 genPrimitiveNewMethod 2) "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" "(83 primitivePerform)" "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "Input/Output Primitives (90-109); We won't compile any of these" "System Primitives (110-119)" (110 genPrimitiveIdentical 1) (111 genPrimitiveClass) "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" "Squeak 2.2 and earlier use 119. Squeak 2.3 and later use 116. Both are supported for backward compatibility." "Miscellaneous Primitives (120-127); We won't compile any of these" "Squeak Primitives Start Here" "Squeak Miscellaneous Primitives (128-149); We won't compile any of these" "File Primitives (150-169) - NO LONGER INDEXED; We won't compile any of these" (169 genPrimitiveNotIdentical 1) (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" (171 genPrimitiveCharacterValue 0) "Character>>value" "Sound Primitives (170-199) - NO LONGER INDEXED; We won't compile any of these" (175 genPrimitiveIdentityHash 0) "Behavior>>identityHash" "Sound Primitives (170-199) - NO LONGER INDEXED; We won't compile any of these" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Sound Primitives (continued) - NO LONGER INDEXED; We won't compile any of these" "(190 194 primitiveFail)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives (were Networking primitives)" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue 0) "value" (202 genPrimitiveClosureValue 1) "value:" (203 genPrimitiveClosureValue 2) "value:value:" (204 genPrimitiveClosureValue 3) "value:value:value:" (205 genPrimitiveClosureValue 4) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" "(207 209 primitiveFail)" "reserved for Cog primitives" "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(213 217 primitiveFail)" "reserved for Cog primitives" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue 0) "valueNoContextSwitch" (222 genPrimitiveClosureValue 1) "valueNoContextSwitch:" "(223 229 primitiveFail)" "reserved for Cog primitives" )! Item was added: + ----- Method: Spur32BitCoMemoryManager>>copyObj:toSegment:addr:stopAt:saveOopAt: (in category 'image segment in/out') ----- + copyObj: objOop toSegment: segmentWordArray addr: limitSeg stopAt: stopAddr saveOopAt: oopPtr + "Copy objOop into the segment beginning at limitSeg, and forward it to the copy. + Fail if out of space. Answer the next segmentAddr if successful." + + "Copy the object..." + | bodySize copy | + <inline: false> + bodySize := self bytesInObject: objOop. + (self oop: limitSeg + bodySize isGreaterThanOrEqualTo: stopAddr) ifTrue: + [^0]. "failure" + self mem: limitSeg cp: (self startOfObject: objOop) y: bodySize. + copy := self objectStartingAt: limitSeg. + + "Clear remebered pinned and mark bits of all headers copied into the segment" + self + setIsRememberedOf: copy to: false; + setIsPinnedOf: copy to: false; + setIsMarkedOf: copy to: false. + + "Make sure Cogged methods have their true header field written to the segment." + ((self isCompiledMethod: objOop) + and: [coInterpreter methodHasCogMethod: objOop]) ifTrue: + [self storePointerUnchecked: HeaderIndex + ofObject: copy + withValue: (self methodHeaderOf: objOop)]. + + "Remember the oop for undoing in case of prim failure." + self longAt: oopPtr put: objOop. + self forward: objOop to: copy. + + "Return new end of segment" + ^limitSeg + bodySize! Item was changed: ----- Method: SpurMemoryManager>>classSmallInteger (in category 'accessing') ----- classSmallInteger + <api> ^self splObj: ClassSmallInteger! Item was added: + ----- Method: SpurMemoryManager>>copyObj:toSegment:addr:stopAt:saveOopAt: (in category 'image segment in/out') ----- + copyObj: objOop toSegment: segmentWordArray addr: limitSeg stopAt: stopAddr saveOopAt: oopPtr + "Copy objOop into the segment beginning at limitSeg, and forward it to the copy. + Fail if out of space. Answer the next segmentAddr if successful." + + "Copy the object..." + | bodySize copy | + <inline: false> + bodySize := self bytesInObject: objOop. + (self oop: limitSeg + bodySize isGreaterThanOrEqualTo: stopAddr) ifTrue: + [^0]. "failure" + self mem: limitSeg cp: (self startOfObject: objOop) y: bodySize. + copy := self objectStartingAt: limitSeg. + + "Clear remebered pinned and mark bits of all headers copied into the segment" + self + setIsRememberedOf: copy to: false; + setIsPinnedOf: copy to: false; + setIsMarkedOf: copy to: false. + + "Remember the oop for undoing in case of prim failure." + self longAt: oopPtr put: objOop. + self forward: objOop to: copy. + + "Return new end of segment" + ^limitSeg + bodySize! Item was added: + ----- Method: SpurMemoryManager>>restoreObjectsFrom:to:from:to: (in category 'image segment in/out') ----- + restoreObjectsFrom: firstIn to: lastIn from: firstSeg to: limitSeg + "Unforward objects" + | originalPtr originalObj copyPtr copyObj | + originalPtr := firstIn. + copyPtr := firstSeg. + [self oop: originalPtr isLessThanOrEqualTo: lastIn] whileTrue: + [originalObj := self longAt: originalPtr. + copyObj := self objectStartingAt: copyPtr. + self unforward: originalObj from: copyObj. + originalPtr := originalPtr + self bytesPerOop. + copyPtr := self addressAfter: copyObj]. + self assert: copyPtr = limitSeg! Item was changed: + ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- - ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'primitive support') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray." "This primitive will store a binary image segment (in the same format as the Squeak image file) of the receiver and every object in its proper tree of subParts (ie, that is not refered to from anywhere else outside the tree). All pointers from within the tree to objects outside the tree will be copied into the array of outpointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set." "The primitive expects the array and wordArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify truncation, both incoming arrays are required to have large headers (i.e. be 256 words long or larger). If either array is too small, the primitive will fail, but in no other case. + During operation of the primitive, it is necessary to convert from both internal and external oops to their mapped values. To make this fast, the original objects in question are forwarded to the mapped values. Tables are kept of both kinds of oops. Note that markObjects eliminates forwarding pointers, so there will be no forwarding pointers in the object graph once objects have been marked. - During operation of the primitive, it is necessary to convert from both internal and external oops to their mapped values. To make this fast, the headers of the original objects in question are replaced by the mapped values (and this is noted by adding the forbidden XX header type). Tables are kept of both kinds of oops, as well as of the original headers for restoration. + To be specific, there are two similar tables, the outPointer array, and one in the upper eight of the segmentWordArray. Each grows oops from the bottom up. - To be specific, there are two similar two-part tables, the outpointer array, and one in the upper fifth of the segmentWordArray. Each grows oops from the bottom up, and preserved headers from halfway up. + In case of either success or failure, the headers must be restored. In the event of primitive failure, the table of outPointers must also be nilled out (since the garbage in the high half will not have been discarded." - In case of either success or failure, the headers must be restored. In the event of primitive failure, the table of outpointers must also be nilled out (since the garbage in the high half will not have been discarded." + | endSeg firstIn firstOut lastIn lastOut limitSeg newSegLimit | - | endSeg firstIn firstOut hdrBaseIn hdrBaseOut lastIn lastOut lastSeg versionOffset | true ifTrue: [^PrimErrUnsupported] ifFalse: [ ((self hasOverflowHeader: outPointerArray) "Must have 128-bit header" and: [self hasOverflowHeader: segmentWordArray]) ifFalse: "Must have 128-bit header" [^PrimErrGenericFailure]. - "Use the top half of outPointers for saved headers." firstOut := outPointerArray + self baseHeaderSize. lastOut := firstOut - self bytesPerOop. - hdrBaseOut := firstOut + ((self numSlotsOf: outPointerArray) // 2 * self bytesPerOop). "top half" + limitSeg := segmentWordArray + self baseHeaderSize. + endSeg := segmentWordArray + (self addressAfter: segmentWordArray). - lastSeg := segmentWordArray. - endSeg := segmentWordArray + (self addressAfter: segmentWordArray) - self bytesPerOop. "Write a version number for byte order and version check" + limitSeg >= endSeg ifTrue: [^PrimErrGenericFailure]. + self longAt: limitSeg put: self imageSegmentVersion. + limitSeg := limitSeg + self bytesPerOop. - versionOffset := self bytesPerOop. - lastSeg := lastSeg + versionOffset. - lastSeg > endSeg ifTrue: [^PrimErrGenericFailure]. - self longAt: lastSeg put: self imageSegmentVersion. + "Allocate top 1/8 of segment for table of internal oops" - "Allocate top 1/8 of segment for table of internal oops and saved headers" firstIn := endSeg - ((self numSlotsOf: segmentWordArray) // 8). "Take 1/8 of seg" lastIn := firstIn - self bytesPerOop. - hdrBaseIn := firstIn + ((self numSlotsOf: segmentWordArray) // 16). "top half of that" self assert: self allObjectsUnmarked. self markObjectsIn: arrayOfRoots. self markObjects. self unmarkObjectsIn: arrayOfRoots. + "All external objects, and only they, are now marked. + Copy the array of roots into the segment, and forward its oop." + ((lastIn := lastIn + self bytesPerOop) >= endSeg + or: [0 = (newSegLimit := self copyObj: arrayOfRoots toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: + [lastIn := lastIn - self bytesPerWord. + self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. + self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. + ^PrimErrGenericFailure]. + limitSeg := newSegLimit. + + "Now traverse arrayOfRoots, copying unmarked objects into the segment" + + "Now the primitive can not fail; traverse the objects in the segment, unforwarding the originals and mapping external oops." self flag: 'you are here']! Item was added: + ----- Method: SpurMemoryManager>>unforward:from: (in category 'image segment in/out') ----- + unforward: obj1 from: obj2 + "Undo a forward: obj1 to: obj2 given that obj2 is a copy of obj1" + self set: obj1 classIndexTo: (self classIndexOf: obj2) formatTo: (self formatOf: obj2). + self storePointer: 0 ofForwarder: obj1 withValue: (self fetchPointer: 0 ofObject: obj2). + (self rawNumSlotsOf: obj2) = 0 ifTrue: + [self setRawNumSlotsOf: obj1 to: 0]!

1 0

Re: [squeak-dev] Re: How can I listen to my app?
by Eliot Miranda 13 Sep '14

13 Sep '14

On Fri, Sep 12, 2014 at 8:44 AM, Chris Muller <asqueaker(a)gmail.com> wrote: > On Thu, Sep 11, 2014 at 6:38 PM, David T. Lewis <lewis(a)mail.msen.com> > wrote: > > On Thu, Sep 11, 2014 at 02:47:55PM -0500, Chris Muller wrote: > >> > >> On Thu, Sep 11, 2014 at 2:42 PM, Chris Muller <asqueaker(a)gmail.com> > wrote: > >> > I've decided I want to get a feel for what my app is doing and at what > >> > rate by, literally, listening to it. I want to put in some brief > >> > beeps into strategic locations. > >> > > >> > But sound is an area where I have exactly zero experience. I want the > >> > sounds to play but with minimal impact on the running program; i.e., > >> > I'm willing to make the beeps very short, but even a 10ms beep (would > >> > I even be able to hear that?) would slow the program down. > >> > > >> > And yet, if I tried to play them in the background, they will not be > >> > in-sync with with the real-time state of the app. I suppose another > >> > option would be to record the events I'm interested in and their time > >> > and play them back later, but I'm more interested in the *real-time* > >> > state. > >> > > >> > Finally, how can I play any sound at all with Squeak and Cog on Linux? > >> > When I try some of the demo sounds on FMSound, there is no sound and > >> > I see this message in the console: > >> > > >> > sound: /dev/dsp: No such file or directory > >> > > >> > Of course, no other apps on this machine have any trouble playing > >> > sounds, so is something simply pointing in the wrong place? > >> > >> squeak -help reports: > >> > >> Available drivers: > >> vm-sound-null > >> vm-sound-ALSA > >> vm-sound-OSS > >> > >> But when I try: > >> > >> squeak -vm sound=ALSA my.image > >> > >> and try to play a sound I get this on the console: > >> > >> sound_Start(default) > >> soundStart: snd_add_pcm_handler: Function not implemented > >> > > > > Sound works fine on my trusty SuSE box, but not at all on my > user-friendly > > but generally untrustworthy Ubuntu laptop. What kind of system are you > using? > > I'm using one of the most popular Linux distros, Ubuntu. > > I tried the -vm-sound-alsa switch to the vm (instead of -vm > sound=ALSA) but the same message is produced on the console when I try > to "FMSound pluckedElecBass play". > > sound_Start(default) > soundStart: snd_add_pcm_handler: Function not implemented > > Does this mean that Cog does not support sound? Using "-vm sound=OSS".... > ..... > WAIT!!! > .... > Success!!! > > I managed to get a sound out of Cog by: > > 1) copying so.vm-sound-pulse from my interpreter VM lib directory to > Cog's lib directory > 2) renaming so.vm-sound-pulse to vm-sound-pulse > 3) setting execute permissions on vm-sound-pulse > > With that, I can actually get sound out of Squeak.. > > And, now, when I do squeak -help, "vm-sound-pulse" is now listed. > > Eliot, do you think we could eventually include this driver in your > Cog releases? > I've no objection. Any one want to volunteer to get this working for the Cog builds? > Sound systems have been changing on Linux distributions, and I suspect > that > > we may be falling behind in our support for this. > > > > Dave > > > > > > -- best, Eliot

1 0

[commit][3077] CogVM source as per VMMaker.oscog-eem.879
by commits＠squeakvm.org 13 Sep '14

13 Sep '14

Revision: 3077 Author: eliot Date: 2014-09-12 17:35:44 -0700 (Fri, 12 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.879 Back out of saneMethodClassAssociation assert in initialPCForHeader:method:. Newspeak falls foul of this. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.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/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/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-09-13 00:35:44 UTC (rev 3077) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade from - CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1109,7 +1109,6 @@ static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); -static sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) NoDbgRegParms; sqInt integerArg(sqInt index); void ioFilenamefromStringofLengthresolveAliases(char *aCharBuffer, char *aFilenameString, sqInt filenameLength, sqInt aBoolean); static sqInt isBaseFrame(char *theFP) NoDbgRegParms; @@ -1225,7 +1224,6 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; -static sqInt saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) NoDbgRegParms; void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -2088,7 +2086,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.878"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.879"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5457,7 +5455,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(nilObj)); } - localIP = pointerForOop((initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1); + localIP = pointerForOop(((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize)) - 1); if (((((sqInt) methodHeader)) < 0 ? methodHeader & (65536 << SmallIntegerShift) : (methodHeader & 536871934) != 0)) { @@ -13228,7 +13226,7 @@ /* Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code. */ - initialPC = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) + (((((sqInt) methodHeader)) < 0 + initialPC = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize)) + (((((sqInt) methodHeader)) < 0 ? 3 : 0)); if (GIV(primFailCode) != 0) { @@ -13348,7 +13346,7 @@ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize)) - 1; if (((((sqInt) methodHeader)) < 0 ? methodHeader & (65536 << SmallIntegerShift) : (methodHeader & 536871934) != 0)) { @@ -19881,9 +19879,7 @@ longAtput((sp81 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp81; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader1))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod1)); @@ -20116,9 +20112,7 @@ longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp8; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader1))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod1)); @@ -46405,19 +46399,6 @@ } -/* Answer the initial PC for a method; used only in methods that build a - frame. Hence add an assert to check that there's a sane - methodClassAssociation. - */ - -static sqInt -initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) -{ - assert(saneMethodClassAssociationInnumLiterals(theMethod, literalCountOfMethodHeader(methodHeader))); - return (theMethod + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize); -} - - /* Like #stackIntegerValue: but access method arguments left-to-right */ sqInt @@ -50730,19 +50711,6 @@ return maybeClass; } -static sqInt -saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) -{ - sqInt shouldBeAssoc; - - shouldBeAssoc = longAt((methodObj + BaseHeaderSize) + (((numLiterals - 1) + LiteralStart) << ShiftForWord)); - - return (((shouldBeAssoc & 1) == 0) - && (((((usqInt) (longAt(shouldBeAssoc))) >> (instFormatFieldLSB())) & 15) <= 4)) - && (((numSlotsOf(shouldBeAssoc)) > ValueIndex) - && (addressCouldBeClassObj(longAt((shouldBeAssoc + BaseHeaderSize) + (ValueIndex << ShiftForWord))))); -} - void setBreakSelector(char *aString) { @@ -51350,9 +51318,7 @@ longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp8; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod)); @@ -52944,7 +52910,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = longAt(aContext); @@ -53128,7 +53094,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -53174,7 +53140,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { @@ -54385,7 +54351,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - GIV(primFailCode) = PrimErrInappropriate; + (GIV(primFailCode) = PrimErrInappropriate); return; } incrementalGC(); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-09-12 20:57:39 UTC (rev 3076) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-09-13 00:35:44 UTC (rev 3077) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-13 00:35:44 UTC (rev 3077) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade from - CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1112,7 +1112,6 @@ static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); -static sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) NoDbgRegParms; sqInt integerArg(sqInt index); void ioFilenamefromStringofLengthresolveAliases(char *aCharBuffer, char *aFilenameString, sqInt filenameLength, sqInt aBoolean); static sqInt isBaseFrame(char *theFP) NoDbgRegParms; @@ -1228,7 +1227,6 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; -static sqInt saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) NoDbgRegParms; void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -2091,7 +2089,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.878"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.879"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5466,7 +5464,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(nilObj)); } - localIP = pointerForOop((initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1); + localIP = pointerForOop(((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize)) - 1); if (((((sqInt) methodHeader)) < 0 ? methodHeader & (65536 << SmallIntegerShift) : (methodHeader & 536871934) != 0)) { @@ -13237,7 +13235,7 @@ /* Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code. */ - initialPC = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) + (((((sqInt) methodHeader)) < 0 + initialPC = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize)) + (((((sqInt) methodHeader)) < 0 ? 3 : 0)); if (GIV(primFailCode) != 0) { @@ -13357,7 +13355,7 @@ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize)) - 1; if (((((sqInt) methodHeader)) < 0 ? methodHeader & (65536 << SmallIntegerShift) : (methodHeader & 536871934) != 0)) { @@ -19890,9 +19888,7 @@ longAtput((sp81 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp81; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader1))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod1)); @@ -20125,9 +20121,7 @@ longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp8; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader1))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod1)); @@ -46414,19 +46408,6 @@ } -/* Answer the initial PC for a method; used only in methods that build a - frame. Hence add an assert to check that there's a sane - methodClassAssociation. - */ - -static sqInt -initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) -{ - assert(saneMethodClassAssociationInnumLiterals(theMethod, literalCountOfMethodHeader(methodHeader))); - return (theMethod + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize); -} - - /* Like #stackIntegerValue: but access method arguments left-to-right */ sqInt @@ -50739,19 +50720,6 @@ return maybeClass; } -static sqInt -saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) -{ - sqInt shouldBeAssoc; - - shouldBeAssoc = longAt((methodObj + BaseHeaderSize) + (((numLiterals - 1) + LiteralStart) << ShiftForWord)); - - return (((shouldBeAssoc & 1) == 0) - && (((((usqInt) (longAt(shouldBeAssoc))) >> (instFormatFieldLSB())) & 15) <= 4)) - && (((numSlotsOf(shouldBeAssoc)) > ValueIndex) - && (addressCouldBeClassObj(longAt((shouldBeAssoc + BaseHeaderSize) + (ValueIndex << ShiftForWord))))); -} - void setBreakSelector(char *aString) { @@ -51359,9 +51327,7 @@ longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp8; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod)); @@ -52953,7 +52919,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = longAt(aContext); @@ -53137,7 +53103,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -53183,7 +53149,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { @@ -54394,7 +54360,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - GIV(primFailCode) = PrimErrInappropriate; + (GIV(primFailCode) = PrimErrInappropriate); return; } incrementalGC(); Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-09-13 00:35:44 UTC (rev 3077) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade from - CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -296,6 +296,7 @@ #define PrimErrBadMethod 12 #define PrimErrBadNumArgs 5 #define PrimErrBadReceiver 2 +#define PrimErrGenericFailure 1 #define PrimErrInappropriate 6 #define PrimErrLimitExceeded 15 #define PrimErrNamedInternal 13 @@ -989,6 +990,7 @@ usqLong headerForSlotsformatclassIndex(sqInt numSlots, sqInt formatField, sqInt classIndex); static sqInt hiddenRootSlots(void); sqInt identityHashHalfWordMask(void); +static sqInt imageSegmentVersion(void); void incrementalGC(void); sqInt indexablePointersFormat(void); static void inFreeTreeReplacewith(sqInt treeNode, sqInt newNode) NoDbgRegParms; @@ -1285,7 +1287,6 @@ static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); -static sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) NoDbgRegParms; sqInt integerArg(sqInt index); void ioFilenamefromStringofLengthresolveAliases(char *aCharBuffer, char *aFilenameString, sqInt filenameLength, sqInt aBoolean); static sqInt isBaseFrame(char *theFP) NoDbgRegParms; @@ -1398,7 +1399,6 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; -static sqInt saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) NoDbgRegParms; void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -2324,7 +2324,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.878"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.879"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6360,7 +6360,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(nilObj)); } - localIP = pointerForOop((initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1); + localIP = pointerForOop(((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) - 1); if (methodHeader & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -15048,7 +15048,7 @@ /* Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code. */ - initialPC = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) + (3); + initialPC = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) + (3); if (GIV(primFailCode) != 0) { if ((byteAt(initialPC)) == (((((sqInt) methodHeader)) < 0 ? AltLongStoreBytecode @@ -15166,7 +15166,7 @@ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -22401,9 +22401,7 @@ longAtput((sp81 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp81; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader1))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * 4)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod1)); @@ -22633,9 +22631,7 @@ longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp8; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader1))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * 4)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod1)); @@ -36637,8 +36633,17 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt arrayOfRoots; sqInt ecode; + sqInt endSeg; + sqInt firstIn; + sqInt firstOut; + sqInt hdrBaseIn; + sqInt hdrBaseOut; + sqInt lastIn; + sqInt lastOut; + sqInt lastSeg; sqInt outPointerArray; sqInt segmentWordArray; + sqInt versionOffset; outPointerArray = longAt(GIV(stackPointer)); segmentWordArray = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -36661,7 +36666,11 @@ } return; } + /* begin storeImageSegmentInto:outPointers:roots: */ ecode = PrimErrUnsupported; + goto l1; + +l1: /* end storeImageSegmentInto:outPointers:roots: */; if (ecode == PrimNoErr) { /* begin pop: */ GIV(stackPointer) += 3 * BytesPerWord; @@ -46858,6 +46867,25 @@ return 0x3FFFFF; } + +/* a more complex version that tells both the word reversal and the + endianness of the machine + it came from. Low half of word is e.g. 6521. Top byte is top byte of + #doesNotUnderstand: on + this machine. ($d on the Mac or $s on the PC) */ + +static sqInt +imageSegmentVersion(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt wholeWord; + + + /* first data word, 'does' */ + + wholeWord = long32At((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorDoesNotUnderstand << 2))) + (BaseHeaderSize)); + return (imageFormatVersion()) | (wholeWord & 0xFF000000UL); +} + void incrementalGC(void) { @@ -57144,19 +57172,6 @@ } -/* Answer the initial PC for a method; used only in methods that build a - frame. Hence add an assert to check that there's a sane - methodClassAssociation. - */ - -static sqInt -initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) -{ - assert(saneMethodClassAssociationInnumLiterals(theMethod, literalCountOfMethodHeader(methodHeader))); - return (theMethod + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize); -} - - /* Like #stackIntegerValue: but access method arguments left-to-right */ sqInt @@ -62595,29 +62610,6 @@ return maybeClass; } -static sqInt -saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) -{ - sqInt referent; - sqInt shouldBeAssoc; - - shouldBeAssoc = longAt((methodObj + (BaseHeaderSize)) + (((numLiterals - 1) + LiteralStart) << 2)); - if (((longAt(shouldBeAssoc)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(shouldBeAssoc)); - referent = longAt((shouldBeAssoc + (BaseHeaderSize)) + (0 << 2)); - while (((referent & 3) == 0) - && (((longAt(referent)) & 0x3FFFFF) == 8)) { - referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); - } - shouldBeAssoc = referent; - } - return (((shouldBeAssoc & 3) == 0) - && (((((usqInt) (longAt(shouldBeAssoc))) >> 24) & 0x1F) <= 5)) - && (((numSlotsOf(shouldBeAssoc)) > ValueIndex) - && (addressCouldBeClassObj(noFixupFollowFieldofObject(ValueIndex, shouldBeAssoc)))); -} - void setBreakSelector(char *aString) { @@ -63338,9 +63330,7 @@ longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp8; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod)); @@ -64777,7 +64767,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -64994,7 +64984,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -65019,7 +65009,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -65082,7 +65072,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -65328,7 +65318,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -65384,7 +65374,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-09-12 20:57:39 UTC (rev 3076) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-09-13 00:35:44 UTC (rev 3077) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-13 00:35:44 UTC (rev 3077) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade from - CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -299,6 +299,7 @@ #define PrimErrBadMethod 12 #define PrimErrBadNumArgs 5 #define PrimErrBadReceiver 2 +#define PrimErrGenericFailure 1 #define PrimErrInappropriate 6 #define PrimErrLimitExceeded 15 #define PrimErrNamedInternal 13 @@ -992,6 +993,7 @@ usqLong headerForSlotsformatclassIndex(sqInt numSlots, sqInt formatField, sqInt classIndex); static sqInt hiddenRootSlots(void); sqInt identityHashHalfWordMask(void); +static sqInt imageSegmentVersion(void); void incrementalGC(void); sqInt indexablePointersFormat(void); static void inFreeTreeReplacewith(sqInt treeNode, sqInt newNode) NoDbgRegParms; @@ -1288,7 +1290,6 @@ static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); -static sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) NoDbgRegParms; sqInt integerArg(sqInt index); void ioFilenamefromStringofLengthresolveAliases(char *aCharBuffer, char *aFilenameString, sqInt filenameLength, sqInt aBoolean); static sqInt isBaseFrame(char *theFP) NoDbgRegParms; @@ -1401,7 +1402,6 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; -static sqInt saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) NoDbgRegParms; void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -2327,7 +2327,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.878"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.879"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6369,7 +6369,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(nilObj)); } - localIP = pointerForOop((initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1); + localIP = pointerForOop(((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) - 1); if (methodHeader & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -15057,7 +15057,7 @@ /* Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code. */ - initialPC = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) + (3); + initialPC = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) + (3); if (GIV(primFailCode) != 0) { if ((byteAt(initialPC)) == (((((sqInt) methodHeader)) < 0 ? AltLongStoreBytecode @@ -15175,7 +15175,7 @@ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -22410,9 +22410,7 @@ longAtput((sp81 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp81; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader1))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * 4)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod1)); @@ -22642,9 +22640,7 @@ longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp8; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader1))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * 4)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod1)); @@ -36646,8 +36642,17 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt arrayOfRoots; sqInt ecode; + sqInt endSeg; + sqInt firstIn; + sqInt firstOut; + sqInt hdrBaseIn; + sqInt hdrBaseOut; + sqInt lastIn; + sqInt lastOut; + sqInt lastSeg; sqInt outPointerArray; sqInt segmentWordArray; + sqInt versionOffset; outPointerArray = longAt(GIV(stackPointer)); segmentWordArray = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -36670,7 +36675,11 @@ } return; } + /* begin storeImageSegmentInto:outPointers:roots: */ ecode = PrimErrUnsupported; + goto l1; + +l1: /* end storeImageSegmentInto:outPointers:roots: */; if (ecode == PrimNoErr) { /* begin pop: */ GIV(stackPointer) += 3 * BytesPerWord; @@ -46867,6 +46876,25 @@ return 0x3FFFFF; } + +/* a more complex version that tells both the word reversal and the + endianness of the machine + it came from. Low half of word is e.g. 6521. Top byte is top byte of + #doesNotUnderstand: on + this machine. ($d on the Mac or $s on the PC) */ + +static sqInt +imageSegmentVersion(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt wholeWord; + + + /* first data word, 'does' */ + + wholeWord = long32At((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorDoesNotUnderstand << 2))) + (BaseHeaderSize)); + return (imageFormatVersion()) | (wholeWord & 0xFF000000UL); +} + void incrementalGC(void) { @@ -57153,19 +57181,6 @@ } -/* Answer the initial PC for a method; used only in methods that build a - frame. Hence add an assert to check that there's a sane - methodClassAssociation. - */ - -static sqInt -initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) -{ - assert(saneMethodClassAssociationInnumLiterals(theMethod, literalCountOfMethodHeader(methodHeader))); - return (theMethod + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize); -} - - /* Like #stackIntegerValue: but access method arguments left-to-right */ sqInt @@ -62604,29 +62619,6 @@ return maybeClass; } -static sqInt -saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) -{ - sqInt referent; - sqInt shouldBeAssoc; - - shouldBeAssoc = longAt((methodObj + (BaseHeaderSize)) + (((numLiterals - 1) + LiteralStart) << 2)); - if (((longAt(shouldBeAssoc)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(shouldBeAssoc)); - referent = longAt((shouldBeAssoc + (BaseHeaderSize)) + (0 << 2)); - while (((referent & 3) == 0) - && (((longAt(referent)) & 0x3FFFFF) == 8)) { - referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); - } - shouldBeAssoc = referent; - } - return (((shouldBeAssoc & 3) == 0) - && (((((usqInt) (longAt(shouldBeAssoc))) >> 24) & 0x1F) <= 5)) - && (((numSlotsOf(shouldBeAssoc)) > ValueIndex) - && (addressCouldBeClassObj(noFixupFollowFieldofObject(ValueIndex, shouldBeAssoc)))); -} - void setBreakSelector(char *aString) { @@ -63347,9 +63339,7 @@ longAtput((sp8 = GIV(stackPointer) - BytesPerWord), GIV(framePointer)); GIV(stackPointer) = sp8; GIV(framePointer) = GIV(stackPointer); - /* begin initialPCForHeader:method: */ - assert(saneMethodClassAssociationInnumLiterals(GIV(newMethod), literalCountOfMethodHeader(methodHeader))); - initialIP = ((sqInt) ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize))); + initialIP = (GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize); if (activateCogMethod) { /* begin push: */ longAtput((sp10 = GIV(stackPointer) - BytesPerWord), ((usqInt)cogMethod)); @@ -64786,7 +64776,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -65003,7 +64993,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -65028,7 +65018,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -65091,7 +65081,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -65337,7 +65327,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -65393,7 +65383,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-09-12 20:57:39 UTC (rev 3076) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-09-13 00:35:44 UTC (rev 3077) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade from - StackInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d + StackInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -264,6 +264,7 @@ #define PrimErrBadMethod 12 #define PrimErrBadNumArgs 5 #define PrimErrBadReceiver 2 +#define PrimErrGenericFailure 1 #define PrimErrInappropriate 6 #define PrimErrLimitExceeded 15 #define PrimErrNamedInternal 13 @@ -741,6 +742,7 @@ usqLong headerForSlotsformatclassIndex(sqInt numSlots, sqInt formatField, sqInt classIndex); static sqInt hiddenRootSlots(void); sqInt identityHashHalfWordMask(void); +static sqInt imageSegmentVersion(void); void incrementalGC(void); sqInt indexablePointersFormat(void); static void inFreeTreeReplacewith(sqInt treeNode, sqInt newNode) NoDbgRegParms; @@ -1055,7 +1057,6 @@ static sqInt imageFormatVersion(void); sqInt implicitReceiverFormixinimplementing(sqInt rcvr, sqInt mixin, sqInt selector); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); -static sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) NoDbgRegParms; sqInt integerArg(sqInt index); static sqInt interpreterAllocationReserveBytes(void); void ioFilenamefromStringofLengthresolveAliases(char *aCharBuffer, char *aFilenameString, sqInt filenameLength, sqInt aBoolean); @@ -1179,7 +1180,6 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms; static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; -static sqInt saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) NoDbgRegParms; EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); EXPORT(sqInt) sendInvokeCallbackStackRegistersJmpbuf(sqInt thunkPtr, sqInt stackPtr, sqInt regsPtr, sqInt jmpBufPtr); void setBreakSelector(char *aString); @@ -2073,7 +2073,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.878"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.879"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5844,7 +5844,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(nilObj)); } - localIP = pointerForOop((initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1); + localIP = pointerForOop(((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) - 1); if (methodHeader & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -20471,7 +20471,7 @@ longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp7; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader1, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader1 & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -24969,8 +24969,17 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt arrayOfRoots; sqInt ecode; + sqInt endSeg; + sqInt firstIn; + sqInt firstOut; + sqInt hdrBaseIn; + sqInt hdrBaseOut; + sqInt lastIn; + sqInt lastOut; + sqInt lastSeg; sqInt outPointerArray; sqInt segmentWordArray; + sqInt versionOffset; outPointerArray = longAt(GIV(stackPointer)); segmentWordArray = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -24993,7 +25002,11 @@ } return; } + /* begin storeImageSegmentInto:outPointers:roots: */ ecode = PrimErrUnsupported; + goto l1; + +l1: /* end storeImageSegmentInto:outPointers:roots: */; if (ecode == PrimNoErr) { /* begin pop: */ GIV(stackPointer) += 3 * BytesPerWord; @@ -35530,6 +35543,25 @@ return 0x3FFFFF; } + +/* a more complex version that tells both the word reversal and the + endianness of the machine + it came from. Low half of word is e.g. 6521. Top byte is top byte of + #doesNotUnderstand: on + this machine. ($d on the Mac or $s on the PC) */ + +static sqInt +imageSegmentVersion(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt wholeWord; + + + /* first data word, 'does' */ + + wholeWord = long32At((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorDoesNotUnderstand << 2))) + (BaseHeaderSize)); + return (imageFormatVersion()) | (wholeWord & 0xFF000000UL); +} + void incrementalGC(void) { @@ -46633,19 +46665,6 @@ } -/* Answer the initial PC for a method; used only in methods that build a - frame. Hence add an assert to check that there's a sane - methodClassAssociation. - */ - -static sqInt -initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) -{ - assert(saneMethodClassAssociationInnumLiterals(theMethod, literalCountOfMethodHeader(methodHeader))); - return (theMethod + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + (BaseHeaderSize); -} - - /* Like #stackIntegerValue: but access method arguments left-to-right */ sqInt @@ -49352,7 +49371,7 @@ longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp7; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader1, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader1))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader1 & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -53106,30 +53125,7 @@ return maybeClass; } -static sqInt -saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) -{ - sqInt referent; - sqInt shouldBeAssoc; - shouldBeAssoc = longAt((methodObj + (BaseHeaderSize)) + (((numLiterals - 1) + LiteralStart) << 2)); - if (((longAt(shouldBeAssoc)) & (0x3FFFFF - 8)) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(shouldBeAssoc)); - referent = longAt((shouldBeAssoc + (BaseHeaderSize)) + (0 << 2)); - while (((referent & 3) == 0) - && (((longAt(referent)) & 0x3FFFFF) == 8)) { - referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); - } - shouldBeAssoc = referent; - } - return (((shouldBeAssoc & 3) == 0) - && (((((usqInt) (longAt(shouldBeAssoc))) >> 24) & 0x1F) <= 5)) - && (((numSlotsOf(shouldBeAssoc)) > ValueIndex) - && (addressCouldBeClassObj(noFixupFollowFieldofObject(ValueIndex, shouldBeAssoc)))); -} - - /* Send the calllback message to Alien class with the supplied arg(s). Use either the 1 arg invokeCallbackContext: or the 4 arg @@ -53284,7 +53280,7 @@ longAtput((sp9 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp9; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -53446,7 +53442,7 @@ longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp7; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -54233,7 +54229,7 @@ longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp7; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -57830,7 +57826,7 @@ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader2, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader2))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader2 & (65536 << SmallIntegerShift)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts @@ -58059,7 +58055,7 @@ longAtput((sp7 = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp7; } - GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader2, GIV(newMethod))) - 1; + GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader2))) * 4)) + (BaseHeaderSize)) - 1; if (methodHeader2 & (65536 << SmallIntegerShift)) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.879.mcz
by commits＠source.squeak.org 13 Sep '14

13 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.879.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.879 Author: eem Time: 12 September 2014, 5:11:28.11 pm UUID: 44c718be-2a51-4e7e-9553-5def29daaade Ancestors: VMMaker.oscog-eem.878 Back out of saneMethodClassAssociation assert in initialPCForHeader:method:. Newspeak falls foul of this. =============== Diff against VMMaker.oscog-eem.878 =============== Item was added: + ----- Method: SpurMemoryManager>>imageSegmentVersion (in category 'image segment in/out') ----- + imageSegmentVersion + | wholeWord | + "a more complex version that tells both the word reversal and the endianness of the machine + it came from. Low half of word is e.g. 6521. Top byte is top byte of #doesNotUnderstand: on + this machine. ($d on the Mac or $s on the PC)" + + wholeWord := self long32At: (self splObj: SelectorDoesNotUnderstand) + self baseHeaderSize. "first data word, 'does'" + ^coInterpreter imageFormatVersion bitOr: (wholeWord bitAnd: 16rFF000000)! Item was changed: ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'primitive support') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray." "This primitive will store a binary image segment (in the same format as the Squeak image file) of the receiver and every object in its proper tree of subParts (ie, that is not refered to from anywhere else outside the tree). All pointers from within the tree to objects outside the tree will be copied into the array of outpointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set." + "The primitive expects the array and wordArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify truncation, both incoming arrays are required to have large headers (i.e. be 256 words long or larger). If either array is too small, the primitive will fail, but in no other case. - "The primitive expects the array and wordArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify truncation, both incoming arrays are required to be 256 bytes or more long (ie with 3-word headers). If either array is too small, the primitive will fail, but in no other case. During operation of the primitive, it is necessary to convert from both internal and external oops to their mapped values. To make this fast, the headers of the original objects in question are replaced by the mapped values (and this is noted by adding the forbidden XX header type). Tables are kept of both kinds of oops, as well as of the original headers for restoration. To be specific, there are two similar two-part tables, the outpointer array, and one in the upper fifth of the segmentWordArray. Each grows oops from the bottom up, and preserved headers from halfway up. In case of either success or failure, the headers must be restored. In the event of primitive failure, the table of outpointers must also be nilled out (since the garbage in the high half will not have been discarded." + | endSeg firstIn firstOut hdrBaseIn hdrBaseOut lastIn lastOut lastSeg versionOffset | + true ifTrue: [^PrimErrUnsupported] ifFalse: [ + + ((self hasOverflowHeader: outPointerArray) "Must have 128-bit header" + and: [self hasOverflowHeader: segmentWordArray]) ifFalse: "Must have 128-bit header" + [^PrimErrGenericFailure]. + + "Use the top half of outPointers for saved headers." + firstOut := outPointerArray + self baseHeaderSize. + lastOut := firstOut - self bytesPerOop. + hdrBaseOut := firstOut + ((self numSlotsOf: outPointerArray) // 2 * self bytesPerOop). "top half" + + lastSeg := segmentWordArray. + endSeg := segmentWordArray + (self addressAfter: segmentWordArray) - self bytesPerOop. + + "Write a version number for byte order and version check" + versionOffset := self bytesPerOop. + lastSeg := lastSeg + versionOffset. + lastSeg > endSeg ifTrue: [^PrimErrGenericFailure]. + self longAt: lastSeg put: self imageSegmentVersion. + + "Allocate top 1/8 of segment for table of internal oops and saved headers" + firstIn := endSeg - ((self numSlotsOf: segmentWordArray) // 8). "Take 1/8 of seg" + lastIn := firstIn - self bytesPerOop. + hdrBaseIn := firstIn + ((self numSlotsOf: segmentWordArray) // 16). "top half of that" + + self assert: self allObjectsUnmarked. + self markObjectsIn: arrayOfRoots. + self markObjects. + self unmarkObjectsIn: arrayOfRoots. + + self flag: 'you are here']! - ^PrimErrUnsupported! Item was changed: ----- Method: StackInterpreter>>initialPCForHeader:method: (in category 'compiled methods') ----- initialPCForHeader: methodHeader method: theMethod + "Answer the initial PC for a method; used only in methods that build a frame." - "Answer the initial PC for a method; used only in methods that build a frame. - Hence add an assert to check that there's a sane methodClassAssociation." <inline: true> - self assert: (self saneMethodClassAssociationIn: theMethod - numLiterals: (objectMemory literalCountOfMethodHeader: methodHeader)). ^theMethod + + ((LiteralStart + (objectMemory literalCountOfMethodHeader: methodHeader)) * objectMemory bytesPerOop) - + ((LiteralStart + (objectMemory literalCountOfMethodHeader: methodHeader)) * BytesPerOop) + objectMemory baseHeaderSize!

1 0

[commit][3076] CogVM source as per VMMaker.oscog-eem.878
by commits＠squeakvm.org 12 Sep '14

12 Sep '14

Revision: 3076 Author: eliot Date: 2014-09-12 13:57:39 -0700 (Fri, 12 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.878 Make sure that the method is set on returning from a callback. Fixes MNUs of atAddress: in exampleCqsort in the stack VMs. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.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/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/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -852,7 +852,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2088,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.876"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.878"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4883,7 +4883,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l303; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4901,7 +4900,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l303: /* end baseFrameReturn */; goto l302; } @@ -36773,15 +36772,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36792,7 +36793,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36807,7 +36822,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36861,18 +36876,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38744,7 +38759,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -50620,6 +50635,14 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + BaseHeaderSize) + (MethodIndex << ShiftForWord))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + BaseHeaderSize) + (MethodIndex << ShiftForWord)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; @@ -54362,7 +54385,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -855,7 +855,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2091,7 +2091,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.876"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.878"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4892,7 +4892,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l303; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4910,7 +4909,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l303: /* end baseFrameReturn */; goto l302; } @@ -36782,15 +36781,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36801,7 +36802,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36816,7 +36831,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36870,18 +36885,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38753,7 +38768,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -50629,6 +50644,14 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + BaseHeaderSize) + (MethodIndex << ShiftForWord))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + BaseHeaderSize) + (MethodIndex << ShiftForWord)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; @@ -54371,7 +54394,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2324,7 +2324,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.876"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.878"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5616,7 +5616,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l292; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5634,7 +5633,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l292: /* end baseFrameReturn */; goto l291; } @@ -62479,6 +62478,14 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; @@ -64770,7 +64777,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } index = (index >> 1); @@ -64987,7 +64994,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ @@ -65012,7 +65019,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -65075,7 +65082,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -65321,7 +65328,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -65377,7 +65384,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2327,7 +2327,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.876"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.878"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5625,7 +5625,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l292; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5643,7 +5642,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l292: /* end baseFrameReturn */; goto l291; } @@ -62488,6 +62487,14 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; @@ -64779,7 +64786,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } index = (index >> 1); @@ -64996,7 +65003,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ @@ -65021,7 +65028,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -65084,7 +65091,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -65330,7 +65337,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -65386,7 +65393,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - StackInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + StackInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2073,7 +2073,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.876"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.878"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -52956,6 +52956,13 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + GIV(method) = longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (methodUsesAlternateBytecodeSet(GIV(method)) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - StackInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + StackInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2070,7 +2070,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.876"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.878"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -52947,6 +52947,13 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + GIV(method) = longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (methodUsesAlternateBytecodeSet(GIV(method)) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Sep 9 10:59:12 PDT 2014 + Fri Sep 12 13:56:48 PDT 2014 Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -851,7 +851,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2085,7 +2085,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.876]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.878]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36769,15 +36769,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36788,7 +36790,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36803,7 +36819,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36857,18 +36873,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38740,7 +38756,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -50540,6 +50556,14 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + BaseHeaderSize) + (MethodIndex << ShiftForWord))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + BaseHeaderSize) + (MethodIndex << ShiftForWord)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; @@ -52841,7 +52865,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = longAt(aContext); @@ -53025,7 +53049,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -53071,7 +53095,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -854,7 +854,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2088,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.876]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.878]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36778,15 +36778,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36797,7 +36799,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36812,7 +36828,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36866,18 +36882,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38749,7 +38765,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -50549,6 +50565,14 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + BaseHeaderSize) + (MethodIndex << ShiftForWord))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + BaseHeaderSize) + (MethodIndex << ShiftForWord)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; @@ -52850,7 +52874,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = longAt(aContext); @@ -53034,7 +53058,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -53080,7 +53104,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1129,7 +1129,7 @@ sqInt removeGCRoot(sqInt *varLoc); static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2322,7 +2322,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.876]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.878]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -51748,7 +51748,7 @@ zero if no change was possible. */ -static sqInt +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -62227,6 +62227,14 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1132,7 +1132,7 @@ sqInt removeGCRoot(sqInt *varLoc); static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2325,7 +2325,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.876]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.878]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -51757,7 +51757,7 @@ zero if no change was possible. */ -static sqInt +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -62236,6 +62236,14 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2)); + assert(isOopCompiledMethod(GIV(method))); + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) + ? 256 + : 0); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/spursrc/vm/cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2313,7 +2313,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.876]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.878]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -57191,6 +57191,11 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2)); + assert(isOopCompiledMethod(GIV(method))); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; @@ -59477,7 +59482,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } index = (index >> 1); @@ -59694,7 +59699,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ @@ -59719,7 +59724,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -59782,7 +59787,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -60028,7 +60033,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -60084,7 +60089,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/spursrc/vm/cointerp.h 2014-09-12 20:57:39 UTC (rev 3076) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-09-10 21:46:44 UTC (rev 3075) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-09-12 20:57:39 UTC (rev 3076) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d from - CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.878 uuid: 4165e5c9-05a2-4795-9295-8b309fa52e2d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2316,7 +2316,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.876]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.878]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -57200,6 +57200,11 @@ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin setMethod: */ + assert((((usqInt)(longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2))))) >= (startOfMemory())); + GIV(method) = longAt((calloutMethodContext + (BaseHeaderSize)) + (MethodIndex << 2)); + assert(isOopCompiledMethod(GIV(method))); + /* begin setStackPageAndLimit: */ assert(thePage != 0); GIV(stackPage) = thePage; @@ -59486,7 +59491,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.878.mcz
by commits＠source.squeak.org 12 Sep '14

12 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.878.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.878 Author: eem Time: 12 September 2014, 12:35:22.8 pm UUID: 4165e5c9-05a2-4795-9295-8b309fa52e2d Ancestors: VMMaker.oscog-eem.877 Make sure that the method is set on returning from a callback. =============== Diff against VMMaker.oscog-eem.877 =============== Item was changed: ----- Method: StackInterpreter>>returnAs:ThroughCallback:Context: (in category 'callback support') ----- returnAs: returnTypeOop ThroughCallback: vmCallbackContext Context: callbackMethodContext "callbackMethodContext is an activation of invokeCallback:[stack:registers:jmpbuf:]. Its sender is the VM's state prior to the callback. Reestablish that state (via longjmp), and mark callbackMethodContext as dead." <export: true> <var: #vmCallbackContext type: #'VMCallbackContext *'> | calloutMethodContext theFP thePage | <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> ((self isIntegerObject: returnTypeOop) and: [self isLiveContext: callbackMethodContext]) ifFalse: [^false]. calloutMethodContext := self externalInstVar: SenderIndex ofContext: callbackMethodContext. (self isLiveContext: calloutMethodContext) ifFalse: [^false]. "We're about to leave this stack page; must save the current frame's instructionPointer." self push: instructionPointer. self externalWriteBackHeadFramePointers. "Mark callbackMethodContext as dead; the common case is that it is the current frame. We go the extra mile for the debugger." (self isSingleContext: callbackMethodContext) ifTrue: [self markContextAsDead: callbackMethodContext] ifFalse: [theFP := self frameOfMarriedContext: callbackMethodContext. framePointer = theFP "common case" ifTrue: [(self isBaseFrame: theFP) ifTrue: [stackPages freeStackPage: stackPage] ifFalse: "calloutMethodContext is immediately below on the same page. Make it current." [instructionPointer := (self frameCallerSavedIP: framePointer) asUnsignedInteger. stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + BytesPerWord. framePointer := self frameCallerFP: framePointer. self restoreCStackStateForCallbackContext: vmCallbackContext. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). ^true]] ifFalse: [self externalDivorceFrame: theFP andContext: callbackMethodContext. self markContextAsDead: callbackMethodContext]]. "Make the calloutMethodContext the active frame. The case where calloutMethodContext is immediately below callbackMethodContext on the same page is handled above." (self isStillMarriedContext: calloutMethodContext) ifTrue: [theFP := self frameOfMarriedContext: calloutMethodContext. thePage := stackPages stackPageFor: theFP. "findSPOf:on: points to the word beneath the instructionPointer, but there is no instructionPointer on the top frame of the current page." self assert: thePage ~= stackPage. stackPointer := (self findSPOf: theFP on: thePage) - BytesPerWord. framePointer := theFP] ifFalse: [thePage := self makeBaseFrameFor: calloutMethodContext. framePointer := thePage headFP. stackPointer := thePage headSP]. instructionPointer := self popStack. + self setMethod: (objectMemory fetchPointer: MethodIndex ofObject: calloutMethodContext). self setStackPageAndLimit: thePage. self restoreCStackStateForCallbackContext: vmCallbackContext. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). "NOTREACHED" ^true!

1 0

opening a unix pipe via external FFI call
by Douglas McPherson 12 Sep '14

12 Sep '14

Hi, Short: Does anyone know offhand of pitfalls trying to make system calls through pipes via FFI from Squeak on Linux (Ubuntu 14.04 on ARM if it makes a difference)? Long: I’ve been having fun playing with the Parallella board [1]. The Parallella board has a Xilinx dual-core ARMv7 with a small FPGA, and an Epiphany coprocessor which has 16 RISC cores. I managed to get a CogStackVM running on (one of the) ARM cores. Based on Tim’s CogStackVM for the RPi (ARMv6), I made some hacks to get it working on the BeagleBoneBlack (ARMv7). This ARMv7 version was compiled on a Chromebook by Ken Dickey where it magically worked, and now by me on the Parallella where it also “just works”. So I wanted to see if I could fire up any of the Epiphany cores. I loaded Squeak OpenCL FFI bindings [2] (very cool) and have been able to do some very simple things such as query the Epiphany capabilities, and create Epiphany buffers and write/read them. So far so good. If you want to induce any of the Epiphany’s cores to do some actual work, you have to provide some code (kernel in OpenCL-speak). These can be compiled and loaded on the fly by an OpenCL library API. This is where I am stuck. The OpenCL library for the Parallella is open source so I can see exactly where things go wrong. When the kernel compile API is called, it performs its work by making a bunch of system calls via popen(<cmd>, “r”). None of these works; both Squeak and the command are deadlocked once the first popen() call is made. I rebuilt the OpenCL library from sources with debug enabled, as well as added some additional debug prints. In order to communicate with the Epiphany, processes need to be run as root, thus I am running Squeak as root for these tests. And since Squeak is running as root I don’t suspect permission problems getting access to commands and files. The OpenCL library for Parallella compiles kernels successfully for test programs written in C, so /it/ should be ok. And the Squeak OpenCL bindings seem to work fine (insofar as I have played with them; that alone is a lot of fun :)) on a Mac with GPU. I know the question is vague, and I’m sure I haven’t provided nearly enough info, but thought I would throw it out there :) Thanks! Doug [1] http://www.parallella.org [2] https://sites.google.com/site/schwaj/home/opencl-binding-for-squeak

2 2

VM Maker: Cog-eem.207.mcz
by commits＠source.squeak.org 11 Sep '14

11 Sep '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.207.mcz ==================== Summary ==================== Name: Cog-eem.207 Author: eem Time: 11 September 2014, 12:14:28.942 pm UUID: 90be5077-a86d-4fe4-8b74-7ee5242f3865 Ancestors: Cog-eem.206 Eliminate the isClosureCompiled: anachronism and add the informative bytecodeSetName to CompiledMethod>> headerDescription in the Spur bootstrap. =============== Diff against Cog-eem.206 =============== Item was changed: ----- Method: SpurBootstrap class>>categoryForClass:meta:selector: (in category 'method prototype categorization') ----- categoryForClass: className meta: isMeta selector: selector ^(isMeta ifTrue: [{ className. #class. selector }] ifFalse: [{ className. selector }]) caseOf: { [#(Behavior allInstancesOrNil)] -> [#enumerating]. [#(Behavior byteSizeOfInstance)] -> [#'accessing instances and variables']. [#(Behavior byteSizeOfInstanceOfSize:)] -> [#'accessing instances and variables']. [#(Behavior elementSize)] -> [#'accessing instances and variables']. [#(Behavior handleFailingBasicNew)] -> [#private]. [#(Behavior handleFailingBasicNew:)] -> [#private]. [#(Behavior handleFailingFailingBasicNew)] -> [#private]. [#(Behavior handleFailingFailingBasicNew:)] -> [#private]. [#(Behavior identityHash)] -> [#comparing]. [#(Behavior isEphemeronClass)] -> [#testing]. [#(Behavior isImmediateClass)] -> [#testing]. [#(Character identityHash)] -> [#comparing]. [#(Class immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#'subclass creation']. [#(ClassBuilder superclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#public]. + [#(CompiledMethod bytecodeSetName)] -> [#accessing]. [#(CompiledMethod class handleFailingFailingNewMethod:header:)] -> [#private]. [#(CompiledMethod class handleFailingNewMethod:header:)] -> [#private]. + [#(CompiledMethod class headerFlagForEncoder:)] + -> [#'method encoding']. + [#(CompiledMethod class installPrimaryBytecodeSet:)] + -> [#'class initialization']. + [#(CompiledMethod class installSecondaryBytecodeSet:)] + -> [#'class initialization']. [#(Context class allInstances)] -> [#enumerating]. [#(Context class allInstancesDo:)] -> [#enumerating]. [#(Context failPrimitiveWith:)] -> [#'system simulation']. [#(Context isPrimFailToken:)] -> [#private]. [#(Context send:to:with:lookupIn:)] -> [#controlling]. [#(ContextPart isPrimFailToken:)] -> [#private]. [#(ContextPart send:to:with:lookupIn:)] -> [#controlling]. - [#(CompiledMethod class headerFlagForEncoder:)] - -> [#'method encoding']. - [#(CompiledMethod class installPrimaryBytecodeSet:)] - -> [#'class initialization']. - [#(CompiledMethod class installSecondaryBytecodeSet:)] - -> [#'class initialization']. [#(EncoderForV3 computeMethodHeaderForNumArgs:numTemps:numLits:primitive:)] -> [#'method encoding']. [#(EncoderForV3PlusClosures genCallPrimitive:)] -> [#'bytecode generation']. [#(EncoderForV3PlusClosures class callPrimitiveCode)] -> [#'bytecode decoding']. [#(MethodContext failPrimitiveWith:)] -> [#'system simulation']. [#(MethodContext class allInstances)] -> [#enumerating]. [#(MethodContext class allInstancesDo:)] -> [#enumerating]. [#(SmallInteger asCharacter)] -> [#converting]. [#(SmalltalkImage growMemoryByAtLeast:)] -> [#'memory space']. [#(SmalltalkImage maxIdentityHash)] -> [#'system attributes']. [#(SystemDictionary growMemoryByAtLeast:)] -> [#'memory space']. [#(SystemDictionary maxIdentityHash)] -> [#'system attributes']. [#(SystemDictionary setGCParameters)] -> [#'snapshot and quit']. [#(SystemNavigation allObjects)] -> [#query]. [#(SystemNavigation allObjectsOrNil)] -> [#query]. } otherwise: [Transcript nextPutAll: className. isMeta ifTrue: [Transcript nextPutAll: ' class']. Transcript nextPutAll: '>>'; store: selector; nextPutAll: ' is unclassified'; cr; flush. ^Categorizer default]! Item was added: + ----- Method: SpurBootstrapSqueakPrototypes>>CompiledMethodPROTOTYPEbytecodeSetName (in category 'method prototypes') ----- + CompiledMethodPROTOTYPEbytecodeSetName + ^self encoderClass name copyReplaceAll: 'EncoderFor' with: ''! Item was added: + ----- Method: SpurBootstrapSqueakPrototypes>>CompiledMethodPROTOTYPEheaderDescription (in category 'method prototypes') ----- + CompiledMethodPROTOTYPEheaderDescription + "Answer a description containing the information about the form of the + receiver and the form of the context needed to run the receiver." + + ^(ByteString new: 128) writeStream + print: self header; cr; + nextPutAll: '"primitive: '; print: self primitive; cr; + nextPutAll: ' numArgs: '; print: self numArgs; cr; + nextPutAll: ' numTemps: '; print: self numTemps; cr; + nextPutAll: ' numLiterals: '; print: self numLiterals; cr; + nextPutAll: ' frameSize: '; print: self frameSize; cr; + nextPutAll: ' bytecodeSet: '; nextPutAll: self bytecodeSetName; + nextPut: $"; cr; + contents!

1 0

VM Maker: Cog-eem.206.mcz
by commits＠source.squeak.org 11 Sep '14

11 Sep '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.206.mcz ==================== Summary ==================== Name: Cog-eem.206 Author: eem Time: 11 September 2014, 9:36:10.489 am UUID: 475ce1eb-6c86-4940-b34b-f64d53a2feae Ancestors: Cog-eem.205 Fix slip in the Spur bootstrap specialObjectsArray definitions; use invokeCallbackContext: not invokeCallbackContext:: !! Fix the decompiler for properties in the 4.3 bootstrap. =============== Diff against Cog-eem.205 =============== Item was added: + ----- Method: MethodNode>>MethodNodePROTOTYPEprintPropertiesOn: (in category '*Cog-method prototypes') ----- + MethodNodePROTOTYPEprintPropertiesOn: aStream + properties ifNil: [^self]. + properties propertyKeysAndValuesDo: + [:prop :val| + aStream crtab; nextPut: $<. + prop = #on:in: + ifTrue: + [prop keywords with: val do: + [:k :v | aStream nextPutAll: k; space; nextPutAll: v; space]] + ifFalse: + [prop = #on + ifTrue: [aStream nextPutAll: prop; nextPutAll:': '; nextPutAll: val] + ifFalse: [aStream nextPutAll: prop; nextPutAll:': '; print: val]]. + aStream nextPut: $>]! Item was changed: ----- Method: SpurBootstrap>>findLiteral:inClass: (in category 'bootstrap methods') ----- findLiteral: aLiteral inClass: classOop | bindingOrNil | aLiteral isString ifTrue: [^self stringFor: aLiteral]. aLiteral isFloat ifTrue: [^oldInterpreter floatObjectOf: aLiteral]. aLiteral isArray ifTrue: [^self cloneArrayLiteral: aLiteral]. + aLiteral isCharacter ifTrue: + [^oldHeap characterObjectOf: aLiteral asciiValue]. self assert: aLiteral isVariableBinding. bindingOrNil := self interpreter: oldInterpreter object: classOop perform: (self findSymbol: #bindingOf:) withArguments: {self findSymbol: aLiteral key}. bindingOrNil ~= oldHeap nilObject ifTrue: [^bindingOrNil]. self error: 'couldn''t find literal ', aLiteral printString! Item was changed: ----- Method: SpurBootstrapPharoPrototypes>>SmalltalkImagePROTOTYPEnewSpecialObjectsArray (in category 'method prototypes') ----- SmalltalkImagePROTOTYPEnewSpecialObjectsArray "Smalltalk recreateSpecialObjectsArray" "To external package developers: **** DO NOT OVERRIDE THIS METHOD. ***** If you are writing a plugin and need additional special object(s) for your own use, use addGCRoot() function and use own, separate special objects registry " "The Special Objects Array is an array of objects used by the Squeak virtual machine. Its contents are critical and accesses to it by the VM are unchecked, so don't even think of playing here unless you know what you are doing." | newArray | newArray := Array new: 60. "Nil false and true get used throughout the interpreter" newArray at: 1 put: nil. newArray at: 2 put: false. newArray at: 3 put: true. "This association holds the active process (a ProcessScheduler)" newArray at: 4 put: (self globals associationAt: #Processor). "Numerous classes below used for type checking and instantiation" newArray at: 5 put: Bitmap. newArray at: 6 put: SmallInteger. newArray at: 7 put: ByteString. newArray at: 8 put: Array. newArray at: 9 put: Smalltalk. newArray at: 10 put: Float. newArray at: 11 put: (self globals at: #MethodContext ifAbsent: [self globals at: #Context]). newArray at: 12 put: nil. "was BlockContext." newArray at: 13 put: Point. newArray at: 14 put: LargePositiveInteger. newArray at: 15 put: Display. newArray at: 16 put: Message. newArray at: 17 put: CompiledMethod. newArray at: 18 put: ((self primitiveGetSpecialObjectsArray at: 18) ifNil: [Semaphore new]). "low space Semaphore" newArray at: 19 put: Semaphore. newArray at: 20 put: Character. newArray at: 21 put: #doesNotUnderstand:. newArray at: 22 put: #cannotReturn:. newArray at: 23 put: nil. "This is the process signalling low space." "An array of the 32 selectors that are compiled as special bytecodes, paired alternately with the number of arguments each takes." newArray at: 24 put: #( #+ 1 #- 1 #< 1 #> 1 #<= 1 #>= 1 #= 1 #~= 1 #* 1 #/ 1 #\\ 1 #@ 1 #bitShift: 1 #// 1 #bitAnd: 1 #bitOr: 1 #at: 1 #at:put: 2 #size 0 #next 0 #nextPut: 1 #atEnd 0 #== 1 #class 0 #blockCopy: 1 #value 0 #value: 1 #do: 1 #new 0 #new: 1 #x 0 #y 0 ). "An array of the 255 Characters in ascii order. Cog inlines table into machine code at: prim so do not regenerate it. This is nil in Spur, which has immediate Characters." newArray at: 25 put: (self primitiveGetSpecialObjectsArray at: 25). newArray at: 26 put: #mustBeBoolean. newArray at: 27 put: ByteArray. newArray at: 28 put: Process. "An array of up to 31 classes whose instances will have compact headers; an empty array in Spur" newArray at: 29 put: self compactClassesArray. newArray at: 30 put: ((self primitiveGetSpecialObjectsArray at: 30) ifNil: [Semaphore new]). "delay Semaphore" newArray at: 31 put: ((self primitiveGetSpecialObjectsArray at: 31) ifNil: [Semaphore new]). "user interrupt Semaphore" "Entries 32 - 34 unreferenced. Previously these contained prototype instances to be copied for fast initialization" newArray at: 32 put: nil. "was the prototype Float" newArray at: 33 put: nil. "was the prototype 4-byte LargePositiveInteger" newArray at: 34 put: nil. "was the prototype Point" newArray at: 35 put: #cannotInterpret:. newArray at: 36 put: nil. "was the prototype MethodContext" newArray at: 37 put: BlockClosure. newArray at: 38 put: nil. "was the prototype BlockContext" "array of objects referred to by external code" newArray at: 39 put: (self primitiveGetSpecialObjectsArray at: 39). "external semaphores" newArray at: 40 put: nil. "Reserved for Mutex in Cog VMs" newArray at: 41 put: ((self primitiveGetSpecialObjectsArray at: 41) ifNil: [LinkedList new]). "Reserved for a LinkedList instance for overlapped calls in CogMT" newArray at: 42 put: ((self primitiveGetSpecialObjectsArray at: 42) ifNil: [Semaphore new]). "finalization Semaphore" newArray at: 43 put: LargeNegativeInteger. "External objects for callout. Note: Written so that one can actually completely remove the FFI." newArray at: 44 put: (self at: #ExternalAddress ifAbsent: []). newArray at: 45 put: (self at: #ExternalStructure ifAbsent: []). newArray at: 46 put: (self at: #ExternalData ifAbsent: []). newArray at: 47 put: (self at: #ExternalFunction ifAbsent: []). newArray at: 48 put: (self at: #ExternalLibrary ifAbsent: []). newArray at: 49 put: #aboutToReturn:through:. newArray at: 50 put: #run:with:in:. "51 reserved for immutability message" newArray at: 51 put: #attemptToAssign:withIndex:. newArray at: 52 put: #(nil "nil => generic error" #'bad receiver' #'bad argument' #'bad index' #'bad number of arguments' #'inappropriate operation' #'unsupported operation' #'no modification' #'insufficient object memory' #'insufficient C memory' #'not found' #'bad method' #'internal error in named primitive machinery' #'object may move' #'resource limit exceeded' #'object is pinned' #'primitive write beyond end of object'). "53 to 55 are for Alien" newArray at: 53 put: (self at: #Alien ifAbsent: []). + newArray at: 54 put: #invokeCallbackContext:. "use invokeCallback:stack:registers:jmpbuf: for old Alien callbacks." - newArray at: 54 put: #invokeCallbackContext::. "use invokeCallback:stack:registers:jmpbuf: for old Alien callbacks." newArray at: 55 put: (self at: #UnsafeAlien ifAbsent: []). "Used to be WeakFinalizationList for WeakFinalizationList hasNewFinalization, obsoleted by ephemeron support." newArray at: 56 put: nil. "reserved for foreign callback process" newArray at: 57 put: (self primitiveGetSpecialObjectsArray at: 57 ifAbsent: []). newArray at: 58 put: #unusedBytecode. "59 reserved for Sista counter tripped message" newArray at: 59 put: #conditionalBranchCounterTrippedOn:. "60 reserved for Sista class trap message" newArray at: 60 put: #classTrapFor:. ^newArray! Item was added: + ----- Method: SpurBootstrapSqueak43Prototypes>>MethodNodePROTOTYPEprintPropertiesOn: (in category 'method prototypes') ----- + MethodNodePROTOTYPEprintPropertiesOn: aStream + <indirect>! Item was changed: ----- Method: SpurBootstrapSqueakPrototypes>>SmalltalkImagePROTOTYPErecreateSpecialObjectsArray (in category 'method prototypes') ----- SmalltalkImagePROTOTYPErecreateSpecialObjectsArray "Smalltalk recreateSpecialObjectsArray" "To external package developers: **** DO NOT OVERRIDE THIS METHOD. ***** If you are writing a plugin and need additional special object(s) for your own use, use addGCRoot() function and use own, separate special objects registry " "The Special Objects Array is an array of objects used by the Squeak virtual machine. Its contents are critical and accesses to it by the VM are unchecked, so don't even think of playing here unless you know what you are doing." | newArray | newArray := Array new: 60. "Nil false and true get used throughout the interpreter" newArray at: 1 put: nil. newArray at: 2 put: false. newArray at: 3 put: true. "This association holds the active process (a ProcessScheduler)" newArray at: 4 put: (self specialObjectsArray at: 4) "(self bindingOf: #Processor) but it answers an Alias". "Numerous classes below used for type checking and instantiation" newArray at: 5 put: Bitmap. newArray at: 6 put: SmallInteger. newArray at: 7 put: ByteString. newArray at: 8 put: Array. newArray at: 9 put: Smalltalk. newArray at: 10 put: Float. newArray at: 11 put: (self globals at: #MethodContext ifAbsent: [self globals at: #Context]). newArray at: 12 put: nil. "was BlockContext." newArray at: 13 put: Point. newArray at: 14 put: LargePositiveInteger. newArray at: 15 put: Display. newArray at: 16 put: Message. newArray at: 17 put: CompiledMethod. newArray at: 18 put: ((self specialObjectsArray at: 18) ifNil: [Semaphore new]). "low space Semaphore" newArray at: 19 put: Semaphore. newArray at: 20 put: Character. newArray at: 21 put: #doesNotUnderstand:. newArray at: 22 put: #cannotReturn:. newArray at: 23 put: nil. "This is the process signalling low space." "An array of the 32 selectors that are compiled as special bytecodes, paired alternately with the number of arguments each takes." newArray at: 24 put: #( #+ 1 #- 1 #< 1 #> 1 #<= 1 #>= 1 #= 1 #~= 1 #* 1 #/ 1 #\\ 1 #@ 1 #bitShift: 1 #// 1 #bitAnd: 1 #bitOr: 1 #at: 1 #at:put: 2 #size 0 #next 0 #nextPut: 1 #atEnd 0 #== 1 #class 0 #blockCopy: 1 #value 0 #value: 1 #do: 1 #new 0 #new: 1 #x 0 #y 0 ). "An array of the 255 Characters in ascii order. Cog inlines table into machine code at: prim so do not regenerate it. This is nil in Spur, which has immediate Characters." newArray at: 25 put: (self specialObjectsArray at: 25). newArray at: 26 put: #mustBeBoolean. newArray at: 27 put: ByteArray. newArray at: 28 put: Process. "An array of up to 31 classes whose instances will have compact headers; an empty array in Spur" newArray at: 29 put: self compactClassesArray. newArray at: 30 put: ((self specialObjectsArray at: 30) ifNil: [Semaphore new]). "delay Semaphore" newArray at: 31 put: ((self specialObjectsArray at: 31) ifNil: [Semaphore new]). "user interrupt Semaphore" "Entries 32 - 34 unreferenced. Previously these contained prototype instances to be copied for fast initialization" newArray at: 32 put: nil. "was the prototype Float" newArray at: 33 put: nil. "was the prototype 4-byte LargePositiveInteger" newArray at: 34 put: nil. "was the prototype Point" newArray at: 35 put: #cannotInterpret:. newArray at: 36 put: nil. "was the prototype MethodContext" newArray at: 37 put: BlockClosure. newArray at: 38 put: nil. "was the prototype BlockContext" "array of objects referred to by external code" newArray at: 39 put: (self specialObjectsArray at: 39). "external semaphores" newArray at: 40 put: nil. "Reserved for Mutex in Cog VMs" newArray at: 41 put: ((self specialObjectsArray at: 41) ifNil: [LinkedList new]). "Reserved for a LinkedList instance for overlapped calls in CogMT" newArray at: 42 put: ((self specialObjectsArray at: 42) ifNil: [Semaphore new]). "finalization Semaphore" newArray at: 43 put: LargeNegativeInteger. "External objects for callout. Note: Written so that one can actually completely remove the FFI." newArray at: 44 put: (self at: #ExternalAddress ifAbsent: []). newArray at: 45 put: (self at: #ExternalStructure ifAbsent: []). newArray at: 46 put: (self at: #ExternalData ifAbsent: []). newArray at: 47 put: (self at: #ExternalFunction ifAbsent: []). newArray at: 48 put: (self at: #ExternalLibrary ifAbsent: []). newArray at: 49 put: #aboutToReturn:through:. newArray at: 50 put: #run:with:in:. "51 reserved for immutability message" newArray at: 51 put: #attemptToAssign:withIndex:. newArray at: 52 put: #(nil "nil => generic error" #'bad receiver' #'bad argument' #'bad index' #'bad number of arguments' #'inappropriate operation' #'unsupported operation' #'no modification' #'insufficient object memory' #'insufficient C memory' #'not found' #'bad method' #'internal error in named primitive machinery' #'object may move' #'resource limit exceeded' #'object is pinned' #'primitive write beyond end of object'). "53 to 55 are for Alien" newArray at: 53 put: (self at: #Alien ifAbsent: []). + newArray at: 54 put: #invokeCallbackContext:. "use invokeCallback:stack:registers:jmpbuf: for old Alien callbacks." - newArray at: 54 put: #invokeCallbackContext::. "use invokeCallback:stack:registers:jmpbuf: for old Alien callbacks." newArray at: 55 put: (self at: #UnsafeAlien ifAbsent: []). "Used to be WeakFinalizationList for WeakFinalizationList hasNewFinalization, obsoleted by ephemeron support." newArray at: 56 put: nil. "reserved for foreign callback process" newArray at: 57 put: (self specialObjectsArray at: 57 ifAbsent: []). newArray at: 58 put: #unusedBytecode. "59 reserved for Sista counter tripped message" newArray at: 59 put: #conditionalBranchCounterTrippedOn:. "60 reserved for Sista class trap message" newArray at: 60 put: #classTrapFor:. "Now replace the interpreter's reference in one atomic operation" self specialObjectsArray becomeForward: newArray!

1 0

VM Maker: VMMaker.oscog-eem.877.mcz
by commits＠source.squeak.org 11 Sep '14

11 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.877.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.877 Author: eem Time: 10 September 2014, 7:58:01.558 pm UUID: db2baa66-7729-434c-891f-b5acb1002b7b Ancestors: VMMaker.oscog-eem.876 Simulator: Allow one to specify a break block for the StackInterpreterSimulator. Fix sizeof: for squeakFileOffsetType. =============== Diff against VMMaker.oscog-eem.876 =============== Item was changed: ----- Method: FilePluginSimulator>>sizeof: (in category 'simulation') ----- sizeof: objectSymbolOrClass + "In the simulator file handles are just integer indices into openFiles and so need only be BytesPerWord big. We assume the file offset type is always 64-bit" + | index | + index := #( #SQFile #squeakFileOffsetType) + indexOf: objectSymbolOrClass + ifAbsent: [^super sizeof: objectSymbolOrClass]. + ^{interpreterProxy wordSize. + 8 } at: index! - "In the simulator file handles are just integer indices into openFiles and so need only be BytesPerWord big." - ^objectSymbolOrClass == #SQFile - ifTrue: [BytesPerWord] - ifFalse: [super sizeof: objectSymbolOrClass]! Item was added: + ----- Method: StackInterpreterSimulator>>atEachStepBlock: (in category 'testing') ----- + atEachStepBlock: aBlock + atEachStepBlock := aBlock! Item was changed: ----- Method: StackInterpreterSimulator>>cloneSimulation (in category 'debug support') ----- cloneSimulation + | savedAtEachStepBlock savedDisplayView savedDisplayForm savedQuitBlock savedTranscript | + savedAtEachStepBlock := atEachStepBlock. atEachStepBlock := nil. - | savedDisplayView savedDisplayForm savedQuitBlock savedTranscript | savedDisplayView := displayView. displayView := nil. savedDisplayForm := displayForm. displayForm = nil. savedQuitBlock := quitBlock. quitBlock := nil. savedTranscript := transcript. transcript := nil. ^[| theClone | Smalltalk garbageCollect. theClone := self veryDeepCopy. theClone parent: self; transcript: Transcript. theClone objectMemory parent: objectMemory. theClone] ensure: + [atEachStepBlock := savedAtEachStepBlock. + displayView := savedDisplayView. - [displayView := savedDisplayView. displayForm = savedDisplayForm. quitBlock := savedQuitBlock. transcript := savedTranscript]!

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 September 2014