Vm-dev April 2015

vm-dev@lists.squeakfoundation.org

45 participants
264 discussions

VM Maker: VMMaker.oscog-cb.1267.mcz
by commits＠source.squeak.org 28 Apr '15

28 Apr '15

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1267.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1267 Author: cb Time: 28 April 2015, 1:00:54.291 pm UUID: d6fac431-cfba-44bc-9590-d031f970feda Ancestors: VMMaker.oscog-cb.1266 Find a workaround to compile genSpecialSelectorComparison without slang generating incorrect code for the macro replacement of super. Added many types to remove C compiler warnings. I also added temporarily <returnTypeC: #sqInt> in getJumpTargetPCAt: to solve a conflict between ARM and IA 32 back end until Eliot or Tim tells me a better solution. =============== Diff against VMMaker.oscog-cb.1265 =============== Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>allImmediate:branchIf:notInstanceOfBehaviors:target: (in category 'sista support') ----- allImmediate: immediateMask branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp | jmpImmediate | < inline: true> + <var: #targetFixUp type: #'AbstractInstruction *'> self assert: immediateMask = objectMemory tagMask. cogit MoveR: reg R: TempReg. jmpImmediate := self genJumpNotImmediateInScratchReg: TempReg. jmpImmediate jmpTarget: targetFixUp. ^0! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>branchIf:hasNotImmediateTag:target: (in category 'sista support') ----- branchIf: reg hasNotImmediateTag: classIndex target: targetFixUp | jmpImmediate| <inline: true> + <var: #targetFixUp type: #'AbstractInstruction *'> cogit MoveR: reg R: TempReg. classIndex = objectMemory smallIntegerTag ifTrue: [jmpImmediate := self genJumpNotSmallIntegerInScratchReg: TempReg]. classIndex = objectMemory characterTag ifTrue: [jmpImmediate := self genJumpNotCharacterInScratchReg: TempReg]. jmpImmediate jmpTarget: targetFixUp! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>allImmediate:branchIf:notInstanceOfBehaviors:target: (in category 'sista support') ----- allImmediate: immediateMask branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp | incorrectTag tag1 tag2 | + <var: #targetFixUp type: #'AbstractInstruction *'> - < inline: true> cogit MoveR: reg R: TempReg. (self genJumpNotImmediateInScratchReg: TempReg) jmpTarget: targetFixUp. immediateMask = objectMemory tagMask ifFalse: [ "TempReg holds the rcvr tag" "In this case one immediate tag out of the three is not present in arrayObj. We look for it, and generate a jump to the fixup if the rcvr tag matches" tag1 := objectMemory classTagForClass: (objectMemory fetchPointer: 0 ofObject: arrayObj). tag2 := objectMemory classTagForClass: (objectMemory fetchPointer: 1 ofObject: arrayObj). incorrectTag := self fetchImmediateTagOtherThanTag1: tag1 tag2: tag2. cogit CmpCq: incorrectTag R: TempReg. cogit JumpZero: targetFixUp ].! Item was changed: ----- Method: CogObjectRepresentationForSpur>>branchIf:notInstanceOfBehavior:target: (in category 'sista support') ----- branchIf: reg notInstanceOfBehavior: classObj target: targetFixUp "Generate a branch if reg is an instance of classObj, otherwise fall- through. Cannot change the value of reg (may be used afterwards)." | classIndex | <inline: true> + <var: #targetFixUp type: #'AbstractInstruction *'> classIndex := objectMemory classTagForClass: classObj. (objectMemory isImmediateClass: classObj) ifTrue: [self branchIf: reg hasNotImmediateTag: classIndex target: targetFixUp ] ifFalse: [cogit MoveR: reg R: TempReg. (self genJumpImmediateInScratchReg: TempReg) jmpTarget: targetFixUp. self genGetClassIndexOfNonImm: reg into: TempReg. self genCmpClassIndex: classIndex R: TempReg. cogit JumpNonZero: targetFixUp ]. ^0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>branchIf:notInstanceOfBehaviors:target: (in category 'sista support') ----- branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp "Generate a branch if reg is an instance of any of the classes in arrayObj, otherwise fall-through. reg should not be edited." | allImmediate noneImmediate immediateMask numNonImmediates classObj | + <var: #targetFixUp type: #'AbstractInstruction *'> - <inline: true> "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: [ ^ self noneImmediateBranchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp ]. allImmediate ifTrue: [ ^ self allImmediate: immediateMask branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp ]. ^ self mixed: numNonImmediates branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genEnsureOopInRegNotForwarded:scratchReg:ifForwarder:ifNotForwarder: (in category 'compile abstract instructions') ----- genEnsureOopInRegNotForwarded: reg scratchReg: scratch ifForwarder: fwdJumpTarget ifNotForwarder: nonFwdJumpTargetOrZero "Make sure that the oop in reg is not forwarded. Use the fact that isForwardedObjectClassIndexPun is a power of two to save an instruction." | skip ok finished | <inline: true> <var: #ok type: #'AbstractInstruction *'> <var: #skip type: #'AbstractInstruction *'> <var: #finished type: #'AbstractInstruction *'> self assert: reg ~= scratch. cogit MoveR: reg R: scratch. skip := self genJumpImmediateInScratchReg: scratch. "notionally self genGetClassIndexOfNonImm: reg into: scratch. cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: TempReg. but the following is an instruction shorter:" cogit MoveMw: 0 r: reg R: scratch. cogit AndCq: objectMemory classIndexMask - objectMemory isForwardedObjectClassIndexPun R: scratch. ok := cogit JumpNonZero: 0. self genLoadSlot: 0 sourceReg: reg destReg: reg. cogit Jump: fwdJumpTarget. finished := nonFwdJumpTargetOrZero = 0 ifTrue: [ cogit Label ] + ifFalse: [ self cCoerceSimple: nonFwdJumpTargetOrZero to: #'AbstractInstruction *' ]. - ifFalse: [ nonFwdJumpTargetOrZero ]. skip jmpTarget: (ok jmpTarget: finished). ^0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genEnsureOopInRegNotForwarded:scratchReg:jumpBackTo: (in category 'compile abstract instructions') ----- genEnsureOopInRegNotForwarded: reg scratchReg: scratch jumpBackTo: instruction + <var: #instruction type: #'AbstractInstruction *'> - <inline: true> ^ self genEnsureOopInRegNotForwarded: reg scratchReg: scratch ifForwarder: instruction ifNotForwarder: 0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>mixed:branchIf:notInstanceOfBehaviors:target: (in category 'sista support') ----- mixed: numNonImmediates branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp | jmpImmediate jumps label numCases classObj index | + <var: #label type: #'AbstractInstruction *'> + <var: #jmpImmediate type: #'AbstractInstruction *'> <var: #jumps type: #'AbstractInstruction **'> + <var: #targetFixUp type: #'AbstractInstruction *'> numCases := objectMemory numSlotsOf: arrayObj. cogit MoveR: reg R: TempReg. jmpImmediate := self genJumpImmediateInScratchReg: TempReg. "Rcvr is non immediate" jumps := self alloca: numNonImmediates type: (self cCode: [#'AbstractInstruction *'] inSmalltalk: [cogit backEnd class]).. self genGetClassIndexOfNonImm: reg into: TempReg. index := 0. 0 to: numCases - 1 do: [:i| classObj := objectMemory fetchPointer: i ofObject: arrayObj. (objectMemory isImmediateClass: classObj) ifFalse: [ self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg. jumps at: index put: (cogit JumpZero: 0). index := index + 1 ] ]. cogit Jump: targetFixUp. "Rcvr is immediate" jmpImmediate jmpTarget: cogit Label. numCases - numNonImmediates "num Immediates allowed" caseOf: {[ 1 ] -> [ "1 immediate allowed. jump to targetFixUp if the rcvr is not this immediate" 0 to: numCases - 1 do: [ :j | classObj := objectMemory fetchPointer: j ofObject: arrayObj. (objectMemory isImmediateClass: classObj) ifTrue: [ self branchIf: reg hasNotImmediateTag: (objectMemory classTagForClass: classObj) target: targetFixUp ] ] ] . [ 2 ] -> [ "2 immediates allowed. On 32 bits nothing to do, all immediate are allowed, on 64 bits generates the jump to fixup for the third tag" self branch2CasesIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp ] . [ 3 ] -> [ "nothing to do, all immediates are allowed." ] }. label := self Label. 0 to: numNonImmediates - 1 do: [:i | (jumps at: i) jmpTarget: label ]. ^ 0 ! Item was changed: ----- Method: CogObjectRepresentationForSpur>>noneImmediateBranchIf:notInstanceOfBehaviors:target: (in category 'sista support') ----- noneImmediateBranchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp "All classes in arrayObj are not immediate" | label numJumps jumps classObj | + <var: #targetFixUp type: #'AbstractInstruction *'> + <var: #label type: #'AbstractInstruction *'> - <inline: true> <var: #jumps type: #'AbstractInstruction **'> cogit MoveR: reg R: TempReg. jumps := self alloca: (objectMemory numSlotsOf: arrayObj) type: (self cCode: [#'AbstractInstruction *'] inSmalltalk: [cogit backEnd class]).. (self genJumpImmediateInScratchReg: TempReg) jmpTarget: targetFixUp. self genGetClassIndexOfNonImm: reg into: TempReg. 0 to: (numJumps := objectMemory numSlotsOf: arrayObj) - 1 do: [:i| classObj := objectMemory fetchPointer: i ofObject: arrayObj. self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg. jumps at: i put: (cogit JumpZero: 0) ]. cogit Jump: targetFixUp. label := self Label. 0 to: numJumps do: [:i | (jumps at: i) jmpTarget: label ]. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode (in category 'bytecode generators') ----- genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" | reg literal distance targetFixUp | "We loose the information of in which register is stack top when jitting the branch target so we need to flush everything. We could use a fixed register here...." reg := self allocateRegForStackEntryAt: 0. self ssTop popToReg: reg. self ssFlushTo: simStackPtr. "flushed but the value is still in reg" literal := self getLiteral: (extA * 256 + byte1). extA := 0. distance := extB * 256 + byte2. extB := 0. + targetFixUp := self cCoerceSimple: (self ensureFixupAt: bytecodePC + 3 + distance - initialPC) to: #'AbstractInstruction *'.. - targetFixUp := (self ensureFixupAt: bytecodePC + 3 + distance - initialPC) asUnsignedInteger. (objectMemory isArrayNonImm: literal) ifTrue: [objectRepresentation branchIf: reg notInstanceOfBehaviors: literal target: targetFixUp] ifFalse: [objectRepresentation branchIf: reg notInstanceOfBehavior: literal target: targetFixUp]. self genPopStackBytecode. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor rcvrIsInt argIsInt rcvrInt argInt result jumpNotSmallInts inlineCAB annotateInst counterAddress countTripped counterReg | <var: #countTripped type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> + (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ self genUnoptimizedSpecialSelectorComparison ]. - (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genSpecialSelectorComparison ]. self ssFlushTo: simStackPtr - 2. primDescriptor := self generatorAt: byte0. argIsInt := self ssTop type = SSConstant and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (self ssValue: 1) type = SSConstant and: [objectMemory isIntegerObject: (rcvrInt := (self ssValue: 1) constant)]. "short-cut the jump if operands are SmallInteger constants." (argIsInt and: [rcvrIsInt]) ifTrue: [self cCode: '' inSmalltalk: "In Simulator ints are unsigned..." [rcvrInt := objectMemory integerValueOf: rcvrInt. argInt := objectMemory integerValueOf: argInt]. primDescriptor opcode caseOf: { [JumpLess] -> [result := rcvrInt < argInt]. [JumpLessOrEqual] -> [result := rcvrInt <= argInt]. [JumpGreater] -> [result := rcvrInt > argInt]. [JumpGreaterOrEqual] -> [result := rcvrInt >= argInt]. [JumpZero] -> [result := rcvrInt = argInt]. [JumpNonZero] -> [result := rcvrInt ~= argInt] }. "Must enter any annotatedConstants into the map" self annotateBytecodeIfAnnotated: (self ssValue: 1). self annotateBytecodeIfAnnotated: self ssTop. "Must annotate the bytecode for correct pc mapping." self ssPop: 2. ^self ssPushAnnotatedConstant: (result ifTrue: [objectMemory trueObject] ifFalse: [objectMemory falseObject])]. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. "Only interested in inlining if followed by a conditional branch." inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. The relational operators successfully statically predict SmallIntegers; the equality operators do not." (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: [inlineCAB := argIsInt or: [rcvrIsInt]]. inlineCAB ifFalse: [^self genSpecialSelectorSend]. argIsInt ifTrue: [(self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. self ssPop: 2. self MoveR: ReceiverResultReg R: TempReg] ifFalse: [self marshallSendArguments: 1. self MoveR: Arg0Reg R: TempReg. rcvrIsInt ifFalse: [objectRepresentation isSmallIntegerTagNonZero ifTrue: [self AndR: ReceiverResultReg R: TempReg] ifFalse: [self OrR: ReceiverResultReg R: TempReg]]]. jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. counterReg := self allocateRegNotConflictingWith: (self registerMaskFor: ReceiverResultReg and: Arg0Reg). self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: counterReg. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [self CmpCq: argInt R: ReceiverResultReg]] ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg]. "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." self gen: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). countTripped jmpTarget: (jumpNotSmallInts jmpTarget: self Label). argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg]. ^self genMarshalledSend: (coInterpreter specialSelector: byte0 - self firstSpecialSelectorBytecodeOffset) numArgs: 1 sendTable: ordinarySendTrampolines! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorEqualsEqualsWithForwarders (in category 'bytecode generators') ----- genSpecialSelectorEqualsEqualsWithForwarders "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC branchDescriptor label counterReg fixup counterAddress countTripped unforwardArg unforwardRcvr argReg rcvrReg regMask | <var: #fixup type: #'BytecodeFixup *'> <var: #countTripped type: #'AbstractInstruction *'> + <var: #label type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> ((coInterpreter isOptimizedMethod: methodObj) or: [needsFrame not]) ifTrue: [ ^ super genSpecialSelectorEqualsEquals ]. regMask := 0. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. unforwardRcvr := (objectRepresentation isUnannotatableConstant: (self ssValue: 1)) not. unforwardArg := (objectRepresentation isUnannotatableConstant: self ssTop) not. "If an operand is an annotable constant, it may be forwarded, so we need to store it into a register so the forwarder check can jump back to the comparison after unforwarding the constant. However, if one of the operand is an unnanotable constant, does not allocate a register for it (machine code will use operations on constants)." self allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. argReg ifNotNil: [ regMask := self registerMaskFor: argReg ]. rcvrReg ifNotNil: [ regMask := regMask bitOr: (self registerMaskFor: rcvrReg) ]. "Only interested in inlining if followed by a conditional branch." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^ self genEqualsEqualsNoBranchArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg]. counterReg := self allocateRegNotConflictingWith: regMask. self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: counterReg. self assert: (unforwardArg or: [ unforwardRcvr ]). "If branching the stack must be flushed for the merge" self ssFlushTo: simStackPtr - 2. label := self Label. self genEqualsEqualsComparisonArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "pop by 2 temporarily for the fixups" branchDescriptor isBranchTrue ifTrue: [ fixup := self ensureNonMergeFixupAt: postBranchPC - initialPC. self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. ] ifFalse: [ fixup := self ensureNonMergeFixupAt: targetBytecodePC - initialPC. self JumpZero: (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger. ]. unforwardArg ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg jumpBackTo: label ]. unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg jumpBackTo: label ]. self ssPop: -2. self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self Jump: fixup. countTripped jmpTarget: self Label. "inlined version of #== ignoring the branchDescriptor if the counter trips to have normal state for the optimizer" self genEqualsEqualsNoBranchArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. ^ 0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genUnconditionalTrapBytecode (in category 'bytecode generators') ----- genUnconditionalTrapBytecode "SistaV1: * 217 Trap" + self ssFlushTo: simStackPtr. - "Use ssFlushNoUpdateTo: so we continue compiling as if the stack had not been flushed . - (typically, this kind of trap is in a branch) - Control does not return after the ceClassTrapTrampoline call." - self ssFlushNoUpdateTo: simStackPtr. self CallRT: ceTrapTrampoline. self annotateBytecode: self Label. ^0! Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>genUnoptimizedSpecialSelectorComparison (in category 'bytecode generators') ----- + genUnoptimizedSpecialSelectorComparison + "This method is there because if I put directly the super send in genSpecialSelectorComparison Slang does not correctly translte the code to C, it does not correctly type one of the branchDescriptor to BytecodeDescriptor" + ^ super genSpecialSelectorComparison! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>getJumpTargetPCAt: (in category 'method introspection') ----- getJumpTargetPCAt: pc <api> + <returnTypeC: #sqInt> ^backEnd jumpTargetPCAt: pc! Item was removed: - ----- Method: SistaStackToRegisterMappingCogit>>ssFlushNoUpdateTo: (in category 'simulation stack') ----- - ssFlushNoUpdateTo: index - "This version of ssFlushTo: does /not/ update the simulation stack; it merely generates the spill code. - It is used to spill all values to the stack on a rare failing branch (the class trap) when we don't want to - flush the stack on the main path and hence mustn't update the simulation stack if there is no spill." - <var: 'copiedEntry' type: #CogSimStackEntry> - self assert: needsFrame. - methodOrBlockNumTemps to: simSpillBase - 1 do: - [:i| self assert: (self simStackAt: i) spilled]. - simSpillBase <= index ifTrue: - [(simSpillBase max: 0) to: index do: - [:i| | copiedEntry | - copiedEntry := self cCode: [simStack at: index] - inSmalltalk: [(simStack at: index) copy]. - copiedEntry - ensureSpilledAt: (self frameOffsetOfTemporary: i) - from: FPReg]]! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorEqualsEqualsWithForwarders (in category 'bytecode generators') ----- genSpecialSelectorEqualsEqualsWithForwarders | nextPC branchDescriptor unforwardRcvr argReg targetBytecodePC unforwardArg rcvrReg postBranchPC label fixup | - <var: #fixup type: #'BytecodeFixup *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #label type: #'AbstractInstruction *'> self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. "If an operand is an annotable constant, it may be forwarded, so we need to store it into a register so the forwarder check can jump back to the comparison after unforwarding the constant. However, if one of the operand is an unnanotable constant, does not allocate a register for it (machine code will use operations on constants) and does not generate forwarder checks." unforwardRcvr := (objectRepresentation isUnannotatableConstant: (self ssValue: 1)) not. unforwardArg := (objectRepresentation isUnannotatableConstant: self ssTop) not. self allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. "If not followed by a branch, resolve to true or false." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^ self genEqualsEqualsNoBranchArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg]. "If branching the stack must be flushed for the merge" self ssFlushTo: simStackPtr - 2. label := self Label. self genEqualsEqualsComparisonArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "Further since there is a following conditional jump bytecode, define non-merge fixups and leave the cond bytecode to set the mergeness." (self fixupAt: nextPC - initialPC) targetInstruction = 0 ifTrue: "The next instruction is dead. we can skip it." [deadCode := true. self ensureFixupAt: targetBytecodePC - initialPC. self ensureFixupAt: postBranchPC - initialPC] ifFalse: [self ssPushConstant: objectMemory trueObject]. "dummy value" self assert: (unforwardArg or: [ unforwardRcvr ]). branchDescriptor isBranchTrue ifTrue: + [ fixup := (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger. - [ fixup := self ensureNonMergeFixupAt: postBranchPC - initialPC. self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger ] ifFalse: "branchDescriptor is branchFalse" + [ fixup := (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. - [ fixup := self ensureNonMergeFixupAt: targetBytecodePC - initialPC. self JumpZero: (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger ]. "The forwarders checks need to jump back to the comparison (label) if a forwarder is found, else jump forward either to the next forwarder check or to the postBranch or branch target (fixup)." unforwardArg ifTrue: [ unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg jumpBackTo: label ] ifFalse: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg ifForwarder: label ifNotForwarder: fixup ] ]. unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg ifForwarder: label ifNotForwarder: fixup ]. "Not reached, execution flow have jumped to fixup" ^0!

