Vm-dev September 2016

vm-dev@lists.squeakfoundation.org

30 participants
102 discussions

[OpenSmalltalk/opensmalltalk-vm] 3b11fc: CogVM source as per VMMaker.oscog-eem.1950
by GitHub 07 Sep '16

07 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 3b11fcf05214243cba7bacfba42afbe8e97f3aaf https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3b11fcf05214243cba… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c A spursista64src/examplePlugins.ext A spursista64src/examplePlugins.int A spursista64src/vm/cogit.c A spursista64src/vm/cogit.h A spursista64src/vm/cogitX64.c A spursista64src/vm/cogmethod.h A spursista64src/vm/cointerp.c A spursista64src/vm/cointerp.h A spursista64src/vm/exampleSqNamedPrims.h A spursista64src/vm/gcc3x-cointerp.c A spursista64src/vm/interp.h A spursista64src/vm/vmCallback.h M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1950 Fix a callback bug that was triggered when using multiple bytecode sets (set the method back to the callout method on all return paths). Add MoveRA32 and MoveA32R support for Sista on x64. Add spursista64src.

1 0

VM Maker: VMMaker.oscog-eem.1950.mcz
by commits＠source.squeak.org 07 Sep '16

07 Sep '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1950.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1950 Author: eem Time: 7 September 2016, 3:31:10.027268 pm UUID: b4089b49-1494-49d2-8966-57cba5c92194 Ancestors: VMMaker.oscog-rsf.1949 Fix Roni's callback fix for the Cogit. Add MoveRA32 and MoveA32R support for Sista on x64. =============== Diff against VMMaker.oscog-rsf.1949 =============== Item was changed: SharedPool subclass: #CogRTLOpcodes instanceVariableNames: '' + classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCqRR AndCwR AndRR ArithmeticShiftRightCqR ArithmeticShiftRightRR Call CallFull CmpC32R CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DivRdRd Fill32 FirstJump FirstShortJump Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpFull JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode Literal LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveA32R MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRA32 MoveRAb MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRRd MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdR MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PopR PrefetchAw PushCq PushCw PushR RetN RotateLeftCqR RotateRightCqR SqrtRd Stop SubCqR SubCwR SubRR SubRdRd TstCqR XorCqR XorCwR XorRR' - classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCqRR AndCwR AndRR ArithmeticShiftRightCqR ArithmeticShiftRightRR Call CallFull CmpC32R CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DivRdRd Fill32 FirstJump FirstShortJump Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpFull JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode Literal LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRAb MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRRd MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdR MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PopR PrefetchAw PushCq PushCw PushR RetN RotateLeftCqR RotateRightCqR SqrtRd Stop SubCqR SubCwR SubRR SubRdRd TstCqR XorCqR XorCwR XorRR' poolDictionaries: '' category: 'VMMaker-JIT'! !CogRTLOpcodes commentStamp: 'eem 12/26/2015 14:00' prior: 0! I am a pool for the Register-Transfer-Language to which Cog compiles. I define unique integer values for all RTL opcodes. See CogAbstractInstruction for instances of instructions with the opcodes that I define.! Item was changed: ----- Method: CogRTLOpcodes class>>initialize (in category 'class initialization') ----- initialize "Abstract opcodes are a compound of a one word operation specifier and zero or more operand type specifiers. The assembler is in Cogit protocol abstract instructions and uses `at&t' syntax, assigning to the register on the right. e.g. MoveRR is the Move opcode with two register operand specifiers and defines a move register to register instruction from operand 0 to operand 1. The word and register size is assumed to be either 32-bits on a 32-bit architecture or 64-bits on a 64-bit architecture. The abstract machine is mostly a 2 address machine with the odd three address instruction added to better exploit RISCs. (self initialize) The operand specifiers are R - general purpose register Rd - double-precision floating-point register Cq - a `quick' constant that can be encoded in the minimum space possible. Cw - a constant with word size where word is the default operand size for the Smalltalk VM, 32-bits for a 32-bit VM, 64-bits for a 64-bit VM. The generated constant must occupy the default number of bits. This allows e.g. a garbage collector to update the value without invalidating the code. C32 - a constant with 32 bit size. The generated constant must occupy 32 bits. C64 - a constant with 64 bit size. The generated constant must occupy 64 bits. + Aw - memory word (32-bits for a 32-bit VM, 64-bits for a 64-bit VM) at an absolute address - Aw - memory word at an absolute address Ab - memory byte at an absolute address + A32 - memory 32-bit halfword at an absolute address Mwr - memory word whose address is at a constant offset from an address in a register Mbr - memory byte whose address is at a constant offset from an address in a register (zero-extended on read) M16r - memory 16-bit halfword whose address is at a constant offset from an address in a register M32r - memory 32-bit halfword whose address is at a constant offset from an address in a register M64r - memory 64-bit doubleword whose address is at a constant offset from an address in a register Xbr - memory byte whose address is r * byte size away from an address in a register X16r - memory 16-bit halfword whose address is r * (2 bytes size) away from an address in a register X32r - memory 32-bit halfword whose address is r * (4 bytes size) away from an address in a register Xwr - memory word whose address is r * word size away from an address in a register Xowr - memory word whose address is o + (r * word size) away from an address in a register (scaled indexed) An alternative would be to decouple opcodes from operands, e.g. Move := 1. Add := 2. Sub := 3... RegisterOperand := 1. ConstantQuickOperand := 2. ConstantWordOperand := 3... But not all combinations make sense and even fewer are used so we stick with the simple compound approach. The assumption is that comparison and arithmetic instructions set condition codes and that move instructions leave the condition codes unaffected. In particular LoadEffectiveAddressMwrR does not set condition codes although it can be used to do arithmetic. On processors such as MIPS this distinction is invalid; there are no condition codes. So the backend is allowed to collapse operation, branch pairs to internal instruciton definitions (see sender and implementors of noteFollowingConditionalBranch:). Not all of the definitions in opcodeDefinitions below are implemented. In particular we do not implement the XowrR scaled index addressing mode since it requires 4 operands. Not all instructions make sense on all architectures. MoveRRd and MoveRdR aqre meaningful only on 64-bit machines. Note that there are no generic division instructions defined, but a processor may define some. Branch/Call ranges. Jump[Cond] can be generated as short as possible. Call/Jump[Cond]Long must be generated in the same number of bytes irrespective of displacement since their targets may be updated, but they need only span 16Mb, the maximum size of the code zone. This allows e.g. ARM to use single-word call and jump instructions for most calls and jumps. CallFull/JumpFull must also be generated in the same number of bytes irrespective of displacement for the same reason, but they must be able to span the full (32-bit or 64-bit) address space because they are used to call code in the C runtime, which may be distant from the code zone. CallFull/JumpFull are allowed to use the cResultRegister as a scratch if required (e.g. on x64 where there is no direct 64-bit call or jump). Byte reads. If the concrete compiler class answers true to byteReadsZeroExtend then byte reads must zero-extend the byte read into the destination register. If not, the other bits of the register should be left undisturbed and the Cogit will add an instruction to zero the register as required. Under no circumstances should byte reads sign-extend. 16-bit (and on 64-bits, 32-bit) reads. These /are/ expected to always zero-extend." | opcodeNames refs | opcodeNames := #("Noops & Pseudo Ops" Label Literal "a word-sized literal" AlignmentNops Fill32 "output four byte's worth of bytes with operand 0" Nop "Control" Call "call within the code zone" CallFull "call anywhere within the full address space" RetN JumpR "Not a regular jump, i.e. not pc dependent." Stop "Halt the processor" "N.B. Jumps are contiguous. Long and Full jumps are contigiuous within them. See FirstJump et al below" JumpFull "Jump anywhere within the address space" JumpLong "Jump anywhere within the 16mb code zone." JumpLongZero "a.k.a. JumpLongEqual" JumpLongNonZero "a.k.a. JumpLongNotEqual" Jump "short jumps; can be encoded in as few bytes as possible; will not be disturbed by GC or relocation." JumpZero "a.k.a. JumpEqual" JumpNonZero "a.k.a. JumpNotEqual" JumpNegative JumpNonNegative JumpOverflow JumpNoOverflow JumpCarry JumpNoCarry JumpLess "signed" JumpGreaterOrEqual JumpGreater JumpLessOrEqual JumpBelow "unsigned" JumpAboveOrEqual JumpAbove JumpBelowOrEqual JumpFPEqual JumpFPNotEqual JumpFPLess JumpFPLessOrEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPOrdered JumpFPUnordered "Data Movement; destination is always last operand" MoveRR + MoveAwR MoveA32R + MoveRAw MoveRA32 - MoveAwR - MoveRAw MoveAbR MoveRAb MoveMwrR MoveRMwr MoveXwrRR MoveRXwrR MoveXowrR MoveRXowr MoveM16rR MoveRM16r MoveX16rRR MoveRX16rR MoveM32rR MoveRM32r MoveX32rRR MoveRX32rR MoveMbrR MoveRMbr MoveXbrRR MoveRXbrR MoveCqR MoveCwR MoveC32R MoveC64R MoveRRd MoveRdR MoveRdRd MoveM64rRd MoveRdM64r PopR PushR PushCq PushCw PrefetchAw "Arithmetic; destination is always last operand except Cmp; CmpXR is SubRX with no update of result" LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR "Variants of add/multiply" NegateR "2's complement negation" ArithmeticShiftRightCqR ArithmeticShiftRightRR LogicalShiftRightCqR LogicalShiftRightRR LogicalShiftLeftCqR LogicalShiftLeftRR RotateLeftCqR RotateRightCqR CmpRR AddRR SubRR AndRR OrRR XorRR CmpCqR AddCqR SubCqR AndCqR OrCqR TstCqR XorCqR CmpCwR CmpC32R AddCwR SubCwR AndCwR OrCwR XorCwR AndCqRR "Three address ops for RISCs; feel free to add and extend" CmpRdRd AddRdRd SubRdRd MulRdRd DivRdRd SqrtRd "Conversion" ConvertRRd LastRTLCode). "Magic auto declaration. Add to the classPool any new variables and nuke any obsolete ones, and assign values" "Find the variables directly referenced by this method" refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect: [:ea| ea key]. "Move to Undeclared any opcodes in classPool not in opcodes or this method." (classPool keys reject: [:k| (opcodeNames includes: k) or: [refs includes: k]]) do: [:k| Undeclared declare: k from: classPool]. "Declare as class variables and number elements of opcodeArray above" opcodeNames withIndexDo: [:classVarName :value| self classPool declare: classVarName from: Undeclared; at: classVarName put: value]. "For CogAbstractInstruction>>isJump etc..." FirstJump := JumpFull. LastJump := JumpFPUnordered. FirstShortJump := Jump. "And now initialize the backends; they add their own opcodes and hence these must be reinitialized." (Smalltalk classNamed: #CogAbstractInstruction) ifNotNil: [:cogAbstractInstruction| cogAbstractInstruction allSubclasses do: [:sc| sc initialize]]! Item was changed: ----- Method: CogX64Compiler>>computeMaximumSize (in category 'generate machine code') ----- (excessive size, no diff calculated) Item was added: + ----- Method: CogX64Compiler>>concretizeMoveA32R (in category 'generate machine code') ----- + concretizeMoveA32R + "Will get inlined into concretizeAt: switch." + <inline: true> + | addressOperand reg offset | + addressOperand := operands at: 0. + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *')) ifTrue: + [addressOperand := (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *') address]. + reg := operands at: 1. + reg = RAX + ifTrue: [offset := 0] + ifFalse: + [machineCode + at: 0 put: (self rexR: 0 x: 0 b: reg); + at: 1 put: 16r90 + (reg \\ 8). + offset := 2]. + machineCode + at: 0 + offset put: 16rA1; + at: 1 + offset put: (addressOperand bitAnd: 16rFF); + at: 2 + offset put: (addressOperand >> 8 bitAnd: 16rFF); + at: 3 + offset put: (addressOperand >> 16 bitAnd: 16rFF); + at: 4 + offset put: (addressOperand >> 24 bitAnd: 16rFF); + at: 5 + offset put: (addressOperand >> 32 bitAnd: 16rFF); + at: 6 + offset put: (addressOperand >> 40 bitAnd: 16rFF); + at: 7 + offset put: (addressOperand >> 48 bitAnd: 16rFF); + at: 8 + offset put: (addressOperand >> 56 bitAnd: 16rFF). + reg = RAX ifTrue: + [^machineCodeSize := 9]. + machineCode + at: 11 put: (machineCode at: 0); + at: 12 put: (machineCode at: 1). + ^machineCodeSize := 13! Item was added: + ----- Method: CogX64Compiler>>concretizeMoveRA32 (in category 'generate machine code') ----- + concretizeMoveRA32 + "Will get inlined into concretizeAt: switch." + <inline: true> + | addressOperand reg offset | + reg := operands at: 0. + addressOperand := operands at: 1. + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *')) ifTrue: + [addressOperand := (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *') address]. + reg = RAX + ifTrue: [offset := 0] + ifFalse: + [machineCode + at: 0 put: (self rexR: 0 x: 0 b: reg); + at: 1 put: 16r90 + (reg \\ 8). + offset := 2]. + machineCode + at: 0 + offset put: 16rA3; + at: 1 + offset put: (addressOperand bitAnd: 16rFF); + at: 2 + offset put: (addressOperand >> 8 bitAnd: 16rFF); + at: 3 + offset put: (addressOperand >> 16 bitAnd: 16rFF); + at: 4 + offset put: (addressOperand >> 24 bitAnd: 16rFF); + at: 5 + offset put: (addressOperand >> 32 bitAnd: 16rFF); + at: 6 + offset put: (addressOperand >> 40 bitAnd: 16rFF); + at: 7 + offset put: (addressOperand >> 48 bitAnd: 16rFF); + at: 8 + offset put: (addressOperand >> 56 bitAnd: 16rFF). + reg = RAX ifTrue: + [^machineCodeSize := 9]. + machineCode + at: 11 put: (machineCode at: 0); + at: 12 put: (machineCode at: 1). + ^machineCodeSize := 13! Item was changed: ----- Method: CogX64Compiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." <returnTypeC: #void> opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [AlignmentNops] -> [^self concretizeAlignmentNops]. [Fill32] -> [^self concretizeFill32]. [Nop] -> [^self concretizeNop]. "Specific Control/Data Movement" [CDQ] -> [^self concretizeCDQ]. [IDIVR] -> [^self concretizeIDIVR]. [IMULRR] -> [^self concretizeMulRR]. "[CPUID] -> [^self concretizeCPUID]." "[CMPXCHGAwR] -> [^self concretizeCMPXCHGAwR]." "[CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]." "[LFENCE] -> [^self concretizeFENCE: 5]." "[MFENCE] -> [^self concretizeFENCE: 6]. [SFENCE] -> [^self concretizeFENCE: 7]." "[LOCK] -> [^self concretizeLOCK]." "[XCHGAwR] -> [^self concretizeXCHGAwR]." "[XCHGMwrR] -> [^self concretizeXCHGMwrR]." [XCHGRR] -> [^self concretizeXCHGRR]. "Control" [Call] -> [^self concretizeCall]. [CallFull] -> [^self concretizeCallFull]. [JumpR] -> [^self concretizeJumpR]. [JumpFull] -> [^self concretizeJumpFull]. [JumpLong] -> [^self concretizeJumpLong]. [JumpLongZero] -> [^self concretizeConditionalJump: 16r4]. [JumpLongNonZero] -> [^self concretizeConditionalJump: 16r5]. [Jump] -> [^self concretizeJump]. "Table B-1 Intel¬Æ 64 and IA-32 Architectures Software Developer's Manual Volume 1: Basic Architecture" [JumpZero] -> [^self concretizeConditionalJump: 16r4]. [JumpNonZero] -> [^self concretizeConditionalJump: 16r5]. [JumpNegative] -> [^self concretizeConditionalJump: 16r8]. [JumpNonNegative] -> [^self concretizeConditionalJump: 16r9]. [JumpOverflow] -> [^self concretizeConditionalJump: 16r0]. [JumpNoOverflow] -> [^self concretizeConditionalJump: 16r1]. [JumpCarry] -> [^self concretizeConditionalJump: 16r2]. [JumpNoCarry] -> [^self concretizeConditionalJump: 16r3]. [JumpLess] -> [^self concretizeConditionalJump: 16rC]. [JumpGreaterOrEqual] -> [^self concretizeConditionalJump: 16rD]. [JumpGreater] -> [^self concretizeConditionalJump: 16rF]. [JumpLessOrEqual] -> [^self concretizeConditionalJump: 16rE]. [JumpBelow] -> [^self concretizeConditionalJump: 16r2]. [JumpAboveOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpAbove] -> [^self concretizeConditionalJump: 16r7]. [JumpBelowOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPEqual] -> [^self concretizeConditionalJump: 16r4]. [JumpFPNotEqual] -> [^self concretizeConditionalJump: 16r5]. [JumpFPLess] -> [^self concretizeConditionalJump: 16r2]. [JumpFPGreaterOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpFPGreater] -> [^self concretizeConditionalJump: 16r7]. [JumpFPLessOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPOrdered] -> [^self concretizeConditionalJump: 16rB]. [JumpFPUnordered] -> [^self concretizeConditionalJump: 16rA]. [RetN] -> [^self concretizeRetN]. [Stop] -> [^self concretizeStop]. "Arithmetic" [AddCqR] -> [^self concretizeArithCqRWithRO: 0 raxOpcode: 15r05]. [AddCwR] -> [^self concretizeArithCwR: 16r03]. [AddRR] -> [^self concretizeOpRR: 16r03]. [AddRdRd] -> [^self concretizeSEE2OpRdRd: 16r58]. [AndCqR] -> [^self concretizeArithCqRWithRO: 4 raxOpcode: 16r25]. [AndCwR] -> [^self concretizeArithCwR: 16r23]. [AndRR] -> [^self concretizeOpRR: 16r23]. [TstCqR] -> [^self concretizeTstCqR]. [CmpCqR] -> [^self concretizeArithCqRWithRO: 7 raxOpcode: 16r3D]. [CmpCwR] -> [^self concretizeArithCwR: 16r39]. [CmpC32R] -> [^self concretizeCmpC32R]. [CmpRR] -> [^self concretizeReverseOpRR: 16r39]. [CmpRdRd] -> [^self concretizeCmpRdRd]. [DivRdRd] -> [^self concretizeSEE2OpRdRd: 16r5E]. [MulRdRd] -> [^self concretizeSEE2OpRdRd: 16r59]. [OrCqR] -> [^self concretizeArithCqRWithRO: 1 raxOpcode: 16r0D]. [OrCwR] -> [^self concretizeArithCwR: 16r0B]. [OrRR] -> [^self concretizeOpRR: 16r0B]. [SubCqR] -> [^self concretizeArithCqRWithRO: 5 raxOpcode: 16r2D]. [SubCwR] -> [^self concretizeArithCwR: 16r2B]. [SubRR] -> [^self concretizeOpRR: 16r2B]. [SubRdRd] -> [^self concretizeSEE2OpRdRd: 16r5C]. [SqrtRd] -> [^self concretizeSqrtRd]. [XorCwR] -> [^self concretizeArithCwR: 16r33]. [XorRR] -> [^self concretizeOpRR: 16r33]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [RotateLeftCqR] -> [^self concretizeShiftCqRegOpcode: 0]. [RotateRightCqR] -> [^self concretizeShiftCqRegOpcode: 1]. [ArithmeticShiftRightCqR] -> [^self concretizeShiftCqRegOpcode: 7]. [LogicalShiftRightCqR] -> [^self concretizeShiftCqRegOpcode: 5]. [LogicalShiftLeftCqR] -> [^self concretizeShiftCqRegOpcode: 4]. [ArithmeticShiftRightRR] -> [^self concretizeShiftRegRegOpcode: 7]. [LogicalShiftLeftRR] -> [^self concretizeShiftRegRegOpcode: 4]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. [MoveC32R] -> [^self concretizeMoveC32R]. [MoveRR] -> [^self concretizeReverseOpRR: 16r89]. [MoveAwR] -> [^self concretizeMoveAwR]. + [MoveA32R] -> [^self concretizeMoveA32R]. [MoveRAw] -> [^self concretizeMoveRAw]. + [MoveRA32] -> [^self concretizeMoveRA32]. [MoveAbR] -> [^self concretizeMoveAbR]. [MoveRAb] -> [^self concretizeMoveRAb]. [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeMoveRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveRM16r] -> [^self concretizeMoveRM16r]. [MoveM64rRd] -> [^self concretizeMoveM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveRXbrR] -> [^self concretizeMoveRXbrR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveX32rRR] -> [^self concretizeMoveX32rRR]. [MoveRX32rR] -> [^self concretizeMoveRX32rR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeMoveRdM64r]. [MoveRdR] -> [^self concretizeMoveRdR]. [MoveRRd] -> [^self concretizeMoveRRd]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCq] -> [^self concretizePushCq]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. "Conversion" [ConvertRRd] -> [^self concretizeConvertRRd] }! Item was added: + ----- Method: Cogit>>MoveA32:R: (in category 'abstract instructions') ----- + MoveA32: address R: reg + <inline: true> + <returnTypeC: #'AbstractInstruction *'> + ^self gen: (objectMemory wordSize = 8 + ifTrue: [MoveA32R] + ifFalse: [MoveAwR]) + literal: address + operand: reg! Item was added: + ----- Method: Cogit>>MoveR:A32: (in category 'abstract instructions') ----- + MoveR: reg A32: address + <inline: true> + <returnTypeC: #'AbstractInstruction *'> + ^self gen: (objectMemory wordSize = 8 + ifTrue: [MoveRA32] + ifFalse: [MoveRAw]) + operand: reg + literal: address! Item was changed: ----- Method: SistaCogit>>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 MoveA32: counterAddress R: counterReg. - 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 A32: counterAddress. "write back" - self MoveR: counterReg Aw: counterAddress. "write back" binaryBlock value: counterAddress value: countTripped! Item was changed: ----- Method: SistaCogit>>genFallsThroughCountLogicCounterReg:counterAddress: (in category 'bytecode generator support') ----- genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress <inline: true> "Gen this when the branch has not been taken and forwarders have been followed." self SubCq: 1 R: counterReg. "Count untaken" + self MoveR: counterReg A32: counterAddress. "write back"! - self MoveR: counterReg Aw: counterAddress. "write back"! Item was changed: ----- Method: StackInterpreter>>returnAs:ThroughCallback:Context: (in category 'callback support') ----- returnAs: returnTypeOop ThroughCallback: vmCallbackContext Context: callbackMethodContext "callbackMethodContext is an activation of invokeCallback:[stack:registers:jmpbuf:]. Its sender is the VM's state prior to the callback. Reestablish that state (via longjmp), and mark callbackMethodContext as dead." <export: true> <var: #vmCallbackContext type: #'VMCallbackContext *'> | calloutMethodContext theFP thePage | <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> ((self isIntegerObject: returnTypeOop) and: [self isLiveContext: callbackMethodContext]) ifFalse: [^false]. calloutMethodContext := self externalInstVar: SenderIndex ofContext: callbackMethodContext. (self isLiveContext: calloutMethodContext) ifFalse: [^false]. "We're about to leave this stack page; must save the current frame's instructionPointer." self push: instructionPointer. self externalWriteBackHeadFramePointers. "Mark callbackMethodContext as dead; the common case is that it is the current frame. We go the extra mile for the debugger." (self isSingleContext: callbackMethodContext) ifTrue: [self markContextAsDead: callbackMethodContext] ifFalse: [theFP := self frameOfMarriedContext: callbackMethodContext. framePointer = theFP "common case" ifTrue: [(self isBaseFrame: theFP) ifTrue: [stackPages freeStackPage: stackPage] ifFalse: "calloutMethodContext is immediately below on the same page. Make it current." [instructionPointer := (self frameCallerSavedIP: framePointer) asUnsignedInteger. stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + objectMemory wordSize. framePointer := self frameCallerFP: framePointer. + self setMethod: (self frameMethodObject: framePointer). - self setMethod: (self frameMethod: framePointer). self restoreCStackStateForCallbackContext: vmCallbackContext. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). ^true]] ifFalse: [self externalDivorceFrame: theFP andContext: callbackMethodContext. self markContextAsDead: callbackMethodContext]]. "Make the calloutMethodContext the active frame. The case where calloutMethodContext is immediately below callbackMethodContext on the same page is handled above." (self isStillMarriedContext: calloutMethodContext) ifTrue: [theFP := self frameOfMarriedContext: calloutMethodContext. thePage := stackPages stackPageFor: theFP. "findSPOf:on: points to the word beneath the instructionPointer, but there is no instructionPointer on the top frame of the current page." self assert: thePage ~= stackPage. stackPointer := (self findSPOf: theFP on: thePage) - objectMemory wordSize. framePointer := theFP] ifFalse: [thePage := self makeBaseFrameFor: calloutMethodContext. framePointer := thePage headFP. stackPointer := thePage headSP]. instructionPointer := self popStack. self setMethod: (objectMemory fetchPointer: MethodIndex ofObject: calloutMethodContext). self setStackPageAndLimit: thePage. self restoreCStackStateForCallbackContext: vmCallbackContext. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). "NOTREACHED" ^true!

