Vm-dev November 2015

vm-dev@lists.squeakfoundation.org

32 participants
118 discussions

VM Maker: Cog-rmacnak.296.mcz
by commits＠source.squeak.org 18 Nov '15

18 Nov '15

Ryan Macnak uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-rmacnak.296.mcz ==================== Summary ==================== Name: Cog-rmacnak.296 Author: rmacnak Time: 17 November 2015, 10:02:15.909 pm UUID: 464e0274-72d2-4658-aac6-a375581d43cc Ancestors: Cog-rmacnak.295 Get MIPSEL up to the first CPIC extension. Add PREF instruction. Implement transitions out of simulation on page faults. =============== Diff against Cog-rmacnak.295 =============== Item was changed: SharedPool subclass: #MIPSConstants instanceVariableNames: '' + classVariableNames: 'A0 A1 A2 A3 ADDIU ADDU AND ANDI AT BEQ BGEZ BGTZ BLEZ BLTZ BNE BREAK FP GP HintLoad HintStore J JAL JALR JR K0 K1 LB LBU LH LHU LUI LW OR ORI OneInstruction PREF R0 R1 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R2 R20 R21 R22 R23 R24 R25 R26 R27 R28 R29 R3 R30 R31 R4 R5 R6 R7 R8 R9 RA REGIMM S0 S1 S2 S3 S4 S5 S6 S7 SB SH SLL SLLV SLT SLTI SLTIU SLTU SP SPECIAL SRA SRAV SRL SRLV SUBU SW T0 T1 T2 T3 T4 T5 T6 T7 T8 T9 TwoInstructions V0 V1 XOR XORI ZR' - classVariableNames: 'A0 A1 A2 A3 ADDIU ADDU AND ANDI AT BEQ BGEZ BGTZ BLEZ BLTZ BNE BREAK FP GP J JAL JALR JR K0 K1 LB LBU LH LHU LUI LW OR ORI OneInstruction R0 R1 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R2 R20 R21 R22 R23 R24 R25 R26 R27 R28 R29 R3 R30 R31 R4 R5 R6 R7 R8 R9 RA REGIMM S0 S1 S2 S3 S4 S5 S6 S7 SB SH SLL SLLV SLT SLTI SLTIU SLTU SP SPECIAL SRA SRAV SRL SRLV SUBU SW T0 T1 T2 T3 T4 T5 T6 T7 T8 T9 TwoInstructions V0 V1 XOR XORI ZR' poolDictionaries: '' category: 'Cog-Processors'! !MIPSConstants commentStamp: 'rmacnak 11/11/2015 20:29:59' prior: 0! MIPS opcodes and register names.! Item was changed: ----- Method: MIPSConstants class>>initialize (in category 'as yet unclassified') ----- initialize super initialize. OneInstruction := 4. TwoInstructions := 8. + HintLoad := 0. + HintStore := 1. + self initializeRegisters. self initializeOpcodes. self initializeSpecialFunctions. self initializeRegImmRts.! Item was changed: ----- Method: MIPSConstants class>>initializeOpcodes (in category 'as yet unclassified') ----- initializeOpcodes SPECIAL := 0. REGIMM := 1. J := 2. JAL := 3. BEQ := 4. BNE := 5. BLEZ := 6. BGTZ := 7. ADDIU := 9. SLTI := 10. SLTIU := 11. ANDI := 12. ORI := 13. XORI := 14. LUI := 15. LB := 32. LH := 33. LW := 35. LBU := 36. LHU := 37. SB := 40. SH := 41. + SW := 43. + PREF := 51.! - SW := 43.! Item was changed: ----- Method: MIPSDisassembler>>disassemble:from:to:for:labels:on: (in category 'as yet unclassified') ----- disassemble: memory from: startPC to: limitPC for: aSymbolManager "<Cogit>" labels: labelDictionary on: aStream - aStream print: labelDictionary;cr. pc := startPC. [pc < limitPC] whileTrue: [ | word instruction | pc printOn: aStream base: 16 nDigits: 8. aStream space; space. word := memory unsignedLongAt: pc + 1. word printOn: aStream base: 16 nDigits: 8. aStream space; space. instruction := MIPSInstruction new value: word. aStream nextPutAll: (instruction decodeFor: self). + + aSymbolManager ifNotNil: [ + (aSymbolManager labelForPC: pc) ifNotNil: + [:label | aStream nextPutAll: ' ;'; nextPutAll: label]]. + "aStream print: (aSymbolManager lookupAddress: pc)." + aStream cr. pc := pc + OneInstruction].! Item was added: + ----- Method: MIPSDisassembler>>prefetch: (in category 'instructions - memory') ----- + prefetch: instruction + | hintName | + instruction rt = HintLoad ifTrue: [hintName := 'load']. + instruction rt = HintStore ifTrue: [hintName := 'store']. + ^'pref ', hintName, ', ', + (instruction signedImmediate printString), '(', + (MIPSConstants nameForRegister: instruction rs), ')'! Item was added: + ----- Method: MIPSELSimulator>>executeFault: (in category 'memory') ----- + executeFault: address + | jumpInstruction type | + self assert: inDelaySlot not. + jumpInstruction := MIPSInstruction new value: (self fetchInstruction: jumpingPC). + jumpInstruction opcode = J ifTrue: [type := #jump]. + jumpInstruction opcode = JAL ifTrue: [type := #call]. + jumpInstruction opcode = SPECIAL ifTrue: + [jumpInstruction function = JR ifTrue: + [jumpInstruction rs = RA + ifTrue: [type := #return] + ifFalse: [type := #jump]]. + jumpInstruction function = JALR ifTrue: + [type := #call]]. + self assert: type ~~ nil. + + ^(ProcessorSimulationTrap + pc: nil + nextpc: nil + address: address + type: type + accessor: nil) + signal! Item was changed: + ----- Method: MIPSELSimulator>>fetchInstruction: (in category 'memory') ----- - ----- Method: MIPSELSimulator>>fetchInstruction: (in category 'as yet unclassified') ----- fetchInstruction: address address < exectuableBase ifTrue: [self executeFault: address]. address > exectuableLimit ifTrue: [self executeFault: address]. (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. ^memory unsignedLongAt: address + 1 bigEndian: false! Item was changed: + ----- Method: MIPSELSimulator>>readFault: (in category 'memory') ----- - ----- Method: MIPSELSimulator>>readFault: (in category 'as yet unclassified') ----- readFault: address + | destReg | + self assert: inDelaySlot not. "Or we have to store nextPC somewhere." + destReg := (MIPSInstruction new value: (self fetchInstruction: pc)) rt. + ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: address type: #read + accessor: (self setterForRegister: destReg)) - accessor: nil) signal ! Item was changed: + ----- Method: MIPSELSimulator>>signedByte: (in category 'memory') ----- - ----- Method: MIPSELSimulator>>signedByte: (in category 'as yet unclassified') ----- signedByte: address address < readableBase ifTrue: [self readFault: address]. address > readableLimit ifTrue: [self readFault: address]. ^memory signedByteAt: address + 1! Item was changed: + ----- Method: MIPSELSimulator>>signedHalfword: (in category 'memory') ----- - ----- Method: MIPSELSimulator>>signedHalfword: (in category 'as yet unclassified') ----- signedHalfword: address (address bitAnd: 1) = 0 ifFalse: [self error: 'Unaligned read']. address < readableBase ifTrue: [self readFault: address]. address > readableLimit ifTrue: [self readFault: address]. ^memory signedShortAt: address + 1! Item was changed: + ----- Method: MIPSELSimulator>>signedWord: (in category 'memory') ----- - ----- Method: MIPSELSimulator>>signedWord: (in category 'as yet unclassified') ----- signedWord: address (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. address < readableBase ifTrue: [self readFault: address]. address > readableLimit ifTrue: [self readFault: address]. ^memory longAt: address + 1! Item was changed: ----- Method: MIPSELSimulator>>signedWord:put: (in category 'memory') ----- signedWord: address put: value (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. address < writableBase ifTrue: [self writeFault: address]. address > writableLimit ifTrue: [self writeFault: address]. + ^memory longAt: address + 1 put: value! - ^memory signedLongAt: address + 1 put: value! Item was changed: + ----- Method: MIPSELSimulator>>unsignedByte: (in category 'memory') ----- - ----- Method: MIPSELSimulator>>unsignedByte: (in category 'as yet unclassified') ----- unsignedByte: address address < readableBase ifTrue: [self readFault: address]. address > readableLimit ifTrue: [self readFault: address]. ^memory at: address + 1! Item was changed: + ----- Method: MIPSELSimulator>>unsignedHalfword: (in category 'memory') ----- - ----- Method: MIPSELSimulator>>unsignedHalfword: (in category 'as yet unclassified') ----- unsignedHalfword: address address < readableBase ifTrue: [self readFault: address]. address > readableLimit ifTrue: [self readFault: address]. (address bitAnd: 1) = 0 ifFalse: [self error: 'Unaligned read']. ^memory unsignedShortAt: address + 1 bigEndian: false! Item was changed: + ----- Method: MIPSELSimulator>>unsignedWord: (in category 'memory') ----- - ----- Method: MIPSELSimulator>>unsignedWord: (in category 'as yet unclassified') ----- unsignedWord: address address < readableBase ifTrue: [self readFault: address]. address > readableLimit ifTrue: [self readFault: address]. (address bitAnd: 3) = 0 ifFalse: [self error: 'Unaligned read']. ^memory unsignedLongAt: address + 1 bigEndian: false! Item was added: + ----- Method: MIPSELSimulator>>writeFault: (in category 'memory') ----- + writeFault: address + | srcReg | + self assert: inDelaySlot not. "Or we have to store nextPC somewhere." + srcReg := (MIPSInstruction new value: (self fetchInstruction: pc)) rt. + + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: address + type: #write + accessor: (self getterForRegister: srcReg)) + signal + ! Item was added: + ----- Method: MIPSELSimulatorTests>>testPref (in category 'tests - memory') ----- + testPref + self + testGenerateInto: + [:stream :compiler | + stream nextPut: (compiler prefR: A0 offset: 0 hint: HintLoad). + stream nextPut: (compiler jR: RA). + stream nextPut: (compiler nop). "Delay slot"] + disassembly: + '00000000 CC800000 pref load, 0(a0) + 00000004 03E00008 jr ra + 00000008 00000000 nop + ' run: + [:simulator | + "No exception even though the address is not part of memory." + simulator call: 0 with: -42 with: 0 with: 0 with: 0].! Item was changed: ----- Method: MIPSInstruction>>decodeFor: (in category 'as yet unclassified') ----- decodeFor: visitor | opcode | opcode := self opcode. opcode = SPECIAL ifTrue: [^self decodeSpecialFor: visitor]. opcode = REGIMM ifTrue: [^self decodeRegImmFor: visitor]. opcode = J ifTrue: [^visitor jump: self]. opcode = JAL ifTrue: [^visitor jumpAndLink: self]. opcode = BEQ ifTrue: [^visitor branchEqual: self]. opcode = BNE ifTrue: [^visitor branchNotEqual: self]. opcode = BLEZ ifTrue: [^visitor branchLessEqualZero: self]. opcode = BGTZ ifTrue: [^visitor branchGreaterThanZero: self]. opcode = ADDIU ifTrue: [^visitor addImmediateUnsigned: self]. opcode = SLTI ifTrue: [^visitor setOnLessThanImmediate: self]. opcode = SLTIU ifTrue: [^visitor setOnLessThanImmediateUnsigned: self]. opcode = ANDI ifTrue: [^visitor andImmediate: self]. opcode = ORI ifTrue: [^visitor orImmediate: self]. opcode = XORI ifTrue: [^visitor xorImmediate: self]. opcode = LUI ifTrue: [^visitor loadUpperImmediate: self]. opcode = LB ifTrue: [^visitor loadByte: self]. opcode = LH ifTrue: [^visitor loadHalfword: self]. opcode = LW ifTrue: [^visitor loadWord: self]. opcode = LBU ifTrue: [^visitor loadByteUnsigned: self]. opcode = LHU ifTrue: [^visitor loadHalfwordUnsigned: self]. opcode = SB ifTrue: [^visitor storeByte: self]. opcode = SH ifTrue: [^visitor storeHalfword: self]. opcode = SW ifTrue: [^visitor storeWord: self]. + opcode = PREF ifTrue: [^visitor prefetch: self]. + - self error: 'Unknown instruction'.! Item was changed: Object subclass: #MIPSSimulator + instanceVariableNames: 'memory registers pc instructionCount inDelaySlot readableBase writableBase exectuableBase readableLimit writableLimit exectuableLimit jumpingPC' - instanceVariableNames: 'memory registers pc instructionCount inDelaySlot readableBase writableBase exectuableBase readableLimit writableLimit exectuableLimit' classVariableNames: 'EndSimulationPC' poolDictionaries: 'MIPSConstants' category: 'Cog-Processors'! !MIPSSimulator commentStamp: 'rmacnak 11/11/2015 20:33:00' prior: 0! Simulator for 32-bit MIPS, without implementation of memory access.! Item was added: + ----- Method: MIPSSimulator>>cResultRegister: (in category 'processor api') ----- + cResultRegister: cResult + ^self unsignedRegister: V0 put: cResult! Item was changed: ----- Method: MIPSSimulator>>call:with:with:with:with: (in category 'as yet unclassified') ----- call: entryPC with: arg0 with: arg1 with: arg2 with: arg3. pc := entryPC. self unsignedRegister: RA put: EndSimulationPC. self signedRegister: A0 put: arg0. self signedRegister: A1 put: arg1. self signedRegister: A2 put: arg2. self signedRegister: A3 put: arg3. self execute. ^self signedRegister: V0.! Item was changed: ----- Method: MIPSSimulator>>execute (in category 'as yet unclassified') ----- execute | instruction | [pc ~= EndSimulationPC] whileTrue: + [Transcript nextPutAll: 'X '; nextPutAll: self currentInstruction; flush. + 10 milliSeconds asDelay wait. - [Transcript nextPutAll: '* '; nextPutAll: self currentInstruction; flush. instruction := MIPSInstruction new value: (self fetchInstruction: pc). instruction decodeFor: self. pc := pc + OneInstruction].! Item was changed: ----- Method: MIPSSimulator>>executeDelaySlot (in category 'as yet unclassified') ----- executeDelaySlot | instruction | self assert: inDelaySlot not. inDelaySlot := true. + Transcript nextPutAll: 'D '; nextPutAll: self currentInstruction; flush. instruction := MIPSInstruction new value: (self fetchInstruction: pc). instruction decodeFor: self. inDelaySlot := false.! Item was changed: + ----- Method: MIPSSimulator>>fp (in category 'registers') ----- - ----- Method: MIPSSimulator>>fp (in category 'processor api') ----- fp ^self signedRegister: FP! Item was added: + ----- Method: MIPSSimulator>>fp: (in category 'registers') ----- + fp: anInteger + ^self signedRegister: FP put: anInteger! Item was added: + ----- Method: MIPSSimulator>>getterForRegister: (in category 'as yet unclassified') ----- + getterForRegister: registerNumber + ^#(zr at v0 v1 a0 a1 a2 a3 + t0 t1 t2 t3 t4 t5 t6 t7 + s0 s1 s2 s3 s4 s5 s6 s7 + t8 t9 k0 k1 gp sp fp ra) at: registerNumber + 1! Item was changed: ----- Method: MIPSSimulator>>initializeWithMemory: (in category 'as yet unclassified') ----- initializeWithMemory: aByteArray + memory := aByteArray. + readableBase := 0. + writableBase := 0. + exectuableBase := 0. + readableLimit := memory size. + writableLimit := memory size. + exectuableLimit := memory size.! - memory := aByteArray.! Item was changed: ----- Method: MIPSSimulator>>jump: (in category 'instructions - control') ----- jump: instruction | nextPC | self assert: inDelaySlot not. + jumpingPC := pc. pc := pc + OneInstruction. nextPC := (pc bitAnd: 16rF0000000) + (instruction target << 2). "Region is that of the delay slot." self executeDelaySlot. pc := nextPC - OneInstruction. "Account for general increment"! Item was changed: ----- Method: MIPSSimulator>>jumpAndLink: (in category 'instructions - control') ----- jumpAndLink: instruction | nextPC | self assert: inDelaySlot not. self unsignedRegister: RA put: pc + TwoInstructions. "Return past delay slot." + jumpingPC := pc. pc := pc + OneInstruction. nextPC := (pc bitAnd: 16rF0000000) + (instruction target << 2). "Region is that of the delay slot." self executeDelaySlot. pc := nextPC - OneInstruction. "Account for general increment"! Item was changed: ----- Method: MIPSSimulator>>jumpAndLinkRegister: (in category 'instructions - control') ----- jumpAndLinkRegister: instruction | nextPC | self assert: inDelaySlot not. self unsignedRegister: instruction rd put: pc + TwoInstructions. "Return past delay slot." nextPC := self unsignedRegister: instruction rs. + jumpingPC := pc. pc := pc + OneInstruction. self executeDelaySlot. pc := nextPC. pc := pc - 4. "Account for general increment"! Item was changed: ----- Method: MIPSSimulator>>jumpRegister: (in category 'instructions - control') ----- jumpRegister: instruction | nextPC | self assert: inDelaySlot not. nextPC := self unsignedRegister: instruction rs. + jumpingPC := pc. pc := pc + OneInstruction. self executeDelaySlot. pc := nextPC. pc := pc - 4. "Account for general increment"! Item was added: + ----- Method: MIPSSimulator>>postCallArgumentsNumArgs:in: (in category 'processor api') ----- + postCallArgumentsNumArgs: numArgs "<Integer>" in: memory "<ByteArray|Bitmap>" + "Answer an argument vector of the requested size after a vanilla ABI call. + We assume that all arguments are single word arguments, which can not be + supplied on co-processor-registers. For compatibility with Cog/Slang we answer + unsigned values." + self flag: #OABI. + + numArgs = 0 ifTrue: + [^{}]. + numArgs = 1 ifTrue: + [^{self unsignedRegister: A0}]. + numArgs = 2 ifTrue: + [^{self unsignedRegister: A0. self unsignedRegister: A1}]. + numArgs = 3 ifTrue: + [^{self unsignedRegister: A0. self unsignedRegister: A1. self unsignedRegister: A2}]. + numArgs = 4 ifTrue: + [^{self unsignedRegister: A0. self unsignedRegister: A1. self unsignedRegister: A2. self unsignedRegister: A3}]. + self unimplemented.! Item was added: + ----- Method: MIPSSimulator>>prefetch: (in category 'instructions - memory') ----- + prefetch: instruction + self assert: (instruction rt = HintLoad or: [instruction rt = HintStore]).! Item was added: + ----- Method: MIPSSimulator>>pushWord:in: (in category 'processor api') ----- + pushWord: aValue in: aMemory + aMemory longAt: (self sp: self sp - 4) + 1 put: aValue bigEndian: false! Item was added: + ----- Method: MIPSSimulator>>ra (in category 'registers') ----- + ra + ^self signedRegister: RA! Item was added: + ----- Method: MIPSSimulator>>setterForRegister: (in category 'as yet unclassified') ----- + setterForRegister: registerNumber + ^#(zr: at: v0: v1: a0: a1: a2: a3: + t0: t1: t2: t3: t4: t5: t6: t7: + s0: s1: s2: s3: s4: s5: s6: s7: + t8: t9: k0: k1: gp: sp: fp: ra:) at: registerNumber + 1! Item was changed: ----- Method: MIPSSimulator>>signedRegister:put: (in category 'registers') ----- signedRegister: registerNumber put: signedValue self assert: (signedValue between: -16r80000000 and: 16r7FFFFFFF). + registerNumber == ZR ifFalse: [^registers at: registerNumber + 1 put: signedValue].! - registerNumber == ZR ifFalse: [registers at: registerNumber + 1 put: signedValue].! Item was added: + ----- Method: MIPSSimulator>>simulateCallOf:nextpc:memory: (in category 'processor api') ----- + simulateCallOf: address nextpc: nextpc memory: aMemory + "Simulate a frame-building call of address. Build a frame since + a) this is used for calls into the run-time which are unlikely to be leaf-calls" + + self flag: #todo. "Why are we building a frame exactly? Frame building is a callee's job, which I'd expect to be done by some code under simulation. --rmacnak" + + self pushWord: self ra in: aMemory. + self pushWord: self fp in: aMemory. + self fp: self sp. + pc := address.! Item was changed: + ----- Method: MIPSSimulator>>sp (in category 'registers') ----- - ----- Method: MIPSSimulator>>sp (in category 'processor api') ----- sp ^self signedRegister: SP! Item was added: + ----- Method: MIPSSimulator>>sp: (in category 'registers') ----- + sp: anInteger + ^self signedRegister: SP put: anInteger! Item was changed: ----- Method: MIPSSimulator>>unsignedRegister:put: (in category 'registers') ----- unsignedRegister: registerNumber put: unsignedValue registerNumber == ZR ifFalse: + [^registers at: registerNumber + 1 put: (self unsigned32ToSigned32: unsignedValue)].! - [registers at: registerNumber + 1 put: (self unsigned32ToSigned32: unsignedValue)].!