1 0

VM Maker: VMMaker.oscog-cb.1265.mcz
by commits＠source.squeak.org 27 Apr '15

27 Apr '15

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1265.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1265 Author: cb Time: 27 April 2015, 3:51:44.905 pm UUID: cbbc3952-338b-466e-8e6b-f6483c657c95 Ancestors: VMMaker.oscog-cb.1264 Added a missing type. The VM now compiles correclty and starts up correctly spur images again. (At least the StackToRegisterMapping one) =============== Diff against VMMaker.oscog-cb.1264 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryInlineComparison:opFalse:destReg: (in category 'inline primitive generators') ----- genBinaryInlineComparison: opTrue opFalse: opFalse destReg: destReg "Inlined comparison. opTrue = jump for true and opFalse = jump for false" + <var: #branchDescriptor type: #'BytecodeDescriptor *'> | nextPC branchDescriptor targetBytecodePC postBranchPC | self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifTrue: "This is the path where the inlined comparison is followed immediately by a branch" [ (self fixupAt: nextPC - initialPC) targetInstruction = 0 ifTrue: "The next instruction is dead. we can skip it." [deadCode := true. self ensureFixupAt: targetBytecodePC - initialPC. self ensureFixupAt: postBranchPC - initialPC ] ifFalse: [self ssPushConstant: objectMemory trueObject]. "dummy value" self gen: (branchDescriptor isBranchTrue ifTrue: [opTrue] ifFalse: [opFalse]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. deadCode ifFalse: [ self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC) ] ] ifFalse: "This is the path where the inlined comparison is *not* followed immediately by a branch" [| condJump jump | condJump := self gen: opTrue operand: 0. self genMoveFalseR: destReg. jump := self Jump: 0. condJump jmpTarget: (self genMoveTrueR: destReg). jump jmpTarget: self Label]. ^ 0!

1 0

VM Maker: VMMaker.oscog-cb.1264.mcz
by commits＠source.squeak.org 27 Apr '15

27 Apr '15

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1264.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1264 Author: cb Time: 27 April 2015, 3:43:21.287 pm UUID: 85bfc943-a124-4ba4-ab44-c117ce807cce Ancestors: VMMaker.oscog-cb.1263 Rewrote the method to be correctly inlined by slang. It generated '... , l1:...' instead of '...; l1:...'. I guess I could improve slang to crrectly inline the method instead of rewriting it, but I tried and failed. =============== Diff against VMMaker.oscog-cb.1263 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:ReceiverVariable:traceBlock:inFrame: (in category 'bytecode generator support') ----- genStorePop: popBoolean ReceiverVariable: slotIndex traceBlock: block inFrame: inFrame <inline: true> | topReg | self ssFlushUpThroughReceiverVariable: slotIndex. "Avoid store check for immediate values" + ^ (objectRepresentation isUnannotatableConstant: self ssTop) + ifTrue: + [self ensureReceiverResultRegContainsSelf. + self ssStorePop: popBoolean toReg: TempReg. + traceStores > 0 ifTrue: [block value]. + objectRepresentation + genStoreImmediateInSourceReg: TempReg + slotIndex: slotIndex + destReg: ReceiverResultReg] + ifFalse: + [topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). + self ssStorePop: popBoolean toReg: topReg. + "Note that ReceiverResultReg remains live after ceStoreCheckTrampoline." + self ensureReceiverResultRegContainsSelf. + traceStores > 0 ifTrue: [self MoveR: topReg R: TempReg. block value]. + objectRepresentation + genStoreSourceReg: topReg + slotIndex: slotIndex + destReg: ReceiverResultReg + scratchReg: TempReg + inFrame: inFrame ]! - (objectRepresentation isUnannotatableConstant: self ssTop) ifTrue: - [self ensureReceiverResultRegContainsSelf. - self ssStorePop: popBoolean toReg: TempReg. - traceStores > 0 ifTrue: [block value]. - ^objectRepresentation - genStoreImmediateInSourceReg: TempReg - slotIndex: slotIndex - destReg: ReceiverResultReg]. - topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). - self ssStorePop: popBoolean toReg: topReg. - "Note that ReceiverResultReg remains live after ceStoreCheckTrampoline." - self ensureReceiverResultRegContainsSelf. - traceStores > 0 ifTrue: - [self MoveR: topReg R: TempReg. - block value]. - ^objectRepresentation - genStoreSourceReg: topReg - slotIndex: slotIndex - destReg: ReceiverResultReg - scratchReg: TempReg - inFrame: inFrame!

1 0

VM Maker: VMMaker.oscog-cb.1263.mcz
by commits＠source.squeak.org 27 Apr '15

27 Apr '15

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1263.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1263 Author: cb Time: 27 April 2015, 3:26:40.541 pm UUID: a1bd713c-e904-4df8-8db6-540c64c90ab8 Ancestors: VMMaker.oscog-cb.1262 added inlining of 4 Args block with value: value: value: value: in slang Add and remove a few types to make gcc and CCodeGenerator happy. =============== Diff against VMMaker.oscog-cb.1262 =============== Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation support') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #>>> #generateSignedShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #timesRepeat: #generateTimesRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: + #value:value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genEnsureOopInRegNotForwarded:scratchReg:jumpBackTo: (in category 'compile abstract instructions') ----- genEnsureOopInRegNotForwarded: reg scratchReg: scratch jumpBackTo: instruction + <inline: true> ^ self genEnsureOopInRegNotForwarded: reg scratchReg: scratch ifForwarder: instruction ifNotForwarder: 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>extractMaybeBranchDescriptorInto: (in category 'bytecode generator support') ----- extractMaybeBranchDescriptorInto: fourArgBlock "Looks one instruction ahead of the current bytecodePC and answers its bytecode descriptor and its pc. If the instruction found is a branch, also answers the pc after the branch and the pc targetted by the branch" | primDescriptor nextPC nExts branchDescriptor targetBytecodePC postBranchPC | <inline: true> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> primDescriptor := self generatorAt: byte0. nextPC := bytecodePC + primDescriptor numBytes. nExts := 0. [branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + bytecodeSetOffset. branchDescriptor isExtension] whileTrue: [nExts := nExts + 1. nextPC := nextPC + branchDescriptor numBytes]. + targetBytecodePC := postBranchPC := 0. + + (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifTrue: + [ targetBytecodePC := nextPC - (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: - [ ^ fourArgBlock value: branchDescriptor value: nextPC value: 0 value: 0 ]. - - targetBytecodePC := nextPC + branchDescriptor numBytes + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). + postBranchPC := nextPC + branchDescriptor numBytes ]. - postBranchPC := nextPC + branchDescriptor numBytes. fourArgBlock value: branchDescriptor value: nextPC value: postBranchPC value: targetBytecodePC! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorEqualsEqualsWithForwarders (in category 'bytecode generators') ----- genSpecialSelectorEqualsEqualsWithForwarders | nextPC branchDescriptor unforwardRcvr argReg targetBytecodePC unforwardArg rcvrReg postBranchPC label fixup | <var: #fixup type: #'BytecodeFixup *'> - <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> + <var: #label type: #'AbstractInstruction *'> self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. "If an operand is an annotable constant, it may be forwarded, so we need to store it into a register so the forwarder check can jump back to the comparison after unforwarding the constant. However, if one of the operand is an unnanotable constant, does not allocate a register for it (machine code will use operations on constants) and does not generate forwarder checks." unforwardRcvr := (objectRepresentation isUnannotatableConstant: (self ssValue: 1)) not. unforwardArg := (objectRepresentation isUnannotatableConstant: self ssTop) not. self allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. "If not followed by a branch, resolve to true or false." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^ self genEqualsEqualsNoBranchArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg]. "If branching the stack must be flushed for the merge" self ssFlushTo: simStackPtr - 2. label := self Label. self genEqualsEqualsComparisonArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "Further since there is a following conditional jump bytecode, define non-merge fixups and leave the cond bytecode to set the mergeness." (self fixupAt: nextPC - initialPC) targetInstruction = 0 ifTrue: "The next instruction is dead. we can skip it." [deadCode := true. self ensureFixupAt: targetBytecodePC - initialPC. self ensureFixupAt: postBranchPC - initialPC] ifFalse: [self ssPushConstant: objectMemory trueObject]. "dummy value" self assert: (unforwardArg or: [ unforwardRcvr ]). branchDescriptor isBranchTrue ifTrue: [ fixup := self ensureNonMergeFixupAt: postBranchPC - initialPC. self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger ] ifFalse: "branchDescriptor is branchFalse" [ fixup := self ensureNonMergeFixupAt: targetBytecodePC - initialPC. self JumpZero: (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger ]. "The forwarders checks need to jump back to the comparison (label) if a forwarder is found, else jump forward either to the next forwarder check or to the postBranch or branch target (fixup)." unforwardArg ifTrue: [ unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg jumpBackTo: label ] ifFalse: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg ifForwarder: label ifNotForwarder: fixup ] ]. unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg ifForwarder: label ifNotForwarder: fixup ]. "Not reached, execution flow have jumped to fixup" ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genVanillaSpecialSelectorEqualsEquals (in category 'bytecode generators') ----- genVanillaSpecialSelectorEqualsEquals | nextPC postBranchPC targetBytecodePC branchDescriptor rcvrReg argReg argIsConstant rcvrIsConstant | - <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. argIsConstant := self ssTop type = SSConstant. "they can't be both constants because we do not have instructions manipulating two constants, if this is the case, which can happen due to annotable constants that can be moved in memory with become and therefore can't resolve #== at compilation time, still write the rcvr into a register as if it was not a constant. It's uncommon anyway." rcvrIsConstant := argIsConstant not and: [(self ssValue: 1) type = SSConstant]. self allocateEqualsEqualsRegistersArgNeedsReg: argIsConstant not rcvrNeedsReg: rcvrIsConstant not into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. "If not followed by a branch, resolve to true or false." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [ ^ self genEqualsEqualsNoBranchArgIsConstant: argIsConstant rcvrIsConstant: rcvrIsConstant argReg: argReg rcvrReg: rcvrReg]. "If branching the stack must be flushed for the merge" self ssFlushTo: simStackPtr - 2. self genEqualsEqualsComparisonArgIsConstant: argIsConstant rcvrIsConstant: rcvrIsConstant argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "Further since there is a following conditional jump bytecode, define non-merge fixups and leave the cond bytecode to set the mergeness." (self fixupAt: nextPC - initialPC) targetInstruction = 0 ifTrue: "The next instruction is dead. we can skip it." [deadCode := true. self ensureFixupAt: targetBytecodePC - initialPC. self ensureFixupAt: postBranchPC - initialPC] ifFalse: [self ssPushConstant: objectMemory trueObject]. "dummy value" self gen: (branchDescriptor isBranchTrue ifTrue: [JumpZero] ifFalse: [JumpNonZero]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. "If the branch is dead, then we can just fall through postBranchPC (only a nop in-between), else we need to jump over the code of the branch" deadCode ifFalse: [self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC)]. ^0!