1 0

VM Maker: VMMaker.oscog-rsf.1949.mcz
by commits＠source.squeak.org 07 Sep '16

07 Sep '16

Ronie Salgado Faila uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rsf.1949.mcz ==================== Summary ==================== Name: VMMaker.oscog-rsf.1949 Author: rsf Time: 7 September 2016, 3:10:29.660502 pm UUID: 535f71f9-3f14-4e9f-9c50-73ac9fa568ef Ancestors: VMMaker.oscog-eem.1948 Fix a callback bug that was triggered when using multiples bytecode sets. =============== Diff against VMMaker.oscog-eem.1948 =============== Item was changed: ----- Method: StackInterpreter>>returnAs:ThroughCallback:Context: (in category 'callback support') ----- returnAs: returnTypeOop ThroughCallback: vmCallbackContext Context: callbackMethodContext "callbackMethodContext is an activation of invokeCallback:[stack:registers:jmpbuf:]. Its sender is the VM's state prior to the callback. Reestablish that state (via longjmp), and mark callbackMethodContext as dead." <export: true> <var: #vmCallbackContext type: #'VMCallbackContext *'> | calloutMethodContext theFP thePage | <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> ((self isIntegerObject: returnTypeOop) and: [self isLiveContext: callbackMethodContext]) ifFalse: [^false]. calloutMethodContext := self externalInstVar: SenderIndex ofContext: callbackMethodContext. (self isLiveContext: calloutMethodContext) ifFalse: [^false]. "We're about to leave this stack page; must save the current frame's instructionPointer." self push: instructionPointer. self externalWriteBackHeadFramePointers. "Mark callbackMethodContext as dead; the common case is that it is the current frame. We go the extra mile for the debugger." (self isSingleContext: callbackMethodContext) ifTrue: [self markContextAsDead: callbackMethodContext] ifFalse: [theFP := self frameOfMarriedContext: callbackMethodContext. framePointer = theFP "common case" ifTrue: [(self isBaseFrame: theFP) ifTrue: [stackPages freeStackPage: stackPage] ifFalse: "calloutMethodContext is immediately below on the same page. Make it current." [instructionPointer := (self frameCallerSavedIP: framePointer) asUnsignedInteger. stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + objectMemory wordSize. framePointer := self frameCallerFP: framePointer. + self setMethod: (self frameMethod: framePointer). self restoreCStackStateForCallbackContext: vmCallbackContext. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). ^true]] ifFalse: [self externalDivorceFrame: theFP andContext: callbackMethodContext. self markContextAsDead: callbackMethodContext]]. "Make the calloutMethodContext the active frame. The case where calloutMethodContext is immediately below callbackMethodContext on the same page is handled above." (self isStillMarriedContext: calloutMethodContext) ifTrue: [theFP := self frameOfMarriedContext: calloutMethodContext. thePage := stackPages stackPageFor: theFP. "findSPOf:on: points to the word beneath the instructionPointer, but there is no instructionPointer on the top frame of the current page." self assert: thePage ~= stackPage. stackPointer := (self findSPOf: theFP on: thePage) - objectMemory wordSize. framePointer := theFP] ifFalse: [thePage := self makeBaseFrameFor: calloutMethodContext. framePointer := thePage headFP. stackPointer := thePage headSP]. instructionPointer := self popStack. self setMethod: (objectMemory fetchPointer: MethodIndex ofObject: calloutMethodContext). self setStackPageAndLimit: thePage. self restoreCStackStateForCallbackContext: vmCallbackContext. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). "NOTREACHED" ^true!