1 0

VM Maker: VMMaker.oscog-eem.1523.mcz
by commits＠source.squeak.org 18 Nov '15

18 Nov '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1523.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1523 Author: eem Time: 17 November 2015, 5:30:56.2 pm UUID: 937e2290-24ff-463f-82fa-6a04c3454b28 Ancestors: VMMaker.oscog-eem.1522 Cogit: Provide a convenience for disassembling in-image compilation of the closed PIC prototype. =============== Diff against VMMaker.oscog-eem.1522 =============== Item was added: + ----- Method: Cogit class>>genAndDisPICoptions: (in category 'in-image compilation') ----- + genAndDisPICoptions: optionsDictionaryOrArray + "StackToRegisterMappingCogit genAndDisPICoptions: #(ISA ARMv5 CogCompilerClass CogInLineLiteralsARMCompiler)" + | coInterpreter cogit | + self initializeWithOptions: (self asOptionsDictionary: optionsDictionaryOrArray). + CoInterpreter initializeWithOptions: initializationOptions. + CoInterpreter objectMemoryClass initializeWithOptions: initializationOptions. + coInterpreter := CurrentImageCoInterpreterFacade forCogit: (cogit := self new). + [cogit + setInterpreter: coInterpreter; + singleStep: true; + initializeCodeZoneFrom: 1024 upTo: coInterpreter memory size / 2. "leave space for rump C stack" + cogit methodZone freeStart: (cogit methodZone freeStart roundUpTo: 1024)] + on: Notification + do: [:ex| + (ex messageText beginsWith: 'cannot find receiver for') ifTrue: + [ex resume: coInterpreter]]. + cogit disassembleFrom: cogit cPICPrototype + (cogit sizeof: CogMethod) to: cogit cPICPrototype + cogit closedPICSize! Item was added: + ----- Method: Cogit>>cPICPrototype (in category 'accessing') ----- + cPICPrototype + "For Cogit clas>>#genAndDisPICoptions:" + <doNotGenerate> + ^cPICPrototype! Item was added: + ----- Method: Cogit>>closedPICSize (in category 'accessing') ----- + closedPICSize + "For Cogit clas>>#genAndDisPICoptions:" + <doNotGenerate> + ^closedPICSize!