1 0

VM Maker: VMMaker.oscog-cb.1262.mcz
by commits＠source.squeak.org 27 Apr '15

27 Apr '15

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1262.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1262 Author: cb Time: 27 April 2015, 2:28:22.575 pm UUID: 9210cbaf-05f6-43e7-a3a6-57ab7cec7828 Ancestors: VMMaker.oscog-cb.1261 Removed 3 typos 'self self' instead of self.... Crashes at C code generation time... =============== Diff against VMMaker.oscog-cb.1261 =============== Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode (in category 'bytecode generators') ----- genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" | reg literal distance targetFixUp | "We loose the information of in which register is stack top when jitting the branch target so we need to flush everything. We could use a fixed register here...." + reg := self allocateRegForStackEntryAt: 0. - reg := self self allocateRegForStackEntryAt: 0. self ssTop popToReg: reg. self ssFlushTo: simStackPtr. "flushed but the value is still in reg" literal := self getLiteral: (extA * 256 + byte1). extA := 0. distance := extB * 256 + byte2. extB := 0. targetFixUp := (self ensureFixupAt: bytecodePC + 3 + distance - initialPC) asUnsignedInteger. (objectMemory isArrayNonImm: literal) ifTrue: [objectRepresentation branchIf: reg notInstanceOfBehaviors: literal target: targetFixUp] ifFalse: [objectRepresentation branchIf: reg notInstanceOfBehavior: literal target: targetFixUp]. self genPopStackBytecode. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryConstOpVarInlinePrimitive: prim "Const op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra val untaggedVal adjust | + ra := self allocateRegForStackEntryAt: 0. - ra := self self allocateRegForStackEntryAt: 0. self ssTop popToReg: ra. self ssPop: 1. val := self ssTop constant. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: ra]. [1] -> [self MoveCq: val R: TempReg. self SubR: ra R: TempReg. objectRepresentation genAddSmallIntegerTagsTo: TempReg. self MoveR: TempReg R: ra]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: ra. objectRepresentation genAddSmallIntegerTagsTo: ra]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "CmpCqR is SubRCq so everything is reversed, but because no CmpRCq things are reversed again and we invert the sense of the jumps." [32] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpLess opFalse: JumpGreaterOrEqual destReg: ra ]. [33] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpGreater opFalse: JumpLessOrEqual destReg: ra ]. [34] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreater destReg: ra ]. [35] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLess destReg: ra ]. [36] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: ra ]. [37] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: ra ]. "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [objectRepresentation genConvertSmallIntegerToIntegerInReg: ra. adjust := (objectMemory baseHeaderSize >> objectMemory shiftForWord) - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" adjust ~= 0 ifTrue: [ self AddCq: adjust R: ra. ]. self genMoveConstant: val R: TempReg. self MoveXwr: ra R: TempReg R: ra]. [65] -> [objectRepresentation genConvertSmallIntegerToIntegerInReg: ra. adjust := objectMemory baseHeaderSize - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" self AddCq: adjust R: ra. self genMoveConstant: val R: TempReg. self MoveXbr: ra R: TempReg R: ra. objectRepresentation genConvertIntegerToSmallIntegerInReg: ra] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: ra. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpConstInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpConstInlinePrimitive: prim "Var op const version of inline binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | rr val untaggedVal | val := self ssTop constant. self ssPop: 1. + rr := self allocateRegForStackEntryAt: 0. - rr := self self allocateRegForStackEntryAt: 0. self ssTop popToReg: rr. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: rr]. [1] -> [self SubCq: untaggedVal R: rr ]. [2] -> [self flag: 'could use MulCq:R'. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: rr. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "CmpCqR is SubRCq so everything is reversed." [32] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpGreater opFalse: JumpLessOrEqual destReg: rr ]. [33] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpLess opFalse: JumpGreaterOrEqual destReg: rr ]. [34] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLess destReg: rr ]. [35] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreater destReg: rr ]. [36] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: rr ]. [37] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: rr ]. "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [objectRepresentation genLoadSlot: (objectMemory integerValueOf: val) - 1 sourceReg: rr destReg: rr]. [65] -> [self MoveCq: (objectMemory integerValueOf: val) + objectMemory baseHeaderSize - 1 R: TempReg. self MoveXbr: TempReg R: rr R: rr. objectRepresentation genConvertIntegerToSmallIntegerInReg: rr] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0!

1 0

VM Maker: VMMaker.oscog-cb.1261.mcz
by commits＠source.squeak.org 27 Apr '15

