Vm-dev August 2014

vm-dev@lists.squeakfoundation.org

12 participants
89 discussions

VM Maker: VMMaker.oscog-eem.847.mcz
by commits＠source.squeak.org 07 Aug '14

07 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.847.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.847 Author: eem Time: 7 August 2014, 7:48:20.583 am UUID: c9c7ffd4-9899-43f5-b566-ab69319636b9 Ancestors: VMMaker.oscog-eem.846 Fix the header rewrite filter so that interp.h doesn't get endlessly regenerated, reducing recompilations. =============== Diff against VMMaker.oscog-eem.846 =============== Item was changed: ----- Method: CCodeGenerator>>needToGenerateHeader:file:contents: (in category 'C code generator') ----- needToGenerateHeader: headerName file: interpHdrPath contents: newContentsArg "Check if we need to regenerate a header file. We always need to if the contents have changed. But if not we can avoid needless recompilations by not regenerating. So only regenerate if the package is clean (version doesn't include a '*'). If we can't find a package version ask the user." + | newContents oldContents makerStamp vmMakerIndex | - | newContents oldContents | (FileDirectory default fileExists: interpHdrPath) ifFalse: [^true]. newContents := newContentsArg. oldContents := (FileDirectory default oldFileNamed: interpHdrPath) contentsOfEntireFile. + oldContents := oldContents copyReplaceAll: {Character cr. Character lf} with: {Character cr}. + oldContents replaceAll: Character lf with: Character cr. + makerStamp := (vmMakerIndex := oldContents indexOfSubCollection: 'VMMaker') ~= 0 + ifTrue: + [oldContents + copyFrom: vmMakerIndex + to: (oldContents indexOf: Character cr startingAt: vmMakerIndex) - 1] + ifFalse: ['XXX']. (newContents beginsWith: '/*') = (oldContents beginsWith: '/*') ifFalse: [(newContents beginsWith: '/*') ifTrue: [newContents := newContents readStream upToAll: '*/'; skipSeparators; upToEnd]. (oldContents beginsWith: '/*') ifTrue: [oldContents := oldContents readStream upToAll: '*/'; skipSeparators; upToEnd]]. - oldContents := oldContents copyReplaceAll: {Character cr. Character lf} with: {Character cr}. - oldContents replaceAll: Character lf with: Character cr. ^oldContents ~= newContents + or: [([((self class monticelloDescriptionFor: vmClass) includes: $*) not + and: [((self class monticelloDescriptionFor: vmClass) includesSubString: makerStamp) not]] - or: [[((self class monticelloDescriptionFor: vmClass) includes: $*) not] on: Error + do: [:ex| true]) + or: [self confirm: headerName, ' contents are unchanged.\Writing the file may cause recompilation of support files.\Do you want to write the header file?' withCRs]]! - do: [:ex| - self confirm: headerName, ' contents are unchanged.\Writing the file may cause recompilation of support files.\Do you want to write the header file?\The interpreter will still be written either way.' withCRs]]!

1 0

VM Maker: VMMaker.oscog-eem.846.mcz
by commits＠source.squeak.org 07 Aug '14

07 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.846.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.846 Author: eem Time: 7 August 2014, 7:14:40.362 am UUID: 9e73d37e-0e43-4238-b471-c1c27d605caf Ancestors: VMMaker.oscog-eem.845 Sista: Implement ceClassTrap. Fix argument access in inlinePrimitiveBytecode:. Refactor primitiveQuo to share code with inlinePrimitiveBytecode:. Fix argument type of branches and its alloca in genExtTrapIfNotInstanceOfBehaviorsBytecode. Provide a dummy genCallPrimitiveBytecode for now. Fix comment typos and miscategorizations. =============== Diff against VMMaker.oscog-eem.845 =============== Item was added: + ----- Method: CoInterpreter>>ceClassTrap: (in category 'trampolines') ----- + ceClassTrap: anObject + <api> + <option: #SistaVM> + | context | + instructionPointer := self popStack. + context := self ensureFrameIsMarried: framePointer SP: stackPointer. + "If there is a class trap, the object is supposed to remain on + the stack, but the cogit always removes it. So restore it here." + self push: anObject. + self push: context. + self push: anObject. + self push: instructionPointer. + ^self + ceSendAbort: (objectMemory splObj: SelectorClassTrap) + to: anObject + numArgs: 1! Item was changed: + ----- Method: CoInterpreter>>frameNumTemps: (in category 'frame access') ----- - ----- Method: CoInterpreter>>frameNumTemps: (in category 'trampolines') ----- frameNumTemps: theFP "For subclasses to redefine to implement different closure semantics." <var: #theFP type: #'char *'> ^0! Item was changed: ----- Method: CogObjectRepresentation>>branchIfInstanceOfBehavior:branches: (in category 'sista support') ----- branchIfInstanceOfBehavior: classObj branches: branches "Generate a branch if ReceiverResultReg is an instance of classObj, otherwise fall- through. Store the branch in branches and answer the number of branches generated." + <var: #branches type: #'AbstractInstruction **'> self subclassResponsibility! Item was changed: ----- Method: CogObjectRepresentation>>branchIfInstanceOfBehaviors:branches: (in category 'sista support') ----- branchIfInstanceOfBehaviors: arrayObj branches: branches "Generate a branch if ReceiverResultReg is an instance of any of the classes in arrayObj, otherwise fall-through. Store the branch in branches and answer the number of branches generated." + <var: #branches type: #'AbstractInstruction **'> - self subclassResponsibility! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>branchIfInstanceOfBehavior:branches: (in category 'in-line cacheing') ----- branchIfInstanceOfBehavior: classObj branches: branches "Generate a branch if ReceiverResultReg is an instance of classObj, otherwise fall- through. Store the branch in branches and answer the number of branches generated." + <var: #branches type: #'AbstractInstruction **'> - <var: #branches type: #'AbstractInstruction *'> | jmpImmediate classIndex | <var: #jmpImmediate type: #'AbstractInstruction *'> classIndex := objectMemory classTagForClass: classObj. cogit MoveR: ReceiverResultReg R: TempReg. (objectMemory isImmediateClass: classObj) ifTrue: [classIndex = objectMemory smallIntegerTag ifTrue: [jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg]. classIndex = objectMemory characterTag ifTrue: [jmpImmediate := self genJumpCharacterInScratchReg: TempReg]. branches at: 0 put: jmpImmediate] ifFalse: [jmpImmediate := self genJumpImmediateInScratchReg: TempReg. self genGetClassIndexOfNonImm: ReceiverResultReg into: TempReg. self genCmpClassIndex: classIndex R: TempReg. branches at: 0 put: (cogit JumpZero: 0). jmpImmediate jmpTarget: cogit Label]. ^1! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>branchIfInstanceOfBehaviors:branches: (in category 'in-line cacheing') ----- branchIfInstanceOfBehaviors: arrayObj branches: branches "Generate a branch if ReceiverResultReg is an instance of any of the classes in arrayObj, otherwise fall-through. Store the branch in branches and answer the number of branches generated." + <var: #branches type: #'AbstractInstruction **'> - - <var: #branches type: #'AbstractInstruction *'> | allImmediate noneImmediate immediateMask numNonImmediates classObj jmpNoMatch jmpImmediate branchIndex classIndex | <var: #jmpNoMatch type: #'AbstractInstruction *'> <var: #jmpImmediate type: #'AbstractInstruction *'> branchIndex := 0. "let me tell you all about it, let me falsify" allImmediate := true. noneImmediate := true. immediateMask := 0. numNonImmediates := 0. 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: [:i| classObj := objectMemory fetchPointer: i ofObject: arrayObj. (objectMemory isImmediateClass: classObj) ifTrue: [noneImmediate := false. immediateMask := immediateMask + (objectMemory classTagForClass: classObj)] ifFalse: [allImmediate := false. numNonImmediates := numNonImmediates + 1]]. noneImmediate ifTrue: [cogit MoveR: ReceiverResultReg R: TempReg. jmpImmediate := self genJumpImmediateInScratchReg: TempReg. self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: [:i| classObj := objectMemory fetchPointer: i ofObject: arrayObj. self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg. branches at: branchIndex put: (cogit JumpZero: 0). branchIndex := branchIndex + 1]. jmpImmediate jmpTarget: cogit Label]. allImmediate ifTrue: [immediateMask = objectMemory tagMask ifTrue: [jmpImmediate := self genJumpImmediateInScratchReg: TempReg. branches at: branchIndex put: jmpImmediate. branchIndex := branchIndex + 1] ifFalse: [0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: [:i| cogit MoveR: ReceiverResultReg R: TempReg. classObj := objectMemory fetchPointer: i ofObject: arrayObj. classIndex := objectMemory classTagForClass: classObj. classIndex = objectMemory smallIntegerTag ifTrue: [jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg]. classIndex = objectMemory characterTag ifTrue: [jmpImmediate := self genJumpCharacterInScratchReg: TempReg]. branches at: branchIndex put: jmpImmediate. branchIndex := branchIndex + 1]]]. (allImmediate or: [noneImmediate]) ifFalse: [cogit MoveR: ReceiverResultReg R: TempReg. jmpImmediate := self genJumpImmediateInScratchReg: TempReg. self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: [:i| classObj := objectMemory fetchPointer: i ofObject: arrayObj. (objectMemory isImmediateClass: classObj) ifFalse: [self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg. branches at: branchIndex put: (cogit JumpZero: 0). branchIndex := branchIndex + 1]]. jmpNoMatch := cogit Jump: 0. jmpImmediate jmpTarget: cogit Label. 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: [:i| classObj := objectMemory fetchPointer: i ofObject: arrayObj. (objectMemory isImmediateClass: classObj) ifTrue: ["first time through TempReg already contains tag pattern, so no need to reload it." branchIndex > numNonImmediates ifTrue: [cogit MoveR: ReceiverResultReg R: TempReg]. classIndex := objectMemory classTagForClass: classObj. classIndex = objectMemory smallIntegerTag ifTrue: [jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg]. classIndex = objectMemory characterTag ifTrue: [jmpImmediate := self genJumpCharacterInScratchReg: TempReg]. branches at: branchIndex put: jmpImmediate. branchIndex := branchIndex + 1]]. jmpNoMatch jmpTarget: cogit Label]. self assert: branchIndex <= (objectMemory numSlotsOf: arrayObj). ^branchIndex! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>branchIfInstanceOfBehavior:branches: (in category 'sista support') ----- branchIfInstanceOfBehavior: classObj branches: branches "Generate a branch if ReceiverResultReg is an instance of classObj, otherwise fall- through. Store the branch in branches and answer the number of branches generated." + <var: #branches type: #'AbstractInstruction **'> - <var: #branches type: #'AbstractInstruction *'> | jmpImmediate compactClassIndex | <var: #jmpImmediate type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg. classObj = (objectMemory splObj: ClassSmallInteger) ifTrue: [branches at: 0 put: jmpImmediate. ^1]. (compactClassIndex := objectMemory compactClassIndexOfClass: classObj) ~= 0 ifTrue: [self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. cogit CmpCq: compactClassIndex R: TempReg] ifFalse: [self genGetClassObjectOfNonCompact: ReceiverResultReg into: TempReg. cogit annotate: (cogit CmpCw: classObj R: TempReg) objRef: classObj]. branches at: 0 put: (cogit JumpZero: 0). ^1! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>branchIfInstanceOfBehaviors:branches: (in category 'sista support') ----- branchIfInstanceOfBehaviors: arrayObj branches: branches "Generate a branch if ReceiverResultReg is an instance of any of the classes in arrayObj, otherwise fall-through. Store the branch in branches and answer the number of branches generated." + <var: #branches type: #'AbstractInstruction **'> - - <var: #branches type: #'AbstractInstruction *'> | anImmediate allCompact noneCompact classObj jmpImmediate jmpCompact branchIndex | <var: #jmpCompact type: #'AbstractInstruction *'> <var: #jmpImmediate type: #'AbstractInstruction *'> "let me tell you all about it, let me falsify" anImmediate := false. allCompact := true. noneCompact := true. 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: [:i| classObj := objectMemory fetchPointer: i ofObject: arrayObj. classObj = (objectMemory splObj: ClassSmallInteger) ifTrue: [anImmediate := true] ifFalse: [(objectMemory compactClassIndexOfClass: classObj) = 0 ifTrue: [allCompact := false] ifFalse: [noneCompact := false]]]. cogit MoveR: ReceiverResultReg R: TempReg. branchIndex := 0. jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg. self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. noneCompact ifTrue: [cogit CmpCq: 0 R: TempReg. jmpCompact := cogit JumpNonZero: 0] ifFalse: [0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: [:i| | compactClassIndex | classObj := objectMemory fetchPointer: i ofObject: arrayObj. (classObj ~= (objectMemory splObj: ClassSmallInteger) and: [(compactClassIndex := objectMemory compactClassIndexOfClass: classObj) ~= 0]) ifTrue: [cogit CmpCq: compactClassIndex R: TempReg. branches at: branchIndex put: (cogit JumpZero: 0). branchIndex := branchIndex + 1]]]. allCompact ifFalse: [self genGetClassObjectOfNonCompact: ReceiverResultReg into: TempReg. 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: [:i| classObj := objectMemory fetchPointer: i ofObject: arrayObj. (classObj ~= (objectMemory splObj: ClassSmallInteger) and: [(objectMemory compactClassIndexOfClass: classObj) = 0]) ifTrue: [cogit annotate: (cogit CmpCw: classObj R: TempReg) objRef: classObj. branches at: branchIndex put: (cogit JumpZero: 0). branchIndex := branchIndex + 1]]]. "Either succeed or fail on the immediate test." anImmediate ifTrue: [branches at: branchIndex put: jmpImmediate. branchIndex := branchIndex + 1] ifFalse: [jmpImmediate jmpTarget: cogit Label]. noneCompact ifTrue: [jmpCompact jmpTarget: cogit Label]. self assert: branchIndex = (objectMemory numSlotsOf: arrayObj). ^branchIndex! Item was changed: ----- Method: InterpreterPrimitives>>primitiveQuo (in category 'arithmetic integer primitives') ----- primitiveQuo "Rounds negative results towards zero." | integerRcvr integerArg integerResult | integerRcvr := self stackIntegerValue: 1. integerArg := self stackIntegerValue: 0. self success: integerArg ~= 0. + self successful ifTrue: + [integerResult := self quot: integerRcvr ient: integerArg]. - self successful ifTrue: [ - integerRcvr > 0 ifTrue: [ - integerArg > 0 ifTrue: [ - integerResult := integerRcvr // integerArg. - ] ifFalse: [ - integerResult := 0 - (integerRcvr // (0 - integerArg)). - ]. - ] ifFalse: [ - integerArg > 0 ifTrue: [ - integerResult := 0 - ((0 - integerRcvr) // integerArg). - ] ifFalse: [ - integerResult := (0 - integerRcvr) // (0 - integerArg). - ]. - ]]. self pop2AndPushIntegerIfOK: integerResult! Item was added: + ----- Method: InterpreterPrimitives>>quot:ient: (in category 'arithmetic integer primitives') ----- + quot: integerRcvr ient: integerArg + "See Number>>#quo:. Rounds results towards zero." + <inline: true> + ^integerRcvr > 0 + ifTrue: + [integerArg > 0 + ifTrue: [integerRcvr // integerArg] + ifFalse: [0 - (integerRcvr // (0 - integerArg))]] + ifFalse: + [integerArg > 0 + ifTrue: [0 - ((0 - integerRcvr) // integerArg)] + ifFalse: [(0 - integerRcvr) // (0 - integerArg)]]! Item was added: + ----- Method: SimpleStackBasedCogit>>genCallPrimitiveBytecode (in category 'bytecode generators') ----- + genCallPrimitiveBytecode + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution." + "This makes sense only for the optimizing JITs" + ^EncounteredUnknownBytecode! Item was changed: ----- Method: SimpleStackBasedCogit>>genExtTrapIfNotInstanceOfBehaviorsBytecode (in category 'bytecode generators') ----- genExtTrapIfNotInstanceOfBehaviorsBytecode "SistaV1: * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" + "This really only makes sense for the optimizing JITs" - "THis realy makes sense only for the optimizing JITs" ^EncounteredUnknownBytecode! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genExtTrapIfNotInstanceOfBehaviorsBytecode (in category 'bytecode generators') ----- genExtTrapIfNotInstanceOfBehaviorsBytecode "SistaV1: * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" | reg litIndex literal branches label numBranches | <var: #branches type: #'AbstractInstruction **'> reg := self ssStorePop: true toPreferredReg: ReceiverResultReg. reg ~= ReceiverResultReg ifTrue: [self MoveR: reg R: ReceiverResultReg]. optStatus isReceiverResultRegLive: false. litIndex := extA * 256 + byte1. extA := 0. literal := self getLiteral: litIndex. "Allow an extra branch for Spur, which may have two tag patterns for SmallInteger" numBranches := (objectMemory isArrayNonImm: literal) ifTrue: [(objectMemory numSlotsOf: literal) + 1] ifFalse: [2]. + branches := self alloca: numBranches type: (self cCode: [#'AbstractInstruction *'] inSmalltalk: [backEnd class]). - branches := self alloca: numBranches type: (self cCoerceSimple: CogAbstractInstruction to: #'AbstractInstruction *'). numBranches := (objectMemory isArrayNonImm: literal) ifTrue: [objectRepresentation branchIfInstanceOfBehaviors: literal branches: branches] ifFalse: [objectRepresentation branchIfInstanceOfBehavior: literal branches: branches]. "Only flush the stack if the class trap traps. Use ssFlushNoUpdateTo: so we continue compiling as if the stack had not been flushed. Control does not return after the ceClassTrapTrampoline call." self ssFlushNoUpdateTo: simStackPtr. self CallRT: ceClassTrapTrampoline. label := self Label. 0 to: numBranches - 1 do: [:i| (branches at: i) jmpTarget: label]. ^0! Item was changed: ----- Method: StackInterpreter>>inlinePrimitiveBytecode: (in category 'miscellaneous bytecodes') ----- (excessive size, no diff calculated)