1 0

VM Maker: VMMaker.oscog-eem.1522.mcz
by commits＠source.squeak.org 18 Nov '15

18 Nov '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1522.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1522 Author: eem Time: 17 November 2015, 5:12:50.33 pm UUID: 62cb521e-b3cc-4104-999e-095ad37474a5 Ancestors: VMMaker.oscog-eem.1521 Cogit: Implement the long conditional branch/long unconditional branch split necessitated by the MIPS processor in all of the closed PIC methods. Update Slang to collapse an ifTrue:ifFalse: if bioth arms are the same, to avoid the code duplication this introduces on the rest of the processors where conditional and unconditional branch offsets can be accessed in the same way. Caution: Tim's new CPICs are broken w.r.t. accessing class tags in PICs. In fact, he's left the breaks in classRefInClosedPICAt: & storeClassRef:inClosedPICAt: to show his unease. I'll fix this asap. First I need to add code to disassemble the closed PIC prototype so I can see the wood for the trees. =============== Diff against VMMaker.oscog-eem.1521 =============== Item was changed: ----- Method: CCodeGenerator>>generateIfFalseIfTrue:on:indent: (in category 'C translation') ----- generateIfFalseIfTrue: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." (self nilOrBooleanConstantReceiverOf: msgNode receiver) ifNil: + [(self tryToCollapseBothArmsOfConditional: msgNode on: aStream indent: level) ifFalse: + [aStream nextPutAll: 'if ('. + msgNode receiver emitCCodeAsExpressionOn: aStream level: level generator: self. + aStream nextPutAll: ') {'; cr. + msgNode args last emitCCodeOn: aStream level: level + 1 generator: self. + aStream tab: level; nextPut: $}; crtab: level; nextPutAll: 'else {'; cr. + msgNode args first emitCCodeOn: aStream level: level + 1 generator: self. + aStream tab: level; nextPut: $}]] - [aStream nextPutAll: 'if ('. - msgNode receiver emitCCodeAsExpressionOn: aStream level: level generator: self. - aStream nextPutAll: ') {'; cr. - msgNode args last emitCCodeOn: aStream level: level + 1 generator: self. - aStream tab: level; nextPut: $}; crtab: level; nextPutAll: 'else {'; cr. - msgNode args first emitCCodeOn: aStream level: level + 1 generator: self. - aStream tab: level; nextPut: $}] ifNotNil: [:const | (const ifTrue: [msgNode args last] ifFalse: [msgNode args first]) emitCCodeOn: aStream level: level generator: self]! Item was changed: ----- Method: CCodeGenerator>>generateIfFalseIfTrueAsArgument:on:indent: (in category 'C translation') ----- generateIfFalseIfTrueAsArgument: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." (self nilOrBooleanConstantReceiverOf: msgNode receiver) ifNil: + [(self tryToCollapseBothArmsOfConditionalExpression: msgNode on: aStream indent: level) ifFalse: + [aStream nextPut: $(. + msgNode receiver emitCCodeAsArgumentOn: aStream level: level generator: self. + aStream crtab: level + 1; nextPut: $?; space. + msgNode args last emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. + aStream crtab: level + 1; nextPut: $:; space. + msgNode args first emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. + aStream nextPut: $)]] - [aStream nextPut: $(. - msgNode receiver emitCCodeAsArgumentOn: aStream level: level generator: self. - aStream crtab: level + 1; nextPut: $?; space. - msgNode args last emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. - aStream crtab: level + 1; nextPut: $:; space. - msgNode args first emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. - aStream nextPut: $)] ifNotNil: [:const| (const ifTrue: [msgNode args last] ifFalse: [msgNode args first]) emitCCodeAsArgumentOn: aStream level: level generator: self]! Item was changed: ----- Method: CCodeGenerator>>generateIfTrueIfFalse:on:indent: (in category 'C translation') ----- generateIfTrueIfFalse: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." (self nilOrBooleanConstantReceiverOf: msgNode receiver) ifNil: + [(self tryToCollapseBothArmsOfConditional: msgNode on: aStream indent: level) ifFalse: + [aStream nextPutAll: 'if ('. + msgNode receiver emitCCodeAsExpressionOn: aStream level: level generator: self. + aStream nextPutAll: ') {'; cr. + msgNode args first emitCCodeOn: aStream level: level + 1 generator: self. + aStream tab: level; nextPut: $}; crtab: level; nextPutAll: 'else {'; cr. + msgNode args last emitCCodeOn: aStream level: level + 1 generator: self. + aStream tab: level; nextPut: $}]] - [aStream nextPutAll: 'if ('. - msgNode receiver emitCCodeAsExpressionOn: aStream level: level generator: self. - aStream nextPutAll: ') {'; cr. - msgNode args first emitCCodeOn: aStream level: level + 1 generator: self. - aStream tab: level; nextPut: $}; crtab: level; nextPutAll: 'else {'; cr. - msgNode args last emitCCodeOn: aStream level: level + 1 generator: self. - aStream tab: level; nextPut: $}] ifNotNil: [:const | (const ifTrue: [msgNode args first] ifFalse: [msgNode args last]) emitCCodeOn: aStream level: level generator: self]! Item was changed: ----- Method: CCodeGenerator>>generateIfTrueIfFalseAsArgument:on:indent: (in category 'C translation') ----- generateIfTrueIfFalseAsArgument: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." (self nilOrBooleanConstantReceiverOf: msgNode receiver) ifNil: + [(self tryToCollapseBothArmsOfConditionalExpression: msgNode on: aStream indent: level) ifFalse: + [aStream nextPut: $(. + msgNode receiver emitCCodeAsExpressionOn: aStream level: level generator: self. + aStream crtab: level + 1; nextPut: $?; space. + msgNode args first emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. + aStream crtab: level + 1; nextPut: $:; space. + msgNode args last emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. + aStream nextPut: $)]] - [aStream nextPut: $(. - msgNode receiver emitCCodeAsExpressionOn: aStream level: level generator: self. - aStream crtab: level + 1; nextPut: $?; space. - msgNode args first emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. - aStream crtab: level + 1; nextPut: $:; space. - msgNode args last emitCCodeAsArgumentOn: aStream level: level + 2 generator: self. - aStream nextPut: $)] ifNotNil: [:const| (const ifTrue: [msgNode args first] ifFalse: [msgNode args last]) emitCCodeAsArgumentOn: aStream level: level generator: self]! Item was added: + ----- Method: CCodeGenerator>>tryToCollapseBothArmsOfConditional:on:indent: (in category 'C translation support') ----- + tryToCollapseBothArmsOfConditional: msgNode on: aStream indent: level + "Attempt to generate the code for an ifTrue:ifFalse: if both arms are found to be the same, in which case + answer true. Otherwise output nothing and answer false." + (msgNode args first isSameAs: msgNode args second) ifFalse: + [^false]. + msgNode receiver hasSideEffect ifTrue: + [msgNode receiver emitCCodeAsExpressionOn: aStream level: level generator: self. + aStream nextPut: $; ; crtab: level]. + msgNode args first emitCCodeOn: aStream level: level generator: self. + ^true! Item was added: + ----- Method: CCodeGenerator>>tryToCollapseBothArmsOfConditionalExpression:on:indent: (in category 'C translation support') ----- + tryToCollapseBothArmsOfConditionalExpression: msgNode on: aStream indent: level + "Attempt to generate the code for an ifTrue:ifFalse: if both arms are found to be the same, in which case + answer true. Otherwise output nothing and answer false." + (msgNode args first isSameAs: msgNode args second) ifFalse: + [^false]. + aStream nextPut: $(. + msgNode receiver hasSideEffect ifTrue: + [msgNode receiver emitCCodeAsExpressionOn: aStream level: level generator: self. + aStream nextPut: $, ; crtab: level].. + msgNode args first emitCCodeAsArgumentOn: aStream level: level generator: self. + aStream nextPut: $). + ^true! Item was removed: - ----- Method: CogARMCompiler>>jumpLongConditionalTargetBeforeFollowingAddress: (in category 'inline cacheing') ----- - jumpLongConditionalTargetBeforeFollowingAddress: mcpc - ^self jumpLongTargetBeforeFollowingAddress: mcpc! Item was added: + ----- Method: CogAbstractInstruction>>jumpLongConditionalTargetBeforeFollowingAddress: (in category 'inline cacheing') ----- + jumpLongConditionalTargetBeforeFollowingAddress: mcpc + "Extract the target from a long conditional jump. On many ISAs this si the same as + extracting the target from a long unconditional jump, so we provide the default here. + Processors such as MIPS override as appropriate." + <inline: true> + ^self jumpLongTargetBeforeFollowingAddress: mcpc! Item was removed: - ----- Method: CogIA32Compiler>>jumpLongConditionalTargetBeforeFollowingAddress: (in category 'inline cacheing') ----- - jumpLongConditionalTargetBeforeFollowingAddress: mcpc - ^self jumpLongTargetBeforeFollowingAddress: mcpc ! Item was changed: ----- Method: Cogit>>cPIC:HasTarget: (in category 'in-line cacheing') ----- cPIC: cPIC HasTarget: targetMethod "Are any of the jumps from this CPIC to targetMethod?" <var: #cPIC type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> | pc target | target := targetMethod asUnsignedInteger + cmNoCheckEntryOffset. pc := cPIC asInteger + firstCPICCaseOffset. "Since this is a fast test doing simple compares we don't need to care that some + cases have nonsense addresses in there. Just zip on through." + "First jump is unconditional; subsequent ones are conditional" + target = (backEnd jumpLongTargetBeforeFollowingAddress: pc) ifTrue: + [^true]. + 2 to: maxCPICCases do: - cases have nonsense addresses in there. Just zip on through" - 1 to: maxCPICCases do: [:i| + pc := pc + cPICCaseSize. + target = (backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc) ifTrue: + [^true]]. - target = (backEnd jumpLongTargetBeforeFollowingAddress: pc) ifTrue: - [^true]. - pc := pc + cPICCaseSize]. ^false! Item was changed: ----- Method: Cogit>>cPICHasFreedTargets: (in category 'in-line cacheing') ----- cPICHasFreedTargets: cPIC "scan the CPIC for target methods that have been freed. " <var: #cPIC type: #'CogMethod *'> | pc entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> 1 to: cPIC cPICNumCases do: [:i| pc := self addressOfEndOfCase: i inCPIC: cPIC. + entryPoint := i = 1 + ifTrue: [backEnd jumpLongTargetBeforeFollowingAddress: pc] + ifFalse: [backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc]. - entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" (cPIC containsAddress: entryPoint) ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMFree]). targetMethod cmType = CMFree ifTrue: [^true]]]. ^false! Item was changed: ----- Method: Cogit>>closedPICRefersToUnmarkedObject: (in category 'garbage collection') ----- closedPICRefersToUnmarkedObject: cPIC "Answer if the ClosedPIC refers to any unmarked objects or freed/freeable target methods, applying markAndTraceOrFreeCogMethod:firstVisit: to those targets to determine if freed/freeable." <var: #cPIC type: #'CogMethod *'> | pc offsetToLiteral object entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> (objectMemory isImmediate: cPIC selector) ifFalse: [(objectMemory isMarked: cPIC selector) ifFalse: [^true]]. + "First jump is unconditional; subsequent ones are conditional." - "First jump is unconditional; subsequent ones are conditional" offsetToLiteral := backEnd jumpLongByteSize. 1 to: cPIC cPICNumCases do: [:i| pc := self addressOfEndOfCase: i inCPIC: cPIC. (objectRepresentation inlineCacheTagsMayBeObjects and: [i>1] ) "inline cache tags for the 0th case are at the send site" ifTrue: [object := literalsManager classRefInClosedPICAt: pc - offsetToLiteral. ((objectRepresentation couldBeObject: object) and: [(objectMemory isMarked: object) not]) ifTrue: [^true]]. object := literalsManager objRefInClosedPICAt: pc - offsetToLiteral. ((objectRepresentation couldBeObject: object) and: [(objectMemory isMarked: object) not]) ifTrue: [^true]. offsetToLiteral := backEnd jumpLongConditionalByteSize. + entryPoint := i = 1 + ifTrue: [backEnd jumpLongTargetBeforeFollowingAddress: pc] + ifFalse: [backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc]. - entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" self assert: (entryPoint > methodZoneBase and: [entryPoint < methodZone freeStart]). (cPIC containsAddress: entryPoint) ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMFree]). (self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > pc asUnsignedInteger) ifTrue: + [^true]]]. - [^true]]. - ]. ^false! Item was changed: ----- Method: Cogit>>compileClosedPICPrototype (in category 'in-line cacheing') ----- compileClosedPICPrototype + "Compile the abstract instructions for a full closed PIC, used to generate the chunk of code + which is copied to form each closed PIC. A Closed Polymorphic Inline Cache is a small jump + table used to optimize sends with a limited degree of polymorphism (currently up to 6 cases). + We call it closed because it deals only with a finite number of cases, as opposed to an Open PIC. + When a monomorphic linked send (a send with a single case, linking direct to the checked entry + point of a CogMethod) fails a class check, the Cogit attempts to create a two-entry PIC that will + handle jumping to the original target for the original class and the relevant target for the new + class. This jump table will be extended on subsequent failures up to a limit (6). + + We avoid extending CPICs to Open PICs by linking the send site to an Open PIC if one already + exists with the send's selector, a good policy since measurements show that sends of mega- + morphic selectors usually become megamorphic at all send sites. Hence the Open PIC list. + + A CPIC also optimizes MNUs and interpret-only methods. Each case can load SendNumArgs with + the oop of a method, or will load SendNumArgs with 0 if not. MNUs are optimized by jumping to + the mnuAbort in the CPIC, which calls code that creates the Message, thereby avoiding looking up + the original message which will not be found, and either looks up doesNotUnderstand: or directly + activates the method loaded into SendNumArgs, hence avoiding looking up doesNotUnderstand:. + Interpret-only methods are handled by jumping to the picInterpretAbort, which enters the + interpreter activating the method loaded in SendNumArgs. + + CPICs look like the following, where rClass is set at the original send site for the 1st case, and #Foo + is some constant, either an oop, a class tag or an instruction address. + + rTemp := (rRecever bitAnd: TagMask) = 0 ifTrue: [rReceiver class] ifFalse: [rRecever bitAnd: TagMask]. + rTemp = rClass ifFalse: + [self goto: #Label]. + rSendNumArgs := #MethodForCase1Or0. + self goto: #TargetForCase1. + #Label + rTemp = #ClassTagForCase6 ifTrue: + [rSendNumArgs := #MethodForCase6Or0. + self goto: #TargetForCase6]. + ...cases 5, 4 & 3 + rTemp = #ClassTagForCase2 ifTrue: + [rSendNumArgs := #MethodForCase2Or0. + self goto: #TargetForCase2]. + self goto: #CPICMissTrampoline + literals (if out-of-line literals) + + where we short-cut as many cases as needed by making the self goto: #Label skip as many cases + as needed." - "Compile the abstract instructions for a full closed PIC used to initialize closedPICSize. - The loads into SendNumArgsReg are those for optional method objects which may be - used in MNU cases." <inline: true> | numArgs jumpNext | <var: #jumpNext type: #'AbstractInstruction *'> + self compilePICAbort: (numArgs := 0). "Will get rewritten to appropriate arity when configuring." + jumpNext := self compileCPICEntry. + "At the end of the entry code we need to jump to the first case code, which is actually the last chunk. + On each entension we must update this jump to move back one case." + "16r5EAF00D is the method oop, or 0, for the 1st case." - numArgs := 0. - self compilePICAbort: numArgs. - jumpNext := self compileCPICEntry. "at the end of the entry code we need to jump to the first case code, which is actually the last chunk - for each entension we must update this jump to move back one case" self MoveUniqueCw: 16r5EAF00D R: SendNumArgsReg. self JumpLong: self cPICPrototypeCaseOffset + 16rCA5E10. endCPICCase0 := self Label. 1 to: maxCPICCases - 1 do: [:h| + h = (maxCPICCases - 1) ifTrue: + [jumpNext jmpTarget: self Label]. "this is where we jump to for the first case" + "16rBABE1F15+h is the class tag for the Nth case" - h = (maxCPICCases - 1) - ifTrue: [jumpNext jmpTarget: self Label]. "this is where we jump to for the first case" self CmpCw: 16rBABE1F15+h R: TempReg. + "16rBADA550+h is the method oop, or 0, for the Nth case." self MoveUniqueCw: 16rBADA550 + h R: SendNumArgsReg. self JumpLongZero: self cPICPrototypeCaseOffset + 16rCA5E10 + (h * 16). + h = 1 ifTrue: - h = 1 ifTrue: [endCPICCase1 := self Label]]. self MoveCw: methodLabel address R: ClassReg. + self JumpLong: (self cPICMissTrampolineFor: numArgs). "Will get rewritten to appropriate arity when configuring." - self JumpLong: (self cPICMissTrampolineFor: numArgs). cPICEndOfCodeLabel := self Label. literalsManager dumpLiterals: false. ^0! Item was changed: ----- Method: Cogit>>noTargetsFreeInClosedPIC: (in category 'compaction') ----- noTargetsFreeInClosedPIC: cPIC "Answer if all targets in the PIC are in-use methods." + ^(self cPICHasFreedTargets: cPIC) not! - <var: #cPIC type: #'CogMethod *'> - | pc entryPoint targetMethod | - <var: #targetMethod type: #'CogMethod *'> - - 1 to: cPIC cPICNumCases do: - [:i| - pc := self addressOfEndOfCase: i inCPIC: cPIC. - entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. - "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" - (cPIC containsAddress: entryPoint) ifFalse: - [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. - targetMethod cmType ~= CMMethod ifTrue: - [^false]]]. - ^true! Item was changed: ----- Method: Cogit>>relocateCallsInClosedPIC: (in category 'compaction') ----- relocateCallsInClosedPIC: cPIC <var: #cPIC type: #'CogMethod *'> | delta pc entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> delta := cPIC objectHeader. self assert: (backEnd callTargetFromReturnAddress: cPIC asInteger + missOffset) = (self picAbortTrampolineFor: cPIC cmNumArgs). backEnd relocateCallBeforeReturnPC: cPIC asInteger + missOffset by: delta negated. pc := cPIC asInteger + firstCPICCaseOffset. 1 to: cPIC cPICNumCases do: [:i| pc := self addressOfEndOfCase: i inCPIC: cPIC. + entryPoint := i = 1 + ifTrue: [backEnd jumpLongTargetBeforeFollowingAddress: pc] + ifFalse: [backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc]. - entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" (cPIC containsAddress: entryPoint) ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: targetMethod cmType = CMMethod. backEnd relocateJumpLongBeforeFollowingAddress: pc by: (delta - targetMethod objectHeader) negated]]. self assert: cPIC cPICNumCases > 0. "Finally relocate the load of the PIC and the jump to the overflow routine ceCPICMiss:receiver:" backEnd relocateMethodReferenceBeforeAddress: (self addressOfEndOfCase: 2 inCPIC: cPIC)+ backEnd loadPICLiteralByteSize by: delta. backEnd relocateJumpLongBeforeFollowingAddress: cPIC asInteger + cPICEndOfCodeOffset by: delta negated! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>populate:withPICInfoFor:firstCacheTag: (in category 'method introspection') ----- populate: tuple withPICInfoFor: cPIC firstCacheTag: firstCacheTag "Populate tuple (which must be large enough) with the ClosedPIC's target method class pairs. The first entry in tuple contains the bytecode pc for the send, so skip the tuple's first field." <var: #cPIC type: #'CogMethod *'> | pc cacheTag classOop entryPoint targetMethod value | <var: #targetMethod type: #'CogMethod *'> 1 to: cPIC cPICNumCases do: [:i| pc := self addressOfEndOfCase: i inCPIC: cPIC. cacheTag := i = 1 ifTrue: [firstCacheTag] ifFalse: [backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize]. classOop := objectRepresentation classForInlineCacheTag: cacheTag. objectMemory storePointer: i * 2 - 1 ofObject: tuple withValue: classOop. + entryPoint := i = 1 + ifTrue: [backEnd jumpLongTargetBeforeFollowingAddress: pc] + ifFalse: [backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc]. - entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. "Find target from jump. A jump to the MNU entry-point should collect #doesNotUnderstand:" (cPIC containsAddress: entryPoint) ifTrue: [value := objectMemory splObj: SelectorDoesNotUnderstand] ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: targetMethod cmType = CMMethod. value := targetMethod methodObject]. + objectMemory storePointer: i * 2 ofObject: tuple withValue: value]! - objectMemory storePointer: i * 2 ofObject: tuple withValue: value ]! Item was added: + ----- Method: TAssignmentNode>>isSameAs: (in category 'testing') ----- + isSameAs: aTParseNode + ^aTParseNode isAssignment + and: [(variable isSameAs: aTParseNode variable) + and: [expression isSameAs: aTParseNode expression]]! Item was added: + ----- Method: TConstantNode>>hasSideEffect (in category 'testing') ----- + hasSideEffect + "Answer if the parse tree rooted at this node has a side-effect or not." + ^false! Item was added: + ----- Method: TParseNode>>hasSideEffect (in category 'testing') ----- + hasSideEffect + "Answer if the parse tree rooted at this node has a side-effect or not. By default assume it has. Nodes that don't override." + ^true! Item was changed: ----- Method: TParseNode>>isSameAs: (in category 'comparing') ----- isSameAs: aTParseNode + "Answer if the ParseTree rooted at this node is the same as aTParseNode. + By default answer false and have subclasses override as appropriate." + ^false! - ^self subclassResponsibility! Item was added: + ----- Method: TSendNode>>hasSideEffect (in category 'as yet unclassified') ----- + hasSideEffect + "Answer if the parse tree rooted at this node has a side-effect or not." + ^(#(#+ #- #* #/ #// #\\ #= #== #~= #~~) includes: selector) not! Item was added: + ----- Method: TStmtListNode>>isSameAs: (in category 'testing') ----- + isSameAs: aTParseNode + (aTParseNode isStmtList + and: [statements size = aTParseNode statements size]) ifFalse: + [^false]. + statements with: aTParseNode statements do: + [:mine :theirs| + (mine isSameAs: theirs) ifFalse: + [^false]]. + ^true! Item was changed: ----- Method: TSwitchStmtNode>>createCasesFromBraceNode: (in category 'instance initialization') ----- createCasesFromBraceNode: aTBraceNode + "Answer a sequence of tuples of { labels. case } for a TBraceNode, making + sure to collect equivalent cases together under a signle sequence of labels." | casesToStrings stringsToLabels newCases | casesToStrings := Dictionary new. stringsToLabels := Dictionary new. newCases := OrderedCollection new: aTBraceNode caseLabels size. aTBraceNode caseLabels with: aTBraceNode cases do: [:label :case| | printString | printString := casesToStrings at: case put: case printString. (stringsToLabels at: printString ifAbsentPut: [OrderedCollection new]) addLast: label]. aTBraceNode caseLabels with: aTBraceNode cases do: [:label :case| | printString labels | printString := casesToStrings at: case. label = (labels := (stringsToLabels at: printString) asArray) first ifTrue: [newCases addLast: { labels collect: [:ea| ea statements first]. case}]]. ^newCases! Item was added: + ----- Method: TVariableNode>>hasSideEffect (in category 'as yet unclassified') ----- + hasSideEffect + "Answer if the parse tree rooted at this node has a side-effect or not." + ^false!