27 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1261.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1261 Author: cb Time: 27 April 2015, 1:31:34.958 pm UUID: a70f7860-6338-4b1a-a62d-15501ed6b8b8 Ancestors: VMMaker.oscog-cb.1260 added a method to be able to simulate non spur images. fixed a typo... =============== Diff against VMMaker.oscog-cb.1260 =============== Item was added: + ----- Method: NewCoObjectMemorySimulatorLSB>>intAt:put: (in category 'memory access') ----- + intAt: byteAddress put: a32BitValue + ^self longAt: byteAddress put: (a32BitValue bitAnd: 16rFFFFFFFF)! Item was changed: ----- Method: StackToRegisterMappingCogit>>allocateEqualsEqualsRegistersArgNeedsReg:rcvrNeedsReg:into: (in category 'bytecode generator support') ----- allocateEqualsEqualsRegistersArgNeedsReg: argNeedsReg rcvrNeedsReg: rcvrNeedsReg into: binaryBlock <inline: true> | argReg rcvrReg | self assert: (argNeedsReg or: [rcvrNeedsReg]). argNeedsReg ifTrue: [rcvrNeedsReg ifTrue: [self allocateRegForStackTopTwoEntriesInto: [:rTop :rNext| argReg := rTop. rcvrReg := rNext]. self ssTop popToReg: argReg. (self ssValue: 1) popToReg: rcvrReg] ifFalse: + [argReg := self allocateRegForStackEntryAt: 0. - [argReg := self self allocateRegForStackEntryAt: 0. self ssTop popToReg: argReg]] ifFalse: [self assert: rcvrNeedsReg. rcvrReg := self allocateRegForStackEntryAt: 1. (self ssValue:1) popToReg: rcvrReg]. self assert: (argNeedsReg not or: [argReg notNil]). self assert: (rcvrNeedsReg not or: [rcvrReg notNil]). binaryBlock value: rcvrReg value: argReg.!

1 0

VM Maker: VMMaker.oscog-cb.1260.mcz
by commits＠source.squeak.org 27 Apr '15

27 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1260.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1260 Author: cb Time: 27 April 2015, 10:31:56.371 am UUID: 5727199d-3cf7-4bc6-b881-d17da3761458 Ancestors: VMMaker.oscog-cb.1259 After hours of debugging, I realized an assertion was failing but the SistaVM is working :-/. I fixed the trap logic. Now I'll compile the VM on linux and see what's going on. =============== Diff against VMMaker.oscog-cb.1259 =============== Item was changed: ----- Method: CoInterpreter>>ceSistaTrap (in category 'trampolines') ----- ceSistaTrap + "When we arrive here, the value that trapped is pushed on stack" <api> <option: #SistaVM> + | context | - | context obj | instructionPointer := self popStack. context := self ensureFrameIsMarried: framePointer SP: stackPointer. - "If there is a trap, the object is supposed to remain on - the stack, but the cogit always removes it. So restore it here." - obj := self stackTop. self push: context. - self push: obj. self push: instructionPointer. ^self ceSendAbort: (objectMemory splObj: SelectorSistaTrap) to: context numArgs: 1! Item was changed: ----- Method: StackInterpreter>>respondToSistaTrap (in category 'sista bytecodes') ----- respondToSistaTrap + | ourContext | - | ourContext tos | <sharedCodeInCase: #unconditionnalTrapBytecode> messageSelector := objectMemory splObj: SelectorSistaTrap. - tos := self internalPopStack. ourContext := self ensureFrameIsMarried: localFP SP: localSP. - messageSelector = objectMemory nilObject ifTrue: - [self error: 'Sista trap but no trap selector installed']. self internalPush: ourContext. - self internalPush: tos. argumentCount := 1. self normalSend!

1 0

[commit][3314] arc and modern C support plus compile on iphone arm-64 host
by commits＠squeakvm.org 27 Apr '15

27 Apr '15

Revision: 3314 Author: johnmci Date: 2015-04-26 16:58:12 -0700 (Sun, 26 Apr 2015) Log Message: ----------- arc and modern C support plus compile on iphone arm-64 host Modified Paths: -------------- trunk/platforms/iOS/plugins/ClipboardExtended/sqMacExtendedClipboard.h trunk/platforms/iOS/plugins/ClipboardExtended/sqMacExtendedClipboard.m trunk/platforms/iOS/plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m trunk/platforms/iOS/plugins/SqueakObjectiveC/PDColoredProgressView.m trunk/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.h trunk/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m trunk/platforms/iOS/vm/Common/Classes/Queue.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.h trunk/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.h trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.h trunk/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+vmAndImagePath.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.h trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.h trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m trunk/platforms/iOS/vm/Common/aio.c trunk/platforms/iOS/vm/Common/main.m trunk/platforms/iOS/vm/MainWindow.xib trunk/platforms/iOS/vm/OSX/SqViewBitmapConversion.m trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.h trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m trunk/platforms/iOS/vm/OSX/plugins/HostWindowPlugin/sqMacHostWindow.h trunk/platforms/iOS/vm/OSX/plugins/HostWindowPlugin/sqMacHostWindow.m trunk/platforms/iOS/vm/OSX/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.m trunk/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+clipboard.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+cursor.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXClipboardAPI.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXFileDirectoryInterface.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m trunk/platforms/iOS/vm/Resources-iPad/MainWindow-iPad.xib trunk/platforms/iOS/vm/SqueakPureObjc-Info.plist trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/project.pbxproj trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist trunk/platforms/iOS/vm/iPhone/Classes/SqueakNoOGLIPhoneAppDelegate.h trunk/platforms/iOS/vm/iPhone/Classes/SqueakNoOGLIPhoneAppDelegate.m trunk/platforms/iOS/vm/iPhone/Classes/SqueakUIController.m trunk/platforms/iOS/vm/iPhone/Classes/SqueakUIView.h trunk/platforms/iOS/vm/iPhone/Classes/SqueakUIView.m trunk/platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m trunk/platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+clipboard.h trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+clipboard.m trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+events.m trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+imageReadWrite.h trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+imageReadWrite.m trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication.m trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneClipboardAPI.m trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneFileDirectoryInterface.m trunk/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneInfoPlistInterface.m trunk/platforms/iOS/vm/iPhone/Classes/sqiPhoneScreenAndWindow.m trunk/platforms/iOS/vm/iPhone/config.h trunk/platforms/iOS/vm/iPhone/plugins/ClipboardExtended/sqMacExtendedClipboard.h trunk/platforms/iOS/vm/iPhone/plugins/ClipboardExtended/sqMacExtendedClipboard.m trunk/platforms/iOS/vm/iPhone/sqPlatformSpecific.h trunk/platforms/iOS/vm/src/vm/intplugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/platforms/iOS/vm/src/vm/sqNamedPrims.h Modified: trunk/platforms/iOS/plugins/ClipboardExtended/sqMacExtendedClipboard.h =================================================================== --- trunk/platforms/iOS/plugins/ClipboardExtended/sqMacExtendedClipboard.h 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/plugins/ClipboardExtended/sqMacExtendedClipboard.h 2015-04-26 23:58:12 UTC (rev 3314) @@ -29,10 +29,15 @@ */ /* The virtual machine proxy definition */ #include "sqVirtualMachine.h" +#ifdef BUILD_FOR_OSX +typedef NSPasteboard * CLIPBOARDTYPE; +#else +typedef UIPasteboard * CLIPBOARDTYPE; +#endif -void sqPasteboardClear( void * inPasteboard ); -sqInt sqPasteboardGetItemCount ( void *inPasteboard ); -sqInt sqPasteboardCopyItemFlavorsitemNumber ( void *inPasteboard, sqInt formatNumber ); +void sqPasteboardClear( CLIPBOARDTYPE inPasteboard ); +sqInt sqPasteboardGetItemCount ( CLIPBOARDTYPE inPasteboard ); +sqInt sqPasteboardCopyItemFlavorsitemNumber ( CLIPBOARDTYPE inPasteboard, sqInt formatNumber ); void * sqCreateClipboard( void ); -void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( void *inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength); -sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( void* inPasteboard, char* format, sqInt formatLength); +void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( CLIPBOARDTYPE inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength); +sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( CLIPBOARDTYPE inPasteboard, char* format, sqInt formatLength); Modified: trunk/platforms/iOS/plugins/ClipboardExtended/sqMacExtendedClipboard.m =================================================================== --- trunk/platforms/iOS/plugins/ClipboardExtended/sqMacExtendedClipboard.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/plugins/ClipboardExtended/sqMacExtendedClipboard.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -31,35 +31,33 @@ #include "sqMacExtendedClipboard.h" #import <Cocoa/Cocoa.h> - extern struct VirtualMachine* interpreterProxy; -void sqPasteboardClear(void *inPasteboard ) +void sqPasteboardClear(CLIPBOARDTYPE inPasteboard ) { NSArray *arrayOfTypes = [[NSArray alloc] init]; - [(NSPasteboard*) inPasteboard declareTypes: arrayOfTypes owner: nil]; - [arrayOfTypes release]; + [inPasteboard declareTypes: arrayOfTypes owner: nil]; } -sqInt sqPasteboardGetItemCount (void *inPasteboard ) +sqInt sqPasteboardGetItemCount (CLIPBOARDTYPE inPasteboard ) { - return [[(NSPasteboard *)inPasteboard types] count]; + return [[inPasteboard types] count]; } -sqInt sqPasteboardCopyItemFlavorsitemNumber ( void *inPasteboard, sqInt formatNumber ) +sqInt sqPasteboardCopyItemFlavorsitemNumber ( CLIPBOARDTYPE inPasteboard, sqInt formatNumber ) { sqInt formatTypeLength; sqInt flavorCount; - flavorCount = [[(NSPasteboard *)inPasteboard types] count]; + flavorCount = [[inPasteboard types] count]; if (formatNumber > flavorCount) { return interpreterProxy->nilObject(); } - NSString *formatType = [[(NSPasteboard *)inPasteboard types] objectAtIndex: formatNumber-1]; + NSString *formatType = [inPasteboard types][formatNumber-1]; const char *utf8data = [formatType UTF8String]; formatTypeLength = strlen(utf8data); @@ -72,42 +70,35 @@ void * sqCreateClipboard( void ) { - return (void*) [NSPasteboard generalPasteboard]; + return (__bridge void*) [NSPasteboard generalPasteboard]; } -void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( void *inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength) +void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( CLIPBOARDTYPE inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength) { NSString *formatType = [[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding]; NSData* data = [[NSData alloc ] initWithBytes: inData length: dataLength]; NSArray *arrayOfTypes = [[NSArray alloc] initWithObjects: formatType,nil]; - [(NSPasteboard *)inPasteboard declareTypes: arrayOfTypes owner: nil]; - [(NSPasteboard *)inPasteboard setData: data forType: formatType]; + [inPasteboard declareTypes: arrayOfTypes owner: nil]; + [inPasteboard setData: data forType: formatType]; - [arrayOfTypes release]; - [data release]; - [formatType release]; } -sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( void *inPasteboard, char* format, sqInt formatLength) +sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( CLIPBOARDTYPE inPasteboard, char* format, sqInt formatLength) { NSString *formatType = [[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding]; NSArray *arrayOfTypes = [[NSArray alloc] initWithObjects: formatType,nil]; - NSString *type= [(NSPasteboard *)inPasteboard availableTypeFromArray: arrayOfTypes]; + NSString *type= [inPasteboard availableTypeFromArray: arrayOfTypes]; if (type == NULL) { - [formatType release]; - [arrayOfTypes release]; return interpreterProxy->nilObject(); } - NSData *dataBuffer = [(NSPasteboard *)inPasteboard dataForType: type]; + NSData *dataBuffer = [inPasteboard dataForType: type]; sqInt dataLength = [dataBuffer length]; sqInt outData = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), dataLength ); char *outDataPtr = (char *) interpreterProxy->firstIndexableField(outData); [dataBuffer getBytes: outDataPtr]; - [formatType release]; - [arrayOfTypes release]; return outData; } \ No newline at end of file Modified: trunk/platforms/iOS/plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m =================================================================== --- trunk/platforms/iOS/plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -21,7 +21,7 @@ MenuRef GetMenuHandle(MenuID menuID){ NSMenu *mainMenu = [[NSApplication sharedApplication] mainMenu]; NSMenuItem *menuRef = [mainMenu itemAtIndex: menuID]; - MenuRef handle = (MenuRef)menuRef; + MenuRef handle = (__bridge MenuRef)menuRef; return handle; }; @@ -222,7 +222,7 @@ MenuID GetMenuID(MenuRef menu){ NSMenu *mainMenu = [[NSApplication sharedApplication] mainMenu]; - NSMenuItem *menuItem = (NSMenuItem *) menu; + NSMenuItem *menuItem = (__bridge NSMenuItem *) menu; return (MenuID) [mainMenu indexOfItem: menuItem]; }; @@ -273,6 +273,6 @@ MenuItemIndex * outIndex){ NSMenu *mainMenu = [[NSApplication sharedApplication] mainMenu]; - NSMenuItem *inputMenu = (NSMenuItem *) inMenu; + NSMenuItem *inputMenu = (__bridge NSMenuItem *) inMenu; OSType inputCommandID = inCommandID; }; \ No newline at end of file Modified: trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h =================================================================== --- trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h 2015-04-26 23:58:12 UTC (rev 3314) @@ -89,8 +89,8 @@ @property (nonatomic) AudioStreamBasicDescription* inputFormat; @property (nonatomic) AudioQueueBufferRef * outputBuffers; @property (nonatomic) AudioQueueBufferRef * inputBuffers; -@property (nonatomic,retain) Queue* soundOutQueue; -@property (nonatomic,retain) Queue* soundInQueue; +@property (nonatomic,strong) Queue* soundOutQueue; +@property (nonatomic,strong) Queue* soundInQueue; @end @interface soundAtom : NSObject { @@ -98,7 +98,7 @@ usqInt byteCount; usqInt startOffset; } -- (id) initWith: (char*) buffer count: (usqInt) bytes; +- (instancetype) initWith: (char*) buffer count: (usqInt) bytes; @property (nonatomic,assign) char * data; @property (nonatomic,assign) usqInt byteCount; Modified: trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m =================================================================== --- trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -40,15 +40,14 @@ #define SqueakFrameSize 4 // guaranteed (see class SoundPlayer) extern struct VirtualMachine* interpreterProxy; -void MyAudioQueueOutputCallback (void *inUserData, +void MyAudioQueueOutputCallback (sqSqueakSoundCoreAudio *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer); -void MyAudioQueueOutputCallback (void *inUserData, +void MyAudioQueueOutputCallback (sqSqueakSoundCoreAudio *myInstance, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer) { - sqSqueakSoundCoreAudio * myInstance = ( sqSqueakSoundCoreAudio *)inUserData; soundAtom *atom = [myInstance.soundOutQueue returnOldest]; if (!atom) { @@ -60,7 +59,6 @@ atom = [myInstance.soundOutQueue returnAndRemoveOldest]; inBuffer->mAudioDataByteSize = (int) atom.byteCount; memcpy(inBuffer->mAudioData,atom.data,atom.byteCount); - [atom release]; //NSLog(@"%i Fill sound buffer with %i bytesA",ioMSecs(),inBuffer->mAudioDataByteSize); } else { inBuffer->mAudioDataByteSize = (int) MIN(atom.byteCount - atom.startOffset,inBuffer->mAudioDataBytesCapacity); @@ -68,7 +66,6 @@ atom.startOffset = atom.startOffset + inBuffer->mAudioDataByteSize; if (atom.startOffset == atom.byteCount) { atom = [myInstance.soundOutQueue returnAndRemoveOldest]; //ignore now it's empty - [atom release]; } //NSLog(@"%i Fill sound buffer with %i bytesB",ioMSecs(),inBuffer->mAudioDataByteSize); } @@ -87,7 +84,7 @@ { sqInt isRunning; UInt32 size = sizeof(isRunning); - sqSqueakSoundCoreAudio * myInstance = ( sqSqueakSoundCoreAudio *)inUserData; + sqSqueakSoundCoreAudio * myInstance = (__bridge sqSqueakSoundCoreAudio *)inUserData; AudioQueueGetProperty (inAQ, kAudioQueueProperty_IsRunning, &isRunning, &size); myInstance.outputIsRunning = isRunning; @@ -111,7 +108,7 @@ UInt32 inNumberPacketDescriptions, const AudioStreamPacketDescription *inPacketDescs) { - sqSqueakSoundCoreAudio * myInstance = ( sqSqueakSoundCoreAudio *)inUserData; + sqSqueakSoundCoreAudio * myInstance = (__bridge sqSqueakSoundCoreAudio *)inUserData; if (!myInstance.inputIsRunning) return; @@ -119,7 +116,6 @@ if (inNumberPacketDescriptions > 0) { soundAtom *atom = [[soundAtom alloc] initWith: inBuffer->mAudioData count: inBuffer->mAudioDataByteSize]; [myInstance.soundInQueue addItem: atom]; - [atom release]; } AudioQueueEnqueueBuffer (inAQ, @@ -136,7 +132,7 @@ @synthesize byteCount; @synthesize startOffset; -- initWith: (char*) buffer count: (usqInt) bytes { +- (instancetype) initWith: (char*) buffer count: (usqInt) bytes { data = malloc(bytes); memcpy(data,buffer,bytes); byteCount = bytes; @@ -149,7 +145,6 @@ data = 0; byteCount = 0; startOffset = 0; - [super dealloc]; } @end @@ -182,8 +177,8 @@ self.inputFormat = calloc(1,sizeof(AudioStreamBasicDescription)); self.outputBuffers = calloc((unsigned)kNumberOfBuffers,sizeof(AudioQueueBufferRef)); self.inputBuffers = calloc((unsigned) kNumberOfBuffers,sizeof(AudioQueueBufferRef)); - soundOutQueue = [Queue new]; - soundInQueue = [Queue new]; + soundOutQueue = [[Queue alloc] init]; + soundInQueue = [[Queue alloc] init]; return 1; } @@ -221,14 +216,14 @@ /* we want to create a new audio queue only if we have to */ - if (self.outputAudioQueue == nil || (memcmp(&check,self.outputFormat,sizeof(AudioStreamBasicDescription) != 0))) { + if (self.outputAudioQueue == nil || (memcmp(&check,self.outputFormat,(size_t)(sizeof(AudioStreamBasicDescription) != 0)))) { AudioQueueRef newQueue; //NSLog(@"%i create new audioqueue",ioMSecs()); if (self.outputAudioQueue) [self snd_StopAndDispose]; *self.outputFormat = check; - result = AudioQueueNewOutput (self.outputFormat, &MyAudioQueueOutputCallback, - (void*) self, + result = AudioQueueNewOutput (self.outputFormat, (void*) &MyAudioQueueOutputCallback, + (__bridge void*) self, NULL, NULL, 0, @@ -238,7 +233,7 @@ return interpreterProxy->primitiveFail(); self.outputAudioQueue = newQueue; - AudioQueueAddPropertyListener (self.outputAudioQueue, kAudioQueueProperty_IsRunning, MyAudioQueuePropertyListenerProc, self); + AudioQueueAddPropertyListener (self.outputAudioQueue, kAudioQueueProperty_IsRunning, MyAudioQueuePropertyListenerProc, (__bridge void *)(self)); self.bufferSizeForOutput = (unsigned) (SqueakFrameSize * nChannels * frameCount * 2); int i; @@ -285,7 +280,7 @@ OSStatus result = AudioQueueDispose (self.outputAudioQueue,true); #pragma unused(result) self.outputAudioQueue = nil; - self.soundOutQueue = [Queue new]; + self.soundOutQueue = [[Queue alloc] init]; return 1; } @@ -314,7 +309,6 @@ soundAtom *atom = [[soundAtom alloc] initWith: arrayIndex+startIndex count: (unsigned) (byteCount-startIndex)]; [self.soundOutQueue addItem: atom]; - [atom release]; if (!self.outputIsRunning) { int i; @@ -365,7 +359,7 @@ AudioQueueRef newQueue; OSStatus result = AudioQueueNewInput (self.inputFormat, &MyAudioQueueInputCallback, - (void*) self, + (__bridge void*) self, NULL, NULL, 0, @@ -401,7 +395,7 @@ return 0; result = AudioQueueDispose (self.inputAudioQueue,true); self.inputAudioQueue = nil; - self.soundInQueue = [Queue new]; + self.soundInQueue = [[Queue alloc] init]; return 1; } @@ -429,7 +423,6 @@ atom = [self.soundInQueue returnAndRemoveOldest]; memcpy(arrayIndex+start,atom.data,atom.byteCount); count= MIN(atom.byteCount, bufferSizeInBytes - start); - [atom release]; return count / (SqueakFrameSize / 2) / self.inputChannels; } else { count= MIN(atom.byteCount-atom.startOffset, bufferSizeInBytes - start); @@ -437,7 +430,6 @@ atom.startOffset = atom.startOffset + (count); if (atom.startOffset == atom.byteCount) { atom = [self.soundInQueue returnAndRemoveOldest]; //ignore now it's empty - [atom release]; } return count / (SqueakFrameSize / 2) / self.inputChannels; } Modified: trunk/platforms/iOS/plugins/SqueakObjectiveC/PDColoredProgressView.m =================================================================== --- trunk/platforms/iOS/plugins/SqueakObjectiveC/PDColoredProgressView.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/plugins/SqueakObjectiveC/PDColoredProgressView.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -104,15 +104,10 @@ } - (void) setTintColor: (UIColor *) aColor { - [_tintColor release]; - _tintColor = [aColor retain]; + _tintColor = aColor; } -- (void)dealloc { - [super dealloc]; - [_tintColor release]; -} @end Modified: trunk/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.h =================================================================== --- trunk/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.h 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.h 2015-04-26 23:58:12 UTC (rev 3314) @@ -74,24 +74,24 @@ @interface SqueakProxy : NSObject { sqInt sem; - Protocol* protocol; - NSInvocation* invocation; + Protocol* __unsafe_unretained protocol; + NSInvocation* __weak invocation; NSConditionLock* lockForSqueak; NSMutableDictionary *sigs; id target; sqInt callbackid; BOOL isCarbonVM; } -- (id) initWithSemaphore: (sqInt) squeakSem protocolNSString: (NSString *) nameString target: (id) aTarget; +- (instancetype) initWithSemaphore: (sqInt) squeakSem protocolNSString: (NSString *) nameString target: (id) aTarget; - (void) setReturnValue: (void*) pointer; - (BOOL) isDataTypeAware; - (void) setIsCarbonVM; @property (nonatomic,assign) sqInt sem; -@property (nonatomic,assign) Protocol* protocol; -@property (nonatomic,assign) NSInvocation* invocation; -@property (nonatomic,assign) NSConditionLock* lockForSqueak; -@property (nonatomic,assign) NSMutableDictionary *sigs; -@property (nonatomic,retain) id target; +@property (nonatomic,unsafe_unretained) Protocol* protocol; +@property (weak, nonatomic) NSInvocation* invocation; +@property (nonatomic) NSConditionLock* lockForSqueak; +@property (nonatomic) NSMutableDictionary *sigs; +@property (nonatomic,strong) id target; @property (nonatomic,assign) sqInt callbackid; @end Modified: trunk/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m =================================================================== --- trunk/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -44,8 +44,8 @@ // #import "squeakProxy.h" +#include <dlfcn.h> - @implementation SqueakProxy @synthesize sem; @@ -56,7 +56,7 @@ @synthesize target; @synthesize callbackid; -- (id) initWithSemaphore: (sqInt) squeakSem protocolNSString: (NSString *) nameString target: aTarget +- (instancetype) initWithSemaphore: (sqInt) squeakSem protocolNSString: (NSString *) nameString target: aTarget { sem = squeakSem; if (nameString) @@ -69,7 +69,6 @@ } else { NSObject *dummy = [[NSObject alloc] init]; [self setTarget: dummy]; - [dummy release]; } lockForSqueak = [[NSConditionLock alloc] initWithCondition: 0]; @@ -80,7 +79,7 @@ return self; } -#include <dlfcn.h> + - (void) forwardInvocation: (NSInvocation*) anInvocation { NSDate *timeout; @@ -88,7 +87,7 @@ // NSLog(@"currentThread: %@", [NSThread currentThread]); SEL selector = [anInvocation selector]; NSString *selectorString = NSStringFromSelector(selector); - if (![sigs objectForKey: selectorString]) { + if (!sigs[selectorString]) { [anInvocation invokeWithTarget: target]; return; } @@ -97,8 +96,7 @@ { // NSLog(@"inside lock 0"); [lockForSqueak unlockWithCondition: 1]; - [timeout release]; - invocation = [anInvocation retain]; + invocation = anInvocation; // NSLog(@"signalling squeak"); interpreterProxy->signalSemaphoreWithIndex(sem); @@ -109,16 +107,12 @@ if([lockForSqueak lockWhenCondition: 2 beforeDate: (timeout = [[NSDate alloc] initWithTimeIntervalSinceNow: 5.0])]) { // NSLog(@"inside lock 2"); - [timeout release]; - [invocation release]; invocation = nil; [lockForSqueak unlockWithCondition: 0]; } else { // NSLog(@"failed lock 2"); - [timeout release]; - [invocation release]; invocation = nil; [lockForSqueak unlockWithCondition: 0]; } @@ -126,7 +120,6 @@ } else { - [timeout release]; //NSLog(@"failed lock 0"); } } @@ -145,7 +138,7 @@ NSString *selectorString = NSStringFromSelector (selector); - if (sigAsString = [sigs objectForKey: selectorString]) { + if (sigAsString = sigs[selectorString]) { if (protocol) { struct objc_method_description methodDescription; @@ -176,7 +169,7 @@ NSString *which = NSStringFromSelector(selector); - if ([sigs objectForKey: which]) + if (sigs[which]) return true; return false; @@ -194,13 +187,6 @@ isCarbonVM = YES; } -- (void) dealloc -{ - [lockForSqueak release]; - [sigs release]; - [target release]; - [super dealloc]; -} @end Modified: trunk/platforms/iOS/vm/Common/Classes/Queue.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/Queue.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/Queue.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -52,6 +52,8 @@ */ +/* Arc version */ + #import "Queue.h" @@ -59,7 +61,7 @@ // Initialize a empty mutable array for queue items // which we can fill -- (id) init +- (instancetype) init { self = [super init]; { @@ -78,7 +80,6 @@ anObject = [mItemArray lastObject]; if (anObject) { - [anObject retain]; [mItemArray removeLastObject]; } } @@ -113,11 +114,5 @@ return mItemArray; } -- (void) dealloc -{ - [mItemArray release]; - - [super dealloc]; -} @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.h =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.h 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.h 2015-04-26 23:58:12 UTC (rev 3314) @@ -44,15 +44,15 @@ @interface sqSqueakAppDelegate : NSObject { sqSqueakMainApplication *squeakApplication; + NSThread *squeakThread; } -@property (nonatomic,retain) sqSqueakMainApplication *squeakApplication; +@property (nonatomic,strong) sqSqueakMainApplication *squeakApplication; +@property (nonatomic, strong) NSThread *squeakThread; - (void) makeMainWindowOnMainThread ; - (void) makeMainWindow; - (id) createPossibleWindow; -- (NSTimeInterval) squeakUIFlushPrimaryDeferNMilliseconds; -- (sqSqueakMainApplication *) makeApplicationInstance; - (void) workerThreadStart; - (void) singleThreadStart; - +- (NSTimeInterval) squeakUIFlushPrimaryDeferNMilliseconds; @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -42,7 +42,7 @@ #import "sqMacHostWindow.h" @implementation sqSqueakAppDelegate -@synthesize squeakApplication; +@synthesize squeakApplication,squeakThread; - (void) makeMainWindow { @@ -60,7 +60,7 @@ width = ((unsigned) getSavedWindowSize()) >> 16; height = getSavedWindowSize() & 0xFFFF; windowBlock = AddWindowBlock(); - windowBlock-> handle = createdWindow; + windowBlock->handle = createdWindow; windowBlock->context = nil; windowBlock->updateArea = CGRectZero; width = (usqInt) ioScreenSize() >> 16; @@ -88,14 +88,14 @@ - (void) workerThreadStart { // Run the squeak process in a worker thread - NSThread* myThread = [[NSThread alloc] initWithTarget: self.squeakApplication + squeakThread = [[NSThread alloc] initWithTarget: self.squeakApplication selector: @selector(runSqueak) object:nil]; #if COGVM - [myThread setStackSize: [myThread stackSize]*4]; + [squeakThread setStackSize: [squeakThread stackSize]*4]; #endif - [myThread start]; + [squeakThread start]; } - (void) singleThreadStart { @@ -106,13 +106,9 @@ target: self.squeakApplication argument: nil order: 1 - modes: [NSArray arrayWithObject: NSDefaultRunLoopMode]]; + modes: @[NSDefaultRunLoopMode]]; } -- (void)dealloc { - [squeakApplication release]; - [super dealloc]; -} @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -53,6 +53,11 @@ aioPoll(0); + if ([[NSThread currentThread] isCancelled]) { + gQuitNowRightNow = YES; + return 0; + } + if ([getMainWindowDelegate() forceUpdateFlush]) { [getMainWindowDelegate() ioForceDisplayUpdate]; } @@ -83,4 +88,4 @@ NSLog(@"evt.type %i keyboard pc %i cc %i uc %i m %i",evt->type,((sqKeyboardEvent *)evt)->pressCode,((sqKeyboardEvent *) evt)->charCode,((sqKeyboardEvent *) evt)->utf32Code,((sqKeyboardEvent *) evt)->modifiers); } */ return 0; -} \ No newline at end of file +} Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -56,13 +56,13 @@ filenameSize is size of file name fType and fCreator is type and creator codes (4 bytes preallocated) */ - NSAutoreleasePool * pool = [NSAutoreleasePool new]; - sqInt status = [gDelegateApp.squeakApplication.fileDirectoryLogic dir_GetMacFileTypeAndCreator: filename - fileNameSize: filenameSize - fType: fType - fCreator: fCreator]; - [pool drain]; + @autoreleasepool { + sqInt status = [gDelegateApp.squeakApplication.fileDirectoryLogic dir_GetMacFileTypeAndCreator: filename + fileNameSize: filenameSize + fType: fType + fCreator: fCreator]; return status; + } } sqInt dir_SetMacFileTypeAndCreator(char *filename, sqInt filenameSize, char *fType, char *fCreator) { @@ -71,13 +71,14 @@ filenameSize is size of file name fType and fCreator is type and creator codes (4 bytes) */ - NSAutoreleasePool * pool = [NSAutoreleasePool new]; + @autoreleasepool { sqInt status = [gDelegateApp.squeakApplication.fileDirectoryLogic dir_SetMacFileTypeAndCreator: filename fileNameSize: filenameSize fType: fType fCreator: fCreator]; - [pool drain]; + return status; + } } sqInt dir_Delimitor(void) @@ -102,9 +103,8 @@ /*Implementation notes if pathStringLength = 0 then we use the current working directory if pathStringLength > 0 then we resolve the pathString and alias */ - NSAutoreleasePool * pool = [NSAutoreleasePool new]; - - sqInt status = + @autoreleasepool { + sqInt status = [gDelegateApp.squeakApplication.fileDirectoryLogic dir_Lookup: pathString length: pathStringLength index: index @@ -114,16 +114,15 @@ modificationDate: modificationDate isDirectory: isDirectory sizeIfFile: sizeIfFile]; - [pool drain]; return status; + } } sqInt dir_EntryLookup(char *pathString, sqInt pathStringLength, char* nameString, sqInt nameStringLength, /* outputs: */ char *name, sqInt *nameLength, sqInt *creationDate, sqInt *modificationDate, sqInt *isDirectory, squeakFileOffsetType *sizeIfFile) { - NSAutoreleasePool * pool = [NSAutoreleasePool new]; - + @autoreleasepool { sqInt status = [gDelegateApp.squeakApplication.fileDirectoryLogic dir_EntryLookup: pathString length: pathStringLength @@ -135,36 +134,34 @@ modificationDate: modificationDate isDirectory: isDirectory sizeIfFile: sizeIfFile]; - [pool drain]; return status; + } } sqInt dir_Create(char *pathString, sqInt pathStringLength){ //API Documented - NSAutoreleasePool * pool = [NSAutoreleasePool new]; + @autoreleasepool { sqInt status = [gDelegateApp.squeakApplication.fileDirectoryLogic dir_Create: pathString length: pathStringLength]; - [pool drain]; return status; + } } sqInt dir_Delete(char *pathString, sqInt pathStringLength){ - NSAutoreleasePool * pool = [NSAutoreleasePool new]; + @autoreleasepool { sqInt status = [gDelegateApp.squeakApplication.fileDirectoryLogic dir_Delete: pathString length: pathStringLength]; - [pool drain]; return status; + } } -NSString* createFilePathFromString(char * aFilenameString, +NSString* createFilePathFromString(char * aFilenameString, sqInt filenameLength, sqInt resolveAlias) { - - NSAutoreleasePool * pool = [NSAutoreleasePool new]; - NSString * filePath = [[[NSString alloc] initWithBytes: aFilenameString length: (NSUInteger) filenameLength encoding: NSUTF8StringEncoding] autorelease]; + @autoreleasepool { + NSString * filePath = [[NSString alloc] initWithBytes: aFilenameString length: (NSUInteger) filenameLength encoding: NSUTF8StringEncoding]; if (!filePath) { - [pool drain]; return NULL; } @@ -175,12 +172,11 @@ NSString *newFilePath = [gDelegateApp.squeakApplication.fileDirectoryLogic resolvedAliasFiles: owningDirectoryPath]; filePath = [newFilePath stringByAppendingPathComponent: [filePath lastPathComponent]]; } - [filePath retain]; - [pool drain]; return filePath; + } } -sqInt sqGetFilenameFromString(char * aCharBuffer, char * aFilenameString, +sqInt sqGetFilenameFromString(char * aCharBuffer, char * aFilenameString, sqInt filenameLength, sqInt resolveAlias) { //API Documented BOOL ok; @@ -194,7 +190,6 @@ //1000 is coded by callers, really should pass in, but historical issue, this also includes null byte which is accounted for by maxLength //Obviously this is a problem that lets a caller do a buffer overflow? - [filePath release]; return 0; } @@ -205,4 +200,4 @@ sqInt dir_PathToWorkingDir(char *pathName, sqInt pathNameMax){ //API Documented return 0; -} \ No newline at end of file +} Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.h =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.h 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.h 2015-04-26 23:58:12 UTC (rev 3314) @@ -80,9 +80,9 @@ fCreator: (char *) fCreator; - (NSString *) resolvedAliasFiles: (NSString *) filePath; -@property (nonatomic,retain) NSString* lastPathForDirLookup; +@property (nonatomic,strong) NSString* lastPathForDirLookup; @property (nonatomic,assign) NSInteger lastIndexForDirLookup; -@property (nonatomic,retain) NSArray * directoryContentsForDirLookup; +@property (nonatomic,strong) NSArray * directoryContentsForDirLookup; @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -103,7 +103,7 @@ } if (pathStringLength > 0) - directoryPath = [[[NSString alloc] initWithBytes: pathString length: (NSUInteger) pathStringLength encoding: NSUTF8StringEncoding] autorelease]; + directoryPath = [[NSString alloc] initWithBytes: pathString length: (NSUInteger) pathStringLength encoding: NSUTF8StringEncoding]; if (directoryPath == NULL) return BAD_PATH; @@ -135,7 +135,7 @@ if (index < 1 || (NSUInteger) index > [directoryContentsForDirLookup count]) return NO_MORE_ENTRIES; - filePath = [ directoryContentsForDirLookup objectAtIndex: (NSUInteger) (index-1)]; + filePath = directoryContentsForDirLookup[(NSUInteger) (index-1)]; filePath = [[ lastPathForDirLookup stringByAppendingString: @"/"] stringByAppendingString: filePath] ; fileName = [[filePath lastPathComponent] precomposedStringWithCanonicalMapping]; strlcpy(name,[fileName UTF8String],256); @@ -155,19 +155,20 @@ if (!fileAttributes) { return ENTRY_FOUND; } - fileType = [fileAttributes objectForKey: NSFileType]; + fileType = fileAttributes[NSFileType]; *isDirectory = [fileType isEqualToString: NSFileTypeDirectory] ? 1 : 0; } else { NSDictionary *fileAttributesPossibleAlias = [fileMgr attributesOfItemAtPath: newFilePath error: &error]; // do symbolic link - fileAttributes = fileAttributesPossibleAlias; + if (!fileAttributes) + fileAttributes = fileAttributesPossibleAlias; - fileType = [fileAttributesPossibleAlias objectForKey: NSFileType]; + fileType = fileAttributesPossibleAlias[NSFileType]; *isDirectory = [fileType isEqualToString: NSFileTypeDirectory] ? 1 : 0; } - *creationDate = convertToSqueakTime([fileAttributes objectForKey: NSFileCreationDate ]); - *modificationDate = convertToSqueakTime([fileAttributes objectForKey: NSFileModificationDate]); - *sizeIfFile = [[fileAttributes objectForKey: NSFileSize] integerValue]; + *creationDate = convertToSqueakTime(fileAttributes[NSFileCreationDate]); + *modificationDate = convertToSqueakTime(fileAttributes[NSFileModificationDate]); + *sizeIfFile = [fileAttributes[NSFileSize] integerValue]; /* POSSIBLE IPHONE BUG CHECK */ if (*creationDate == 0) @@ -197,7 +198,6 @@ NSError *error; ok = [fileMgr createDirectoryAtPath: directoryPath withIntermediateDirectories: NO attributes: NULL error: &error]; - [directoryPath release]; return ok; } @@ -224,7 +224,6 @@ if (directoryContentsForDirLookupCheck == NULL || ([directoryContentsForDirLookupCheck count])) { /* We don't recursive delete directory, that is too dangerous, let the squeak programmer do it which is why if the directory content count is > 0 we abort the delete */ - [directoryPath release]; return 0; } @@ -239,8 +238,6 @@ if (lastPathForDirLookup) { self.lastPathForDirLookup = NULL; } - - [directoryPath release]; return ok; } @@ -268,12 +265,11 @@ NSError *error; NSDictionary * fileAttributes = [fileMgr attributesOfItemAtPath:filePath error:&error]; - [filePath release]; if (!fileAttributes) return 0; - NSNumber *typeCode = [fileAttributes objectForKey: NSFileHFSTypeCode]; - NSNumber *creatorCode = [fileAttributes objectForKey: NSFileHFSCreatorCode]; + NSNumber *typeCode = fileAttributes[NSFileHFSTypeCode]; + NSNumber *creatorCode = fileAttributes[NSFileHFSCreatorCode]; if (creatorCode == NULL || typeCode == NULL) return 0; @@ -302,19 +298,12 @@ return 0; } - NSNumber *typeCode,*creatorCode; - typeCode = [NSNumber numberWithUnsignedLong: CFSwapInt32HostToBig(*((uint32_t *) fType))]; - creatorCode = [NSNumber numberWithUnsignedLong: CFSwapInt32HostToBig(*((uint32_t *) fCreator))]; + NSNumber *typeCode = [NSNumber numberWithUnsignedLong: CFSwapInt32HostToBig(*((uint32_t *) fType))]; + NSNumber *creatorCode = [NSNumber numberWithUnsignedLong: CFSwapInt32HostToBig(*((uint32_t *) fCreator))]; - NSMutableDictionary *fileAttributes = [NSMutableDictionary new]; - [fileAttributes setObject: typeCode forKey: NSFileHFSTypeCode]; - [fileAttributes setObject: creatorCode forKey: NSFileHFSCreatorCode]; - - BOOL ok=[fileMgr setAttributes: fileAttributes ofItemAtPath: filePath + BOOL ok=[fileMgr setAttributes: @{ NSFileHFSTypeCode : typeCode, NSFileHFSCreatorCode: creatorCode} ofItemAtPath: filePath error: NULL]; - [fileAttributes release]; - [filePath release]; return ok; } @@ -322,10 +311,4 @@ return filePath; } -- (void)dealloc { - [super dealloc]; - [lastPathForDirLookup release]; - [directoryContentsForDirLookup release]; -} - @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.h =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.h 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.h 2015-04-26 23:58:12 UTC (rev 3314) @@ -43,7 +43,7 @@ } - (void) parseInfoPlist; -@property (nonatomic,retain) NSUserDefaults* defaults; +@property (nonatomic,strong) NSUserDefaults* defaults; @property (nonatomic,assign) BOOL SqueakUseFileMappedMMAP; @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -55,9 +55,9 @@ return; } -- (void)dealloc { - [super dealloc]; - [defaults release]; -} +//- (void)dealloc { +// [super dealloc]; +// [defaults release]; +//} @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -60,7 +60,7 @@ if (indexNumber < 0) /* VM argument */ { if (-indexNumber <= [self.argsArguments count]) - return (char *) [self.argsArguments objectAtIndex: (NSUInteger) (-indexNumber - 1)]; + return (char *) [(self.argsArguments)[(NSUInteger) (indexNumber - 1)] cStringUsingEncoding: [self currentVMEncoding]]; } else { switch (indexNumber) { @@ -94,7 +94,7 @@ default: if ((indexNumber - 2) > 0 && ((indexNumber - 2) < [self.argsArguments count])) - return (char *) [[self.argsArguments objectAtIndex: (NSUInteger) (indexNumber - 2)] cStringUsingEncoding: [self currentVMEncoding]]; + return (char *) [(self.argsArguments)[(NSUInteger) (indexNumber - 2)] cStringUsingEncoding: [self currentVMEncoding]]; } } interpreterProxy->success(false); Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -68,10 +68,9 @@ ioProcessEvents(); id event = [eventQueue returnAndRemoveOldest]; if (event) { - NSAutoreleasePool * pool = [NSAutoreleasePool new]; - [self processAsOldEventOrComplexEvent: event placeIn: evt]; - [event release]; - [pool drain]; + @autoreleasepool { + [self processAsOldEventOrComplexEvent: event placeIn: evt]; + } } } Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -44,17 +44,16 @@ } - (BOOL) readImageIntoMemory { - NSAutoreleasePool * pool = [NSAutoreleasePool new]; + @autoreleasepool { const char * characterPathForImage = (const char *) [[NSFileManager defaultManager] fileSystemRepresentationWithPath: [self.imageNameURL path]]; sqImageFile f; if (!characterPathForImage) { - [pool drain]; return NO; } f = sqImageFileOpen(characterPathForImage, "rb"); readImageFromFileHeapSizeStartingAt(f, sqGetAvailableMemory(), (squeakFileOffsetType) 0); //This is a VM Callback sqImageFileClose(f); - [pool drain]; return YES; + } } @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+vmAndImagePath.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+vmAndImagePath.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+vmAndImagePath.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -80,7 +80,7 @@ if (!sqImageName) return; - self.imageNameURL = [NSURL fileURLWithPath: [NSString stringWithUTF8String: sqImageName] isDirectory: NO]; + self.imageNameURL = [NSURL fileURLWithPath: @(sqImageName) isDirectory: NO]; } - (const char *) getVMPath { Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.h =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.h 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.h 2015-04-26 23:58:12 UTC (rev 3314) @@ -71,19 +71,21 @@ - (void) setupBrowserLogic; - (void) setupSoundLogic; - (void) runSqueak; +- (void) tearDown; - (void) MenuBarRestore; - (void) ioExit; - (void) ioExitWithErrorCode: (int) ec; - (sqSqueakFileDirectoryInterface *) newFileDirectoryInterfaceInstance; +- (void) imageNamePut:(const char *) sqImageName; -@property (nonatomic,retain) NSURL* vmPathStringURL; -@property (nonatomic,retain) sqSqueakInfoPlistInterface* infoPlistInterfaceLogic; -@property (nonatomic,retain) sqSqueakSoundCoreAudio* soundInterfaceLogic; -@property (nonatomic,retain) NSURL* imageNameURL; +@property (nonatomic,strong) NSURL* vmPathStringURL; +@property (nonatomic,strong) sqSqueakInfoPlistInterface* infoPlistInterfaceLogic; +@property (nonatomic,strong) sqSqueakSoundCoreAudio* soundInterfaceLogic; +@property (nonatomic,strong) NSURL* imageNameURL; @property (nonatomic,assign) sqInt inputSemaphoreIndex; @property (nonatomic,assign) NSStringEncoding currentVMEncoding; -@property (nonatomic,retain) Queue* eventQueue; -@property (nonatomic,retain) sqSqueakFileDirectoryInterface * fileDirectoryLogic; -@property (nonatomic,retain) NSMutableArray* argsArguments; +@property (nonatomic,strong) Queue* eventQueue; +@property (nonatomic,strong) sqSqueakFileDirectoryInterface * fileDirectoryLogic; +@property (nonatomic,strong) NSMutableArray* argsArguments; @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -75,7 +75,7 @@ } - (sqSqueakInfoPlistInterface *) newSqSqueakInfoPlistInterfaceCreation { - return [sqSqueakInfoPlistInterface new]; + return [[sqSqueakInfoPlistInterface alloc] init]; } - (void) fetchPreferences { @@ -111,23 +111,25 @@ } - (void) setupEventQueue { - eventQueue = [Queue new]; + eventQueue = [[Queue alloc] init]; } - (void) setupBrowserLogic { } - (void) setupSoundLogic { - soundInterfaceLogic = [sqSqueakSoundCoreAudio new]; + soundInterfaceLogic = [[sqSqueakSoundCoreAudio alloc] init]; } - (sqSqueakFileDirectoryInterface *) newFileDirectoryInterfaceInstance { - return [sqSqueakFileDirectoryInterface new]; + return [[sqSqueakFileDirectoryInterface alloc] init]; } - (void) runSqueak { - NSAutoreleasePool * pool = [NSAutoreleasePool new]; //Needed since this is a worker thread, see comments in NSAutoreleasePool Class Reference about Threads - + @autoreleasepool { + extern BOOL gQuitNowRightNow; + gQuitNowRightNow=false; + [self setupFloat]; //JMM We have code for intel and powerpc float, but arm? [self setupErrorRecovery]; [self fetchPreferences]; @@ -135,7 +137,6 @@ fileDirectoryLogic = [self newFileDirectoryInterfaceInstance]; [self setVMPathFromApplicationDirectory]; if (![self.fileDirectoryLogic setWorkingDirectory]) { - [pool drain]; return; } @@ -153,12 +154,10 @@ [self findImageViaBundleOrPreferences]; if ([self ImageNameIsEmpty]) { - [pool drain]; return; } if (![self readImageIntoMemory]) { - [pool drain]; return; } @@ -170,10 +169,15 @@ [gDelegateApp makeMainWindow]; interpret(); - [pool drain]; //may not return here, could call exit() via quit image - [self release]; + [self tearDown]; + } + [NSThread exit]; } +- (void) tearDown{ + +} + - (void) MenuBarRestore { } @@ -190,14 +194,13 @@ } - (void)dealloc { - [infoPlistInterfaceLogic release]; - [soundInterfaceLogic release]; - [vmPathStringURL release]; - [imageNameURL release]; - [fileDirectoryLogic release]; - [eventQueue release]; +// [infoPlistInterfaceLogic release]; +// [soundInterfaceLogic release]; +// [vmPathStringURL release]; +// [imageNameURL release]; +// [fileDirectoryLogic release]; +// [eventQueue release]; sqMacMemoryFree(); - [super dealloc]; } @end @@ -229,4 +232,4 @@ /* Squeak epoch is Jan 1, 1901. Unix epoch is Jan 1, 1970: 17 leap years and 52 non-leap years later than Squeak. */ return unixTime + ((52*365UL + 17*366UL) * 24*60*60UL); -} \ No newline at end of file +} Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -53,7 +53,7 @@ sqSqueakScreenAndWindow *getMainWindowDelegate() { #ifdef BUILD_FOR_OSX - return ((NSWindow *) windowHandleFromIndex(1)).delegate; + return (windowHandleFromIndex(1)).delegate; #else return [gDelegateApp screenAndWindow]; #endif Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.h =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.h 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.h 2015-04-26 23:58:12 UTC (rev 3314) @@ -66,7 +66,7 @@ - (id) getMainView; - (void) ioForceDisplayUpdateFlush: (NSTimer*)theTimer; @property (nonatomic,assign) sqInt windowIndex; -@property (nonatomic,retain) NSTimer *blip; +@property (nonatomic,strong) NSTimer *blip; @property (nonatomic,assign) NSTimeInterval squeakUIFlushPrimaryDeferNMilliseconds; @property (nonatomic,assign) NSTimeInterval lastFlushTime; @property (nonatomic,assign) BOOL forceUpdateFlush; Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -40,6 +40,7 @@ #import "sqSqueakScreenAndWindow.h" #import "sqSqueakMainApplication+screen.h" #import "sqMacHostWindow.h" + #ifdef BUILD_FOR_OSX #import "SqueakOSXAppDelegate.h" extern SqueakOSXAppDelegate *gDelegateApp; @@ -64,7 +65,7 @@ @synthesize windowIndex; @synthesize blip,squeakUIFlushPrimaryDeferNMilliseconds,forceUpdateFlush,lastFlushTime,displayIsDirty; -- (id)init { +- (instancetype)init { self = [super init]; if (self) { // Initialization code here. @@ -112,11 +113,13 @@ lastFlushTime = [NSDate timeIntervalSinceReferenceDate]; self.displayIsDirty = NO; self.forceUpdateFlush = NO; - if ([NSThread isMainThread]) + + [[self getMainView] preDrawThelayers]; + + + dispatch_async(dispatch_get_main_queue(), ^{ [[self getMainView] drawThelayers]; - else { - [[self getMainView] performSelectorOnMainThread: @selector(drawThelayers) withObject: nil waitUntilDone: NO]; - } + }); } - (void) ioForceDisplayUpdate { @@ -200,6 +203,8 @@ } - (void)dealloc { - [super dealloc]; + if (blip) { + [blip invalidate]; + } } @end Modified: trunk/platforms/iOS/vm/Common/aio.c =================================================================== --- trunk/platforms/iOS/vm/Common/aio.c 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/aio.c 2015-04-26 23:58:12 UTC (rev 3314) @@ -31,6 +31,7 @@ */ #include "sqaio.h" +#include "sqMemoryAccess.h" #ifdef HAVE_CONFIG_H @@ -123,8 +124,6 @@ #define _DO_FLAG_TYPE() _DO(AIO_R, rd) _DO(AIO_W, wr) _DO(AIO_X, ex) -static int one= 1; - static aioHandler rdHandler[FD_SETSIZE]; static aioHandler wrHandler[FD_SETSIZE]; static aioHandler exHandler[FD_SETSIZE]; @@ -219,9 +218,9 @@ if (maxFd == 0) return 0; #endif + extern sqInt ioMSecs(void); + ms= (sqInt) ioMSecs(); - ms= (int) ioMSecs(); - for (;;) { struct timeval tv; Modified: trunk/platforms/iOS/vm/Common/main.m =================================================================== --- trunk/platforms/iOS/vm/Common/main.m 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/Common/main.m 2015-04-26 23:58:12 UTC (rev 3314) @@ -48,9 +48,9 @@ int main(int argc, char *argv[]) { - NSAutoreleasePool * pool = [NSAutoreleasePool new]; - int retVal = UIApplicationMain(argc, argv, nil, nil); - [pool drain]; - return retVal; + @autoreleasepool { + int retVal = UIApplicationMain(argc, argv, nil, nil); + return retVal; + } } #endif \ No newline at end of file Modified: trunk/platforms/iOS/vm/MainWindow.xib =================================================================== --- trunk/platforms/iOS/vm/MainWindow.xib 2015-04-22 18:36:16 UTC (rev 3313) +++ trunk/platforms/iOS/vm/MainWindow.xib 2015-04-26 23:58:12 UTC (rev 3314) @@ -1,172 +1,29 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> - <data> - <int key="IBDocument.SystemTarget">512</int> - <string key="IBDocument.SystemVersion">12C3006</string> - <string key="IBDocument.InterfaceBuilderVersion">2840</string> - <string key="IBDocument.AppKitVersion">1187.34</string> - <string key="IBDocument.HIToolboxVersion">625.00</string> - <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="NS.object.0">1926</string> - </object> - <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>IBProxyObject</string> - <string>IBUICustomObject</string> - <string>IBUIWindow</string> - </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - </object> - <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <string key="NS.key.0">PluginDependencyRecalculationVersion</string> - <integer value="1" key="NS.object.0"/> - </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBProxyObject" id="841351856"> - <string key="IBProxiedObjectIdentifier">IBFilesOwner</string> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - </object> - <object class="IBProxyObject" id="64004946"> - <string key="IBProxiedObjectIdentifier">IBFirstResponder</string> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - </object> - <object class="IBUICustomObject" id="664661524"> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - </object> - <object class="IBUIWindow" id="380026005"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">1316</int> - <object class="NSPSMatrix" key="NSFrameMatrix"/> - <string key="NSFrameSize">{320, 480}</string> - <reference key="NSSuperview"/> - <object class="NSColor" key="IBUIBackgroundColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MSAxIDEAA</bytes> - </object> - <bool key="IBUIOpaque">NO</bool> - <bool key="IBUIClearsContextBeforeDrawing">NO</bool> - <bool key="IBUIMultipleTouchEnabled">YES</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <bool key="IBUIVisibleAtLaunch">YES</bool> @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-cb.1259.mcz
by commits＠source.squeak.org 26 Apr '15

26 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1259.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1259 Author: cb Time: 26 April 2015, 6:19:03.384 pm UUID: c85fc97c-7c12-471f-ba77-932844e7db53 Ancestors: VMMaker.oscog-cb.1258 ooops I forgot an inline true so C code generation was not working because the blocks were not inlined. =============== Diff against VMMaker.oscog-cb.1258 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>extractMaybeBranchDescriptorInto: (in category 'bytecode generator support') ----- extractMaybeBranchDescriptorInto: fourArgBlock "Looks one instruction ahead of the current bytecodePC and answers its bytecode descriptor and its pc. If the instruction found is a branch, also answers the pc after the branch and the pc targetted by the branch" | primDescriptor nextPC nExts branchDescriptor targetBytecodePC postBranchPC | + <inline: true> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> primDescriptor := self generatorAt: byte0. nextPC := bytecodePC + primDescriptor numBytes. nExts := 0. [branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + bytecodeSetOffset. branchDescriptor isExtension] whileTrue: [nExts := nExts + 1. nextPC := nextPC + branchDescriptor numBytes]. (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [ ^ fourArgBlock value: branchDescriptor value: nextPC value: 0 value: 0 ]. targetBytecodePC := nextPC + branchDescriptor numBytes + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). postBranchPC := nextPC + branchDescriptor numBytes. fourArgBlock value: branchDescriptor value: nextPC value: postBranchPC value: targetBytecodePC!

1 0

VM Maker: VMMaker.oscog-cb.1258.mcz
by commits＠source.squeak.org 26 Apr '15

26 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1258.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1258 Author: cb Time: 26 April 2015, 5:50:58.72 pm UUID: db02f249-b7aa-4d3d-bd32-d6660ca3bee4 Ancestors: VMMaker.oscog-cb.1257 I removed a few methods in register allocation because there were too many indirection it was too hard to debug. I fixed the counter logic which was definitely crashing when the trampoline was used with a caller saved register for counters. I added #allocateRegPreferringCalleeSavedNotConflictingWith: to allocate a callee saved reg for counters if possible. The sistaCogit still does not start but I'm closer and closer... Added a few comments in register allocation. =============== Diff against VMMaker.oscog-cb.1257 =============== Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>allocateRegPreferringCalleeSavedNotConflictingWith: (in category 'simulation stack') ----- + allocateRegPreferringCalleeSavedNotConflictingWith: regMask + "If there are multiple free registers, choose one which is callee saved, + else just allocate a register not conflicting with regMask" + | reg | + reg := backEnd availableRegisterOrNilFor: ((self liveRegisters bitOr: regMask) bitOr: callerSavedRegMask). + ^ reg + ifNil: [ self allocateRegNotConflictingWith: regMask ] + ifNotNil: [ reg ]! Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>genExecutionCountLogicInto:counterReg: (in category 'bytecode generator support') ----- + genExecutionCountLogicInto: binaryBlock counterReg: counterReg + <var: #countTripped type: #'AbstractInstruction *'> + <inline: true> + | counterAddress countTripped | + counterAddress := counters + ((self sizeof: #sqInt) * counterIndex). + self flag: 'will need to use MoveAw32:R: if 64 bits'. + self assert: objectMemory wordSize = CounterBytes. + self MoveAw: counterAddress R: counterReg. + self SubCq: 16r10000 R: counterReg. "Count executed" + "If counter trips simply abort the comparison continuing to the following + branch *without* writing back. A double decrement will not trip the second time." + countTripped := self JumpCarry: 0. + self MoveR: counterReg Aw: counterAddress. "write back" + binaryBlock value: counterAddress value: countTripped! Item was removed: - ----- Method: SistaStackToRegisterMappingCogit>>genExecutionCountLogicInto:counterRegNotConflictingWith: (in category 'bytecode generator support') ----- - genExecutionCountLogicInto: trinaryBlock counterRegNotConflictingWith: regMask - <var: #countTripped type: #'AbstractInstruction *'> - <inline: true> - | counterReg counterAddress countTripped | - counterReg := self allocateRegNotConflictingWith: regMask. - counterAddress := counters + ((self sizeof: #sqInt) * counterIndex). - self flag: 'will need to use MoveAw32:R: if 64 bits'. - self assert: objectMemory wordSize = CounterBytes. - self MoveAw: counterAddress R: counterReg. - self SubCq: 16r10000 R: counterReg. "Count executed" - "If counter trips simply abort the comparison continuing to the following - branch *without* writing back. A double decrement will not trip the second time." - countTripped := self JumpCarry: 0. - self MoveR: counterReg Aw: counterAddress. "write back" - trinaryBlock value: counterReg value: counterAddress value: countTripped! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode (in category 'bytecode generators') ----- genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" | reg literal distance targetFixUp | "We loose the information of in which register is stack top when jitting the branch target so we need to flush everything. We could use a fixed register here...." + reg := self self allocateRegForStackEntryAt: 0. - self ssFlushTo: simStackPtr. - reg := self allocateRegForStackTopEntry. self ssTop popToReg: reg. + self ssFlushTo: simStackPtr. "flushed but the value is still in reg" literal := self getLiteral: (extA * 256 + byte1). extA := 0. distance := extB * 256 + byte2. extB := 0. targetFixUp := (self ensureFixupAt: bytecodePC + 3 + distance - initialPC) asUnsignedInteger. (objectMemory isArrayNonImm: literal) ifTrue: [objectRepresentation branchIf: reg notInstanceOfBehaviors: literal target: targetFixUp] ifFalse: [objectRepresentation branchIf: reg notInstanceOfBehavior: literal target: targetFixUp]. self genPopStackBytecode. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> | desc ok counterAddress countTripped retry counterReg | <var: #ok type: #'AbstractInstruction *'> <var: #desc type: #'CogSimStackEntry *'> <var: #retry type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. desc popToReg: TempReg. + "We prefer calleeSaved to avoid saving it across the trap trip trampoline" + counterReg := self allocateRegPreferringCalleeSavedNotConflictingWith: 0. + retry := self Label. self + genExecutionCountLogicInto: [ :cAddress :countTripBranch | - genExecutionCountLogicInto: [ :cReg :cAddress :countTripBranch | - counterReg := cReg. counterAddress := cAddress. countTripped := countTripBranch ] + counterReg: counterReg. - counterRegNotConflictingWith: 0. counterIndex := counterIndex + 1. - retry := self Label. - "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: counterReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." + + "If counterReg is caller saved then save it" + (self register: counterReg isInMask: callerSavedRegMask) ifTrue: [ self PushR: counterReg ]. + countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). + "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will return directly to machine code, returning the boolean. So the code should jump back to the retry point. The trampoline makes sure that TempReg has been reloaded." self annotateBytecode: self Label. + + "If counterReg is caller saved then restore it" + (self register: counterReg isInMask: callerSavedRegMask) ifTrue: [ self PopR: counterReg ]. + self Jump: retry. ok jmpTarget: self Label. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor rcvrIsInt argIsInt rcvrInt argInt result jumpNotSmallInts inlineCAB annotateInst counterAddress countTripped counterReg | <var: #countTripped type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genSpecialSelectorComparison ]. self ssFlushTo: simStackPtr - 2. primDescriptor := self generatorAt: byte0. argIsInt := self ssTop type = SSConstant and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (self ssValue: 1) type = SSConstant and: [objectMemory isIntegerObject: (rcvrInt := (self ssValue: 1) constant)]. "short-cut the jump if operands are SmallInteger constants." (argIsInt and: [rcvrIsInt]) ifTrue: [self cCode: '' inSmalltalk: "In Simulator ints are unsigned..." [rcvrInt := objectMemory integerValueOf: rcvrInt. argInt := objectMemory integerValueOf: argInt]. primDescriptor opcode caseOf: { [JumpLess] -> [result := rcvrInt < argInt]. [JumpLessOrEqual] -> [result := rcvrInt <= argInt]. [JumpGreater] -> [result := rcvrInt > argInt]. [JumpGreaterOrEqual] -> [result := rcvrInt >= argInt]. [JumpZero] -> [result := rcvrInt = argInt]. [JumpNonZero] -> [result := rcvrInt ~= argInt] }. "Must enter any annotatedConstants into the map" self annotateBytecodeIfAnnotated: (self ssValue: 1). self annotateBytecodeIfAnnotated: self ssTop. "Must annotate the bytecode for correct pc mapping." self ssPop: 2. ^self ssPushAnnotatedConstant: (result ifTrue: [objectMemory trueObject] ifFalse: [objectMemory falseObject])]. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. "Only interested in inlining if followed by a conditional branch." inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. The relational operators successfully statically predict SmallIntegers; the equality operators do not." (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: [inlineCAB := argIsInt or: [rcvrIsInt]]. inlineCAB ifFalse: [^self genSpecialSelectorSend]. argIsInt ifTrue: [(self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. self ssPop: 2. self MoveR: ReceiverResultReg R: TempReg] ifFalse: [self marshallSendArguments: 1. self MoveR: Arg0Reg R: TempReg. rcvrIsInt ifFalse: [objectRepresentation isSmallIntegerTagNonZero ifTrue: [self AndR: ReceiverResultReg R: TempReg] ifFalse: [self OrR: ReceiverResultReg R: TempReg]]]. jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. + counterReg := self allocateRegNotConflictingWith: (self registerMaskFor: ReceiverResultReg and: Arg0Reg). self + genExecutionCountLogicInto: [ :cAddress :countTripBranch | - genExecutionCountLogicInto: [ :cReg :cAddress :countTripBranch | - counterReg := cReg. counterAddress := cAddress. countTripped := countTripBranch ] + counterReg: counterReg. - counterRegNotConflictingWith: (self registerMaskFor: ReceiverResultReg and: Arg0Reg). argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [self CmpCq: argInt R: ReceiverResultReg]] ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg]. "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." self gen: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). countTripped jmpTarget: (jumpNotSmallInts jmpTarget: self Label). argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg]. ^self genMarshalledSend: (coInterpreter specialSelector: byte0 - self firstSpecialSelectorBytecodeOffset) numArgs: 1 sendTable: ordinarySendTrampolines! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorEqualsEqualsWithForwarders (in category 'bytecode generators') ----- genSpecialSelectorEqualsEqualsWithForwarders "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC branchDescriptor label counterReg fixup counterAddress countTripped unforwardArg unforwardRcvr argReg rcvrReg regMask | <var: #fixup type: #'BytecodeFixup *'> <var: #countTripped type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> ((coInterpreter isOptimizedMethod: methodObj) or: [needsFrame not]) ifTrue: [ ^ super genSpecialSelectorEqualsEquals ]. regMask := 0. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. unforwardRcvr := (objectRepresentation isUnannotatableConstant: (self ssValue: 1)) not. unforwardArg := (objectRepresentation isUnannotatableConstant: self ssTop) not. "If an operand is an annotable constant, it may be forwarded, so we need to store it into a register so the forwarder check can jump back to the comparison after unforwarding the constant. However, if one of the operand is an unnanotable constant, does not allocate a register for it (machine code will use operations on constants)." self allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. argReg ifNotNil: [ regMask := self registerMaskFor: argReg ]. rcvrReg ifNotNil: [ regMask := regMask bitOr: (self registerMaskFor: rcvrReg) ]. "Only interested in inlining if followed by a conditional branch." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^ self genEqualsEqualsNoBranchArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg]. + counterReg := self allocateRegNotConflictingWith: regMask. self + genExecutionCountLogicInto: [ :cAddress :countTripBranch | - genExecutionCountLogicInto: [ :cReg :cAddress :countTripBranch | - counterReg := cReg. counterAddress := cAddress. countTripped := countTripBranch ] + counterReg: counterReg. - counterRegNotConflictingWith: regMask. self assert: (unforwardArg or: [ unforwardRcvr ]). "If branching the stack must be flushed for the merge" self ssFlushTo: simStackPtr - 2. label := self Label. self genEqualsEqualsComparisonArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "pop by 2 temporarily for the fixups" branchDescriptor isBranchTrue ifTrue: [ fixup := self ensureNonMergeFixupAt: postBranchPC - initialPC. self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. ] ifFalse: [ fixup := self ensureNonMergeFixupAt: targetBytecodePC - initialPC. self JumpZero: (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger. ]. unforwardArg ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg jumpBackTo: label ]. unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg jumpBackTo: label ]. self ssPop: -2. self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self Jump: fixup. countTripped jmpTarget: self Label. "inlined version of #== ignoring the branchDescriptor if the counter trips to have normal state for the optimizer" self genEqualsEqualsNoBranchArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. ^ 0! Item was removed: - ----- Method: StackToRegisterMappingCogit>>allocateAnyReg (in category 'simulation stack') ----- - allocateAnyReg - < inline: true > - ^ self allocateRegNotConflictingWith: 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>allocateEqualsEqualsRegistersArgNeedsReg:rcvrNeedsReg:into: (in category 'bytecode generator support') ----- allocateEqualsEqualsRegistersArgNeedsReg: argNeedsReg rcvrNeedsReg: rcvrNeedsReg into: binaryBlock <inline: true> | argReg rcvrReg | self assert: (argNeedsReg or: [rcvrNeedsReg]). argNeedsReg ifTrue: [rcvrNeedsReg ifTrue: [self allocateRegForStackTopTwoEntriesInto: [:rTop :rNext| argReg := rTop. rcvrReg := rNext]. self ssTop popToReg: argReg. (self ssValue: 1) popToReg: rcvrReg] ifFalse: + [argReg := self self allocateRegForStackEntryAt: 0. - [argReg := self allocateRegForStackTopEntry. self ssTop popToReg: argReg]] ifFalse: [self assert: rcvrNeedsReg. rcvrReg := self allocateRegForStackEntryAt: 1. (self ssValue:1) popToReg: rcvrReg]. self assert: (argNeedsReg not or: [argReg notNil]). self assert: (rcvrNeedsReg not or: [rcvrReg notNil]). binaryBlock value: rcvrReg value: argReg.! Item was changed: ----- Method: StackToRegisterMappingCogit>>allocateRegForStackEntryAt: (in category 'simulation stack') ----- allocateRegForStackEntryAt: index + "If the stack entry is already in a register, answers it, + else allocate a new register for it" <inline: true> ^ self allocateRegForStackEntryAt: index notConflictingWith: 0 ! Item was changed: ----- Method: StackToRegisterMappingCogit>>allocateRegForStackEntryAt:notConflictingWith: (in category 'simulation stack') ----- allocateRegForStackEntryAt: index notConflictingWith: regMask + "If the stack entry is already in a register not conflicting with regMask, answers it, + else allocate a new register not conflicting with reg mask" <var: #stackEntry type: #'CogSimStackEntry *'> | stackEntry | stackEntry := self ssValue: index. (stackEntry type = SSRegister and: [ (self register: stackEntry register isInMask: regMask) not ]) ifTrue: [ ^ stackEntry register]. ^ self allocateRegNotConflictingWith: regMask ! Item was removed: - ----- Method: StackToRegisterMappingCogit>>allocateRegForStackTopEntry (in category 'simulation stack') ----- - allocateRegForStackTopEntry - <inline: true> - ^ self allocateRegForStackEntryAt: 0 - ! Item was removed: - ----- Method: StackToRegisterMappingCogit>>allocateRegForStackTopEntryNotConflictingWith: (in category 'simulation stack') ----- - allocateRegForStackTopEntryNotConflictingWith: regMask - <inline: true> - ^ self allocateRegForStackEntryAt: 0 notConflictingWith: regMask - ! Item was changed: ----- Method: StackToRegisterMappingCogit>>allocateRegForStackTopThreeEntriesInto:thirdIsReceiver: (in category 'simulation stack') ----- allocateRegForStackTopThreeEntriesInto: trinaryBlock thirdIsReceiver: thirdIsReceiver + "Answers registers for the 3 top values on stack. If the values are already in registers, answers + these registers, else allocate registers not conflicting with each others. + If thirdIsReceiver is true, allocate ReceiverResultReg for stackTop - 2 (for ceStoreCheck)." <inline: true> | topRegistersMask rTop rNext rThird | topRegistersMask := 0. (self ssTop type = SSRegister and: [ thirdIsReceiver not or: [ self ssTop register ~= ReceiverResultReg ] ]) ifTrue: [ topRegistersMask := self registerMaskFor: (rTop := self ssTop register)]. ((self ssValue: 1) type = SSRegister and: [ thirdIsReceiver not or: [ (self ssValue: 1) register ~= ReceiverResultReg ] ]) ifTrue: [ topRegistersMask := topRegistersMask bitOr: (self registerMaskFor: (rNext := (self ssValue: 1) register))]. ((self ssValue: 2) type = SSRegister and: [thirdIsReceiver not or: [ (self ssValue: 2) register = ReceiverResultReg ] ]) ifTrue: [ topRegistersMask := topRegistersMask bitOr: (self registerMaskFor: (rThird := (self ssValue: 2) register))]. rThird ifNil: [ thirdIsReceiver ifTrue: [ rThird := ReceiverResultReg. "Free ReceiverResultReg if it was not free" self ssAllocateRequiredReg: ReceiverResultReg. optStatus isReceiverResultRegLive: false ] ifFalse: [ rThird := self allocateRegNotConflictingWith: topRegistersMask ]. topRegistersMask := topRegistersMask bitOr: (self registerMaskFor: rThird) ]. rTop ifNil: [ rTop := self allocateRegNotConflictingWith: topRegistersMask. topRegistersMask := topRegistersMask bitOr: (self registerMaskFor: rTop) ]. rNext ifNil: [ rNext := self allocateRegNotConflictingWith: topRegistersMask ]. ^ trinaryBlock value: rTop value: rNext value: rThird ! Item was changed: ----- Method: StackToRegisterMappingCogit>>allocateRegForStackTopTwoEntriesInto: (in category 'simulation stack') ----- allocateRegForStackTopTwoEntriesInto: binaryBlock + "Answers registers for the 2 top values on stack. If the values are already in registers, answers + these registers, else allocate registers not conflicting with each others." <inline: true> | topRegistersMask rTop rNext | topRegistersMask := 0. self ssTop type = SSRegister ifTrue: [ rTop := self ssTop register]. (self ssValue: 1) type = SSRegister ifTrue: [ topRegistersMask := self registerMaskFor: (rNext := (self ssValue: 1) register)]. rTop ifNil: [ rTop := self allocateRegNotConflictingWith: topRegistersMask ]. rNext ifNil: [ rNext := self allocateRegNotConflictingWith: (self registerMaskFor: rTop) ]. ^ binaryBlock value: rTop value: rNext ! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryConstOpVarInlinePrimitive: prim "Const op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra val untaggedVal adjust | + ra := self self allocateRegForStackEntryAt: 0. - ra := self allocateRegForStackTopEntry. self ssTop popToReg: ra. self ssPop: 1. val := self ssTop constant. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: ra]. [1] -> [self MoveCq: val R: TempReg. self SubR: ra R: TempReg. objectRepresentation genAddSmallIntegerTagsTo: TempReg. self MoveR: TempReg R: ra]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: ra. objectRepresentation genAddSmallIntegerTagsTo: ra]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "CmpCqR is SubRCq so everything is reversed, but because no CmpRCq things are reversed again and we invert the sense of the jumps." [32] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpLess opFalse: JumpGreaterOrEqual destReg: ra ]. [33] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpGreater opFalse: JumpLessOrEqual destReg: ra ]. [34] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreater destReg: ra ]. [35] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLess destReg: ra ]. [36] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: ra ]. [37] -> [ self CmpCq: val R: ra. self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: ra ]. "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [objectRepresentation genConvertSmallIntegerToIntegerInReg: ra. adjust := (objectMemory baseHeaderSize >> objectMemory shiftForWord) - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" adjust ~= 0 ifTrue: [ self AddCq: adjust R: ra. ]. self genMoveConstant: val R: TempReg. self MoveXwr: ra R: TempReg R: ra]. [65] -> [objectRepresentation genConvertSmallIntegerToIntegerInReg: ra. adjust := objectMemory baseHeaderSize - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" self AddCq: adjust R: ra. self genMoveConstant: val R: TempReg. self MoveXbr: ra R: TempReg R: ra. objectRepresentation genConvertIntegerToSmallIntegerInReg: ra] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: ra. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpConstInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpConstInlinePrimitive: prim "Var op const version of inline binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | rr val untaggedVal | val := self ssTop constant. self ssPop: 1. + rr := self self allocateRegForStackEntryAt: 0. - rr := self allocateRegForStackTopEntry. self ssTop popToReg: rr. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: rr]. [1] -> [self SubCq: untaggedVal R: rr ]. [2] -> [self flag: 'could use MulCq:R'. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: rr. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "CmpCqR is SubRCq so everything is reversed." [32] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpGreater opFalse: JumpLessOrEqual destReg: rr ]. [33] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpLess opFalse: JumpGreaterOrEqual destReg: rr ]. [34] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLess destReg: rr ]. [35] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreater destReg: rr ]. [36] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: rr ]. [37] -> [ self CmpCq: val R: rr. self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: rr ]. "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [objectRepresentation genLoadSlot: (objectMemory integerValueOf: val) - 1 sourceReg: rr destReg: rr]. [65] -> [self MoveCq: (objectMemory integerValueOf: val) + objectMemory baseHeaderSize - 1 R: TempReg. self MoveXbr: TempReg R: rr R: rr. objectRepresentation genConvertIntegerToSmallIntegerInReg: rr] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushLiteralVariable: (in category 'bytecode generator support') ----- genPushLiteralVariable: literalIndex <inline: false> | association freeReg | + freeReg := self allocateRegNotConflictingWith: 0. - freeReg := self allocateAnyReg. association := self getLiteral: literalIndex. "N.B. Do _not_ use ReceiverResultReg to avoid overwriting receiver in assignment in frameless methods." "So far descriptors are not rich enough to describe the entire dereference so generate the register load but don't push the result. There is an order-of-evaluation issue if we defer the dereference." self genMoveConstant: association R: TempReg. objectRepresentation genEnsureObjInRegNotForwarded: TempReg scratchReg: freeReg. objectRepresentation genLoadSlot: ValueIndex sourceReg: TempReg destReg: freeReg. self ssPushRegister: freeReg. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushMaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genPushMaybeContextReceiverVariable: slotIndex <inline: false> | jmpSingle jmpDone | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> self assert: needsFrame. self ssAllocateCallReg: ReceiverResultReg and: SendNumArgsReg. self ensureReceiverResultRegContainsSelf. + (self register: ReceiverResultReg isInMask: callerSavedRegMask) ifTrue: - ((self registerMaskFor: ReceiverResultReg) anyMask: callerSavedRegMask) ifTrue: ["We have no way of reloading ReceiverResultReg since we need the inst var value as the result." optStatus isReceiverResultRegLive: false]. "See CoInterpreter>>contextInstructionPointer:frame: for an explanation of the instruction pointer slot handling." slotIndex = InstructionPointerIndex ifTrue: [self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceFetchContextInstVarTrampoline. ^self ssPushRegister: SendNumArgsReg]. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceFetchContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. objectRepresentation genLoadSlot: slotIndex sourceReg: ReceiverResultReg destReg: SendNumArgsReg. jmpDone jmpTarget: self Label. ^self ssPushRegister: SendNumArgsReg! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean LiteralVariable: litVarIndex <inline: false> | topReg assocReg association | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." self assert: needsFrame. "N.B. No need to check the stack for references because we generate code for literal variable loads that stores the result in a register, deferring only the register push." association := self getLiteral: litVarIndex. "Avoid store check for immediate values" (objectRepresentation isUnannotatableConstant: self ssTop) ifTrue: + [ assocReg := self allocateRegNotConflictingWith: 0. - [ assocReg := self allocateAnyReg. self genMoveConstant: association R: assocReg. objectRepresentation genEnsureObjInRegNotForwarded: assocReg scratchReg: TempReg. self ssStorePop: popBoolean toReg: TempReg. traceStores > 0 ifTrue: [ assocReg = ReceiverResultReg ifFalse: [ self ssAllocateRequiredReg: ReceiverResultReg. optStatus isReceiverResultRegLive: false. self MoveR: assocReg R: ReceiverResultReg ]. self CallRT: ceTraceStoreTrampoline]. ^objectRepresentation genStoreImmediateInSourceReg: TempReg slotIndex: ValueIndex destReg: assocReg ]. + topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). - topReg := self allocateRegForStackTopEntryNotConflictingWith: (self registerMaskFor: ReceiverResultReg). self ssStorePop: popBoolean toReg: topReg. optStatus isReceiverResultRegLive: false. self ssAllocateRequiredReg: ReceiverResultReg. "for ceStoreCheck call in genStoreSourceReg: has to be ReceiverResultReg" self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. traceStores > 0 ifTrue: [self MoveR: topReg R: TempReg. self CallRT: ceTraceStoreTrampoline]. ^objectRepresentation genStoreSourceReg: topReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:ReceiverVariable:traceBlock:inFrame: (in category 'bytecode generator support') ----- genStorePop: popBoolean ReceiverVariable: slotIndex traceBlock: block inFrame: inFrame <inline: true> | topReg | self ssFlushUpThroughReceiverVariable: slotIndex. "Avoid store check for immediate values" (objectRepresentation isUnannotatableConstant: self ssTop) ifTrue: [self ensureReceiverResultRegContainsSelf. self ssStorePop: popBoolean toReg: TempReg. traceStores > 0 ifTrue: [block value]. ^objectRepresentation genStoreImmediateInSourceReg: TempReg slotIndex: slotIndex destReg: ReceiverResultReg]. + topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). - topReg := self allocateRegForStackTopEntryNotConflictingWith: (self registerMaskFor: ReceiverResultReg). self ssStorePop: popBoolean toReg: topReg. "Note that ReceiverResultReg remains live after ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. traceStores > 0 ifTrue: [self MoveR: topReg R: TempReg. block value]. ^objectRepresentation genStoreSourceReg: topReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: inFrame! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:RemoteTemp:At: (in category 'bytecode generator support') ----- genStorePop: popBoolean RemoteTemp: slotIndex At: remoteTempIndex <inline: false> | topReg topSpilled tempVectReg | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the temote temp store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." self assert: needsFrame. "N.B. No need to check the stack for references because we generate code for remote temp loads that stores the result in a register, deferring only the register push." "Avoid store check for immediate values" (objectRepresentation isUnannotatableConstant: self ssTop) ifTrue: + [ tempVectReg := self allocateRegNotConflictingWith: 0. - [ tempVectReg := self allocateAnyReg. self MoveMw: (self frameOffsetOfTemporary: remoteTempIndex) r: FPReg R: tempVectReg. self ssStorePop: popBoolean toReg: TempReg. traceStores > 0 ifTrue: [ tempVectReg = ReceiverResultReg ifFalse: [ self ssAllocateRequiredReg: ReceiverResultReg. optStatus isReceiverResultRegLive: false. self MoveR: tempVectReg R: ReceiverResultReg ]. self CallRT: ceTraceStoreTrampoline]. ^objectRepresentation genStoreImmediateInSourceReg: TempReg slotIndex: slotIndex destReg: tempVectReg]. + topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). - topReg := self allocateRegForStackTopEntryNotConflictingWith: (self registerMaskFor: ReceiverResultReg). topSpilled := self ssTop spilled. self ssStorePop: (popBoolean or: [topSpilled]) toReg: topReg. popBoolean ifFalse: [topSpilled ifFalse: [self ssPop: 1]. self ssPushRegister: topReg]. self ssAllocateRequiredReg: ReceiverResultReg. optStatus isReceiverResultRegLive: false. self MoveMw: (self frameOffsetOfTemporary: remoteTempIndex) r: FPReg R: ReceiverResultReg. traceStores > 0 ifTrue: [self MoveR: topReg R: TempReg. self CallRT: ceTraceStoreTrampoline]. ^objectRepresentation genStoreSourceReg: topReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame! Item was changed: ----- Method: StackToRegisterMappingCogit>>genUnaryInlinePrimitive: (in category 'inline primitive generators') ----- genUnaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#unaryInlinePrimitive:" | rcvrReg resultReg | + rcvrReg := self allocateRegForStackEntryAt: 0. - rcvrReg := self allocateRegForStackTopEntry. resultReg := self allocateRegNotConflictingWith: (self registerMaskFor: rcvrReg). self ssTop popToReg: rcvrReg. self ssPop: 1. prim caseOf: { "00 unchecked class" [1] -> "01 unchecked pointer numSlots" [objectRepresentation genGetNumSlotsOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInReg: resultReg]. "02 unchecked pointer basicSize" [3] -> "03 unchecked byte numBytes" [objectRepresentation genGetNumBytesOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInReg: resultReg]. "04 unchecked short16Type format numShorts" "05 unchecked word32Type format numWords" "06 unchecked doubleWord64Type format numDoubleWords" } otherwise: [^EncounteredUnknownBytecode].. self ssPushRegister: resultReg. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>returnRegForStoreCheck (in category 'trampolines') ----- returnRegForStoreCheck "We must ensure the ReceiverResultReg is live across the store check so that we can store into receiver inst vars in a frameless method since self exists only in ReceiverResultReg in a frameless method. So if ReceiverResultReg is caller-saved we use the fact that ceStoreCheck: answers its argument to reload ReceiverResultReg cheaply. Otherwise we don't care about the result and use the cResultRegister, effectively a no-op (see compileTrampoline...)" + ^(self register: ReceiverResultReg isInMask: callerSavedRegMask) - ^((self registerMaskFor: ReceiverResultReg) anyMask: callerSavedRegMask) ifTrue: [ReceiverResultReg] ifFalse: [backEnd cResultRegister]!

1 0

← Newer
1
2
3
4
5
6
7
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2015