1 0

[OpenSmalltalk/opensmalltalk-vm] bce195: CogVM source as per VMMaker.oscog-eem.1948
by GitHub 07 Sep '16

07 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: bce1958136cca35f193b76804aa9957abd6a3e64 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bce1958136cca35f19… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: A build.macos32x86/pharo.stack.spur/Makefile A build.macos32x86/pharo.stack.spur/mvm A build.macos32x86/pharo.stack.spur/plugins.ext A build.macos32x86/pharo.stack.spur/plugins.int M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1948 General: Fix off-by-one error in an assert Fixes related to Immutability / read-only objects: - weak structures can't be mmutable - primitiveStringReplace fails if the receier is immutable only if it attempts to mutate something. SistaBytecodeSet/FullBlocks: Re-enabled full block compilation to machine code. Fix marryFrame:SP:copyTemps: for full blocks; the closureOrNil field must still be set. Add an assert to primitiveFindNextUnwindContext that caught a side-effect of the bug. Added assertion ensuring that when a method is jitted, the compiled code jitted is a compiled method and when a block is jitted, the compiled code jitted is a compiled block. Improve stack backtrace printing for full blocks. Disabled 2 paths compiltion on full blocks. Find the home of a full block for context printing. Fix pc mapping for full block closures (mustMapMachineCodePC:context:). In the Cogit change inBlock to be an integer value, 0 for methods, 1 for vannilla blocks and 2 for full blocks (to reuce the amount of refactoring now and when removing vanilla block support some time in the future). Add trampolines for creating small and large full block contexts in the Spur object representation. Get frameless full block prolog generation more correct than it was ;-) Added a deny to ensure the block can be frameless. Works both for blocks and full blocks.