1 0

VM Maker: VMMaker.oscog-eem.1521.mcz
by commits＠source.squeak.org 17 Nov '15

17 Nov '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1521.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1521 Author: eem Time: 17 November 2015, 1:44:42.026 pm UUID: 4e7fb348-e709-4cb4-8752-c48d71d5e011 Ancestors: VMMaker.oscog-rmacnak.1520 Fix accessor generartor for surrogates when BytesPerWord=8 and hence generate correct accessors for the CogStackPageSurrogate64. =============== Diff against VMMaker.oscog-rmacnak.1520 =============== Item was changed: ----- Method: CogStackPageSurrogate64>>padToWord (in category 'accessing') ----- padToWord + ^memory longAt: address + 61! - ^memory long64At: address + 65! Item was changed: ----- Method: CogStackPageSurrogate64>>padToWord: (in category 'accessing') ----- padToWord: aValue + self assert: (address + 60 >= zoneBase and: [address + 63 < zoneLimit]). + ^memory longAt: address + 61 put: aValue! - self assert: (address + 64 >= zoneBase and: [address + 71 < zoneLimit]). - ^memory long64At: address + 65 put: aValue! Item was changed: ----- Method: CogStackPageSurrogate64>>trace (in category 'accessing') ----- trace + ^memory longAt: address + 57! - ^memory long64At: address + 57! Item was changed: ----- Method: CogStackPageSurrogate64>>trace: (in category 'accessing') ----- trace: aValue + self assert: (address + 56 >= zoneBase and: [address + 59 < zoneLimit]). + ^memory longAt: address + 57 put: aValue! - self assert: (address + 56 >= zoneBase and: [address + 63 < zoneLimit]). - ^memory long64At: address + 57 put: aValue! Item was changed: ----- Method: VMStructType class>>fieldAccessorsForBytesPerWord: (in category 'code generation') ----- fieldAccessorsForBytesPerWord: bytesPerWord | fieldSpecs | fieldSpecs := OrderedCollection new. self instVarNamesAndTypesForTranslationDo: [:ivn :typeTuple| | index replacement | (index := typeTuple indexOf: #BytesPerWord ifAbsent: 0) > 0 ifTrue: [(typeTuple at: index + 1) = bytesPerWord ifTrue: [replacement := typeTuple copyReplaceFrom: index to: index + 1 with: #(). replacement size = 1 ifTrue: [replacement := replacement first]. fieldSpecs add: { ivn. replacement }]] ifFalse: [fieldSpecs add: { ivn. typeTuple }]]. ^fieldSpecs collect: [:tuple| [:ivn :typeTuple| { ('*unused*' match: ivn) ifTrue: [#unused] ifFalse: [ivn]. (typeTuple isArray and: ['unsigned' = typeTuple first]) ifTrue: [Integer readFrom: (typeTuple last readStream skipTo: $:; skipSeparators)] ifFalse: [typeTuple caseOf: { + [#char] -> [8]. + [#'unsigned char'] -> [8]. + [#short] -> [16]. + [#'unsigned short'] -> [16]. + [#int] -> [32]. + [#'unsigned int'] -> [32] } - ['unsigned char'] -> [8]. - ['unsigned short'] -> [16]. - ['unsigned int'] -> [32] } otherwise: [bytesPerWord * 8]]. typeTuple isArray ifTrue: [(typeTuple size >= 3 and: [typeTuple second = #Boolean]) ifTrue: [#Boolean]] ifFalse: [typeTuple last = $* ifTrue: [(typeTuple beginsWith: 'struct _') "remove struct tag if any" ifTrue: [(typeTuple allButFirst: 8) asSymbol] ifFalse: [typeTuple]]] }] valueWithArguments: tuple] "#(4 8) collect: [:bpw| (CogBlockMethod fieldAccessorsForBytesPerWord: bpw) asArray]" "#(4 8) collect: [:bpw| (CogMethod fieldAccessorsForBytesPerWord: bpw) asArray]"!