1 0

VM Maker: VMMaker.oscog-eem.845.mcz
by commits＠source.squeak.org 07 Aug '14

07 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.845.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.845 Author: eem Time: 7 August 2014, 5:57:59.331 am UUID: d9eb7c70-0744-4da6-b629-1df02ca17337 Ancestors: VMMaker.oscog-eem.844 Cogits: Implement genExtTrapIfNotInstanceOfBehaviorsBytecode for 32 bit Spur. Eliminate classFloatCompactIndex and just use ClassFloatCompactIndex directly. Simulator: Move the facade's numSlotsOf: up. =============== Diff against VMMaker.oscog-eem.844 =============== Item was changed: CogClass subclass: #CogObjectRepresentation instanceVariableNames: 'cogit methodZone objectMemory coInterpreter ceStoreCheckTrampoline' classVariableNames: '' + poolDictionaries: 'CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMSqueakClassIndices VMStackFrameOffsets' - poolDictionaries: 'CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! !CogObjectRepresentation commentStamp: '<historical>' prior: 0! I am an abstract superclass for object representations whose job it is to generate abstract instructions for accessing objects. It is hoped that this level of indirection between the Cogit code generator and object access makes it easier to adapt the code generator to different garbage collectors, object representations and languages.! Item was added: + ----- Method: CogObjectRepresentation>>genCmpClassFloatCompactIndexR: (in category 'compile abstract instructions') ----- + genCmpClassFloatCompactIndexR: reg + ^cogit CmpCq: ClassFloatCompactIndex R: SendNumArgsReg.! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>branchIfInstanceOfBehavior:branches: (in category 'in-line cacheing') ----- + branchIfInstanceOfBehavior: classObj branches: branches + "Generate a branch if ReceiverResultReg is an instance of classObj, otherwise fall- + through. Store the branch in branches and answer the number of branches generated." + <var: #branches type: #'AbstractInstruction *'> + | jmpImmediate classIndex | + <var: #jmpImmediate type: #'AbstractInstruction *'> + classIndex := objectMemory classTagForClass: classObj. + cogit MoveR: ReceiverResultReg R: TempReg. + (objectMemory isImmediateClass: classObj) + ifTrue: + [classIndex = objectMemory smallIntegerTag ifTrue: + [jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg]. + classIndex = objectMemory characterTag ifTrue: + [jmpImmediate := self genJumpCharacterInScratchReg: TempReg]. + branches at: 0 put: jmpImmediate] + ifFalse: + [jmpImmediate := self genJumpImmediateInScratchReg: TempReg. + self genGetClassIndexOfNonImm: ReceiverResultReg into: TempReg. + self genCmpClassIndex: classIndex R: TempReg. + branches at: 0 put: (cogit JumpZero: 0). + jmpImmediate jmpTarget: cogit Label]. + ^1! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>branchIfInstanceOfBehaviors:branches: (in category 'in-line cacheing') ----- + branchIfInstanceOfBehaviors: arrayObj branches: branches + "Generate a branch if ReceiverResultReg is an instance of any of the classes in arrayObj, + otherwise fall-through. Store the branch in branches and answer the number of branches + generated." + + <var: #branches type: #'AbstractInstruction *'> + | allImmediate noneImmediate immediateMask numNonImmediates classObj jmpNoMatch jmpImmediate branchIndex classIndex | + <var: #jmpNoMatch type: #'AbstractInstruction *'> + <var: #jmpImmediate type: #'AbstractInstruction *'> + branchIndex := 0. + "let me tell you all about it, let me falsify" + allImmediate := true. noneImmediate := true. immediateMask := 0. numNonImmediates := 0. + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + (objectMemory isImmediateClass: classObj) + ifTrue: + [noneImmediate := false. + immediateMask := immediateMask + (objectMemory classTagForClass: classObj)] + ifFalse: + [allImmediate := false. + numNonImmediates := numNonImmediates + 1]]. + + noneImmediate ifTrue: + [cogit MoveR: ReceiverResultReg R: TempReg. + jmpImmediate := self genJumpImmediateInScratchReg: TempReg. + self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg. + branches at: branchIndex put: (cogit JumpZero: 0). + branchIndex := branchIndex + 1]. + jmpImmediate jmpTarget: cogit Label]. + + allImmediate ifTrue: + [immediateMask = objectMemory tagMask + ifTrue: + [jmpImmediate := self genJumpImmediateInScratchReg: TempReg. + branches at: branchIndex put: jmpImmediate. + branchIndex := branchIndex + 1] + ifFalse: + [0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + cogit MoveR: ReceiverResultReg R: TempReg. + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + classIndex := objectMemory classTagForClass: classObj. + classIndex = objectMemory smallIntegerTag ifTrue: + [jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg]. + classIndex = objectMemory characterTag ifTrue: + [jmpImmediate := self genJumpCharacterInScratchReg: TempReg]. + branches at: branchIndex put: jmpImmediate. + branchIndex := branchIndex + 1]]]. + + (allImmediate or: [noneImmediate]) ifFalse: + [cogit MoveR: ReceiverResultReg R: TempReg. + jmpImmediate := self genJumpImmediateInScratchReg: TempReg. + self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + (objectMemory isImmediateClass: classObj) ifFalse: + [self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg. + branches at: branchIndex put: (cogit JumpZero: 0). + branchIndex := branchIndex + 1]]. + jmpNoMatch := cogit Jump: 0. + jmpImmediate jmpTarget: cogit Label. + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + (objectMemory isImmediateClass: classObj) ifTrue: + ["first time through TempReg already contains tag pattern, so no need to reload it." + branchIndex > numNonImmediates ifTrue: + [cogit MoveR: ReceiverResultReg R: TempReg]. + classIndex := objectMemory classTagForClass: classObj. + classIndex = objectMemory smallIntegerTag ifTrue: + [jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg]. + classIndex = objectMemory characterTag ifTrue: + [jmpImmediate := self genJumpCharacterInScratchReg: TempReg]. + branches at: branchIndex put: jmpImmediate. + branchIndex := branchIndex + 1]]. + jmpNoMatch jmpTarget: cogit Label]. + + self assert: branchIndex <= (objectMemory numSlotsOf: arrayObj). + ^branchIndex! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genCmpClassIndex:R: (in category 'in-line cacheing') ----- + genCmpClassIndex: classIndex R: reg + "It is safe to use a short comparison for the known classes; these will not + change with become, etc... But it's probably not safe to assume the hash of + some other class won't change over time, so to be sure of generating the + same size code over time, use a long comparison for unknown classes." + classIndex < objectMemory classTablePageSize + ifTrue: [cogit CmpCq: classIndex R: TempReg] + ifFalse: [cogit CmpCw: classIndex R: TempReg].! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>inlineCacheTagForClass: (in category 'in-line cacheing') ----- inlineCacheTagForClass: classOop "Answer the relevant inline cache tag for a class. c.f. inlineCacheTagForInstance:" | hash | + hash := objectMemory classTagForClass: classOop. - hash := objectMemory ensureBehaviorHash: classOop. ^hash <= objectMemory tagMask ifTrue: [hash bitAnd: 1] ifFalse: [hash]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>inlineCacheTagForClass: (in category 'in-line cacheing') ----- inlineCacheTagForClass: classOop "Answer the relevant inline cache tag for a class. c.f. inlineCacheTagForInstance:" + ^objectMemory classTagForClass: classOop! - ^objectMemory ensureBehaviorHash: classOop! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genAllocFloatValue:into:scratchReg:scratchReg: (in category 'primitive generators') ----- genAllocFloatValue: dpreg into: resultReg scratchReg: scratch1 scratchReg: scratch2 <returnTypeC: #'AbstractInstruction *'> | allocSize newFloatHeader jumpFail | <var: #jumpFail type: #'AbstractInstruction *'> allocSize := objectMemory baseHeaderSize + (objectMemory sizeof: #double). newFloatHeader := objectMemory headerForSlots: (self sizeof: #double) / objectMemory wordSize format: objectMemory firstLongFormat + classIndex: ClassFloatCompactIndex. - classIndex: objectMemory classFloatCompactIndex. cogit MoveAw: objectMemory freeStartAddress R: resultReg. cogit LoadEffectiveAddressMw: allocSize r: resultReg R: scratch1. cogit CmpCq: objectMemory getScavengeThreshold R: scratch1. jumpFail := cogit JumpAboveOrEqual: 0. cogit MoveR: scratch1 Aw: objectMemory freeStartAddress. cogit MoveCq: newFloatHeader R: scratch2. objectMemory wordSize = objectMemory baseHeaderSize ifTrue: [cogit MoveR: scratch2 Mw: 0 r: resultReg] ifFalse: [self flag: #endianness. cogit MoveCq: newFloatHeader >> 32 R: scratch1. cogit MoveR: scratch2 Mw: 0 r: resultReg. cogit MoveR: scratch1 Mw: objectMemory wordSize r: resultReg]. cogit MoveRd: dpreg M64: objectMemory baseHeaderSize r: resultReg. ^jumpFail! Item was added: + ----- Method: CogObjectRepresentationForSpur>>genJumpCharacterInScratchReg: (in category 'compile abstract instructions') ----- + genJumpCharacterInScratchReg: reg + cogit AndCq: objectMemory tagMask R: reg. + cogit CmpCq: objectMemory characterTag R: reg. + ^cogit JumpZero: 0! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genAllocFloatValue:into:scratchReg:scratchReg: (in category 'compile abstract instructions') ----- genAllocFloatValue: dpreg into: resultReg scratchReg: scratch1 scratchReg: scratch2 <returnTypeC: #'AbstractInstruction *'> | allocSize newFloatHeaderSansHash jumpFail | <var: #jumpFail type: #'AbstractInstruction *'> allocSize := BaseHeaderSize + (objectMemory sizeof: #double). + newFloatHeaderSansHash := ((ClassFloatCompactIndex << objectMemory compactClassFieldLSB - newFloatHeaderSansHash := ((objectMemory classFloatCompactIndex << objectMemory compactClassFieldLSB bitOr: (objectMemory formatOfClass: objectMemory classFloat)) bitOr: allocSize) bitOr: HeaderTypeShort. cogit MoveAw: objectMemory freeStartAddress R: resultReg. cogit MoveR: resultReg R: scratch1. cogit AddCq: allocSize R: scratch1. cogit MoveAw: objectMemory scavengeThresholdAddress R: scratch2. cogit CmpR: scratch2 R: scratch1. jumpFail := cogit JumpAboveOrEqual: 0. cogit MoveR: resultReg R: scratch2. self flag: #newObjectHash. cogit AndCq: HashMaskUnshifted << BytesPerWord R: scratch2. cogit LogicalShiftLeftCq: HashBitsOffset - BytesPerWord R: scratch2. cogit OrCq: newFloatHeaderSansHash R: scratch2. cogit MoveR: scratch2 Mw: 0 r: resultReg. cogit MoveRd: dpreg M64: BaseHeaderSize r: resultReg. cogit MoveR: scratch1 Aw: objectMemory freeStartAddress. ^jumpFail! Item was removed: - ----- Method: CurrentImageCoInterpreterFacade>>classFloatCompactIndex (in category 'accessing') ----- - classFloatCompactIndex - ^objectMemory classFloatCompactIndex! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>numSlotsOf: (in category 'accessing') ----- + numSlotsOf: objOop + "Answer the number of slots in the given non-immediate object. + Does not adjust the size of contexts by stackPointer." + | obj elementSize wordSize | + obj := self objectForOop: objOop. + self deny: ([obj class isImmediateClass] + on: MessageNotUnderstood + do: [:ex| obj class == SmallInteger]). + wordSize := Smalltalk wordSize. + elementSize := + [obj class elementSize] + on: MessageNotUnderstood + do: [:ex| obj class isBytes ifTrue: [1] ifFalse: [wordSize]]. + wordSize = 4 ifTrue: + [^elementSize caseOf: { + [1] -> [obj basicSize + 3 // wordSize]. + [2] -> [obj basicSize * 2 + 3 // wordSize]. + [4] -> [obj basicSize + obj class instSize] }]. + ^elementSize caseOf: { + [1] -> [obj basicSize + (wordSize - 1) // wordSize]. + [2] -> [obj basicSize * 2 + (wordSize - 1) // wordSize]. + [4] -> [obj basicSize * 2 + (wordSize - 1) // wordSize]. + [8] -> [obj basicSize + obj class instSize] }! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>characterTag (in category 'accessing') ----- + characterTag + ^objectMemory characterTag! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>classTablePageSize (in category 'accessing') ----- + classTablePageSize + ^objectMemory classTablePageSize! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>classTagForClass: (in category 'accessing') ----- + classTagForClass: classOop + ^(self objectForOop: classOop) identityHash! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>isImmediateClass: (in category 'accessing') ----- + isImmediateClass: classOop + "Can't rely on the host image; may be running on SqueakV3. hence..." + ^#(Character SmallInteger SmallFloat) includes: (self objectForOop: classOop) name! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>smallIntegerTag (in category 'accessing') ----- + smallIntegerTag + ^objectMemory smallIntegerTag! Item was removed: - ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation>>numSlotsOf: (in category 'accessing') ----- - numSlotsOf: objOop - "Answer the number of slots in the given non-immediate object. - Does not adjust the size of contexts by stackPointer." - | obj elementSize wordSize | - obj := self objectForOop: objOop. - self deny: ([obj class isImmediateClass] - on: MessageNotUnderstood - do: [:ex| obj class == SmallInteger]). - wordSize := Smalltalk wordSize. - elementSize := - [obj class elementSize] - on: MessageNotUnderstood - do: [:ex| obj class isBytes ifTrue: [1] ifFalse: [wordSize]]. - wordSize = 4 ifTrue: - [^elementSize caseOf: { - [1] -> [obj basicSize + 3 // wordSize]. - [2] -> [obj basicSize * 2 + 3 // wordSize]. - [4] -> [obj basicSize + obj class instSize] }]. - ^elementSize caseOf: { - [1] -> [obj basicSize + (wordSize - 1) // wordSize]. - [2] -> [obj basicSize * 2 + (wordSize - 1) // wordSize]. - [4] -> [obj basicSize * 2 + (wordSize - 1) // wordSize]. - [8] -> [obj basicSize + obj class instSize] }! Item was removed: - ----- Method: NewObjectMemory>>classFloatCompactIndex (in category 'cog jit support') ----- - classFloatCompactIndex - <api> - ^ClassFloatCompactIndex! Item was changed: ----- Method: ObjectMemory>>instSpecOfClass: (in category 'object format') ----- instSpecOfClass: classPointer + "This field in a class's format inst var corresponds to the 4-bit format field stored in every object header" - "This is the same as the field stored in every object header" ^self formatOfHeader: (self formatOfClass: classPointer)! Item was changed: ----- Method: SimpleStackBasedCogit>>genDoubleArithmetic:preOpCheck: (in category 'primitive generators') ----- genDoubleArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil "Stack looks like receiver (also in ResultReceiverReg) arg return address" <var: #preOpCheckOrNil declareC: 'AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)'> | jumpFailClass jumpFailAlloc jumpFailCheck jumpImmediate jumpNonInt doOp fail | <var: #jumpFailClass type: #'AbstractInstruction *'> <var: #jumpFailAlloc type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpFailCheck type: #'AbstractInstruction *'> <var: #doOp type: #'AbstractInstruction *'> <var: #fail type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. self MoveR: TempReg R: ClassReg. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg. + objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. - self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFailClass := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. doOp := self Label. preOpCheckOrNil ifNotNil: [jumpFailCheck := self perform: preOpCheckOrNil with: DPFPReg0 with: DPFPReg1]. self gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0. jumpFailAlloc := objectRepresentation genAllocFloatValue: DPFPReg0 into: SendNumArgsReg scratchReg: ClassReg scratchReg: TempReg. self MoveR: SendNumArgsReg R: ReceiverResultReg. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. self ConvertR: ClassReg Rd: DPFPReg1. self Jump: doOp. jumpFailAlloc jmpTarget: self Label. self compileFallbackToInterpreterPrimitive. fail := self Label. jumpFailClass jmpTarget: fail. preOpCheckOrNil ifNotNil: [jumpFailCheck jmpTarget: fail]. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: fail]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genDoubleComparison:invert: (in category 'primitive generators') ----- genDoubleComparison: jumpOpcodeGenerator invert: invertComparison "Stack looks like receiver (also in ResultReceiverReg) arg return address" <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction *(*jumpOpcodeGenerator)(void *)'> | jumpFail jumpImmediate jumpNonInt jumpCond compare | <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> <var: #compare type: #'AbstractInstruction *'> <var: #jumpFail type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. self MoveR: TempReg R: ClassReg. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg. + objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. - self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. invertComparison "May need to invert for NaNs" ifTrue: [compare := self CmpRd: DPFPReg0 Rd: DPFPReg1] ifFalse: [compare := self CmpRd: DPFPReg1 Rd: DPFPReg0]. jumpCond := self perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: BytesPerWord * 2. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. self ConvertR: ClassReg Rd: DPFPReg1. self Jump: compare. jumpFail jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: jumpFail getJmpTarget]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator "Stack looks like receiver (also in ResultReceiverReg) arg return address" | jumpDouble jumpNonInt jumpFail jumpTrue jumpCond | <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> <var: #jumpDouble type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> <var: #jumpTrue type: #'AbstractInstruction *'> <var: #jumpFail type: #'AbstractInstruction *'> backEnd hasDoublePrecisionFloatingPointSupport ifFalse: [^self genSmallIntegerComparison: jumpOpcode]. self MoveMw: BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg R: ClassReg. jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self CmpR: ClassReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - ClassReg" jumpTrue := self gen: jumpOpcode. self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpTrue jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: BytesPerWord * 2. "Argument may be a Float : let us check or fail" jumpDouble jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [self MoveR: ClassReg R: TempReg. jumpNonInt := objectRepresentation genJumpImmediateInScratchReg: TempReg]. objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg. + objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. - self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. "It was a Float, so convert the receiver to double and perform the operation" self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genConvertSmallIntegerToIntegerInReg: TempReg. self ConvertR: TempReg Rd: DPFPReg0. objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. self CmpRd: DPFPReg1 Rd: DPFPReg0. jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: BytesPerWord * 2. objectRepresentation smallIntegerIsOnlyImmediateType ifTrue: [jumpFail jmpTarget: self Label] ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self Label)]. ^0! Item was added: + ----- Method: Spur32BitCoMemoryManager>>isImmediateClass: (in category 'cog jit support') ----- + isImmediateClass: classObj + <api> + ^(self instSpecOfClass: classObj) = self instSpecForImmediateClasses! Item was added: + ----- Method: Spur32BitCoMemoryManager>>smallIntegerTag (in category 'cog jit support') ----- + smallIntegerTag + "Beware, SmallInetger tags are 1 or 3. But SmallInteger's identityHash is 1." + <api> + ^1! Item was removed: - ----- Method: SpurMemoryManager>>classFloatCompactIndex (in category 'cog jit support') ----- - classFloatCompactIndex - <api> - ^ClassFloatCompactIndex! Item was changed: ----- Method: SpurMemoryManager>>classTablePageSize (in category 'class table') ----- classTablePageSize "1024 entries per page (2^10); 22 bit classIndex implies 2^12 pages" "self basicNew classTablePageSize" + <api> ^1 << self classTableMajorIndexShift! Item was changed: ----- Method: SpurMemoryManager>>classTagForClass: (in category 'interpreter access') ----- classTagForClass: classObj "Answer the classObj's identityHash to use as a tag in the first-level method lookup cache." + <api> self assert: (coInterpreter addressCouldBeClassObj: classObj). ^self ensureBehaviorHash: classObj! Item was changed: ----- Method: SpurMemoryManager>>ensureBehaviorHash: (in category 'class table') ----- ensureBehaviorHash: aBehavior | newHash err | - <api> <inline: true> self assert: (coInterpreter addressCouldBeClassObj: aBehavior). (newHash := self rawHashBitsOf: aBehavior) = 0 ifTrue: [(err := self enterIntoClassTable: aBehavior) ~= 0 ifTrue: [^err negated]. newHash := self rawHashBitsOf: aBehavior. self assert: (self classAtIndex: newHash) = aBehavior]. ^newHash! Item was changed: ----- Method: SpurMemoryManager>>instSpecOfClass: (in category 'object format') ----- instSpecOfClass: classPointer + "This field in a class's format inst var corresponds to the 5-bit format field stored in every object header" - "This is the same as the field stored in every object header" ^self instSpecOfClassFormat: (self formatOfClass: classPointer)! Item was changed: ----- Method: StackToRegisterMappingCogit>>genDoubleArithmetic:preOpCheck: (in category 'primitive generators') ----- genDoubleArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil "Receiver and arg in registers. Stack looks like return address" <var: #preOpCheckOrNil declareC: 'AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)'> | jumpFailClass jumpFailAlloc jumpFailCheck jumpImmediate jumpNonInt doOp | <var: #jumpFailClass type: #'AbstractInstruction *'> <var: #jumpFailAlloc type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpFailCheck type: #'AbstractInstruction *'> <var: #doOp type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. self MoveR: Arg0Reg R: ClassReg. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. - self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFailClass := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. doOp := self Label. preOpCheckOrNil ifNotNil: [jumpFailCheck := self perform: preOpCheckOrNil with: DPFPReg0 with: DPFPReg1]. self gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0. jumpFailAlloc := objectRepresentation genAllocFloatValue: DPFPReg0 into: SendNumArgsReg scratchReg: ClassReg scratchReg: TempReg. self MoveR: SendNumArgsReg R: ReceiverResultReg. self RetN: 0. "We need to push the register args on two paths; this one and the interpreter primitive path. But the interpreter primitive path won't unless regArgsHaveBeenPushed is false." self assert: methodOrBlockNumArgs <= self numRegArgs. jumpFailClass jmpTarget: self Label. preOpCheckOrNil ifNotNil: [jumpFailCheck jmpTarget: jumpFailClass getJmpTarget]. backEnd genPushRegisterArgsForNumArgs: methodOrBlockNumArgs. jumpFailClass := self Jump: 0. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. self ConvertR: ClassReg Rd: DPFPReg1. self Jump: doOp. jumpFailAlloc jmpTarget: self Label. self compileFallbackToInterpreterPrimitive. jumpFailClass jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: jumpFailClass getJmpTarget]. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genDoubleComparison:invert: (in category 'primitive generators') ----- genDoubleComparison: jumpOpcodeGenerator invert: invertComparison "Receiver and arg in registers. Stack looks like return address" <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction *(*jumpOpcodeGenerator)(void *)'> | jumpFail jumpImmediate jumpNonInt jumpCond compare | <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> <var: #compare type: #'AbstractInstruction *'> <var: #jumpFail type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. - self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. invertComparison "May need to invert for NaNs" ifTrue: [compare := self CmpRd: DPFPReg0 Rd: DPFPReg1] ifFalse: [compare := self CmpRd: DPFPReg1 Rd: DPFPReg0]. jumpCond := self perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self RetN: 0. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: 0. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. objectRepresentation genConvertSmallIntegerToIntegerInReg: Arg0Reg. self ConvertR: Arg0Reg Rd: DPFPReg1. self Jump: compare. jumpFail jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: jumpFail getJmpTarget]. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator "Stack looks like return address" | jumpDouble jumpNonInt jumpFail jumpTrue jumpCond | <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> <var: #jumpDouble type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> <var: #jumpTrue type: #'AbstractInstruction *'> <var: #jumpFail type: #'AbstractInstruction *'> backEnd hasDoublePrecisionFloatingPointSupport ifFalse: [^self genSmallIntegerComparison: jumpOpcode]. self MoveR: Arg0Reg R: TempReg. jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" jumpTrue := self gen: jumpOpcode. self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self RetN: 0. jumpTrue jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: 0. "Argument may be a Float : let us check or fail" jumpDouble jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [self MoveR: ClassReg R: TempReg. jumpNonInt := objectRepresentation genJumpImmediateInScratchReg: TempReg]. objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. - self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. "It was a Float, so convert the receiver to double and perform the operation" objectRepresentation genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. self ConvertR: ReceiverResultReg Rd: DPFPReg0. objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. self CmpRd: DPFPReg1 Rd: DPFPReg0. jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self RetN: 0. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: 0. objectRepresentation smallIntegerIsOnlyImmediateType ifTrue: [jumpFail jmpTarget: self Label] ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self Label)]. ^0!