1 0

VM Maker: VMMaker.oscog-eem.1948.mcz
by commits＠source.squeak.org 07 Sep '16

07 Sep '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1948.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1948 Author: eem Time: 7 September 2016, 2:25:30.049917 pm UUID: 7725d8e2-28a4-4f42-9231-1df18e655857 Ancestors: VMMaker.oscog-eem.1947 Fix off-by-one error in an assert =============== Diff against VMMaker.oscog-eem.1947 =============== Item was changed: ----- Method: CoInterpreter>>externalInstVar:ofContext: (in category 'frame access') ----- externalInstVar: offset ofContext: aContext "Fetch an instance variable from a maybe married context. If the context is still married compute the value of the relevant inst var from the spouse frame's state. If the context is single but has a negative instruction pointer recognise that the instruction pointer is actually into machine code and convert it to the corresponding bytecode pc." <inline: false> | value | self assert: (objectMemory isContext: aContext). + self assert: offset <= (ReceiverIndex + (self checkStackPointerForMaybeMarriedContext: aContext)). - self assert: offset < (ReceiverIndex + (self checkStackPointerForMaybeMarriedContext: aContext)). "method, closureOrNil & receiver need no special handling; only sender, pc & stackp have to be computed for married contexts." (self isReadMediatedContextInstVarIndex: offset) ifFalse: [^objectMemory fetchPointer: offset ofObject: aContext]. self externalWriteBackHeadFramePointers. (self isStillMarriedContext: aContext) ifTrue: [^self fetchPointer: offset ofMarriedContext: aContext]. value := objectMemory fetchPointer: offset ofObject: aContext. (offset = InstructionPointerIndex and: [(objectMemory isIntegerObject: value) and: [value signedIntFromLong < 0]]) ifTrue: [^self mustMapMachineCodePC: (objectMemory integerValueOf: value) context: aContext]. ^value! Item was changed: ----- Method: StackInterpreter>>externalInstVar:ofContext: (in category 'frame access') ----- externalInstVar: offset ofContext: aContext "Fetch an instance variable from a maybe married context. If the context is still married compute the value of the relevant inst var from the spouse frame's state." <inline: false> self assert: (objectMemory isContext: aContext). + self assert: offset <= (ReceiverIndex + (self checkStackPointerForMaybeMarriedContext: aContext)). - self assert: offset < (ReceiverIndex + (self checkStackPointerForMaybeMarriedContext: aContext)). "method, closureOrNil & receiver need no special handling; only sender, pc & stackp have to be computed for married contexts." (self isReadMediatedContextInstVarIndex: offset) ifTrue: [self externalWriteBackHeadFramePointers. (self isStillMarriedContext: aContext) ifTrue: [^self fetchPointer: offset ofMarriedContext: aContext]]. ^objectMemory fetchPointer: offset ofObject: aContext!