1 0

Re: [Vm-dev] VM Maker: Cog-rmacnak.294.mcz
by Colin Putney 17 Nov '15

17 Nov '15

Go Ryan! http://blog.imgtec.com/mips-processors/pezy-licenses-mips-for-green-superco… On Wed, Nov 11, 2015 at 8:49 PM, <commits(a)source.squeak.org> wrote: > > Ryan Macnak uploaded a new version of Cog to project VM Maker: > http://source.squeak.org/VMMaker/Cog-rmacnak.294.mcz > > ==================== Summary ==================== > > Name: Cog-rmacnak.294 > Author: rmacnak > Time: 11 November 2015, 8:49:29.983 pm > UUID: 474cf204-cc7d-4c72-bf46-806f7a8095f9 > Ancestors: Cog-eem.293 > > Initial commit of MIPSEL simulator. >

4 3

Fwd: [Pharo-dev] Pharo VM Crash
by Max Leske 16 Nov '15

16 Nov '15

> Begin forwarded message: > > From: Henrik Johansen <henrik.s.johansen(a)veloxit.no> > Date: 16 November 2015 at 12:08:27 GMT+1 > To: Pharo Development List <pharo-dev(a)lists.pharo.org> > Subject: Re: [Pharo-dev] Pharo VM Crash > > >> On 16 Nov 2015, at 11:49 , Boris Spasojevic <spasojev(a)inf.unibe.ch <mailto:spasojev@inf.unibe.ch>> wrote: >> >> Hey all, >> >> How and where can I report the pharo VM crashing? if I have a class Tmp and it has a method >> >> Tmp>>tmp >> [ ^ true ] >> >> and I try to execute Tmp new tmp. The VM segfaults. >> -- >> Cheers, >> BoriS >> >> > > That's a compiler (and probably a code) bug. > It correctly eliminates the unused block, but it *should* emit a return self instruction (as it would for a method with an empty body), but it doesn't, which is why the VM crashes. > > Cheers, > Henry