1 0

New CogVMs available
by Eliot Miranda 07 Aug '14

07 Aug '14

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3060/. CogVM binaries as per VMMaker.oscog-eem.844/r3060 Fix bad bug in interpreter to machine code frame conversion on backward branch. Old code would decrement branch even if backward branch checked for events and did a process switch, potentially converting frames at arbitrary unmappable pcs, not just backward branches. Neaten and comment the code. Neaten and update the pc mapping tests for multiple bytecode sets and for sets with extensions. Change default count to 40 from 10 to reduce number of startup methods jitted. Allow warnings to be treated as errors, adding -blockonwarn flag on Mac & Unix. -- best, Eliot

1 0

[commit][3060] CogVM source as per VMMaker.oscog-eem.844
by commits＠squeakvm.org 07 Aug '14

07 Aug '14

Revision: 3060 Author: eliot Date: 2014-08-06 17:37:34 -0700 (Wed, 06 Aug 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.844 Fix bad bug in interpreter to machine code frame conversion on backward branch. Old code would decrement branch even if backward branch checked for events and did a process switch, potentially converting frames at arbitrary unmappable pcs, not just backward branches. Neaten and comment the code. Neaten and update the pc mapping tests for multiple bytecode sets and for sets with extensions. Change default count to 40 from 10 to reduce number of startup methods jitted. Nuke obsolete PRIM_TABLE code form the sqGnu.h's. Spur: Eliminate expensive asserts in Spur allObjects/alInstances unnecessary in MarkObjectsForEnumerationPrimitives false regime. Sista: Implement genExtTrapIfNotInstanceOfBehaviorsBytecode for SqueakV3. And fix it and the interpreter's version to pop the value from the stack. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/platforms/Mac OS/vm/Developer/sqGnu.h branches/Cog/platforms/unix/vm/sqGnu.h branches/Cog/platforms/win32/vm/sqGnu.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cogmethod.h 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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-08-07 00:37:34 UTC (rev 3060) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.844 uuid: 4ea8ab78-c8f6-4cf2-a165-23eb85dd66aa from - CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b + CoInterpreter VMMaker.oscog-eem.844 uuid: 4ea8ab78-c8f6-4cf2-a165-23eb85dd66aa */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.844 uuid: 4ea8ab78-c8f6-4cf2-a165-23eb85dd66aa " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -265,7 +265,7 @@ #define MFMethodMask -0x8 #define MFrameSlots 5 #define MillisecondClockMask 0x1FFFFFFF -#define MinBackwardJumpCountForCompile 10 +#define MinBackwardJumpCountForCompile 40 #define MixinIndex 3 #define MULTIPLEBYTECODESETS 1 #define MyListIndex 3 @@ -2083,8 +2083,8 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843"; -sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.844"; +sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4381,7 +4381,7 @@ ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { goto commonCallerReturn; - goto l295; + goto l297; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -4418,11 +4418,11 @@ theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << ShiftForWord)); if ((primitiveIndexOfMethodheader(theMethod, headerOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; - goto l297; + goto l299; } } unwindContextOrNilOrZero = ctxtOrNilOrZero; - l297: /* end internalFindUnwindThroughContext: */; + l299: /* end internalFindUnwindThroughContext: */; if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -4436,10 +4436,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l299; + goto l301; } ourContext = marryFrameSP(localFP, localSP); - l299: /* end ensureFrameIsMarried:SP: */; + l301: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -4448,7 +4448,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l295; + goto l297; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -4460,10 +4460,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l296; + goto l298; } ourContext1 = marryFrameSP(localFP, localSP); - l296: /* end ensureFrameIsMarried:SP: */; + l298: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -4474,7 +4474,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l295; + goto l297; } contextToReturnTo = null; if (((longAt((home + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { @@ -4533,10 +4533,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l298; + goto l300; } ourContext2 = marryFrameSP(localFP, localSP); - l298: /* end ensureFrameIsMarried:SP: */; + l300: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -4545,7 +4545,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l295; + goto l297; } } assert(pageListIsWellFormed()); @@ -4656,7 +4656,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l295; + goto l297; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4674,7 +4674,7 @@ /* return self */ } - l295: /* end case */; + l297: /* end case */; break; case 121: /* returnTrue */ @@ -4794,27 +4794,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l302; + goto l304; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l302; + goto l304; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l302: /* end findFrameAbove:inPage: */; + l304: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l303; + goto l305; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l303: /* end newStackPage */; + l305: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -4838,7 +4838,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << ShiftForWord)), contextToReturnFrom, 1); - goto l301; + goto l303; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -4877,7 +4877,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l301; + goto l303; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4895,8 +4895,8 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); /* return self */ - l301: /* end baseFrameReturn */; - goto l300; + l303: /* end baseFrameReturn */; + goto l302; } /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); @@ -4925,7 +4925,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l300; + goto l302; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4942,7 +4942,7 @@ longAtPointerput(localSP, localReturnValue); } - l300: /* end case */; + l302: /* end case */; break; case 126: /* dynamicSuperSendBytecode */ @@ -5234,7 +5234,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l307; + goto l309; } /* second probe */ @@ -5245,7 +5245,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l307; + goto l309; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -5253,10 +5253,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l307; + goto l309; } ok = 0; - l307: /* end inlineLookupInMethodCacheSel:classTag: */; + l309: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(0ifAppropriateCompileToNativeCodeselector); @@ -5297,7 +5297,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l304: /* end internalFindNewMethod */; + l306: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ VM_LABEL(0internalExecuteNewMethod); if (primitiveFunctionPointer != 0) { @@ -5311,31 +5311,31 @@ if (localPrimIndex >= 264) { longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << ShiftForWord))); 1; - goto l308; + goto l310; } if (localPrimIndex == 256) { 1; - goto l308; + goto l310; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l308; + goto l310; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l308; + goto l310; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l308; + goto l310; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l308: /* end internalQuickPrimitiveResponse */; - goto l306; + l310: /* end internalQuickPrimitiveResponse */; + goto l308; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -5393,7 +5393,7 @@ returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); null; - goto l306; + goto l308; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -5476,11 +5476,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); - goto l305; + goto l307; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l305: /* end getErrorObjectFromPrimFailCode */; + l307: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -5504,7 +5504,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l306: /* end internalExecuteNewMethod */; + l308: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6352,54 +6352,55 @@ localIP += offset; /* begin ifBackwardsCheckForEvents: */ VM_LABEL(0ifBackwardsCheckForEvents); - if (offset < 0) { - if (localSP < GIV(stackLimit)) { + if (offset >= 0) { + goto l12; + } + if (localSP < GIV(stackLimit)) { + /* begin externalizeIPandSP */ + assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); + GIV(instructionPointer) = oopForPointer(localIP); + GIV(stackPointer) = localSP; + GIV(framePointer) = localFP; + switched = checkForEventsMayContextSwitch(1); + returnToExecutivepostContextSwitch(1, switched); + browserPluginReturnIfNeeded(); + /* begin internalizeIPandSP */ + assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); + localIP = pointerForOop(GIV(instructionPointer)); + localSP = pointerForOop(GIV(stackPointer)); + localFP = pointerForOop(GIV(framePointer)); + if (switched) { + goto l12; + } + } + backwardJumpCountByte = byteAt(localFP + ((VMBIGENDIAN + ? (FoxIFrameFlags + BytesPerWord) - 1 + : FoxIFrameFlags))); + if (((backwardJumpCountByte -= 2)) == 1) { + if (methodWithHeaderShouldBeCogged(headerOf(GIV(method)))) { /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - switched = checkForEventsMayContextSwitch(1); - returnToExecutivepostContextSwitch(1, switched); - browserPluginReturnIfNeeded(); - /* begin internalizeIPandSP */ - assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); - localIP = pointerForOop(GIV(instructionPointer)); - localSP = pointerForOop(GIV(stackPointer)); - localFP = pointerForOop(GIV(framePointer)); + attemptToSwitchToMachineCode(((((oopForPointer(localIP)) - offset) - GIV(method)) - BaseHeaderSize) - 1); } - backwardJumpCountByte = byteAt(localFP + ((VMBIGENDIAN - ? (FoxIFrameFlags + BytesPerWord) - 1 - : FoxIFrameFlags))); - if (((backwardJumpCountByte -= 2)) <= 1) { - if (backwardJumpCountByte == -1) { + backwardJumpCountByte = 0x7F; + } + else { + if (backwardJumpCountByte == -1) { - /* initialize the count */ + /* initialize the count */ - assert(minBackwardJumpCountForCompile <= 128); - backwardJumpCountByte = ((minBackwardJumpCountForCompile - 1) << 1) + 1; - } - else { - if (methodWithHeaderShouldBeCogged(headerOf(GIV(method)))) { - /* begin externalizeFPandSP */ - assert((localSP < ((GIV(stackPage)->baseAddress))) - && (localSP > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - GIV(stackPointer) = localSP; - GIV(framePointer) = localFP; - attemptToSwitchToMachineCode(((((oopForPointer(localIP)) - offset) - GIV(method)) - BaseHeaderSize) - 1); - } - else { - - /* avoid asking for as long as possible */ - - backwardJumpCountByte = 0xFF; - } - } + assert(minBackwardJumpCountForCompile <= 128); + backwardJumpCountByte = ((minBackwardJumpCountForCompile - 1) << 1) + 1; } - byteAtput(localFP + ((VMBIGENDIAN + } + /* begin iframeBackwardBranchByte:put: */ + byteAtput(localFP + ((VMBIGENDIAN ? (FoxIFrameFlags + BytesPerWord) - 1 : FoxIFrameFlags)), backwardJumpCountByte); - } + l12: /* end ifBackwardsCheckForEvents: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6431,7 +6432,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorMustBeBoolean << ShiftForWord)); GIV(argumentCount) = 0; goto normalSend; - goto l12; + goto l13; } /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6439,7 +6440,7 @@ } /* begin internalPop: */ localSP += 1 * BytesPerOop; - l12: /* end jumplfTrueBy: */; + l13: /* end jumplfTrueBy: */; } break; case 172: @@ -6468,7 +6469,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorMustBeBoolean << ShiftForWord)); GIV(argumentCount) = 0; goto normalSend; - goto l13; + goto l14; } /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6476,7 +6477,7 @@ } /* begin internalPop: */ localSP += 1 * BytesPerOop; - l13: /* end jumplfFalseBy: */; + l14: /* end jumplfFalseBy: */; } break; case 176: @@ -6506,7 +6507,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l14; + goto l15; } } else { @@ -6521,77 +6522,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l18; + goto l19; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l17; + goto l18; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l21; + goto l22; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l21; + goto l22; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l21: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l17: /* end is:instanceOf:compactClassIndex: */; + l22: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l18: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l16; + goto l17; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l16: /* end floatValueOf: */; - l18: /* end loadFloatOrIntFrom: */; + l17: /* end floatValueOf: */; + l19: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l22; + goto l23; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l20; + goto l21; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l15; + goto l16; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l15; + goto l16; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l15: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l20: /* end is:instanceOf:compactClassIndex: */; + l16: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l21: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l19; + goto l20; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l19: /* end floatValueOf: */; - l22: /* end loadFloatOrIntFrom: */; + l20: /* end floatValueOf: */; + l23: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 + arg1)); @@ -6606,14 +6607,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l14; + goto l15; } } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((0 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l14: /* end case */; + l15: /* end case */; break; case 177: /* bytecodePrimSubtract */ @@ -6642,7 +6643,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l23; + goto l24; } } else { @@ -6657,77 +6658,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l27; + goto l28; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l26; + goto l27; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l30; + goto l31; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l30; + goto l31; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l30: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l26: /* end is:instanceOf:compactClassIndex: */; + l31: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l27: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l25; + goto l26; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l25: /* end floatValueOf: */; - l27: /* end loadFloatOrIntFrom: */; + l26: /* end floatValueOf: */; + l28: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l31; + goto l32; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l29; + goto l30; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l24; + goto l25; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l24; + goto l25; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l24: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l29: /* end is:instanceOf:compactClassIndex: */; + l25: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l30: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l28; + goto l29; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l28: /* end floatValueOf: */; - l31: /* end loadFloatOrIntFrom: */; + l29: /* end floatValueOf: */; + l32: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 - arg1)); @@ -6742,14 +6743,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l23; + goto l24; } } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((1 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l23: /* end case */; + l24: /* end case */; break; case 178: /* bytecodePrimLessThan */ @@ -6781,7 +6782,7 @@ else { goto booleanCheatFalse; } - goto l32; + goto l33; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -6789,77 +6790,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l36; + goto l37; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l35; + goto l36; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l39; + goto l40; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l39; + goto l40; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l39: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l35: /* end is:instanceOf:compactClassIndex: */; + l40: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l36: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l34; + goto l35; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l34: /* end floatValueOf: */; - l36: /* end loadFloatOrIntFrom: */; + l35: /* end floatValueOf: */; + l37: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l40; + goto l41; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l38; + goto l39; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l33; + goto l34; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l33; + goto l34; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l33: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l38: /* end is:instanceOf:compactClassIndex: */; + l34: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l39: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l37; + goto l38; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l37: /* end floatValueOf: */; - l40: /* end loadFloatOrIntFrom: */; + l38: /* end floatValueOf: */; + l41: /* end loadFloatOrIntFrom: */; aBool = rcvr1 < arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -6869,13 +6870,13 @@ else { goto booleanCheatFalse; } - goto l32; + goto l33; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((2 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l32: /* end case */; + l33: /* end case */; booleanCheatTrue: /* booleanCheatTrue */ @@ -6899,7 +6900,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l309; + goto l311; } if (bytecode == 172) { @@ -6909,7 +6910,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l309; + goto l311; } if (bytecode > 167) { @@ -6920,7 +6921,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l309; + goto l311; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -6928,7 +6929,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l309: /* end case */; + l311: /* end case */; break; case 179: /* bytecodePrimGreaterThan */ @@ -6960,7 +6961,7 @@ else { /* goto booleanCheatFalse */ } - goto l41; + goto l42; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -6968,77 +6969,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l45; + goto l46; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l44; + goto l45; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l48; + goto l49; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l48; + goto l49; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l48: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l44: /* end is:instanceOf:compactClassIndex: */; + l49: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l45: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l43; + goto l44; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l43: /* end floatValueOf: */; - l45: /* end loadFloatOrIntFrom: */; + l44: /* end floatValueOf: */; + l46: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l49; + goto l50; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l47; + goto l48; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l42; + goto l43; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l42; + goto l43; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l42: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l47: /* end is:instanceOf:compactClassIndex: */; + l43: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l48: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l46; + goto l47; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l46: /* end floatValueOf: */; - l49: /* end loadFloatOrIntFrom: */; + l47: /* end floatValueOf: */; + l50: /* end loadFloatOrIntFrom: */; aBool = rcvr1 > arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7048,13 +7049,13 @@ else { goto booleanCheatFalse; } - goto l41; + goto l42; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((3 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l41: /* end case */; + l42: /* end case */; booleanCheatFalse: /* booleanCheatFalse */ @@ -7078,7 +7079,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l310; + goto l312; } if (bytecode == 172) { @@ -7089,14 +7090,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l310; + goto l312; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l310: /* end case */; + l312: /* end case */; break; case 180: /* bytecodePrimLessOrEqual */ @@ -7128,7 +7129,7 @@ else { goto booleanCheatFalse; } - goto l50; + goto l51; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -7136,77 +7137,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l54; + goto l55; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l53; + goto l54; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l57; + goto l58; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l57; + goto l58; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l57: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l53: /* end is:instanceOf:compactClassIndex: */; + l58: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l54: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l52; + goto l53; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l52: /* end floatValueOf: */; - l54: /* end loadFloatOrIntFrom: */; + l53: /* end floatValueOf: */; + l55: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l58; + goto l59; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l56; + goto l57; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l51; + goto l52; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l51; + goto l52; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l51: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l56: /* end is:instanceOf:compactClassIndex: */; + l52: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l57: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l55; + goto l56; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l55: /* end floatValueOf: */; - l58: /* end loadFloatOrIntFrom: */; + l56: /* end floatValueOf: */; + l59: /* end loadFloatOrIntFrom: */; aBool = rcvr1 <= arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7216,13 +7217,13 @@ else { goto booleanCheatFalse; } - goto l50; + goto l51; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((4 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l50: /* end case */; + l51: /* end case */; break; case 181: /* bytecodePrimGreaterOrEqual */ @@ -7254,7 +7255,7 @@ else { goto booleanCheatFalse; } - goto l59; + goto l60; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -7262,77 +7263,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l63; + goto l64; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l62; + goto l63; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l66; + goto l67; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l66; + goto l67; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l66: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l62: /* end is:instanceOf:compactClassIndex: */; + l67: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l63: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l61; + goto l62; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l61: /* end floatValueOf: */; - l63: /* end loadFloatOrIntFrom: */; + l62: /* end floatValueOf: */; + l64: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l67; + goto l68; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l65; + goto l66; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l60; + goto l61; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l60; + goto l61; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l60: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l65: /* end is:instanceOf:compactClassIndex: */; + l61: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l66: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l64; + goto l65; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l64: /* end floatValueOf: */; - l67: /* end loadFloatOrIntFrom: */; + l65: /* end floatValueOf: */; + l68: /* end loadFloatOrIntFrom: */; aBool = rcvr1 >= arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7342,13 +7343,13 @@ else { goto booleanCheatFalse; } - goto l59; + goto l60; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((5 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l59: /* end case */; + l60: /* end case */; break; case 182: /* bytecodePrimEqual */ @@ -7376,7 +7377,7 @@ else { goto booleanCheatFalse; } - goto l68; + goto l69; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -7384,77 +7385,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l72; + goto l73; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l71; + goto l72; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l75; + goto l76; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l75; + goto l76; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l75: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l71: /* end is:instanceOf:compactClassIndex: */; + l76: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l72: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l70; + goto l71; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l70: /* end floatValueOf: */; - l72: /* end loadFloatOrIntFrom: */; + l71: /* end floatValueOf: */; + l73: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l76; + goto l77; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l74; + goto l75; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l69; + goto l70; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l69; + goto l70; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l69: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l74: /* end is:instanceOf:compactClassIndex: */; + l70: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l75: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l73; + goto l74; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l73: /* end floatValueOf: */; - l76: /* end loadFloatOrIntFrom: */; + l74: /* end floatValueOf: */; + l77: /* end loadFloatOrIntFrom: */; aBool = rcvr1 == arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7464,13 +7465,13 @@ else { goto booleanCheatFalse; } - goto l68; + goto l69; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((6 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l68: /* end case */; + l69: /* end case */; break; case 183: /* bytecodePrimNotEqual */ @@ -7498,7 +7499,7 @@ else { goto booleanCheatFalse; } - goto l77; + goto l78; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -7506,77 +7507,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l81; + goto l82; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l80; + goto l81; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l84; + goto l85; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l84; + goto l85; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l84: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l80: /* end is:instanceOf:compactClassIndex: */; + l85: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l81: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l79; + goto l80; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l79: /* end floatValueOf: */; - l81: /* end loadFloatOrIntFrom: */; + l80: /* end floatValueOf: */; + l82: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l85; + goto l86; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l83; + goto l84; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> (compactClassFieldLSB())) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l78; + goto l79; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l78; + goto l79; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l78: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l83: /* end is:instanceOf:compactClassIndex: */; + l79: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l84: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l82; + goto l83; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l82: /* end floatValueOf: */; - l85: /* end loadFloatOrIntFrom: */; + l83: /* end floatValueOf: */; + l86: /* end loadFloatOrIntFrom: */; aBool = rcvr1 == arg1; if (!GIV(primFailCode)) { /* begin booleanCheat: */ @@ -7586,13 +7587,13 @@ else { goto booleanCheatFalse; } - goto l77; + goto l78; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((7 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l77: /* end case */; + l78: /* end case */; break; case 184: /* bytecodePrimMultiply */ @@ -7625,7 +7626,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l86; + goto l87; } } else { @@ -7640,77 +7641,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l90; + goto l91; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l89; + goto l90; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.844.mcz
by commits＠source.squeak.org 07 Aug '14

07 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.844.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.844 Author: eem Time: 6 August 2014, 5:15:34.309 pm UUID: 4ea8ab78-c8f6-4cf2-a165-23eb85dd66aa Ancestors: VMMaker.oscog-eem.843 Fix bad bug in interpreter to machine code frame conversion on backward branch. Old code would decrement branch even if backward branch checked for events and did a process switch, potentially converting frames at arbitrary unmappable pcs, not just backward branches. Neaten and comment the code. Neaten and update the pc mapping tests for multiple bytecode sets and for sets with extensions. Change the default count to 40 from 10 to reduce the number of startup methods jitted. Implement genExtTrapIfNotInstanceOfBehaviorsBytecode for SqeakV3. And fix it and the interpreter's version to pop the value from the stack. Eliminate expensive asserts in Spur allObjects/alInstances unnecessary in MarkObjectsForEnumerationPrimitives false regime. Simulator: Make the DetailedInstructionPrinter multiple bytecode set aware. Fix bugs in the facades: don't rely on host image for compact class indices, answer more classes through splObj:, implement encoderClassForHeader:. Comment the facade and proxy classes; they are confusing. Nuke obsolete InterpreterForLongFormV3. =============== Diff against VMMaker.oscog-eem.843 =============== Item was changed: ----- Method: CoInterpreter class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants super initializeMiscConstants. COGVM := true. + MinBackwardJumpCountForCompile := 40. - MinBackwardJumpCountForCompile := 10. MaxNumArgs := 15. PrimCallNeedsNewMethod := 1. PrimCallNeedsPrimitiveFunction := 2. PrimCallMayCallBack := 4. PrimCallCollectsProfileSamples := 8. CheckAllocationFillerAfterPrimCall := 16. PrimCallDoNotJIT := 32. ReturnToInterpreter := 1. "setjmp/longjmp code." PrimTraceLogSize := 256. "Room for 256 selectors. Must be 256 because we use a byte to hold the index" TraceBufferSize := 256 * 3. "Room for 256 events" TraceContextSwitch := self objectMemoryClass basicNew integerObjectOf: 1. TraceBlockActivation := self objectMemoryClass basicNew integerObjectOf: 2. TraceBlockCreation := self objectMemoryClass basicNew integerObjectOf: 3. TraceIncrementalGC := self objectMemoryClass basicNew integerObjectOf: 4. TraceFullGC := self objectMemoryClass basicNew integerObjectOf: 5. TraceCodeCompaction := self objectMemoryClass basicNew integerObjectOf: 6. TraceOwnVM := self objectMemoryClass basicNew integerObjectOf: 7. TraceDisownVM := self objectMemoryClass basicNew integerObjectOf: 8. TraceThreadSwitch := self objectMemoryClass basicNew integerObjectOf: 9. TracePreemptDisowningThread := self objectMemoryClass basicNew integerObjectOf: 10. TraceVMCallback := self objectMemoryClass basicNew integerObjectOf: 11. TraceVMCallbackReturn := self objectMemoryClass basicNew integerObjectOf: 12. TraceStackOverflow := self objectMemoryClass basicNew integerObjectOf: 13. TraceIsFromMachineCode := 1. TraceIsFromInterpreter := 2. CSCallbackEnter := 3. CSCallbackLeave := 4. CSEnterCriticalSection := 5. CSExitCriticalSection := 6. CSResume := 7. CSSignal := 8. CSSuspend := 9. CSWait := 10. CSYield := 11. CSCheckEvents := 12. CSThreadSchedulingLoop := 13. CSOwnVM := 14. CSThreadBind := 15. CSSwitchIfNeccessary := 16. TraceSources := CArrayAccessor on: #('?' 'm' 'i' 'callbackEnter' 'callbackLeave' 'enterCritical' 'exitCritical' 'resume' 'signal' 'suspend' 'wait' 'yield' 'eventcheck' 'threadsched' 'ownVM' 'bindToThread' 'switchIfNecessary'). "this is simulation only" RumpCStackSize := 4096! Item was changed: ----- Method: CoInterpreter>>attemptToSwitchToMachineCode: (in category 'jump bytecodes') ----- attemptToSwitchToMachineCode: bcpc + "Attempt to convert the current interpreted activation into a machine code + activation, and if this is popssible, jump into machine code. bcpc is the + 0-relative pc of the backward branch bytecode (not any preceeding extension)." | cogMethod pc | <inline: false> <var: #cogMethod type: #'CogMethod *'> (self methodHasCogMethod: method) ifFalse: [cogit cog: method selector: objectMemory nilObject]. (self methodHasCogMethod: method) ifTrue: [cogMethod := self cogMethodOf: method. pc := self convertToMachineCodeFrame: cogMethod bcpc: bcpc. self assertValidMachineCodeFrame: pc. self push: pc. self push: objectMemory nilObject. cogit ceEnterCogCodePopReceiverReg]! Item was changed: ----- Method: CoInterpreter>>convertToMachineCodeFrame:bcpc: (in category 'frame access') ----- convertToMachineCodeFrame: cogHomeMethod bcpc: bcpc <var: #cogHomeMethod type: #'CogHomeMethod *'> <returnTypeC: #usqInt> "Convert the current interpreter frame into a machine code frame and answer the machine code pc matching bcpc." | startBcpc methodField closure cogMethod pc | <var: #cogMethod type: #'CogBlockMethod *'> <var: #p type: #'char *'> self assert: (self isMachineCodeFrame: framePointer) not. "Update the return pc, perhaps saving it in the caller's iframeSavedIP." (self isBaseFrame: framePointer) ifTrue: [stackPages longAt: framePointer + FoxCallerSavedIP put: cogit ceBaseFrameReturnPC] ifFalse: [(self isMachineCodeFrame: (self frameCallerFP: framePointer)) ifFalse: [self iframeSavedIP: (self frameCallerFP: framePointer) put: (self frameCallerSavedIP: framePointer) asInteger. stackPages longAt: framePointer + FoxCallerSavedIP put: cogit ceReturnToInterpreterPC]]. + "Compute the cog method field" - "Set the cog method field" (self iframeIsBlockActivation: framePointer) ifTrue: [closure := self pushedReceiverOrClosureOfFrame: framePointer. startBcpc := self startPCOfClosure: closure. cogMethod := cogit findMethodForStartBcpc: startBcpc inHomeMethod: cogHomeMethod. methodField := cogMethod asInteger + MFMethodFlagIsBlockFlag] ifFalse: [startBcpc := self startPCOfMethodHeader: cogHomeMethod methodHeader. cogMethod := self cCoerceSimple: cogHomeMethod to: #'CogBlockMethod *'. methodField := cogHomeMethod asInteger]. + "compute the pc before converting the frame to help with debugging." + pc := cogit mcPCForBackwardBranch: bcpc startBcpc: startBcpc in: cogMethod. + self assert: pc > (cogMethod asUnsignedInteger + cogit noCheckEntryOffset). + self assert: bcpc = (self bytecodePCFor: pc startBcpc: startBcpc in: cogMethod). + "now convert to a machine code frame" stackPages longAt: framePointer + FoxMethod put: methodField + ((self iframeHasContext: framePointer) ifTrue: [MFMethodFlagHasContextFlag] ifFalse: [0]). framePointer + FoxIFReceiver to: stackPointer by: BytesPerWord negated do: [:p| stackPages longAt: p + FoxMFReceiver - FoxIFReceiver put: (stackPages longAt: p)]. stackPointer := stackPointer + FoxMFReceiver - FoxIFReceiver. - pc := cogit mcPCForBackwardBranch: bcpc startBcpc: startBcpc in: cogMethod. - self assert: pc > (cogMethod asUnsignedInteger + cogit noCheckEntryOffset). ^pc! Item was changed: ----- Method: CoInterpreter>>ifBackwardsCheckForEvents: (in category 'jump bytecodes') ----- ifBackwardsCheckForEvents: offset "Backward jump means we're in a loop. - check for possible interrupts. - check for long-running loops and JIT if appropriate." | switched backwardJumpCountByte | <inline: true> + offset >= 0 ifTrue: + [^self]. + + localSP < stackLimit ifTrue: + [self externalizeIPandSP. + switched := self checkForEventsMayContextSwitch: true. + self returnToExecutive: true postContextSwitch: switched. + self browserPluginReturnIfNeeded. + self internalizeIPandSP. + switched ifTrue: + [^self]]. + + "We use the least significant byte of the flags word (which is marked as an immediate) and + subtract two each time to avoid disturbing the least significant tag bit. Since the byte is + initialized to 1 (on frame build), on first decrement it will become -1. Trip when it reaches 1 again." + backwardJumpCountByte := self iframeBackwardBranchByte: localFP. + (backwardJumpCountByte := backwardJumpCountByte - 2) = 1 + ifTrue: + [(self methodWithHeaderShouldBeCogged: (self headerOf: method)) ifTrue: + [self externalizeIPandSP. + self attemptToSwitchToMachineCode: (self oopForPointer: localIP) - offset - method - BaseHeaderSize - 1 + "If attemptToSwitchToMachineCode: returns the method could not be cogged, hence..."]. + "can't cog method; avoid asking to cog it again for the longest possible time." + backwardJumpCountByte := 16r7F] + ifFalse: + [backwardJumpCountByte = -1 ifTrue: "initialize the count" + [self assert: minBackwardJumpCountForCompile <= 128. + backwardJumpCountByte := minBackwardJumpCountForCompile - 1 << 1 + 1]]. + self iframeBackwardBranchByte: localFP put: backwardJumpCountByte! - offset < 0 ifTrue: - [localSP < stackLimit ifTrue: - [self externalizeIPandSP. - switched := self checkForEventsMayContextSwitch: true. - self returnToExecutive: true postContextSwitch: switched. - self browserPluginReturnIfNeeded. - self internalizeIPandSP]. - "We use the least significant byte of the flags word (which is marked as an immediate) and subtract two each time - to avoid disturbing the least significant tag bit. Since the byte is initialized to 1 (on frame build), on first decrement - it will become -1. We trip when it becomes 1 again." - backwardJumpCountByte := stackPages byteAt: localFP + (VMBIGENDIAN ifTrue: [FoxIFrameFlags + BytesPerWord - 1] ifFalse: [FoxIFrameFlags]). - (backwardJumpCountByte := backwardJumpCountByte - 2) <= 1 ifTrue: - [backwardJumpCountByte = -1 - ifTrue: "initialize the count" - [self assert: minBackwardJumpCountForCompile <= 128. - backwardJumpCountByte := minBackwardJumpCountForCompile - 1 << 1 + 1] - ifFalse: - [(self methodWithHeaderShouldBeCogged: (self headerOf: method)) - ifTrue: - [self externalizeFPandSP. - self attemptToSwitchToMachineCode: (self oopForPointer: localIP) - offset - method - BaseHeaderSize - 1] - ifFalse: "avoid asking for as long as possible" - [backwardJumpCountByte := 16rFF]]]. - stackPages - byteAt: localFP + (VMBIGENDIAN ifTrue: [FoxIFrameFlags + BytesPerWord - 1] ifFalse: [FoxIFrameFlags]) - put: backwardJumpCountByte]! Item was added: + ----- Method: CoInterpreter>>iframeBackwardBranchByte: (in category 'frame access') ----- + iframeBackwardBranchByte: theFP + "See encodeFrameFieldHasContext:numArgs: and ifBackwardsCheckForEvents:" + <inline: true> + <var: #theFP type: #'char *'> + ^stackPages byteAt: theFP + (VMBIGENDIAN ifTrue: [FoxIFrameFlags + BytesPerWord - 1] ifFalse: [FoxIFrameFlags])! Item was added: + ----- Method: CoInterpreter>>iframeBackwardBranchByte:put: (in category 'frame access') ----- + iframeBackwardBranchByte: theFP put: aByte + "See encodeFrameFieldHasContext:numArgs: and ifBackwardsCheckForEvents:" + <inline: true> + <var: #theFP type: #'char *'> + stackPages + byteAt: theFP + (VMBIGENDIAN ifTrue: [FoxIFrameFlags + BytesPerWord - 1] ifFalse: [FoxIFrameFlags]) + put: aByte! Item was added: + ----- Method: CogObjectRepresentation>>branchIfInstanceOfBehavior:branches: (in category 'sista support') ----- + branchIfInstanceOfBehavior: classObj branches: branches + "Generate a branch if ReceiverResultReg is an instance of classObj, otherwise fall- + through. Store the branch in branches and answer the number of branches generated." + self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>branchIfInstanceOfBehaviors:branches: (in category 'sista support') ----- + branchIfInstanceOfBehaviors: arrayObj branches: branches + "Generate a branch if ReceiverResultReg is an instance of any of the classes in arrayObj, + otherwise fall-through. Store the branch in branches and answer the number of branches + generated." + + self subclassResponsibility! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>branchIfInstanceOfBehavior:branches: (in category 'sista support') ----- branchIfInstanceOfBehavior: classObj branches: branches + "Generate a branch if ReceiverResultReg is an instance of classObj, otherwise fall- + through. Store the branch in branches and answer the number of branches generated." <var: #branches type: #'AbstractInstruction *'> | jmpImmediate compactClassIndex | <var: #jmpImmediate type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg. classObj = (objectMemory splObj: ClassSmallInteger) ifTrue: [branches at: 0 put: jmpImmediate. + ^1]. - ^0]. (compactClassIndex := objectMemory compactClassIndexOfClass: classObj) ~= 0 ifTrue: [self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. cogit CmpCq: compactClassIndex R: TempReg] ifFalse: [self genGetClassObjectOfNonCompact: ReceiverResultReg into: TempReg. cogit annotate: (cogit CmpCw: classObj R: TempReg) objRef: classObj]. branches at: 0 put: (cogit JumpZero: 0). + ^1! - ^0! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>branchIfInstanceOfBehaviors:branches: (in category 'sista support') ----- + branchIfInstanceOfBehaviors: arrayObj branches: branches + "Generate a branch if ReceiverResultReg is an instance of any of the classes in arrayObj, + otherwise fall-through. Store the branch in branches and answer the number of branches + generated." + + <var: #branches type: #'AbstractInstruction *'> + | anImmediate allCompact noneCompact classObj jmpImmediate jmpCompact branchIndex | + <var: #jmpCompact type: #'AbstractInstruction *'> + <var: #jmpImmediate type: #'AbstractInstruction *'> + "let me tell you all about it, let me falsify" + anImmediate := false. allCompact := true. noneCompact := true. + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + classObj = (objectMemory splObj: ClassSmallInteger) + ifTrue: + [anImmediate := true] + ifFalse: + [(objectMemory compactClassIndexOfClass: classObj) = 0 + ifTrue: [allCompact := false] + ifFalse: [noneCompact := false]]]. + cogit MoveR: ReceiverResultReg R: TempReg. + branchIndex := 0. + jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg. + self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. + noneCompact + ifTrue: + [cogit CmpCq: 0 R: TempReg. + jmpCompact := cogit JumpNonZero: 0] + ifFalse: + [0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| | compactClassIndex | + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + (classObj ~= (objectMemory splObj: ClassSmallInteger) + and: [(compactClassIndex := objectMemory compactClassIndexOfClass: classObj) ~= 0]) ifTrue: + [cogit CmpCq: compactClassIndex R: TempReg. + branches at: branchIndex put: (cogit JumpZero: 0). + branchIndex := branchIndex + 1]]]. + allCompact ifFalse: + [self genGetClassObjectOfNonCompact: ReceiverResultReg into: TempReg. + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + (classObj ~= (objectMemory splObj: ClassSmallInteger) + and: [(objectMemory compactClassIndexOfClass: classObj) = 0]) ifTrue: + [cogit + annotate: (cogit CmpCw: classObj R: TempReg) + objRef: classObj. + branches at: branchIndex put: (cogit JumpZero: 0). + branchIndex := branchIndex + 1]]]. + "Either succeed or fail on the immediate test." + anImmediate + ifTrue: [branches at: branchIndex put: jmpImmediate. + branchIndex := branchIndex + 1] + ifFalse: [jmpImmediate jmpTarget: cogit Label]. + noneCompact ifTrue: + [jmpCompact jmpTarget: cogit Label]. + self assert: branchIndex = (objectMemory numSlotsOf: arrayObj). + ^branchIndex! Item was changed: ----- Method: CogVMSimulator>>convertToMachineCodeFrame:bcpc: (in category 'frame access') ----- convertToMachineCodeFrame: cogHomeMethod bcpc: bcpc + "bytecodeSetSelector ~= 0 ifTrue: ["self halt"]". - "(minBackwardJumpCountForCompile ~= MinBackwardJumpCountForCompile - and: [(self stringOf: (self penultimateLiteralOf: cogHomeMethod methodObject)) = #repeat]) ifTrue: - [self printExternalHeadFrame. - self print: bcpc; cr. - self halt]." ^super convertToMachineCodeFrame: cogHomeMethod bcpc: bcpc! Item was changed: ----- Method: Cogit class>>testPCMappingFor:options: (in category 'tests') ----- testPCMappingFor: aCompiledMethod options: optionsDictionaryOrArray | tuple | tuple := self cog: aCompiledMethod selector: aCompiledMethod selector options: optionsDictionaryOrArray. + tuple second testPCMappingForCompiledMethod: aCompiledMethod cogMethod: tuple last! - tuple second testPCMappingForMethod: tuple last! Item was changed: ----- Method: Cogit class>>testPCMappingSelect:options: (in category 'tests') ----- testPCMappingSelect: aBlock options: optionsDictionaryOrArray + "Test pc mapping both ways using a selection of the methods in the current image." - "Test pc mapping both ways using the methods in the current image" | cogit coInterpreter | self initializeWithOptions: (self asOptionsDictionary: optionsDictionaryOrArray). cogit := self new. coInterpreter := CurrentImageCoInterpreterFacade new cogit: cogit; yourself. [cogit setInterpreter: coInterpreter; singleStep: true; initializeCodeZoneFrom: 1024 upTo: coInterpreter memory size] on: Notification do: [:ex| (ex messageText beginsWith: 'cannot find receiver for') ifTrue: [ex resume: coInterpreter]]. SystemNavigation new allSelect: [:m| | cm | (m isQuick not and: [aBlock value: m]) ifTrue: [Transcript nextPut: $.; flush. [cm := cogit cog: (coInterpreter oopForObject: m) selector: (coInterpreter oopForObject: m selector). cm isNil and: [coInterpreter isCogCompiledCodeCompactionCalledFor]] whileTrue: [cogit methodZone clearCogCompiledCode. coInterpreter clearCogCompiledCodeCompactionCalledFor. coInterpreter initializeObjectMap]. + cogit testPCMappingForCompiledMethod: m cogMethod: cm]. - cogit testPCMappingForMethod: cm]. false]! Item was added: + ----- Method: Cogit>>bcpcsAndDescriptorsFor:bsOffset:do: (in category 'tests-method map') ----- + bcpcsAndDescriptorsFor: aMethod bsOffset: bsOffset do: quaternaryBlock + "Evaluate quaternaryBlock with the pc, byte, descriptor and numExtensions for + all the bytecodes in aMethod. Evaluate with byte, descriptor and numExtensions + nil for the initialPC of the mehtod and any blocks within it." + <doNotGenerate> + | nExts byte descriptor endpc latestContinuation pc primIdx | + ((primIdx := coInterpreter primitiveIndexOf: aMethod) > 0 + and: [coInterpreter isQuickPrimitiveIndex: primIdx]) ifTrue: + [^self]. + latestContinuation := pc := coInterpreter startPCOfMethod: aMethod. + quaternaryBlock value: pc value: nil value: nil value: 0. "stackCheck/entry pc" + nExts := 0. + endpc := objectMemory numBytesOf: aMethod. + [pc <= endpc] whileTrue: + [byte := objectMemory fetchByte: pc ofObject: aMethod. + descriptor := self generatorAt: byte + bsOffset. + descriptor isExtension ifFalse: + [quaternaryBlock value: pc value: byte value: descriptor value: nExts]. + (descriptor isReturn + and: [pc >= latestContinuation]) ifTrue: + [endpc := pc]. + (descriptor isBranch + or: [descriptor isBlockCreation]) ifTrue: + [| targetPC | + descriptor isBlockCreation ifTrue: + [quaternaryBlock value: pc + descriptor numBytes value: nil value: nil value: 0]. "stackCheck/entry pc" + targetPC := self latestContinuationPCFor: descriptor at: pc exts: nExts in: aMethod. + self assert: targetPC < endpc. + latestContinuation := latestContinuation max: targetPC]. + pc := pc + descriptor numBytes. + nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]! Item was removed: - ----- Method: Cogit>>bcpcsAndDescriptorsFor:do: (in category 'tests-method map') ----- - bcpcsAndDescriptorsFor: aMethod do: trinaryBlock - <doNotGenerate> - | bsOffset nExts byte descriptor endpc latestContinuation pc primIdx | - ((primIdx := coInterpreter primitiveIndexOf: aMethod) > 0 - and: [coInterpreter isQuickPrimitiveIndex: primIdx]) ifTrue: - [^self]. - latestContinuation := pc := coInterpreter startPCOfMethod: aMethod. - trinaryBlock value: pc value: nil value: nil. "stackCheck/entry pc" - bsOffset := self bytecodeSetOffsetFor: aMethod. - nExts := 0. - endpc := objectMemory numBytesOf: aMethod. - [pc <= endpc] whileTrue: - [byte := objectMemory fetchByte: pc ofObject: aMethod. - descriptor := self generatorAt: byte + bsOffset. - trinaryBlock value: pc value: byte value: descriptor. - (descriptor isReturn - and: [pc >= latestContinuation]) ifTrue: - [endpc := pc]. - (descriptor isBranch - or: [descriptor isBlockCreation]) ifTrue: - [| targetPC | - descriptor isBlockCreation ifTrue: - [trinaryBlock value: pc + descriptor numBytes value: nil value: nil]. "stackCheck/entry pc" - targetPC := self latestContinuationPCFor: descriptor at: pc exts: nExts in: aMethod. - self assert: targetPC < endpc. - latestContinuation := latestContinuation max: targetPC]. - pc := pc + descriptor numBytes. - nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]! Item was changed: ----- Method: Cogit>>cCoerceSimple:to: (in category 'translation support') ----- cCoerceSimple: value to: cTypeString <doNotGenerate> cTypeString == #'CogMethod *' ifTrue: [^(value isInteger and: [value < 0]) ifTrue: [value] "it's an error code; leave it be" ifFalse: [self cogMethodSurrogateAt: value asUnsignedInteger]]. cTypeString == #'CogBlockMethod *' ifTrue: [^self cogBlockMethodSurrogateAt: value asUnsignedInteger]. + (cTypeString == #'AbstractInstruction *' + and: [value isBehavior]) ifTrue: + [^processor abstractInstructionCompilerClass]. ^super cCoerceSimple: value to: cTypeString! Item was removed: - ----- Method: Cogit>>nExtensionsFor:in: (in category 'simulation only') ----- - nExtensionsFor: bcpc in: aMethodObj - (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifFalse: - [^0]. - ^(InstructionStream on: (VMCompiledMethodProxy new - for: aMethodObj - coInterpreter: coInterpreter - objectMemory: objectMemory)) - extensionsForBytecodeAt: bcpc + 1 - into: [:extAValue :extBValue| (extAValue ~= 0 ifTrue: [1] ifFalse: [0]) + (extBValue ~= 0 ifTrue: [1] ifFalse: [0])]! Item was added: + ----- Method: Cogit>>testBcToMcPcMappingForCompiledMethod:cogMethod: (in category 'tests-method map') ----- + testBcToMcPcMappingForCompiledMethod: aCompiledMethod cogMethod: cogMethod + <doNotGenerate> + "self disassembleMethod: cogMethod" + "self printPCMapPairsFor: cogMethod on: Transcript" + | aMethodObj currentSubMethod subMethods bsOffset | + aMethodObj := cogMethod methodObject. + subMethods := self subMethodsAsRangesFor: cogMethod. + currentSubMethod := subMethods first. + currentSubMethod endPC: (self endPCOf: aMethodObj). + bsOffset := self bytecodeSetOffsetFor: aMethodObj. + self bcpcsAndDescriptorsFor: aMethodObj bsOffset: bsOffset do: + [:bcpc :byte :desc :nExts| | subMethod | + (desc notNil and: [desc isBlockCreation]) ifTrue: + [subMethod := subMethods detect: [:sm| sm startpc = (bcpc + desc numBytes)]. + subMethod endPC: bcpc + desc numBytes + (self spanFor: desc at: bcpc exts: -1 in: aMethodObj) - 1]]. + subMethods allButFirst do: + [:blockSubMethod| | cogBlockMethod | + cogBlockMethod := self + findMethodForStartBcpc: blockSubMethod startpc + inHomeMethod: cogMethod. + self assert: cogBlockMethod address = (blockSubMethod first - (self sizeof: CogBlockMethod))]. + self bcpcsAndDescriptorsFor: aMethodObj bsOffset: bsOffset do: + [:bcpc :byte :desc :nExts| | absMcpc mappedBcpc | + currentSubMethod := self innermostSubMethodFor: bcpc in: subMethods startingAt: 1. + (currentSubMethod cogMethod stackCheckOffset > 0 + and: [desc isNil or: [desc isMapped]]) ifTrue: + ["The first bytecode and backward branch bytecodes are mapped to their pc. + Other bytecodes map to their following pc." + absMcpc := (desc notNil + and: [desc isBranch + and: [self isBackwardBranch: desc at: bcpc exts: nExts in: aMethodObj]]) + ifTrue: "Backward branches have a special mapper" + [mappedBcpc := bcpc. + self + mcPCForBackwardBranch: mappedBcpc + startBcpc: currentSubMethod startpc + in: currentSubMethod cogMethod] + ifFalse: "All others use the generic mapper" + [mappedBcpc := desc ifNil: [bcpc] ifNotNil: [bcpc + desc numBytes]. + self + mcPCFor: mappedBcpc + startBcpc: currentSubMethod startpc + in: currentSubMethod cogMethod]. + self assert: absMcpc > (currentSubMethod cogMethod asInteger + self noCheckEntryOffset). + self assert: (self + bytecodePCFor: absMcpc + startBcpc: currentSubMethod startpc + in: currentSubMethod cogMethod) = mappedBcpc]]! Item was removed: - ----- Method: Cogit>>testBcToMcPcMappingForMethod: (in category 'tests-method map') ----- - testBcToMcPcMappingForMethod: cogMethod - <doNotGenerate> - "self disassembleMethod: cogMethod" - "self printPCMapPairsFor: cogMethod on: Transcript" - | aMethodObj currentSubMethod subMethods | - aMethodObj := cogMethod methodObject. - subMethods := self subMethodsAsRangesFor: cogMethod. - currentSubMethod := subMethods first. - currentSubMethod endPC: (self endPCOf: aMethodObj). - self bcpcsAndDescriptorsFor: aMethodObj do: - [:bcpc :byte :desc| | subMethod | - (desc notNil and: [desc isBlockCreation]) ifTrue: - [subMethod := subMethods detect: [:sm| sm startpc = (bcpc + desc numBytes)]. - subMethod endPC: bcpc + desc numBytes + (self spanFor: desc at: bcpc exts: -1 in: aMethodObj) - 1]]. - subMethods allButFirst do: - [:blockSubMethod| | cogBlockMethod | - cogBlockMethod := self - findMethodForStartBcpc: blockSubMethod startpc - inHomeMethod: cogMethod. - self assert: cogBlockMethod address = (blockSubMethod first - (self sizeof: CogBlockMethod))]. - self bcpcsAndDescriptorsFor: aMethodObj do: - [:bcpc :byte :desc| | absMcpc mappedBcpc | - currentSubMethod := self innermostSubMethodFor: bcpc in: subMethods startingAt: 1. - (currentSubMethod cogMethod stackCheckOffset > 0 - and: [desc isNil or: [desc isMapped]]) ifTrue: - ["The first bytecode and backward branch bytecodes are mapped to their pc. - Other bytecodes map to their following pc." - mappedBcpc := (desc isNil - or: [desc isBranch - and: [(self isBackwardBranch: desc at: bcpc exts: (self nExtensionsFor: bcpc in: aMethodObj) in: aMethodObj)]]) - ifTrue: [bcpc] - ifFalse: [bcpc + desc numBytes]. - absMcpc := self - mcPCFor: mappedBcpc - startBcpc: currentSubMethod startpc - in: currentSubMethod cogMethod. - self assert: absMcpc > (currentSubMethod cogMethod asInteger + self noCheckEntryOffset). - self assert: (self - bytecodePCFor: absMcpc - startBcpc: currentSubMethod startpc - in: currentSubMethod cogMethod) = mappedBcpc]]! Item was added: + ----- Method: Cogit>>testMcToBcPcMappingForCompiledMethod:cogMethod: (in category 'tests-method map') ----- + testMcToBcPcMappingForCompiledMethod: aCompiledMethod cogMethod: cogMethod + <doNotGenerate> + | bcMethod subMethods prevMcpc isAltInstSet | + "self disassembleMethod: cogMethod" + "coInterpreter symbolicMethod: cogMethod methodObject" + "coInterpreter printOop: cogMethod methodObject" + "self printPCMapPairsFor: cogMethod on: Transcript" + cogMethod stackCheckOffset = 0 ifTrue: "frameless" + [^self]. + bcMethod := coInterpreter isCurrentImageFacade + ifTrue: [coInterpreter objectForOop: cogMethod methodObject] + ifFalse: [VMCompiledMethodProxy new + for: cogMethod methodObject + coInterpreter: coInterpreter + objectMemory: objectMemory]. + subMethods := self subMethodsAsRangesFor: cogMethod. + isAltInstSet := coInterpreter headerIndicatesAlternateBytecodeSet: cogMethod methodHeader. + self mapFor: cogMethod do: + [:annotation :mcpc| | subMethod bcpc mappedpc | + (self isPCMappedAnnotation: annotation alternateInstructionSet: isAltInstSet) ifTrue: + [subMethod := subMethods + detect: [:range| range includes: mcpc] + ifNone: ["a trailing call ceNonLocalReturnTrampoline's following + pc is the start of a following block or the end of the map" + subMethods detect: [:range| range includes: mcpc - 1]]. + mcpc > subMethod first ifTrue: + [bcpc := self + bytecodePCFor: mcpc + startBcpc: subMethod startpc + in: subMethod cogMethod. + self assert: bcpc ~= 0. + mappedpc := self mcPCFor: bcpc startBcpc: subMethod startpc in: subMethod cogMethod. + self assert: mappedpc > (subMethod cogMethod address + self noCheckEntryOffset). + "mcpc = mappedpc is obviously what we want and expect. prevMcpc = mappedpc hacks + around frame building accessors where the first bytecode is mapped twice, once for the + stack check and once for the context inst var access. The bytecode pc can only map + back to a single mcpc, the first, so the second map entry will fail without this hack." + self assert: (mcpc = mappedpc or: [prevMcpc = mappedpc]). + (self isSendAnnotation: annotation) ifTrue: + [| mcSelector bcSelector | + mcSelector := self selectorForSendAt: mcpc annotation: annotation. + "sends map to the following pc. need to find the selector for the previous pc" + bcSelector := self selectorForSendBefore: bcpc in: bcMethod. + self assert: mcSelector = bcSelector]]. + prevMcpc := mcpc]. + false "keep scanning"]! Item was removed: - ----- Method: Cogit>>testMcToBcPcMappingForMethod: (in category 'tests-method map') ----- - testMcToBcPcMappingForMethod: cogMethod - <doNotGenerate> - | bcMethod subMethods prevMcpc isAltInstSet | - "self disassembleMethod: cogMethod" - "coInterpreter symbolicMethod: cogMethod methodObject" - "coInterpreter printOop: cogMethod methodObject" - "self printPCMapPairsFor: cogMethod on: Transcript" - cogMethod stackCheckOffset = 0 ifTrue: "frameless" - [^self]. - bcMethod := coInterpreter isCurrentImageFacade - ifTrue: [coInterpreter objectForOop: cogMethod methodObject] - ifFalse: [VMCompiledMethodProxy new - for: cogMethod methodObject - coInterpreter: coInterpreter - objectMemory: objectMemory]. - subMethods := self subMethodsAsRangesFor: cogMethod. - isAltInstSet := coInterpreter headerIndicatesAlternateBytecodeSet: cogMethod methodHeader. - self mapFor: cogMethod do: - [:annotation :mcpc| | subMethod bcpc mappedpc | - (self isPCMappedAnnotation: annotation alternateInstructionSet: isAltInstSet) ifTrue: - [subMethod := subMethods - detect: [:range| range includes: mcpc] - ifNone: ["a trailing call ceNonLocalReturnTrampoline's following - pc is the start of a following block or the end of the map" - subMethods detect: [:range| range includes: mcpc - 1]]. - mcpc > subMethod first ifTrue: - [bcpc := self - bytecodePCFor: mcpc - startBcpc: subMethod startpc - in: subMethod cogMethod. - self assert: bcpc ~= 0. - mappedpc := self mcPCFor: bcpc startBcpc: subMethod startpc in: subMethod cogMethod. - self assert: mappedpc > (subMethod cogMethod address + self noCheckEntryOffset). - "mcpc = mappedpc is obviously what we want and expect. PrevMcpc = mappedpc hacks - around frame building accessors where the first bytecode is mapped twice, once for the - stack check and once for the context inst var access. The bytecode pc can only map - back to a single mcpc, the first, so the second map entry will fail without this hack." - self assert: (mcpc = mappedpc or: [prevMcpc = mappedpc]). - "IsNSSendCall is used only for pushImplicitReceiver:. This isn't a send bytecode. - So filter-out these annotations." - ((self isSendAnnotation: annotation) and: [annotation ~= IsNSSendCall]) ifTrue: - [| mcSelector bcSelector | - mcSelector := self selectorForSendAt: mcpc annotation: annotation. - "sends map to the following pc. need to find the selector for the previous pc" - bcSelector := self selectorForSendBefore: bcpc in: bcMethod. - self assert: mcSelector = bcSelector]]. - prevMcpc := mcpc]. - false "keep scanning"]! Item was added: + ----- Method: Cogit>>testPCMappingForCompiledMethod:cogMethod: (in category 'tests-method map') ----- + testPCMappingForCompiledMethod: aCompiledMethod cogMethod: cm + <doNotGenerate> + methodObj := nil. + self + testMcToBcPcMappingForCompiledMethod: aCompiledMethod cogMethod: cm; + testBcToMcPcMappingForCompiledMethod: aCompiledMethod cogMethod: cm! Item was removed: - ----- Method: Cogit>>testPCMappingForMethod: (in category 'tests-method map') ----- - testPCMappingForMethod: cm - <doNotGenerate> - methodObj := nil. - self - testMcToBcPcMappingForMethod: cm; - testBcToMcPcMappingForMethod: cm! Item was changed: CogClass subclass: #CurrentImageCoInterpreterFacade instanceVariableNames: 'memory cogit coInterpreter objectMemory objectMap headerToMethodMap cachedObject cachedOop variables' classVariableNames: '' poolDictionaries: 'VMBasicConstants VMObjectIndices' category: 'VMMaker-Support'! + + !CurrentImageCoInterpreterFacade commentStamp: 'eem 8/6/2014 14:59' prior: 0! + A CurrentImageCoInterpreterFacade is a stand-in for an object memory (ObjectMemory, SpurMemoryManager, etc) that allows the Cogits to access image objects as if they were in the simulator VM's heap. hence it allows the Cogits to generate code for methdos in the current image, for testing, etc. + + Instance Variables + cachedObject: <Object> + cachedOop: <Integer> + coInterpreter: <CoInterpreter> + cogit: <Cogit> + headerToMethodMap: <Dictionary> + memory: <ByteArray> + objectMap: <IdentityDictionary> + objectMemory: <NewObjectMemory|SpurMemoryManager> + variables: <Dictionary> + + cachedObject + - the object matching cachedOop, to speed-up oop to obejct mapping + + cachedOop + - the last used oop + + coInterpreter + - the CoInterpreter simulator used by the cogit. + + cogit + - the code egnerator in use + + headerToMethodMap + - a map from header to CompiledMethod + + memory + - a rump memory for holding various interpreter variables (e.g. stackLimit) that are accessed as memory locations by generated code + + objectMap + - map from objects to their oops + + objectMemory + - the object memory used to encode various values, answer queries, etc + + variables + - a map from the names of variables to their addresses in memory + ! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>encoderClassForHeader: (in category 'accessing') ----- + encoderClassForHeader: headerInteger + ^coInterpreter encoderClassForHeader: headerInteger! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>fetchPointer:ofObject: (in category 'accessing') ----- fetchPointer: index ofObject: anOop | obj | obj := (objectMap keyAtValue: anOop). + ^self oopForObject: (obj isCompiledMethod + ifTrue: [obj objectAt: index + 1] + ifFalse: [obj instVarAt: index + 1])! - ^obj isCompiledMethod - ifTrue: [obj objectAt: index + 1] - ifFalse: [obj instVarAt: index + 1]! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>splObj: (in category 'accessing') ----- splObj: splObjIndex ^splObjIndex caseOf: { + [ClassArray] -> [self oopForObject: Array]. + [ClassCharacter] -> [self oopForObject: Character]. + [ClassLargeNegativeInteger] -> [self oopForObject: LargeNegativeInteger]. + [ClassLargePositiveInteger] -> [self oopForObject: LargePositiveInteger]. + [ClassSmallInteger] -> [self oopForObject: SmallInteger]. + [CompactClasses] -> [self oopForObject: Smalltalk compactClassesArray] - [ClassArray] -> [self oopForObject: Array]. - [CompactClasses] -> [self oopForObject: Smalltalk compactClassesArray] }! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation>>compactClassIndexOfClass: (in category 'accessing') ----- + compactClassIndexOfClass: classOop + "Ugh, can't reply on the host. Spur doesn't have compact classes" + | aClass | + aClass := self objectForOop: classOop. + ^false + ifTrue: [aClass indexIfCompact] + ifFalse: + [aClass caseOf: { + [CompiledMethod] -> [1]. + [Array] -> [3]. + [LargeNegativeInteger] -> [4]. + [LargePositiveInteger] -> [5]. + [Float] -> [6]. + [Association] -> [8]. + [Point] -> [9]. + [Rectangle] -> [10]. + [ByteString] -> [11]. + [MethodContext] -> [14]. + [Bitmap] -> [16] + } + otherwise: [0]]! Item was changed: InstructionPrinter subclass: #DetailedInstructionPrinter + instanceVariableNames: 'stackHeightComputer encoderClass' - instanceVariableNames: 'stackHeightComputer' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Support'! Item was added: + ----- Method: DetailedInstructionPrinter>>encoderClass (in category 'accessing') ----- + encoderClass + + ^encoderClass! Item was added: + ----- Method: DetailedInstructionPrinter>>encoderClass: (in category 'accessing') ----- + encoderClass: anObject + + encoderClass := anObject! Item was added: + ----- Method: DetailedInstructionPrinter>>interpretNextInstructionFor: (in category 'decoding') ----- + interpretNextInstructionFor: client + ^encoderClass + ifNil: [super interpretNextInstructionFor: client] + ifNotNil: [encoderClass interpretNextInstructionFor: client in: self]! Item was added: + ----- Method: DetailedInstructionPrinter>>printInstructionsOn: (in category 'printing') ----- + printInstructionsOn: aStream + "Append to the stream, aStream, a description of each bytecode in the + instruction stream." + + | end | + encoderClass ifNil: + [^super printInstructionsOn: aStream]. + stackHeightComputer encoderClass: encoderClass. + stream := aStream. + scanner := InstructionStream on: method. + end := method endPC. + oldPC := scanner pc. + innerIndents := Array new: end withAll: 0. + [scanner pc <= end] whileTrue: + [encoderClass interpretNextInstructionFor: self in: scanner]! Item was removed: - Interpreter subclass: #InterpreterForLongFormV3 - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'VMMaker-Interpreter'! - - !InterpreterForLongFormV3 commentStamp: '<historical>' prior: 0! - I interpret only the long-form bytecodes, making room for lots of additional bytecodes. - - - - Misc notes: - I do not need to reimplement booleanCheat: to only check for long jumps since it only gets called by the inlined arithmetic primitives which I don't implement.! Item was removed: - ----- Method: InterpreterForLongFormV3 class>>initializeBytecodeTable (in category 'initialization') ----- - initializeBytecodeTable - "Interpreter initializeBytecodeTable" - "Note: This table will be used to generate a C switch statement." - - BytecodeTable := Array new: 256. - self table: BytecodeTable from: - #( - ( 0 111 unknownBytecode) - - (112 pushReceiverBytecode) - (113 pushConstantTrueBytecode) - (114 pushConstantFalseBytecode) - (115 pushConstantNilBytecode) - (116 pushConstantMinusOneBytecode) - (117 pushConstantZeroBytecode) - (118 pushConstantOneBytecode) - (119 pushConstantTwoBytecode) - (120 returnReceiver) - (121 returnTrue) - (122 returnFalse) - (123 returnNil) - (124 returnTopFromMethod) - (125 returnTopFromBlock) - - (126 127 unknownBytecode) - - (128 extendedPushBytecode) - (129 extendedStoreBytecode) - (130 extendedStoreAndPopBytecode) - (131 singleExtendedSendBytecode) - (132 doubleExtendedDoAnythingBytecode) - (133 singleExtendedSuperBytecode) - (134 secondExtendedSendBytecode) - (135 popStackBytecode) - (136 duplicateTopBytecode) - - (137 pushActiveContextBytecode) - (138 pushNewArrayBytecode) - (139 unknownBytecode) - (140 pushRemoteTempLongBytecode) - (141 storeRemoteTempLongBytecode) - (142 storeAndPopRemoteTempLongBytecode) - (143 pushClosureCopyCopiedValuesBytecode) - - (144 159 unknownBytecode) - - (160 167 longUnconditionalJump) - (168 171 longJumpIfTrue) - (172 175 longJumpIfFalse) - - "176-255 were send bytecodes" - (176 255 unknownBytecode) - ).! Item was removed: - ----- Method: InterpreterForLongFormV3 class>>sourceFileName (in category 'accessing') ----- - sourceFileName - "Answer the filename for the core interpreter" - - ^'interp-lfv3.c'! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genExtTrapIfNotInstanceOfBehaviorsBytecode (in category 'bytecode generators') ----- genExtTrapIfNotInstanceOfBehaviorsBytecode "SistaV1: * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" + | reg litIndex literal branches label numBranches | - | litIndex literal branches label numBranches | <var: #branches type: #'AbstractInstruction **'> + reg := self ssStorePop: true toPreferredReg: ReceiverResultReg. + reg ~= ReceiverResultReg ifTrue: + [self MoveR: reg R: ReceiverResultReg]. + optStatus isReceiverResultRegLive: false. - self ssStorePop: false toPreferredReg: ReceiverResultReg. litIndex := extA * 256 + byte1. extA := 0. literal := self getLiteral: litIndex. + "Allow an extra branch for Spur, which may have two tag patterns for SmallInteger" numBranches := (objectMemory isArrayNonImm: literal) + ifTrue: [(objectMemory numSlotsOf: literal) + 1] + ifFalse: [2]. - ifTrue: [objectMemory numSlotsOf: literal] - ifFalse: [1]. branches := self alloca: numBranches type: (self cCoerceSimple: CogAbstractInstruction to: #'AbstractInstruction *'). + numBranches := (objectMemory isArrayNonImm: literal) + ifTrue: [objectRepresentation branchIfInstanceOfBehaviors: literal branches: branches] + ifFalse: [objectRepresentation branchIfInstanceOfBehavior: literal branches: branches]. + "Only flush the stack if the class trap traps. Use ssFlushNoUpdateTo: so we continue compiling as if + the stack had not been flushed. Control does not return after the ceClassTrapTrampoline call." - (objectMemory isArrayNonImm: literal) - ifTrue: [objectRepresentation branchIfInstanceOfBehaviors: literal branches: branches] - ifFalse: [objectRepresentation branchIfInstanceOfBehavior: literal branches: branches]. - "Only flush teh stack if the class trap traps. Use ssFlushNoUpdateTo: so we continue compiling as if - the stack had not been fliushed. Control does not return after the ceClassTrapTrampoline call." self ssFlushNoUpdateTo: simStackPtr. self CallRT: ceClassTrapTrampoline. label := self Label. 0 to: numBranches - 1 do: [:i| (branches at: i) jmpTarget: label]. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>generateSistaRuntime (in category 'initialization') ----- generateSistaRuntime "Class trap sends class trap message to context with top of stack, so we on't need any arguments..." + ceClassTrapTrampoline := self genTrampolineFor: #ceClassTrap: + called: 'ceClassTrapTrampoline' + arg: ReceiverResultReg! - ceClassTrapTrampoline := self genTrampolineFor: #ceClassTrap - called: 'ceClassTrapTrampoline'! Item was changed: ----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') ----- allInstancesOf: aClass "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of instances as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | classIndex freeChunk ptr start limit count bytes | classIndex := self rawHashBitsOf: aClass. (classIndex = 0 or: [aClass ~~ (self classOrNilAtIndex: classIndex)]) ifTrue: [freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex. ^freeChunk]. MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (MarkObjectsForEnumerationPrimitives ifTrue: [self isMarked: obj] ifFalse: [true]) ifTrue: [(self isNormalObject: obj) ifTrue: [MarkObjectsForEnumerationPrimitives ifTrue: [self setIsMarkedOf: obj to: false]. (self classIndexOf: obj) = classIndex ifTrue: [count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerSlot]]] ifFalse: [MarkObjectsForEnumerationPrimitives ifTrue: [(self isSegmentBridge: obj) ifFalse: [self setIsMarkedOf: obj to: false]]]]]. - self assert: self allObjectsUnmarked. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives + ifTrue: + [self assert: self allObjectsUnmarked. + self emptyObjStack: weaklingStack] + ifFalse: + [self assert: (self isEmptyObjStack: weaklingStack)]. - ifTrue: [self emptyObjStack: weaklingStack] - ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeObject: freeChunk. ^self integerObjectOf: count]. count < self numSlotsMask ifTrue: [| smallObj | smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex. 0 to: count - 1 do: [:i| self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofFreeChunk: freeChunk)]. self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self beRootIfOld: smallObj. self checkFreeSpace. ^smallObj]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>allObjects (in category 'primitive support') ----- allObjects "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of objects as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | freeChunk ptr start limit count bytes | MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (MarkObjectsForEnumerationPrimitives ifTrue: [self isMarked: obj] ifFalse: [true]) ifTrue: [(self isNormalObject: obj) ifTrue: [MarkObjectsForEnumerationPrimitives ifTrue: [self setIsMarkedOf: obj to: false]. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerSlot]] ifFalse: [MarkObjectsForEnumerationPrimitives ifTrue: [(self isSegmentBridge: obj) ifFalse: [self setIsMarkedOf: obj to: false]]]]]. - self assert: self allObjectsUnmarked. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives + ifTrue: + [self assert: self allObjectsUnmarked. + self emptyObjStack: weaklingStack] + ifFalse: + [self assert: (self isEmptyObjStack: weaklingStack)]. - ifTrue: [self emptyObjStack: weaklingStack] - ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. self assert: count >= self numSlotsMask. (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: StackInterpreter>>extTrapIfNotInstanceOfBehaviorsBytecode (in category 'sista bytecodes') ----- extTrapIfNotInstanceOfBehaviorsBytecode + "SistaV1: * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" - "SistaV1: * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" | tos tosClassTag literal | + tos := self internalStackTop. - tos := self stackTop. tosClassTag := objectMemory fetchClassTagOf: tos. literal := self literal: extA << 8 + self fetchByte. extA := 0. (objectMemory isArrayNonImm: literal) ifTrue: [| i | i := (objectMemory numSlotsOf: literal) asInteger. [(i := i -1) < 0 or: [tosClassTag = (objectMemory rawClassTagForClass: (objectMemory fetchPointer: i ofObject: literal))]] whileTrue. i < 0 ifTrue: [^self respondToClassTrap]] ifFalse: [tosClassTag ~= (objectMemory rawClassTagForClass: literal) ifTrue: [^self respondToClassTrap]]. + self internalPopStack. self fetchNextBytecode! Item was changed: ----- Method: StackInterpreter>>respondToClassTrap (in category 'sista bytecodes') ----- respondToClassTrap | ourContext tos | <sharedCodeInCase: #extTrapIfNotInstanceOfBehaviorsBytecode> messageSelector := objectMemory splObj: SelectorClassTrap. + tos := self internalPopStack. - tos := self internalStackTop. ourContext := self ensureFrameIsMarried: localFP SP: localSP. messageSelector = objectMemory nilObject ifTrue: [self error: 'class trap']. self internalPush: ourContext. self internalPush: tos. argumentCount := 1. self normalSend! Item was changed: VMObjectProxy subclass: #VMCompiledMethodProxy instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Support'! + + !VMCompiledMethodProxy commentStamp: 'eem 8/6/2014 14:48' prior: 0! + A VMCompiledMethodProxy is a wrapper for the oop of a CompiledMethod object in the simulator VM's heap that provides accessd to the oop as if it were a CompiledMethod object.! Item was removed: - ----- Method: VMCompiledMethodProxy>>usesAlternateBytecodeSet (in category 'accessing') ----- - usesAlternateBytecodeSet - - ^coInterpreter headerIndicatesAlternateBytecodeSet: self header! Item was changed: Object subclass: #VMObjectProxy instanceVariableNames: 'coInterpreter oop objectMemory' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Support'! + + !VMObjectProxy commentStamp: 'eem 8/6/2014 14:46' prior: 0! + A VMObjectProxy is a wraper for an oop in the VM, that provides limited access to that oop as an object. + !

1 0

VM Maker: Cog-eem.180.mcz
by commits＠source.squeak.org 06 Aug '14

06 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.180.mcz ==================== Summary ==================== Name: Cog-eem.180 Author: eem Time: 5 August 2014, 8:12:50.642 pm UUID: 5ba5485c-a3d2-4960-8656-022de3e8c831 Ancestors: Cog-eem.179 Fix copy-paste snafu =============== Diff against Cog-eem.179 =============== 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]. [#(Context class allInstances)] -> [#enumerating]. [#(Context class allInstancesDo:)] -> [#enumerating]. [#(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]. - [#(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]!

1 0

VM Maker: Cog-eem.179.mcz
by commits＠source.squeak.org 06 Aug '14

06 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.179.mcz ==================== Summary ==================== Name: Cog-eem.179 Author: eem Time: 5 August 2014, 5:26:14.703 pm UUID: 145243c5-4cb2-417c-845d-e47beab2bbb1 Ancestors: Cog-eem.178 Add the missing prototype method categories in Squeak trunk Kernel. =============== Diff against Cog-eem.178 =============== 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']. - [#(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]. [#(ClassBuilder superclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] + -> [#public]. + [#(Context class allInstances)] -> [#enumerating]. + [#(Context class allInstancesDo:)] -> [#enumerating]. + [#(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]. - -> [#public]. - [#(Context class allInstances)] -> [#enumerating]. - [#(Context class allInstancesDo:)] -> [#enumerating]. - [#(MethodContext class allInstances)] -> [#enumerating]. - [#(MethodContext class allInstancesDo:)] -> [#enumerating]. - [#(SmallInteger asCharacter)] -> [#converting]. } otherwise: [Transcript nextPutAll: className. isMeta ifTrue: [Transcript nextPutAll: ' class']. Transcript nextPutAll: '>>'; store: selector; nextPutAll: ' is unclassified'; cr; flush. ^Categorizer default]!

1 0

[commit][3059] CogVM source as per VMMaker.oscog-eem.843
by commits＠squeakvm.org 05 Aug '14

05 Aug '14

Revision: 3059 Author: eliot Date: 2014-08-05 10:16:14 -0700 (Tue, 05 Aug 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.843 Allow warnings to be treated as errors, adding -blockonwarn flag on Mac & Unix. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h 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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -35,9 +35,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2082,7 +2083,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.841"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -52571,7 +52572,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -52736,7 +52737,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -52761,7 +52762,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()) @@ -52822,7 +52823,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); @@ -53006,7 +53007,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -53052,7 +53053,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())) { @@ -54257,7 +54258,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-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -38,9 +38,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2085,7 +2086,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.841"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -52580,7 +52581,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -52745,7 +52746,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -52770,7 +52771,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()) @@ -52831,7 +52832,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); @@ -53015,7 +53016,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -53061,7 +53062,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())) { @@ -54266,7 +54267,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nscogsrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -35,9 +35,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2319,7 +2320,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 CoInterpreter_VMMaker.oscog-eem.841"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5610,6 +5611,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l290; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5627,7 +5629,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l290: /* end baseFrameReturn */; goto l289; } @@ -64579,7 +64581,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -64796,7 +64798,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -64821,7 +64823,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()) Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -38,9 +38,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2322,7 +2323,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 CoInterpreter_VMMaker.oscog-eem.841"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5619,6 +5620,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l290; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5636,7 +5638,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l290: /* end baseFrameReturn */; goto l289; } @@ -64588,7 +64590,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -64805,7 +64807,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -64830,7 +64832,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()) Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspursrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -34,9 +34,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2070,7 +2071,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.841"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.843"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -31,9 +31,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2067,7 +2068,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.841"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.843"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/nsspurstacksrc/vm/interp.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Aug 4 19:14:37 PDT 2014 + Tue Aug 5 10:15:13 PDT 2014 Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -165,6 +165,11 @@ extern int blockOnError; blockOnError = true; return 1; } + else if (!strcmp(argv[0], "-blockonwarn")) { + extern int blockOnError; + extern sqInt erroronwarn; + erroronwarn = blockOnError = true; + return 1; } else if (!strcmp(argv[0], "-timephases")) { extern void printPhaseTime(int); printPhaseTime(1); @@ -329,6 +334,7 @@ printf(" -version print version information, then exit\n"); printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n"); + printf(" -blockonwarning on warning block, don't warn. useful for attaching gdb\n"); } static void printUsageNotes(void) Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -904,6 +904,7 @@ } int blockOnError = 0; /* to allow attaching gdb on fatal error */ +extern sqInt erroronwarn; static void block() @@ -1355,6 +1356,7 @@ else if (!strcmp(argv[0], "-notimer")) { useItimer = 0; return 1; } else if (!strcmp(argv[0], "-nohandlers")) { installHandlers= 0; return 1; } else if (!strcmp(argv[0], "-blockonerror")) { blockOnError = 1; return 1; } + else if (!strcmp(argv[0], "-blockonwarn")) { erroronwarn = blockOnError = 1; return 1; } else if (!strcmp(argv[0], "-timephases")) { printPhaseTime(1); return 1; } @@ -1518,6 +1520,7 @@ printf(" -reportheadroom report unused stack headroom on exit\n"); #endif printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n"); + printf(" -blockonwarning on warning block, don't warn. useful for attaching gdb\n"); #if 1 printf("Deprecated:\n"); # if !STACKVM Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -35,9 +35,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2078,7 +2079,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -54097,7 +54098,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -38,9 +38,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2081,7 +2082,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -54106,7 +54107,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/sistasrc/vm/interp.h =================================================================== --- branches/Cog/sistasrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/sistasrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/sistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/sistasrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/sistasrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -35,9 +35,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -1123,7 +1124,7 @@ sqInt removeGCRoot(sqInt *varLoc); static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2316,7 +2317,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 [CoInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -51589,7 +51590,7 @@ zero if no change was possible. */ -static usqInt +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -64568,7 +64569,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); @@ -64814,7 +64815,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -64870,7 +64871,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.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -38,9 +38,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -1126,7 +1127,7 @@ sqInt removeGCRoot(sqInt *varLoc); static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2319,7 +2320,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 [CoInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -51598,7 +51599,7 @@ zero if no change was possible. */ -static usqInt +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -64577,7 +64578,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); @@ -64823,7 +64824,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -64879,7 +64880,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/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursistasrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -35,9 +35,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2308,7 +2309,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 [CoInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -38,9 +38,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2311,7 +2312,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 [CoInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spursrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -34,9 +34,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2062,7 +2063,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.843]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -31,9 +31,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2059,7 +2060,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.843]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spurstacksrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058) +++ branches/Cog/src/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b from - CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -35,9 +35,10 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off -sqInt warnpid; +sqInt warnpid, erroronwarn; void -warning(char *s) { /* Print an error message but don't exit. */ +warning(char *s) { /* Print an error message but don't necessarily exit. */ + if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else @@ -2071,7 +2072,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -47896,7 +47897,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -48061,7 +48062,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.843.mcz
by commits＠source.squeak.org 05 Aug '14

05 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.843.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.843 Author: eem Time: 5 August 2014, 9:55:00.224 am UUID: 5b054eac-e59e-46bd-a440-cc5ce9f9622b Ancestors: VMMaker.oscog-eem.842 Allow warnings to be treated as errors. =============== Diff against VMMaker.oscog-eem.842 =============== Item was changed: ----- Method: StackInterpreter class>>preambleCCode (in category 'translation') ----- preambleCCode ^ '/* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off + sqInt warnpid, erroronwarn; - sqInt warnpid; void + warning(char *s) { /* Print an error message but don''t necessarily exit. */ + if (erroronwarn) error(s); - warning(char *s) { /* Print an error message but don''t exit. */ if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ /* use alloca to call warning so one does not have to remember to set two breakpoints... */ char *sl = alloca(strlen(s) + 16); sprintf(sl, "%s %d", s, l); warning(sl); } #pragma auto_inline on void invalidCompactClassError(char *s) { /* Print a (compact) class index error message and exit. */ #if SPURVM printf("\nClass %s does not have the required class index\n", s); #else printf("\nClass %s does not have the required compact class index\n", s); #endif exit(-1); } /* * Define sigsetjmp and siglongjmp to be the most minimal setjmp/longjmp available on the platform. */ #if WIN32 # define sigsetjmp(jb,ssmf) setjmp(jb) # define siglongjmp(jb,v) longjmp(jb,v) #else # define sigsetjmp(jb,ssmf) _setjmp(jb) # define siglongjmp(jb,v) _longjmp(jb,v) #endif '!

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