1 0

VM Maker: VMMaker.oscog-eem.1947.mcz
by commits＠source.squeak.org 07 Sep '16

07 Sep '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1947.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1947 Author: eem Time: 7 September 2016, 1:44:31.485496 pm UUID: 602f26ce-e176-44a7-be01-ae589e1de1c4 Ancestors: VMMaker.oscog-eem.1946 Fix marryFrame:SP:copyTemps: for full blocks; the closureOrNil field must still be set. Add an assert to primitiveFindNextUnwindContext that caught a side-effect of the bug. Eliminate some warnings in genPrimitiveShallowCopy. Move the abort for loading SqueakFFIPrims later in the method. =============== Diff against VMMaker.oscog-eem.1946 =============== Item was changed: ----- Method: CoInterpreter>>marryFrame:SP:copyTemps: (in category 'frame access') ----- marryFrame: theFP SP: theSP copyTemps: copyTemps "Marry an unmarried frame. This means creating a spouse context initialized with a subset of the frame's state that references the frame. For the default closure implementation we do not need to copy temps. Different closure implementations may require temps to be copied. This method is important enough for performance to be worth streamlining. Override to set the ``has context'' flag appropriately for both machine code and interpreter frames and to streamline the machine code/interpreter differences.." | theContext methodFieldOrObj closureOrNil rcvr numSlots numArgs numStack numTemps | <inline: true> <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #cogMethod type: #'CogMethod *'> self assert: (self frameHasContext: theFP) not. self assert: (self isBaseFrame: theFP) not. "base frames must aready be married for cannotReturn: processing" "The SP is expected to be pointing at the last oop on the stack, not at the pc" self assert: (objectMemory addressCouldBeOop: (objectMemory longAt: theSP)). "Decide how much of the stack to preserve in widowed contexts. Preserving too much state will potentially hold onto garbage. Holding onto too little may mean that a dead context isn't informative enough in a debugging situation. If copyTemps is false (as it is in the default closure implementation) compromise, retaining only the arguments with no temporaries. Note that we still set the stack pointer to its current value, but stack contents other than the arguments are nil." methodFieldOrObj := self frameMethodField: theFP. methodFieldOrObj asUnsignedInteger < objectMemory startOfMemory "inline (self isMachineCodeFrame: theFP)" ifTrue: [| cogMethod | stackPages longAt: theFP + FoxMethod put: methodFieldOrObj + MFMethodFlagHasContextFlag. cogMethod := self cCoerceSimple: (methodFieldOrObj bitAnd: MFMethodMask) to: #'CogMethod *'. numArgs := cogMethod cmNumArgs. cogMethod cmType = CMMethod ifTrue: + [closureOrNil := cogMethod cmIsFullBlock + ifTrue: [self frameStackedReceiver: theFP numArgs: numArgs] + ifFalse: [objectMemory nilObject]] - [closureOrNil := objectMemory nilObject] ifFalse: [cogMethod := (self cCoerceSimple: cogMethod to: #'CogBlockMethod *') cmHomeMethod. closureOrNil := self frameStackedReceiver: theFP numArgs: numArgs]. numSlots := (self methodHeaderIndicatesLargeFrame: cogMethod methodHeader) ifTrue: [LargeContextSlots] ifFalse: [SmallContextSlots]. methodFieldOrObj := cogMethod methodObject. rcvr := self mframeReceiver: theFP. numStack := self stackPointerIndexForMFrame: theFP WithSP: theSP numArgs: numArgs] ifFalse: [self setIFrameHasContext: theFP. numArgs := self iframeNumArgs: theFP. numSlots := (self methodHeaderIndicatesLargeFrame: (objectMemory methodHeaderOf: methodFieldOrObj)) ifTrue: [LargeContextSlots] ifFalse: [SmallContextSlots]. closureOrNil := (self iframeIsBlockActivation: theFP) ifTrue: [self frameStackedReceiver: theFP numArgs: numArgs] ifFalse: [objectMemory nilObject]. rcvr := self iframeReceiver: theFP. numStack := self stackPointerIndexForIFrame: theFP WithSP: theSP numArgs: numArgs]. theContext := objectMemory eeInstantiateMethodContextSlots: numSlots. self setFrameContext: theFP to: theContext. "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity)" objectMemory storePointerUnchecked: SenderIndex ofObject: theContext withValue: (self withSmallIntegerTags: theFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: theContext withValue: (self withSmallIntegerTags: (self frameCallerFP: theFP)). objectMemory storePointerUnchecked: StackPointerIndex ofObject: theContext withValue: (objectMemory integerObjectOf: numStack). objectMemory storePointerUnchecked: MethodIndex ofObject: theContext withValue: methodFieldOrObj. objectMemory storePointerUnchecked: ClosureIndex ofObject: theContext withValue: closureOrNil. objectMemory storePointerUnchecked: ReceiverIndex ofObject: theContext withValue: rcvr. 1 to: numArgs do: [:i| objectMemory storePointerUnchecked: ReceiverIndex + i ofObject: theContext withValue: (self temporary: i - 1 in: theFP)]. copyTemps ifTrue: [numTemps := self frameNumTemps: theFP. 1 to: numTemps do: [:i| objectMemory storePointerUnchecked: ReceiverIndex + i + numArgs ofObject: theContext withValue: (self temporary: i - 1 in: theFP)]. numArgs := numArgs + numTemps]. numArgs + 1 to: numStack do: [:i| objectMemory storePointerUnchecked: ReceiverIndex + i ofObject: theContext withValue: objectMemory nilObject]. self assert: (self frameHasContext: theFP). self assert: (self frameOfMarriedContext: theContext) = theFP. self assert: numStack + ReceiverIndex < (objectMemory lengthOf: theContext). ^theContext! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genPrimitiveShallowCopy (in category 'primitive generators') ----- genPrimitiveShallowCopy "Implement primitiveShallowCopy/primitiveClone for convenient cases: - the receiver is not a context - the receiver is not a compiled method - the result fits in eden (actually below scavengeThreshold)" | formatReg resultReg slotsReg ptrReg jumpImmediate jumpIsMethod jumpVariable jumpTooBig jumpEmpty jumpNoSpace continuance copyLoop | - <var: #continue type: #'AbstractInstruction *'> <var: #copyLoop type: #'AbstractInstruction *'> <var: #jumpTooBig type: #'AbstractInstruction *'> + <var: #continuance type: #'AbstractInstruction *'> <var: #jumpVariable type: #'AbstractInstruction *'> <var: #jumpNoSpace type: #'AbstractInstruction *'> <var: #jumpIsMethod type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> jumpImmediate := self genJumpImmediate: ReceiverResultReg. resultReg := Arg0Reg. slotsReg := Arg1Reg. "get freeStart as early as possible so as not to wait later..." cogit MoveAw: objectMemory freeStartAddress R: resultReg. "formatReg := self formatOf: ReceiverResultReg" self genGetFormatOf: ReceiverResultReg into: (ptrReg := formatReg := SendNumArgsReg) leastSignificantHalfOfBaseHeaderIntoScratch: NoReg. cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg. jumpIsMethod := cogit JumpAboveOrEqual: 0. cogit CmpCq: objectMemory indexablePointersFormat R: formatReg. jumpVariable := cogit JumpZero: 0. continuance := cogit Label. self genGetRawSlotSizeOfNonImm: ReceiverResultReg into: slotsReg. cogit CmpCq: objectMemory numSlotsMask R: slotsReg. jumpTooBig := cogit JumpZero: 0. cogit CmpCq: 0 R: slotsReg. jumpEmpty := cogit JumpZero: 0. "round up to allocationUnit" cogit MoveR: slotsReg R: TempReg; AndCq: 1 R: TempReg; AddR: TempReg R: slotsReg; AddCq: objectMemory baseHeaderSize / objectMemory wordSize R: slotsReg; LogicalShiftLeftCq: objectMemory shiftForWord R: slotsReg; "check if allocation fits (freeSize + byteSize < scavengeThreshold); scavengeThreshold is constant." AddR: resultReg R: slotsReg; CmpCq: objectMemory getScavengeThreshold R: slotsReg. jumpNoSpace := cogit JumpAboveOrEqual: 0. cogit MoveR: resultReg R: ptrReg; "write back new freeStart; get result. slotsReg holds new freeStart, the limit of the object" MoveR: slotsReg Aw: objectMemory freeStartAddress; "set up loop bounds" SubCq: objectMemory wordSize * 2 R: slotsReg; "copy header, masking off irrelevant bits" MoveMw: 0 r: ReceiverResultReg R: TempReg; AndCq: objectMemory formatMask << objectMemory formatShift + objectMemory classIndexMask R: TempReg; MoveR: TempReg Mw: 0 r: resultReg; MoveMw: objectMemory wordSize r: ReceiverResultReg R: TempReg; AndCq: objectMemory numSlotsMask << objectMemory numSlotsHalfShift R: TempReg; MoveR: TempReg Mw: objectMemory wordSize r: resultReg. "copy two fields at a time..." copyLoop := cogit Label. cogit AddCq: objectMemory wordSize * 2 R: ReceiverResultReg; AddCq: objectMemory wordSize * 2 R: ptrReg; MoveMw: 0 r: ReceiverResultReg R: TempReg; MoveR: TempReg Mw: 0 r: ptrReg; MoveMw: objectMemory wordSize r: ReceiverResultReg R: TempReg; MoveR: TempReg Mw: objectMemory wordSize r: ptrReg; CmpR: ptrReg R: slotsReg; JumpAbove: copyLoop; MoveR: resultReg R: ReceiverResultReg; genPrimReturn. "If the receiver is variable pointers, fail if its a context, otherwise continue" jumpVariable jmpTarget: cogit Label. self genGetClassIndexOfNonImm: ReceiverResultReg into: ClassReg. cogit CmpCq: ClassMethodContextCompactIndex R: ClassReg; JumpNonZero: continuance. jumpImmediate jmpTarget: (jumpNoSpace jmpTarget: (jumpIsMethod jmpTarget: (jumpTooBig jmpTarget: (jumpEmpty jmpTarget: cogit Label)))). ^0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveShallowCopy (in category 'primitive generators') ----- genPrimitiveShallowCopy "Implement primitiveShallowCopy/primitiveClone for convenient cases: - the receiver is not a context - the receiver is not a compiled method - the result fits in eden (actually below scavengeThreshold)" | formatReg resultReg slotsReg ptrReg jumpImmediate jumpIsMethod jumpVariable jumpTooBig jumpEmpty jumpNoSpace continuance copyLoop | - <var: #continue type: #'AbstractInstruction *'> <var: #copyLoop type: #'AbstractInstruction *'> <var: #jumpTooBig type: #'AbstractInstruction *'> + <var: #continuance type: #'AbstractInstruction *'> <var: #jumpVariable type: #'AbstractInstruction *'> <var: #jumpNoSpace type: #'AbstractInstruction *'> <var: #jumpIsMethod type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> jumpImmediate := self genJumpImmediate: ReceiverResultReg. resultReg := Arg0Reg. slotsReg := Arg1Reg. "get freeStart as early as possible so as not to wait later..." cogit MoveAw: objectMemory freeStartAddress R: resultReg. "formatReg := self formatOf: ReceiverResultReg" self genGetFormatOf: ReceiverResultReg into: (ptrReg := formatReg := SendNumArgsReg) leastSignificantHalfOfBaseHeaderIntoScratch: NoReg. cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg. jumpIsMethod := cogit JumpAboveOrEqual: 0. cogit CmpCq: objectMemory indexablePointersFormat R: formatReg. jumpVariable := cogit JumpZero: 0. continuance := cogit Label. self genGetRawSlotSizeOfNonImm: ReceiverResultReg into: slotsReg. cogit CmpCq: objectMemory numSlotsMask R: slotsReg. jumpTooBig := cogit JumpZero: 0. cogit CmpCq: 0 R: slotsReg. jumpEmpty := cogit JumpZero: 0. "compute byte size for slots" cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize R: slotsReg; LogicalShiftLeftCq: objectMemory shiftForWord R: slotsReg; "check if allocation fits (freeSize + byteSize < scavengeThreshold); scavengeThreshold is constant." AddR: resultReg R: slotsReg; CmpCq: objectMemory getScavengeThreshold R: slotsReg. jumpNoSpace := cogit JumpAboveOrEqual: 0. cogit MoveR: resultReg R: ptrReg; "write back new freeStart; get result. slotsReg holds new freeStart, the limit of the object" MoveR: slotsReg Aw: objectMemory freeStartAddress; "set up loop bounds" SubCq: objectMemory wordSize * 2 R: slotsReg; "copy header, masking off irrelevant bits" MoveMw: 0 r: ReceiverResultReg R: TempReg; AndCq: (objectMemory headerForSlots: objectMemory numSlotsMask format: objectMemory formatMask classIndex: objectMemory classIndexMask) R: TempReg; MoveR: TempReg Mw: 0 r: resultReg. copyLoop := cogit Label. cogit AddCq: objectMemory wordSize R: ReceiverResultReg; AddCq: objectMemory wordSize R: ptrReg; MoveMw: 0 r: ReceiverResultReg R: TempReg; MoveR: TempReg Mw: 0 r: ptrReg; CmpR: ptrReg R: slotsReg; JumpAboveOrEqual: copyLoop; MoveR: resultReg R: ReceiverResultReg; genPrimReturn. "If the receiver is variable pointers, fail if its a context, otherwise continue" jumpVariable jmpTarget: cogit Label. self genGetClassIndexOfNonImm: ReceiverResultReg into: ClassReg. cogit CmpCq: ClassMethodContextCompactIndex R: ClassReg; JumpNonZero: continuance. jumpImmediate jmpTarget: (jumpNoSpace jmpTarget: (jumpIsMethod jmpTarget: (jumpTooBig jmpTarget: (jumpEmpty jmpTarget: cogit Label)))). ^0! Item was changed: ----- Method: StackInterpreter>>ioLoadExternalFunction:OfLength:FromModule:OfLength:AccessorDepthInto: (in category 'primitive support') ----- ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength AccessorDepthInto: accessorDepthPtr "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" <doNotGenerate> | pluginString functionString | pluginString := String new: moduleLength. 1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)]. - "Pharo images as of 2016 use the FFI plugin (for getenv:?). We can't simulate such function loads. So ignore" - pluginString = 'SqueakFFIPrims' ifTrue: - [self transcript cr; show: 'ignoring function load from SqueakFFIPrims'. - ^0]. functionString := String new: functionLength. 1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)]. + "Pharo images as of 2016 use the FFI plugin (for getenv:?). We can't simulate such function loads. So ignore" + pluginString = 'SqueakFFIPrims' ifTrue: + ["self halt." + true ifTrue: + [self transcript cr; show: 'ignoring function load from SqueakFFIPrims'. + ^0]]. ^self ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveFindNextUnwindContext (in category 'control primitives') ----- primitiveFindNextUnwindContext "Primitive. Search up the context stack for the next method context marked for unwind handling from the receiver up to but not including the argument. Return nil if none found." | stopContext calleeContext handlerOrNilOrZero | <var: #theFP type: #'char *'> stopContext := self stackTop. calleeContext := self stackValue: 1. (stopContext = objectMemory nilObject or: [objectMemory isContext: stopContext]) ifFalse: [^self primitiveFail]. + "The following should never be true, but developing full blocks, early in September + 2016 we were seeing invalid invocations of this primitive.. Hence the assert:" + self assert: stopContext ~= calleeContext. self externalWriteBackHeadFramePointers. (self isStillMarriedContext: calleeContext) ifTrue: [| theFP | theFP := self frameOfMarriedContext: calleeContext. (self isBaseFrame: theFP) ifTrue: [handlerOrNilOrZero := self findMethodWithPrimitive: 198 FromContext: (self frameCallerContext: theFP) UpToContext: stopContext] ifFalse: [handlerOrNilOrZero := self findMethodWithPrimitive: 198 FromFP: (self frameCallerFP: theFP) UpToContext: stopContext]] ifFalse: [| startContext | startContext := objectMemory fetchPointer: SenderIndex ofObject: calleeContext. (objectMemory isContext: startContext) ifTrue: [handlerOrNilOrZero := self findMethodWithPrimitive: 198 FromContext: startContext UpToContext: stopContext] ifFalse: [handlerOrNilOrZero := 0]]. handlerOrNilOrZero = 0 ifTrue: [handlerOrNilOrZero := objectMemory nilObject]. self pop: 2 thenPush: handlerOrNilOrZero!