4 4

Debugging VM crash, INVALID RECEIVER / a(n) bad class ??
by Mariano Martinez Peck 16 Nov '15

16 Nov '15

Hi guys, I am debugging a Pharo VM crash I am having and I cannot figure out what it is exactly. I suspect it might be related to block closures compilation but I am not sure. I have a reproducible crash test under Pharo 4.0 and OSX. I built a VM in debug mode and I run it via gdb. This is the kind of info I am able to see: *Program received signal SIGSEGV, Segmentation fault.* *0x000ab66b in updatePointersInRangeFromto (memStart=924623948, memEnd=928201420) at /Users/mariano/Pharo/git/pharo-vm/src/vm/gcc3x-cointerp.c:40444* *40444 && (((longAt(fieldOop)) & MarkBit) != 0)) {* *(gdb) call printAllStacks()* *Process 0x30e228c4 priority 40* *0xbffb2e10 M FaAction class>block: 0x20ebb104: a(n) FaAction class* *0xbffb2e30 M BlockClosure(FaMemoryStoreSession)>register: 0x371d0968: a(n) BlockClosure* *0xbffb2e4c M INVALID RECEIVER>register: 0x371cfd54: a(n) bad class* *(callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil)) 48626* *0x3721e1f0 is not a context* *0x371c34b4 is not a context* And another crash: *Program received signal SIGSEGV, Segmentation fault.* *0x000ab66b in updatePointersInRangeFromto (memStart=924677864, memEnd=928262300) at /Users/mariano/Pharo/git/pharo-vm/src/vm/gcc3x-cointerp.c:40444* *40444 && (((longAt(fieldOop)) & MarkBit) != 0)) {* *(gdb) call printAllStacks()* *Process 0x30e228c4 priority 40* *0xbffb2de0 M INVALID RECEIVER>initialize 0x3722b9a0: a(n) bad class* *0xbffb2df8 M FaAction class(Behavior)>new 0x20ebb104: a(n) FaAction class* *0xbffb2e10 M FaAction class>block: 0x20ebb104: a(n) FaAction class* *0xbffb2e30 M INVALID RECEIVER>register: 0x371ddee0: a(n) bad class* *0xbffb2e4c M INVALID RECEIVER>register: 0x371dd328 is in old space* *(callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil)) 48626* *0x3722b750 is not a context* *[New Thread 0x1b43 of process 5886]* *[New Thread 0x1d2f of process 5886]* *[New Thread 0x1f07 of process 5886]* *[New Thread 0x1e07 of process 5886]* >From what I can see in *#printActivationNameFor: aMethod receiver: anObject isBlock: isBlock firstTemporary: maybeMessage* It looks like if the memory address is not an OOP, nor forwarding pointer nor... It also seems like the above stack I can get is not the real cause but a side effect that makes GC to crash (#updatePointersInRangeFromto) As said, I have a way to reproduce the crash, and I already have the VM compiled in debug and gdb running. I can also attach the full output of the gdb stack. BTW.... in the output of the gdb I see lots of printings like: *(numStack + ReceiverIndex) < (lengthOf(theContext)) 45421* *(ReceiverIndex + contextSize) < (lengthOfbaseHeaderformat(oop, header2, fmt)) 40416* Any pointer is appreciated. Thanks! -- Mariano http://marianopeck.wordpress.com

2 3

Fwd: [Pharo-dev] Pharo VM Crash
by Max Leske 16 Nov '15

16 Nov '15

Forwarded on behalf of Boris. > Begin forwarded message: > > From: Boris Spasojevic <spasojev(a)inf.unibe.ch> > Date: 16 November 2015 at 11:49:21 GMT+1 > To: <pharo-dev(a)lists.pharo.org> > Subject: [Pharo-dev] Pharo VM Crash > > Hey all, > > How and where can I report the pharo VM crashing? if I have a class Tmp and it has a method > > Tmp>>tmp > [ ^ true ] > > and I try to execute Tmp new tmp. The VM segfaults. > -- > Cheers, > BoriS > >

1 0

Re: [Pharo-dev] keyboard events in the windows VM
by Nicolai Hess 16 Nov '15

16 Nov '15

Anyone from Squeak/SqueeakVM interested on this change? I can build a squeak vm as well and / or provide a vm-source patch file. 2015-11-13 8:33 GMT+01:00 Nicolai Hess <nicolaihess(a)gmail.com>: > > > 2015-11-12 16:43 GMT+01:00 EuanM <euanmee(a)gmail.com>: > >> I'm happy to test on Windows 7, and on Raspbian Linux >> >> (Although Raspbian Linux runs Pharo UI events slo-o-owly, so I am not >> the best person to do the Linux testing) >> > > Thank you EuanM, > I 'll provide a vm with these changes. All changes are only for the > windows vm at the moment. > > >> >> On 12 November 2015 at 15:42, EuanM <euanmee(a)gmail.com> wrote: >> > I think anything that makes a consistent UI to Pharo for users on >> > different platforms is a good thing. >> > >> > However, I do not know what the downside-effects of this change are. >> > >> > The key thing is to capture all breaks caused by the changed, so they >> > can be coded through or around. And ensure that the test results are >> > viewed with at least the same importance as the automated Jenkins CI >> > test results. >> > >> > I do not know the extent that the Jenkins CI tests actually simulate >> > user keyboard input, so... (Pharo pseudocode for comic effect and >> > clarity) >> > >> > We can write Jenkins tests that simulate user input >> > ifTrue: [ we should do so ]. >> > ifFalse: [ >> > we should >> > write a canonical set of regression test scripts for human >> > users to follow . >> > we should >> > do: [:eachPlatformSupportedByPharo | >> > run the tests in which humans use keyboard tasks ] . >> > we should >> > capture the results ; >> > and feed them into automated the regression tests results >> database >> > ] >> > >> > >> > On 12 November 2015 at 08:35, Nicolai Hess <nicolaihess(a)gmail.com> >> wrote: >> >> A short overview: >> >> >> >> With Ctrl-Key pressed, >> >> >> >> some keyboard events don't generate smalltalk keystrokes (EventKeyChar) >> >> ctrl+tab, ctrl+1, ctrl+2, ..., ctrl+0, ctrl+Tab, ctrl+m >> >> >> >> for some keyboard events there are only key down and key up events >> (from >> >> windows) but the vm "generates" a keypress (EventKeyChar) event >> >> ctrl+Home, ctrl+End, ctrl+PageUp, ... >> >> >> >> But the key value , char code and ctrl flag for this generated events, >> make >> >> them undistinguishable from other ctrl+key shortcuts >> >> ctrl+a = ctrl+Home, ctrl+d = ctrl+End, ctrl+k=ctrl+PageUp,... >> >> >> >> And one key (ctrl+Enter) creates two EventKeyChar events one "normal" >> and >> >> one that is generated from the vm >> >> one with keyvalue 10 and one with 13. >> >> >> >> And the keycode for char like "a","b", ..., are different if you they >> are >> >> typed with or without ctrl-key >> >> >> >> just key "a": >> >> keycode: >> >> 65 (keydown event) >> >> 97 (keyvalue/charcode event) (65 if you press shift key) >> >> 65 (keyup event) >> >> >> >> with ctrl key pressed: >> >> keycode >> >> 65 (keydown event) >> >> 1 (keyvalue/charcode event) >> >> 65 (keyup event) >> >> >> >> >> >> I would like to change this, that means: >> >> >> >> generate EventKeyChar events for >> >> ctrl+1, ctrl+2, ..., ctrl+Tab, ctrl+m >> >> >> >> remove the double key event for ctrl+Enter >> >> >> >> and adopt the behavior of the linux vm, for keyValue, charCode values >> for >> >> events like >> >> ctrl+a, ctrl+home, ... >> >> >> >> for example, the linux vm generates event buffer values: >> >> #(2 7329656 1 0 2 65 0 1) for ctrl+a (keyValue 1/charCode 65) >> >> but >> >> #(2 7329656 1 0 2 1 0 1) for ctrl+home (keyValue 1/charCode 1) >> >> >> >> this may need some changes on the image side. For example, in Pharo we >> >> have some special handling that adds "96" to the keyValue for >> keystrokes >> >> with ctrl-key). >> >> >> >> What do you think? >> >> >> >> >> >> >> >> nicolai >> >> >> >> >