1 0

[OpenSmalltalk/opensmalltalk-vm] b14f85: [SqueakSSL] fix endless recursion on failes connec...
by GitHub 07 Sep '16

07 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: b14f85f17051df09c7c7b94d03aef3b0207bef00 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b14f85f17051df09c7… Author: Tobias Pape <tobias(a)netshed.de> Date: 2016-09-07 (Wed, 07 Sep 2016) Changed paths: M platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c Log Message: ----------- [SqueakSSL] fix endless recursion on failes connect Because returning -1 here is actually saying "need more data"

4 3

why are plugins.int and plugins.ext in .gitignore?
by Eliot Miranda 07 Sep '16

07 Sep '16

McStalker.oscogvm$ git add build.macos32x86/pharo.stack.spur/* The following paths are ignored by one of your .gitignore files: build.macos32x86/pharo.stack.spur/Makefile build.macos32x86/pharo.stack.spur/plugins.ext build.macos32x86/pharo.stack.spur/plugins.int Use -f if you really want to add them. fatal: no files added McStalker.oscogvm$ vi .gitignore McStalker.oscogvm$ git add -f build.macos32x86/pharo.stack.spur/* plugins.int and plugins.ext are important; they specify the set of plains to be built. They should not be in .gitignore. Why are they there? _,,,^..^,,,_ best, Eliot

2 2

VM Maker: VMMaker.oscog-eem.1946.mcz
by commits＠source.squeak.org 06 Sep '16

06 Sep '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1946.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1946 Author: eem Time: 6 September 2016, 7:25:45.714008 pm UUID: 5d49f2e2-77f3-4f4d-877b-b3fecceda04e Ancestors: VMMaker.oscog-eem.1945 Fix Slang bug that misgenerated the macros for the full block entry offsets. Add some facade machinery for the new full block check asserts. =============== Diff against VMMaker.oscog-eem.1945 =============== Item was changed: ----- Method: CCodeGenerator>>addMethodFor:selector: (in category 'utilities') ----- addMethodFor: aClass selector: selector "Add the given method to the code base and answer its translation or nil if it shouldn't be translated." | method tmethod | method := aClass compiledMethodAt: selector. (method pragmaAt: #doNotGenerate) ifNotNil: ["only remove a previous method if this one overrides it, i.e. this is a subclass method. If the existing method is in a different hierarchy this method must be merely a redeirect." (methods at: selector ifAbsent: []) ifNotNil: [:tm| (aClass includesBehavior: tm definingClass) ifTrue: [self removeMethodForSelector: selector]]. ^nil]. method isSubclassResponsibility ifTrue: [^nil]. (self shouldIncludeMethodFor: aClass selector: selector) ifFalse: [^nil]. tmethod := self compileToTMethodSelector: selector in: aClass. "Even thoug we exclude initialize methods, we must consider their global variable usage, otherwise globals may be incorrectly localized." selector == #initialize ifTrue: [self checkForGlobalUsage: (tmethod allReferencedVariablesUsing: self) in: tmethod. ^nil]. self addMethod: tmethod. "If the method has a macro then add the macro. But keep the method for analysis purposes (e.g. its variable accesses)." (method pragmaAt: #cmacro:) ifNotNil: [:pragma| self addMacro: (pragma argumentAt: 1) for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. (method pragmaAt: #cmacro) ifNotNil: [:pragma| | literal | "Method should be just foo ^const" self assert: (method numArgs = 0 and: [method numLiterals = 3 or: [method isQuick]]). literal := method isQuick ifTrue: [method decompile block statements last expr key] ifFalse: [method literalAt: 1]. + self addMacro: '() ', (method isReturnField + ifTrue: [literal] + ifFalse: [self cLiteralFor: literal value name: method selector]) for: selector. - self addMacro: '() ', (self cLiteralFor: literal value name: method selector) for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. ^tmethod! Item was changed: ----- Method: Cogit class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code. include cePositive32BitIntegerTrampoline as a hack to prevent it being inlined (it is only used outside of Cogit by the object representation). Include CFramePointer CStackPointer as a hack to get them declared at all." ^#( 'ceBaseFrameReturnTrampoline' #ceCaptureCStackPointers 'ceCheckForInterruptTrampoline' ceEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg realCECallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs realCECallCogCodePopReceiverAndClassRegs 'ceReturnToInterpreterTrampoline' 'ceCannotResumeTrampoline' ceTryLockVMOwner ceUnlockVMOwner + 'cmEntryOffset' 'cmNoCheckEntryOffset' 'cmDynSuperEntryOffset' 'cmSelfSendEntryOffset' + 'missOffset' 'cbEntryOffset' 'cbNoSwitchEntryOffset' 'blockNoContextSwitchOffset' breakPC - 'cmEntryOffset' 'cmNoCheckEntryOffset' 'cmDynSuperEntryOffset' 'cmSelfSendEntryOffset' 'missOffset' - 'blockNoContextSwitchOffset' breakPC CFramePointer CStackPointer 'cFramePointerInUse' ceGetFP ceGetSP traceFlags 'traceStores' debugPrimCallStackOffset) includes: var! Item was changed: ----- Method: Cogit>>entryOffset (in category 'accessing') ----- entryOffset <api> + <cmacro> - <cmacro: '() cmEntryOffset'> ^cmEntryOffset! Item was changed: ----- Method: Cogit>>noCheckEntryOffset (in category 'accessing') ----- noCheckEntryOffset <api> + <cmacro> - <cmacro: '() cmNoCheckEntryOffset'> ^cmNoCheckEntryOffset! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>isOopCompiledMethod: (in category 'accessing') ----- + isOopCompiledMethod: anOop + ^(objectMap keyAtValue: anOop) isCompiledMethod! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>ultimateLiteralOf: (in category 'accessing') ----- + ultimateLiteralOf: methodObj + | meth | + meth := (objectMap keyAtValue: methodObj). + ^self oopForObject: (meth literalAt: meth numLiterals)!

1 0

VM Maker: VMMaker.oscog-eem.1945.mcz
by commits＠source.squeak.org 06 Sep '16

06 Sep '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1945.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1945 Author: eem Time: 6 September 2016, 6:22:08.72066 pm UUID: f7150c35-fa20-4559-8baa-90948c71df43 Ancestors: VMMaker.oscog-cb.1944 Revise the two asserts in the previous commit to use isOopCompiledMethod: to be more robust. Add print cog methods with method and move simulator window menu single step command to be with the other breakpoint operations. =============== Diff against VMMaker.oscog-cb.1944 =============== Item was changed: ----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; add: 'clone VM' action: #cloneSimulationWindow; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'print mc/cog head frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp]; add: 'short print ext head frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int head frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'short print mc/cog head frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp]; add: 'long print ext head frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int head frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'long print mc/cog head frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print stack call stack of...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printStackCallStackOf: fp]]; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor pc. self externalWriteBackHeadFramePointers]; addLine; add: 'print rump C stack' action: [objectMemory printMemoryFrom: cogit processor sp to: cogit getCStackPointer]; add: 'print registers' action: [cogit processor printRegistersOn: transcript]; add: 'print register map' action: [cogit printRegisterMapOn: transcript]; add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]]; add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: (((cogit codeEntryFor: cogit processor pc) isNil and: [(cogit methodZone methodFor: cogit processor pc) = 0]) ifTrue: [instructionPointer] ifFalse: [cogit processor pc])]; add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)]; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; add: 'print context...' action: [(self promptHex: 'print context') ifNotNil: [:oop| self printContext: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; add: 'run leak checker' action: [Cursor execute showWhile: [self runLeakChecker]]; add: 'inspect cointerpreter' action: #inspect; add: 'inspect cogit' target: cogit action: #inspect; add: 'inspect method zone' target: cogit methodZone action: #inspect. self isThreadedVM ifTrue: [aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect]. aMenuMorph addLine; add: 'print cog methods' target: cogMethodZone action: #printCogMethods; add: 'print cog methods with prim...' action: [(self promptNum: 'prim index') ifNotNil: [:pix| cogMethodZone printCogMethodsWithPrimitive: pix]]; add: 'print cog methods with selector...' action: [|s| s := UIManager default request: 'selector'. s notEmpty ifTrue: [s = 'nil' ifTrue: [s := nil]. cogMethodZone methodsDo: [:m| (s ifNil: [m selector = objectMemory nilObject] ifNotNil: [(objectMemory numBytesOf: m selector) = s size and: [(self str: s n: (m selector + objectMemory baseHeaderSize) cmp: (objectMemory numBytesOf: m selector)) = 0]]) ifTrue: [cogit printCogMethod: m]]]]; + add: 'print cog methods with method...' action: + [(self promptHex: 'method') ifNotNil: [:methodOop| + cogMethodZone methodsDo: + [:m| + m methodObject = methodOop ifTrue: + [cogit printCogMethod: m]]]]; add: 'print cog method for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodFor: pc]]; add: 'print cog method header for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodHeaderFor: pc]]; add: 'print trampoline table' target: cogit action: #printTrampolineTable; add: 'print prim trace log' action: #dumpPrimTraceLog; add: 'report recent instructions' target: cogit action: #reportLastNInstructions; - add: (cogit singleStep - ifTrue: ['no single step'] - ifFalse: ['single step']) - action: [cogit singleStep: cogit singleStep not]; add: (cogit printRegisters ifTrue: ['no print registers each instruction'] ifFalse: ['print registers each instruction']) action: [cogit printRegisters: cogit printRegisters not]; add: (cogit printInstructions ifTrue: ['no print instructions each instruction'] ifFalse: ['print instructions each instruction']) action: [cogit printInstructions: cogit printInstructions not]; addLine; + add: (cogit singleStep + ifTrue: ['no single step'] + ifFalse: ['single step']) + action: [cogit singleStep: cogit singleStep not]; add: 'click step' action: [cogit setClickStepBreakBlock]; add: 'set break pc', cogit breakPC menuPrompt, '...-ve to disable or remove' action: [cogit promptForBreakPC]; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; add: 'set break block...' action: [|s| s := UIManager default request: 'break block' initialAnswer: '[:theCogit| false]'. s notEmpty ifTrue: [self setBreakBlockFromString: s]]; add: 'set cogit break method...' action: [(self promptHex: 'cogit breakMethod') ifNotNil: [:bm| cogit setBreakMethod: bm]]; add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph! Item was changed: ----- Method: Cogit>>cog:selector: (in category 'jit - api') ----- cog: aMethodObj selector: aSelectorOop "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> (self exclude: aMethodObj selector: aSelectorOop) ifTrue: [^nil]. "In Newspeak we support anonymous accessors and hence tolerate the same method being cogged multiple times. But only if the method class association is nil." NewspeakVM ifTrue: [(coInterpreter methodHasCogMethod: aMethodObj) ifTrue: [cogMethod := coInterpreter cogMethodOf: aMethodObj. self deny: cogMethod selector = aSelectorOop. cogMethod selector = aSelectorOop ifTrue: [^cogMethod]. (coInterpreter methodClassAssociationOf: aMethodObj) ~= objectMemory nilObject ifTrue: [self cCode: 'extern void *firstIndexableField(sqInt)'. "Slang, au natural" self warnMultiple: cogMethod selectors: aSelectorOop. ^nil]]] ifFalse: [self deny: (coInterpreter methodHasCogMethod: aMethodObj)]. + self deny: (objectMemory isOopCompiledMethod: (coInterpreter ultimateLiteralOf: aMethodObj)). - self deny: (objectMemory isCompiledMethod: (coInterpreter ultimateLiteralOf: aMethodObj)). "coInterpreter stringOf: aSelectorOop" coInterpreter compilationBreak: aSelectorOop point: (objectMemory lengthOf: aSelectorOop) isMNUCase: false. aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. NewspeakVM ifTrue: [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop. cogMethod ifNotNil: [(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue: [self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader. cogMethod methodObject: aMethodObj. coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger]. ^cogMethod]]. "If the generators for the alternate bytecode set are missing then interpret." (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: [(self numElementsIn: generatorTable) <= 256 ifTrue: [^nil]. bytecodeSetOffset := 256] ifFalse: [bytecodeSetOffset := 0]. objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj. methodObj := aMethodObj. methodHeader := objectMemory methodHeaderOf: aMethodObj. cogMethod := self compileCogMethod: aSelectorOop. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. self maybeFreeCounters. "Right now no errors should be reported, so nothing more to do." "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)." ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod! Item was changed: ----- Method: Cogit>>cogFullBlockMethod:numCopied: (in category 'jit - api') ----- cogFullBlockMethod: aMethodObj numCopied: numCopied "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <option: #SistaV1BytecodeSet> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> self cCode: [] inSmalltalk: "for debugging, allow excluding methods based on selector or methodClass" [self class initializationOptions at: #DoNotJIT ifPresent: [:excluded| (excluded anySatisfy: [:exclude| aMethodObj = exclude]) ifTrue: [coInterpreter transcript nextPutAll: 'EXCLUDING '; nextPutAll: aMethodObj; nextPutAll: ' (compiled block)'; cr; flush. ^nil]]]. self deny: (coInterpreter methodHasCogMethod: aMethodObj). + self assert: (objectMemory isOopCompiledMethod: (coInterpreter ultimateLiteralOf: aMethodObj)). - self assert: (objectMemory isCompiledMethod: (coInterpreter ultimateLiteralOf: aMethodObj)). aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. "If the generators for the alternate bytecode set are missing then interpret." (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: [(self numElementsIn: generatorTable) <= 256 ifTrue: [^nil]. bytecodeSetOffset := 256] ifFalse: [bytecodeSetOffset := 0]. objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj. methodObj := aMethodObj. methodHeader := objectMemory methodHeaderOf: aMethodObj. cogMethod := self compileCogFullBlockMethod: numCopied. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. self maybeFreeCounters. "Right now no errors should be reported, so nothing more to do." "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)." ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod!

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2016