1 0

[commit][3485] update resolver local address discovery; it seem gethostbyaddr has been compromised by OS changes recently.
by commits＠squeakvm.org 16 Nov '15

16 Nov '15

Revision: 3485 Author: rowledge Date: 2015-11-05 12:53:44 -0800 (Thu, 05 Nov 2015) Log Message: ----------- update resolver local address discovery; it seem gethostbyaddr has been compromised by OS changes recently. Change to using ifgetaddrs and scanning for eth0 or wlan0 addresses, which looks like a good change on Raspbian at least. Modified Paths: -------------- branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c Modified: branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c =================================================================== --- branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2015-11-05 18:16:38 UTC (rev 3484) +++ branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2015-11-05 20:53:44 UTC (rev 3485) @@ -83,6 +83,7 @@ # include <netinet/tcp.h> # include <arpa/inet.h> # include <netdb.h> +#include <ifaddrs.h> # include <errno.h> # include <unistd.h> @@ -1504,11 +1505,55 @@ sqInt sqResolverAddrLookupResultSize(void) { return strlen(lastName); } sqInt sqResolverError(void) { return lastError; } sqInt sqResolverLocalAddress(void) +#if 0 +/* old code */ { sqInt localaddr = nameToAddr(localHostName); if (!localaddr) localaddr = nameToAddr("localhost"); return localaddr; } +#else +/* experimental new code */ +{ + struct ifaddrs *ifaddr, *ifa; + int family, s; + char host[NI_MAXHOST]; + sqInt localAddr = 0; + + if (getifaddrs(&ifaddr) == -1) { + interpreterProxy->success(false); + return 0; + } + + + for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) + { + if (ifa->ifa_addr == NULL) + continue; + + s=getnameinfo(ifa->ifa_addr,sizeof(struct sockaddr_in),host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + + if(((strcmp(ifa->ifa_name,"eth0")==0)||(strcmp(ifa->ifa_name,"wlan0")==0))&&(ifa->ifa_addr->sa_family==AF_INET)) + { + if (s != 0) + { + interpreterProxy->success(false); + return 0; + } + FPRINTF((stderr, "\tInterface : <%s>\n",ifa->ifa_name )); + FPRINTF((stderr, "\t IP : <%s>\n", inet_ntoa(((struct sockaddr_in *)(ifa->ifa_addr))->sin_addr))); + if(localAddr == 0) { /* take the first plausible answer */ + localAddr = ((struct sockaddr_in *)(ifa->ifa_addr))->sin_addr.s_addr; + } + + } + } + + freeifaddrs(ifaddr); + return ntohl(localAddr); + +} +#endif sqInt sqResolverNameLookupResult(void) { return lastAddr; } void sqResolverAddrLookupResult(char *nameForAddress, sqInt nameSize)

6 8

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2015